diff --git a/lang b/lang index 65e2c3558..46e208965 160000 --- a/lang +++ b/lang @@ -1 +1 @@ -Subproject commit 65e2c3558b3f5a6e6d39eb086e7f4eb2ea5f10ba +Subproject commit 46e20896500e20f46ffde78d19486868172302f5 diff --git a/src/main/java/forestry/api/genetics/AlleleManager.java b/src/main/java/forestry/api/genetics/AlleleManager.java index 1700b72cd..8a8f8366e 100644 --- a/src/main/java/forestry/api/genetics/AlleleManager.java +++ b/src/main/java/forestry/api/genetics/AlleleManager.java @@ -9,7 +9,7 @@ import java.util.HashMap; import java.util.Map; import net.minecraft.block.Block; -import net.minecraft.item.ItemStack; +import net.minecraft.item.Item; /** * Holds a static reference to the {@link IAlleleRegistry}. @@ -28,7 +28,7 @@ public class AlleleManager { /** * Translates plain saplings into genetic data. Used by the treealyzer and the farm to convert foreign saplings. */ - public static Map saplingTranslation = new HashMap<>(); + public static Map saplingTranslation = new HashMap<>(); /** * Queryable instance of an {@link IClimateHelper} for easier implementation. diff --git a/src/main/java/forestry/api/genetics/IAlyzer.java b/src/main/java/forestry/api/genetics/IAlyzer.java deleted file mode 100644 index 87919bb70..000000000 --- a/src/main/java/forestry/api/genetics/IAlyzer.java +++ /dev/null @@ -1,37 +0,0 @@ -package forestry.api.genetics; - -import java.util.Map; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -public interface IAlyzer { - - ISpeciesRoot getSpeciesRoot(); - - Map getIconStacks(); - - ResourceLocation getGuiTexture(); - - boolean canSlotAccept(I inventory, int slotIndex, ItemStack itemStack); - - void onSlotClick(I inventory, int slotIndex, EntityPlayer player); - - @SideOnly(Side.CLIENT) - void drawAnalyticsPage1(G gui, II individual, T type); - - @SideOnly(Side.CLIENT) - void drawAnalyticsPage2(G gui, II individual, T type); - - @SideOnly(Side.CLIENT) - void drawAnalyticsPage3(G gui, II individual, T type); - - boolean isAlyzingFuel(ItemStack itemstack); - - T getDefaultType(); - -} diff --git a/src/main/java/forestry/api/genetics/IAlyzerPlugin.java b/src/main/java/forestry/api/genetics/IAlyzerPlugin.java new file mode 100644 index 000000000..6166ce2f1 --- /dev/null +++ b/src/main/java/forestry/api/genetics/IAlyzerPlugin.java @@ -0,0 +1,24 @@ +package forestry.api.genetics; + +import java.util.List; + +import net.minecraft.item.ItemStack; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import forestry.core.gui.GuiAlyzer; + +public interface IAlyzerPlugin { + + @SideOnly(Side.CLIENT) + void drawAnalyticsPage1(GuiAlyzer gui, ItemStack itemStack); + + @SideOnly(Side.CLIENT) + void drawAnalyticsPage2(GuiAlyzer gui, ItemStack itemStack); + + @SideOnly(Side.CLIENT) + void drawAnalyticsPage3(GuiAlyzer gui, ItemStack itemStack); + + List getHints(); +} diff --git a/src/main/java/forestry/api/genetics/IGuiAlyzer.java b/src/main/java/forestry/api/genetics/IGuiAlyzer.java deleted file mode 100644 index d071f9fa3..000000000 --- a/src/main/java/forestry/api/genetics/IGuiAlyzer.java +++ /dev/null @@ -1,44 +0,0 @@ -package forestry.api.genetics; - -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -public interface IGuiAlyzer { - - @SideOnly(Side.CLIENT) - int getColorCoding(boolean dominant); - - @SideOnly(Side.CLIENT) - void drawLine(String text, int x, IIndividual individual, IChromosomeType chromosome, boolean inactive); - - @SideOnly(Side.CLIENT) - void drawSplitLine(String text, int x, int maxWidth, IIndividual individual, IChromosomeType chromosome, boolean inactive); - - @SideOnly(Side.CLIENT) - void drawRow(String text0, String text1, String text2, IIndividual individual, IChromosomeType chromosome); - - @SideOnly(Side.CLIENT) - void drawChromosomeRow(String chromosomeName, IIndividual individual, IChromosomeType chromosome); - - @SideOnly(Side.CLIENT) - void drawSpeciesRow(String text0, IIndividual individual, IChromosomeType chromosome, String customPrimaryName, String customSecondaryName); - - @SideOnly(Side.CLIENT) - void drawAnalyticsOverview(); - - @SideOnly(Side.CLIENT) - void drawAnalyticsPageClassification(IIndividual individual); - - @SideOnly(Side.CLIENT) - void drawAnalyticsPageMutations(IIndividual individual); - - @SideOnly(Side.CLIENT) - void drawMutationInfo(IMutation combination, IAllele species, int x); - - @SideOnly(Side.CLIENT) - void drawToleranceInfo(IAlleleTolerance toleranceAllele, int x); - - @SideOnly(Side.CLIENT) - void drawFertilityInfo(int fertility, int x, int textColor, int texOffset); - -} diff --git a/src/main/java/forestry/api/genetics/ISaplingTranslator.java b/src/main/java/forestry/api/genetics/ISaplingTranslator.java new file mode 100644 index 000000000..c84a0ed25 --- /dev/null +++ b/src/main/java/forestry/api/genetics/ISaplingTranslator.java @@ -0,0 +1,12 @@ +package forestry.api.genetics; + +import javax.annotation.Nullable; + +import net.minecraft.item.ItemStack; + +import forestry.api.arboriculture.ITree; + +public interface ISaplingTranslator { + @Nullable + ITree getTreeFromSapling(ItemStack sapling); +} diff --git a/src/main/java/forestry/api/genetics/ISpeciesRoot.java b/src/main/java/forestry/api/genetics/ISpeciesRoot.java index 0a012d4ec..5e9e2d9ac 100644 --- a/src/main/java/forestry/api/genetics/ISpeciesRoot.java +++ b/src/main/java/forestry/api/genetics/ISpeciesRoot.java @@ -179,5 +179,8 @@ public interface ISpeciesRoot { */ IChromosomeType getKaryotypeKey(); - IAlyzer getAlyzer(); + /** + * Plugin to add information for the handheld genetic analyzer. + */ + IAlyzerPlugin getAlyzerPlugin(); } diff --git a/src/main/java/forestry/apiculture/genetics/BeeAlyzer.java b/src/main/java/forestry/apiculture/genetics/BeeAlyzerPlugin.java similarity index 89% rename from src/main/java/forestry/apiculture/genetics/BeeAlyzer.java rename to src/main/java/forestry/apiculture/genetics/BeeAlyzerPlugin.java index 11ead4e63..34cf94d27 100644 --- a/src/main/java/forestry/apiculture/genetics/BeeAlyzer.java +++ b/src/main/java/forestry/apiculture/genetics/BeeAlyzerPlugin.java @@ -1,7 +1,14 @@ package forestry.apiculture.genetics; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; + +import net.minecraft.item.ItemStack; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import forestry.api.apiculture.BeeManager; import forestry.api.apiculture.EnumBeeChromosome; @@ -11,28 +18,23 @@ import forestry.api.apiculture.IBee; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAlleleInteger; import forestry.api.genetics.IAlleleTolerance; +import forestry.api.genetics.IAlyzerPlugin; import forestry.apiculture.PluginApiculture; -import forestry.apiculture.items.ItemRegistryApiculture; import forestry.core.config.Config; -import forestry.core.genetics.Alyzer; import forestry.core.genetics.alleles.AlleleBoolean; import forestry.core.gui.GuiAlyzer; -import forestry.core.gui.IHintSource; import forestry.core.gui.TextLayoutHelper; import forestry.core.gui.widgets.ItemStackWidget; import forestry.core.gui.widgets.WidgetManager; import forestry.core.utils.StringUtil; import forestry.core.utils.Translator; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; -public class BeeAlyzer extends Alyzer implements IHintSource{ +public class BeeAlyzerPlugin implements IAlyzerPlugin { + public static final BeeAlyzerPlugin INSTANCE = new BeeAlyzerPlugin(); - public BeeAlyzer() { - super(BeeManager.beeRoot); - + protected final Map iconStacks = new HashMap<>(); + + private BeeAlyzerPlugin() { ArrayList beeList = new ArrayList<>(); PluginApiculture.items.beeDroneGE.addCreativeItems(beeList, false); for (ItemStack beeStack : beeList) { @@ -42,27 +44,17 @@ public class BeeAlyzer extends Alyzer implements I } } } - - @Override - public boolean isAlyzingFuel(ItemStack itemstack) { - if (itemstack == null || itemstack.stackSize <= 0) { - return false; - } - - ItemRegistryApiculture beeItems = PluginApiculture.items; - if (beeItems == null) { - return false; - } - - Item item = itemstack.getItem(); - return beeItems.honeyDrop == item || beeItems.honeydew == item; - } @SideOnly(Side.CLIENT) @Override - public void drawAnalyticsPage1(GuiAlyzer gui, IBee bee, EnumBeeType type) { + public void drawAnalyticsPage1(GuiAlyzer gui, ItemStack itemStack) { + IBee bee = BeeManager.beeRoot.getMember(itemStack); + if (bee == null) { + return; + } + EnumBeeType type = BeeManager.beeRoot.getType(itemStack); + TextLayoutHelper textLayout = gui.getTextLayout(); - WidgetManager widgetManager = gui.getWidgetManager(); textLayout.startPage(GuiAlyzer.COLUMN_0, GuiAlyzer.COLUMN_1, GuiAlyzer.COLUMN_2); @@ -107,9 +99,14 @@ public class BeeAlyzer extends Alyzer implements I @SideOnly(Side.CLIENT) @Override - public void drawAnalyticsPage2(GuiAlyzer gui, IBee bee, EnumBeeType type) { + public void drawAnalyticsPage2(GuiAlyzer gui, ItemStack itemStack) { + IBee bee = BeeManager.beeRoot.getMember(itemStack); + if (bee == null) { + return; + } + EnumBeeType type = BeeManager.beeRoot.getType(itemStack); + TextLayoutHelper textLayout = gui.getTextLayout(); - WidgetManager widgetManager = gui.getWidgetManager(); textLayout.startPage(GuiAlyzer.COLUMN_0, GuiAlyzer.COLUMN_1, GuiAlyzer.COLUMN_2); @@ -206,7 +203,12 @@ public class BeeAlyzer extends Alyzer implements I @SideOnly(Side.CLIENT) @Override - public void drawAnalyticsPage3(GuiAlyzer gui, IBee bee, EnumBeeType type) { + public void drawAnalyticsPage3(GuiAlyzer gui, ItemStack itemStack) { + IBee bee = BeeManager.beeRoot.getMember(itemStack); + if (bee == null) { + return; + } + TextLayoutHelper textLayout = gui.getTextLayout(); WidgetManager widgetManager = gui.getWidgetManager(); @@ -248,12 +250,7 @@ public class BeeAlyzer extends Alyzer implements I textLayout.endPage(); } - - @Override - public EnumBeeType getDefaultType() { - return EnumBeeType.DRONE; - } - + @Override public List getHints() { return Config.hints.get("beealyzer"); diff --git a/src/main/java/forestry/apiculture/genetics/BeeRoot.java b/src/main/java/forestry/apiculture/genetics/BeeRoot.java index e949c284c..87315b2f6 100644 --- a/src/main/java/forestry/apiculture/genetics/BeeRoot.java +++ b/src/main/java/forestry/apiculture/genetics/BeeRoot.java @@ -42,7 +42,7 @@ import forestry.api.apiculture.IBeekeepingLogic; import forestry.api.apiculture.IBeekeepingMode; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAllele; -import forestry.api.genetics.IAlyzer; +import forestry.api.genetics.IAlyzerPlugin; import forestry.api.genetics.IChromosome; import forestry.api.genetics.IChromosomeType; import forestry.api.genetics.IIndividual; @@ -138,11 +138,6 @@ public class BeeRoot extends SpeciesRoot implements IBeeRoot { beeStack.setTagCompound(nbttagcompound); return beeStack; } - - @Override - public IAlyzer getAlyzer() { - return new BeeAlyzer(); - } @Nullable @Override @@ -379,4 +374,9 @@ public class BeeRoot extends SpeciesRoot implements IBeeRoot { public IChromosomeType getKaryotypeKey() { return EnumBeeChromosome.SPECIES; } + + @Override + public IAlyzerPlugin getAlyzerPlugin() { + return BeeAlyzerPlugin.INSTANCE; + } } diff --git a/src/main/java/forestry/arboriculture/PluginArboriculture.java b/src/main/java/forestry/arboriculture/PluginArboriculture.java index a07e4f32d..430c9cc62 100644 --- a/src/main/java/forestry/arboriculture/PluginArboriculture.java +++ b/src/main/java/forestry/arboriculture/PluginArboriculture.java @@ -10,6 +10,7 @@ ******************************************************************************/ package forestry.arboriculture; +import javax.annotation.Nullable; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -45,6 +46,7 @@ import forestry.api.arboriculture.TreeManager; import forestry.api.core.ForestryAPI; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.ILeafTranslator; +import forestry.api.genetics.ISaplingTranslator; import forestry.api.recipes.RecipeManagers; import forestry.api.storage.ICrateRegistry; import forestry.api.storage.StorageManager; @@ -382,6 +384,7 @@ public class PluginArboriculture extends BlankForestryPlugin { private static void registerErsatzGenomes() { AlleleManager.leafTranslators.put(Blocks.LEAVES, new ILeafTranslator() { + @Nullable @Override public ITree getTreeFromLeaf(IBlockState leafBlockState) { if (!leafBlockState.getValue(BlockOldLeaf.DECAYABLE)) { @@ -401,6 +404,7 @@ public class PluginArboriculture extends BlankForestryPlugin { } }); AlleleManager.leafTranslators.put(Blocks.LEAVES2, new ILeafTranslator() { + @Nullable @Override public ITree getTreeFromLeaf(IBlockState leafBlockState) { if (!leafBlockState.getValue(BlockNewLeaf.DECAYABLE)) { @@ -416,12 +420,27 @@ public class PluginArboriculture extends BlankForestryPlugin { } }); - AlleleManager.saplingTranslation.put(new ItemStack(Blocks.SAPLING, 1, 0), TreeDefinition.Oak.getIndividual()); - AlleleManager.saplingTranslation.put(new ItemStack(Blocks.SAPLING, 1, 1), TreeDefinition.Spruce.getIndividual()); - AlleleManager.saplingTranslation.put(new ItemStack(Blocks.SAPLING, 1, 2), TreeDefinition.Birch.getIndividual()); - AlleleManager.saplingTranslation.put(new ItemStack(Blocks.SAPLING, 1, 3), TreeDefinition.Jungle.getIndividual()); - AlleleManager.saplingTranslation.put(new ItemStack(Blocks.SAPLING, 1, 4), TreeDefinition.AcaciaVanilla.getIndividual()); - AlleleManager.saplingTranslation.put(new ItemStack(Blocks.SAPLING, 1, 5), TreeDefinition.DarkOak.getIndividual()); + AlleleManager.saplingTranslation.put(Item.getItemFromBlock(Blocks.SAPLING), new ISaplingTranslator() { + @Nullable + @Override + public ITree getTreeFromSapling(ItemStack sapling) { + switch (sapling.getMetadata()) { + case 0: + return TreeDefinition.Oak.getIndividual(); + case 1: + return TreeDefinition.Spruce.getIndividual(); + case 2: + return TreeDefinition.Birch.getIndividual(); + case 3: + return TreeDefinition.Jungle.getIndividual(); + case 4: + return TreeDefinition.AcaciaVanilla.getIndividual(); + case 5: + return TreeDefinition.DarkOak.getIndividual(); + } + return null; + } + }); } @Override diff --git a/src/main/java/forestry/arboriculture/genetics/TreeAlyzer.java b/src/main/java/forestry/arboriculture/genetics/TreeAlyzerPlugin.java similarity index 85% rename from src/main/java/forestry/arboriculture/genetics/TreeAlyzer.java rename to src/main/java/forestry/arboriculture/genetics/TreeAlyzerPlugin.java index 785138924..995dd8bb5 100644 --- a/src/main/java/forestry/arboriculture/genetics/TreeAlyzer.java +++ b/src/main/java/forestry/arboriculture/genetics/TreeAlyzerPlugin.java @@ -12,16 +12,18 @@ package forestry.arboriculture.genetics; import java.util.ArrayList; import java.util.Collections; +import java.util.HashMap; import java.util.List; import java.util.Locale; +import java.util.Map; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.text.TextFormatting; import net.minecraftforge.common.EnumPlantType; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; + import forestry.api.arboriculture.EnumGermlingType; import forestry.api.arboriculture.EnumTreeChromosome; import forestry.api.arboriculture.IAlleleFruit; @@ -31,27 +33,24 @@ import forestry.api.arboriculture.ITree; import forestry.api.arboriculture.TreeManager; import forestry.api.genetics.IAllele; import forestry.api.genetics.IAlleleInteger; +import forestry.api.genetics.IAlyzerPlugin; import forestry.api.genetics.IFruitFamily; import forestry.arboriculture.PluginArboriculture; import forestry.arboriculture.genetics.alleles.AlleleFruit; import forestry.core.config.Config; -import forestry.core.genetics.Alyzer; import forestry.core.genetics.alleles.AllelePlantType; import forestry.core.gui.GuiAlyzer; -import forestry.core.gui.IHintSource; import forestry.core.gui.TextLayoutHelper; -import forestry.core.gui.widgets.WidgetManager; -import forestry.core.inventory.ItemInventoryAlyzer; import forestry.core.proxy.Proxies; -import forestry.core.utils.GeneticsUtil; import forestry.core.utils.Translator; -public class TreeAlyzer extends Alyzer implements IHintSource { - - public TreeAlyzer() { - super(TreeManager.treeRoot); - - ArrayList treeList = new ArrayList<>(); +public class TreeAlyzerPlugin implements IAlyzerPlugin { + public static final TreeAlyzerPlugin INSTANCE = new TreeAlyzerPlugin(); + + protected final Map iconStacks = new HashMap<>(); + + private TreeAlyzerPlugin() { + List treeList = new ArrayList<>(); PluginArboriculture.items.sapling.addCreativeItems(treeList, false); for (ItemStack treeStack : treeList) { IAlleleTreeSpecies species = TreeGenome.getSpecies(treeStack); @@ -60,37 +59,18 @@ public class TreeAlyzer extends Alyzer imple } } } - - @Override - public boolean canSlotAccept(ItemInventoryAlyzer inventory, int slotIndex, ItemStack itemStack) { - if (!TreeManager.treeRoot.isMember(itemStack)) { - ItemStack ersatz = GeneticsUtil.convertSaplingToGeneticEquivalent(itemStack); - if (ersatz != null) { - return super.canSlotAccept(inventory, slotIndex, ersatz); - } - } - return super.canSlotAccept(inventory, slotIndex, itemStack); - } - - @Override - public void onSlotClick(ItemInventoryAlyzer inventory, int slotIndex, EntityPlayer player) { - ItemStack specimen = inventory.getStackInSlot(ItemInventoryAlyzer.SLOT_SPECIMEN); - if (!TreeManager.treeRoot.isMember(specimen)) { - ItemStack ersatz = GeneticsUtil.convertSaplingToGeneticEquivalent(specimen); - if (ersatz != null) { - inventory.setInventorySlotContents(ItemInventoryAlyzer.SLOT_SPECIMEN, ersatz); - } - } - - super.onSlotClick(inventory, slotIndex, player); - } @SideOnly(Side.CLIENT) @Override - public void drawAnalyticsPage1(GuiAlyzer gui, ITree tree, EnumGermlingType type) { + public void drawAnalyticsPage1(GuiAlyzer gui, ItemStack itemStack) { + ITree tree = TreeManager.treeRoot.getMember(itemStack); + if (tree == null) { + return; + } + EnumGermlingType type = TreeManager.treeRoot.getType(itemStack); + TextLayoutHelper textLayout = gui.getTextLayout(); - WidgetManager widgetManager = gui.getWidgetManager(); - + textLayout.startPage(GuiAlyzer.COLUMN_0, GuiAlyzer.COLUMN_1, GuiAlyzer.COLUMN_2); textLayout.drawLine(Translator.translateToLocal("for.gui.active"), GuiAlyzer.COLUMN_1); @@ -134,10 +114,14 @@ public class TreeAlyzer extends Alyzer imple @SideOnly(Side.CLIENT) @Override - public void drawAnalyticsPage2(GuiAlyzer gui, ITree tree, EnumGermlingType type) { + public void drawAnalyticsPage2(GuiAlyzer gui, ItemStack itemStack) { + ITree tree = TreeManager.treeRoot.getMember(itemStack); + if (tree == null) { + return; + } + TextLayoutHelper textLayout = gui.getTextLayout(); - WidgetManager widgetManager = gui.getWidgetManager(); - + textLayout.startPage(); int speciesDominance0 = gui.getColorCoding(tree.getGenome().getPrimary().isDominant()); @@ -247,9 +231,13 @@ public class TreeAlyzer extends Alyzer imple @SideOnly(Side.CLIENT) @Override - public void drawAnalyticsPage3(GuiAlyzer gui, ITree tree, EnumGermlingType type) { + public void drawAnalyticsPage3(GuiAlyzer gui, ItemStack itemStack) { + ITree tree = TreeManager.treeRoot.getMember(itemStack); + if (tree == null) { + return; + } + TextLayoutHelper textLayout = gui.getTextLayout(); - WidgetManager widgetManager = gui.getWidgetManager(); textLayout.startPage(GuiAlyzer.COLUMN_0, GuiAlyzer.COLUMN_1, GuiAlyzer.COLUMN_2); @@ -287,11 +275,6 @@ public class TreeAlyzer extends Alyzer imple textLayout.endPage(); } - @Override - public EnumGermlingType getDefaultType() { - return EnumGermlingType.SAPLING; - } - @Override public List getHints() { return Config.hints.get("treealyzer"); diff --git a/src/main/java/forestry/arboriculture/genetics/TreeRoot.java b/src/main/java/forestry/arboriculture/genetics/TreeRoot.java index ead82db2f..3a06fe1b6 100644 --- a/src/main/java/forestry/arboriculture/genetics/TreeRoot.java +++ b/src/main/java/forestry/arboriculture/genetics/TreeRoot.java @@ -49,7 +49,7 @@ import forestry.api.arboriculture.ITreekeepingMode; import forestry.api.arboriculture.TreeManager; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAllele; -import forestry.api.genetics.IAlyzer; +import forestry.api.genetics.IAlyzerPlugin; import forestry.api.genetics.IChromosomeType; import forestry.api.genetics.IIndividual; import forestry.api.genetics.IMutation; @@ -155,7 +155,7 @@ public class TreeRoot extends SpeciesRoot implements ITreeRoot { @Override public ITree getMember(ItemStack itemstack) { - itemstack = GeneticsUtil.convertSaplingToGeneticEquivalent(itemstack); + itemstack = GeneticsUtil.convertToGeneticEquivalent(itemstack); if (!isMember(itemstack)) { return null; } @@ -426,10 +426,10 @@ public class TreeRoot extends SpeciesRoot implements ITreeRoot { public IChromosomeType getKaryotypeKey() { return EnumTreeChromosome.SPECIES; } - + @Override - public IAlyzer getAlyzer() { - return new TreeAlyzer(); + public IAlyzerPlugin getAlyzerPlugin() { + return TreeAlyzerPlugin.INSTANCE; } } diff --git a/src/main/java/forestry/core/genetics/Alyzer.java b/src/main/java/forestry/core/genetics/Alyzer.java deleted file mode 100644 index 5df420dde..000000000 --- a/src/main/java/forestry/core/genetics/Alyzer.java +++ /dev/null @@ -1,139 +0,0 @@ -package forestry.core.genetics; - -import java.util.HashMap; -import java.util.Map; - -import forestry.api.core.ForestryAPI; -import forestry.api.genetics.AlleleManager; -import forestry.api.genetics.IAlyzer; -import forestry.api.genetics.IBreedingTracker; -import forestry.api.genetics.IGuiAlyzer; -import forestry.api.genetics.IIndividual; -import forestry.api.genetics.ISpeciesRoot; -import forestry.api.genetics.ISpeciesType; -import forestry.apiculture.PluginApiculture; -import forestry.apiculture.items.ItemRegistryApiculture; -import forestry.core.PluginCore; -import forestry.core.config.Constants; -import forestry.core.inventory.ItemInventoryAlyzer; -import forestry.plugins.ForestryPluginUids; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.ResourceLocation; - -public abstract class Alyzer implements IAlyzer { - - protected final Map iconStacks = new HashMap<>(); - private final ISpeciesRoot speciesRoot; - - public Alyzer(ISpeciesRoot speciesRoot) { - this.speciesRoot = speciesRoot; - } - - @Override - public boolean canSlotAccept(ItemInventoryAlyzer inventory, int slotIndex, ItemStack itemStack) { - if (slotIndex == ItemInventoryAlyzer.SLOT_ENERGY) { - if(inventory.hasSpecimen()){ - ISpeciesRoot speciesRoot = AlleleManager.alleleRegistry.getSpeciesRoot(inventory.getSpecimen()); - return speciesRoot.getAlyzer().isAlyzingFuel(itemStack); - } - return false; - } - ISpeciesRoot speciesRoot = AlleleManager.alleleRegistry.getSpeciesRoot(itemStack); - if (speciesRoot == null || !speciesRoot.isMember(itemStack)) { - return false; - } - - // only allow one slot to be used at a time - if (inventory.hasSpecimen() && inventory.getStackInSlot(slotIndex) == null) { - return false; - } - - if (slotIndex == ItemInventoryAlyzer.SLOT_SPECIMEN) { - return true; - } - - IIndividual individual = speciesRoot.getMember(itemStack); - return individual.isAnalyzed(); - } - - @Override - public void onSlotClick(ItemInventoryAlyzer inventory, int slotIndex, EntityPlayer player) { - // Source slot to analyze empty - ItemStack specimen = inventory.getStackInSlot(ItemInventoryAlyzer.SLOT_SPECIMEN); - if (specimen == null) { - return; - } - - ISpeciesRoot speciesRoot = AlleleManager.alleleRegistry.getSpeciesRoot(specimen); - - // No individual, abort - if(speciesRoot == null){ - return; - } - - IIndividual individual = speciesRoot.getMember(specimen); - - // Analyze if necessary - if (!individual.isAnalyzed()) { - - if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.APICULTURE)) { - // Requires energy - if (!speciesRoot.getAlyzer().isAlyzingFuel(inventory.getStackInSlot(ItemInventoryAlyzer.SLOT_ENERGY))) { - return; - } - } - - individual.analyze(); - if (player != null) { - IBreedingTracker breedingTracker = speciesRoot.getBreedingTracker(player.worldObj, player.getGameProfile()); - breedingTracker.registerSpecies(individual.getGenome().getPrimary()); - breedingTracker.registerSpecies(individual.getGenome().getSecondary()); - } - - NBTTagCompound nbttagcompound = new NBTTagCompound(); - individual.writeToNBT(nbttagcompound); - specimen.setTagCompound(nbttagcompound); - - // Decrease energy - inventory.decrStackSize(ItemInventoryAlyzer.SLOT_ENERGY, 1); - } - - inventory.setInventorySlotContents(ItemInventoryAlyzer.SLOT_ANALYZE_1, specimen); - inventory.setInventorySlotContents(ItemInventoryAlyzer.SLOT_SPECIMEN, null); - PluginCore.items.portableAlyzer.openGui(player); - } - - @Override - public ISpeciesRoot getSpeciesRoot() { - return speciesRoot; - } - - @Override - public Map getIconStacks() { - return iconStacks; - } - - @Override - public ResourceLocation getGuiTexture() { - return new ResourceLocation(Constants.RESOURCE_ID, Constants.TEXTURE_PATH_GUI + "/portablealyzer.png"); - } - - @Override - public boolean isAlyzingFuel(ItemStack itemstack) { - if (itemstack == null || itemstack.stackSize <= 0) { - return false; - } - - ItemRegistryApiculture beeItems = PluginApiculture.items; - if (beeItems == null) { - return false; - } - - Item item = itemstack.getItem(); - return beeItems.honeyDrop == item || beeItems.honeydew == item; - } - -} diff --git a/src/main/java/forestry/core/gui/GuiAlyzer.java b/src/main/java/forestry/core/gui/GuiAlyzer.java index 14733bf71..411043add 100755 --- a/src/main/java/forestry/core/gui/GuiAlyzer.java +++ b/src/main/java/forestry/core/gui/GuiAlyzer.java @@ -22,22 +22,21 @@ import net.minecraft.client.renderer.RenderHelper; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; + import forestry.api.apiculture.EnumBeeChromosome; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.EnumTolerance; import forestry.api.genetics.IAllele; import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IAlleleTolerance; -import forestry.api.genetics.IAlyzer; import forestry.api.genetics.IBreedingTracker; import forestry.api.genetics.IChromosomeType; import forestry.api.genetics.IClassification; -import forestry.api.genetics.IGuiAlyzer; import forestry.api.genetics.IClassification.EnumClassLevel; import forestry.api.genetics.IIndividual; import forestry.api.genetics.IMutation; import forestry.api.genetics.ISpeciesRoot; -import forestry.api.genetics.ISpeciesType; +import forestry.core.config.Constants; import forestry.core.genetics.mutations.EnumMutateChance; import forestry.core.gui.ledgers.LedgerManager; import forestry.core.gui.widgets.ItemStackWidget; @@ -46,30 +45,21 @@ import forestry.core.inventory.ItemInventoryAlyzer; import forestry.core.proxy.Proxies; import forestry.core.utils.Translator; -public class GuiAlyzer extends GuiForestry implements IGuiAlyzer { +public class GuiAlyzer extends GuiForestry { public static final int COLUMN_0 = 12; public static final int COLUMN_1 = 90; public static final int COLUMN_2 = 155; - private final ISpeciesRoot speciesRoot; - private final IBreedingTracker breedingTracker; - private final IAlyzer alyzer; - protected final Map iconStacks = new HashMap<>(); - public GuiAlyzer(EntityPlayer player, IAlyzer alyzer, ItemInventoryAlyzer inventory) { - super(alyzer.getGuiTexture(), new ContainerAlyzer(inventory, player), inventory); + public GuiAlyzer(EntityPlayer player, ItemInventoryAlyzer inventory) { + super(Constants.TEXTURE_PATH_GUI + "/portablealyzer.png", new ContainerAlyzer(inventory, player), inventory); this.xSize = 246; this.ySize = 238; - - this.speciesRoot = alyzer.getSpeciesRoot(); - this.breedingTracker = this.speciesRoot.getBreedingTracker(player.worldObj, player.getGameProfile()); - this.alyzer = alyzer; } - @Override public final int getColorCoding(boolean dominant) { if (dominant) { return fontColor.get("gui.beealyzer.dominant"); @@ -78,7 +68,6 @@ public class GuiAlyzer extends GuiForestry implemen } } - @Override public final void drawLine(String text, int x, IIndividual individual, IChromosomeType chromosome, boolean inactive) { if (!inactive) { textLayout.drawLine(text, x, getColorCoding(individual.getGenome().getActiveAllele(chromosome).isDominant())); @@ -87,7 +76,6 @@ public class GuiAlyzer extends GuiForestry implemen } } - @Override public final void drawSplitLine(String text, int x, int maxWidth, IIndividual individual, IChromosomeType chromosome, boolean inactive) { if (!inactive) { textLayout.drawSplitLine(text, x, maxWidth, getColorCoding(individual.getGenome().getActiveAllele(chromosome).isDominant())); @@ -96,13 +84,11 @@ public class GuiAlyzer extends GuiForestry implemen } } - @Override public final void drawRow(String text0, String text1, String text2, IIndividual individual, IChromosomeType chromosome) { textLayout.drawRow(text0, text1, text2, fontColor.get("gui.screen"), getColorCoding(individual.getGenome().getActiveAllele(chromosome).isDominant()), getColorCoding(individual.getGenome().getInactiveAllele(chromosome).isDominant())); } - @Override public final void drawChromosomeRow(String chromosomeName, IIndividual individual, IChromosomeType chromosome) { IAllele active = individual.getGenome().getActiveAllele(chromosome); IAllele inactive = individual.getGenome().getInactiveAllele(chromosome); @@ -111,7 +97,6 @@ public class GuiAlyzer extends GuiForestry implemen getColorCoding(inactive.isDominant())); } - @Override public final void drawSpeciesRow(String text0, IIndividual individual, IChromosomeType chromosome, String customPrimaryName, String customSecondaryName) { IAlleleSpecies primary = individual.getGenome().getPrimary(); IAlleleSpecies secondary = individual.getGenome().getSecondary(); @@ -144,51 +129,66 @@ public class GuiAlyzer extends GuiForestry implemen super.drawGuiContainerBackgroundLayer(var1, mouseX, mouseY); widgetManager.clear(); - int page = 0; - IIndividual individual = null; - ISpeciesType speciesType = alyzer.getDefaultType(); - - for (int k = ItemInventoryAlyzer.SLOT_SPECIMEN; k <= ItemInventoryAlyzer.SLOT_ANALYZE_5; k++) { - if (k == ItemInventoryAlyzer.SLOT_ENERGY) { - continue; - } - - if (inventory.getStackInSlot(k) == null) { - continue; - } - individual = speciesRoot.getMember(inventory.getStackInSlot(k)); - speciesType = speciesRoot.getType(inventory.getStackInSlot(k)); - if (individual == null || !individual.isAnalyzed()) { - continue; - } - - page = k; - break; + int specimenSlot = getSpecimenSlot(); + if (specimenSlot < ItemInventoryAlyzer.SLOT_ANALYZE_1) { + drawAnalyticsOverview(); + return; } - switch (page) { - case 1: - alyzer.drawAnalyticsPage1(this, individual, speciesType); + ItemStack stackInSlot = inventory.getStackInSlot(specimenSlot); + ISpeciesRoot speciesRoot = AlleleManager.alleleRegistry.getSpeciesRoot(stackInSlot); + + switch (specimenSlot) { + case ItemInventoryAlyzer.SLOT_ANALYZE_1: { + speciesRoot.getAlyzerPlugin().drawAnalyticsPage1(this, stackInSlot); break; - case 2: - alyzer.drawAnalyticsPage2(this, individual, speciesType); + } + case ItemInventoryAlyzer.SLOT_ANALYZE_2: { + speciesRoot.getAlyzerPlugin().drawAnalyticsPage2(this, stackInSlot); break; - case 3: - alyzer.drawAnalyticsPage3(this, individual, speciesType); + } + case ItemInventoryAlyzer.SLOT_ANALYZE_3: { + speciesRoot.getAlyzerPlugin().drawAnalyticsPage3(this, stackInSlot); break; - case 4: + } + case ItemInventoryAlyzer.SLOT_ANALYZE_4: { + IIndividual individual = speciesRoot.getMember(stackInSlot); drawAnalyticsPageMutations(individual); break; - case 6: + } + case ItemInventoryAlyzer.SLOT_ANALYZE_5: { + IIndividual individual = speciesRoot.getMember(stackInSlot); drawAnalyticsPageClassification(individual); break; + } default: drawAnalyticsOverview(); } } - @Override + private int getSpecimenSlot() { + for (int k = ItemInventoryAlyzer.SLOT_SPECIMEN; k <= ItemInventoryAlyzer.SLOT_ANALYZE_5; k++) { + ItemStack stackInSlot = inventory.getStackInSlot(k); + if (stackInSlot == null) { + continue; + } + + ISpeciesRoot speciesRoot = AlleleManager.alleleRegistry.getSpeciesRoot(stackInSlot); + if (speciesRoot == null) { + continue; + } + + IIndividual individual = speciesRoot.getMember(stackInSlot); + if (individual == null || !individual.isAnalyzed()) { + continue; + } + + return k; + } + return -1; + } + public void drawAnalyticsOverview() { textLayout.startPage(); @@ -217,7 +217,6 @@ public class GuiAlyzer extends GuiForestry implemen textLayout.endPage(); } - @Override public final void drawAnalyticsPageClassification(IIndividual individual) { textLayout.startPage(); @@ -285,7 +284,6 @@ public class GuiAlyzer extends GuiForestry implemen textLayout.endPage(); } - @Override public void drawAnalyticsPageMutations(IIndividual individual) { textLayout.startPage(COLUMN_0, COLUMN_1, COLUMN_2); @@ -296,6 +294,8 @@ public class GuiAlyzer extends GuiForestry implemen HashMap combinations = new HashMap<>(); + ISpeciesRoot speciesRoot = individual.getGenome().getSpeciesRoot(); + for (IMutation mutation : speciesRoot.getCombinations(individual.getGenome().getPrimary())) { combinations.put(mutation, individual.getGenome().getPrimary()); } @@ -307,17 +307,20 @@ public class GuiAlyzer extends GuiForestry implemen int columnWidth = 50; int x = 0; + EntityPlayer player = Proxies.common.getPlayer(); + IBreedingTracker breedingTracker = speciesRoot.getBreedingTracker(player.worldObj, player.getGameProfile()); + for (Map.Entry mutation : combinations.entrySet()) { if (breedingTracker.isDiscovered(mutation.getKey())) { - drawMutationInfo(mutation.getKey(), mutation.getValue(), COLUMN_0 + x); + drawMutationInfo(mutation.getKey(), mutation.getValue(), COLUMN_0 + x, breedingTracker); } else { // Do not display secret undiscovered mutations. if (mutation.getKey().isSecret()) { continue; } - drawUnknownMutation(mutation.getKey(), COLUMN_0 + x); + drawUnknownMutation(mutation.getKey(), COLUMN_0 + x, breedingTracker); } x += columnWidth; @@ -330,24 +333,23 @@ public class GuiAlyzer extends GuiForestry implemen textLayout.endPage(); } - @Override - public void drawMutationInfo(IMutation combination, IAllele species, int x) { + public void drawMutationInfo(IMutation combination, IAllele species, int x, IBreedingTracker breedingTracker) { ItemStack partnerBee = iconStacks.get(combination.getPartner(species).getUID()); widgetManager.add(new ItemStackWidget(widgetManager, x, textLayout.getLineY(), partnerBee)); - drawProbabilityArrow(combination, guiLeft + x + 18, guiTop + textLayout.getLineY() + 4); + drawProbabilityArrow(combination, guiLeft + x + 18, guiTop + textLayout.getLineY() + 4, breedingTracker); IAllele result = combination.getTemplate()[EnumBeeChromosome.SPECIES.ordinal()]; ItemStack resultBee = iconStacks.get(result.getUID()); widgetManager.add(new ItemStackWidget(widgetManager, x + 33, textLayout.getLineY(), resultBee)); } - private void drawUnknownMutation(IMutation combination, int x) { + private void drawUnknownMutation(IMutation combination, int x, IBreedingTracker breedingTracker) { drawQuestionMark(guiLeft + x, guiTop + textLayout.getLineY()); - drawProbabilityArrow(combination, guiLeft + x + 18, guiTop + textLayout.getLineY() + 4); + drawProbabilityArrow(combination, guiLeft + x + 18, guiTop + textLayout.getLineY() + 4, breedingTracker); drawQuestionMark(guiLeft + x + 32, guiTop + textLayout.getLineY()); } @@ -357,7 +359,7 @@ public class GuiAlyzer extends GuiForestry implemen drawTexturedModalRect(x, y, 78, 240, 16, 16); } - private void drawProbabilityArrow(IMutation combination, int x, int y) { + private void drawProbabilityArrow(IMutation combination, int x, int y, IBreedingTracker breedingTracker) { float chance = combination.getBaseChance(); int line = 247; int column = 100; @@ -394,7 +396,6 @@ public class GuiAlyzer extends GuiForestry implemen } } - @Override public void drawToleranceInfo(IAlleleTolerance toleranceAllele, int x) { int textColor = getColorCoding(toleranceAllele.isDominant()); EnumTolerance tolerance = toleranceAllele.getValue(); @@ -455,7 +456,6 @@ public class GuiAlyzer extends GuiForestry implemen drawTexturedModalRect(guiLeft + x, guiTop + y, 45, 247, 15, 9); } - @Override public void drawFertilityInfo(int fertility, int x, int textColor, int texOffset) { // Enable correct lighting. GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); diff --git a/src/main/java/forestry/core/gui/GuiForestry.java b/src/main/java/forestry/core/gui/GuiForestry.java index 0c15b8561..794b1d2d3 100755 --- a/src/main/java/forestry/core/gui/GuiForestry.java +++ b/src/main/java/forestry/core/gui/GuiForestry.java @@ -15,7 +15,6 @@ import java.awt.Rectangle; import java.io.IOException; import java.util.List; -import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.renderer.GlStateManager; @@ -70,12 +69,6 @@ public abstract class GuiForestry ext this.textLayout = new TextLayoutHelper(this, this.fontColor); } - @Override - public void setWorldAndResolution(Minecraft minecraft, int width, int height) { - super.setWorldAndResolution(minecraft, width, height); - textLayout.setFontRendererObj(fontRendererObj); - } - /* LEDGERS */ @Override public void initGui() { diff --git a/src/main/java/forestry/core/gui/TextLayoutHelper.java b/src/main/java/forestry/core/gui/TextLayoutHelper.java index ca9643755..9210deedb 100644 --- a/src/main/java/forestry/core/gui/TextLayoutHelper.java +++ b/src/main/java/forestry/core/gui/TextLayoutHelper.java @@ -10,7 +10,6 @@ ******************************************************************************/ package forestry.core.gui; -import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.renderer.GlStateManager; import forestry.core.render.FontColour; @@ -20,7 +19,6 @@ public class TextLayoutHelper { private final GuiForestry guiForestry; private final int defaultFontColor; - private FontRenderer fontRendererObj; public int column0; public int column1; @@ -31,10 +29,6 @@ public class TextLayoutHelper { this.guiForestry = guiForestry; this.defaultFontColor = fontColour.get("gui.screen"); } - - public void setFontRendererObj(FontRenderer fontRendererObj) { - this.fontRendererObj = fontRendererObj; - } public void startPage() { line = LINE_HEIGHT; @@ -89,15 +83,15 @@ public class TextLayoutHelper { } public void drawCenteredLine(String text, int x, int width, int color) { - fontRendererObj.drawString(text, guiForestry.getGuiLeft() + x + getCenteredOffset(text, width), guiForestry.getGuiTop() + line, color); + guiForestry.getFontRenderer().drawString(text, guiForestry.getGuiLeft() + x + getCenteredOffset(text, width), guiForestry.getGuiTop() + line, color); } public void drawLine(String text, int x, int color) { - fontRendererObj.drawString(text, guiForestry.getGuiLeft() + x, guiForestry.getGuiTop() + line, color); + guiForestry.getFontRenderer().drawString(text, guiForestry.getGuiLeft() + x, guiForestry.getGuiTop() + line, color); } public void drawSplitLine(String text, int x, int maxWidth, int color) { - fontRendererObj.drawSplitString(text, guiForestry.getGuiLeft() + x, guiForestry.getGuiTop() + line, maxWidth, color); + guiForestry.getFontRenderer().drawSplitString(text, guiForestry.getGuiLeft() + x, guiForestry.getGuiTop() + line, maxWidth, color); } public int getCenteredOffset(String string) { @@ -105,6 +99,6 @@ public class TextLayoutHelper { } public int getCenteredOffset(String string, int xWidth) { - return (xWidth - fontRendererObj.getStringWidth(string)) / 2; + return (xWidth - guiForestry.getFontRenderer().getStringWidth(string)) / 2; } } diff --git a/src/main/java/forestry/core/inventory/InventoryAnalyzer.java b/src/main/java/forestry/core/inventory/InventoryAnalyzer.java index 27bee5ef6..54f8f696e 100644 --- a/src/main/java/forestry/core/inventory/InventoryAnalyzer.java +++ b/src/main/java/forestry/core/inventory/InventoryAnalyzer.java @@ -56,7 +56,7 @@ public class InventoryAnalyzer extends InventoryAdapterTile { @Override public void setInventorySlotContents(int slotId, ItemStack itemStack) { if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.ARBORICULTURE) && !TreeManager.treeRoot.isMember(itemStack)) { - ItemStack ersatz = GeneticsUtil.convertSaplingToGeneticEquivalent(itemStack); + ItemStack ersatz = GeneticsUtil.convertToGeneticEquivalent(itemStack); if (ersatz != null) { itemStack = ersatz; } diff --git a/src/main/java/forestry/core/inventory/InventoryEscritoire.java b/src/main/java/forestry/core/inventory/InventoryEscritoire.java index 3d100542a..fa931f745 100644 --- a/src/main/java/forestry/core/inventory/InventoryEscritoire.java +++ b/src/main/java/forestry/core/inventory/InventoryEscritoire.java @@ -80,7 +80,7 @@ public class InventoryEscritoire extends InventoryAdapterTile { } if (slotIndex == SLOT_ANALYZE && !tile.getWorld().isRemote) { if (!AlleleManager.alleleRegistry.isIndividual(getStackInSlot(SLOT_ANALYZE)) && getStackInSlot(SLOT_ANALYZE) != null) { - ItemStack ersatz = GeneticsUtil.convertSaplingToGeneticEquivalent(getStackInSlot(SLOT_ANALYZE)); + ItemStack ersatz = GeneticsUtil.convertToGeneticEquivalent(getStackInSlot(SLOT_ANALYZE)); if (ersatz != null) { setInventorySlotContents(SLOT_ANALYZE, ersatz); } diff --git a/src/main/java/forestry/core/inventory/ItemInventoryAlyzer.java b/src/main/java/forestry/core/inventory/ItemInventoryAlyzer.java index 16e886a4d..1e75e0c9d 100644 --- a/src/main/java/forestry/core/inventory/ItemInventoryAlyzer.java +++ b/src/main/java/forestry/core/inventory/ItemInventoryAlyzer.java @@ -10,58 +10,88 @@ ******************************************************************************/ package forestry.core.inventory; +import com.google.common.collect.ImmutableSet; + import java.util.Collections; import java.util.List; -import com.google.common.collect.ImmutableSet; - import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; + +import forestry.api.core.ForestryAPI; import forestry.api.core.IErrorSource; import forestry.api.core.IErrorState; import forestry.api.genetics.AlleleManager; -import forestry.api.genetics.IAlyzer; +import forestry.api.genetics.IAlyzerPlugin; +import forestry.api.genetics.IBreedingTracker; +import forestry.api.genetics.IIndividual; import forestry.api.genetics.ISpeciesRoot; +import forestry.apiculture.PluginApiculture; +import forestry.apiculture.items.ItemRegistryApiculture; +import forestry.core.PluginCore; import forestry.core.errors.EnumErrorCode; import forestry.core.gui.IHintSource; import forestry.core.utils.GeneticsUtil; +import forestry.plugins.ForestryPluginUids; public class ItemInventoryAlyzer extends ItemInventory implements IErrorSource, IHintSource { - public static final int SLOT_SPECIMEN = 0; - public static final int SLOT_ANALYZE_1 = 1; - public static final int SLOT_ANALYZE_2 = 2; - public static final int SLOT_ANALYZE_3 = 3; - public static final int SLOT_ANALYZE_4 = 4; + public static final int SLOT_ENERGY = 0; + public static final int SLOT_SPECIMEN = 1; + public static final int SLOT_ANALYZE_1 = 2; + public static final int SLOT_ANALYZE_2 = 3; + public static final int SLOT_ANALYZE_3 = 4; + public static final int SLOT_ANALYZE_4 = 5; public static final int SLOT_ANALYZE_5 = 6; - public static final int SLOT_ENERGY = 5; - public IAlyzer alyzer; - - public ItemInventoryAlyzer(EntityPlayer player, ItemStack itemstack, IAlyzer alyzer) { + public ItemInventoryAlyzer(EntityPlayer player, ItemStack itemstack) { super(player, 7, itemstack); - - this.alyzer = alyzer; + } + + public static boolean isAlyzingFuel(ItemStack itemstack) { + if (itemstack == null || itemstack.stackSize <= 0) { + return false; + } + + ItemRegistryApiculture beeItems = PluginApiculture.items; + if (beeItems == null) { + return false; + } + + Item item = itemstack.getItem(); + return beeItems.honeyDrop == item || beeItems.honeydew == item; } @Override public boolean canSlotAccept(int slotIndex, ItemStack itemStack) { - ISpeciesRoot speciesRoot; - if(!hasSpecimen() && slotIndex == SLOT_SPECIMEN){ - ItemStack ersatz = GeneticsUtil.convertSaplingToGeneticEquivalent(itemStack); - speciesRoot = AlleleManager.alleleRegistry.getSpeciesRoot(ersatz); - }else{ - speciesRoot = AlleleManager.alleleRegistry.getSpeciesRoot(getSpecimen()); + if (slotIndex == SLOT_ENERGY) { + return isAlyzingFuel(itemStack); } - if(speciesRoot != null){ - return speciesRoot.getAlyzer().canSlotAccept(this, slotIndex, itemStack); + + itemStack = GeneticsUtil.convertToGeneticEquivalent(itemStack); + ISpeciesRoot speciesRoot = AlleleManager.alleleRegistry.getSpeciesRoot(itemStack); + if (speciesRoot == null) { + return false; } - return alyzer.canSlotAccept(this, slotIndex, itemStack); + + // only allow one slot to be used at a time + if (hasSpecimen() && getStackInSlot(slotIndex) == null) { + return false; + } + + if (slotIndex == SLOT_SPECIMEN) { + return true; + } + + IIndividual individual = speciesRoot.getMember(itemStack); + return individual.isAnalyzed(); } @Override public void setInventorySlotContents(int slotIndex, ItemStack itemStack) { if(!hasSpecimen() && slotIndex == SLOT_SPECIMEN){ - ItemStack ersatz = GeneticsUtil.convertSaplingToGeneticEquivalent(itemStack); + ItemStack ersatz = GeneticsUtil.convertToGeneticEquivalent(itemStack); if(ersatz != null){ super.setInventorySlotContents(slotIndex, ersatz); return; @@ -72,18 +102,55 @@ public class ItemInventoryAlyzer extends ItemInventory implements IErrorSource, @Override public void onSlotClick(int slotIndex, EntityPlayer player) { - ISpeciesRoot speciesRoot; - if(hasSpecimen() && AlleleManager.alleleRegistry.getSpeciesRoot(getSpecimen()) == null && slotIndex == SLOT_SPECIMEN){ - ItemStack ersatz = GeneticsUtil.convertSaplingToGeneticEquivalent(getStackInSlot(slotIndex)); - speciesRoot = AlleleManager.alleleRegistry.getSpeciesRoot(ersatz); - }else{ - speciesRoot = AlleleManager.alleleRegistry.getSpeciesRoot(getSpecimen()); + // Source slot to analyze empty + ItemStack specimen = getStackInSlot(SLOT_SPECIMEN); + if (specimen == null) { + return; } - if(speciesRoot != null){ - speciesRoot.getAlyzer().onSlotClick(this, slotIndex, player); - }else{ - alyzer.onSlotClick(this, slotIndex, player); + + ItemStack convertedSpecimen = GeneticsUtil.convertToGeneticEquivalent(specimen); + if (!ItemStack.areItemStacksEqual(specimen, convertedSpecimen)) { + setInventorySlotContents(SLOT_SPECIMEN, convertedSpecimen); + specimen = convertedSpecimen; } + + ISpeciesRoot speciesRoot = AlleleManager.alleleRegistry.getSpeciesRoot(specimen); + + // No individual, abort + if (speciesRoot == null) { + return; + } + + IIndividual individual = speciesRoot.getMember(specimen); + + // Analyze if necessary + if (!individual.isAnalyzed()) { + + if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.APICULTURE)) { + // Requires energy + if (!isAlyzingFuel(getStackInSlot(SLOT_ENERGY))) { + return; + } + } + + individual.analyze(); + if (player != null) { + IBreedingTracker breedingTracker = speciesRoot.getBreedingTracker(player.worldObj, player.getGameProfile()); + breedingTracker.registerSpecies(individual.getGenome().getPrimary()); + breedingTracker.registerSpecies(individual.getGenome().getSecondary()); + } + + NBTTagCompound nbttagcompound = new NBTTagCompound(); + individual.writeToNBT(nbttagcompound); + specimen.setTagCompound(nbttagcompound); + + // Decrease energy + decrStackSize(SLOT_ENERGY, 1); + } + + setInventorySlotContents(SLOT_ANALYZE_1, specimen); + setInventorySlotContents(SLOT_SPECIMEN, null); + PluginCore.items.portableAlyzer.openGui(player); } @Override @@ -92,9 +159,9 @@ public class ItemInventoryAlyzer extends ItemInventory implements IErrorSource, if (!hasSpecimen()) { errorStates.add(EnumErrorCode.NO_SPECIMEN); - }else{ + } else { ISpeciesRoot speciesRoot = AlleleManager.alleleRegistry.getSpeciesRoot(getSpecimen()); - if (speciesRoot != null && !speciesRoot.getAlyzer().isAlyzingFuel(getStackInSlot(SLOT_ENERGY))) { + if (speciesRoot != null && !isAlyzingFuel(getStackInSlot(SLOT_ENERGY))) { errorStates.add(EnumErrorCode.NO_HONEY); } } @@ -104,10 +171,6 @@ public class ItemInventoryAlyzer extends ItemInventory implements IErrorSource, public ItemStack getSpecimen() { for (int i = SLOT_SPECIMEN; i <= SLOT_ANALYZE_5; i++) { - if (i == SLOT_ENERGY) { - continue; - } - ItemStack itemStack = getStackInSlot(i); if (itemStack != null) { return itemStack; @@ -123,11 +186,14 @@ public class ItemInventoryAlyzer extends ItemInventory implements IErrorSource, /* IHintSource */ @Override public List getHints() { - if(hasSpecimen()){ - ISpeciesRoot speciesRoot = AlleleManager.alleleRegistry.getSpeciesRoot(getSpecimen()); - IAlyzer alyzer = speciesRoot.getAlyzer(); - if(alyzer instanceof IHintSource){ - return ((IHintSource)alyzer).getHints(); + ItemStack specimen = getSpecimen(); + if (specimen != null) { + ISpeciesRoot speciesRoot = AlleleManager.alleleRegistry.getSpeciesRoot(specimen); + if (speciesRoot != null) { + IAlyzerPlugin alyzerPlugin = speciesRoot.getAlyzerPlugin(); + if (alyzerPlugin != null) { + return alyzerPlugin.getHints(); + } } } return Collections.emptyList(); diff --git a/src/main/java/forestry/core/items/ItemAlyzer.java b/src/main/java/forestry/core/items/ItemAlyzer.java index c9a4ee1d7..7620532d1 100644 --- a/src/main/java/forestry/core/items/ItemAlyzer.java +++ b/src/main/java/forestry/core/items/ItemAlyzer.java @@ -10,16 +10,16 @@ ******************************************************************************/ package forestry.core.items; +import java.util.List; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import forestry.api.apiculture.BeeManager; + import forestry.api.core.Tabs; -import forestry.api.genetics.AlleleManager; -import forestry.api.genetics.IAlyzer; -import forestry.api.genetics.ISpeciesRoot; import forestry.core.gui.ContainerAlyzer; import forestry.core.gui.GuiAlyzer; import forestry.core.inventory.ItemInventoryAlyzer; +import forestry.core.utils.ItemTooltipUtil; public class ItemAlyzer extends ItemWithGui { public ItemAlyzer() { @@ -33,22 +33,17 @@ public class ItemAlyzer extends ItemWithGui { @Override public Object getGui(EntityPlayer player, ItemStack heldItem, int data) { - IAlyzer alyzer =BeeManager.beeRoot.getAlyzer(); - ItemInventoryAlyzer inventory = new ItemInventoryAlyzer(player, heldItem, null); - if(inventory.getSpecimen() != null){ - ISpeciesRoot speciesRoot = AlleleManager.alleleRegistry.getSpeciesRoot(inventory.getSpecimen()); - alyzer = speciesRoot.getAlyzer(); - } - return new GuiAlyzer(player, alyzer, new ItemInventoryAlyzer(player, heldItem, alyzer)); + return new GuiAlyzer(player, new ItemInventoryAlyzer(player, heldItem)); } @Override public Object getContainer(EntityPlayer player, ItemStack heldItem, int data) { - ItemInventoryAlyzer inventory = new ItemInventoryAlyzer(player, heldItem, null); - if(inventory.getSpecimen() != null){ - ISpeciesRoot speciesRoot = AlleleManager.alleleRegistry.getSpeciesRoot(inventory.getSpecimen()); - return new ContainerAlyzer(new ItemInventoryAlyzer(player, heldItem, speciesRoot.getAlyzer()), player); - } - return new ContainerAlyzer(new ItemInventoryAlyzer(player, heldItem, BeeManager.beeRoot.getAlyzer()), player); + return new ContainerAlyzer(new ItemInventoryAlyzer(player, heldItem), player); + } + + @Override + public void addInformation(ItemStack stack, EntityPlayer playerIn, List tooltip, boolean advanced) { + super.addInformation(stack, playerIn, tooltip, advanced); + ItemTooltipUtil.addInformation(stack, playerIn, tooltip, advanced); } } diff --git a/src/main/java/forestry/core/tiles/TileAnalyzer.java b/src/main/java/forestry/core/tiles/TileAnalyzer.java index 3ba44b512..dcf00bf33 100644 --- a/src/main/java/forestry/core/tiles/TileAnalyzer.java +++ b/src/main/java/forestry/core/tiles/TileAnalyzer.java @@ -207,7 +207,7 @@ public class TileAnalyzer extends TilePowered implements ISidedInventory, ILiqui } if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.ARBORICULTURE) && !TreeManager.treeRoot.isMember(inputStack)) { - ItemStack ersatz = GeneticsUtil.convertSaplingToGeneticEquivalent(inputStack); + ItemStack ersatz = GeneticsUtil.convertToGeneticEquivalent(inputStack); if (ersatz != null) { inputStack = ersatz; } diff --git a/src/main/java/forestry/core/utils/GeneticsUtil.java b/src/main/java/forestry/core/utils/GeneticsUtil.java index 6c63bbfb2..2825b26a8 100644 --- a/src/main/java/forestry/core/utils/GeneticsUtil.java +++ b/src/main/java/forestry/core/utils/GeneticsUtil.java @@ -12,7 +12,6 @@ package forestry.core.utils; import javax.annotation.Nullable; import java.util.HashSet; -import java.util.Map; import java.util.Set; import net.minecraft.block.Block; @@ -38,6 +37,7 @@ import forestry.api.genetics.IIndividual; import forestry.api.genetics.ILeafTranslator; import forestry.api.genetics.IMutation; import forestry.api.genetics.IPollinatable; +import forestry.api.genetics.ISaplingTranslator; import forestry.api.lepidopterology.IButterfly; import forestry.api.lepidopterology.IButterflyNursery; import forestry.arboriculture.genetics.pollination.CheckPollinatableTree; @@ -145,36 +145,36 @@ public class GeneticsUtil { if (itemStack == null) { return null; } + Item item = itemStack.getItem(); if (item instanceof ItemGE) { return ((ItemGE) item).getIndividual(itemStack); } - for (Map.Entry entry : AlleleManager.saplingTranslation.entrySet()) { - if (ItemStackUtil.isIdenticalItem(itemStack, entry.getKey())) { - return entry.getValue().copy(); - } + ISaplingTranslator saplingTranslator = AlleleManager.saplingTranslation.get(item); + if (saplingTranslator == null) { + return null; } - return null; + return saplingTranslator.getTreeFromSapling(itemStack); } - public static ItemStack convertSaplingToGeneticEquivalent(ItemStack foreign) { + public static ItemStack convertToGeneticEquivalent(ItemStack foreign) { if (foreign == null) { return null; } - if (TreeManager.treeRoot.isMember(foreign)) { + if (AlleleManager.alleleRegistry.getSpeciesRoot(foreign) != null) { return foreign; } - IIndividual tree = getGeneticEquivalent(foreign); - if (!(tree instanceof ITree)) { - return null; + IIndividual individual = getGeneticEquivalent(foreign); + if (individual instanceof ITree) { + ItemStack equivalent = TreeManager.treeRoot.getMemberStack(individual, EnumGermlingType.SAPLING); + equivalent.stackSize = foreign.stackSize; + return equivalent; } - ItemStack ersatz = TreeManager.treeRoot.getMemberStack(tree, EnumGermlingType.SAPLING); - ersatz.stackSize = foreign.stackSize; - return ersatz; + return null; } public static int getResearchComplexity(IAlleleSpecies species, IChromosomeType speciesChromosome) { diff --git a/src/main/java/forestry/core/utils/ItemTooltipUtil.java b/src/main/java/forestry/core/utils/ItemTooltipUtil.java new file mode 100644 index 000000000..1f2ee90eb --- /dev/null +++ b/src/main/java/forestry/core/utils/ItemTooltipUtil.java @@ -0,0 +1,18 @@ +package forestry.core.utils; + +import java.util.List; + +import net.minecraft.client.Minecraft; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; + +public class ItemTooltipUtil { + public static void addInformation(ItemStack stack, EntityPlayer playerIn, List tooltip, boolean advanced) { + String unlocalizedName = stack.getUnlocalizedName(); + String tooltipKey = unlocalizedName + ".tooltip"; + String tooltipInfo = Translator.translateToLocal(tooltipKey); + Minecraft minecraft = Minecraft.getMinecraft(); + List tooltipInfoWrapped = minecraft.fontRendererObj.listFormattedStringToWidth(tooltipInfo, 150); + tooltip.addAll(tooltipInfoWrapped); + } +} diff --git a/src/main/java/forestry/energy/items/ItemEngine.java b/src/main/java/forestry/energy/items/ItemEngine.java index 2e2bf3907..3800a5964 100644 --- a/src/main/java/forestry/energy/items/ItemEngine.java +++ b/src/main/java/forestry/energy/items/ItemEngine.java @@ -3,12 +3,11 @@ package forestry.energy.items; import java.util.List; import net.minecraft.block.Block; -import net.minecraft.client.Minecraft; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import forestry.core.items.ItemBlockForestry; -import forestry.core.utils.Translator; +import forestry.core.utils.ItemTooltipUtil; import forestry.energy.blocks.BlockEngine; public class ItemEngine extends ItemBlockForestry { @@ -20,11 +19,6 @@ public class ItemEngine extends ItemBlockForestry { @Override public void addInformation(ItemStack stack, EntityPlayer playerIn, List tooltip, boolean advanced) { super.addInformation(stack, playerIn, tooltip, advanced); - String unlocalizedName = getUnlocalizedName(stack); - String tooltipKey = unlocalizedName + ".tooltip"; - String tooltipInfo = Translator.translateToLocal(tooltipKey); - Minecraft minecraft = Minecraft.getMinecraft(); - List tooltipInfoWrapped = minecraft.fontRendererObj.listFormattedStringToWidth(tooltipInfo, 150); - tooltip.addAll(tooltipInfoWrapped); + ItemTooltipUtil.addInformation(stack, playerIn, tooltip, advanced); } } diff --git a/src/main/java/forestry/farming/logic/FarmableGE.java b/src/main/java/forestry/farming/logic/FarmableGE.java index 34d34e047..0030df222 100755 --- a/src/main/java/forestry/farming/logic/FarmableGE.java +++ b/src/main/java/forestry/farming/logic/FarmableGE.java @@ -59,7 +59,7 @@ public class FarmableGE implements IFarmable { @Override public boolean isGermling(ItemStack itemstack) { - itemstack = GeneticsUtil.convertSaplingToGeneticEquivalent(itemstack); + itemstack = GeneticsUtil.convertToGeneticEquivalent(itemstack); return TreeManager.treeRoot.isMember(itemstack); } diff --git a/src/main/java/forestry/lepidopterology/genetics/ButterflyRoot.java b/src/main/java/forestry/lepidopterology/genetics/ButterflyRoot.java index 634073359..c00a33e9a 100644 --- a/src/main/java/forestry/lepidopterology/genetics/ButterflyRoot.java +++ b/src/main/java/forestry/lepidopterology/genetics/ButterflyRoot.java @@ -29,7 +29,7 @@ import com.mojang.authlib.GameProfile; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAllele; -import forestry.api.genetics.IAlyzer; +import forestry.api.genetics.IAlyzerPlugin; import forestry.api.genetics.IChromosomeType; import forestry.api.genetics.IIndividual; import forestry.api.genetics.IMutation; @@ -320,8 +320,8 @@ public class ButterflyRoot extends SpeciesRoot implements IButterflyRoot { } @Override - public IAlyzer getAlyzer() { - return new Flutterlyzer(); + public IAlyzerPlugin getAlyzerPlugin() { + return FlutterlyzerPlugin.INSTANCE; } } diff --git a/src/main/java/forestry/lepidopterology/genetics/Flutterlyzer.java b/src/main/java/forestry/lepidopterology/genetics/FlutterlyzerPlugin.java similarity index 91% rename from src/main/java/forestry/lepidopterology/genetics/Flutterlyzer.java rename to src/main/java/forestry/lepidopterology/genetics/FlutterlyzerPlugin.java index 9427f10c8..5bf06d14d 100644 --- a/src/main/java/forestry/lepidopterology/genetics/Flutterlyzer.java +++ b/src/main/java/forestry/lepidopterology/genetics/FlutterlyzerPlugin.java @@ -11,39 +11,41 @@ package forestry.lepidopterology.genetics; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; import net.minecraft.item.ItemStack; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; + import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAlleleFlowers; import forestry.api.genetics.IAlleleInteger; import forestry.api.genetics.IAlleleTolerance; +import forestry.api.genetics.IAlyzerPlugin; import forestry.api.lepidopterology.ButterflyManager; import forestry.api.lepidopterology.EnumButterflyChromosome; -import forestry.api.lepidopterology.EnumFlutterType; import forestry.api.lepidopterology.IAlleleButterflySpecies; import forestry.api.lepidopterology.IButterfly; import forestry.core.config.Config; -import forestry.core.genetics.Alyzer; import forestry.core.genetics.GenericRatings; import forestry.core.genetics.alleles.AlleleBoolean; import forestry.core.gui.GuiAlyzer; -import forestry.core.gui.IHintSource; import forestry.core.gui.TextLayoutHelper; -import forestry.core.gui.widgets.WidgetManager; import forestry.core.proxy.Proxies; import forestry.core.utils.StringUtil; import forestry.core.utils.Translator; import forestry.lepidopterology.PluginLepidopterology; -public class Flutterlyzer extends Alyzer implements IHintSource { +public class FlutterlyzerPlugin implements IAlyzerPlugin { + public static final FlutterlyzerPlugin INSTANCE = new FlutterlyzerPlugin(); - public Flutterlyzer() { - super(ButterflyManager.butterflyRoot); - - ArrayList butterflyList = new ArrayList<>(); + protected final Map iconStacks = new HashMap<>(); + + private FlutterlyzerPlugin() { + List butterflyList = new ArrayList<>(); PluginLepidopterology.items.butterflyGE.addCreativeItems(butterflyList, false); for (ItemStack butterflyStack : butterflyList) { IAlleleButterflySpecies species = ButterflyGenome.getSpecies(butterflyStack); @@ -55,10 +57,14 @@ public class Flutterlyzer extends Alyzer @SideOnly(Side.CLIENT) @Override - public void drawAnalyticsPage1(GuiAlyzer gui, IButterfly butterfly, EnumFlutterType type) { + public void drawAnalyticsPage1(GuiAlyzer gui, ItemStack itemStack) { + IButterfly butterfly = ButterflyManager.butterflyRoot.getMember(itemStack); + if (butterfly == null) { + return; + } + TextLayoutHelper textLayout = gui.getTextLayout(); - WidgetManager widgetManager = gui.getWidgetManager(); - + textLayout.startPage(GuiAlyzer.COLUMN_0, GuiAlyzer.COLUMN_1, GuiAlyzer.COLUMN_2); textLayout.drawLine(Translator.translateToLocal("for.gui.active"), GuiAlyzer.COLUMN_1); @@ -111,10 +117,14 @@ public class Flutterlyzer extends Alyzer @SideOnly(Side.CLIENT) @Override - public void drawAnalyticsPage2(GuiAlyzer gui, IButterfly butterfly, EnumFlutterType type) { + public void drawAnalyticsPage2(GuiAlyzer gui, ItemStack itemStack) { + IButterfly butterfly = ButterflyManager.butterflyRoot.getMember(itemStack); + if (butterfly == null) { + return; + } + TextLayoutHelper textLayout = gui.getTextLayout(); - WidgetManager widgetManager = gui.getWidgetManager(); - + textLayout.startPage(GuiAlyzer.COLUMN_0, GuiAlyzer.COLUMN_1, GuiAlyzer.COLUMN_2); textLayout.drawLine(Translator.translateToLocal("for.gui.active"), GuiAlyzer.COLUMN_1); @@ -193,9 +203,13 @@ public class Flutterlyzer extends Alyzer @SideOnly(Side.CLIENT) @Override - public void drawAnalyticsPage3(GuiAlyzer gui, IButterfly butterfly, EnumFlutterType type) { + public void drawAnalyticsPage3(GuiAlyzer gui, ItemStack itemStack) { + IButterfly butterfly = ButterflyManager.butterflyRoot.getMember(itemStack); + if (butterfly == null) { + return; + } + TextLayoutHelper textLayout = gui.getTextLayout(); - WidgetManager widgetManager = gui.getWidgetManager(); textLayout.startPage(GuiAlyzer.COLUMN_0, GuiAlyzer.COLUMN_1, GuiAlyzer.COLUMN_2); @@ -230,11 +244,6 @@ public class Flutterlyzer extends Alyzer textLayout.endPage(); } - - @Override - public EnumFlutterType getDefaultType() { - return EnumFlutterType.BUTTERFLY; - } @Override public List getHints() {