Clean Up Butterflies

This commit is contained in:
Nedelosk committed 2017-04-10 11:52:02 +02:00
1 parent 1626b6ec03
commit 11b8fce668
29 files changed
+202 -290

No files matched your search

+12 -14
View File
@@ -29,6 +29,7 @@ import com.google.common.base.Preconditions;
import forestry.api.arboriculture.ITreeRoot;
import forestry.api.genetics.AlleleManager;
import forestry.api.genetics.AlleleSpeciesRegisterEvent;
import forestry.api.lepidopterology.IButterflyRoot;
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
import net.minecraftforge.client.event.ModelBakeEvent;
import net.minecraftforge.client.event.TextureStitchEvent;
@@ -165,6 +166,17 @@ public class ExtraTrees extends AbstractMod {
public String getModID() {
return Constants.EXTRA_TREES_MOD_ID;
}
@SubscribeEvent
public void speciesRegister(AlleleSpeciesRegisterEvent event) {
if (event.getRoot() instanceof ITreeRoot) {
ETTreeDefinition.preInitTrees();
PlankType.ExtraTreePlanks.initWoodTypes();
}else if(event.getRoot() instanceof IButterflyRoot && BinnieCore.isLepidopteryActive()) {
ButterflySpecies.preInit();
getClass();
}
}
@Override
protected Class<? extends BinniePacketHandler> getPacketHandler() {
@@ -176,20 +188,6 @@ public class ExtraTrees extends AbstractMod {
return BinnieCore.isExtraTreesActive();
}
@SubscribeEvent
public void speciesRegister(AlleleSpeciesRegisterEvent event) {
if (event.getRoot() instanceof ITreeRoot) {
ETTreeDefinition.preInitTrees();
PlankType.ExtraTreePlanks.initWoodTypes();
if (BinnieCore.isLepidopteryActive()) {
for (final ButterflySpecies species : ButterflySpecies.values()) {
AlleleManager.alleleRegistry.registerAllele(species);
}
}
}
}
public static class PacketHandler extends BinniePacketHandler {
public PacketHandler() {
super(ExtraBees.instance);