From a19380347a7d3668c9d77c77f8f0956db45f8aaa Mon Sep 17 00:00:00 2001 From: mezz Date: Sun, 2 Jul 2017 21:31:49 -0700 Subject: [PATCH] Fix missing textures on butterfly items (#1730) --- .../forestry/lepidopterology/PluginLepidopterology.java | 7 ++++++- .../lepidopterology/genetics/ButterflyDefinition.java | 7 +++++++ .../forestry/lepidopterology/genetics/MothDefinition.java | 4 ++++ 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/src/main/java/forestry/lepidopterology/PluginLepidopterology.java b/src/main/java/forestry/lepidopterology/PluginLepidopterology.java index e65054944..2425b6e20 100755 --- a/src/main/java/forestry/lepidopterology/PluginLepidopterology.java +++ b/src/main/java/forestry/lepidopterology/PluginLepidopterology.java @@ -131,7 +131,12 @@ public class PluginLepidopterology extends BlankForestryPlugin { MinecraftForge.EVENT_BUS.register(this); ButterflyBranchDefinition.createAlleles(); ButterflyAlleles.registerEffectAlleles(); - + + ButterflyDefinition.preInit(); + MothDefinition.preInit(); + MinecraftForge.EVENT_BUS.post(new AlleleSpeciesRegisterEvent<>(ButterflyManager.butterflyRoot, IAlleleButterflySpecies.class)); + + GameRegistry.registerTileEntity(TileCocoon.class, "forestry.Cocoon"); proxy.preInitializeRendering(); } diff --git a/src/main/java/forestry/lepidopterology/genetics/ButterflyDefinition.java b/src/main/java/forestry/lepidopterology/genetics/ButterflyDefinition.java index 0cc671f97..7e96158ce 100644 --- a/src/main/java/forestry/lepidopterology/genetics/ButterflyDefinition.java +++ b/src/main/java/forestry/lepidopterology/genetics/ButterflyDefinition.java @@ -15,6 +15,7 @@ import java.util.Arrays; import java.util.Locale; import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; +import forestry.api.genetics.AlleleSpeciesRegisterEvent; import forestry.api.genetics.IAllele; import forestry.api.genetics.IClassification; import forestry.api.lepidopterology.ButterflyManager; @@ -31,6 +32,8 @@ import forestry.core.genetics.alleles.EnumAllele; import forestry.core.utils.StringUtil; import net.minecraft.item.ItemStack; +import net.minecraftforge.common.MinecraftForge; + public enum ButterflyDefinition implements IButterflyDefinition { CabbageWhite(ButterflyBranchDefinition.Pieris, "cabbageWhite", "rapae", new Color(0xccffee), true, 1.0f) { @Override @@ -320,6 +323,10 @@ public enum ButterflyDefinition implements IButterflyDefinition { setSpeciesProperties(speciesBuilder); this.species = speciesBuilder.build(); } + + public static void preInit() { + // just used to initialize the enums + } public static void initButterflies() { for (ButterflyDefinition butterfly : values()) { diff --git a/src/main/java/forestry/lepidopterology/genetics/MothDefinition.java b/src/main/java/forestry/lepidopterology/genetics/MothDefinition.java index 2e6dfaa31..ab2b0fe81 100644 --- a/src/main/java/forestry/lepidopterology/genetics/MothDefinition.java +++ b/src/main/java/forestry/lepidopterology/genetics/MothDefinition.java @@ -80,6 +80,10 @@ public enum MothDefinition implements IButterflyDefinition { setSpeciesProperties(speciesBuilder); species = speciesBuilder.build(); } + + public static void preInit() { + // just used to initialize the enums + } public static void initMoths() { for (MothDefinition butterfly : values()) {