From 0aa4a0f7940bcba9afa2e4964512e572add10fe7 Mon Sep 17 00:00:00 2001 From: Nedelosk Date: Mon, 10 Apr 2017 00:23:39 +0200 Subject: [PATCH] Add AlleleRegisterEvent --- .../api/genetics/AlleleRegisterEvent.java | 22 +++++++++++++++++++ .../genetics/AlleleSpeciesRegisterEvent.java | 5 +++-- .../apiculture/genetics/BeeDefinition.java | 2 +- .../blocks/BlockRegistryArboriculture.java | 3 +++ .../genetics/TreeDefinition.java | 2 +- .../PluginLepidopterology.java | 2 +- 6 files changed, 31 insertions(+), 5 deletions(-) create mode 100644 src/main/java/forestry/api/genetics/AlleleRegisterEvent.java diff --git a/src/main/java/forestry/api/genetics/AlleleRegisterEvent.java b/src/main/java/forestry/api/genetics/AlleleRegisterEvent.java new file mode 100644 index 000000000..195dd2db8 --- /dev/null +++ b/src/main/java/forestry/api/genetics/AlleleRegisterEvent.java @@ -0,0 +1,22 @@ +package forestry.api.genetics; + +import forestry.api.arboriculture.IAlleleFruit; +import net.minecraftforge.fml.common.eventhandler.Event; + +/** + * Called after Forestry has registered all his alleles of an specific type. Like IAlleleFruit or IAlleleSpecies + * @since 5.3.3 + */ +public class AlleleRegisterEvent extends Event { + + private final Class alleleClass; + + public AlleleRegisterEvent(Class alleleClass) { + this.alleleClass = alleleClass; + } + + public Class getAlleleClass() { + return alleleClass; + } + +} diff --git a/src/main/java/forestry/api/genetics/AlleleSpeciesRegisterEvent.java b/src/main/java/forestry/api/genetics/AlleleSpeciesRegisterEvent.java index 1362033d5..2bd4e35be 100644 --- a/src/main/java/forestry/api/genetics/AlleleSpeciesRegisterEvent.java +++ b/src/main/java/forestry/api/genetics/AlleleSpeciesRegisterEvent.java @@ -5,11 +5,12 @@ import net.minecraftforge.fml.common.eventhandler.Event; /** * Called after Forestry has registered all his species alleles of a individual. */ -public class AlleleSpeciesRegisterEvent extends Event { +public class AlleleSpeciesRegisterEvent extends AlleleRegisterEvent { private final ISpeciesRoot root; - public AlleleSpeciesRegisterEvent(ISpeciesRoot root) { + public AlleleSpeciesRegisterEvent(ISpeciesRoot root, Class alleleClass) { + super(alleleClass); this.root = root; } diff --git a/src/main/java/forestry/apiculture/genetics/BeeDefinition.java b/src/main/java/forestry/apiculture/genetics/BeeDefinition.java index 02e0f2eec..c1f7d4847 100644 --- a/src/main/java/forestry/apiculture/genetics/BeeDefinition.java +++ b/src/main/java/forestry/apiculture/genetics/BeeDefinition.java @@ -1021,7 +1021,7 @@ public enum BeeDefinition implements IBeeDefinition { for (BeeDefinition bee : values()) { bee.registerMutations(); } - MinecraftForge.EVENT_BUS.post(new AlleleSpeciesRegisterEvent(BeeManager.beeRoot)); + MinecraftForge.EVENT_BUS.post(new AlleleSpeciesRegisterEvent(BeeManager.beeRoot, IAlleleBeeSpecies.class)); } public static void preInit() { diff --git a/src/main/java/forestry/arboriculture/blocks/BlockRegistryArboriculture.java b/src/main/java/forestry/arboriculture/blocks/BlockRegistryArboriculture.java index 930aca4c2..1ae7514ef 100644 --- a/src/main/java/forestry/arboriculture/blocks/BlockRegistryArboriculture.java +++ b/src/main/java/forestry/arboriculture/blocks/BlockRegistryArboriculture.java @@ -18,6 +18,7 @@ import java.util.Map; import forestry.api.arboriculture.EnumForestryWoodType; import forestry.api.arboriculture.EnumVanillaWoodType; import forestry.api.arboriculture.IAlleleFruit; +import forestry.api.genetics.AlleleRegisterEvent; import forestry.arboriculture.genetics.TreeDefinition; import forestry.arboriculture.genetics.alleles.AlleleFruits; import forestry.arboriculture.items.ItemBlockDecorativeLeaves; @@ -31,6 +32,7 @@ import forestry.core.utils.OreDictUtil; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.item.ItemStack; +import net.minecraftforge.common.MinecraftForge; public class BlockRegistryArboriculture extends BlockRegistry { public final List logs; @@ -259,6 +261,7 @@ public class BlockRegistryArboriculture extends BlockRegistry { // Pods AlleleFruits.registerAlleles(); + MinecraftForge.EVENT_BUS.post(new AlleleRegisterEvent(IAlleleFruit.class)); podsMap = new HashMap<>(); for (BlockFruitPod pod : BlockFruitPod.create()) { IAlleleFruit fruit = pod.getFruit(); diff --git a/src/main/java/forestry/arboriculture/genetics/TreeDefinition.java b/src/main/java/forestry/arboriculture/genetics/TreeDefinition.java index efa7e2467..5aa4cc5b3 100644 --- a/src/main/java/forestry/arboriculture/genetics/TreeDefinition.java +++ b/src/main/java/forestry/arboriculture/genetics/TreeDefinition.java @@ -1071,7 +1071,7 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator, IStringSe } public static void preInit() { - MinecraftForge.EVENT_BUS.post(new AlleleSpeciesRegisterEvent(TreeManager.treeRoot)); + MinecraftForge.EVENT_BUS.post(new AlleleSpeciesRegisterEvent(TreeManager.treeRoot, IAlleleTreeSpecies.class)); } @Override diff --git a/src/main/java/forestry/lepidopterology/PluginLepidopterology.java b/src/main/java/forestry/lepidopterology/PluginLepidopterology.java index d86676253..fd729a92c 100644 --- a/src/main/java/forestry/lepidopterology/PluginLepidopterology.java +++ b/src/main/java/forestry/lepidopterology/PluginLepidopterology.java @@ -154,7 +154,7 @@ public class PluginLepidopterology extends BlankForestryPlugin { ButterflyDefinition.initButterflies(); ButterflyAlleles.createLoot(); - MinecraftForge.EVENT_BUS.post(new AlleleSpeciesRegisterEvent(ButterflyManager.butterflyRoot)); + MinecraftForge.EVENT_BUS.post(new AlleleSpeciesRegisterEvent(ButterflyManager.butterflyRoot, IAlleleButterflySpecies.class)); blocks.butterflyChest.init();