From e38b8531da26238f5c1bd9992f18d85bb22036c2 Mon Sep 17 00:00:00 2001 From: mezz Date: Tue, 7 Feb 2017 17:54:26 -0800 Subject: [PATCH] Improve tooltips and information for insulated electron tubes --- .../binnie/botany/farm/CircuitGarden.java | 42 +++++++--------- .../botany/flower/ItemInsulatedTube.java | 49 +++++++++++++++++-- .../resources/assets/botany/lang/en_US.lang | 5 +- 3 files changed, 66 insertions(+), 30 deletions(-) diff --git a/src/main/java/binnie/botany/farm/CircuitGarden.java b/src/main/java/binnie/botany/farm/CircuitGarden.java index f5ed0a44..8c52ff8e 100644 --- a/src/main/java/binnie/botany/farm/CircuitGarden.java +++ b/src/main/java/binnie/botany/farm/CircuitGarden.java @@ -13,38 +13,32 @@ import net.minecraft.util.text.TextFormatting; import javax.annotation.Nullable; public class CircuitGarden extends BinnieCircuit { - private Class logicClass; private boolean isManual; - private boolean isFertilised; - private ItemStack icon; - private EnumMoisture moisture; - @Nullable - private EnumAcidity acidity; private GardenLogic logic; public CircuitGarden(EnumMoisture moisture, @Nullable EnumAcidity ph, boolean manual, boolean fertilised, ItemStack recipe, ItemStack icon) { super(getName(moisture, ph, manual, fertilised), 4, manual ? ChipsetManager.circuitRegistry.getLayout("forestry.farms.manual") : ChipsetManager.circuitRegistry.getLayout("forestry.farms.managed"), recipe); - this.isFertilised = false; this.isManual = manual; - this.isFertilised = fertilised; - this.moisture = moisture; - this.acidity = ph; - this.icon = icon; - this.logic = new GardenLogic(this.moisture, this.acidity, this.isManual, this.isFertilised, this.icon, Binnie.LANGUAGE.localise(this.getUnlocalizedName())); - String info = ""; - if (moisture != EnumMoisture.Normal) { - info += TextFormatting.GRAY + Binnie.LANGUAGE.localise("botany.moisture") + ": " + moisture.getTranslated(true); - } - if (info.length() > 0) { - info += ", "; - } + this.logic = new GardenLogic(moisture, ph, this.isManual, fertilised, icon, Binnie.LANGUAGE.localise(this.getUnlocalizedName())); + StringBuilder info = new StringBuilder("Flowers (") + .append(TextFormatting.GRAY.toString()) + .append(Binnie.LANGUAGE.localise("botany.moisture")) + .append(": ") + .append(moisture.getTranslated(true)); + if (ph != null) { - info += TextFormatting.GRAY + Binnie.LANGUAGE.localise("botany.ph") + ": " + ph.getTranslated(true); + info.append(TextFormatting.GRAY.toString()) + .append(", ") + .append(Binnie.LANGUAGE.localise("botany.ph")) + .append(": ") + .append(ph.getTranslated(true)); } - if (info.length() > 0) { - info = " (" + info + TextFormatting.RESET + ")"; - } - this.addTooltipString("Flowers" + info); + String fertilizedKey = fertilised ? "for.binnie.circuit.garden.fertilized" : "for.binnie.circuit.garden.unfertilized"; + info.append(TextFormatting.RESET.toString()) + .append(" ") + .append(Binnie.LANGUAGE.localise(fertilizedKey)) + .append(")"); + this.addTooltipString(info.toString()); } private static String getName(EnumMoisture moisture, @Nullable EnumAcidity ph, boolean manual, boolean fertilised) { diff --git a/src/main/java/binnie/botany/flower/ItemInsulatedTube.java b/src/main/java/binnie/botany/flower/ItemInsulatedTube.java index a757388b..80f6573d 100644 --- a/src/main/java/binnie/botany/flower/ItemInsulatedTube.java +++ b/src/main/java/binnie/botany/flower/ItemInsulatedTube.java @@ -2,17 +2,27 @@ package binnie.botany.flower; import binnie.botany.CreativeTabBotany; import binnie.core.item.ItemCore; +import com.google.common.collect.ArrayListMultimap; +import com.google.common.collect.Multimap; +import forestry.api.circuits.ChipsetManager; +import forestry.api.circuits.ICircuit; +import forestry.api.circuits.ICircuitLayout; import forestry.api.core.IModelManager; +import forestry.core.circuits.SolderManager; import forestry.core.items.IColoredItem; +import forestry.core.proxy.Proxies; +import forestry.core.utils.Translator; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.text.TextFormatting; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import javax.annotation.Nullable; +import java.util.Collection; import java.util.List; public class ItemInsulatedTube extends ItemCore implements IColoredItem { @@ -21,6 +31,7 @@ public class ItemInsulatedTube extends ItemCore implements IColoredItem { super("insulatedTube"); setUnlocalizedName("insulatedTube"); setCreativeTab(CreativeTabBotany.instance); + setHasSubtypes(true); } @Override @@ -54,14 +65,42 @@ public class ItemInsulatedTube extends ItemCore implements IColoredItem { } @Override - @SideOnly(Side.CLIENT) - public void addInformation(ItemStack itemStack, EntityPlayer player, List tooltip, boolean advanced) { - tooltip.add(Insulate.get(itemStack.getItemDamage()).getName()); + public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean flag) { + super.addInformation(itemstack, player, list, flag); + Multimap circuits = getCircuits(itemstack); + if (!circuits.isEmpty()) { + if (Proxies.common.isShiftDown()) { + for (ICircuitLayout circuitLayout : circuits.keys()) { + String circuitLayoutName = circuitLayout.getUsage(); + list.add(TextFormatting.WHITE.toString() + TextFormatting.UNDERLINE + circuitLayoutName); + for (ICircuit circuit : circuits.get(circuitLayout)) { + circuit.addTooltip(list); + } + } + } else { + list.add(TextFormatting.ITALIC + "<" + Translator.translateToLocal("for.gui.tooltip.tmi") + ">"); + } + } else { + list.add("<" + Translator.translateToLocal("for.gui.noeffect") + ">"); + } + } + + private static Multimap getCircuits(ItemStack itemStack) { + Multimap circuits = ArrayListMultimap.create(); + Collection allLayouts = ChipsetManager.circuitRegistry.getRegisteredLayouts().values(); + for (ICircuitLayout circuitLayout : allLayouts) { + ICircuit circuit = SolderManager.getCircuit(circuitLayout, itemStack); + if (circuit != null) { + circuits.put(circuitLayout, circuit); + } + } + return circuits; } @Override - public String getItemStackDisplayName(ItemStack p_77653_1_) { - return Material.get(p_77653_1_.getItemDamage()).getName() + " " + super.getItemStackDisplayName(p_77653_1_); + public String getItemStackDisplayName(ItemStack itemStack) { + int meta = itemStack.getMetadata(); + return Material.get(meta).getName() + " " + Insulate.get(meta).getName() + " " + super.getItemStackDisplayName(itemStack); } public static String getInsulate(ItemStack stack) { diff --git a/src/main/resources/assets/botany/lang/en_US.lang b/src/main/resources/assets/botany/lang/en_US.lang index 152a4b48..a28ec7de 100644 --- a/src/main/resources/assets/botany/lang/en_US.lang +++ b/src/main/resources/assets/botany/lang/en_US.lang @@ -5,7 +5,7 @@ botany.ph.acid=Acidic botany.ph.neutral=Neutral botany.ph.alkaline=Alkaline -botany.moisture=M +botany.moisture=Moisture botany.moisture.dry=Dry botany.moisture.normal=Normal botany.moisture.damp=Damp @@ -126,6 +126,9 @@ botany.colour.white=White botany.colour.yellow=Yellow botany.colour.yellowgreen=Yellow-Green +for.binnie.circuit.garden.fertilized=Fertilized +for.binnie.circuit.garden.unfertilized=Unfertilized + for.binnie.circuit.garden.dry.manual.fert=Fert. Garden (Dry) for.binnie.circuit.garden.dry.acid.manual.fert=Fert. Garden (Dry, Acidic) for.binnie.circuit.garden.dry.neutral.manual.fert=Fert. Garden (Dry, Neutral)