diff --git a/common/buildcraft/BuildCraftCore.java b/common/buildcraft/BuildCraftCore.java index 9a52e961..dfc76fe5 100644 --- a/common/buildcraft/BuildCraftCore.java +++ b/common/buildcraft/BuildCraftCore.java @@ -258,8 +258,10 @@ public class BuildCraftCore { ActionManager.registerTriggerProvider(new DefaultTriggerProvider()); ActionManager.registerActionProvider(new DefaultActionProvider()); - MinecraftForge.EVENT_BUS.register(new SpringPopulate()); - + if (BuildCraftCore.modifyWorld) { + MinecraftForge.EVENT_BUS.register(new SpringPopulate()); + } + if (BuildCraftCore.loadDefaultRecipes) { loadRecipes(); } diff --git a/common/buildcraft/BuildCraftEnergy.java b/common/buildcraft/BuildCraftEnergy.java index 6b62e768..3e318a14 100644 --- a/common/buildcraft/BuildCraftEnergy.java +++ b/common/buildcraft/BuildCraftEnergy.java @@ -87,7 +87,10 @@ public class BuildCraftEnergy { @Init public static void load(FMLInitializationEvent evt) { NetworkRegistry.instance().registerGuiHandler(instance, new GuiHandler()); - MinecraftForge.EVENT_BUS.register(new OilPopulate()); + + if (BuildCraftCore.modifyWorld) { + MinecraftForge.EVENT_BUS.register(new OilPopulate()); + } new BptBlockEngine(engineBlock.blockID); diff --git a/common/buildcraft/core/SpringPopulate.java b/common/buildcraft/core/SpringPopulate.java index 2c740514..69f3f800 100644 --- a/common/buildcraft/core/SpringPopulate.java +++ b/common/buildcraft/core/SpringPopulate.java @@ -22,9 +22,6 @@ public class SpringPopulate { @ForgeSubscribe public void populate(PopulateChunkEvent.Post event) { - if (!BuildCraftCore.modifyWorld) { - return; - } boolean doGen = TerrainGen.populate(event.chunkProvider, event.world, event.rand, event.chunkX, event.chunkX, event.hasVillageGenerated, PopulateChunkEvent.Populate.EventType.CUSTOM); diff --git a/common/buildcraft/energy/OilPopulate.java b/common/buildcraft/energy/OilPopulate.java index ba715187..b47ee66c 100644 --- a/common/buildcraft/energy/OilPopulate.java +++ b/common/buildcraft/energy/OilPopulate.java @@ -37,10 +37,6 @@ public class OilPopulate { } public static void doPopulate(World world, Random rand, int x, int z) { - if (!BuildCraftCore.modifyWorld) { - return; - } - BiomeGenBase biomegenbase = world.getBiomeGenForCoords(x + 16, z + 16); // Do not generate oil in the End