From cfbab6b988c4e4c25296bfd2e2087f67368dfecd Mon Sep 17 00:00:00 2001 From: mezz Date: Mon, 6 Apr 2015 20:24:37 -0700 Subject: [PATCH] Fix #597 Crash from Butterfly Genome.getActiveAllele --- application.properties | 2 +- src/main/java/forestry/plugins/PluginLepidopterology.java | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/application.properties b/application.properties index 71fd522c3..6ad6ccb77 100644 --- a/application.properties +++ b/application.properties @@ -2,4 +2,4 @@ mcversion=1.7.10 forgeversion=10.13.2.1286 version_major=3 version_minor=5 -version_patch=2 +version_patch=3 diff --git a/src/main/java/forestry/plugins/PluginLepidopterology.java b/src/main/java/forestry/plugins/PluginLepidopterology.java index 61890778d..3aa973e3d 100755 --- a/src/main/java/forestry/plugins/PluginLepidopterology.java +++ b/src/main/java/forestry/plugins/PluginLepidopterology.java @@ -88,14 +88,14 @@ public class PluginLepidopterology extends ForestryPlugin { super.setupAPI(); AlleleManager.alleleRegistry.registerSpeciesRoot(PluginLepidopterology.butterflyInterface = new ButterflyHelper()); - createAlleles(); - registerTemplates(); } @Override public void preInit() { ForestryBlock.lepidopterology.registerBlock(new BlockBase(Material.iron), ItemForestryBlock.class, "lepidopterology"); ForestryBlock.lepidopterology.block().setCreativeTab(Tabs.tabLepidopterology); + + createAlleles(); } @Override @@ -128,6 +128,8 @@ public class PluginLepidopterology extends ForestryPlugin { Utils.registerEntity(EntityButterfly.class, "butterflyGE", 0, 0x000000, 0xffffff, 50, 1, true); proxy.initializeRendering(); + registerTemplates(); + BlockBase lepidopterology = ((BlockBase) ForestryBlock.lepidopterology.block()); definitionChest = lepidopterology.addDefinition((new MachineDefinition(Defaults.DEFINITION_LEPICHEST_META, "forestry.LepiChest", TileLepidopteristChest.class, ShapedRecipeCustom.createShapedRecipe(