From a8a4ea9c02316f6f09cfdee527768af9ea68e881 Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Mon, 17 Oct 2016 21:50:25 +0200 Subject: [PATCH] Added ore dictionary compare toggle to storage I/O blocks --- CHANGELOG.md | 1 + src/main/java/refinedstorage/gui/GuiConstructor.java | 1 + src/main/java/refinedstorage/gui/GuiDestructor.java | 1 + src/main/java/refinedstorage/gui/GuiDetector.java | 1 + src/main/java/refinedstorage/gui/GuiDiskManipulator.java | 1 + src/main/java/refinedstorage/gui/GuiExporter.java | 1 + src/main/java/refinedstorage/gui/GuiImporter.java | 1 + src/main/java/refinedstorage/gui/GuiInterface.java | 1 + src/main/java/refinedstorage/gui/GuiStorage.java | 1 + src/main/resources/assets/refinedstorage/lang/en_US.lang | 3 ++- 10 files changed, 11 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 34841d5ab..64a3efbc4 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ - Added ability to toggle between read and write, read and write mode in storage blocks (InusualZ, raoulvdberge) - Added Silk Touch Upgrade for Destructor (InusualZ) - Added Fortune Upgrade for Destructor (InusualZ) +- Added ore dictionary compare toggle to storage I/O blocks (raoulvdberge) - The Constructor can now drop items in the world (raoulvdberge) - The Constructor can now place skulls (modmuss50) - The Destructor can now pick up items in the world (InusualZ) diff --git a/src/main/java/refinedstorage/gui/GuiConstructor.java b/src/main/java/refinedstorage/gui/GuiConstructor.java index 2ed00d1bf..2e18d1ac9 100755 --- a/src/main/java/refinedstorage/gui/GuiConstructor.java +++ b/src/main/java/refinedstorage/gui/GuiConstructor.java @@ -21,6 +21,7 @@ public class GuiConstructor extends GuiBase { addSideButton(new SideButtonCompare(this, TileConstructor.COMPARE, IComparer.COMPARE_DAMAGE)); addSideButton(new SideButtonCompare(this, TileConstructor.COMPARE, IComparer.COMPARE_NBT)); + addSideButton(new SideButtonCompare(this, TileConstructor.COMPARE, IComparer.COMPARE_OREDICT)); addSideButton(new SideButtonConstuctorDrop(this)); } diff --git a/src/main/java/refinedstorage/gui/GuiDestructor.java b/src/main/java/refinedstorage/gui/GuiDestructor.java index f5aac1f11..8aea318f8 100755 --- a/src/main/java/refinedstorage/gui/GuiDestructor.java +++ b/src/main/java/refinedstorage/gui/GuiDestructor.java @@ -20,6 +20,7 @@ public class GuiDestructor extends GuiBase { addSideButton(new SideButtonCompare(this, TileDestructor.COMPARE, IComparer.COMPARE_DAMAGE)); addSideButton(new SideButtonCompare(this, TileDestructor.COMPARE, IComparer.COMPARE_NBT)); + addSideButton(new SideButtonCompare(this, TileDestructor.COMPARE, IComparer.COMPARE_OREDICT)); addSideButton(new SideButtonPickup(this)); } diff --git a/src/main/java/refinedstorage/gui/GuiDetector.java b/src/main/java/refinedstorage/gui/GuiDetector.java index 0cef4e7ce..218a1aacd 100755 --- a/src/main/java/refinedstorage/gui/GuiDetector.java +++ b/src/main/java/refinedstorage/gui/GuiDetector.java @@ -27,6 +27,7 @@ public class GuiDetector extends GuiBase { addSideButton(new SideButtonCompare(this, TileDetector.COMPARE, IComparer.COMPARE_DAMAGE)); addSideButton(new SideButtonCompare(this, TileDetector.COMPARE, IComparer.COMPARE_NBT)); + addSideButton(new SideButtonCompare(this, TileDetector.COMPARE, IComparer.COMPARE_OREDICT)); AMOUNT = new GuiTextField(0, fontRendererObj, x + 62 + 1, y + 23 + 1, 29, fontRendererObj.FONT_HEIGHT); AMOUNT.setText(String.valueOf(TileDetector.AMOUNT.getValue())); diff --git a/src/main/java/refinedstorage/gui/GuiDiskManipulator.java b/src/main/java/refinedstorage/gui/GuiDiskManipulator.java index 334b39f72..1b7d55566 100755 --- a/src/main/java/refinedstorage/gui/GuiDiskManipulator.java +++ b/src/main/java/refinedstorage/gui/GuiDiskManipulator.java @@ -18,6 +18,7 @@ public class GuiDiskManipulator extends GuiBase { addSideButton(new SideButtonMode(this, TileDiskManipulator.MODE)); addSideButton(new SideButtonCompare(this, TileDiskManipulator.COMPARE, IComparer.COMPARE_DAMAGE)); addSideButton(new SideButtonCompare(this, TileDiskManipulator.COMPARE, IComparer.COMPARE_NBT)); + addSideButton(new SideButtonCompare(this, TileDiskManipulator.COMPARE, IComparer.COMPARE_OREDICT)); } @Override diff --git a/src/main/java/refinedstorage/gui/GuiExporter.java b/src/main/java/refinedstorage/gui/GuiExporter.java index 6f58b71df..f90840a66 100755 --- a/src/main/java/refinedstorage/gui/GuiExporter.java +++ b/src/main/java/refinedstorage/gui/GuiExporter.java @@ -20,6 +20,7 @@ public class GuiExporter extends GuiBase { addSideButton(new SideButtonCompare(this, TileExporter.COMPARE, IComparer.COMPARE_DAMAGE)); addSideButton(new SideButtonCompare(this, TileExporter.COMPARE, IComparer.COMPARE_NBT)); + addSideButton(new SideButtonCompare(this, TileExporter.COMPARE, IComparer.COMPARE_OREDICT)); } @Override diff --git a/src/main/java/refinedstorage/gui/GuiImporter.java b/src/main/java/refinedstorage/gui/GuiImporter.java index 955c45e3c..a8b0590d8 100755 --- a/src/main/java/refinedstorage/gui/GuiImporter.java +++ b/src/main/java/refinedstorage/gui/GuiImporter.java @@ -23,6 +23,7 @@ public class GuiImporter extends GuiBase { addSideButton(new SideButtonCompare(this, TileImporter.COMPARE, IComparer.COMPARE_DAMAGE)); addSideButton(new SideButtonCompare(this, TileImporter.COMPARE, IComparer.COMPARE_NBT)); + addSideButton(new SideButtonCompare(this, TileImporter.COMPARE, IComparer.COMPARE_OREDICT)); } @Override diff --git a/src/main/java/refinedstorage/gui/GuiInterface.java b/src/main/java/refinedstorage/gui/GuiInterface.java index 51a06d025..84ac9ae57 100755 --- a/src/main/java/refinedstorage/gui/GuiInterface.java +++ b/src/main/java/refinedstorage/gui/GuiInterface.java @@ -17,6 +17,7 @@ public class GuiInterface extends GuiBase { addSideButton(new SideButtonCompare(this, TileInterface.COMPARE, IComparer.COMPARE_DAMAGE)); addSideButton(new SideButtonCompare(this, TileInterface.COMPARE, IComparer.COMPARE_NBT)); + addSideButton(new SideButtonCompare(this, TileInterface.COMPARE, IComparer.COMPARE_OREDICT)); } @Override diff --git a/src/main/java/refinedstorage/gui/GuiStorage.java b/src/main/java/refinedstorage/gui/GuiStorage.java index 919c75193..1480e1027 100755 --- a/src/main/java/refinedstorage/gui/GuiStorage.java +++ b/src/main/java/refinedstorage/gui/GuiStorage.java @@ -49,6 +49,7 @@ public class GuiStorage extends GuiBase { if (gui.getCompareParameter() != null) { addSideButton(new SideButtonCompare(this, gui.getCompareParameter(), IComparer.COMPARE_DAMAGE)); addSideButton(new SideButtonCompare(this, gui.getCompareParameter(), IComparer.COMPARE_NBT)); + addSideButton(new SideButtonCompare(this, gui.getCompareParameter(), IComparer.COMPARE_OREDICT)); } if (gui.getVoidExcessParameter() != null) { diff --git a/src/main/resources/assets/refinedstorage/lang/en_US.lang b/src/main/resources/assets/refinedstorage/lang/en_US.lang index b5dd28f27..68b9a4a4b 100755 --- a/src/main/resources/assets/refinedstorage/lang/en_US.lang +++ b/src/main/resources/assets/refinedstorage/lang/en_US.lang @@ -74,8 +74,9 @@ misc.refinedstorage:clear=Clear misc.refinedstorage:cancel_all=Cancel All misc.refinedstorage:priority=Priority -sidebutton.refinedstorage:compare.1=Compare Damage +sidebutton.refinedstorage:compare.1=Compare damage sidebutton.refinedstorage:compare.2=Compare NBT +sidebutton.refinedstorage:compare.8=Compare ore dictionary sidebutton.refinedstorage:redstone_mode=Redstone Mode sidebutton.refinedstorage:redstone_mode.0=Ignore redstone signal