diff --git a/src/main/java/refinedstorage/gui/GuiStorage.java b/src/main/java/refinedstorage/gui/GuiStorage.java index e8dd262e3..f4864dc6a 100755 --- a/src/main/java/refinedstorage/gui/GuiStorage.java +++ b/src/main/java/refinedstorage/gui/GuiStorage.java @@ -55,7 +55,7 @@ public class GuiStorage extends GuiBase { addSideButton(new SideButtonCompare(this, gui.getCompareParameter(), IComparer.COMPARE_NBT)); } - if(gui.getVoidExcessParameter() != null) { + if (gui.getVoidExcessParameter() != null) { addSideButton(new SideButtonVoidExcess(this, gui.getVoidExcessParameter())); } diff --git a/src/main/java/refinedstorage/gui/sidebutton/SideButtonVoidExcess.java b/src/main/java/refinedstorage/gui/sidebutton/SideButtonVoidExcess.java index 9544cfc1a..3de71ef34 100644 --- a/src/main/java/refinedstorage/gui/sidebutton/SideButtonVoidExcess.java +++ b/src/main/java/refinedstorage/gui/sidebutton/SideButtonVoidExcess.java @@ -16,7 +16,7 @@ public class SideButtonVoidExcess extends SideButton { @Override public String getTooltip() { - return TextFormatting.LIGHT_PURPLE + gui.t("sidebutton.refinedstorage:void_excess.mode") + TextFormatting.RESET + "\n" + gui.t("sidebutton.refinedstorage:void_excess.mode." + (parameter.getValue() ? "yes" : "no")); + return TextFormatting.LIGHT_PURPLE + gui.t("sidebutton.refinedstorage:void_excess.mode") + TextFormatting.RESET + "\n" + gui.t(parameter.getValue() ? "gui.yes" : "gui.no"); } @Override diff --git a/src/main/java/refinedstorage/tile/TileController.java b/src/main/java/refinedstorage/tile/TileController.java index a5afd0a95..3d03c4199 100755 --- a/src/main/java/refinedstorage/tile/TileController.java +++ b/src/main/java/refinedstorage/tile/TileController.java @@ -537,9 +537,9 @@ public class TileController extends TileBase implements INetworkMaster, IEnergyR //If the stack size of the remainder is negative, it means of the original size abs(remainder.stackSize) items have been voided int inserted; - if(remainder == null) { + if (remainder == null) { inserted = orginalSize; - } else if(remainder.stackSize < 0) { + } else if (remainder.stackSize < 0) { inserted = orginalSize + remainder.stackSize; remainder = null; } else { diff --git a/src/main/java/refinedstorage/tile/TileStorage.java b/src/main/java/refinedstorage/tile/TileStorage.java index 5e1cb8e4c..440cad57e 100755 --- a/src/main/java/refinedstorage/tile/TileStorage.java +++ b/src/main/java/refinedstorage/tile/TileStorage.java @@ -53,7 +53,7 @@ public class TileStorage extends TileNode implements IItemStorageProvider, IStor ItemStack result = super.insertItem(stack, size, simulate); - if(voidExcess && result != null) { + if (voidExcess && result != null) { //Simulate should not matter as the items are voided anyway result.stackSize = -result.stackSize; } diff --git a/src/main/resources/assets/refinedstorage/lang/en_US.lang b/src/main/resources/assets/refinedstorage/lang/en_US.lang index 8a3b681f3..eef4c9054 100755 --- a/src/main/resources/assets/refinedstorage/lang/en_US.lang +++ b/src/main/resources/assets/refinedstorage/lang/en_US.lang @@ -118,8 +118,6 @@ sidebutton.refinedstorage:detector.mode.3=Emit signal when item is being autocra sidebutton.refinedstorage:crafter.triggered_autocrafting=Trigger autocrafting with redstone signal sidebutton.refinedstorage:void_excess.mode=Void excess items -sidebutton.refinedstorage:void_excess.mode.yes=Yes -sidebutton.refinedstorage:void_excess.mode.no=No block.refinedstorage:controller.0.name=Controller block.refinedstorage:controller.1.name=Creative Controller