diff --git a/api b/api index d29ab26c9..28235a758 160000 --- a/api +++ b/api @@ -1 +1 @@ -Subproject commit d29ab26c905a2658c07e394fffa2595b2d8ed1a4 +Subproject commit 28235a758e66f075cbe8596501bbf4fd264ab018 diff --git a/lang b/lang index c3743cfd7..6577b87e0 160000 --- a/lang +++ b/lang @@ -1 +1 @@ -Subproject commit c3743cfd74a24aa096240e637868da95eaad7d03 +Subproject commit 6577b87e0739355c7bed48e2280b5c6290b5acfb diff --git a/src/main/java/forestry/core/config/ForestryBlock.java b/src/main/java/forestry/core/config/ForestryBlock.java index 95448b27f..ad24d5bb6 100755 --- a/src/main/java/forestry/core/config/ForestryBlock.java +++ b/src/main/java/forestry/core/config/ForestryBlock.java @@ -11,6 +11,9 @@ package forestry.core.config; import forestry.core.proxy.Proxies; +import forestry.plugins.PluginManager; +import forestry.plugins.PluginManager.Stage; +import java.util.EnumSet; import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; @@ -79,6 +82,8 @@ public enum ForestryBlock { private Block block; public void registerBlock(Block block, Class itemClass, String name) { + if (!EnumSet.of(Stage.PRE_INIT).contains(PluginManager.getStage())) + throw new RuntimeException("Tried to register Block outside of Pre-Init"); this.block = block; block.setBlockName("for." + name); Proxies.common.registerBlock(block, itemClass); @@ -95,8 +100,8 @@ public enum ForestryBlock { public boolean isBlockEqual(World world, int x, int y, int z) { return isBlockEqual(world.getBlock(x, y, z)); } - - public Item item(){ + + public Item item() { return Item.getItemFromBlock(block); } diff --git a/src/main/java/forestry/core/config/ForestryItem.java b/src/main/java/forestry/core/config/ForestryItem.java index 91fd29ad5..2055ef1af 100755 --- a/src/main/java/forestry/core/config/ForestryItem.java +++ b/src/main/java/forestry/core/config/ForestryItem.java @@ -14,6 +14,9 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import forestry.core.proxy.Proxies; +import forestry.plugins.PluginManager; +import forestry.plugins.PluginManager.Stage; +import java.util.EnumSet; import net.minecraftforge.oredict.OreDictionary; /** @@ -248,6 +251,8 @@ public enum ForestryItem { private Item item; public void registerItem(Item item, String name) { + if (!EnumSet.of(Stage.PRE_INIT, Stage.INIT).contains(PluginManager.getStage())) + throw new RuntimeException("Tried to register Item outside of Pre-Init or Init"); this.item = item; item.setUnlocalizedName("for." + name); Proxies.common.registerItem(item); diff --git a/src/main/java/forestry/plugins/PluginManager.java b/src/main/java/forestry/plugins/PluginManager.java index 3ef76fa44..3c63764b9 100755 --- a/src/main/java/forestry/plugins/PluginManager.java +++ b/src/main/java/forestry/plugins/PluginManager.java @@ -179,32 +179,31 @@ public class PluginManager { private static void loadPlugin(ForestryPlugin plugin) { Proxies.log.fine("Loading Plugin: {0}", plugin); - ForestryPlugin nplugin = (ForestryPlugin) plugin; - IGuiHandler guiHandler = nplugin.getGuiHandler(); + IGuiHandler guiHandler = plugin.getGuiHandler(); if (guiHandler != null) guiHandlers.add(guiHandler); - IPacketHandler packetHandler = nplugin.getPacketHandler(); + IPacketHandler packetHandler = plugin.getPacketHandler(); if (packetHandler != null) packetHandlers.add(packetHandler); - IPickupHandler pickupHandler = nplugin.getPickupHandler(); + IPickupHandler pickupHandler = plugin.getPickupHandler(); if (pickupHandler != null) pickupHandlers.add(pickupHandler); - ISaveEventHandler saveHandler = nplugin.getSaveEventHandler(); + ISaveEventHandler saveHandler = plugin.getSaveEventHandler(); if (saveHandler != null) saveEventHandlers.add(saveHandler); - IResupplyHandler resupplyHandler = nplugin.getResupplyHandler(); + IResupplyHandler resupplyHandler = plugin.getResupplyHandler(); if (resupplyHandler != null) resupplyHandlers.add(resupplyHandler); - IOreDictionaryHandler dictionaryHandler = nplugin.getDictionaryHandler(); + IOreDictionaryHandler dictionaryHandler = plugin.getDictionaryHandler(); if (dictionaryHandler != null) dictionaryHandlers.add(dictionaryHandler); - IFuelHandler fuelHandler = nplugin.getFuelHandler(); + IFuelHandler fuelHandler = plugin.getFuelHandler(); if (fuelHandler != null) GameRegistry.registerFuelHandler((fuelHandler)); }