From 4bbaf4e84442f59a5bab14221ee7da28e1ec13f8 Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Tue, 9 Aug 2016 21:42:12 +0200 Subject: [PATCH] Small tweaks to combined items text --- src/main/java/refinedstorage/item/ItemGridFilter.java | 2 +- src/main/java/refinedstorage/item/ItemPattern.java | 10 ++++------ .../refinedstorage/models/item/debug_storage_disk.json | 6 ------ 3 files changed, 5 insertions(+), 13 deletions(-) delete mode 100755 src/main/resources/assets/refinedstorage/models/item/debug_storage_disk.json diff --git a/src/main/java/refinedstorage/item/ItemGridFilter.java b/src/main/java/refinedstorage/item/ItemGridFilter.java index 24a3fbd9e..81048e31e 100755 --- a/src/main/java/refinedstorage/item/ItemGridFilter.java +++ b/src/main/java/refinedstorage/item/ItemGridFilter.java @@ -45,7 +45,7 @@ public class ItemGridFilter extends ItemBase { ItemHandlerGridFilter items = new ItemHandlerGridFilter(stack); - ItemPattern.combineItems(tooltip, items.getFilteredItems()); + ItemPattern.combineItems(tooltip, false, items.getFilteredItems()); } public static int getCompare(ItemStack stack) { diff --git a/src/main/java/refinedstorage/item/ItemPattern.java b/src/main/java/refinedstorage/item/ItemPattern.java index ec129af2c..3ab1897aa 100755 --- a/src/main/java/refinedstorage/item/ItemPattern.java +++ b/src/main/java/refinedstorage/item/ItemPattern.java @@ -35,16 +35,16 @@ public class ItemPattern extends ItemBase { if (GuiScreen.isShiftKeyDown() || isProcessing(pattern)) { tooltip.add(TextFormatting.YELLOW + I18n.format("misc.refinedstorage:pattern.inputs") + TextFormatting.RESET); - combineItems(tooltip, getInputs(pattern)); + combineItems(tooltip, true, getInputs(pattern)); tooltip.add(TextFormatting.YELLOW + I18n.format("misc.refinedstorage:pattern.outputs") + TextFormatting.RESET); } - combineItems(tooltip, getOutputs(pattern)); + combineItems(tooltip, true, getOutputs(pattern)); } } - public static void combineItems(List tooltip, ItemStack... stacks) { + public static void combineItems(List tooltip, boolean displayAmount, ItemStack... stacks) { Set combinedIndices = new HashSet<>(); for (int i = 0; i < stacks.length; ++i) { @@ -61,9 +61,7 @@ public class ItemPattern extends ItemBase { } } - if (amount != 1) { - data += " (" + amount + "x)"; - } + data = (displayAmount ? (TextFormatting.WHITE + String.valueOf(amount) + " ") : "") + TextFormatting.GRAY + data; tooltip.add(data); } diff --git a/src/main/resources/assets/refinedstorage/models/item/debug_storage_disk.json b/src/main/resources/assets/refinedstorage/models/item/debug_storage_disk.json deleted file mode 100755 index 4119b149f..000000000 --- a/src/main/resources/assets/refinedstorage/models/item/debug_storage_disk.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "refinedstorage:items/debug_storage_disk" - } -}