Anvilcraft/DimDoors
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
DimDoors/StevenDimDoors/mod_pocketDim/helpers/DungeonHelper.java

588 lines
23 KiB
Java
Raw Normal View History

finished update, starting testing builds
2013-06-10 23:03:52 +02:00
package StevenDimDoors.mod_pocketDim.helpers;
import java.io.File;
import java.util.ArrayList;
Fixed Dungeon Listing and Formatting Bugs Added a workaround so that the dungeon list produced by CommandAddDungeonRift does not have repeated names. Also cleaned up the code a bit - it's a mess in there. Part of the rewrite eliminated the bug that caused some dungeon names to be preceded by a backslash (or slash). I've noticed a different bug now - the dungeon tutorial file is being included in the list of dungeons. I'll be fixing that in the next commit.
2013-06-17 12:18:15 +02:00
import java.util.Collection;
Fixed Tutorial Listing Bug and Improved Listing Fixed the bug that caused the dungeon creation tutorial to be listed as a schematic. We were listing all files in the custom schematic directory as a schematic, even though that file wasn't. I added filtering so that we only look at files that end with ".schematic". Also improved dungeon listing by sorting the name list in alphabetical order. That makes the list much easier to read through.
2013-06-17 12:31:53 +02:00
import java.util.Collections;
finished update, starting testing builds
2013-06-10 23:03:52 +02:00
import java.util.HashMap;
Improved DungeonHelper.registerCustomDungeon() Changed the function to use a Hashtable mapping dungeon types to their respective lists so that it wouldn't be necessary to hardcode a condition for each type. The code is much shorter now and we can add new types with ease. The next stage will be to remove weightedDungeonGetList, if possible, so that we don't have to construct a list with duplicates just to have weights. The loop that repeatedly inserted dungeons into that list has been removed anyway, but it shouldn't affect anything since custom dungeon integration was broken and weights were being ignored.
2013-06-15 17:21:49 +02:00
import java.util.HashSet;
finished update, starting testing builds
2013-06-10 23:03:52 +02:00
import java.util.Random;
Overhauling DungeonHelper I changed the name filter for schematic names from CommandEndDungeonCreation to DungeonHelper, and renamed it to NamePattern. I also rewrote most of registerCustomDungeon() to be much more concise. The changes are incomplete but I'm making an intermediate commit. The aim is to change DungeonHelper into a proper singleton and to eliminate the clunky sections that manually map dungeon categories to their corresponding lists. Instead, I'll use data structures to implement that far more efficiently.
2013-06-15 16:25:50 +02:00
import java.util.regex.Pattern;
finished update, starting testing builds
2013-06-10 23:03:52 +02:00
Optimized Weighted Random Dungeon Selection Optimized the selection of random dungeons with weights applied. We now have a class called WeightedContainer for taping into Minecraft's weighted selection code without having to extend the WeightedRandomItem class. Using that, we no longer need to keep a list with duplicate dungeons to achieve weighted selection, so I removed that variable.
2013-06-18 04:26:39 +02:00
import net.minecraft.util.WeightedRandom;
finished update, starting testing builds
2013-06-10 23:03:52 +02:00
import net.minecraft.world.World;
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-14 01:01:54 +02:00
import StevenDimDoors.mod_pocketDim.DDProperties;
Added method to return dungeons already generated.
2013-07-13 05:40:21 +02:00
import StevenDimDoors.mod_pocketDim.DimData;
fixed save data
2013-06-11 20:42:11 +02:00
import StevenDimDoors.mod_pocketDim.DungeonGenerator;
finished update, starting testing builds
2013-06-10 23:03:52 +02:00
import StevenDimDoors.mod_pocketDim.LinkData;
import StevenDimDoors.mod_pocketDim.mod_pocketDim;
Created DungeonSchematic Class Created DungeonSchematic, a class that extends Schematic and adds DD-specific functionality such as methods for filtering the schematic's block before importing and exporting. Testing confirms that DungeonSchematic works well so far, although it still lacks critical features. Made some minor changes to Schematic and copied SchematicLoader.setBlockDirectly(). I realized during testing that setting blocks without using that function could cause problems. First, it's possible that the blocks would not be placed if chunks weren't created. Second, there are issues with blocks updating if we use World to set them, even if block updates are disabled. That causes some torches to break and other weird problems. Added classes to support block filtering operations applied to Schematic. These are used to implement ID standardization and removing mod blocks when importing.
2013-07-29 15:58:47 +02:00
import StevenDimDoors.mod_pocketDim.dungeon.DungeonSchematic;
Partially Overhauled Commands Partially overhauled our command classes. Added DDCommandBase - it extends CommandBase and acts as a new base class for our commands. It removes a little redundancy in our code and provides increased convenience. Removed the static fields for our commands in mod_pocketDim. There was no point in keeping them when nothing was using them. Changed in-game command names to be shorter yet relevant. Converted all commands to singletons so proper instances can be retrieved if necessary. Migrated some of the custom dungeon start/ending logic to DungeonHelper and made customDungeonStatus private. Except for data objects, we shouldn't be exposing state variables like that without any kind of checks. I've rewritten the code in some commands but it's been quite tiring. Still need to fix up lots of things.
2013-06-18 16:23:31 +02:00
import StevenDimDoors.mod_pocketDim.items.itemDimDoor;
Optimized Weighted Random Dungeon Selection Optimized the selection of random dungeons with weights applied. We now have a class called WeightedContainer for taping into Minecraft's weighted selection code without having to extend the WeightedRandomItem class. Using that, we no longer need to keep a list with duplicate dungeons to achieve weighted selection, so I removed that variable.
2013-06-18 04:26:39 +02:00
import StevenDimDoors.mod_pocketDim.util.WeightedContainer;
finished update, starting testing builds
2013-06-10 23:03:52 +02:00
public class DungeonHelper
{
Changed DungeonHelper into a singleton Changed DungeonHelper into a singleton. Changed code in other classes to interface with it properly.
2013-06-16 07:00:05 +02:00
private static DungeonHelper instance = null;
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-14 01:01:54 +02:00
private static DDProperties properties = null;
Partial Overhaul of Commands Made progress on overhauling and prettifying our commands. There are still more changes to be done for this to be functional. I need to do an intermediate commit because I want to merge in recent changes by Steven.
2013-06-25 19:55:13 +02:00
public static final Pattern SchematicNamePattern = Pattern.compile("[A-Za-z0-9_\\-]+");
public static final Pattern DungeonNamePattern = Pattern.compile("[A-Za-z0-9\\-]+");
Improved DungeonHelper.registerCustomDungeon() Changed the function to use a Hashtable mapping dungeon types to their respective lists so that it wouldn't be necessary to hardcode a condition for each type. The code is much shorter now and we can add new types with ease. The next stage will be to remove weightedDungeonGetList, if possible, so that we don't have to construct a list with duplicates just to have weights. The loop that repeatedly inserted dungeons into that list has been removed anyway, but it shouldn't affect anything since custom dungeon integration was broken and weights were being ignored.
2013-06-15 17:21:49 +02:00
Partial Overhaul of Commands Made progress on overhauling and prettifying our commands. There are still more changes to be done for this to be functional. I need to do an intermediate commit because I want to merge in recent changes by Steven.
2013-06-25 19:55:13 +02:00
public static final String SCHEMATIC_FILE_EXTENSION = ".schematic";
Overhauling DungeonHelper I changed the name filter for schematic names from CommandEndDungeonCreation to DungeonHelper, and renamed it to NamePattern. I also rewrote most of registerCustomDungeon() to be much more concise. The changes are incomplete but I'm making an intermediate commit. The aim is to change DungeonHelper into a proper singleton and to eliminate the clunky sections that manually map dungeon categories to their corresponding lists. Instead, I'll use data structures to implement that far more efficiently.
2013-06-15 16:25:50 +02:00
private static final int DEFAULT_DUNGEON_WEIGHT = 100;
Partial Overhaul of Commands Made progress on overhauling and prettifying our commands. There are still more changes to be done for this to be functional. I need to do an intermediate commit because I want to merge in recent changes by Steven.
2013-06-25 19:55:13 +02:00
public static final int MAX_DUNGEON_WEIGHT = 10000; //Used to prevent overflows and math breaking down
Fixed Selection of Bounds for Custom Dungeons Fixed the selection of boundaries for custom dungeons. The code had a bug that would clip off a portion of dungeons during exporting. Also, permafabric is not used to mark the edges of the dungeon anymore. That means dungeons can contain permafabric now without getting cut off, and the permafabric shells will be included as part of the export.
2013-07-15 06:47:32 +02:00
private static final int MAX_EXPORT_RADIUS = 50;
Improved DungeonHelper.registerCustomDungeon() Changed the function to use a Hashtable mapping dungeon types to their respective lists so that it wouldn't be necessary to hardcode a condition for each type. The code is much shorter now and we can add new types with ease. The next stage will be to remove weightedDungeonGetList, if possible, so that we don't have to construct a list with duplicates just to have weights. The loop that repeatedly inserted dungeons into that list has been removed anyway, but it shouldn't affect anything since custom dungeon integration was broken and weights were being ignored.
2013-06-15 17:21:49 +02:00
Standardized Exported Block IDs Standardized exported block IDs for fabric of reality and permafabric blocks. Now we should always export the same block IDs.
2013-07-15 06:54:53 +02:00
public static final int FABRIC_OF_REALITY_EXPORT_ID = 1973;
public static final int PERMAFABRIC_EXPORT_ID = 220;
Improved DungeonHelper.registerCustomDungeon() Changed the function to use a Hashtable mapping dungeon types to their respective lists so that it wouldn't be necessary to hardcode a condition for each type. The code is much shorter now and we can add new types with ease. The next stage will be to remove weightedDungeonGetList, if possible, so that we don't have to construct a list with duplicates just to have weights. The loop that repeatedly inserted dungeons into that list has been removed anyway, but it shouldn't affect anything since custom dungeon integration was broken and weights were being ignored.
2013-06-15 17:21:49 +02:00
private static final String HUB_DUNGEON_TYPE = "Hub";
private static final String TRAP_DUNGEON_TYPE = "Trap";
private static final String SIMPLE_HALL_DUNGEON_TYPE = "SimpleHall";
private static final String COMPLEX_HALL_DUNGEON_TYPE = "ComplexHall";
private static final String EXIT_DUNGEON_TYPE = "Exit";
private static final String DEAD_END_DUNGEON_TYPE = "DeadEnd";
private static final String MAZE_DUNGEON_TYPE = "Maze";
//The list of dungeon types will be kept as an array for now. If we allow new
//dungeon types in the future, then this can be changed to an ArrayList.
private static final String[] DUNGEON_TYPES = new String[] {
HUB_DUNGEON_TYPE,
TRAP_DUNGEON_TYPE,
SIMPLE_HALL_DUNGEON_TYPE,
COMPLEX_HALL_DUNGEON_TYPE,
EXIT_DUNGEON_TYPE,
DEAD_END_DUNGEON_TYPE,
MAZE_DUNGEON_TYPE
};
private Random rand = new Random();
finished update, starting testing builds
2013-06-10 23:03:52 +02:00
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 14:07:33 +02:00
public ArrayList<DungeonGenerator> customDungeons = new ArrayList<DungeonGenerator>();
public ArrayList<DungeonGenerator> registeredDungeons = new ArrayList<DungeonGenerator>();
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 14:46:28 +02:00
private ArrayList<DungeonGenerator> simpleHalls = new ArrayList<DungeonGenerator>();
private ArrayList<DungeonGenerator> complexHalls = new ArrayList<DungeonGenerator>();
private ArrayList<DungeonGenerator> deadEnds = new ArrayList<DungeonGenerator>();
private ArrayList<DungeonGenerator> hubs = new ArrayList<DungeonGenerator>();
private ArrayList<DungeonGenerator> mazes = new ArrayList<DungeonGenerator>();
private ArrayList<DungeonGenerator> pistonTraps = new ArrayList<DungeonGenerator>();
private ArrayList<DungeonGenerator> exits = new ArrayList<DungeonGenerator>();
finished update, starting testing builds
2013-06-10 23:03:52 +02:00
Fixed minor bug Fixed a mistake with the schematic paths of somethingBroke and defaultUp - they were written incorrectly and so they would never load properly.
2013-06-19 04:39:03 +02:00
public DungeonGenerator defaultBreak = new DungeonGenerator(DEFAULT_DUNGEON_WEIGHT, "/schematics/somethingBroke.schematic", true);
public DungeonGenerator defaultUp = new DungeonGenerator(DEFAULT_DUNGEON_WEIGHT, "/schematics/simpleStairsUp.schematic", true);
configurable rift gen and monolith spawn density
2013-06-16 08:59:02 +02:00
Improved DungeonHelper.registerCustomDungeon() Changed the function to use a Hashtable mapping dungeon types to their respective lists so that it wouldn't be necessary to hardcode a condition for each type. The code is much shorter now and we can add new types with ease. The next stage will be to remove weightedDungeonGetList, if possible, so that we don't have to construct a list with duplicates just to have weights. The loop that repeatedly inserted dungeons into that list has been removed anyway, but it shouldn't affect anything since custom dungeon integration was broken and weights were being ignored.
2013-06-15 17:21:49 +02:00
private HashSet<String> dungeonTypeChecker;
Replaced Hashtable with HashMap Replaced all instances of Hashtable in our code with HashMap. I had never given that much thought until Steven mentioned it. HashMap is a better alternative for our code.
2013-06-16 17:06:08 +02:00
private HashMap<String, ArrayList<DungeonGenerator>> dungeonTypeMapping;
Improved DungeonHelper.registerCustomDungeon() Changed the function to use a Hashtable mapping dungeon types to their respective lists so that it wouldn't be necessary to hardcode a condition for each type. The code is much shorter now and we can add new types with ease. The next stage will be to remove weightedDungeonGetList, if possible, so that we don't have to construct a list with duplicates just to have weights. The loop that repeatedly inserted dungeons into that list has been removed anyway, but it shouldn't affect anything since custom dungeon integration was broken and weights were being ignored.
2013-06-15 17:21:49 +02:00
Changed DungeonHelper into a singleton Changed DungeonHelper into a singleton. Changed code in other classes to interface with it properly.
2013-06-16 07:00:05 +02:00
private DungeonHelper()
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 14:46:28 +02:00
{
Improved DungeonHelper.registerCustomDungeon() Changed the function to use a Hashtable mapping dungeon types to their respective lists so that it wouldn't be necessary to hardcode a condition for each type. The code is much shorter now and we can add new types with ease. The next stage will be to remove weightedDungeonGetList, if possible, so that we don't have to construct a list with duplicates just to have weights. The loop that repeatedly inserted dungeons into that list has been removed anyway, but it shouldn't affect anything since custom dungeon integration was broken and weights were being ignored.
2013-06-15 17:21:49 +02:00
//Load the dungeon type checker with the list of all types in lowercase.
//Capitalization matters for matching in a hash set.
dungeonTypeChecker = new HashSet<String>();
for (String dungeonType : DUNGEON_TYPES)
{
dungeonTypeChecker.add(dungeonType.toLowerCase());
}
//Add all the basic dungeon types to dungeonTypeMapping
Fixed Bugs in DungeonHelper 1. Added converting dungeon type names to lowercase before adding them to dungeonTypeMapping (a HashMap that associates dungeon type strings with their lists). Keeping the original casing was causing a NullPointerException when the HashMap returned null and we expected to receive a non-null list. 2. Added code to strip out the file extension of a schematic in validateSchematicName(). The extension was getting dragged along with the dungeon's weight, which would cause parsing to fail and the name was considered invalid. This means that none of the custom dungeons were being registered for generation since the system saw them as badly tagged. They also wouldn't generate Monoliths even if tagged as closed because we would ignore the tags. 3. Changed a comparison for the "open" tag to be case insensitive. 4. Minor changes
2013-06-22 20:27:59 +02:00
//Dungeon type names must be passed in lowercase to make matching easier.
Replaced Hashtable with HashMap Replaced all instances of Hashtable in our code with HashMap. I had never given that much thought until Steven mentioned it. HashMap is a better alternative for our code.
2013-06-16 17:06:08 +02:00
dungeonTypeMapping = new HashMap<String, ArrayList<DungeonGenerator>>();
Fixed Bugs in DungeonHelper 1. Added converting dungeon type names to lowercase before adding them to dungeonTypeMapping (a HashMap that associates dungeon type strings with their lists). Keeping the original casing was causing a NullPointerException when the HashMap returned null and we expected to receive a non-null list. 2. Added code to strip out the file extension of a schematic in validateSchematicName(). The extension was getting dragged along with the dungeon's weight, which would cause parsing to fail and the name was considered invalid. This means that none of the custom dungeons were being registered for generation since the system saw them as badly tagged. They also wouldn't generate Monoliths even if tagged as closed because we would ignore the tags. 3. Changed a comparison for the "open" tag to be case insensitive. 4. Minor changes
2013-06-22 20:27:59 +02:00
dungeonTypeMapping.put(SIMPLE_HALL_DUNGEON_TYPE.toLowerCase(), simpleHalls);
dungeonTypeMapping.put(COMPLEX_HALL_DUNGEON_TYPE.toLowerCase(), complexHalls);
dungeonTypeMapping.put(HUB_DUNGEON_TYPE.toLowerCase(), hubs);
dungeonTypeMapping.put(EXIT_DUNGEON_TYPE.toLowerCase(), exits);
dungeonTypeMapping.put(DEAD_END_DUNGEON_TYPE.toLowerCase(), deadEnds);
dungeonTypeMapping.put(MAZE_DUNGEON_TYPE.toLowerCase(), mazes);
dungeonTypeMapping.put(TRAP_DUNGEON_TYPE.toLowerCase(), pistonTraps);
Improved DungeonHelper.registerCustomDungeon() Changed the function to use a Hashtable mapping dungeon types to their respective lists so that it wouldn't be necessary to hardcode a condition for each type. The code is much shorter now and we can add new types with ease. The next stage will be to remove weightedDungeonGetList, if possible, so that we don't have to construct a list with duplicates just to have weights. The loop that repeatedly inserted dungeons into that list has been removed anyway, but it shouldn't affect anything since custom dungeon integration was broken and weights were being ignored.
2013-06-15 17:21:49 +02:00
//Load our reference to the DDProperties singleton
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 14:46:28 +02:00
if (properties == null)
properties = DDProperties.instance();
Reintegrated initialization code for DungeonHelper I had previously removed the function calls in mod_pocketDim to migrate them to DungeonHelper. Completed the migration now.
2013-06-16 07:13:06 +02:00
Partially Overhauled Commands Partially overhauled our command classes. Added DDCommandBase - it extends CommandBase and acts as a new base class for our commands. It removes a little redundancy in our code and provides increased convenience. Removed the static fields for our commands in mod_pocketDim. There was no point in keeping them when nothing was using them. Changed in-game command names to be shorter yet relevant. Converted all commands to singletons so proper instances can be retrieved if necessary. Migrated some of the custom dungeon start/ending logic to DungeonHelper and made customDungeonStatus private. Except for data objects, we shouldn't be exposing state variables like that without any kind of checks. I've rewritten the code in some commands but it's been quite tiring. Still need to fix up lots of things.
2013-06-18 16:23:31 +02:00
registerCustomDungeons();
Reintegrated initialization code for DungeonHelper I had previously removed the function calls in mod_pocketDim to migrate them to DungeonHelper. Completed the migration now.
2013-06-16 07:13:06 +02:00
}
Partially Overhauled Commands Partially overhauled our command classes. Added DDCommandBase - it extends CommandBase and acts as a new base class for our commands. It removes a little redundancy in our code and provides increased convenience. Removed the static fields for our commands in mod_pocketDim. There was no point in keeping them when nothing was using them. Changed in-game command names to be shorter yet relevant. Converted all commands to singletons so proper instances can be retrieved if necessary. Migrated some of the custom dungeon start/ending logic to DungeonHelper and made customDungeonStatus private. Except for data objects, we shouldn't be exposing state variables like that without any kind of checks. I've rewritten the code in some commands but it's been quite tiring. Still need to fix up lots of things.
2013-06-18 16:23:31 +02:00
private void registerCustomDungeons()
Reintegrated initialization code for DungeonHelper I had previously removed the function calls in mod_pocketDim to migrate them to DungeonHelper. Completed the migration now.
2013-06-16 07:13:06 +02:00
{
File file = new File(properties.CustomSchematicDirectory);
Tweaked Dungeon Tutorial Copy Code Tweaked the code that copies the dungeon export tutorial. I'm not sure it worked all the time before. It didn't seem quite right. I've confirmed it's working better now. Also cleaned up copyfile a little.
2013-06-16 16:54:03 +02:00
if (file.exists() || file.mkdir())
Reintegrated initialization code for DungeonHelper I had previously removed the function calls in mod_pocketDim to migrate them to DungeonHelper. Completed the migration now.
2013-06-16 07:13:06 +02:00
{
Fixed Empty Dungeon Guide Bug Fixed the bug that caused "How_to_add_dungeons.txt" to be copied as an empty file. The reason was very subtle. Also moved the file to a different directory.
2013-06-20 10:47:16 +02:00
copyfile.copyFile("/mods/DimDoors/text/How_to_add_dungeons.txt", file.getAbsolutePath() + "/How_to_add_dungeons.txt");
Reintegrated initialization code for DungeonHelper I had previously removed the function calls in mod_pocketDim to migrate them to DungeonHelper. Completed the migration now.
2013-06-16 07:13:06 +02:00
}
importCustomDungeons(properties.CustomSchematicDirectory);
registerBaseDungeons();
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 14:46:28 +02:00
}
Renamed all singleton create() to initialize() Renamed the create() function of DDProperties and DungeonHelper to initialize(). Why? Because it was bugging me. <.< That is all.
2013-06-16 18:06:21 +02:00
public static DungeonHelper initialize()
Changed DungeonHelper into a singleton Changed DungeonHelper into a singleton. Changed code in other classes to interface with it properly.
2013-06-16 07:00:05 +02:00
{
if (instance == null)
Reintegrated initialization code for DungeonHelper I had previously removed the function calls in mod_pocketDim to migrate them to DungeonHelper. Completed the migration now.
2013-06-16 07:13:06 +02:00
{
Changed DungeonHelper into a singleton Changed DungeonHelper into a singleton. Changed code in other classes to interface with it properly.
2013-06-16 07:00:05 +02:00
instance = new DungeonHelper();
Reintegrated initialization code for DungeonHelper I had previously removed the function calls in mod_pocketDim to migrate them to DungeonHelper. Completed the migration now.
2013-06-16 07:13:06 +02:00
}
Changed DungeonHelper into a singleton Changed DungeonHelper into a singleton. Changed code in other classes to interface with it properly.
2013-06-16 07:00:05 +02:00
else
Reintegrated initialization code for DungeonHelper I had previously removed the function calls in mod_pocketDim to migrate them to DungeonHelper. Completed the migration now.
2013-06-16 07:13:06 +02:00
{
Renamed all singleton create() to initialize() Renamed the create() function of DDProperties and DungeonHelper to initialize(). Why? Because it was bugging me. <.< That is all.
2013-06-16 18:06:21 +02:00
throw new IllegalStateException("Cannot initialize DungeonHelper twice");
Reintegrated initialization code for DungeonHelper I had previously removed the function calls in mod_pocketDim to migrate them to DungeonHelper. Completed the migration now.
2013-06-16 07:13:06 +02:00
}
Changed DungeonHelper into a singleton Changed DungeonHelper into a singleton. Changed code in other classes to interface with it properly.
2013-06-16 07:00:05 +02:00
return instance;
}
public static DungeonHelper instance()
{
if (instance == null)
{
//This is to prevent some frustrating bugs that could arise when classes
//are loaded in the wrong order. Trust me, I had to squash a few...
Renamed all singleton create() to initialize() Renamed the create() function of DDProperties and DungeonHelper to initialize(). Why? Because it was bugging me. <.< That is all.
2013-06-16 18:06:21 +02:00
throw new IllegalStateException("Instance of DungeonHelper requested before initialization");
Changed DungeonHelper into a singleton Changed DungeonHelper into a singleton. Changed code in other classes to interface with it properly.
2013-06-16 07:00:05 +02:00
}
return instance;
}
Partially Overhauled Commands Partially overhauled our command classes. Added DDCommandBase - it extends CommandBase and acts as a new base class for our commands. It removes a little redundancy in our code and provides increased convenience. Removed the static fields for our commands in mod_pocketDim. There was no point in keeping them when nothing was using them. Changed in-game command names to be shorter yet relevant. Converted all commands to singletons so proper instances can be retrieved if necessary. Migrated some of the custom dungeon start/ending logic to DungeonHelper and made customDungeonStatus private. Except for data objects, we shouldn't be exposing state variables like that without any kind of checks. I've rewritten the code in some commands but it's been quite tiring. Still need to fix up lots of things.
2013-06-18 16:23:31 +02:00
public LinkData createCustomDungeonDoor(World world, int x, int y, int z)
{
//Create a link above the specified position. Link to a new pocket dimension.
LinkData link = new LinkData(world.provider.dimensionId, 0, x, y + 1, z, x, y + 1, z, true, 3);
link = dimHelper.instance.createPocket(link, true, false);
//Place a Warp Door linked to that pocket
itemDimDoor.placeDoorBlock(world, x, y, z, 3, mod_pocketDim.ExitDoor);
return link;
}
Partial Overhaul of Commands Made progress on overhauling and prettifying our commands. There are still more changes to be done for this to be functional. I need to do an intermediate commit because I want to merge in recent changes by Steven.
2013-06-25 19:55:13 +02:00
public boolean validateDungeonType(String type)
{
//Check if the dungeon type is valid
return dungeonTypeChecker.contains(type.toLowerCase());
}
Overhauling DungeonHelper I changed the name filter for schematic names from CommandEndDungeonCreation to DungeonHelper, and renamed it to NamePattern. I also rewrote most of registerCustomDungeon() to be much more concise. The changes are incomplete but I'm making an intermediate commit. The aim is to change DungeonHelper into a proper singleton and to eliminate the clunky sections that manually map dungeon categories to their corresponding lists. Instead, I'll use data structures to implement that far more efficiently.
2013-06-15 16:25:50 +02:00
public boolean validateSchematicName(String name)
{
Fixed Bugs in DungeonHelper 1. Added converting dungeon type names to lowercase before adding them to dungeonTypeMapping (a HashMap that associates dungeon type strings with their lists). Keeping the original casing was causing a NullPointerException when the HashMap returned null and we expected to receive a non-null list. 2. Added code to strip out the file extension of a schematic in validateSchematicName(). The extension was getting dragged along with the dungeon's weight, which would cause parsing to fail and the name was considered invalid. This means that none of the custom dungeons were being registered for generation since the system saw them as badly tagged. They also wouldn't generate Monoliths even if tagged as closed because we would ignore the tags. 3. Changed a comparison for the "open" tag to be case insensitive. 4. Minor changes
2013-06-22 20:27:59 +02:00
String[] dungeonData;
if (!name.endsWith(SCHEMATIC_FILE_EXTENSION))
return false;
dungeonData = name.substring(0, name.length() - SCHEMATIC_FILE_EXTENSION.length()).split("_");
Overhauling DungeonHelper I changed the name filter for schematic names from CommandEndDungeonCreation to DungeonHelper, and renamed it to NamePattern. I also rewrote most of registerCustomDungeon() to be much more concise. The changes are incomplete but I'm making an intermediate commit. The aim is to change DungeonHelper into a proper singleton and to eliminate the clunky sections that manually map dungeon categories to their corresponding lists. Instead, I'll use data structures to implement that far more efficiently.
2013-06-15 16:25:50 +02:00
//Check for a valid number of parts
if (dungeonData.length < 3 || dungeonData.length > 4)
return false;
Improved DungeonHelper.registerCustomDungeon() Changed the function to use a Hashtable mapping dungeon types to their respective lists so that it wouldn't be necessary to hardcode a condition for each type. The code is much shorter now and we can add new types with ease. The next stage will be to remove weightedDungeonGetList, if possible, so that we don't have to construct a list with duplicates just to have weights. The loop that repeatedly inserted dungeons into that list has been removed anyway, but it shouldn't affect anything since custom dungeon integration was broken and weights were being ignored.
2013-06-15 17:21:49 +02:00
//Check if the dungeon type is valid
if (!dungeonTypeChecker.contains(dungeonData[0].toLowerCase()))
Overhauling DungeonHelper I changed the name filter for schematic names from CommandEndDungeonCreation to DungeonHelper, and renamed it to NamePattern. I also rewrote most of registerCustomDungeon() to be much more concise. The changes are incomplete but I'm making an intermediate commit. The aim is to change DungeonHelper into a proper singleton and to eliminate the clunky sections that manually map dungeon categories to their corresponding lists. Instead, I'll use data structures to implement that far more efficiently.
2013-06-15 16:25:50 +02:00
return false;
//Check if the name is valid
Partial Overhaul of Commands Made progress on overhauling and prettifying our commands. There are still more changes to be done for this to be functional. I need to do an intermediate commit because I want to merge in recent changes by Steven.
2013-06-25 19:55:13 +02:00
if (!SchematicNamePattern.matcher(dungeonData[1]).matches())
Overhauling DungeonHelper I changed the name filter for schematic names from CommandEndDungeonCreation to DungeonHelper, and renamed it to NamePattern. I also rewrote most of registerCustomDungeon() to be much more concise. The changes are incomplete but I'm making an intermediate commit. The aim is to change DungeonHelper into a proper singleton and to eliminate the clunky sections that manually map dungeon categories to their corresponding lists. Instead, I'll use data structures to implement that far more efficiently.
2013-06-15 16:25:50 +02:00
return false;
//Check if the open/closed flag is present
if (!dungeonData[2].equalsIgnoreCase("open") && !dungeonData[2].equalsIgnoreCase("closed"))
return false;
//If the weight is present, check that it is valid
if (dungeonData.length == 4)
{
try
{
int weight = Integer.parseInt(dungeonData[3]);
Fixed duplicate custom dungeon listing Removed a line in CommandEndDungeonCreation that inserted a new dungeon directly into DungeonHelper.customDungeons. This had a chance of causing a duplicate listing. registerCustomDungeon() was already being invoked before and if reading tags from the file name failed, the dungeon would get added twice. This could explain some of the buggy dungeon listing that would appear during testing.
2013-06-15 17:30:05 +02:00
if (weight < 0 || weight > MAX_DUNGEON_WEIGHT)
Overhauling DungeonHelper I changed the name filter for schematic names from CommandEndDungeonCreation to DungeonHelper, and renamed it to NamePattern. I also rewrote most of registerCustomDungeon() to be much more concise. The changes are incomplete but I'm making an intermediate commit. The aim is to change DungeonHelper into a proper singleton and to eliminate the clunky sections that manually map dungeon categories to their corresponding lists. Instead, I'll use data structures to implement that far more efficiently.
2013-06-15 16:25:50 +02:00
return false;
}
catch (NumberFormatException e)
{
//Not a number
return false;
}
}
return true;
}
finished update, starting testing builds
2013-06-10 23:03:52 +02:00
public void registerCustomDungeon(File schematicFile)
{
Overhauling DungeonHelper I changed the name filter for schematic names from CommandEndDungeonCreation to DungeonHelper, and renamed it to NamePattern. I also rewrote most of registerCustomDungeon() to be much more concise. The changes are incomplete but I'm making an intermediate commit. The aim is to change DungeonHelper into a proper singleton and to eliminate the clunky sections that manually map dungeon categories to their corresponding lists. Instead, I'll use data structures to implement that far more efficiently.
2013-06-15 16:25:50 +02:00
String name = schematicFile.getName();
Improved DungeonHelper.registerCustomDungeon() Changed the function to use a Hashtable mapping dungeon types to their respective lists so that it wouldn't be necessary to hardcode a condition for each type. The code is much shorter now and we can add new types with ease. The next stage will be to remove weightedDungeonGetList, if possible, so that we don't have to construct a list with duplicates just to have weights. The loop that repeatedly inserted dungeons into that list has been removed anyway, but it shouldn't affect anything since custom dungeon integration was broken and weights were being ignored.
2013-06-15 17:21:49 +02:00
String path = schematicFile.getAbsolutePath();
finished update, starting testing builds
2013-06-10 23:03:52 +02:00
try
{
Fixed Bugs in DungeonHelper 1. Added converting dungeon type names to lowercase before adding them to dungeonTypeMapping (a HashMap that associates dungeon type strings with their lists). Keeping the original casing was causing a NullPointerException when the HashMap returned null and we expected to receive a non-null list. 2. Added code to strip out the file extension of a schematic in validateSchematicName(). The extension was getting dragged along with the dungeon's weight, which would cause parsing to fail and the name was considered invalid. This means that none of the custom dungeons were being registered for generation since the system saw them as badly tagged. They also wouldn't generate Monoliths even if tagged as closed because we would ignore the tags. 3. Changed a comparison for the "open" tag to be case insensitive. 4. Minor changes
2013-06-22 20:27:59 +02:00
if (validateSchematicName(name))
finished update, starting testing builds
2013-06-10 23:03:52 +02:00
{
Overhauling DungeonHelper I changed the name filter for schematic names from CommandEndDungeonCreation to DungeonHelper, and renamed it to NamePattern. I also rewrote most of registerCustomDungeon() to be much more concise. The changes are incomplete but I'm making an intermediate commit. The aim is to change DungeonHelper into a proper singleton and to eliminate the clunky sections that manually map dungeon categories to their corresponding lists. Instead, I'll use data structures to implement that far more efficiently.
2013-06-15 16:25:50 +02:00
//Strip off the file extension while splitting the file name
String[] dungeonData = name.substring(0, name.length() - SCHEMATIC_FILE_EXTENSION.length()).split("_");
Improved DungeonHelper.registerCustomDungeon() Changed the function to use a Hashtable mapping dungeon types to their respective lists so that it wouldn't be necessary to hardcode a condition for each type. The code is much shorter now and we can add new types with ease. The next stage will be to remove weightedDungeonGetList, if possible, so that we don't have to construct a list with duplicates just to have weights. The loop that repeatedly inserted dungeons into that list has been removed anyway, but it shouldn't affect anything since custom dungeon integration was broken and weights were being ignored.
2013-06-15 17:21:49 +02:00
String dungeonType = dungeonData[0].toLowerCase();
Fixed Bugs in DungeonHelper 1. Added converting dungeon type names to lowercase before adding them to dungeonTypeMapping (a HashMap that associates dungeon type strings with their lists). Keeping the original casing was causing a NullPointerException when the HashMap returned null and we expected to receive a non-null list. 2. Added code to strip out the file extension of a schematic in validateSchematicName(). The extension was getting dragged along with the dungeon's weight, which would cause parsing to fail and the name was considered invalid. This means that none of the custom dungeons were being registered for generation since the system saw them as badly tagged. They also wouldn't generate Monoliths even if tagged as closed because we would ignore the tags. 3. Changed a comparison for the "open" tag to be case insensitive. 4. Minor changes
2013-06-22 20:27:59 +02:00
boolean isOpen = dungeonData[2].equalsIgnoreCase("open");
Overhauling DungeonHelper I changed the name filter for schematic names from CommandEndDungeonCreation to DungeonHelper, and renamed it to NamePattern. I also rewrote most of registerCustomDungeon() to be much more concise. The changes are incomplete but I'm making an intermediate commit. The aim is to change DungeonHelper into a proper singleton and to eliminate the clunky sections that manually map dungeon categories to their corresponding lists. Instead, I'll use data structures to implement that far more efficiently.
2013-06-15 16:25:50 +02:00
int weight = (dungeonData.length == 4) ? Integer.parseInt(dungeonData[3]) : DEFAULT_DUNGEON_WEIGHT;
Improved DungeonHelper.registerCustomDungeon() Changed the function to use a Hashtable mapping dungeon types to their respective lists so that it wouldn't be necessary to hardcode a condition for each type. The code is much shorter now and we can add new types with ease. The next stage will be to remove weightedDungeonGetList, if possible, so that we don't have to construct a list with duplicates just to have weights. The loop that repeatedly inserted dungeons into that list has been removed anyway, but it shouldn't affect anything since custom dungeon integration was broken and weights were being ignored.
2013-06-15 17:21:49 +02:00
//Add this custom dungeon to the list corresponding to its type
Fixed Bugs in DungeonHelper 1. Added converting dungeon type names to lowercase before adding them to dungeonTypeMapping (a HashMap that associates dungeon type strings with their lists). Keeping the original casing was causing a NullPointerException when the HashMap returned null and we expected to receive a non-null list. 2. Added code to strip out the file extension of a schematic in validateSchematicName(). The extension was getting dragged along with the dungeon's weight, which would cause parsing to fail and the name was considered invalid. This means that none of the custom dungeons were being registered for generation since the system saw them as badly tagged. They also wouldn't generate Monoliths even if tagged as closed because we would ignore the tags. 3. Changed a comparison for the "open" tag to be case insensitive. 4. Minor changes
2013-06-22 20:27:59 +02:00
DungeonGenerator generator = new DungeonGenerator(weight, path, isOpen);
Overhauling DungeonHelper I changed the name filter for schematic names from CommandEndDungeonCreation to DungeonHelper, and renamed it to NamePattern. I also rewrote most of registerCustomDungeon() to be much more concise. The changes are incomplete but I'm making an intermediate commit. The aim is to change DungeonHelper into a proper singleton and to eliminate the clunky sections that manually map dungeon categories to their corresponding lists. Instead, I'll use data structures to implement that far more efficiently.
2013-06-15 16:25:50 +02:00
Improved DungeonHelper.registerCustomDungeon() Changed the function to use a Hashtable mapping dungeon types to their respective lists so that it wouldn't be necessary to hardcode a condition for each type. The code is much shorter now and we can add new types with ease. The next stage will be to remove weightedDungeonGetList, if possible, so that we don't have to construct a list with duplicates just to have weights. The loop that repeatedly inserted dungeons into that list has been removed anyway, but it shouldn't affect anything since custom dungeon integration was broken and weights were being ignored.
2013-06-15 17:21:49 +02:00
dungeonTypeMapping.get(dungeonType).add(generator);
registeredDungeons.add(generator);
Fixed duplicate custom dungeon listing Removed a line in CommandEndDungeonCreation that inserted a new dungeon directly into DungeonHelper.customDungeons. This had a chance of causing a duplicate listing. registerCustomDungeon() was already being invoked before and if reading tags from the file name failed, the dungeon would get added twice. This could explain some of the buggy dungeon listing that would appear during testing.
2013-06-15 17:30:05 +02:00
customDungeons.add(generator);
Overhauling DungeonHelper I changed the name filter for schematic names from CommandEndDungeonCreation to DungeonHelper, and renamed it to NamePattern. I also rewrote most of registerCustomDungeon() to be much more concise. The changes are incomplete but I'm making an intermediate commit. The aim is to change DungeonHelper into a proper singleton and to eliminate the clunky sections that manually map dungeon categories to their corresponding lists. Instead, I'll use data structures to implement that far more efficiently.
2013-06-15 16:25:50 +02:00
System.out.println("Imported " + name);
}
else
{
System.out.println("Could not parse dungeon filename, not adding dungeon to generation lists");
Improved DungeonHelper.registerCustomDungeon() Changed the function to use a Hashtable mapping dungeon types to their respective lists so that it wouldn't be necessary to hardcode a condition for each type. The code is much shorter now and we can add new types with ease. The next stage will be to remove weightedDungeonGetList, if possible, so that we don't have to construct a list with duplicates just to have weights. The loop that repeatedly inserted dungeons into that list has been removed anyway, but it shouldn't affect anything since custom dungeon integration was broken and weights were being ignored.
2013-06-15 17:21:49 +02:00
customDungeons.add(new DungeonGenerator(DEFAULT_DUNGEON_WEIGHT, path, true));
Overhauling DungeonHelper I changed the name filter for schematic names from CommandEndDungeonCreation to DungeonHelper, and renamed it to NamePattern. I also rewrote most of registerCustomDungeon() to be much more concise. The changes are incomplete but I'm making an intermediate commit. The aim is to change DungeonHelper into a proper singleton and to eliminate the clunky sections that manually map dungeon categories to their corresponding lists. Instead, I'll use data structures to implement that far more efficiently.
2013-06-15 16:25:50 +02:00
System.out.println("Imported " + name);
finished update, starting testing builds
2013-06-10 23:03:52 +02:00
}
}
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 14:07:33 +02:00
catch(Exception e)
{
e.printStackTrace();
Overhauling DungeonHelper I changed the name filter for schematic names from CommandEndDungeonCreation to DungeonHelper, and renamed it to NamePattern. I also rewrote most of registerCustomDungeon() to be much more concise. The changes are incomplete but I'm making an intermediate commit. The aim is to change DungeonHelper into a proper singleton and to eliminate the clunky sections that manually map dungeon categories to their corresponding lists. Instead, I'll use data structures to implement that far more efficiently.
2013-06-15 16:25:50 +02:00
System.out.println("Failed to import " + name);
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 14:07:33 +02:00
}
finished update, starting testing builds
2013-06-10 23:03:52 +02:00
}
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 14:07:33 +02:00
Fixed Tutorial Listing Bug and Improved Listing Fixed the bug that caused the dungeon creation tutorial to be listed as a schematic. We were listing all files in the custom schematic directory as a schematic, even though that file wasn't. I added filtering so that we only look at files that end with ".schematic". Also improved dungeon listing by sorting the name list in alphabetical order. That makes the list much easier to read through.
2013-06-17 12:31:53 +02:00
public void importCustomDungeons(String path)
finished update, starting testing builds
2013-06-10 23:03:52 +02:00
{
Fixed Tutorial Listing Bug and Improved Listing Fixed the bug that caused the dungeon creation tutorial to be listed as a schematic. We were listing all files in the custom schematic directory as a schematic, even though that file wasn't. I added filtering so that we only look at files that end with ".schematic". Also improved dungeon listing by sorting the name list in alphabetical order. That makes the list much easier to read through.
2013-06-17 12:31:53 +02:00
File directory = new File(path);
File[] schematicNames = directory.listFiles();
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 14:07:33 +02:00
Fixed Tutorial Listing Bug and Improved Listing Fixed the bug that caused the dungeon creation tutorial to be listed as a schematic. We were listing all files in the custom schematic directory as a schematic, even though that file wasn't. I added filtering so that we only look at files that end with ".schematic". Also improved dungeon listing by sorting the name list in alphabetical order. That makes the list much easier to read through.
2013-06-17 12:31:53 +02:00
if (schematicNames != null)
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 14:07:33 +02:00
{
Fixed Tutorial Listing Bug and Improved Listing Fixed the bug that caused the dungeon creation tutorial to be listed as a schematic. We were listing all files in the custom schematic directory as a schematic, even though that file wasn't. I added filtering so that we only look at files that end with ".schematic". Also improved dungeon listing by sorting the name list in alphabetical order. That makes the list much easier to read through.
2013-06-17 12:31:53 +02:00
for (File schematicFile: schematicNames)
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 14:07:33 +02:00
{
Fixed Tutorial Listing Bug and Improved Listing Fixed the bug that caused the dungeon creation tutorial to be listed as a schematic. We were listing all files in the custom schematic directory as a schematic, even though that file wasn't. I added filtering so that we only look at files that end with ".schematic". Also improved dungeon listing by sorting the name list in alphabetical order. That makes the list much easier to read through.
2013-06-17 12:31:53 +02:00
if (schematicFile.getName().endsWith(SCHEMATIC_FILE_EXTENSION))
{
registerCustomDungeon(schematicFile);
}
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 14:07:33 +02:00
}
}
finished update, starting testing builds
2013-06-10 23:03:52 +02:00
}
public void registerBaseDungeons()
{
Optimized Weighted Random Dungeon Selection Optimized the selection of random dungeons with weights applied. We now have a class called WeightedContainer for taping into Minecraft's weighted selection code without having to extend the WeightedRandomItem class. Using that, we no longer need to keep a list with duplicate dungeons to achieve weighted selection, so I removed that variable.
2013-06-18 04:26:39 +02:00
hubs.add(new DungeonGenerator(2 * DEFAULT_DUNGEON_WEIGHT, "/schematics/4WayBasicHall.schematic", false));
hubs.add(new DungeonGenerator(2 * DEFAULT_DUNGEON_WEIGHT, "/schematics/4WayHallExit.schematic", false));
hubs.add(new DungeonGenerator(DEFAULT_DUNGEON_WEIGHT, "/schematics/doorTotemRuins.schematic", true));
hubs.add(new DungeonGenerator(DEFAULT_DUNGEON_WEIGHT, "/schematics/hallwayTrapRooms1.schematic", false));
hubs.add(new DungeonGenerator(DEFAULT_DUNGEON_WEIGHT, "/schematics/longDoorHallway.schematic", false));
hubs.add(new DungeonGenerator(DEFAULT_DUNGEON_WEIGHT, "/schematics/smallRotundaWithExit.schematic", false));
hubs.add(new DungeonGenerator(DEFAULT_DUNGEON_WEIGHT, "/schematics/fortRuins.schematic", true));
Added New Dungeons Added 12 new dungeons to the mod. Integrated them to registerBaseDungeons() so that they should generate like all the other base dungeons.
2013-07-17 07:45:41 +02:00
hubs.add(new DungeonGenerator(10, "/schematics/Hub_SK-Claustrophobia_Open_10.schematic", true));
hubs.add(new DungeonGenerator(50, "/schematics/Hub_SK-HeartOfDisorder_Open_50.schematic", true));
Optimized Weighted Random Dungeon Selection Optimized the selection of random dungeons with weights applied. We now have a class called WeightedContainer for taping into Minecraft's weighted selection code without having to extend the WeightedRandomItem class. Using that, we no longer need to keep a list with duplicate dungeons to achieve weighted selection, so I removed that variable.
2013-06-18 04:26:39 +02:00
simpleHalls.add(new DungeonGenerator(DEFAULT_DUNGEON_WEIGHT, "/schematics/collapsedSingleTunnel1.schematic", false));
simpleHalls.add(new DungeonGenerator(DEFAULT_DUNGEON_WEIGHT, "/schematics/singleStraightHall1.schematic", false));
simpleHalls.add(new DungeonGenerator(DEFAULT_DUNGEON_WEIGHT, "/schematics/smallBranchWithExit.schematic", false));
simpleHalls.add(new DungeonGenerator(DEFAULT_DUNGEON_WEIGHT, "/schematics/smallSimpleLeft.schematic", false));
simpleHalls.add(new DungeonGenerator(DEFAULT_DUNGEON_WEIGHT, "/schematics/smallSimpleRight.schematic", false));
simpleHalls.add(new DungeonGenerator(DEFAULT_DUNGEON_WEIGHT, "/schematics/simpleStairsUp.schematic", false));
simpleHalls.add(new DungeonGenerator(DEFAULT_DUNGEON_WEIGHT, "/schematics/simpleStairsDown.schematic", false));
simpleHalls.add(new DungeonGenerator(DEFAULT_DUNGEON_WEIGHT, "/schematics/simpleSmallT1.schematic", false));
Added New Dungeons Added 12 new dungeons to the mod. Integrated them to registerBaseDungeons() so that they should generate like all the other base dungeons.
2013-07-17 07:45:41 +02:00
simpleHalls.add(new DungeonGenerator(50, "/schematics/SimpleHall_SK-LeftDownStairs_Open_50.schematic", true));
simpleHalls.add(new DungeonGenerator(50, "/schematics/SimpleHall_SK-LeftUpPath_Open_50.schematic", true));
simpleHalls.add(new DungeonGenerator(50, "/schematics/SimpleHall_SK-RightDownStairs_Open_50.schematic", true));
simpleHalls.add(new DungeonGenerator(50, "/schematics/SimpleHall_SK-RightUpPath_Open_50.schematic", true));
simpleHalls.add(new DungeonGenerator(DEFAULT_DUNGEON_WEIGHT, "/schematics/SimpleHall_SK-SpiralHallway_Open_100.schematic", true));
Added dungeons and fixed monolith placement bug
2013-07-18 07:20:12 +02:00
simpleHalls.add(new DungeonGenerator(DEFAULT_DUNGEON_WEIGHT, "/schematics/complexHall_largeBrokenHall_closed_100.schematic", false));
Added New Dungeons Added 12 new dungeons to the mod. Integrated them to registerBaseDungeons() so that they should generate like all the other base dungeons.
2013-07-17 07:45:41 +02:00
Optimized Weighted Random Dungeon Selection Optimized the selection of random dungeons with weights applied. We now have a class called WeightedContainer for taping into Minecraft's weighted selection code without having to extend the WeightedRandomItem class. Using that, we no longer need to keep a list with duplicate dungeons to achieve weighted selection, so I removed that variable.
2013-06-18 04:26:39 +02:00
complexHalls.add(new DungeonGenerator(DEFAULT_DUNGEON_WEIGHT, "/schematics/tntPuzzleTrap.schematic", false));
complexHalls.add(new DungeonGenerator(DEFAULT_DUNGEON_WEIGHT, "/schematics/brokenPillarsO.schematic", true));
complexHalls.add(new DungeonGenerator(DEFAULT_DUNGEON_WEIGHT, "/schematics/buggyTopEntry1.schematic", true));
complexHalls.add(new DungeonGenerator(DEFAULT_DUNGEON_WEIGHT, "/schematics/exitRuinsWithHiddenDoor.schematic", true));
complexHalls.add(new DungeonGenerator(DEFAULT_DUNGEON_WEIGHT, "/schematics/hallwayHiddenTreasure.schematic", false));
complexHalls.add(new DungeonGenerator(DEFAULT_DUNGEON_WEIGHT, "/schematics/mediumPillarStairs.schematic", true));
complexHalls.add(new DungeonGenerator(DEFAULT_DUNGEON_WEIGHT, "/schematics/ruinsO.schematic", true));
complexHalls.add(new DungeonGenerator(DEFAULT_DUNGEON_WEIGHT, "/schematics/pitStairs.schematic", true));
Added New Dungeons Added 12 new dungeons to the mod. Integrated them to registerBaseDungeons() so that they should generate like all the other base dungeons.
2013-07-17 07:45:41 +02:00
complexHalls.add(new DungeonGenerator(DEFAULT_DUNGEON_WEIGHT, "/schematics/ComplexHall_SK-HiddenStairs_Open_100.schematic", true));
complexHalls.add(new DungeonGenerator(10, "/schematics/ComplexHall_SK-LostGarden_Open_10.schematic", true));
Optimized Weighted Random Dungeon Selection Optimized the selection of random dungeons with weights applied. We now have a class called WeightedContainer for taping into Minecraft's weighted selection code without having to extend the WeightedRandomItem class. Using that, we no longer need to keep a list with duplicate dungeons to achieve weighted selection, so I removed that variable.
2013-06-18 04:26:39 +02:00
deadEnds.add(new DungeonGenerator(DEFAULT_DUNGEON_WEIGHT, "/schematics/azersDungeonO.schematic", false));
deadEnds.add(new DungeonGenerator(DEFAULT_DUNGEON_WEIGHT, "/schematics/diamondTowerTemple1.schematic", true));
Flipped east/west rotation
2013-06-27 07:03:09 +02:00
deadEnds.add(new DungeonGenerator(DEFAULT_DUNGEON_WEIGHT, "/schematics/fallingTrapO.schematic", true));
Optimized Weighted Random Dungeon Selection Optimized the selection of random dungeons with weights applied. We now have a class called WeightedContainer for taping into Minecraft's weighted selection code without having to extend the WeightedRandomItem class. Using that, we no longer need to keep a list with duplicate dungeons to achieve weighted selection, so I removed that variable.
2013-06-18 04:26:39 +02:00
deadEnds.add(new DungeonGenerator(DEFAULT_DUNGEON_WEIGHT, "/schematics/hiddenStaircaseO.schematic", true));
deadEnds.add(new DungeonGenerator(DEFAULT_DUNGEON_WEIGHT, "/schematics/lavaTrapO.schematic", true));
deadEnds.add(new DungeonGenerator(DEFAULT_DUNGEON_WEIGHT, "/schematics/randomTree.schematic", true));
deadEnds.add(new DungeonGenerator(DEFAULT_DUNGEON_WEIGHT, "/schematics/smallHiddenTowerO.schematic", true));
deadEnds.add(new DungeonGenerator(DEFAULT_DUNGEON_WEIGHT, "/schematics/smallSilverfishRoom.schematic", false));
deadEnds.add(new DungeonGenerator(DEFAULT_DUNGEON_WEIGHT, "/schematics/tntTrapO.schematic", true));
deadEnds.add(new DungeonGenerator(DEFAULT_DUNGEON_WEIGHT, "/schematics/smallDesert.schematic", true));
deadEnds.add(new DungeonGenerator(DEFAULT_DUNGEON_WEIGHT, "/schematics/smallPond.schematic", true));
Added New Dungeons Added 12 new dungeons to the mod. Integrated them to registerBaseDungeons() so that they should generate like all the other base dungeons.
2013-07-17 07:45:41 +02:00
deadEnds.add(new DungeonGenerator(DEFAULT_DUNGEON_WEIGHT, "/schematics/DeadEnd_SK-FarAwayInTheDark_Open_100.schematic", true));
deadEnds.add(new DungeonGenerator(50, "/schematics/DeadEnd_SK-UnstableDesert_Open_50.schematic", true));
Optimized Weighted Random Dungeon Selection Optimized the selection of random dungeons with weights applied. We now have a class called WeightedContainer for taping into Minecraft's weighted selection code without having to extend the WeightedRandomItem class. Using that, we no longer need to keep a list with duplicate dungeons to achieve weighted selection, so I removed that variable.
2013-06-18 04:26:39 +02:00
pistonTraps.add(new DungeonGenerator(2 * DEFAULT_DUNGEON_WEIGHT, "/schematics/hallwayPitFallTrap.schematic", false));
pistonTraps.add(new DungeonGenerator(2 * DEFAULT_DUNGEON_WEIGHT, "/schematics/pistonFloorHall.schematic", false));
pistonTraps.add(new DungeonGenerator(2 * DEFAULT_DUNGEON_WEIGHT, "/schematics/wallFallcomboPistonHall.schematic", false));
pistonTraps.add(new DungeonGenerator(DEFAULT_DUNGEON_WEIGHT, "/schematics/fakeTNTTrap.schematic", false));
Chnaged dungeon
2013-07-18 20:30:21 +02:00
pistonTraps.add(new DungeonGenerator(DEFAULT_DUNGEON_WEIGHT, "/schematics/pistonFallRuins.schematic", true));
Optimized Weighted Random Dungeon Selection Optimized the selection of random dungeons with weights applied. We now have a class called WeightedContainer for taping into Minecraft's weighted selection code without having to extend the WeightedRandomItem class. Using that, we no longer need to keep a list with duplicate dungeons to achieve weighted selection, so I removed that variable.
2013-06-18 04:26:39 +02:00
pistonTraps.add(new DungeonGenerator(DEFAULT_DUNGEON_WEIGHT, "/schematics/pistonSmasherHall.schematic", false));
pistonTraps.add(new DungeonGenerator(DEFAULT_DUNGEON_WEIGHT, "/schematics/simpleDropHall.schematic", false));
pistonTraps.add(new DungeonGenerator(DEFAULT_DUNGEON_WEIGHT, "/schematics/fallingTNThall.schematic", false));
pistonTraps.add(new DungeonGenerator(DEFAULT_DUNGEON_WEIGHT, "/schematics/lavaPyramid.schematic", true));
Added New Dungeons Added 12 new dungeons to the mod. Integrated them to registerBaseDungeons() so that they should generate like all the other base dungeons.
2013-07-17 07:45:41 +02:00
pistonTraps.add(new DungeonGenerator(10, "/schematics/Trap_SK-RestlessCorridor_Open_10.schematic", true));
Added dungeons and fixed monolith placement bug
2013-07-18 07:20:12 +02:00
pistonTraps.add(new DungeonGenerator(DEFAULT_DUNGEON_WEIGHT, "/schematics/trap_pistonFloorPlatform_closed_100.schematic", false));
pistonTraps.add(new DungeonGenerator(DEFAULT_DUNGEON_WEIGHT/2, "/schematics/trap_pistonFloorPlatform2_closed_100.schematic", false));
Optimized Weighted Random Dungeon Selection Optimized the selection of random dungeons with weights applied. We now have a class called WeightedContainer for taping into Minecraft's weighted selection code without having to extend the WeightedRandomItem class. Using that, we no longer need to keep a list with duplicate dungeons to achieve weighted selection, so I removed that variable.
2013-06-18 04:26:39 +02:00
mazes.add(new DungeonGenerator(DEFAULT_DUNGEON_WEIGHT, "/schematics/smallMaze1.schematic", false));
mazes.add(new DungeonGenerator(DEFAULT_DUNGEON_WEIGHT, "/schematics/smallMultilevelMaze.schematic", false));
exits.add(new DungeonGenerator(2 * DEFAULT_DUNGEON_WEIGHT, "/schematics/lockingExitHall.schematic", false));
exits.add(new DungeonGenerator(DEFAULT_DUNGEON_WEIGHT, "/schematics/exitCube.schematic", true));
exits.add(new DungeonGenerator(DEFAULT_DUNGEON_WEIGHT, "/schematics/smallExitPrison.schematic", true));
registeredDungeons.addAll(simpleHalls);
registeredDungeons.addAll(exits);
registeredDungeons.addAll(pistonTraps);
registeredDungeons.addAll(mazes);
registeredDungeons.addAll(deadEnds);
registeredDungeons.addAll(complexHalls);
registeredDungeons.addAll(hubs);
finished update, starting testing builds
2013-06-10 23:03:52 +02:00
}
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 14:07:33 +02:00
Minor Change Fixed DungeonHelper.exportDungeon() to have proper name. I'd changed the name before to track where the function was being used in our code.
2013-07-15 07:58:01 +02:00
public boolean exportDungeon(World world, int centerX, int centerY, int centerZ, String exportPath)
finished update, starting testing builds
2013-06-10 23:03:52 +02:00
{
Added Support for Exporting Tile Entities Added support for exporting tile entities as part of custom dungeons. I've produced a schematic as a test that shows items are exported properly and they're recognized in MCedit. I still need to add support for loading tile entities in imported schematics.
2013-07-15 10:15:58 +02:00
//Write schematic data to a file
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 14:07:33 +02:00
try
{
Created Schematic Class Separated part of the dungeon-exporting logic into a new class: Schematic. Also created a few classes to implement important operations. Some parts of the original exporting logic are missing now, such as mapping certain blocks to standard IDs. That will be reimplemented in the future. Importing schematics is not supported yet. I need to test what's done so far.
2013-07-27 12:52:30 +02:00
short size = (short) 2 * MAX_EXPORT_RADIUS + 1;
Created DungeonSchematic Class Created DungeonSchematic, a class that extends Schematic and adds DD-specific functionality such as methods for filtering the schematic's block before importing and exporting. Testing confirms that DungeonSchematic works well so far, although it still lacks critical features. Made some minor changes to Schematic and copied SchematicLoader.setBlockDirectly(). I realized during testing that setting blocks without using that function could cause problems. First, it's possible that the blocks would not be placed if chunks weren't created. Second, there are issues with blocks updating if we use World to set them, even if block updates are disabled. That causes some torches to break and other weird problems. Added classes to support block filtering operations applied to Schematic. These are used to implement ID standardization and removing mod blocks when importing.
2013-07-29 15:58:47 +02:00
DungeonSchematic dungeon = DungeonSchematic.copyFromWorld(world,
Created Schematic Class Separated part of the dungeon-exporting logic into a new class: Schematic. Also created a few classes to implement important operations. Some parts of the original exporting logic are missing now, such as mapping certain blocks to standard IDs. That will be reimplemented in the future. Importing schematics is not supported yet. I need to test what's done so far.
2013-07-27 12:52:30 +02:00
centerX - MAX_EXPORT_RADIUS, centerY - MAX_EXPORT_RADIUS, centerZ - MAX_EXPORT_RADIUS, size, size, size, true);
Improved and Integrated DungeonSchematic Improved DungeonSchematic to the point that it can replace SchematicLoader as our method of loading dungeons. Some of the code was copied over rather than refactored to save time. It's been subdivided so make it much more readable. Also, we can reimplement portions of it as WorldOperations later on further remove redudancy. Testing shows that there is one problem left to fix: door blocks are not being set up correctly at the moment. Rifts are being set up properly and attaching doors to rifts will show that dungeons continue to generate fine. Added classes to support DungeonSchematic and its additional filtering logic on import and export. SpecialBlockFinder handles listing the entrance, other doors in the dungeon, and end portal frames. FillContainersOperation is a WorldOperation that fills chests and dispensers. BlockRotator is a temporary class to hold transformMetadata() and transformPoint() until we rewrite that code later. Stripped out most of the code from SchematicLoader to ensure it's no longer used. The only remaining function sets up dungeon pockets. We can phase it out in a later version so as not to delay our release. Removed references to SchematicLoader in mod_pocketDim since it no longer needs to be instantiated.
2013-07-30 19:58:14 +02:00
dungeon.applyExportFilters(properties);
Created DungeonSchematic Class Created DungeonSchematic, a class that extends Schematic and adds DD-specific functionality such as methods for filtering the schematic's block before importing and exporting. Testing confirms that DungeonSchematic works well so far, although it still lacks critical features. Made some minor changes to Schematic and copied SchematicLoader.setBlockDirectly(). I realized during testing that setting blocks without using that function could cause problems. First, it's possible that the blocks would not be placed if chunks weren't created. Second, there are issues with blocks updating if we use World to set them, even if block updates are disabled. That causes some torches to break and other weird problems. Added classes to support block filtering operations applied to Schematic. These are used to implement ID standardization and removing mod blocks when importing.
2013-07-29 15:58:47 +02:00
dungeon.writeToFile(exportPath);
Improved DungeonHelper Separated exportDungeon() from registerCustomDungeon() - exporting a dungeon no longer automatically registers it. Also changed exportDungeon() so that it returns a boolean indicating success or failure, instead of an instance of DungeonGenerator that was never being used. I modified CommandEndDungeonCreation so that it can warn you if exporting the dungeon failed (if exportDungeon() returned false), and also, to register the dungeon after it's exported since it's no longer automatic.
2013-06-16 11:59:53 +02:00
return true;
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 14:07:33 +02:00
}
catch(Exception e)
{
e.printStackTrace();
Improved DungeonHelper Separated exportDungeon() from registerCustomDungeon() - exporting a dungeon no longer automatically registers it. Also changed exportDungeon() so that it returns a boolean indicating success or failure, instead of an instance of DungeonGenerator that was never being used. I modified CommandEndDungeonCreation so that it can warn you if exporting the dungeon failed (if exportDungeon() returned false), and also, to register the dungeon after it's exported since it's no longer automatic.
2013-06-16 11:59:53 +02:00
return false;
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 14:07:33 +02:00
}
finished update, starting testing builds
2013-06-10 23:03:52 +02:00
}
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 14:07:33 +02:00
Optimized Weighted Random Dungeon Selection Optimized the selection of random dungeons with weights applied. We now have a class called WeightedContainer for taping into Minecraft's weighted selection code without having to extend the WeightedRandomItem class. Using that, we no longer need to keep a list with duplicate dungeons to achieve weighted selection, so I removed that variable.
2013-06-18 04:26:39 +02:00
public void generateDungeonLink(LinkData incoming)
finished update, starting testing builds
2013-06-10 23:03:52 +02:00
{
fixed save data
2013-06-11 20:42:11 +02:00
DungeonGenerator dungeon;
Optimized Weighted Random Dungeon Selection Optimized the selection of random dungeons with weights applied. We now have a class called WeightedContainer for taping into Minecraft's weighted selection code without having to extend the WeightedRandomItem class. Using that, we no longer need to keep a list with duplicate dungeons to achieve weighted selection, so I removed that variable.
2013-06-18 04:26:39 +02:00
int depth = dimHelper.instance.getDimDepth(incoming.locDimID);
int depthWeight = rand.nextInt(depth + 2) + rand.nextInt(depth + 2) - 2;
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 14:07:33 +02:00
Added creative tab
2013-07-13 20:13:01 +02:00
Trivial Changes Made trivial changes to DungeonHelper. Just some spacing and a note to check something in the future. Need to commit to change branches.
2013-06-16 20:40:26 +02:00
int count = 10;
Optimized Weighted Random Dungeon Selection Optimized the selection of random dungeons with weights applied. We now have a class called WeightedContainer for taping into Minecraft's weighted selection code without having to extend the WeightedRandomItem class. Using that, we no longer need to keep a list with duplicate dungeons to achieve weighted selection, so I removed that variable.
2013-06-18 04:26:39 +02:00
boolean flag = true;
finished update, starting testing builds
2013-06-10 23:03:52 +02:00
try
{
Optimized Weighted Random Dungeon Selection Optimized the selection of random dungeons with weights applied. We now have a class called WeightedContainer for taping into Minecraft's weighted selection code without having to extend the WeightedRandomItem class. Using that, we no longer need to keep a list with duplicate dungeons to achieve weighted selection, so I removed that variable.
2013-06-18 04:26:39 +02:00
if (incoming.destYCoord > 15)
finished update, starting testing builds
2013-06-10 23:03:52 +02:00
{
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 14:07:33 +02:00
do
finished update, starting testing builds
2013-06-10 23:03:52 +02:00
{
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 14:07:33 +02:00
count--;
flag = true;
Optimized Weighted Random Dungeon Selection Optimized the selection of random dungeons with weights applied. We now have a class called WeightedContainer for taping into Minecraft's weighted selection code without having to extend the WeightedRandomItem class. Using that, we no longer need to keep a list with duplicate dungeons to achieve weighted selection, so I removed that variable.
2013-06-18 04:26:39 +02:00
//Select a dungeon at random, taking into account its weight
dungeon = getRandomDungeon(rand, registeredDungeons);
finished update, starting testing builds
2013-06-10 23:03:52 +02:00
Optimized Weighted Random Dungeon Selection Optimized the selection of random dungeons with weights applied. We now have a class called WeightedContainer for taping into Minecraft's weighted selection code without having to extend the WeightedRandomItem class. Using that, we no longer need to keep a list with duplicate dungeons to achieve weighted selection, so I removed that variable.
2013-06-18 04:26:39 +02:00
if (depth <= 1)
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 14:07:33 +02:00
{
if(rand.nextBoolean())
{
dungeon = complexHalls.get(rand.nextInt(complexHalls.size()));
finished update, starting testing builds
2013-06-10 23:03:52 +02:00
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 14:07:33 +02:00
}
else if(rand.nextBoolean())
finished update, starting testing builds
2013-06-10 23:03:52 +02:00
{
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 14:07:33 +02:00
dungeon = hubs.get(rand.nextInt(hubs.size()));
finished update, starting testing builds
2013-06-10 23:03:52 +02:00
}
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 14:07:33 +02:00
else if(rand.nextBoolean())
{
dungeon = hubs.get(rand.nextInt(hubs.size()));
finished update, starting testing builds
2013-06-10 23:03:52 +02:00
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 14:07:33 +02:00
}
else if(deadEnds.contains(dungeon)||exits.contains(dungeon))
{
flag=false;
}
}
Optimized Weighted Random Dungeon Selection Optimized the selection of random dungeons with weights applied. We now have a class called WeightedContainer for taping into Minecraft's weighted selection code without having to extend the WeightedRandomItem class. Using that, we no longer need to keep a list with duplicate dungeons to achieve weighted selection, so I removed that variable.
2013-06-18 04:26:39 +02:00
else if (depth <= 3 && (deadEnds.contains(dungeon) || exits.contains(dungeon) || rand.nextBoolean()))
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 14:07:33 +02:00
{
if(rand.nextBoolean())
{
dungeon = hubs.get(rand.nextInt(hubs.size()));
finished update, starting testing builds
2013-06-10 23:03:52 +02:00
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 14:07:33 +02:00
}
else if(rand.nextBoolean())
{
dungeon = mazes.get(rand.nextInt(mazes.size()));
}
else if(rand.nextBoolean())
{
dungeon = pistonTraps.get(rand.nextInt(pistonTraps.size()));
finished update, starting testing builds
2013-06-10 23:03:52 +02:00
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 14:07:33 +02:00
}
else
{
Optimized Weighted Random Dungeon Selection Optimized the selection of random dungeons with weights applied. We now have a class called WeightedContainer for taping into Minecraft's weighted selection code without having to extend the WeightedRandomItem class. Using that, we no longer need to keep a list with duplicate dungeons to achieve weighted selection, so I removed that variable.
2013-06-18 04:26:39 +02:00
flag = false;
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 14:07:33 +02:00
}
}
Optimized Weighted Random Dungeon Selection Optimized the selection of random dungeons with weights applied. We now have a class called WeightedContainer for taping into Minecraft's weighted selection code without having to extend the WeightedRandomItem class. Using that, we no longer need to keep a list with duplicate dungeons to achieve weighted selection, so I removed that variable.
2013-06-18 04:26:39 +02:00
else if (rand.nextInt(3) == 0 && !complexHalls.contains(dungeon))
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 14:07:33 +02:00
{
Optimized Weighted Random Dungeon Selection Optimized the selection of random dungeons with weights applied. We now have a class called WeightedContainer for taping into Minecraft's weighted selection code without having to extend the WeightedRandomItem class. Using that, we no longer need to keep a list with duplicate dungeons to achieve weighted selection, so I removed that variable.
2013-06-18 04:26:39 +02:00
if (rand.nextInt(3) == 0)
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 14:07:33 +02:00
{
dungeon = simpleHalls.get(rand.nextInt(simpleHalls.size()));
}
else if(rand.nextBoolean())
{
dungeon = pistonTraps.get(rand.nextInt(pistonTraps.size()));
}
Optimized Weighted Random Dungeon Selection Optimized the selection of random dungeons with weights applied. We now have a class called WeightedContainer for taping into Minecraft's weighted selection code without having to extend the WeightedRandomItem class. Using that, we no longer need to keep a list with duplicate dungeons to achieve weighted selection, so I removed that variable.
2013-06-18 04:26:39 +02:00
else if (depth < 4)
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 14:07:33 +02:00
{
dungeon = hubs.get(rand.nextInt(hubs.size()));
}
}
Optimized Weighted Random Dungeon Selection Optimized the selection of random dungeons with weights applied. We now have a class called WeightedContainer for taping into Minecraft's weighted selection code without having to extend the WeightedRandomItem class. Using that, we no longer need to keep a list with duplicate dungeons to achieve weighted selection, so I removed that variable.
2013-06-18 04:26:39 +02:00
else if (depthWeight - depthWeight / 2 > depth -4 && (deadEnds.contains(dungeon) || exits.contains(dungeon)))
finished update, starting testing builds
2013-06-10 23:03:52 +02:00
{
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 14:07:33 +02:00
if(rand.nextBoolean())
{
dungeon = simpleHalls.get(rand.nextInt(simpleHalls.size()));
}
else if(rand.nextBoolean())
{
dungeon = complexHalls.get(rand.nextInt(complexHalls.size()));
}
else if(rand.nextBoolean())
{
dungeon = pistonTraps.get(rand.nextInt(pistonTraps.size()));
}
else
{
Optimized Weighted Random Dungeon Selection Optimized the selection of random dungeons with weights applied. We now have a class called WeightedContainer for taping into Minecraft's weighted selection code without having to extend the WeightedRandomItem class. Using that, we no longer need to keep a list with duplicate dungeons to achieve weighted selection, so I removed that variable.
2013-06-18 04:26:39 +02:00
flag = false;
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 14:07:33 +02:00
}
finished update, starting testing builds
2013-06-10 23:03:52 +02:00
}
Optimized Weighted Random Dungeon Selection Optimized the selection of random dungeons with weights applied. We now have a class called WeightedContainer for taping into Minecraft's weighted selection code without having to extend the WeightedRandomItem class. Using that, we no longer need to keep a list with duplicate dungeons to achieve weighted selection, so I removed that variable.
2013-06-18 04:26:39 +02:00
else if (depthWeight > 7 && hubs.contains(dungeon))
finished update, starting testing builds
2013-06-10 23:03:52 +02:00
{
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 14:07:33 +02:00
if(rand.nextInt(12)+5<depthWeight)
{
if(rand.nextBoolean())
{
dungeon = exits.get(rand.nextInt(exits.size()));
}
else if(rand.nextBoolean())
{
dungeon = deadEnds.get(rand.nextInt(deadEnds.size()));
}
else
{
dungeon = pistonTraps.get(rand.nextInt(pistonTraps.size()));
}
}
else
{
flag = false;
}
finished update, starting testing builds
2013-06-10 23:03:52 +02:00
}
Optimized Weighted Random Dungeon Selection Optimized the selection of random dungeons with weights applied. We now have a class called WeightedContainer for taping into Minecraft's weighted selection code without having to extend the WeightedRandomItem class. Using that, we no longer need to keep a list with duplicate dungeons to achieve weighted selection, so I removed that variable.
2013-06-18 04:26:39 +02:00
else if (depth > 10 && hubs.contains(dungeon))
finished update, starting testing builds
2013-06-10 23:03:52 +02:00
{
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 14:07:33 +02:00
flag = false;
finished update, starting testing builds
2013-06-10 23:03:52 +02:00
}
Added creative tab
2013-07-13 20:13:01 +02:00
if(getDungeonDataInChain(dimHelper.dimList.get(incoming.locDimID)).contains(dungeon))
{
flag=false;
}
finished update, starting testing builds
2013-06-10 23:03:52 +02:00
}
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 14:07:33 +02:00
while (!flag && count > 0);
finished update, starting testing builds
2013-06-10 23:03:52 +02:00
}
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 14:07:33 +02:00
else
finished update, starting testing builds
2013-06-10 23:03:52 +02:00
{
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 14:07:33 +02:00
dungeon = defaultUp;
finished update, starting testing builds
2013-06-10 23:03:52 +02:00
}
}
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 14:07:33 +02:00
catch (Exception e)
finished update, starting testing builds
2013-06-10 23:03:52 +02:00
{
Trivial Changes Made trivial changes to DungeonHelper. Just some spacing and a note to check something in the future. Need to commit to change branches.
2013-06-16 20:40:26 +02:00
e.printStackTrace();
Optimized Weighted Random Dungeon Selection Optimized the selection of random dungeons with weights applied. We now have a class called WeightedContainer for taping into Minecraft's weighted selection code without having to extend the WeightedRandomItem class. Using that, we no longer need to keep a list with duplicate dungeons to achieve weighted selection, so I removed that variable.
2013-06-18 04:26:39 +02:00
if (registeredDungeons.size() > 0)
finished update, starting testing builds
2013-06-10 23:03:52 +02:00
{
Optimized Weighted Random Dungeon Selection Optimized the selection of random dungeons with weights applied. We now have a class called WeightedContainer for taping into Minecraft's weighted selection code without having to extend the WeightedRandomItem class. Using that, we no longer need to keep a list with duplicate dungeons to achieve weighted selection, so I removed that variable.
2013-06-18 04:26:39 +02:00
//Select a random dungeon
dungeon = getRandomDungeon(rand, registeredDungeons);
finished update, starting testing builds
2013-06-10 23:03:52 +02:00
}
else
{
return;
}
}
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 14:07:33 +02:00
dimHelper.dimList.get(incoming.destDimID).dungeonGenerator = dungeon;
finished update, starting testing builds
2013-06-10 23:03:52 +02:00
}
Fixed Dungeon Listing and Formatting Bugs Added a workaround so that the dungeon list produced by CommandAddDungeonRift does not have repeated names. Also cleaned up the code a bit - it's a mess in there. Part of the rewrite eliminated the bug that caused some dungeon names to be preceded by a backslash (or slash). I've noticed a different bug now - the dungeon tutorial file is being included in the list of dungeons. I'll be fixing that in the next commit.
2013-06-17 12:18:15 +02:00
public Collection<String> getDungeonNames() {
Fixed Tutorial Listing Bug and Improved Listing Fixed the bug that caused the dungeon creation tutorial to be listed as a schematic. We were listing all files in the custom schematic directory as a schematic, even though that file wasn't. I added filtering so that we only look at files that end with ".schematic". Also improved dungeon listing by sorting the name list in alphabetical order. That makes the list much easier to read through.
2013-06-17 12:31:53 +02:00
Fixed Dungeon Listing and Formatting Bugs Added a workaround so that the dungeon list produced by CommandAddDungeonRift does not have repeated names. Also cleaned up the code a bit - it's a mess in there. Part of the rewrite eliminated the bug that caused some dungeon names to be preceded by a backslash (or slash). I've noticed a different bug now - the dungeon tutorial file is being included in the list of dungeons. I'll be fixing that in the next commit.
2013-06-17 12:18:15 +02:00
//Use a HashSet to guarantee that all dungeon names will be distinct.
//This shouldn't be necessary if we keep proper lists without repetitions,
//but it's a fool-proof workaround.
HashSet<String> dungeonNames = new HashSet<String>();
dungeonNames.addAll( parseDungeonNames(registeredDungeons) );
dungeonNames.addAll( parseDungeonNames(customDungeons) );
Fixed Tutorial Listing Bug and Improved Listing Fixed the bug that caused the dungeon creation tutorial to be listed as a schematic. We were listing all files in the custom schematic directory as a schematic, even though that file wasn't. I added filtering so that we only look at files that end with ".schematic". Also improved dungeon listing by sorting the name list in alphabetical order. That makes the list much easier to read through.
2013-06-17 12:31:53 +02:00
//Sort dungeon names alphabetically
ArrayList<String> sortedNames = new ArrayList<String>(dungeonNames);
Collections.sort(sortedNames);
return sortedNames;
Fixed Dungeon Listing and Formatting Bugs Added a workaround so that the dungeon list produced by CommandAddDungeonRift does not have repeated names. Also cleaned up the code a bit - it's a mess in there. Part of the rewrite eliminated the bug that caused some dungeon names to be preceded by a backslash (or slash). I've noticed a different bug now - the dungeon tutorial file is being included in the list of dungeons. I'll be fixing that in the next commit.
2013-06-17 12:18:15 +02:00
}
private static ArrayList<String> parseDungeonNames(ArrayList<DungeonGenerator> dungeons)
{
String name;
File schematic;
ArrayList<String> names = new ArrayList<String>(dungeons.size());
for (DungeonGenerator dungeon : dungeons)
{
Added a comment Just added a comment in DungeonHelper.
2013-06-17 12:34:35 +02:00
//Retrieve the file name and strip off the file extension
Fixed Dungeon Listing and Formatting Bugs Added a workaround so that the dungeon list produced by CommandAddDungeonRift does not have repeated names. Also cleaned up the code a bit - it's a mess in there. Part of the rewrite eliminated the bug that caused some dungeon names to be preceded by a backslash (or slash). I've noticed a different bug now - the dungeon tutorial file is being included in the list of dungeons. I'll be fixing that in the next commit.
2013-06-17 12:18:15 +02:00
schematic = new File(dungeon.schematicPath);
name = schematic.getName();
name = name.substring(0, name.length() - SCHEMATIC_FILE_EXTENSION.length());
names.add(name);
}
return names;
}
Optimized Weighted Random Dungeon Selection Optimized the selection of random dungeons with weights applied. We now have a class called WeightedContainer for taping into Minecraft's weighted selection code without having to extend the WeightedRandomItem class. Using that, we no longer need to keep a list with duplicate dungeons to achieve weighted selection, so I removed that variable.
2013-06-18 04:26:39 +02:00
private static DungeonGenerator getRandomDungeon(Random random, Collection<DungeonGenerator> dungeons)
{
//Use Minecraft's WeightedRandom to select our dungeon. =D
ArrayList<WeightedContainer<DungeonGenerator>> weights =
new ArrayList<WeightedContainer<DungeonGenerator>>(dungeons.size());
for (DungeonGenerator dungeon : dungeons)
{
weights.add(new WeightedContainer<DungeonGenerator>(dungeon, dungeon.weight));
}
@SuppressWarnings("unchecked")
WeightedContainer<DungeonGenerator> resultContainer = (WeightedContainer<DungeonGenerator>) WeightedRandom.getRandomItem(random, weights);
return (resultContainer != null) ? resultContainer.getData() : null;
}
Added creative tab
2013-07-13 20:13:01 +02:00
public static ArrayList<DungeonGenerator> getDungeonDataInChain(DimData dimData)
Added method to return dungeons already generated.
2013-07-13 05:40:21 +02:00
{
DimData startingDim = dimHelper.dimList.get(dimHelper.instance.getLinkDataFromCoords(dimData.exitDimLink.destXCoord, dimData.exitDimLink.destYCoord, dimData.exitDimLink.destZCoord, dimData.exitDimLink.destDimID).destDimID);
Added creative tab
2013-07-13 20:13:01 +02:00
return getDungeonDataBelow(startingDim);
Added method to return dungeons already generated.
2013-07-13 05:40:21 +02:00
}
Added creative tab
2013-07-13 20:13:01 +02:00
private static ArrayList<DungeonGenerator> getDungeonDataBelow(DimData dimData)
Added method to return dungeons already generated.
2013-07-13 05:40:21 +02:00
{
ArrayList<DungeonGenerator> dungeonData = new ArrayList<DungeonGenerator>();
if(dimData.dungeonGenerator!=null)
{
dungeonData.add(dimData.dungeonGenerator);
for(LinkData link : dimData.getLinksInDim())
{
if(dimHelper.dimList.containsKey(link.destDimID))
{
if(dimHelper.dimList.get(link.destDimID).dungeonGenerator!=null&&dimHelper.instance.getDimDepth(link.destDimID)==dimData.depth+1)
{
Added creative tab
2013-07-13 20:13:01 +02:00
for(DungeonGenerator dungeonGen :getDungeonDataBelow(dimHelper.dimList.get(link.destDimID)) )
Added method to return dungeons already generated.
2013-07-13 05:40:21 +02:00
{
if(!dungeonData.contains(dungeonGen))
{
dungeonData.add(dungeonGen);
}
}
}
}
}
}
return dungeonData;
}
finished update, starting testing builds
2013-06-10 23:03:52 +02:00
}
Reference in a new issue Copy permalink