apex/DimDoors
1
1
Fork 0
Code Issues 26 Pull Requests Actions Packages Projects Releases Wiki Activity

Various Updates #138

Merged
SenseiKiwi merged 20 commits from master into master 2014-03-06 06:23:16 +00:00
Conversation 0 Commits 20 Files Changed 30 +11 -15
2 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 8cb651030a - Show all commits

7
src/main/java/StevenDimDoors/mod_pocketDim/mod_pocketDim.java
View File

@@ -166,7 +166,6 @@ public class mod_pocketDim
EventHookContainer hooks = new EventHookContainer(properties); EventHookContainer hooks = new EventHookContainer(properties);
MinecraftForge.EVENT_BUS.register(hooks); MinecraftForge.EVENT_BUS.register(hooks);
MinecraftForge.TERRAIN_GEN_BUS.register(hooks); MinecraftForge.TERRAIN_GEN_BUS.register(hooks);
gatewayGenerator = new GatewayGenerator(properties);
} }
@EventHandler @EventHandler
@@ -181,7 +180,7 @@ public class mod_pocketDim
spawner = new CustomLimboPopulator(commonTickHandler, properties); spawner = new CustomLimboPopulator(commonTickHandler, properties);
new RiftRegenerator(commonTickHandler); //No need to store the reference new RiftRegenerator(commonTickHandler); //No need to store the reference
LimboDecay decay = new LimboDecay(commonTickHandler, properties); LimboDecay decay = new LimboDecay(commonTickHandler, properties);
this.fastRiftRegenerator = new FastRiftRegenerator(commonTickHandler); fastRiftRegenerator = new FastRiftRegenerator(commonTickHandler);
transientDoor = new TransientDoor(properties.TransientDoorID, Material.iron, properties).setHardness(1.0F) .setUnlocalizedName("transientDoor"); transientDoor = new TransientDoor(properties.TransientDoorID, Material.iron, properties).setHardness(1.0F) .setUnlocalizedName("transientDoor");
goldenDimensionalDoor = new BlockGoldDimDoor(properties.GoldenDimensionalDoorID, Material.iron, properties).setHardness(1.0F) .setUnlocalizedName("dimDoorGold"); goldenDimensionalDoor = new BlockGoldDimDoor(properties.GoldenDimensionalDoorID, Material.iron, properties).setHardness(1.0F) .setUnlocalizedName("dimDoorGold");
@@ -277,10 +276,9 @@ public class mod_pocketDim
EntityList.entityEggs.put(properties.MonolithEntityID, new EntityEggInfo(properties.MonolithEntityID, 0, 0xffffff)); EntityList.entityEggs.put(properties.MonolithEntityID, new EntityEggInfo(properties.MonolithEntityID, 0, 0xffffff));
LanguageRegistry.instance().addStringLocalization("entity.DimDoors.Obelisk.name", "Monolith"); LanguageRegistry.instance().addStringLocalization("entity.DimDoors.Obelisk.name", "Monolith");
CraftingManager.registerRecipes(properties); CraftingManager.registerRecipes(properties);
DungeonHelper.initialize(); DungeonHelper.initialize();
this.gatewayGenerator.initGateways(); gatewayGenerator = new GatewayGenerator(properties);
// Register loot chests // Register loot chests
DDLoot.registerInfo(properties); DDLoot.registerInfo(properties);
@@ -288,7 +286,6 @@ public class mod_pocketDim
proxy.registerRenderers(); proxy.registerRenderers();
} }
@EventHandler @EventHandler
public void onPostInitialization(FMLPostInitializationEvent event) public void onPostInitialization(FMLPostInitializationEvent event)
{ {

17
src/main/java/StevenDimDoors/mod_pocketDim/world/GatewayGenerator.java
View File

@@ -36,27 +36,26 @@ public class GatewayGenerator implements IWorldGenerator
private static final int NETHER_DIMENSION_ID = -1; private static final int NETHER_DIMENSION_ID = -1;
private static final int END_DIMENSION_ID = 1; private static final int END_DIMENSION_ID = 1;
private static ArrayList<BaseGateway> gateways; private ArrayList<BaseGateway> gateways;
private static BaseGateway defaultGateway; private BaseGateway defaultGateway;
private final DDProperties properties; private final DDProperties properties;
public GatewayGenerator(DDProperties properties) public GatewayGenerator(DDProperties properties)
{ {
this.properties = properties; this.properties = properties;
this.initialize();
} }
public void initGateways() private void initialize()
{ {
gateways = new ArrayList<BaseGateway>(); gateways = new ArrayList<BaseGateway>();
this.defaultGateway=new GatewayTwoPillars(this.properties); defaultGateway = new GatewayTwoPillars(properties);
//add gateways here // Add gateways here
gateways.add(new GatewaySandstonePillars(this.properties));
gateways.add(defaultGateway); gateways.add(defaultGateway);
gateways.add(new GatewayLimbo(this.properties)); gateways.add(new GatewaySandstonePillars(properties));
gateways.add(new GatewayLimbo(properties));
} }
@Override @Override