Anvilcraft/DimDoors
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed CommandCreateDungeonRift

Browse source 
Forgot to fix a reference to DungeonHelper in CommandCreateDungeonRift
during the last commit. Made some further improvements to DungeonHelper
to avoid exposing internal variables.
This commit is contained in:
SenseiKiwi 2013-08-01 00:05:08 -04:00
parent 5ddf2c636f
commit a174ad4b29
2 changed files with 26 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
StevenDimDoors/mod_pocketDim/commands/CommandCreateDungeonRift.java
View file

@ -69,10 +69,10 @@ public class CommandCreateDungeonRift extends DDCommandBase
} }
else else
{ {
result = findDungeonByPartialName(command[0], dungeonHelper.registeredDungeons); result = findDungeonByPartialName(command[0], dungeonHelper.getRegisteredDungeons());
if (result == null) if (result == null)
{ {
result = findDungeonByPartialName(command[0], dungeonHelper.customDungeons); result = findDungeonByPartialName(command[0], dungeonHelper.getUntaggedDungeons());
} }
//Check if we found any matches //Check if we found any matches
if (result != null) if (result != null)

37
StevenDimDoors/mod_pocketDim/helpers/DungeonHelper.java
View file

@ -6,6 +6,7 @@ import java.util.Collection;
import java.util.Collections; import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.List;
import java.util.Random; import java.util.Random;
import java.util.regex.Pattern; import java.util.regex.Pattern;
@ -60,8 +61,8 @@ public class DungeonHelper
private Random rand = new Random(); private Random rand = new Random();
public ArrayList<DungeonGenerator> untaggedDungeons = new ArrayList<DungeonGenerator>(); private ArrayList<DungeonGenerator> untaggedDungeons = new ArrayList<DungeonGenerator>();
public ArrayList<DungeonGenerator> registeredDungeons = new ArrayList<DungeonGenerator>(); private ArrayList<DungeonGenerator> registeredDungeons = new ArrayList<DungeonGenerator>();
private ArrayList<DungeonGenerator> simpleHalls = new ArrayList<DungeonGenerator>(); private ArrayList<DungeonGenerator> simpleHalls = new ArrayList<DungeonGenerator>();
private ArrayList<DungeonGenerator> complexHalls = new ArrayList<DungeonGenerator>(); private ArrayList<DungeonGenerator> complexHalls = new ArrayList<DungeonGenerator>();
@ -105,17 +106,6 @@ public class DungeonHelper
registerCustomDungeons(); registerCustomDungeons();
} }
private void registerCustomDungeons()
{
File file = new File(properties.CustomSchematicDirectory);
if (file.exists() || file.mkdir())
{
copyfile.copyFile("/mods/DimDoors/text/How_to_add_dungeons.txt", file.getAbsolutePath() + "/How_to_add_dungeons.txt");
}
importCustomDungeons(properties.CustomSchematicDirectory);
registerBaseDungeons();
}
public static DungeonHelper initialize() public static DungeonHelper initialize()
{ {
if (instance == null) if (instance == null)
@ -141,6 +131,27 @@ public class DungeonHelper
return instance; return instance;
} }
private void registerCustomDungeons()
{
File file = new File(properties.CustomSchematicDirectory);
if (file.exists() || file.mkdir())
{
copyfile.copyFile("/mods/DimDoors/text/How_to_add_dungeons.txt", file.getAbsolutePath() + "/How_to_add_dungeons.txt");
}
importCustomDungeons(properties.CustomSchematicDirectory);
registerBaseDungeons();
}
public List<DungeonGenerator> getRegisteredDungeons()
{
return Collections.unmodifiableList(this.registeredDungeons);
}
public List<DungeonGenerator> getUntaggedDungeons()
{
return Collections.unmodifiableList(this.untaggedDungeons);
}
public LinkData createCustomDungeonDoor(World world, int x, int y, int z) public LinkData createCustomDungeonDoor(World world, int x, int y, int z)
{ {
//Create a link above the specified position. Link to a new pocket dimension. //Create a link above the specified position. Link to a new pocket dimension.