Major Improvements to DungeonHelper, Minor Bug Fixes and Tweaks #25

Merged
SenseiKiwi merged 29 commits from master into master 2013-06-16 19:30:26 +00:00
3 changed files with 8 additions and 8 deletions
Showing only changes of commit 8dce8c1c26 - Show all commits

View File

@@ -225,12 +225,12 @@ public class DDProperties
config.save();
}
public static DDProperties create(File configFile)
public static DDProperties initialize(File configFile)
{
if (instance == null)
instance = new DDProperties(configFile);
else
throw new IllegalStateException("Cannot create DDProperties twice");
throw new IllegalStateException("Cannot initialize DDProperties twice");
return instance;
}
@@ -241,7 +241,7 @@ public class DDProperties
{
//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...
throw new IllegalStateException("Instance of DDProperties requested before properties have been loaded");
throw new IllegalStateException("Instance of DDProperties requested before initialization");
}
return instance;
}

View File

@@ -115,7 +115,7 @@ public class DungeonHelper
registerBaseDungeons();
}
public static DungeonHelper create()
public static DungeonHelper initialize()
{
if (instance == null)
{
@@ -123,7 +123,7 @@ public class DungeonHelper
}
else
{
throw new IllegalStateException("Cannot create DungeonHelper twice");
throw new IllegalStateException("Cannot initialize DungeonHelper twice");
}
return instance;
@@ -135,7 +135,7 @@ public class DungeonHelper
{
//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...
throw new IllegalStateException("Instance of DungeonHelper requested before creation");
throw new IllegalStateException("Instance of DungeonHelper requested before initialization");
}
return instance;
}

View File

@@ -145,7 +145,7 @@ public class mod_pocketDim
public void PreInit(FMLPreInitializationEvent event)
{
//This should be the FIRST thing that gets done.
properties = DDProperties.create(event.getSuggestedConfigurationFile());
properties = DDProperties.initialize(event.getSuggestedConfigurationFile());
//Now do other stuff
MinecraftForge.EVENT_BUS.register(new EventHookContainer());
@@ -373,7 +373,7 @@ public class mod_pocketDim
mod_pocketDim.blocksImmuneToRift.add(Block.blockLapis.blockID);
mod_pocketDim.blocksImmuneToRift.add(Block.bedrock.blockID);
DungeonHelper.create();
DungeonHelper.initialize();
proxy.loadTextures();
proxy.registerRenderers();