Commit Graph
22 Commits
Author SHA1 Message Date
SenseiKiwi 51969793a5 Fixed minor bug and cleaned up DungeonHelper
Set various lists of DungeonGenerators to private - there was no need to
make them public fields. While cleaning up the code before, I
accidentally erased the default constructor, which handled loading a
reference to DDProperties. I've put the code back in so that the class
works correctly.
2013-06-15 08:46:28 -04:00
SenseiKiwi 84e430abfd Improved DungeonHelper
I was able to infer that HashMap schematic should have generic
parameters <String, Tag> and changed the declaration accordingly. All
generic collections in DungeonHelper are now parameterized properly.
2013-06-15 08:13:50 -04:00
SenseiKiwi 172e3e3af1 Cleaned up and tweaked DungeonHelper
Cleaned up the indentation and empty lines in DungeonHelper. Set
metadataFlipList and metadataNextList to have generic type Integer,
since they're used to store block IDs. Whenever possible, we should
always be using parameterized collections instead of leaving their types
unspecified. I'd like to fix up the schematic HashMap in the future -
unless it's necessary, we shouldn't be storing values of various types
in that collection. Strongly typed variables or a class with the
appropriate fields would be much cleaner.
2013-06-15 08:07:33 -04:00
SenseiKiwi 4e8b8deab7 Formatted DungeonGenerator
Changed the formatting in DungeonGenerator. Autocorrected indentation
and removed extra empty lines to improve readability. None of the
variables were changed since that would break compability with previous
serialized instances.
2013-06-15 07:50:00 -04:00
SenseiKiwi 4c23e5c7b8 Minor change to SchematicLoader
Changed SchematicLoader to use DDLoot.DungeonChestInfo instead of
requesting a reference to the same data through ChestGenHooks. Exactly
the same data is being retrieved, but ChestGenHooks retrieves it by
performing a lookup on a map relating loot categories to loot info, so
it's slightly slower. No point in doing that if we have access to the
reference directly.
2013-06-15 07:24:28 -04:00
SenseiKiwi 21d94b7c66 Tweaked loot generation
Decreased the weight of DD items very slightly to make them a little
more rare. Added a section to DDLoot.mergeCategories() that searches for
the enchanted book loot and fixes its weight to 3 (instead of the usual
1). This makes enchanted books slightly more common. I confirmed that
books are actually spawning in loot chests. There is the possibility
that there is a built-in chance of an enchanted book taking up a chest
slot but not actually generating anything.
2013-06-15 06:32:30 -04:00
SenseiKiwi a24cd87ddb Added a filter for bad schematic names
Added a regex filter for bad schematic names in
CommandEndDungeonCreatoin. Names can only be made of letters, numbers,
and underscores now. This should prevent any nasty tricks people might
try to affect the underlying file system.
2013-06-15 02:40:00 -04:00
SenseiKiwi b174c69e5b Merge remote-tracking branch 'upstream/master' 2013-06-15 02:19:00 -04:00
SenseiKiwi 929d4680bb Merge remote-tracking branch 'upstream/master' 2013-06-15 02:10:27 -04:00
SenseiKiwi 03d60dc07d Fixed bug in DDLoot, delayed loot generation
Changed DDLoot to use the correct item IDs when adding DD items to
chests. Moved loot chest registration from init() to postInit() in the
hopes that we'll be able to catch the loot of other mods that also hook
into Vanilla chests.
2013-06-15 01:58:53 -04:00
SenseiKiwi 1c7028cd1c Separated loot config settings
Created a separate category for loot properties so that they're not lost
among all the Limbo flags.
2013-06-14 20:09:37 -04:00
SenseiKiwi 70d5c3d97e Merge remote-tracking branch 'upstream/master' 2013-06-14 15:24:17 -04:00
SenseiKiwi b1130d0cc6 Overhauled loot generation
Dimensional dungeon loot chests are now registered with Forge. Other
mods can tap into our chests and our own generation is cleaner. The list
of items in our chests is generated in DDLoot.
2013-06-14 15:22:22 -04:00
SenseiKiwi 6fb05c9be5 Corrections and additions to config properties
Corrected typos in the names of two properties. Added properties for
toggling each item in our mod as dimensional dungeon loot. These
properties are not being used yet, but my next commit will actually
integrate them.
2013-06-14 13:12:39 -04:00
SenseiKiwi cb966210bd Fixed null DDProperties reference in DimData
Fixed null DDProperties reference in DimData. Changed the code so that
it requests an instance in each of its functions instead of relying on
loading a reference when it's first instantiated. I'm not sure how the
null references are slipping through, that shouldn't be possible.
2013-06-14 05:14:34 -04:00
SenseiKiwi b11354767d Overhauled configuration properties
Moved all configuration variables from mod_pocketDim to DDProperties
(formerly DimDoorsConfig). Changed property names to be clearer in
config file, modified some comments, and generally cleaned up the config
file. Fixed some missing properties and variables that were reading from
the wrong properties. Modified the order in which mod_pocketDim
instantiated some of its static fields so that they would load after
properties are read. Almost all classes load after properties are read.
Fixed indentation across various files and replaced references to
properties in mod_pocketDim with references to DDProperties.
2013-06-13 19:01:54 -04:00
SenseiKiwi 9c3067ed35 Renamed DimDoorsConfig to DDProperties
Renamed DimDoorsConfig to DDProperties
2013-06-13 00:48:21 -04:00
SenseiKiwi e4c8b50dae Changed some configuration features
Added flag for disabling whether Stabilized Rift Signatures are
craftable. Autocorrected indentation in some areas. Renamed some
property keys in the config file, but the naming is inconsistent. Will
return soon to make all names consistent. Property values should be
removed from mod_pocketDim and moved to a file, e.g. DDProperties.
Configuration should either be loaded directly into the value variables
or be kept as a separate file, e.g. DDConfiguration. I favor for
integrating configuration reading into the same file as the values and
not declaring Property variables at all.
2013-06-12 23:30:13 -04:00
SenseiKiwi e96cbac35c Changed property variable names, minor bug fix
Changed the names of property variables in DimDoorsConfig to follow
better variable naming conventions. Removed a duplicate config.save()
call. Noticed that crafting Stabilized Rift Signatures can't be disabled
in the config file, will be adding that option in the next commit.
General note: we need a better way of handling item configuration.
Metaprogramming in Java would be a godsend.
2013-06-12 22:49:45 -04:00
SenseiKiwi 2990e393e8 Merge remote-tracking branch 'upstream/master' 2013-06-12 21:48:49 -04:00
SenseiKiwi d54b7c287f another silly commit
another silly commit
2013-06-12 03:36:56 -04:00
SenseiKiwi 9db478fcc7 silly commit for testing purposes
silly commit for testing purposes
2013-06-12 03:28:57 -04:00