From 7ae7e62c0cc52dc69c0b4ffa4e9cb6b1914a3205 Mon Sep 17 00:00:00 2001 From: Nedelosk Date: Mon, 16 May 2016 17:04:34 +0200 Subject: [PATCH] Add universal portable alyzer and remove flutter-,tree- and beealyzer --- lang | 2 +- .../java/forestry/api/genetics/IAlyzer.java | 37 +++ .../forestry/api/genetics/IGuiAlyzer.java | 44 ++++ .../forestry/api/genetics/ISpeciesRoot.java | 2 + .../forestry/apiculture/PluginApiculture.java | 16 -- .../BeeAlyzer.java} | 201 ++++++++--------- .../forestry/apiculture/genetics/BeeRoot.java | 6 + .../inventory/ItemInventoryBeealyzer.java | 34 --- .../ItemInventoryHabitatLocator.java | 2 +- .../inventory/ItemInventoryImprinter.java | 2 +- .../apiculture/items/ItemBeealyzer.java | 36 --- .../items/ItemRegistryApiculture.java | 2 - .../arboriculture/PluginArboriculture.java | 16 -- .../TreeAlyzer.java} | 210 +++++++++--------- .../arboriculture/genetics/TreeRoot.java | 6 + .../inventory/ItemInventoryTreealyzer.java | 61 ----- .../items/ItemRegistryArboriculture.java | 2 - .../arboriculture/items/ItemTreealyzer.java | 36 --- src/main/java/forestry/core/PluginCore.java | 29 +++ .../java/forestry/core/genetics/Alyzer.java | 139 ++++++++++++ .../core/gui/ContainerItemInventory.java | 4 +- .../java/forestry/core/gui/GuiAlyzer.java | 134 ++++++++--- .../java/forestry/core/gui/GuiForestry.java | 3 - .../java/forestry/core/gui/GuiIdRegistry.java | 10 +- .../core/inventory/ItemInventory.java | 2 +- .../core/inventory/ItemInventoryAlyzer.java | 154 +++++-------- .../inventory/ItemInventorySolderingIron.java | 2 +- .../java/forestry/core/items/ItemAlyzer.java | 54 +++++ .../forestry/core/items/ItemForestryTool.java | 2 - .../forestry/core/items/ItemRegistryCore.java | 8 +- .../food/inventory/ItemInventoryInfuser.java | 2 +- .../PluginLepidopterology.java | 6 - .../genetics/ButterflyRoot.java | 6 + .../Flutterlyzer.java} | 183 +++++++-------- .../inventory/ItemInventoryFlutterlyzer.java | 34 --- .../items/ItemFlutterlyzer.java | 36 --- .../items/ItemRegistryLepidopterology.java | 2 - .../forestry/models/item/flutterlyzer.json | 6 - .../{beealyzer.json => portablealyzer.json} | 2 +- .../forestry/models/item/treealyzer.json | 6 - .../{beealyzer2.png => portablealyzer.png} | Bin .../textures/items/portablealyzer.png | Bin 0 -> 3154 bytes 42 files changed, 788 insertions(+), 751 deletions(-) create mode 100644 src/main/java/forestry/api/genetics/IAlyzer.java create mode 100644 src/main/java/forestry/api/genetics/IGuiAlyzer.java rename src/main/java/forestry/apiculture/{gui/GuiBeealyzer.java => genetics/BeeAlyzer.java} (54%) mode change 100755 => 100644 delete mode 100644 src/main/java/forestry/apiculture/inventory/ItemInventoryBeealyzer.java delete mode 100644 src/main/java/forestry/apiculture/items/ItemBeealyzer.java rename src/main/java/forestry/arboriculture/{gui/GuiTreealyzer.java => genetics/TreeAlyzer.java} (52%) mode change 100755 => 100644 delete mode 100644 src/main/java/forestry/arboriculture/inventory/ItemInventoryTreealyzer.java delete mode 100644 src/main/java/forestry/arboriculture/items/ItemTreealyzer.java create mode 100644 src/main/java/forestry/core/genetics/Alyzer.java create mode 100644 src/main/java/forestry/core/items/ItemAlyzer.java rename src/main/java/forestry/lepidopterology/{gui/GuiFlutterlyzer.java => genetics/Flutterlyzer.java} (57%) mode change 100755 => 100644 delete mode 100644 src/main/java/forestry/lepidopterology/inventory/ItemInventoryFlutterlyzer.java delete mode 100644 src/main/java/forestry/lepidopterology/items/ItemFlutterlyzer.java delete mode 100644 src/main/resources/assets/forestry/models/item/flutterlyzer.json rename src/main/resources/assets/forestry/models/item/{beealyzer.json => portablealyzer.json} (88%) delete mode 100644 src/main/resources/assets/forestry/models/item/treealyzer.json rename src/main/resources/assets/forestry/textures/gui/{beealyzer2.png => portablealyzer.png} (100%) create mode 100644 src/main/resources/assets/forestry/textures/items/portablealyzer.png diff --git a/lang b/lang index cdad7ef9c..9196759db 160000 --- a/lang +++ b/lang @@ -1 +1 @@ -Subproject commit cdad7ef9c59cd68ae153ec4efb2d8c918e823109 +Subproject commit 9196759dbf62157b0e715fc50b0eab8910e6b63d diff --git a/src/main/java/forestry/api/genetics/IAlyzer.java b/src/main/java/forestry/api/genetics/IAlyzer.java new file mode 100644 index 000000000..87919bb70 --- /dev/null +++ b/src/main/java/forestry/api/genetics/IAlyzer.java @@ -0,0 +1,37 @@ +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/IGuiAlyzer.java b/src/main/java/forestry/api/genetics/IGuiAlyzer.java new file mode 100644 index 000000000..d071f9fa3 --- /dev/null +++ b/src/main/java/forestry/api/genetics/IGuiAlyzer.java @@ -0,0 +1,44 @@ +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/ISpeciesRoot.java b/src/main/java/forestry/api/genetics/ISpeciesRoot.java index fc11ecbd5..0a012d4ec 100644 --- a/src/main/java/forestry/api/genetics/ISpeciesRoot.java +++ b/src/main/java/forestry/api/genetics/ISpeciesRoot.java @@ -178,4 +178,6 @@ public interface ISpeciesRoot { * @return {@link IChromosomeType} which is the "key" for this species class, usually the species chromosome. */ IChromosomeType getKaryotypeKey(); + + IAlyzer getAlyzer(); } diff --git a/src/main/java/forestry/apiculture/PluginApiculture.java b/src/main/java/forestry/apiculture/PluginApiculture.java index 833288d48..5ee9f9468 100644 --- a/src/main/java/forestry/apiculture/PluginApiculture.java +++ b/src/main/java/forestry/apiculture/PluginApiculture.java @@ -103,7 +103,6 @@ import forestry.apiculture.worldgen.HiveRegistry; import forestry.core.ISaveEventHandler; import forestry.core.PluginCore; import forestry.core.PluginFluids; -import forestry.core.blocks.BlockTypeCoreTesr; import forestry.core.config.Config; import forestry.core.config.Constants; import forestry.core.config.LocalizedConfiguration; @@ -603,12 +602,6 @@ public class PluginApiculture extends BlankForestryPlugin { RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{phosphor, new ItemStack(Blocks.DIRT)}, Fluids.LAVA.getFluid(1600)); // / CARPENTER - RecipeManagers.carpenterManager.addRecipe(100, Fluids.WATER.getFluid(2000), null, items.beealyzer.getItemStack(), - "X#X", "X#X", "RDR", - '#', "paneGlass", - 'X', "ingotTin", - 'R', "dustRedstone", - 'D', "gemDiamond"); RecipeManagers.carpenterManager.addRecipe(50, Fluids.FOR_HONEY.getFluid(500), null, PluginCore.items.craftingMaterial.getScentedPaneling(), " J ", "###", "WPW", '#', "plankWood", @@ -727,15 +720,6 @@ public class PluginApiculture extends BlankForestryPlugin { RecipeManagers.fermenterManager.addRecipe(items.honeydew.getItemStack(), 500, 1.0f, Fluids.SHORT_MEAD.getFluid(1), Fluids.FOR_HONEY.getFluid(1)); } - // ANALYZER - RecipeUtil.addRecipe(PluginCore.blocks.core.get(BlockTypeCoreTesr.ANALYZER), - "XTX", - " Y ", - "X X", - 'Y', PluginCore.items.sturdyCasing, - 'T', items.beealyzer, - 'X', "ingotBronze"); - RecipeUtil.addRecipe(blocks.apiculture.get(BlockTypeApiculture.APIARY), "XXX", "#C#", diff --git a/src/main/java/forestry/apiculture/gui/GuiBeealyzer.java b/src/main/java/forestry/apiculture/genetics/BeeAlyzer.java old mode 100755 new mode 100644 similarity index 54% rename from src/main/java/forestry/apiculture/gui/GuiBeealyzer.java rename to src/main/java/forestry/apiculture/genetics/BeeAlyzer.java index bc3234706..11ead4e63 --- a/src/main/java/forestry/apiculture/gui/GuiBeealyzer.java +++ b/src/main/java/forestry/apiculture/genetics/BeeAlyzer.java @@ -1,19 +1,7 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser Public License v3 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: - * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges - ******************************************************************************/ -package forestry.apiculture.gui; +package forestry.apiculture.genetics; import java.util.ArrayList; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; +import java.util.List; import forestry.api.apiculture.BeeManager; import forestry.api.apiculture.EnumBeeChromosome; @@ -24,21 +12,27 @@ import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAlleleInteger; import forestry.api.genetics.IAlleleTolerance; import forestry.apiculture.PluginApiculture; -import forestry.apiculture.genetics.BeeGenome; -import forestry.apiculture.inventory.ItemInventoryBeealyzer; +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.ContainerAlyzer; import forestry.core.gui.GuiAlyzer; +import forestry.core.gui.IHintSource; +import forestry.core.gui.TextLayoutHelper; import forestry.core.gui.widgets.ItemStackWidget; -import forestry.core.inventory.ItemInventoryAlyzer; +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 GuiBeealyzer extends GuiAlyzer { - - public GuiBeealyzer(EntityPlayer player, ItemInventoryBeealyzer inventory) { - super(BeeManager.beeRoot, player, new ContainerAlyzer(inventory, player), inventory, "for.gui.beealyzer"); +public class BeeAlyzer extends Alyzer implements IHintSource{ + public BeeAlyzer() { + super(BeeManager.beeRoot); + ArrayList beeList = new ArrayList<>(); PluginApiculture.items.beeDroneGE.addCreativeItems(beeList, false); for (ItemStack beeStack : beeList) { @@ -48,61 +42,32 @@ public class GuiBeealyzer extends GuiAlyzer { } } } - + @Override - protected void drawGuiContainerBackgroundLayer(float var1, int mouseX, int mouseY) { - super.drawGuiContainerBackgroundLayer(var1, mouseX, mouseY); - - int page = 0; - IBee bee = null; - EnumBeeType beeType = EnumBeeType.DRONE; - - for (int k = ItemInventoryAlyzer.SLOT_SPECIMEN; k <= ItemInventoryAlyzer.SLOT_ANALYZE_5; k++) { - if (k == ItemInventoryAlyzer.SLOT_ENERGY) { - continue; - } - - if (inventory.getStackInSlot(k) == null) { - continue; - } - bee = BeeManager.beeRoot.getMember(inventory.getStackInSlot(k)); - beeType = BeeManager.beeRoot.getType(inventory.getStackInSlot(k)); - if (bee == null || !bee.isAnalyzed()) { - continue; - } - - page = k; - break; + public boolean isAlyzingFuel(ItemStack itemstack) { + if (itemstack == null || itemstack.stackSize <= 0) { + return false; } - switch (page) { - case 1: - drawAnalyticsPage1(bee, beeType); - break; - case 2: - drawAnalyticsPage2(bee, beeType); - break; - case 3: - drawAnalyticsPage3(bee); - break; - case 4: - drawAnalyticsPageMutations(bee); - break; - case 6: - drawAnalyticsPageClassification(bee); - break; - default: - drawAnalyticsOverview(); + ItemRegistryApiculture beeItems = PluginApiculture.items; + if (beeItems == null) { + return false; } + Item item = itemstack.getItem(); + return beeItems.honeyDrop == item || beeItems.honeydew == item; } - private void drawAnalyticsPage1(IBee bee, EnumBeeType type) { + @SideOnly(Side.CLIENT) + @Override + public void drawAnalyticsPage1(GuiAlyzer gui, IBee bee, EnumBeeType type) { + TextLayoutHelper textLayout = gui.getTextLayout(); + WidgetManager widgetManager = gui.getWidgetManager(); - textLayout.startPage(COLUMN_0, COLUMN_1, COLUMN_2); + textLayout.startPage(GuiAlyzer.COLUMN_0, GuiAlyzer.COLUMN_1, GuiAlyzer.COLUMN_2); - textLayout.drawLine(Translator.translateToLocal("for.gui.active"), COLUMN_1); - textLayout.drawLine(Translator.translateToLocal("for.gui.inactive"), COLUMN_2); + textLayout.drawLine(Translator.translateToLocal("for.gui.active"), GuiAlyzer.COLUMN_1); + textLayout.drawLine(Translator.translateToLocal("for.gui.inactive"), GuiAlyzer.COLUMN_2); textLayout.newLine(); textLayout.newLine(); @@ -111,67 +76,71 @@ public class GuiBeealyzer extends GuiAlyzer { String customPrimaryBeeKey = "for.bees.custom.beealyzer." + type.getName() + "." + bee.getGenome().getPrimary().getUnlocalizedName().replace("bees.species.", ""); String customSecondaryBeeKey = "for.bees.custom.beealyzer." + type.getName() + "." + bee.getGenome().getSecondary().getUnlocalizedName().replace("bees.species.", ""); - drawSpeciesRow(Translator.translateToLocal("for.gui.species"), bee, EnumBeeChromosome.SPECIES, checkCustomName(customPrimaryBeeKey), checkCustomName(customSecondaryBeeKey)); + gui.drawSpeciesRow(Translator.translateToLocal("for.gui.species"), bee, EnumBeeChromosome.SPECIES, GuiAlyzer.checkCustomName(customPrimaryBeeKey), GuiAlyzer.checkCustomName(customSecondaryBeeKey)); textLayout.newLine(); } - drawChromosomeRow(Translator.translateToLocal("for.gui.lifespan"), bee, EnumBeeChromosome.LIFESPAN); + gui.drawChromosomeRow(Translator.translateToLocal("for.gui.lifespan"), bee, EnumBeeChromosome.LIFESPAN); textLayout.newLine(); - drawChromosomeRow(Translator.translateToLocal("for.gui.speed"), bee, EnumBeeChromosome.SPEED); + gui.drawChromosomeRow(Translator.translateToLocal("for.gui.speed"), bee, EnumBeeChromosome.SPEED); textLayout.newLine(); - drawChromosomeRow(Translator.translateToLocal("for.gui.pollination"), bee, EnumBeeChromosome.FLOWERING); + gui.drawChromosomeRow(Translator.translateToLocal("for.gui.pollination"), bee, EnumBeeChromosome.FLOWERING); textLayout.newLine(); - drawChromosomeRow(Translator.translateToLocal("for.gui.flowers"), bee, EnumBeeChromosome.FLOWER_PROVIDER); + gui.drawChromosomeRow(Translator.translateToLocal("for.gui.flowers"), bee, EnumBeeChromosome.FLOWER_PROVIDER); textLayout.newLine(); - textLayout.drawLine(Translator.translateToLocal("for.gui.fertility"), COLUMN_0); + textLayout.drawLine(Translator.translateToLocal("for.gui.fertility"), GuiAlyzer.COLUMN_0); IAlleleInteger primaryFertility = (IAlleleInteger) bee.getGenome().getActiveAllele(EnumBeeChromosome.FERTILITY); IAlleleInteger secondaryFertility = (IAlleleInteger) bee.getGenome().getInactiveAllele(EnumBeeChromosome.FERTILITY); - drawFertilityInfo(primaryFertility.getValue(), COLUMN_1, getColorCoding(primaryFertility.isDominant()), 0); - drawFertilityInfo(secondaryFertility.getValue(), COLUMN_2, getColorCoding(secondaryFertility.isDominant()), 0); + gui.drawFertilityInfo(primaryFertility.getValue(), GuiAlyzer.COLUMN_1, gui.getColorCoding(primaryFertility.isDominant()), 0); + gui.drawFertilityInfo(secondaryFertility.getValue(), GuiAlyzer.COLUMN_2, gui.getColorCoding(secondaryFertility.isDominant()), 0); textLayout.newLine(); - drawChromosomeRow(Translator.translateToLocal("for.gui.area"), bee, EnumBeeChromosome.TERRITORY); + gui.drawChromosomeRow(Translator.translateToLocal("for.gui.area"), bee, EnumBeeChromosome.TERRITORY); textLayout.newLine(); - drawChromosomeRow(Translator.translateToLocal("for.gui.effect"), bee, EnumBeeChromosome.EFFECT); + gui.drawChromosomeRow(Translator.translateToLocal("for.gui.effect"), bee, EnumBeeChromosome.EFFECT); textLayout.newLine(); textLayout.endPage(); } - private void drawAnalyticsPage2(IBee bee, EnumBeeType type) { + @SideOnly(Side.CLIENT) + @Override + public void drawAnalyticsPage2(GuiAlyzer gui, IBee bee, EnumBeeType type) { + TextLayoutHelper textLayout = gui.getTextLayout(); + WidgetManager widgetManager = gui.getWidgetManager(); - textLayout.startPage(COLUMN_0, COLUMN_1, COLUMN_2); + textLayout.startPage(GuiAlyzer.COLUMN_0, GuiAlyzer.COLUMN_1, GuiAlyzer.COLUMN_2); - textLayout.drawLine(Translator.translateToLocal("for.gui.active"), COLUMN_1); - textLayout.drawLine(Translator.translateToLocal("for.gui.inactive"), COLUMN_2); + textLayout.drawLine(Translator.translateToLocal("for.gui.active"), GuiAlyzer.COLUMN_1); + textLayout.drawLine(Translator.translateToLocal("for.gui.inactive"), GuiAlyzer.COLUMN_2); textLayout.newLine(); - drawRow(Translator.translateToLocal("for.gui.climate"), AlleleManager.climateHelper.toDisplay(bee.getGenome().getPrimary().getTemperature()), + gui.drawRow(Translator.translateToLocal("for.gui.climate"), AlleleManager.climateHelper.toDisplay(bee.getGenome().getPrimary().getTemperature()), AlleleManager.climateHelper.toDisplay(bee.getGenome().getSecondary().getTemperature()), bee, EnumBeeChromosome.SPECIES); textLayout.newLine(); IAlleleTolerance tempToleranceActive = (IAlleleTolerance) bee.getGenome().getActiveAllele(EnumBeeChromosome.TEMPERATURE_TOLERANCE); IAlleleTolerance tempToleranceInactive = (IAlleleTolerance) bee.getGenome().getInactiveAllele(EnumBeeChromosome.TEMPERATURE_TOLERANCE); - textLayout.drawLine(" " + Translator.translateToLocal("for.gui.tolerance"), COLUMN_0); - drawToleranceInfo(tempToleranceActive, COLUMN_1); - drawToleranceInfo(tempToleranceInactive, COLUMN_2); + textLayout.drawLine(" " + Translator.translateToLocal("for.gui.tolerance"), GuiAlyzer.COLUMN_0); + gui.drawToleranceInfo(tempToleranceActive, GuiAlyzer.COLUMN_1); + gui.drawToleranceInfo(tempToleranceInactive, GuiAlyzer.COLUMN_2); textLayout.newLine(16); - drawRow(Translator.translateToLocal("for.gui.humidity"), AlleleManager.climateHelper.toDisplay(bee.getGenome().getPrimary().getHumidity()), + gui.drawRow(Translator.translateToLocal("for.gui.humidity"), AlleleManager.climateHelper.toDisplay(bee.getGenome().getPrimary().getHumidity()), AlleleManager.climateHelper.toDisplay(bee.getGenome().getSecondary().getHumidity()), bee, EnumBeeChromosome.SPECIES); textLayout.newLine(); IAlleleTolerance humidToleranceActive = (IAlleleTolerance) bee.getGenome().getActiveAllele(EnumBeeChromosome.HUMIDITY_TOLERANCE); IAlleleTolerance humidToleranceInactive = (IAlleleTolerance) bee.getGenome().getInactiveAllele(EnumBeeChromosome.HUMIDITY_TOLERANCE); - textLayout.drawLine(" " + Translator.translateToLocal("for.gui.tolerance"), COLUMN_0); - drawToleranceInfo(humidToleranceActive, COLUMN_1); - drawToleranceInfo(humidToleranceInactive, COLUMN_2); + textLayout.drawLine(" " + Translator.translateToLocal("for.gui.tolerance"), GuiAlyzer.COLUMN_0); + gui.drawToleranceInfo(humidToleranceActive, GuiAlyzer.COLUMN_1); + gui.drawToleranceInfo(humidToleranceInactive, GuiAlyzer.COLUMN_2); textLayout.newLine(16); @@ -192,27 +161,27 @@ public class GuiBeealyzer extends GuiAlyzer { diurnal1 = !bee.getGenome().getSecondary().isNocturnal() ? yes : no; } - textLayout.drawLine(Translator.translateToLocal("for.gui.diurnal"), COLUMN_0); - textLayout.drawLine(diurnal0, COLUMN_1, getColorCoding(false)); - textLayout.drawLine(diurnal1, COLUMN_2, getColorCoding(false)); + textLayout.drawLine(Translator.translateToLocal("for.gui.diurnal"), GuiAlyzer.COLUMN_0); + textLayout.drawLine(diurnal0, GuiAlyzer.COLUMN_1, gui.getColorCoding(false)); + textLayout.drawLine(diurnal1, GuiAlyzer.COLUMN_2, gui.getColorCoding(false)); textLayout.newLineCompressed(); - textLayout.drawLine(Translator.translateToLocal("for.gui.nocturnal"), COLUMN_0); - textLayout.drawLine(nocturnal0, COLUMN_1, getColorCoding(false)); - textLayout.drawLine(nocturnal1, COLUMN_2, getColorCoding(false)); + textLayout.drawLine(Translator.translateToLocal("for.gui.nocturnal"), GuiAlyzer.COLUMN_0); + textLayout.drawLine(nocturnal0, GuiAlyzer.COLUMN_1, gui.getColorCoding(false)); + textLayout.drawLine(nocturnal1, GuiAlyzer.COLUMN_2, gui.getColorCoding(false)); textLayout.newLineCompressed(); String primary = StringUtil.readableBoolean(bee.getGenome().getToleratesRain(), yes, no); String secondary = StringUtil.readableBoolean(((AlleleBoolean) bee.getGenome().getInactiveAllele(EnumBeeChromosome.TOLERATES_RAIN)).getValue(), yes, no); - drawRow(Translator.translateToLocal("for.gui.flyer"), primary, secondary, bee, EnumBeeChromosome.TOLERATES_RAIN); + gui.drawRow(Translator.translateToLocal("for.gui.flyer"), primary, secondary, bee, EnumBeeChromosome.TOLERATES_RAIN); textLayout.newLineCompressed(); primary = StringUtil.readableBoolean(bee.getGenome().getCaveDwelling(), yes, no); secondary = StringUtil.readableBoolean(((AlleleBoolean) bee.getGenome().getInactiveAllele(EnumBeeChromosome.CAVE_DWELLING)).getValue(), yes, no); - drawRow(Translator.translateToLocal("for.gui.cave"), primary, secondary, bee, EnumBeeChromosome.CAVE_DWELLING); + gui.drawRow(Translator.translateToLocal("for.gui.cave"), primary, secondary, bee, EnumBeeChromosome.CAVE_DWELLING); textLayout.newLine(); @@ -223,33 +192,37 @@ public class GuiBeealyzer extends GuiAlyzer { displayTextKey = "for.bees.stock.ignoble"; } displayText = Translator.translateToLocal(displayTextKey); - textLayout.drawCenteredLine(displayText, 8, 208, fontColor.get("gui.beealyzer.binomial")); + textLayout.drawCenteredLine(displayText, 8, 208, gui.getFontColor().get("gui.beealyzer.binomial")); } if (bee.getGeneration() >= 0) { textLayout.newLineCompressed(); displayText = Translator.translateToLocalFormatted("for.gui.beealyzer.generations", bee.getGeneration()); - textLayout.drawCenteredLine(displayText, 8, 208, fontColor.get("gui.beealyzer.binomial")); + textLayout.drawCenteredLine(displayText, 8, 208, gui.getFontColor().get("gui.beealyzer.binomial")); } textLayout.endPage(); } - private void drawAnalyticsPage3(IBee bee) { + @SideOnly(Side.CLIENT) + @Override + public void drawAnalyticsPage3(GuiAlyzer gui, IBee bee, EnumBeeType type) { + TextLayoutHelper textLayout = gui.getTextLayout(); + WidgetManager widgetManager = gui.getWidgetManager(); + + textLayout.startPage(GuiAlyzer.COLUMN_0, GuiAlyzer.COLUMN_1, GuiAlyzer.COLUMN_2); - textLayout.startPage(COLUMN_0, COLUMN_1, COLUMN_2); - - textLayout.drawLine(Translator.translateToLocal("for.gui.beealyzer.produce") + ":", COLUMN_0); + textLayout.drawLine(Translator.translateToLocal("for.gui.beealyzer.produce") + ":", GuiAlyzer.COLUMN_0); textLayout.newLine(); - int x = COLUMN_0; + int x = GuiAlyzer.COLUMN_0; for (ItemStack stack : bee.getProduceList()) { widgetManager.add(new ItemStackWidget(widgetManager, x, textLayout.getLineY(), stack)); x += 18; if (x > 148) { - x = COLUMN_0; + x = GuiAlyzer.COLUMN_0; textLayout.newLine(); } } @@ -259,21 +232,31 @@ public class GuiBeealyzer extends GuiAlyzer { textLayout.newLine(); textLayout.newLine(); - textLayout.drawLine(Translator.translateToLocal("for.gui.beealyzer.specialty") + ":", COLUMN_0); + textLayout.drawLine(Translator.translateToLocal("for.gui.beealyzer.specialty") + ":", GuiAlyzer.COLUMN_0); textLayout.newLine(); - x = COLUMN_0; + x = GuiAlyzer.COLUMN_0; for (ItemStack stack : bee.getSpecialtyList()) { widgetManager.add(new ItemStackWidget(widgetManager, x, textLayout.getLineY(), stack)); x += 18; if (x > 148) { - x = COLUMN_0; + x = GuiAlyzer.COLUMN_0; textLayout.newLine(); } } 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 7d2ed4b62..6bee61be3 100644 --- a/src/main/java/forestry/apiculture/genetics/BeeRoot.java +++ b/src/main/java/forestry/apiculture/genetics/BeeRoot.java @@ -42,6 +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.IChromosome; import forestry.api.genetics.IChromosomeType; import forestry.api.genetics.IIndividual; @@ -137,6 +138,11 @@ public class BeeRoot extends SpeciesRoot implements IBeeRoot { beeStack.setTagCompound(nbttagcompound); return beeStack; } + + @Override + public IAlyzer getAlyzer() { + return new BeeAlyzer(); + } @Nullable @Override diff --git a/src/main/java/forestry/apiculture/inventory/ItemInventoryBeealyzer.java b/src/main/java/forestry/apiculture/inventory/ItemInventoryBeealyzer.java deleted file mode 100644 index aeca6751e..000000000 --- a/src/main/java/forestry/apiculture/inventory/ItemInventoryBeealyzer.java +++ /dev/null @@ -1,34 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser Public License v3 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: - * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges - ******************************************************************************/ -package forestry.apiculture.inventory; - -import java.util.List; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; - -import forestry.api.apiculture.BeeManager; -import forestry.core.config.Config; -import forestry.core.gui.IHintSource; -import forestry.core.inventory.ItemInventoryAlyzer; - -public class ItemInventoryBeealyzer extends ItemInventoryAlyzer implements IHintSource { - - public ItemInventoryBeealyzer(EntityPlayer player, ItemStack itemStack) { - super(BeeManager.beeRoot, player, itemStack); - } - - /* IHintSource */ - @Override - public List getHints() { - return Config.hints.get("beealyzer"); - } -} diff --git a/src/main/java/forestry/apiculture/inventory/ItemInventoryHabitatLocator.java b/src/main/java/forestry/apiculture/inventory/ItemInventoryHabitatLocator.java index 9cd7f4853..8c847ba9a 100644 --- a/src/main/java/forestry/apiculture/inventory/ItemInventoryHabitatLocator.java +++ b/src/main/java/forestry/apiculture/inventory/ItemInventoryHabitatLocator.java @@ -56,7 +56,7 @@ public class ItemInventoryHabitatLocator extends ItemInventory implements IError } @Override - public void onSlotClick(EntityPlayer player) { + public void onSlotClick(int slotIndex, EntityPlayer player) { if (getStackInSlot(SLOT_ANALYZED) != null) { if (locatorLogic.isBiomeFound()) { diff --git a/src/main/java/forestry/apiculture/inventory/ItemInventoryImprinter.java b/src/main/java/forestry/apiculture/inventory/ItemInventoryImprinter.java index 5fb0a471d..4bfa289c9 100644 --- a/src/main/java/forestry/apiculture/inventory/ItemInventoryImprinter.java +++ b/src/main/java/forestry/apiculture/inventory/ItemInventoryImprinter.java @@ -94,7 +94,7 @@ public class ItemInventoryImprinter extends ItemInventory { } @Override - public void onSlotClick(EntityPlayer player) { + public void onSlotClick(int slotIndex, EntityPlayer player) { ItemStack specimen = getStackInSlot(specimenSlot); if (specimen == null) { return; diff --git a/src/main/java/forestry/apiculture/items/ItemBeealyzer.java b/src/main/java/forestry/apiculture/items/ItemBeealyzer.java deleted file mode 100644 index 9dab61450..000000000 --- a/src/main/java/forestry/apiculture/items/ItemBeealyzer.java +++ /dev/null @@ -1,36 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser Public License v3 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: - * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges - ******************************************************************************/ -package forestry.apiculture.items; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; - -import forestry.api.core.Tabs; -import forestry.apiculture.gui.GuiBeealyzer; -import forestry.apiculture.inventory.ItemInventoryBeealyzer; -import forestry.core.gui.ContainerAlyzer; -import forestry.core.items.ItemWithGui; - -public class ItemBeealyzer extends ItemWithGui { - public ItemBeealyzer() { - setCreativeTab(Tabs.tabApiculture); - } - - @Override - public Object getGui(EntityPlayer player, ItemStack heldItem, int data) { - return new GuiBeealyzer(player, new ItemInventoryBeealyzer(player, heldItem)); - } - - @Override - public Object getContainer(EntityPlayer player, ItemStack heldItem, int data) { - return new ContainerAlyzer(new ItemInventoryBeealyzer(player, heldItem), player); - } -} diff --git a/src/main/java/forestry/apiculture/items/ItemRegistryApiculture.java b/src/main/java/forestry/apiculture/items/ItemRegistryApiculture.java index 8f494bf0d..25a9a8055 100644 --- a/src/main/java/forestry/apiculture/items/ItemRegistryApiculture.java +++ b/src/main/java/forestry/apiculture/items/ItemRegistryApiculture.java @@ -28,7 +28,6 @@ public class ItemRegistryApiculture extends ItemRegistry { public final ItemBeeGE beeLarvaeGE; public final ItemHabitatLocator habitatLocator; - public final ItemBeealyzer beealyzer; public final ItemImprinter imprinter; public final ItemMinecartBeehouse minecartBeehouse; @@ -60,7 +59,6 @@ public class ItemRegistryApiculture extends ItemRegistry { beePrincessGE = registerItem(new ItemBeeGE(EnumBeeType.PRINCESS), "beePrincessGE"); beeLarvaeGE = registerItem(new ItemBeeGE(EnumBeeType.LARVAE), "beeLarvaeGE"); - beealyzer = registerItem(new ItemBeealyzer(), "beealyzer"); habitatLocator = registerItem(new ItemHabitatLocator(), "habitatLocator"); imprinter = registerItem(new ItemImprinter(), "imprinter"); diff --git a/src/main/java/forestry/arboriculture/PluginArboriculture.java b/src/main/java/forestry/arboriculture/PluginArboriculture.java index 18e2e0ca4..d147ff294 100644 --- a/src/main/java/forestry/arboriculture/PluginArboriculture.java +++ b/src/main/java/forestry/arboriculture/PluginArboriculture.java @@ -62,7 +62,6 @@ import forestry.arboriculture.tiles.TileFruitPod; import forestry.arboriculture.tiles.TileLeaves; import forestry.arboriculture.tiles.TileSapling; import forestry.core.PluginCore; -import forestry.core.blocks.BlockTypeCoreTesr; import forestry.core.config.Constants; import forestry.core.fluids.Fluids; import forestry.core.genetics.alleles.AllelePlantType; @@ -312,12 +311,6 @@ public class PluginArboriculture extends BlankForestryPlugin { } if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.FACTORY)) { - // Treealyzer - RecipeManagers.carpenterManager.addRecipe(100, Fluids.WATER.getFluid(2000), null, items.treealyzer.getItemStack(), "X#X", "X#X", "RDR", - '#', "paneGlass", - 'X', "ingotCopper", - 'R', "dustRedstone", - 'D', "gemDiamond"); // SQUEEZER RECIPES int seedOilMultiplier = ForestryAPI.activeMode.getIntegerSetting("squeezer.liquid.seed"); @@ -343,15 +336,6 @@ public class PluginArboriculture extends BlankForestryPlugin { 'B', "ingotBronze", '#', "stickWood"); - // ANALYZER - RecipeUtil.addRecipe(PluginCore.blocks.core.get(BlockTypeCoreTesr.ANALYZER), - "XTX", - " Y ", - "X X", - 'Y', PluginCore.items.sturdyCasing, - 'T', items.treealyzer, - 'X', "ingotBronze"); - RecipeUtil.addRecipe(blocks.arboriculture.get(BlockTypeArboricultureTesr.ARB_CHEST), " # ", "XYX", diff --git a/src/main/java/forestry/arboriculture/gui/GuiTreealyzer.java b/src/main/java/forestry/arboriculture/genetics/TreeAlyzer.java old mode 100755 new mode 100644 similarity index 52% rename from src/main/java/forestry/arboriculture/gui/GuiTreealyzer.java rename to src/main/java/forestry/arboriculture/genetics/TreeAlyzer.java index ba3e310a1..785138924 --- a/src/main/java/forestry/arboriculture/gui/GuiTreealyzer.java +++ b/src/main/java/forestry/arboriculture/genetics/TreeAlyzer.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.arboriculture.gui; +package forestry.arboriculture.genetics; import java.util.ArrayList; import java.util.Collections; @@ -20,7 +20,8 @@ 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; @@ -32,20 +33,24 @@ import forestry.api.genetics.IAllele; import forestry.api.genetics.IAlleleInteger; import forestry.api.genetics.IFruitFamily; import forestry.arboriculture.PluginArboriculture; -import forestry.arboriculture.genetics.TreeGenome; import forestry.arboriculture.genetics.alleles.AlleleFruit; -import forestry.arboriculture.inventory.ItemInventoryTreealyzer; +import forestry.core.config.Config; +import forestry.core.genetics.Alyzer; import forestry.core.genetics.alleles.AllelePlantType; -import forestry.core.gui.ContainerAlyzer; 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 GuiTreealyzer extends GuiAlyzer { - - public GuiTreealyzer(EntityPlayer player, ItemInventoryTreealyzer inventory) { - super(TreeManager.treeRoot, player, new ContainerAlyzer(inventory, player), inventory, "for.gui.treealyzer"); - +public class TreeAlyzer extends Alyzer implements IHintSource { + + public TreeAlyzer() { + super(TreeManager.treeRoot); + ArrayList treeList = new ArrayList<>(); PluginArboriculture.items.sapling.addCreativeItems(treeList, false); for (ItemStack treeStack : treeList) { @@ -55,60 +60,41 @@ public class GuiTreealyzer extends GuiAlyzer { } } } - + @Override - protected void drawGuiContainerBackgroundLayer(float var1, int mouseX, int mouseY) { - super.drawGuiContainerBackgroundLayer(var1, mouseX, mouseY); - - int page = 0; - ITree tree = null; - EnumGermlingType treeType = EnumGermlingType.SAPLING; - for (int k = 1; k < ItemInventoryAlyzer.SLOT_ANALYZE_5 + 1; k++) { - if (k == ItemInventoryAlyzer.SLOT_ENERGY) { - continue; + 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); } - - if (inventory.getStackInSlot(k) == null) { - continue; - } - tree = TreeManager.treeRoot.getMember(inventory.getStackInSlot(k)); - treeType = TreeManager.treeRoot.getType(inventory.getStackInSlot(k)); - if (tree == null || !tree.isAnalyzed()) { - continue; - } - - page = k; - break; } - - switch (page) { - case 1: - drawAnalyticsPage1(tree, treeType); - break; - case 2: - drawAnalyticsPage2(tree); - break; - case 3: - drawAnalyticsPage3(tree); - break; - case 4: - drawAnalyticsPageMutations(tree); - break; - case 6: - drawAnalyticsPageClassification(tree); - break; - default: - drawAnalyticsOverview(); - } - + return super.canSlotAccept(inventory, slotIndex, itemStack); } - private void drawAnalyticsPage1(ITree tree, EnumGermlingType type) { + @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); + } + } - textLayout.startPage(COLUMN_0, COLUMN_1, COLUMN_2); + super.onSlotClick(inventory, slotIndex, player); + } - textLayout.drawLine(Translator.translateToLocal("for.gui.active"), COLUMN_1); - textLayout.drawLine(Translator.translateToLocal("for.gui.inactive"), COLUMN_2); + @SideOnly(Side.CLIENT) + @Override + public void drawAnalyticsPage1(GuiAlyzer gui, ITree tree, EnumGermlingType type) { + 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); + textLayout.drawLine(Translator.translateToLocal("for.gui.inactive"), GuiAlyzer.COLUMN_2); textLayout.newLine(); textLayout.newLine(); @@ -117,64 +103,68 @@ public class GuiTreealyzer extends GuiAlyzer { String customPrimaryTreeKey = "trees.custom.treealyzer." + type.getName() + "." + tree.getGenome().getPrimary().getUnlocalizedName().replace("trees.species.", ""); String customSecondaryTreeKey = "trees.custom.treealyzer." + type.getName() + "." + tree.getGenome().getSecondary().getUnlocalizedName().replace("trees.species.", ""); - drawSpeciesRow(Translator.translateToLocal("for.gui.species"), tree, EnumTreeChromosome.SPECIES, checkCustomName(customPrimaryTreeKey), checkCustomName(customSecondaryTreeKey)); + gui.drawSpeciesRow(Translator.translateToLocal("for.gui.species"), tree, EnumTreeChromosome.SPECIES, GuiAlyzer.checkCustomName(customPrimaryTreeKey), GuiAlyzer.checkCustomName(customSecondaryTreeKey)); textLayout.newLine(); } - drawChromosomeRow(Translator.translateToLocal("for.gui.saplings"), tree, EnumTreeChromosome.FERTILITY); + gui.drawChromosomeRow(Translator.translateToLocal("for.gui.saplings"), tree, EnumTreeChromosome.FERTILITY); textLayout.newLineCompressed(); - drawChromosomeRow(Translator.translateToLocal("for.gui.maturity"), tree, EnumTreeChromosome.MATURATION); + gui.drawChromosomeRow(Translator.translateToLocal("for.gui.maturity"), tree, EnumTreeChromosome.MATURATION); textLayout.newLineCompressed(); - drawChromosomeRow(Translator.translateToLocal("for.gui.height"), tree, EnumTreeChromosome.HEIGHT); + gui.drawChromosomeRow(Translator.translateToLocal("for.gui.height"), tree, EnumTreeChromosome.HEIGHT); textLayout.newLineCompressed(); IAlleleInteger activeGirth = (IAlleleInteger) tree.getGenome().getActiveAllele(EnumTreeChromosome.GIRTH); IAlleleInteger inactiveGirth = (IAlleleInteger) tree.getGenome().getInactiveAllele(EnumTreeChromosome.GIRTH); - textLayout.drawLine(Translator.translateToLocal("for.gui.girth"), COLUMN_0); - drawLine(String.format("%sx%s", activeGirth.getValue(), activeGirth.getValue()), COLUMN_1, tree, EnumTreeChromosome.GIRTH, false); - drawLine(String.format("%sx%s", inactiveGirth.getValue(), inactiveGirth.getValue()), COLUMN_2, tree, EnumTreeChromosome.GIRTH, true); + textLayout.drawLine(Translator.translateToLocal("for.gui.girth"), GuiAlyzer.COLUMN_0); + gui.drawLine(String.format("%sx%s", activeGirth.getValue(), activeGirth.getValue()), GuiAlyzer.COLUMN_1, tree, EnumTreeChromosome.GIRTH, false); + gui.drawLine(String.format("%sx%s", inactiveGirth.getValue(), inactiveGirth.getValue()), GuiAlyzer.COLUMN_2, tree, EnumTreeChromosome.GIRTH, true); textLayout.newLineCompressed(); - drawChromosomeRow(Translator.translateToLocal("for.gui.yield"), tree, EnumTreeChromosome.YIELD); + gui.drawChromosomeRow(Translator.translateToLocal("for.gui.yield"), tree, EnumTreeChromosome.YIELD); textLayout.newLineCompressed(); - drawChromosomeRow(Translator.translateToLocal("for.gui.sappiness"), tree, EnumTreeChromosome.SAPPINESS); + gui.drawChromosomeRow(Translator.translateToLocal("for.gui.sappiness"), tree, EnumTreeChromosome.SAPPINESS); textLayout.newLineCompressed(); - drawChromosomeRow(Translator.translateToLocal("for.gui.effect"), tree, EnumTreeChromosome.EFFECT); + gui.drawChromosomeRow(Translator.translateToLocal("for.gui.effect"), tree, EnumTreeChromosome.EFFECT); textLayout.endPage(); } - private void drawAnalyticsPage2(ITree tree) { - + @SideOnly(Side.CLIENT) + @Override + public void drawAnalyticsPage2(GuiAlyzer gui, ITree tree, EnumGermlingType type) { + TextLayoutHelper textLayout = gui.getTextLayout(); + WidgetManager widgetManager = gui.getWidgetManager(); + textLayout.startPage(); - int speciesDominance0 = getColorCoding(tree.getGenome().getPrimary().isDominant()); - int speciesDominance1 = getColorCoding(tree.getGenome().getSecondary().isDominant()); + int speciesDominance0 = gui.getColorCoding(tree.getGenome().getPrimary().isDominant()); + int speciesDominance1 = gui.getColorCoding(tree.getGenome().getSecondary().isDominant()); - textLayout.drawLine(Translator.translateToLocal("for.gui.active"), COLUMN_1); - textLayout.drawLine(Translator.translateToLocal("for.gui.inactive"), COLUMN_2); + textLayout.drawLine(Translator.translateToLocal("for.gui.active"), GuiAlyzer.COLUMN_1); + textLayout.drawLine(Translator.translateToLocal("for.gui.inactive"), GuiAlyzer.COLUMN_2); textLayout.newLine(); textLayout.newLine(); - textLayout.drawLine(Translator.translateToLocal("for.gui.growth"), COLUMN_0); - drawLine(tree.getGenome().getGrowthProvider().getDescription(), COLUMN_1, tree, EnumTreeChromosome.GROWTH, false); - drawLine(((IAlleleGrowth) tree.getGenome().getInactiveAllele(EnumTreeChromosome.GROWTH)).getProvider().getDescription(), COLUMN_2, tree, + textLayout.drawLine(Translator.translateToLocal("for.gui.growth"), GuiAlyzer.COLUMN_0); + gui.drawLine(tree.getGenome().getGrowthProvider().getDescription(), GuiAlyzer.COLUMN_1, tree, EnumTreeChromosome.GROWTH, false); + gui.drawLine(((IAlleleGrowth) tree.getGenome().getInactiveAllele(EnumTreeChromosome.GROWTH)).getProvider().getDescription(), GuiAlyzer.COLUMN_2, tree, EnumTreeChromosome.GROWTH, true); textLayout.newLine(); - textLayout.drawLine(Translator.translateToLocal("for.gui.native"), COLUMN_0); - textLayout.drawLine(Translator.translateToLocal("for.gui." + tree.getGenome().getPrimary().getPlantType().toString().toLowerCase(Locale.ENGLISH)), COLUMN_1, + textLayout.drawLine(Translator.translateToLocal("for.gui.native"), GuiAlyzer.COLUMN_0); + textLayout.drawLine(Translator.translateToLocal("for.gui." + tree.getGenome().getPrimary().getPlantType().toString().toLowerCase(Locale.ENGLISH)), GuiAlyzer.COLUMN_1, speciesDominance0); - textLayout.drawLine(Translator.translateToLocal("for.gui." + tree.getGenome().getSecondary().getPlantType().toString().toLowerCase(Locale.ENGLISH)), COLUMN_2, + textLayout.drawLine(Translator.translateToLocal("for.gui." + tree.getGenome().getSecondary().getPlantType().toString().toLowerCase(Locale.ENGLISH)), GuiAlyzer.COLUMN_2, speciesDominance1); textLayout.newLine(); - textLayout.drawLine(Translator.translateToLocal("for.gui.tolerated"), COLUMN_0); + textLayout.drawLine(Translator.translateToLocal("for.gui.tolerated"), GuiAlyzer.COLUMN_0); List activeTolerated = new ArrayList<>(tree.getGenome().getPlantTypes()); List inactiveTolerated = Collections.emptyList(); @@ -190,16 +180,16 @@ public class GuiTreealyzer extends GuiAlyzer { textLayout.newLine(); } if (activeTolerated.size() > i) { - drawLine(Translator.translateToLocal("for.gui." + activeTolerated.get(i).toString().toLowerCase(Locale.ENGLISH)), COLUMN_1, tree, EnumTreeChromosome.PLANT, false); + gui.drawLine(Translator.translateToLocal("for.gui." + activeTolerated.get(i).toString().toLowerCase(Locale.ENGLISH)), GuiAlyzer.COLUMN_1, tree, EnumTreeChromosome.PLANT, false); } if (inactiveTolerated.size() > i) { - drawLine(Translator.translateToLocal("for.gui." + inactiveTolerated.get(i).toString().toLowerCase(Locale.ENGLISH)), COLUMN_2, tree, EnumTreeChromosome.PLANT, true); + gui.drawLine(Translator.translateToLocal("for.gui." + inactiveTolerated.get(i).toString().toLowerCase(Locale.ENGLISH)), GuiAlyzer.COLUMN_2, tree, EnumTreeChromosome.PLANT, true); } } textLayout.newLine(); // FRUITS - textLayout.drawLine(Translator.translateToLocal("for.gui.supports"), COLUMN_0); + textLayout.drawLine(Translator.translateToLocal("for.gui.supports"), GuiAlyzer.COLUMN_0); List families0 = new ArrayList<>(tree.getGenome().getPrimary().getSuitableFruit()); List families1 = new ArrayList<>(tree.getGenome().getSecondary().getSuitableFruit()); @@ -210,10 +200,10 @@ public class GuiTreealyzer extends GuiAlyzer { } if (families0.size() > i) { - textLayout.drawLine(families0.get(i).getName(), COLUMN_1, speciesDominance0); + textLayout.drawLine(families0.get(i).getName(), GuiAlyzer.COLUMN_1, speciesDominance0); } if (families1.size() > i) { - textLayout.drawLine(families1.get(i).getName(), COLUMN_2, speciesDominance1); + textLayout.drawLine(families1.get(i).getName(), GuiAlyzer.COLUMN_2, speciesDominance1); } } @@ -221,53 +211,57 @@ public class GuiTreealyzer extends GuiAlyzer { textLayout.newLine(); textLayout.newLine(); - int fruitDominance0 = getColorCoding(tree.getGenome().getActiveAllele(EnumTreeChromosome.FRUITS).isDominant()); - int fruitDominance1 = getColorCoding(tree.getGenome().getInactiveAllele(EnumTreeChromosome.FRUITS).isDominant()); + int fruitDominance0 = gui.getColorCoding(tree.getGenome().getActiveAllele(EnumTreeChromosome.FRUITS).isDominant()); + int fruitDominance1 = gui.getColorCoding(tree.getGenome().getInactiveAllele(EnumTreeChromosome.FRUITS).isDominant()); - textLayout.drawLine(Translator.translateToLocal("for.gui.fruits"), COLUMN_0); + textLayout.drawLine(Translator.translateToLocal("for.gui.fruits"), GuiAlyzer.COLUMN_0); String strike = ""; IAllele fruit0 = tree.getGenome().getActiveAllele(EnumTreeChromosome.FRUITS); if (!tree.canBearFruit() && fruit0 != AlleleFruit.fruitNone) { strike = TextFormatting.STRIKETHROUGH.toString(); } - textLayout.drawLine(strike + tree.getGenome().getFruitProvider().getDescription(), COLUMN_1, fruitDominance0); + textLayout.drawLine(strike + tree.getGenome().getFruitProvider().getDescription(), GuiAlyzer.COLUMN_1, fruitDominance0); strike = ""; IAlleleFruit fruit1 = (IAlleleFruit) tree.getGenome().getInactiveAllele(EnumTreeChromosome.FRUITS); if (!tree.getGenome().getSecondary().getSuitableFruit().contains(fruit1.getProvider().getFamily()) && fruit1 != AlleleFruit.fruitNone) { strike = TextFormatting.STRIKETHROUGH.toString(); } - textLayout.drawLine(strike + fruit1.getProvider().getDescription(), COLUMN_2, fruitDominance1); + textLayout.drawLine(strike + fruit1.getProvider().getDescription(), GuiAlyzer.COLUMN_2, fruitDominance1); textLayout.newLine(); - textLayout.drawLine(Translator.translateToLocal("for.gui.family"), COLUMN_0); + textLayout.drawLine(Translator.translateToLocal("for.gui.family"), GuiAlyzer.COLUMN_0); IFruitFamily primary = tree.getGenome().getFruitProvider().getFamily(); IFruitFamily secondary = ((IAlleleFruit) tree.getGenome().getInactiveAllele(EnumTreeChromosome.FRUITS)).getProvider().getFamily(); if (primary != null) { - textLayout.drawLine(primary.getName(), COLUMN_1, fruitDominance0); + textLayout.drawLine(primary.getName(), GuiAlyzer.COLUMN_1, fruitDominance0); } if (secondary != null) { - textLayout.drawLine(secondary.getName(), COLUMN_2, fruitDominance1); + textLayout.drawLine(secondary.getName(), GuiAlyzer.COLUMN_2, fruitDominance1); } textLayout.endPage(); } - private void drawAnalyticsPage3(ITree tree) { + @SideOnly(Side.CLIENT) + @Override + public void drawAnalyticsPage3(GuiAlyzer gui, ITree tree, EnumGermlingType type) { + TextLayoutHelper textLayout = gui.getTextLayout(); + WidgetManager widgetManager = gui.getWidgetManager(); - textLayout.startPage(COLUMN_0, COLUMN_1, COLUMN_2); + textLayout.startPage(GuiAlyzer.COLUMN_0, GuiAlyzer.COLUMN_1, GuiAlyzer.COLUMN_2); - textLayout.drawLine(Translator.translateToLocal("for.gui.beealyzer.produce") + ":", COLUMN_0); + textLayout.drawLine(Translator.translateToLocal("for.gui.beealyzer.produce") + ":", GuiAlyzer.COLUMN_0); textLayout.newLine(); - int x = COLUMN_0; + int x = GuiAlyzer.COLUMN_0; for (ItemStack stack : tree.getProducts().keySet()) { - itemRender.renderItemIntoGUI(stack, guiLeft + x, guiTop + textLayout.getLineY()); + Proxies.common.getClientInstance().getRenderItem().renderItemIntoGUI(stack, gui.getGuiLeft() + x, gui.getGuiTop() + textLayout.getLineY()); x += 18; if (x > 148) { - x = COLUMN_0; + x = GuiAlyzer.COLUMN_0; textLayout.newLine(); } } @@ -277,15 +271,15 @@ public class GuiTreealyzer extends GuiAlyzer { textLayout.newLine(); textLayout.newLine(); - textLayout.drawLine(Translator.translateToLocal("for.gui.beealyzer.specialty") + ":", COLUMN_0); + textLayout.drawLine(Translator.translateToLocal("for.gui.beealyzer.specialty") + ":", GuiAlyzer.COLUMN_0); textLayout.newLine(); - x = COLUMN_0; + x = GuiAlyzer.COLUMN_0; for (ItemStack stack : tree.getSpecialties().keySet()) { - itemRender.renderItemIntoGUI(stack, guiLeft + x, guiTop + textLayout.getLineY()); + Proxies.common.getClientInstance().getRenderItem().renderItemIntoGUI(stack, gui.getGuiLeft() + x, gui.getGuiTop() + textLayout.getLineY()); x += 18; if (x > 148) { - x = COLUMN_0; + x = GuiAlyzer.COLUMN_0; textLayout.newLine(); } } @@ -293,4 +287,14 @@ public class GuiTreealyzer extends GuiAlyzer { 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 66f5bae12..1a339444a 100644 --- a/src/main/java/forestry/arboriculture/genetics/TreeRoot.java +++ b/src/main/java/forestry/arboriculture/genetics/TreeRoot.java @@ -49,6 +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.IChromosomeType; import forestry.api.genetics.IIndividual; import forestry.api.genetics.IMutation; @@ -418,5 +419,10 @@ public class TreeRoot extends SpeciesRoot implements ITreeRoot { public IChromosomeType getKaryotypeKey() { return EnumTreeChromosome.SPECIES; } + + @Override + public IAlyzer getAlyzer() { + return new TreeAlyzer(); + } } diff --git a/src/main/java/forestry/arboriculture/inventory/ItemInventoryTreealyzer.java b/src/main/java/forestry/arboriculture/inventory/ItemInventoryTreealyzer.java deleted file mode 100644 index ebf9083ff..000000000 --- a/src/main/java/forestry/arboriculture/inventory/ItemInventoryTreealyzer.java +++ /dev/null @@ -1,61 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser Public License v3 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: - * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges - ******************************************************************************/ -package forestry.arboriculture.inventory; - -import java.util.List; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; - -import forestry.api.arboriculture.TreeManager; -import forestry.core.config.Config; -import forestry.core.gui.IHintSource; -import forestry.core.inventory.ItemInventoryAlyzer; -import forestry.core.utils.GeneticsUtil; - -public class ItemInventoryTreealyzer extends ItemInventoryAlyzer implements IHintSource { - - public ItemInventoryTreealyzer(EntityPlayer player, ItemStack itemStack) { - super(TreeManager.treeRoot, player, itemStack); - } - - @Override - public boolean canSlotAccept(int slotIndex, ItemStack itemStack) { - if (!TreeManager.treeRoot.isMember(itemStack) || itemStack.getItem() == Item.getItemFromBlock(Blocks.SAPLING)) { - ItemStack ersatz = GeneticsUtil.convertSaplingToGeneticEquivalent(itemStack); - if (ersatz != null) { - return super.canSlotAccept(slotIndex, ersatz); - } - } - return super.canSlotAccept(slotIndex, itemStack); - } - - @Override - public void onSlotClick(EntityPlayer player) { - ItemStack specimen = getStackInSlot(SLOT_SPECIMEN); - if (!TreeManager.treeRoot.isMember(specimen) || specimen.getItem() == Item.getItemFromBlock(Blocks.SAPLING)) { - ItemStack ersatz = GeneticsUtil.convertSaplingToGeneticEquivalent(specimen); - if (ersatz != null) { - setInventorySlotContents(SLOT_SPECIMEN, ersatz); - } - } - - super.onSlotClick(player); - } - - /* IHintSource */ - @Override - public List getHints() { - return Config.hints.get("treealyzer"); - } -} diff --git a/src/main/java/forestry/arboriculture/items/ItemRegistryArboriculture.java b/src/main/java/forestry/arboriculture/items/ItemRegistryArboriculture.java index 227c0d44c..0b1fa3824 100644 --- a/src/main/java/forestry/arboriculture/items/ItemRegistryArboriculture.java +++ b/src/main/java/forestry/arboriculture/items/ItemRegistryArboriculture.java @@ -18,7 +18,6 @@ import forestry.core.items.ItemRegistry; public class ItemRegistryArboriculture extends ItemRegistry { public final ItemGermlingGE sapling; public final ItemGermlingGE pollenFertile; - public final ItemTreealyzer treealyzer; public final ItemGrafter grafter; public final ItemGrafter grafterProven; @@ -27,7 +26,6 @@ public class ItemRegistryArboriculture extends ItemRegistry { OreDictionary.registerOre("treeSapling", sapling.getWildcard()); pollenFertile = registerItem(new ItemGermlingGE(EnumGermlingType.POLLEN), "pollenFertile"); - treealyzer = registerItem(new ItemTreealyzer(), "treealyzer"); grafter = registerItem(new ItemGrafter(4), "grafter"); grafterProven = registerItem(new ItemGrafter(149), "grafterProven"); } diff --git a/src/main/java/forestry/arboriculture/items/ItemTreealyzer.java b/src/main/java/forestry/arboriculture/items/ItemTreealyzer.java deleted file mode 100644 index 19a56d175..000000000 --- a/src/main/java/forestry/arboriculture/items/ItemTreealyzer.java +++ /dev/null @@ -1,36 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser Public License v3 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: - * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges - ******************************************************************************/ -package forestry.arboriculture.items; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; - -import forestry.api.core.Tabs; -import forestry.arboriculture.gui.GuiTreealyzer; -import forestry.arboriculture.inventory.ItemInventoryTreealyzer; -import forestry.core.gui.ContainerAlyzer; -import forestry.core.items.ItemWithGui; - -public class ItemTreealyzer extends ItemWithGui { - public ItemTreealyzer() { - setCreativeTab(Tabs.tabArboriculture); - } - - @Override - public Object getGui(EntityPlayer player, ItemStack heldItem, int data) { - return new GuiTreealyzer(player, new ItemInventoryTreealyzer(player, heldItem)); - } - - @Override - public Object getContainer(EntityPlayer player, ItemStack heldItem, int data) { - return new ContainerAlyzer(new ItemInventoryTreealyzer(player, heldItem), player); - } -} diff --git a/src/main/java/forestry/core/PluginCore.java b/src/main/java/forestry/core/PluginCore.java index fa59ba0da..4d8fd380d 100644 --- a/src/main/java/forestry/core/PluginCore.java +++ b/src/main/java/forestry/core/PluginCore.java @@ -257,6 +257,35 @@ public class PluginCore extends BlankForestryPlugin { // / WRENCH RecipeUtil.addRecipe(items.wrench, "# #", " # ", " # ", '#', "ingotBronze"); + + if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.FACTORY)) { + // / CARPENTER + RecipeManagers.carpenterManager.addRecipe(100, Fluids.WATER.getFluid(2000), null, PluginCore.items.portableAlyzer.getItemStack(), + "X#X", "X#X", "RDR", + '#', "paneGlass", + 'X', "ingotTin", + 'R', "dustRedstone", + 'D', "gemDiamond"); + }else{ + // Portable ANALYZER + RecipeUtil.addRecipe(PluginCore.items.portableAlyzer.getItemStack(), + "X#X", + "X#X", + "RDR", + '#', "paneGlass", + 'X', "ingotTin", + 'R', "dustRedstone", + 'D', "gemDiamond"); + } + + // ANALYZER + RecipeUtil.addRecipe(PluginCore.blocks.core.get(BlockTypeCoreTesr.ANALYZER), + "XTX", + " Y ", + "X X", + 'Y', PluginCore.items.sturdyCasing, + 'T', PluginCore.items.portableAlyzer, + 'X', "ingotBronze"); // Manure and Fertilizer int compostWheatAmount = ForestryAPI.activeMode.getIntegerSetting("recipe.output.compost.wheat"); diff --git a/src/main/java/forestry/core/genetics/Alyzer.java b/src/main/java/forestry/core/genetics/Alyzer.java new file mode 100644 index 000000000..5df420dde --- /dev/null +++ b/src/main/java/forestry/core/genetics/Alyzer.java @@ -0,0 +1,139 @@ +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/ContainerItemInventory.java b/src/main/java/forestry/core/gui/ContainerItemInventory.java index 68e2c579d..1003fc6bf 100755 --- a/src/main/java/forestry/core/gui/ContainerItemInventory.java +++ b/src/main/java/forestry/core/gui/ContainerItemInventory.java @@ -53,7 +53,9 @@ public abstract class ContainerItemInventory extends Co @Override public ItemStack slotClick(int slotId, int dragType_or_button, ClickType clickTypeIn, EntityPlayer player) { ItemStack result = super.slotClick(slotId, dragType_or_button, clickTypeIn, player); - inventory.onSlotClick(player); + if(slotId != -999){ + inventory.onSlotClick(inventorySlots.get(slotId).getSlotIndex(), player); + } return result; } diff --git a/src/main/java/forestry/core/gui/GuiAlyzer.java b/src/main/java/forestry/core/gui/GuiAlyzer.java index b74fb8438..14733bf71 100755 --- a/src/main/java/forestry/core/gui/GuiAlyzer.java +++ b/src/main/java/forestry/core/gui/GuiAlyzer.java @@ -22,52 +22,55 @@ 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.core.config.Constants; +import forestry.api.genetics.ISpeciesType; import forestry.core.genetics.mutations.EnumMutateChance; +import forestry.core.gui.ledgers.LedgerManager; import forestry.core.gui.widgets.ItemStackWidget; +import forestry.core.gui.widgets.WidgetManager; +import forestry.core.inventory.ItemInventoryAlyzer; import forestry.core.proxy.Proxies; import forestry.core.utils.Translator; -public abstract class GuiAlyzer extends GuiForestry { - - protected static final int COLUMN_0 = 12; - protected static final int COLUMN_1 = 90; - protected static final int COLUMN_2 = 155; +public class GuiAlyzer extends GuiForestry implements IGuiAlyzer { + + 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 String unlocalizedName; + private final IAlyzer alyzer; protected final Map iconStacks = new HashMap<>(); - protected GuiAlyzer(ISpeciesRoot speciesRoot, EntityPlayer player, ContainerAlyzer container, IInventory inventory, String unlocalizedName) { - super(Constants.TEXTURE_PATH_GUI + "/beealyzer2.png", container, inventory); + public GuiAlyzer(EntityPlayer player, IAlyzer alyzer, ItemInventoryAlyzer inventory) { + super(alyzer.getGuiTexture(), new ContainerAlyzer(inventory, player), inventory); this.xSize = 246; this.ySize = 238; - this.unlocalizedName = unlocalizedName; - - this.speciesRoot = speciesRoot; + this.speciesRoot = alyzer.getSpeciesRoot(); this.breedingTracker = this.speciesRoot.getBreedingTracker(player.worldObj, player.getGameProfile()); + this.alyzer = alyzer; } - protected final int getColorCoding(boolean dominant) { + @Override + public final int getColorCoding(boolean dominant) { if (dominant) { return fontColor.get("gui.beealyzer.dominant"); } else { @@ -75,7 +78,8 @@ public abstract class GuiAlyzer extends GuiForestry } } - protected final void drawLine(String text, int x, IIndividual individual, IChromosomeType chromosome, boolean inactive) { + @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())); } else { @@ -83,7 +87,8 @@ public abstract class GuiAlyzer extends GuiForestry } } - protected final void drawSplitLine(String text, int x, int maxWidth, IIndividual individual, IChromosomeType chromosome, boolean inactive) { + @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())); } else { @@ -91,12 +96,14 @@ public abstract class GuiAlyzer extends GuiForestry } } - protected final void drawRow(String text0, String text1, String text2, IIndividual individual, IChromosomeType chromosome) { + @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())); } - protected final void drawChromosomeRow(String chromosomeName, IIndividual individual, IChromosomeType chromosome) { + @Override + public final void drawChromosomeRow(String chromosomeName, IIndividual individual, IChromosomeType chromosome) { IAllele active = individual.getGenome().getActiveAllele(chromosome); IAllele inactive = individual.getGenome().getInactiveAllele(chromosome); textLayout.drawRow(chromosomeName, active.getName(), inactive.getName(), @@ -104,7 +111,8 @@ public abstract class GuiAlyzer extends GuiForestry getColorCoding(inactive.isDominant())); } - protected final void drawSpeciesRow(String text0, IIndividual individual, IChromosomeType chromosome, String customPrimaryName, String customSecondaryName) { + @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(); @@ -123,30 +131,75 @@ public abstract class GuiAlyzer extends GuiForestry textLayout.newLine(); } - protected static String checkCustomName(String key) { + public static String checkCustomName(String key) { if (Translator.canTranslateToLocal(key)) { return Translator.translateToLocal(key); } else { return null; } } - + @Override - protected void drawGuiContainerBackgroundLayer(float f, int mouseX, int mouseY) { - super.drawGuiContainerBackgroundLayer(f, mouseX, mouseY); + protected void drawGuiContainerBackgroundLayer(float var1, int mouseX, int mouseY) { + 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; + } + + switch (page) { + case 1: + alyzer.drawAnalyticsPage1(this, individual, speciesType); + break; + case 2: + alyzer.drawAnalyticsPage2(this, individual, speciesType); + break; + case 3: + alyzer.drawAnalyticsPage3(this, individual, speciesType); + break; + case 4: + drawAnalyticsPageMutations(individual); + break; + case 6: + drawAnalyticsPageClassification(individual); + break; + default: + drawAnalyticsOverview(); + } + } - protected void drawAnalyticsOverview() { + @Override + public void drawAnalyticsOverview() { textLayout.startPage(); textLayout.newLine(); - String title = Translator.translateToLocal(unlocalizedName).toUpperCase(); + String title = Translator.translateToLocal("for.gui.portablealyzer").toUpperCase(); textLayout.drawCenteredLine(title, 8, 208, fontColor.get("gui.screen")); textLayout.newLine(); - fontRendererObj.drawSplitString(Translator.translateToLocal(unlocalizedName + ".help"), guiLeft + COLUMN_0 + 4, guiTop + 42, 200, fontColor.get("gui.screen")); + fontRendererObj.drawSplitString(Translator.translateToLocal("for.gui.portablealyzer.help"), guiLeft + COLUMN_0 + 4, guiTop + 42, 200, fontColor.get("gui.screen")); + textLayout.newLine(); textLayout.newLine(); textLayout.newLine(); textLayout.newLine(); @@ -164,7 +217,8 @@ public abstract class GuiAlyzer extends GuiForestry textLayout.endPage(); } - protected final void drawAnalyticsPageClassification(IIndividual individual) { + @Override + public final void drawAnalyticsPageClassification(IIndividual individual) { textLayout.startPage(); @@ -231,7 +285,8 @@ public abstract class GuiAlyzer extends GuiForestry textLayout.endPage(); } - protected void drawAnalyticsPageMutations(IIndividual individual) { + @Override + public void drawAnalyticsPageMutations(IIndividual individual) { textLayout.startPage(COLUMN_0, COLUMN_1, COLUMN_2); textLayout.drawLine(Translator.translateToLocal("for.gui.beealyzer.mutations") + ":", COLUMN_0); @@ -275,7 +330,8 @@ public abstract class GuiAlyzer extends GuiForestry textLayout.endPage(); } - protected void drawMutationInfo(IMutation combination, IAllele species, int x) { + @Override + public void drawMutationInfo(IMutation combination, IAllele species, int x) { ItemStack partnerBee = iconStacks.get(combination.getPartner(species).getUID()); widgetManager.add(new ItemStackWidget(widgetManager, x, textLayout.getLineY(), partnerBee)); @@ -338,7 +394,8 @@ public abstract class GuiAlyzer extends GuiForestry } } - protected void drawToleranceInfo(IAlleleTolerance toleranceAllele, int x) { + @Override + public void drawToleranceInfo(IAlleleTolerance toleranceAllele, int x) { int textColor = getColorCoding(toleranceAllele.isDominant()); EnumTolerance tolerance = toleranceAllele.getValue(); String text = "(" + toleranceAllele.getName() + ")"; @@ -398,7 +455,8 @@ public abstract class GuiAlyzer extends GuiForestry drawTexturedModalRect(guiLeft + x, guiTop + y, 45, 247, 15, 9); } - protected void drawFertilityInfo(int fertility, int x, int textColor, int texOffset) { + @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); @@ -412,4 +470,16 @@ public abstract class GuiAlyzer extends GuiForestry textLayout.drawLine(fertilityString, x, textColor); } + public TextLayoutHelper getTextLayout() { + return textLayout; + } + + public WidgetManager getWidgetManager() { + return widgetManager; + } + + public LedgerManager getLedgerManager() { + return ledgerManager; + } + } diff --git a/src/main/java/forestry/core/gui/GuiForestry.java b/src/main/java/forestry/core/gui/GuiForestry.java index 3872144a5..0c15b8561 100755 --- a/src/main/java/forestry/core/gui/GuiForestry.java +++ b/src/main/java/forestry/core/gui/GuiForestry.java @@ -26,8 +26,6 @@ import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fml.common.Optional; - import forestry.api.core.IErrorLogicSource; import forestry.api.core.IErrorSource; import forestry.core.access.IRestrictedAccess; @@ -44,7 +42,6 @@ import forestry.core.render.ForestryResource; import forestry.core.tiles.IClimatised; import forestry.core.tiles.IPowerHandler; -@Optional.Interface(iface = "codechicken.nei.api.INEIGuiHandler", modid = "NotEnoughItems") public abstract class GuiForestry extends GuiContainer { protected final I inventory; protected final C container; diff --git a/src/main/java/forestry/core/gui/GuiIdRegistry.java b/src/main/java/forestry/core/gui/GuiIdRegistry.java index 7334de37a..6ab306853 100644 --- a/src/main/java/forestry/core/gui/GuiIdRegistry.java +++ b/src/main/java/forestry/core/gui/GuiIdRegistry.java @@ -17,7 +17,6 @@ import java.util.Map; import forestry.apiculture.entities.EntityMinecartApiary; import forestry.apiculture.entities.EntityMinecartBeehouse; -import forestry.apiculture.items.ItemBeealyzer; import forestry.apiculture.items.ItemHabitatLocator; import forestry.apiculture.items.ItemImprinter; import forestry.apiculture.multiblock.TileAlveary; @@ -25,7 +24,7 @@ import forestry.apiculture.multiblock.TileAlvearyHygroregulator; import forestry.apiculture.multiblock.TileAlvearySieve; import forestry.apiculture.tiles.TileApiary; import forestry.apiculture.tiles.TileBeeHouse; -import forestry.arboriculture.items.ItemTreealyzer; +import forestry.core.items.ItemAlyzer; import forestry.core.items.ItemSolderingIron; import forestry.core.tiles.TileAnalyzer; import forestry.core.tiles.TileEscritoire; @@ -47,7 +46,6 @@ import forestry.factory.tiles.TileWorktable; import forestry.farming.tiles.TileFarm; import forestry.food.items.ItemInfuser; import forestry.greenhouse.tiles.TileGreenhouse; -import forestry.lepidopterology.items.ItemFlutterlyzer; import forestry.mail.items.ItemCatalogue; import forestry.mail.items.ItemLetter; import forestry.mail.tiles.TileMailbox; @@ -101,15 +99,13 @@ public class GuiIdRegistry { registerGuiHandlers(GuiType.Item, Arrays.asList( ItemBackpack.class, ItemBackpackNaturalist.class, - ItemBeealyzer.class, + ItemAlyzer.class, ItemCatalogue.class, - ItemFlutterlyzer.class, ItemHabitatLocator.class, ItemImprinter.class, ItemInfuser.class, ItemLetter.class, - ItemSolderingIron.class, - ItemTreealyzer.class + ItemSolderingIron.class )); registerGuiHandlers(GuiType.Entity, Arrays.asList( diff --git a/src/main/java/forestry/core/inventory/ItemInventory.java b/src/main/java/forestry/core/inventory/ItemInventory.java index 0f6834572..e59283eb4 100755 --- a/src/main/java/forestry/core/inventory/ItemInventory.java +++ b/src/main/java/forestry/core/inventory/ItemInventory.java @@ -149,7 +149,7 @@ public abstract class ItemInventory implements IInventory, IFilterSlotDelegate, return Integer.toString(i, Character.MAX_RADIX); } - public void onSlotClick(EntityPlayer player) { + public void onSlotClick(int slotIndex, EntityPlayer player) { } @Override diff --git a/src/main/java/forestry/core/inventory/ItemInventoryAlyzer.java b/src/main/java/forestry/core/inventory/ItemInventoryAlyzer.java index 3e7aebaf2..669b69adf 100644 --- a/src/main/java/forestry/core/inventory/ItemInventoryAlyzer.java +++ b/src/main/java/forestry/core/inventory/ItemInventoryAlyzer.java @@ -10,25 +10,23 @@ ******************************************************************************/ package forestry.core.inventory; +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.IBreedingTracker; -import forestry.api.genetics.IIndividual; +import forestry.api.genetics.AlleleManager; +import forestry.api.genetics.IAlyzer; import forestry.api.genetics.ISpeciesRoot; -import forestry.apiculture.PluginApiculture; -import forestry.apiculture.items.ItemRegistryApiculture; import forestry.core.errors.EnumErrorCode; -import forestry.plugins.ForestryPluginUids; +import forestry.core.gui.IHintSource; +import forestry.core.utils.GeneticsUtil; -public abstract class ItemInventoryAlyzer extends ItemInventory implements IErrorSource { +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; @@ -37,77 +35,43 @@ public abstract class ItemInventoryAlyzer extends ItemInventory implements IErro public static final int SLOT_ANALYZE_5 = 6; public static final int SLOT_ENERGY = 5; - private final ISpeciesRoot speciesRoot; - - public ItemInventoryAlyzer(ISpeciesRoot speciesRoot, EntityPlayer player, ItemStack itemstack) { + public IAlyzer alyzer; + + public ItemInventoryAlyzer(EntityPlayer player, ItemStack itemstack, IAlyzer alyzer) { super(player, 7, itemstack); - this.speciesRoot = speciesRoot; + + this.alyzer = alyzer; } - + @Override public boolean canSlotAccept(int slotIndex, ItemStack itemStack) { - if (slotIndex == SLOT_ENERGY) { - return isEnergy(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 (!speciesRoot.isMember(itemStack)) { - return false; + if(speciesRoot != null){ + return speciesRoot.getAlyzer().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(); + return alyzer.canSlotAccept(this, slotIndex, itemStack); } - + @Override - public void onSlotClick(EntityPlayer player) { - // Source slot to analyze empty - ItemStack specimen = getStackInSlot(SLOT_SPECIMEN); - if (specimen == null) { - return; + 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()); } - - IIndividual individual = speciesRoot.getMember(specimen); - // No individual, abort - if (individual == null) { - return; + if(speciesRoot != null){ + speciesRoot.getAlyzer().onSlotClick(this, slotIndex, player); + }else{ + alyzer.onSlotClick(this, slotIndex, player); } - - // Analyze if necessary - if (!individual.isAnalyzed()) { - - if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.APICULTURE)) { - // Requires energy - if (!isEnergy(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); } @Override @@ -116,30 +80,17 @@ public abstract class ItemInventoryAlyzer extends ItemInventory implements IErro if (!hasSpecimen()) { errorStates.add(EnumErrorCode.NO_SPECIMEN); - } - - if (!isEnergy(getStackInSlot(SLOT_ENERGY))) { - errorStates.add(EnumErrorCode.NO_HONEY); + }else{ + ISpeciesRoot speciesRoot = AlleleManager.alleleRegistry.getSpeciesRoot(getSpecimen()); + if (speciesRoot != null && !speciesRoot.getAlyzer().isAlyzingFuel(getStackInSlot(SLOT_ENERGY))) { + errorStates.add(EnumErrorCode.NO_HONEY); + } } return errorStates.build(); } - - private static boolean isEnergy(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; - } - - private boolean hasSpecimen() { + + public ItemStack getSpecimen() { for (int i = SLOT_SPECIMEN; i <= SLOT_ANALYZE_5; i++) { if (i == SLOT_ENERGY) { continue; @@ -147,9 +98,26 @@ public abstract class ItemInventoryAlyzer extends ItemInventory implements IErro ItemStack itemStack = getStackInSlot(i); if (itemStack != null) { - return true; + return itemStack; } } - return false; + return null; + } + + public boolean hasSpecimen() { + return getSpecimen() != null; + } + + /* 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(); + } + } + return Collections.emptyList(); } } diff --git a/src/main/java/forestry/core/inventory/ItemInventorySolderingIron.java b/src/main/java/forestry/core/inventory/ItemInventorySolderingIron.java index f5c498e5a..d473b8979 100644 --- a/src/main/java/forestry/core/inventory/ItemInventorySolderingIron.java +++ b/src/main/java/forestry/core/inventory/ItemInventorySolderingIron.java @@ -99,7 +99,7 @@ public class ItemInventorySolderingIron extends ItemInventory implements IErrorS } @Override - public void onSlotClick(EntityPlayer player) { + public void onSlotClick(int slotIndex, EntityPlayer player) { if (layouts.getCurrent() == CircuitRegistry.DUMMY_LAYOUT) { return; } diff --git a/src/main/java/forestry/core/items/ItemAlyzer.java b/src/main/java/forestry/core/items/ItemAlyzer.java new file mode 100644 index 000000000..c9a4ee1d7 --- /dev/null +++ b/src/main/java/forestry/core/items/ItemAlyzer.java @@ -0,0 +1,54 @@ +/******************************************************************************* + * Copyright (c) 2011-2014 SirSengir. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Lesser Public License v3 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/lgpl-3.0.txt + * + * Various Contributors including, but not limited to: + * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges + ******************************************************************************/ +package forestry.core.items; + +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; + +public class ItemAlyzer extends ItemWithGui { + public ItemAlyzer() { + setCreativeTab(Tabs.tabApiculture); + } + + @Override + public void openGui(EntityPlayer entityplayer) { + super.openGui(entityplayer); + } + + @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)); + } + + @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); + } +} diff --git a/src/main/java/forestry/core/items/ItemForestryTool.java b/src/main/java/forestry/core/items/ItemForestryTool.java index eb7405940..ed314fae1 100755 --- a/src/main/java/forestry/core/items/ItemForestryTool.java +++ b/src/main/java/forestry/core/items/ItemForestryTool.java @@ -17,9 +17,7 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.init.SoundEvents; -import net.minecraft.item.ItemSpade; import net.minecraft.item.ItemStack; -import net.minecraft.item.ItemTool; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; diff --git a/src/main/java/forestry/core/items/ItemRegistryCore.java b/src/main/java/forestry/core/items/ItemRegistryCore.java index 325ea2e0c..666fe4320 100644 --- a/src/main/java/forestry/core/items/ItemRegistryCore.java +++ b/src/main/java/forestry/core/items/ItemRegistryCore.java @@ -11,7 +11,8 @@ package forestry.core.items; import net.minecraft.item.ItemStack; - +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.oredict.OreDictionary; import forestry.api.core.Tabs; @@ -28,6 +29,9 @@ public class ItemRegistryCore extends ItemRegistry { /* Research */ public final ItemResearchNote researchNote; + + /* Alyzer */ + public final ItemAlyzer portableAlyzer; /* Ingots */ public final ItemForestry ingotCopper; @@ -93,6 +97,8 @@ public class ItemRegistryCore extends ItemRegistry { OreDictionary.registerOre("gemApatite", apatite); researchNote = registerItem(new ItemResearchNote(), "researchNote"); + + portableAlyzer = registerItem(new ItemAlyzer(), "portableAlyzer"); ingotCopper = registerItem(new ItemForestry(), "ingotCopper"); OreDictionary.registerOre("ingotCopper", ingotCopper); diff --git a/src/main/java/forestry/food/inventory/ItemInventoryInfuser.java b/src/main/java/forestry/food/inventory/ItemInventoryInfuser.java index 24c4a0ff2..254e3debc 100644 --- a/src/main/java/forestry/food/inventory/ItemInventoryInfuser.java +++ b/src/main/java/forestry/food/inventory/ItemInventoryInfuser.java @@ -28,7 +28,7 @@ public class ItemInventoryInfuser extends ItemInventory { } @Override - public void onSlotClick(EntityPlayer player) { + public void onSlotClick(int slotIndex, EntityPlayer player) { // Need input ItemStack input = getStackInSlot(inputSlot); diff --git a/src/main/java/forestry/lepidopterology/PluginLepidopterology.java b/src/main/java/forestry/lepidopterology/PluginLepidopterology.java index b508736f4..bfe9cd502 100644 --- a/src/main/java/forestry/lepidopterology/PluginLepidopterology.java +++ b/src/main/java/forestry/lepidopterology/PluginLepidopterology.java @@ -41,11 +41,9 @@ import forestry.api.genetics.IAllele; import forestry.api.lepidopterology.ButterflyManager; import forestry.api.lepidopterology.IAlleleButterflyCocoon; import forestry.api.lepidopterology.IAlleleButterflySpecies; -import forestry.api.recipes.RecipeManagers; import forestry.core.PluginCore; import forestry.core.config.Constants; import forestry.core.config.LocalizedConfiguration; -import forestry.core.fluids.Fluids; import forestry.core.recipes.RecipeUtil; import forestry.core.utils.EntityUtil; import forestry.core.utils.ItemStackUtil; @@ -263,10 +261,6 @@ public class PluginLepidopterology extends BlankForestryPlugin { public void registerRecipes() { CraftingManager.getInstance().getRecipeList().add(new MatingRecipe()); - RecipeManagers.carpenterManager.addRecipe(100, Fluids.WATER.getFluid(2000), null, items.flutterlyzer.getItemStack(), - "X#X", "X#X", "RDR", '#', "paneGlass", 'X', "ingotBronze", 'R', - "dustRedstone", 'D', "gemDiamond"); - RecipeUtil.addRecipe(blocks.lepidopterology.get(BlockTypeLepidopterologyTesr.LEPICHEST), " # ", "XYX", diff --git a/src/main/java/forestry/lepidopterology/genetics/ButterflyRoot.java b/src/main/java/forestry/lepidopterology/genetics/ButterflyRoot.java index ab1cbac8b..31c6cd0b7 100644 --- a/src/main/java/forestry/lepidopterology/genetics/ButterflyRoot.java +++ b/src/main/java/forestry/lepidopterology/genetics/ButterflyRoot.java @@ -29,6 +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.IChromosomeType; import forestry.api.genetics.IIndividual; import forestry.api.genetics.IMutation; @@ -319,4 +320,9 @@ public class ButterflyRoot extends SpeciesRoot implements IButterflyRoot { return EnumButterflyChromosome.SPECIES; } + @Override + public IAlyzer getAlyzer() { + return new Flutterlyzer(); + } + } diff --git a/src/main/java/forestry/lepidopterology/gui/GuiFlutterlyzer.java b/src/main/java/forestry/lepidopterology/genetics/Flutterlyzer.java old mode 100755 new mode 100644 similarity index 57% rename from src/main/java/forestry/lepidopterology/gui/GuiFlutterlyzer.java rename to src/main/java/forestry/lepidopterology/genetics/Flutterlyzer.java index 92f105e86..9427f10c8 --- a/src/main/java/forestry/lepidopterology/gui/GuiFlutterlyzer.java +++ b/src/main/java/forestry/lepidopterology/genetics/Flutterlyzer.java @@ -8,37 +8,41 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.lepidopterology.gui; +package forestry.lepidopterology.genetics; import java.util.ArrayList; +import java.util.List; -import net.minecraft.entity.player.EntityPlayer; 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.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.ContainerAlyzer; import forestry.core.gui.GuiAlyzer; -import forestry.core.inventory.ItemInventoryAlyzer; +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; -import forestry.lepidopterology.genetics.ButterflyGenome; -import forestry.lepidopterology.inventory.ItemInventoryFlutterlyzer; -public class GuiFlutterlyzer extends GuiAlyzer { - - public GuiFlutterlyzer(EntityPlayer player, ItemInventoryFlutterlyzer inventory) { - super(ButterflyManager.butterflyRoot, player, new ContainerAlyzer(inventory, player), inventory, "for.gui.flutterlyzer"); +public class Flutterlyzer extends Alyzer implements IHintSource { + public Flutterlyzer() { + super(ButterflyManager.butterflyRoot); + ArrayList butterflyList = new ArrayList<>(); PluginLepidopterology.items.butterflyGE.addCreativeItems(butterflyList, false); for (ItemStack butterflyStack : butterflyList) { @@ -49,94 +53,54 @@ public class GuiFlutterlyzer extends GuiAlyzer { } } + @SideOnly(Side.CLIENT) @Override - protected void drawGuiContainerBackgroundLayer(float var1, int mouseX, int mouseY) { - super.drawGuiContainerBackgroundLayer(var1, mouseX, mouseY); + public void drawAnalyticsPage1(GuiAlyzer gui, IButterfly butterfly, EnumFlutterType type) { + TextLayoutHelper textLayout = gui.getTextLayout(); + WidgetManager widgetManager = gui.getWidgetManager(); + + textLayout.startPage(GuiAlyzer.COLUMN_0, GuiAlyzer.COLUMN_1, GuiAlyzer.COLUMN_2); - int page = 0; - IButterfly butterfly = null; - for (int k = 1; k < ItemInventoryAlyzer.SLOT_ANALYZE_5 + 1; k++) { - if (k == ItemInventoryAlyzer.SLOT_ENERGY) { - continue; - } - - if (inventory.getStackInSlot(k) == null) { - continue; - } - butterfly = ButterflyManager.butterflyRoot.getMember(inventory.getStackInSlot(k)); - if (butterfly == null || !butterfly.isAnalyzed()) { - continue; - } - - page = k; - break; - } - - switch (page) { - case 1: - drawAnalyticsPage1(butterfly); - break; - case 2: - drawAnalyticsPage2(butterfly); - break; - case 3: - drawAnalyticsPage3(butterfly); - break; - case 4: - drawAnalyticsPageMutations(butterfly); - break; - case 6: - drawAnalyticsPageClassification(butterfly); - break; - default: - drawAnalyticsOverview(); - } - - } - - private void drawAnalyticsPage1(IButterfly butterfly) { - textLayout.startPage(COLUMN_0, COLUMN_1, COLUMN_2); - - textLayout.drawLine(Translator.translateToLocal("for.gui.active"), COLUMN_1); - textLayout.drawLine(Translator.translateToLocal("for.gui.inactive"), COLUMN_2); + textLayout.drawLine(Translator.translateToLocal("for.gui.active"), GuiAlyzer.COLUMN_1); + textLayout.drawLine(Translator.translateToLocal("for.gui.inactive"), GuiAlyzer.COLUMN_2); textLayout.newLine(); textLayout.newLine(); - drawSpeciesRow(Translator.translateToLocal("for.gui.species"), butterfly, EnumButterflyChromosome.SPECIES, null, null); + gui.drawSpeciesRow(Translator.translateToLocal("for.gui.species"), butterfly, EnumButterflyChromosome.SPECIES, null, null); textLayout.newLine(); - drawRow(Translator.translateToLocal("for.gui.size"), butterfly.getGenome().getActiveAllele(EnumButterflyChromosome.SIZE).getName(), + gui.drawRow(Translator.translateToLocal("for.gui.size"), butterfly.getGenome().getActiveAllele(EnumButterflyChromosome.SIZE).getName(), butterfly.getGenome().getInactiveAllele(EnumButterflyChromosome.SIZE).getName(), butterfly, EnumButterflyChromosome.SPEED); textLayout.newLine(); - drawRow(Translator.translateToLocal("for.gui.lifespan"), butterfly.getGenome().getActiveAllele(EnumButterflyChromosome.LIFESPAN).getName(), + gui.drawRow(Translator.translateToLocal("for.gui.lifespan"), butterfly.getGenome().getActiveAllele(EnumButterflyChromosome.LIFESPAN).getName(), butterfly.getGenome().getInactiveAllele(EnumButterflyChromosome.LIFESPAN).getName(), butterfly, EnumButterflyChromosome.LIFESPAN); textLayout.newLine(); - drawRow(Translator.translateToLocal("for.gui.speed"), butterfly.getGenome().getActiveAllele(EnumButterflyChromosome.SPEED).getName(), + gui.drawRow(Translator.translateToLocal("for.gui.speed"), butterfly.getGenome().getActiveAllele(EnumButterflyChromosome.SPEED).getName(), butterfly.getGenome().getInactiveAllele(EnumButterflyChromosome.SPEED).getName(), butterfly, EnumButterflyChromosome.SPEED); textLayout.newLine(); - drawRow(Translator.translateToLocal("for.gui.metabolism"), GenericRatings.rateMetabolism(butterfly.getGenome().getMetabolism()), + gui.drawRow(Translator.translateToLocal("for.gui.metabolism"), GenericRatings.rateMetabolism(butterfly.getGenome().getMetabolism()), GenericRatings.rateMetabolism(((IAlleleInteger) butterfly.getGenome().getInactiveAllele(EnumButterflyChromosome.METABOLISM)).getValue()), butterfly, EnumButterflyChromosome.METABOLISM); textLayout.newLine(); - textLayout.drawLine(Translator.translateToLocal("for.gui.fertility"), COLUMN_0); - drawFertilityInfo(butterfly.getGenome().getFertility(), COLUMN_1, getColorCoding(butterfly.getGenome().getActiveAllele(EnumButterflyChromosome.FERTILITY) + textLayout.drawLine(Translator.translateToLocal("for.gui.fertility"), GuiAlyzer.COLUMN_0); + gui.drawFertilityInfo(butterfly.getGenome().getFertility(), GuiAlyzer.COLUMN_1, gui.getColorCoding(butterfly.getGenome().getActiveAllele(EnumButterflyChromosome.FERTILITY) .isDominant()), 8); - drawFertilityInfo(((IAlleleInteger) butterfly.getGenome().getInactiveAllele(EnumButterflyChromosome.FERTILITY)).getValue(), COLUMN_2, getColorCoding(butterfly + gui.drawFertilityInfo(((IAlleleInteger) butterfly.getGenome().getInactiveAllele(EnumButterflyChromosome.FERTILITY)).getValue(), GuiAlyzer.COLUMN_2, gui.getColorCoding(butterfly .getGenome().getInactiveAllele(EnumButterflyChromosome.FERTILITY).isDominant()), 8); textLayout.newLine(); - drawRow(Translator.translateToLocal("for.gui.flowers"), butterfly.getGenome().getFlowerProvider().getDescription(), + gui.drawRow(Translator.translateToLocal("for.gui.flowers"), butterfly.getGenome().getFlowerProvider().getDescription(), ((IAlleleFlowers) butterfly.getGenome().getInactiveAllele(EnumButterflyChromosome.FLOWER_PROVIDER)).getProvider() .getDescription(), butterfly, EnumButterflyChromosome.FLOWER_PROVIDER); textLayout.newLine(); - drawRow(Translator.translateToLocal("for.gui.effect"), butterfly.getGenome().getEffect().getName(), + gui.drawRow(Translator.translateToLocal("for.gui.effect"), butterfly.getGenome().getEffect().getName(), butterfly.getGenome().getInactiveAllele(EnumButterflyChromosome.EFFECT).getName(), butterfly, EnumButterflyChromosome.EFFECT); @@ -144,37 +108,42 @@ public class GuiFlutterlyzer extends GuiAlyzer { textLayout.endPage(); } + + @SideOnly(Side.CLIENT) + @Override + public void drawAnalyticsPage2(GuiAlyzer gui, IButterfly butterfly, EnumFlutterType type) { + TextLayoutHelper textLayout = gui.getTextLayout(); + WidgetManager widgetManager = gui.getWidgetManager(); + + textLayout.startPage(GuiAlyzer.COLUMN_0, GuiAlyzer.COLUMN_1, GuiAlyzer.COLUMN_2); - private void drawAnalyticsPage2(IButterfly butterfly) { - textLayout.startPage(COLUMN_0, COLUMN_1, COLUMN_2); - - textLayout.drawLine(Translator.translateToLocal("for.gui.active"), COLUMN_1); - textLayout.drawLine(Translator.translateToLocal("for.gui.inactive"), COLUMN_2); + textLayout.drawLine(Translator.translateToLocal("for.gui.active"), GuiAlyzer.COLUMN_1); + textLayout.drawLine(Translator.translateToLocal("for.gui.inactive"), GuiAlyzer.COLUMN_2); textLayout.newLine(); textLayout.newLine(); - drawRow(Translator.translateToLocal("for.gui.climate"), AlleleManager.climateHelper.toDisplay(butterfly.getGenome().getPrimary().getTemperature()), + gui.drawRow(Translator.translateToLocal("for.gui.climate"), AlleleManager.climateHelper.toDisplay(butterfly.getGenome().getPrimary().getTemperature()), AlleleManager.climateHelper.toDisplay(butterfly.getGenome().getPrimary().getTemperature()), butterfly, EnumButterflyChromosome.SPECIES); textLayout.newLine(); IAlleleTolerance tempToleranceActive = (IAlleleTolerance) butterfly.getGenome().getActiveAllele(EnumButterflyChromosome.TEMPERATURE_TOLERANCE); IAlleleTolerance tempToleranceInactive = (IAlleleTolerance) butterfly.getGenome().getInactiveAllele(EnumButterflyChromosome.TEMPERATURE_TOLERANCE); - textLayout.drawLine(" " + Translator.translateToLocal("for.gui.tolerance"), COLUMN_0); - drawToleranceInfo(tempToleranceActive, COLUMN_1); - drawToleranceInfo(tempToleranceInactive, COLUMN_2); + textLayout.drawLine(" " + Translator.translateToLocal("for.gui.tolerance"), GuiAlyzer.COLUMN_0); + gui.drawToleranceInfo(tempToleranceActive, GuiAlyzer.COLUMN_1); + gui.drawToleranceInfo(tempToleranceInactive, GuiAlyzer.COLUMN_2); textLayout.newLine(); - drawRow(Translator.translateToLocal("for.gui.humidity"), AlleleManager.climateHelper.toDisplay(butterfly.getGenome().getPrimary().getHumidity()), + gui.drawRow(Translator.translateToLocal("for.gui.humidity"), AlleleManager.climateHelper.toDisplay(butterfly.getGenome().getPrimary().getHumidity()), AlleleManager.climateHelper.toDisplay(butterfly.getGenome().getPrimary().getHumidity()), butterfly, EnumButterflyChromosome.SPECIES); textLayout.newLine(); IAlleleTolerance humidToleranceActive = (IAlleleTolerance) butterfly.getGenome().getActiveAllele(EnumButterflyChromosome.HUMIDITY_TOLERANCE); IAlleleTolerance humidToleranceInactive = (IAlleleTolerance) butterfly.getGenome().getInactiveAllele(EnumButterflyChromosome.HUMIDITY_TOLERANCE); - textLayout.drawLine(" " + Translator.translateToLocal("for.gui.tolerance"), COLUMN_0); - drawToleranceInfo(humidToleranceActive, COLUMN_1); - drawToleranceInfo(humidToleranceInactive, COLUMN_2); + textLayout.drawLine(" " + Translator.translateToLocal("for.gui.tolerance"), GuiAlyzer.COLUMN_0); + gui.drawToleranceInfo(humidToleranceActive, GuiAlyzer.COLUMN_1); + gui.drawToleranceInfo(humidToleranceInactive, GuiAlyzer.COLUMN_2); textLayout.newLine(); textLayout.newLine(); @@ -196,45 +165,49 @@ public class GuiFlutterlyzer extends GuiAlyzer { diurnal1 = !butterfly.getGenome().getSecondary().isNocturnal() ? yes : no; } - textLayout.drawLine(Translator.translateToLocal("for.gui.diurnal"), COLUMN_0); - textLayout.drawLine(diurnal0, COLUMN_1, getColorCoding(false)); - textLayout.drawLine(diurnal1, COLUMN_2, getColorCoding(false)); + textLayout.drawLine(Translator.translateToLocal("for.gui.diurnal"), GuiAlyzer.COLUMN_0); + textLayout.drawLine(diurnal0, GuiAlyzer.COLUMN_1, gui.getColorCoding(false)); + textLayout.drawLine(diurnal1, GuiAlyzer.COLUMN_2, gui.getColorCoding(false)); textLayout.newLine(); - textLayout.drawLine(Translator.translateToLocal("for.gui.nocturnal"), COLUMN_0); - textLayout.drawLine(nocturnal0, COLUMN_1, getColorCoding(false)); - textLayout.drawLine(nocturnal1, COLUMN_2, getColorCoding(false)); + textLayout.drawLine(Translator.translateToLocal("for.gui.nocturnal"), GuiAlyzer.COLUMN_0); + textLayout.drawLine(nocturnal0, GuiAlyzer.COLUMN_1, gui.getColorCoding(false)); + textLayout.drawLine(nocturnal1, GuiAlyzer.COLUMN_2, gui.getColorCoding(false)); textLayout.newLine(); String primary = StringUtil.readableBoolean(butterfly.getGenome().getTolerantFlyer(), yes, no); String secondary = StringUtil.readableBoolean(((AlleleBoolean) butterfly.getGenome().getInactiveAllele(EnumButterflyChromosome.TOLERANT_FLYER)).getValue(), yes, no); - drawRow(Translator.translateToLocal("for.gui.flyer"), primary, secondary, butterfly, EnumButterflyChromosome.TOLERANT_FLYER); + gui.drawRow(Translator.translateToLocal("for.gui.flyer"), primary, secondary, butterfly, EnumButterflyChromosome.TOLERANT_FLYER); textLayout.newLine(); primary = StringUtil.readableBoolean(butterfly.getGenome().getFireResist(), yes, no); secondary = StringUtil.readableBoolean(((AlleleBoolean) butterfly.getGenome().getInactiveAllele(EnumButterflyChromosome.FIRE_RESIST)).getValue(), yes, no); - drawRow(Translator.translateToLocal("for.gui.fireresist"), primary, secondary, butterfly, EnumButterflyChromosome.FIRE_RESIST); + gui.drawRow(Translator.translateToLocal("for.gui.fireresist"), primary, secondary, butterfly, EnumButterflyChromosome.FIRE_RESIST); textLayout.endPage(); } - private void drawAnalyticsPage3(IButterfly butterfly) { + @SideOnly(Side.CLIENT) + @Override + public void drawAnalyticsPage3(GuiAlyzer gui, IButterfly butterfly, EnumFlutterType type) { + TextLayoutHelper textLayout = gui.getTextLayout(); + WidgetManager widgetManager = gui.getWidgetManager(); - textLayout.startPage(COLUMN_0, COLUMN_1, COLUMN_2); + textLayout.startPage(GuiAlyzer.COLUMN_0, GuiAlyzer.COLUMN_1, GuiAlyzer.COLUMN_2); - textLayout.drawLine(Translator.translateToLocal("for.gui.loot.butterfly") + ":", COLUMN_0); + textLayout.drawLine(Translator.translateToLocal("for.gui.loot.butterfly") + ":", GuiAlyzer.COLUMN_0); textLayout.newLine(); - int x = COLUMN_0; + int x = GuiAlyzer.COLUMN_0; for (ItemStack stack : butterfly.getGenome().getPrimary().getButterflyLoot().keySet()) { - itemRender.renderItemIntoGUI(stack, guiLeft + x, guiTop + textLayout.getLineY()); + Proxies.common.getClientInstance().getRenderItem().renderItemIntoGUI(stack, gui.guiLeft + x, gui.guiTop + textLayout.getLineY()); x += 18; if (x > 148) { - x = COLUMN_0; + x = GuiAlyzer.COLUMN_0; textLayout.newLine(); } } @@ -242,19 +215,29 @@ public class GuiFlutterlyzer extends GuiAlyzer { textLayout.newLine(); textLayout.newLine(); - textLayout.drawLine(Translator.translateToLocal("for.gui.loot.caterpillar") + ":", COLUMN_0); + textLayout.drawLine(Translator.translateToLocal("for.gui.loot.caterpillar") + ":", GuiAlyzer.COLUMN_0); textLayout.newLine(); - x = COLUMN_0; + x = GuiAlyzer.COLUMN_0; for (ItemStack stack : butterfly.getGenome().getPrimary().getCaterpillarLoot().keySet()) { - itemRender.renderItemIntoGUI(stack, guiLeft + x, guiTop + textLayout.getLineY()); + Proxies.common.getClientInstance().getRenderItem().renderItemIntoGUI(stack, gui.guiLeft + x, gui.guiTop + textLayout.getLineY()); x += 18; if (x > 148) { - x = COLUMN_0; + x = GuiAlyzer.COLUMN_0; textLayout.newLine(); } } textLayout.endPage(); } + + @Override + public EnumFlutterType getDefaultType() { + return EnumFlutterType.BUTTERFLY; + } + + @Override + public List getHints() { + return Config.hints.get("flutterlyzer"); + } } diff --git a/src/main/java/forestry/lepidopterology/inventory/ItemInventoryFlutterlyzer.java b/src/main/java/forestry/lepidopterology/inventory/ItemInventoryFlutterlyzer.java deleted file mode 100644 index 1b9d3d6fe..000000000 --- a/src/main/java/forestry/lepidopterology/inventory/ItemInventoryFlutterlyzer.java +++ /dev/null @@ -1,34 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser Public License v3 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: - * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges - ******************************************************************************/ -package forestry.lepidopterology.inventory; - -import java.util.List; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; - -import forestry.api.lepidopterology.ButterflyManager; -import forestry.core.config.Config; -import forestry.core.gui.IHintSource; -import forestry.core.inventory.ItemInventoryAlyzer; - -public class ItemInventoryFlutterlyzer extends ItemInventoryAlyzer implements IHintSource { - - public ItemInventoryFlutterlyzer(EntityPlayer player, ItemStack itemStack) { - super(ButterflyManager.butterflyRoot, player, itemStack); - } - - /* IHintSource */ - @Override - public List getHints() { - return Config.hints.get("flutterlyzer"); - } -} diff --git a/src/main/java/forestry/lepidopterology/items/ItemFlutterlyzer.java b/src/main/java/forestry/lepidopterology/items/ItemFlutterlyzer.java deleted file mode 100644 index 8245ab483..000000000 --- a/src/main/java/forestry/lepidopterology/items/ItemFlutterlyzer.java +++ /dev/null @@ -1,36 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser Public License v3 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: - * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges - ******************************************************************************/ -package forestry.lepidopterology.items; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; - -import forestry.api.core.Tabs; -import forestry.core.gui.ContainerAlyzer; -import forestry.core.items.ItemWithGui; -import forestry.lepidopterology.gui.GuiFlutterlyzer; -import forestry.lepidopterology.inventory.ItemInventoryFlutterlyzer; - -public class ItemFlutterlyzer extends ItemWithGui { - public ItemFlutterlyzer() { - setCreativeTab(Tabs.tabLepidopterology); - } - - @Override - public Object getGui(EntityPlayer player, ItemStack heldItem, int data) { - return new GuiFlutterlyzer(player, new ItemInventoryFlutterlyzer(player, heldItem)); - } - - @Override - public Object getContainer(EntityPlayer player, ItemStack heldItem, int data) { - return new ContainerAlyzer(new ItemInventoryFlutterlyzer(player, heldItem), player); - } -} diff --git a/src/main/java/forestry/lepidopterology/items/ItemRegistryLepidopterology.java b/src/main/java/forestry/lepidopterology/items/ItemRegistryLepidopterology.java index 3242d2bca..d556fb295 100644 --- a/src/main/java/forestry/lepidopterology/items/ItemRegistryLepidopterology.java +++ b/src/main/java/forestry/lepidopterology/items/ItemRegistryLepidopterology.java @@ -14,14 +14,12 @@ import forestry.api.lepidopterology.EnumFlutterType; import forestry.core.items.ItemRegistry; public class ItemRegistryLepidopterology extends ItemRegistry { - public final ItemFlutterlyzer flutterlyzer; public final ItemButterflyGE butterflyGE; public final ItemButterflyGE serumGE; public final ItemButterflyGE caterpillarGE; public final ItemButterflyGE cocoonGE; public ItemRegistryLepidopterology() { - flutterlyzer = registerItem(new ItemFlutterlyzer(), "flutterlyzer"); butterflyGE = registerItem(new ItemButterflyGE(EnumFlutterType.BUTTERFLY), "butterflyGE"); serumGE = registerItem(new ItemButterflyGE(EnumFlutterType.SERUM), "serumGE"); caterpillarGE = registerItem(new ItemButterflyGE(EnumFlutterType.CATERPILLAR), "caterpillarGE"); diff --git a/src/main/resources/assets/forestry/models/item/flutterlyzer.json b/src/main/resources/assets/forestry/models/item/flutterlyzer.json deleted file mode 100644 index dfa2921a3..000000000 --- a/src/main/resources/assets/forestry/models/item/flutterlyzer.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "forestry:items/flutterlyzer" - } -} diff --git a/src/main/resources/assets/forestry/models/item/beealyzer.json b/src/main/resources/assets/forestry/models/item/portablealyzer.json similarity index 88% rename from src/main/resources/assets/forestry/models/item/beealyzer.json rename to src/main/resources/assets/forestry/models/item/portablealyzer.json index 61651c0b0..4ccd39a04 100644 --- a/src/main/resources/assets/forestry/models/item/beealyzer.json +++ b/src/main/resources/assets/forestry/models/item/portablealyzer.json @@ -1,7 +1,7 @@ { "parent": "item/generated", "textures": { - "layer0": "forestry:items/beealyzer" + "layer0": "forestry:items/portablealyzer" }, "display": { "thirdperson": { diff --git a/src/main/resources/assets/forestry/models/item/treealyzer.json b/src/main/resources/assets/forestry/models/item/treealyzer.json deleted file mode 100644 index ff9577ddd..000000000 --- a/src/main/resources/assets/forestry/models/item/treealyzer.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "forestry:items/treealyzer" - } -} diff --git a/src/main/resources/assets/forestry/textures/gui/beealyzer2.png b/src/main/resources/assets/forestry/textures/gui/portablealyzer.png similarity index 100% rename from src/main/resources/assets/forestry/textures/gui/beealyzer2.png rename to src/main/resources/assets/forestry/textures/gui/portablealyzer.png diff --git a/src/main/resources/assets/forestry/textures/items/portablealyzer.png b/src/main/resources/assets/forestry/textures/items/portablealyzer.png new file mode 100644 index 0000000000000000000000000000000000000000..52dc205a16962658c6280d1dec20d5e2f6a5b256 GIT binary patch literal 3154 zcmV-Y46XBtP)004&%004{+008|`004nN004b?008NW002DY000@xb3BE2000U( zX+uL$P-t&-Z*ypGa3D!TLm+T+Z)Rz1WdHz3$DNjUR8-d%htIutdZEoQ0#b(FyTAa_ zdy`&8VVD_UC<6{NG_fI~0ue<-nj%P0#DLLIBvwSR5EN9f2P6n6F&ITuEN@2Ei>|D^ z_ww@lRz|vC zuzLs)$;-`!o*{AqUjza0dRV*yaMRE;fKCVhpQKsoe1Yhg01=zBIT!&C1$=TK@rP|Ibo3vKKm@PqnO#LJhq6%Ij6Hz*<$V$@wQAMN5qJ)hzm2h zoGcOF60t^#FqJFfH{#e-4l@G)6iI9sa9D{VHW4w29}?su;^hF~NC{tY+*d5%WDCTX za!E_i;d2ub1#}&jF5T4HnnCyEWTkKf0>c0%E1Ah>(_PY1)0w;+02c53Su*0<(nUqK zG_|(0G&D0Z{i;y^b@OjZ+}lNZ8Th$p5Uu}MTtq^NHl*T1?CO*}7&0ztZsv2j*bmJyf3G7=Z`5B*PvzoDiKdLpOAxi2$L0#SX*@cY z_n(^h55xYX#km%V()bZjV~l{*bt*u9?FT3d5g^g~#a;iSZ@&02Abxq_DwB(I|L-^b zXThc7C4-yrInE_0gw7K3GZ**7&k~>k0Z0NWkO#^@9q0fwx1%qj zZ=)yBuQ3=54Wo^*!gyjLF-e%Um=erBOdIALW)L%unZshS@>qSW9o8Sq#0s#5*edK% z>{;v(b^`kbN5rY%%y90wC>#%$kE_5P!JWYk;U;klcqzOl-UjcFXXA75rT9jCH~u<) z0>40zCTJ7v2qAyk54cquI@7b&LHdZ`+zlTss6bJ7%PQ)z$cROu4wBhpu-r)01) zS~6}jY?%U?gEALn#wiFzo#H}aQ8rT=DHkadR18&{>P1bW7E`~Y4p3)hWn`DhhRJ5j z*2tcg9i<^OEt(fCg;q*CP8+7ZTcWhYX$fb^_9d-LhL+6BEtPYWVlfKTBusSTASKKb%HuWJzl+By+?gkLq)?+BTu761 zjmyXF)a;mc^>(B7bo*HQ1NNg1st!zt28YLv>W*y3CdWx9U8f|cqfXDAO`Q48?auQq zHZJR2&bcD49Ip>EY~kKEPV6Wm+eXFV)D)_R=tM0@&p?(!V*Qu1PXHG9o^ zTY0bZ?)4%01p8F`JoeS|<@=<@RE7GY07EYX@lwd>4oW|Yi!o+Su@M`;WuSK z8LKk71XR(_RKHM1xJ5XYX`fk>`6eqY>qNG6HZQwBM=xi4&Sb88?zd}EYguc1@>KIS z<&CX#T35dwS|7K*XM_5Nf(;WJJvJWRMA($P>8E^?{IdL4o5MGE7bq2MEEwP7v8AO@ zqL5!WvekBL-8R%V?zVyL=G&{be=K4bT`e{#t|)$A!YaA?jp;X)-+bB;zhj`(vULAW z%ue3U;av{94wp%n<(7@__S@Z2PA@Mif3+uO&y|X06?J#oSi8M;ejj_^(0<4Lt#wLu#dYrva1Y$6_o(k^&}yhSh&h;f@JVA>W8b%o zZ=0JGnu?n~9O4}sJsfnnx7n(>`H13?(iXTy*fM=I`sj`CT)*pTHEgYKqqP+u1IL8N zo_-(u{qS+0<2@%BCt82d{Gqm;(q7a7b>wu+b|!X?c13m#p7cK1({0<`{-e>4hfb-U zsyQuty7Ua;Ou?B?XLHZaol8GAb3Wnxcu!2v{R_`T4=x`(GvqLI{-*2AOSimk zUAw*F_TX^n@STz9kDQ z$NC=!KfXWC8h`dn#xL(D3Z9UkR7|Q&Hcy#Notk!^zVUSB(}`#4&lYA1f0h2V_PNgU zAAWQEt$#LRcH#y9#i!p(Udq2b^lI6wp1FXzN3T;~FU%Lck$-deE#qz9yYP3D3t8{6 z?<+s(e(3(_^YOu_)K8!O1p}D#{JO;G(*OVf32;bRa{vGf5&!@T5&_cPe*6Fc02p*d zSaefwW^{L9a%BK;VQFr3E^cLXAT%y8E;(#7eog=Y0bfZ(K~z{r-IuXS!%!546RB_D zPzu(ih~QMgMTa7|ITw5i-@q4eZHU-Y->)};v=I?G$+C=^Ap0b0Xrh(wgY1*2AxP6SFQJAM9kQQMLr_i(Apml14NwVq z>v;0Z`mGV%Q+G?O0q_yne7vhU2qqByUJA_e)5(aouSaw|Jg{<;Rs{eS2cPRnG5%T{ zTE}1le+3KQUk$nySgsy+pIZ~Cy9MKuAze<-=;?W0j2E+kbqppD$FVAaZ+~-rPV>iU zPojnJ{yXD0Lpo;oF!4w`~Uy|07*qoM6N<$g6)arF8}}l literal 0 HcmV?d00001