diff --git a/gradle.properties b/gradle.properties index 1f5b35e95..57971b7e3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,4 +8,4 @@ ic2_version=2.6.5-ex110 version_major=5 version_minor=1 -version_patch=11 +version_patch=12 diff --git a/lang b/lang index 82c5455d7..a8bbc7bd1 160000 --- a/lang +++ b/lang @@ -1 +1 @@ -Subproject commit 82c5455d7ba9852508aa36c4d3fa1269704d872f +Subproject commit a8bbc7bd1cb1ddf6b79f496677e4ce4ec7d7e82f diff --git a/src/main/java/forestry/core/circuits/CircuitBoard.java b/src/main/java/forestry/core/circuits/CircuitBoard.java index 9be3db061..41594825c 100755 --- a/src/main/java/forestry/core/circuits/CircuitBoard.java +++ b/src/main/java/forestry/core/circuits/CircuitBoard.java @@ -11,6 +11,7 @@ package forestry.core.circuits; import javax.annotation.Nonnull; +import javax.annotation.Nullable; import java.util.ArrayList; import java.util.List; @@ -29,7 +30,7 @@ public class CircuitBoard implements ICircuitBoard { @Nonnull private final EnumCircuitBoardType type; - @Nonnull + @Nullable private final ICircuitLayout layout; @Nonnull private final ICircuit[] circuits; @@ -80,19 +81,23 @@ public class CircuitBoard implements ICircuitBoard { public void addTooltip(List list) { if (layout != null) { list.add(TextFormatting.GOLD + layout.getUsage() + ":"); - } - - List extendedTooltip = new ArrayList<>(); - for (ICircuit circuit : circuits) { - if (circuit != null) { - circuit.addTooltip(extendedTooltip); + List extendedTooltip = new ArrayList<>(); + for (ICircuit circuit : circuits) { + if (circuit != null) { + circuit.addTooltip(extendedTooltip); + } } - } - if (Proxies.common.isShiftDown() || extendedTooltip.size() <= 4) { - list.addAll(extendedTooltip); + if (Proxies.common.isShiftDown() || extendedTooltip.size() <= 4) { + list.addAll(extendedTooltip); + } else { + list.add(TextFormatting.ITALIC + "<" + Translator.translateToLocal("for.gui.tooltip.tmi") + ">"); + } } else { - list.add(TextFormatting.ITALIC + "<" + Translator.translateToLocal("for.gui.tooltip.tmi") + ">"); + int socketCount = type.getSockets(); + String localizationKey = "item.for.circuitboard.tooltip." + (socketCount == 1 ? "singular" : "plural"); + String tooltip = Translator.translateToLocalFormatted(localizationKey, type.getSockets()); + list.add(tooltip); } } diff --git a/src/main/java/forestry/core/items/ItemSolderingIron.java b/src/main/java/forestry/core/items/ItemSolderingIron.java index dfd4d9203..3dc3776c8 100644 --- a/src/main/java/forestry/core/items/ItemSolderingIron.java +++ b/src/main/java/forestry/core/items/ItemSolderingIron.java @@ -10,6 +10,9 @@ ******************************************************************************/ package forestry.core.items; +import java.util.List; + +import forestry.core.utils.Translator; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -19,7 +22,13 @@ import forestry.core.circuits.ISolderingIron; import forestry.core.inventory.ItemInventorySolderingIron; public class ItemSolderingIron extends ItemWithGui implements ISolderingIron { - + + @Override + public void addInformation(ItemStack stack, EntityPlayer playerIn, List tooltip, boolean advanced) { + super.addInformation(stack, playerIn, tooltip, advanced); + tooltip.add(Translator.translateToLocal("item.for.solderingIron.tooltip")); + } + @Override public Object getGui(EntityPlayer player, ItemStack heldItem, int data) { return new GuiSolderingIron(player, new ItemInventorySolderingIron(player, heldItem)); diff --git a/src/main/java/forestry/plugins/compat/ForestryJeiPlugin.java b/src/main/java/forestry/plugins/compat/ForestryJeiPlugin.java index cce013917..f2ba858ac 100644 --- a/src/main/java/forestry/plugins/compat/ForestryJeiPlugin.java +++ b/src/main/java/forestry/plugins/compat/ForestryJeiPlugin.java @@ -3,6 +3,8 @@ package forestry.plugins.compat; import javax.annotation.Nonnull; import java.util.List; +import forestry.core.PluginCore; +import forestry.core.utils.OreDictUtil; import net.minecraft.item.ItemStack; import forestry.plugins.PluginManager; @@ -12,6 +14,7 @@ import mezz.jei.api.IItemBlacklist; import mezz.jei.api.IJeiHelpers; import mezz.jei.api.IModRegistry; import mezz.jei.api.JEIPlugin; +import net.minecraftforge.oredict.OreDictionary; @JEIPlugin public class ForestryJeiPlugin extends BlankModPlugin { @@ -23,5 +26,9 @@ public class ForestryJeiPlugin extends BlankModPlugin { for (ItemStack hiddenItem : hiddenItems) { itemBlacklist.addItemToBlacklist(hiddenItem); } + + registry.addDescription(new ItemStack(PluginCore.items.solderingIron), "item.for.solderingIron.description"); + registry.addDescription(new ItemStack(PluginCore.items.circuitboards, 1, OreDictionary.WILDCARD_VALUE), "item.for.circuitboard.description"); + registry.addDescription(new ItemStack(PluginCore.items.tubes, 1, OreDictionary.WILDCARD_VALUE), "item.for.thermionicTubes.description"); } }