Add tooltips and JEI descriptions for CircuitBoard, SolderingIron, Tubes

This commit is contained in:
mezz committed 2016-07-13 21:35:27 -07:00
1 parent 0df85063a1
commit 641f763d05
5 files changed
+35 -14

No files matched your search

@@ -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<T> 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<T> implements ICircuitBoard {
public void addTooltip(List<String> list) {
if (layout != null) {
list.add(TextFormatting.GOLD + layout.getUsage() + ":");
}
List<String> extendedTooltip = new ArrayList<>();
for (ICircuit circuit : circuits) {
if (circuit != null) {
circuit.addTooltip(extendedTooltip);
List<String> 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);
}
}
@@ -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<String> 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));
@@ -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");
}
}