dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Small tweaks to combined items text

Browse Source
This commit is contained in:
Raoul Van den Berge
2016-08-09 21:42:12 +02:00
parent c3690f72a0
commit 4bbaf4e844
3 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/refinedstorage/item/ItemGridFilter.java
View File

@@ -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) {

10
src/main/java/refinedstorage/item/ItemPattern.java
View File

@@ -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<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 class ItemPattern extends ItemBase {
}
}
if (amount != 1) {
data += " (" + amount + "x)";
}
data = (displayAmount ? (TextFormatting.WHITE + String.valueOf(amount) + " ") : "") + TextFormatting.GRAY + data;
tooltip.add(data);
}

6
src/main/resources/assets/refinedstorage/models/item/debug_storage_disk.json
View File

@@ -1,6 +0,0 @@
{
"parent": "item/generated",
"textures": {
"layer0": "refinedstorage:items/debug_storage_disk"
}
}