Small tweaks to combined items text

refinedmods · Aug 9, 2016 · 4bbaf4e · 4bbaf4e
1 parent c3690f7
commit 4bbaf4e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 13 deletions.
diff --git a/src/main/java/refinedstorage/item/ItemGridFilter.java b/src/main/java/refinedstorage/item/ItemGridFilter.java
@@ -45,7 +45,7 @@ public void addInformation(ItemStack stack, EntityPlayer player, List<String> to
 
         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
@@ -35,16 +35,16 @@ public void addInformation(ItemStack pattern, EntityPlayer player, List<String>
             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<String> tooltip, ItemStack... stacks) {
+    public static void combineItems(List<String> tooltip, boolean displayAmount, ItemStack... stacks) {
         Set<Integer> combinedIndices = new HashSet<>();
 
         for (int i = 0; i < stacks.length; ++i) {
@@ -61,9 +61,7 @@ public static void combineItems(List<String> tooltip, ItemStack... stacks) {
                     }
                 }
 
-                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