diff --git a/extratrees/src/main/java/binnie/extratrees/ExtraTrees.java b/extratrees/src/main/java/binnie/extratrees/ExtraTrees.java index c0e3f3f9..b3ffb86f 100644 --- a/extratrees/src/main/java/binnie/extratrees/ExtraTrees.java +++ b/extratrees/src/main/java/binnie/extratrees/ExtraTrees.java @@ -16,11 +16,10 @@ import binnie.core.gui.IBinnieGUID; import binnie.core.modules.BlankModuleContainer; import binnie.core.network.BinniePacketHandler; import binnie.core.proxy.IProxyCore; -import binnie.extratrees.modules.ModuleWood; import binnie.extratrees.config.ConfigurationMain; import binnie.extratrees.core.ExtraTreesGUID; import binnie.extratrees.genetics.MothBreedingSystem; -import binnie.extratrees.genetics.TreeBreedingSystem; +import binnie.extratrees.modules.ModuleWood; import binnie.extratrees.proxy.Proxy; @Mod( @@ -37,7 +36,6 @@ public class ExtraTrees extends BlankModuleContainer { @SuppressWarnings("NullableProblems") @SidedProxy(clientSide = "binnie.extratrees.proxy.ProxyClient", serverSide = "binnie.extratrees.proxy.ProxyServer") public static Proxy proxy; - public static IBreedingSystem treeBreedingSystem; public static IBreedingSystem mothBreedingSystem; public ExtraTrees() { @@ -49,9 +47,7 @@ public class ExtraTrees extends BlankModuleContainer { public void preInit(final FMLPreInitializationEvent evt) { container.registerConfigHandler(new ConfigurationMain(container)); super.preInit(evt); - treeBreedingSystem = new TreeBreedingSystem(); mothBreedingSystem = new MothBreedingSystem(); - Binnie.GENETICS.registerBreedingSystem(treeBreedingSystem); Binnie.GENETICS.registerBreedingSystem(mothBreedingSystem); } diff --git a/extratrees/src/main/java/binnie/extratrees/genetics/AlleleETFruit.java b/extratrees/src/main/java/binnie/extratrees/genetics/AlleleETFruit.java index ba3dc628..fe2baa71 100644 --- a/extratrees/src/main/java/binnie/extratrees/genetics/AlleleETFruit.java +++ b/extratrees/src/main/java/binnie/extratrees/genetics/AlleleETFruit.java @@ -1,6 +1,5 @@ package binnie.extratrees.genetics; -import binnie.extratrees.ExtraTrees; import com.google.common.base.Preconditions; import javax.annotation.Nullable; @@ -37,10 +36,11 @@ import forestry.core.genetics.alleles.AlleleCategorized; import binnie.core.Constants; import binnie.core.util.I18N; -import binnie.extratrees.wood.FruitPod; import binnie.extratrees.config.ConfigurationMain; -import binnie.extratrees.modules.ModuleCore; import binnie.extratrees.items.Food; +import binnie.extratrees.modules.ModuleCore; +import binnie.extratrees.modules.ModuleWood; +import binnie.extratrees.wood.FruitPod; public class AlleleETFruit extends AlleleCategorized implements IAlleleFruit, IFruitProvider { public static final AlleleETFruit Blackthorn = new AlleleETFruit("Blackthorn", 10, 7180062, 14561129, FruitSprite.SMALL); @@ -304,7 +304,7 @@ public class AlleleETFruit extends AlleleCategorized implements IAlleleFruit, IF throw new RuntimeException(e); } } - for (final IAlleleSpecies tree : ExtraTrees.treeBreedingSystem.getAllSpecies()) { + for (final IAlleleSpecies tree : ModuleWood.treeBreedingSystem.getAllSpecies()) { if (tree instanceof AlleleTreeSpecies && ((IAlleleTreeSpecies) tree).getSuitableFruit().contains(familyPrune)) { ((AlleleTreeSpecies) tree).addFruitFamily(familyCitrus); } diff --git a/extratrees/src/main/java/binnie/extratrees/gui/database/PageSpeciesTreeGenome.java b/extratrees/src/main/java/binnie/extratrees/gui/database/PageSpeciesTreeGenome.java index b3861d85..aa92020e 100644 --- a/extratrees/src/main/java/binnie/extratrees/gui/database/PageSpeciesTreeGenome.java +++ b/extratrees/src/main/java/binnie/extratrees/gui/database/PageSpeciesTreeGenome.java @@ -4,9 +4,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; -import binnie.core.api.genetics.IBreedingSystem; -import binnie.extratrees.ExtraTrees; -import forestry.api.arboriculture.TreeManager; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; @@ -22,9 +19,11 @@ import forestry.api.arboriculture.IFruitProvider; import forestry.api.arboriculture.ILeafSpriteProvider; import forestry.api.arboriculture.ITree; import forestry.api.arboriculture.ITreeGenome; +import forestry.api.arboriculture.TreeManager; import forestry.api.genetics.IAllele; import forestry.api.genetics.IAlleleSpecies; +import binnie.core.api.genetics.IBreedingSystem; import binnie.core.gui.IWidget; import binnie.core.gui.controls.ControlText; import binnie.core.gui.controls.core.Control; @@ -36,6 +35,7 @@ import binnie.core.gui.geometry.Point; import binnie.core.gui.geometry.TextJustification; import binnie.core.gui.minecraft.control.ControlItemDisplay; import binnie.core.util.I18N; +import binnie.extratrees.modules.ModuleWood; @SideOnly(Side.CLIENT) public class PageSpeciesTreeGenome extends PageSpecies { @@ -73,7 +73,7 @@ public class PageSpeciesTreeGenome extends PageSpecies { int y = 0; final int th = 14; final int th2 = 18; - final IBreedingSystem syst = ExtraTrees.treeBreedingSystem; + final IBreedingSystem syst = ModuleWood.treeBreedingSystem; new ControlText(contents, new Area(w2, y, w3, th), treeSpecies.getPlantType().toString(), TextJustification.MIDDLE_LEFT); y += th; new ControlText(contents, new Area(0, y, w2, th), I18N.localise("binniecore.gui.temperature.short") + " : ", TextJustification.MIDDLE_RIGHT); diff --git a/extratrees/src/main/java/binnie/extratrees/gui/database/WindowArboristDatabase.java b/extratrees/src/main/java/binnie/extratrees/gui/database/WindowArboristDatabase.java index 86333a09..d0bf7734 100644 --- a/extratrees/src/main/java/binnie/extratrees/gui/database/WindowArboristDatabase.java +++ b/extratrees/src/main/java/binnie/extratrees/gui/database/WindowArboristDatabase.java @@ -28,6 +28,7 @@ import binnie.core.gui.minecraft.Window; import binnie.core.util.I18N; import binnie.extratrees.ExtraTrees; import binnie.extratrees.api.IDesignMaterial; +import binnie.extratrees.modules.ModuleWood; import binnie.extratrees.wood.WoodManager; public class WindowArboristDatabase extends WindowAbstractDatabase { @@ -36,7 +37,7 @@ public class WindowArboristDatabase extends WindowAbstractDatabase { ControlListBox selectionBoxPlanks; public WindowArboristDatabase(final EntityPlayer player, final Side side, final boolean nei) { - super(player, side, nei, ExtraTrees.treeBreedingSystem, 120); + super(player, side, nei, ModuleWood.treeBreedingSystem, 120); } public static Window create(final EntityPlayer player, final Side side, final boolean nei) { diff --git a/extratrees/src/main/java/binnie/extratrees/modules/ModuleWood.java b/extratrees/src/main/java/binnie/extratrees/modules/ModuleWood.java index c86f8b56..4a43bd36 100644 --- a/extratrees/src/main/java/binnie/extratrees/modules/ModuleWood.java +++ b/extratrees/src/main/java/binnie/extratrees/modules/ModuleWood.java @@ -55,9 +55,11 @@ import forestry.core.fluids.Fluids; import forestry.core.utils.OreDictUtil; import forestry.plugins.ForestryPluginUids; +import binnie.core.Binnie; import binnie.core.BinnieCore; import binnie.core.Constants; import binnie.core.Mods; +import binnie.core.api.genetics.IBreedingSystem; import binnie.core.block.ItemMetadata; import binnie.core.liquid.ILiquidDefinition; import binnie.core.models.DoublePassBakedModel; @@ -87,6 +89,7 @@ import binnie.extratrees.genetics.ButterflySpecies; import binnie.extratrees.genetics.ETTreeDefinition; import binnie.extratrees.genetics.ExtraTreeMutation; import binnie.extratrees.genetics.FruitSprite; +import binnie.extratrees.genetics.TreeBreedingSystem; import binnie.extratrees.items.ExtraTreeLiquid; import binnie.extratrees.items.ItemBlockETDecorativeLeaves; import binnie.extratrees.wood.EnumETLog; @@ -119,6 +122,8 @@ public class ModuleWood extends Module { @Nullable public static BlockShrubLog shrubLog; + public static IBreedingSystem treeBreedingSystem; + //TODO: Unused ? public static String[] branches = new String[]{"Malus Maleae Amygdaloideae Rosaceae", "Musa Musaceae Zingiberales Commelinids Angiosperms", "Sorbus Maleae", "Tsuga Pinaceae", "Fraxinus Oleeae Oleaceae Lamiales Asterids Angiospems"};; public static List> classifications = new ArrayList<>(); @@ -318,6 +323,9 @@ public class ModuleWood extends Module { ExtraTrees.proxy.registerBlock(shrubLog, new ItemBlockETWood(shrubLog)); woodAccess.register(EnumShrubLog.INSTANCE, WoodBlockKind.LOG, false, shrubLog.getStateFromMeta(0), new ItemStack(shrubLog, 1, 0)); woodAccess.register(EnumShrubLog.INSTANCE, WoodBlockKind.LOG, true, shrubLog.getStateFromMeta(1), new ItemStack(shrubLog, 1, 1)); + + treeBreedingSystem = new TreeBreedingSystem(); + Binnie.GENETICS.registerBreedingSystem(treeBreedingSystem); } private void registerDoors(WoodAccess woodAccess, List blocks) { diff --git a/genetics/src/main/java/binnie/genetics/gui/analyst/AnalystPageBiology.java b/genetics/src/main/java/binnie/genetics/gui/analyst/AnalystPageBiology.java index 15711196..ac523f00 100644 --- a/genetics/src/main/java/binnie/genetics/gui/analyst/AnalystPageBiology.java +++ b/genetics/src/main/java/binnie/genetics/gui/analyst/AnalystPageBiology.java @@ -2,7 +2,6 @@ package binnie.genetics.gui.analyst; import java.text.DecimalFormat; -import binnie.extratrees.ExtraTrees; import net.minecraft.util.text.TextFormatting; import net.minecraftforge.fml.relauncher.Side; @@ -22,6 +21,7 @@ import binnie.core.gui.geometry.Area; import binnie.core.gui.geometry.Point; import binnie.core.gui.minecraft.control.ControlIconDisplay; import binnie.core.util.I18N; +import binnie.extratrees.modules.ModuleWood; import binnie.genetics.item.ModuleItems; @SideOnly(Side.CLIENT) @@ -241,7 +241,7 @@ public class AnalystPageBiology extends ControlAnalystPage { } private void addTreePages(ITree tree, int y){ - String alleleName = ExtraTrees.treeBreedingSystem.getAlleleName(EnumTreeChromosome.SAPPINESS, tree.getGenome().getActiveAllele(EnumTreeChromosome.SAPPINESS)); + String alleleName = ModuleWood.treeBreedingSystem.getAlleleName(EnumTreeChromosome.SAPPINESS, tree.getGenome().getActiveAllele(EnumTreeChromosome.SAPPINESS)); new ControlTextCentered(this, y, TextFormatting.ITALIC + I18N.localise(AnalystConstants.BIOLOGY_KEY + ".sappiness", alleleName)) .setColor(getColor()); y += 20; diff --git a/genetics/src/main/java/binnie/genetics/gui/analyst/tree/AnalystPageFruit.java b/genetics/src/main/java/binnie/genetics/gui/analyst/tree/AnalystPageFruit.java index a68e2b80..2d5a2a7e 100644 --- a/genetics/src/main/java/binnie/genetics/gui/analyst/tree/AnalystPageFruit.java +++ b/genetics/src/main/java/binnie/genetics/gui/analyst/tree/AnalystPageFruit.java @@ -5,8 +5,6 @@ import java.util.Collection; import java.util.Collections; import java.util.Map; -import binnie.extratrees.ExtraTrees; -import forestry.api.arboriculture.TreeManager; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.util.text.TextFormatting; @@ -15,6 +13,7 @@ import forestry.api.arboriculture.EnumTreeChromosome; import forestry.api.arboriculture.IAlleleFruit; import forestry.api.arboriculture.ITree; import forestry.api.arboriculture.ITreeGenome; +import forestry.api.arboriculture.TreeManager; import forestry.api.genetics.IAllele; import forestry.api.genetics.IFruitFamily; import forestry.arboriculture.FruitProviderPod; @@ -27,6 +26,7 @@ import binnie.core.gui.geometry.Point; import binnie.core.gui.minecraft.control.ControlItemDisplay; import binnie.core.util.I18N; import binnie.core.util.UniqueItemStackSet; +import binnie.extratrees.modules.ModuleWood; import binnie.genetics.gui.analyst.AnalystConstants; import binnie.genetics.gui.analyst.AnalystPageProduce; @@ -38,7 +38,7 @@ public class AnalystPageFruit extends AnalystPageProduce { int y = 4; new ControlTextCentered(this, y, TextFormatting.UNDERLINE + getTitle()).setColor(getColor()); y += 12; - new ControlTextCentered(this, y, TextFormatting.ITALIC + I18N.localise(AnalystConstants.FRUIT_KEY + ".yield") + ": " + ExtraTrees.treeBreedingSystem.getAlleleName(EnumTreeChromosome.YIELD, ind.getGenome().getActiveAllele(EnumTreeChromosome.YIELD))).setColor(getColor()); + new ControlTextCentered(this, y, TextFormatting.ITALIC + I18N.localise(AnalystConstants.FRUIT_KEY + ".yield") + ": " + ModuleWood.treeBreedingSystem.getAlleleName(EnumTreeChromosome.YIELD, ind.getGenome().getActiveAllele(EnumTreeChromosome.YIELD))).setColor(getColor()); y += 20; Collection products = new UniqueItemStackSet(); Collection specialties = new UniqueItemStackSet(); diff --git a/genetics/src/main/java/binnie/genetics/gui/analyst/tree/AnalystPageGrowth.java b/genetics/src/main/java/binnie/genetics/gui/analyst/tree/AnalystPageGrowth.java index 656ae09a..e4f59193 100644 --- a/genetics/src/main/java/binnie/genetics/gui/analyst/tree/AnalystPageGrowth.java +++ b/genetics/src/main/java/binnie/genetics/gui/analyst/tree/AnalystPageGrowth.java @@ -1,6 +1,5 @@ package binnie.genetics.gui.analyst.tree; -import binnie.extratrees.ExtraTrees; import net.minecraft.util.text.TextFormatting; import forestry.api.arboriculture.EnumTreeChromosome; @@ -12,6 +11,7 @@ import binnie.core.gui.IWidget; import binnie.core.gui.controls.ControlTextCentered; import binnie.core.gui.geometry.Area; import binnie.core.util.I18N; +import binnie.extratrees.modules.ModuleWood; import binnie.genetics.gui.analyst.AnalystConstants; import binnie.genetics.gui.analyst.ControlAnalystPage; @@ -30,9 +30,9 @@ public class AnalystPageGrowth extends ControlAnalystPage { y += 12; new ControlTextCentered(this, y, TextFormatting.BOLD + getTimeString(Math.round(1373.3999f * mat))).setColor(getColor()); y += 22; - new ControlTextCentered(this, y, TextFormatting.ITALIC + I18N.localise(AnalystConstants.GROWTH_KEY + ".height") + ": " + ExtraTrees.treeBreedingSystem.getAlleleName(EnumTreeChromosome.HEIGHT, ind.getGenome().getActiveAllele(EnumTreeChromosome.HEIGHT))).setColor(getColor()); + new ControlTextCentered(this, y, TextFormatting.ITALIC + I18N.localise(AnalystConstants.GROWTH_KEY + ".height") + ": " + ModuleWood.treeBreedingSystem.getAlleleName(EnumTreeChromosome.HEIGHT, ind.getGenome().getActiveAllele(EnumTreeChromosome.HEIGHT))).setColor(getColor()); y += 12; - new ControlTextCentered(this, y, TextFormatting.ITALIC + I18N.localise(AnalystConstants.GROWTH_KEY + ".girth") + ": " + ExtraTrees.treeBreedingSystem.getAlleleName(EnumTreeChromosome.GIRTH, ind.getGenome().getActiveAllele(EnumTreeChromosome.GIRTH))).setColor(getColor()); + new ControlTextCentered(this, y, TextFormatting.ITALIC + I18N.localise(AnalystConstants.GROWTH_KEY + ".girth") + ": " + ModuleWood.treeBreedingSystem.getAlleleName(EnumTreeChromosome.GIRTH, ind.getGenome().getActiveAllele(EnumTreeChromosome.GIRTH))).setColor(getColor()); } }