From fc554c288f9c9a9c0dce3855391405741c833670 Mon Sep 17 00:00:00 2001 From: Geldorn Date: Fri, 7 Oct 2016 12:30:09 +0200 Subject: [PATCH] Coding style corrections, naming corrections. --- .../refinedstorage/gui/sidebutton/SideButtonVoidExcess.java | 2 +- src/main/java/refinedstorage/tile/TileController.java | 6 ++---- src/main/java/refinedstorage/tile/TileDiskDrive.java | 4 +++- src/main/java/refinedstorage/tile/TileFluidStorage.java | 4 +++- src/main/java/refinedstorage/tile/TileStorage.java | 4 +++- .../java/refinedstorage/tile/config/IExcessVoidable.java | 5 +---- .../tile/externalstorage/TileExternalStorage.java | 4 +++- src/main/resources/assets/refinedstorage/lang/en_US.lang | 6 +++--- 8 files changed, 19 insertions(+), 16 deletions(-) diff --git a/src/main/java/refinedstorage/gui/sidebutton/SideButtonVoidExcess.java b/src/main/java/refinedstorage/gui/sidebutton/SideButtonVoidExcess.java index 5c42e7b40..9544cfc1a 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() ? "on" : "off")); + 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")); } @Override diff --git a/src/main/java/refinedstorage/tile/TileController.java b/src/main/java/refinedstorage/tile/TileController.java index d758104a0..56a46f395 100755 --- a/src/main/java/refinedstorage/tile/TileController.java +++ b/src/main/java/refinedstorage/tile/TileController.java @@ -532,12 +532,10 @@ public class TileController extends TileBase implements INetworkMaster, IEnergyR int inserted; if(remainder == null) { inserted = orginalSize; - } - else if(remainder.stackSize < 0) { + } else if(remainder.stackSize < 0) { inserted = orginalSize + remainder.stackSize; remainder = null; - } - else { + } else { inserted = orginalSize - remainder.stackSize; } diff --git a/src/main/java/refinedstorage/tile/TileDiskDrive.java b/src/main/java/refinedstorage/tile/TileDiskDrive.java index bd202ad14..9a8053621 100755 --- a/src/main/java/refinedstorage/tile/TileDiskDrive.java +++ b/src/main/java/refinedstorage/tile/TileDiskDrive.java @@ -376,7 +376,9 @@ public class TileDiskDrive extends TileNode implements IItemStorageProvider, IFl } @Override - public TileDataParameter getVoidExcessParameter() { return null; } + public TileDataParameter getVoidExcessParameter() { + return null; + } @Override public int getPriority() { diff --git a/src/main/java/refinedstorage/tile/TileFluidStorage.java b/src/main/java/refinedstorage/tile/TileFluidStorage.java index b19f9c9bd..65d3d7a64 100755 --- a/src/main/java/refinedstorage/tile/TileFluidStorage.java +++ b/src/main/java/refinedstorage/tile/TileFluidStorage.java @@ -225,7 +225,9 @@ public class TileFluidStorage extends TileNode implements IFluidStorageProvider, } @Override - public TileDataParameter getVoidExcessParameter() { return null; } + public TileDataParameter getVoidExcessParameter() { + return null; + } public NBTTagCompound getStorageTag() { return storageTag; diff --git a/src/main/java/refinedstorage/tile/TileStorage.java b/src/main/java/refinedstorage/tile/TileStorage.java index 9d63c849b..07411db00 100755 --- a/src/main/java/refinedstorage/tile/TileStorage.java +++ b/src/main/java/refinedstorage/tile/TileStorage.java @@ -254,7 +254,9 @@ public class TileStorage extends TileNode implements IItemStorageProvider, IStor } @Override - public TileDataParameter getVoidExcessParameter() { return VOID_EXCESS; } + public TileDataParameter getVoidExcessParameter() { + return VOID_EXCESS; + } public NBTTagCompound getStorageTag() { return storageTag; diff --git a/src/main/java/refinedstorage/tile/config/IExcessVoidable.java b/src/main/java/refinedstorage/tile/config/IExcessVoidable.java index 386fc1dc2..df9350eb7 100644 --- a/src/main/java/refinedstorage/tile/config/IExcessVoidable.java +++ b/src/main/java/refinedstorage/tile/config/IExcessVoidable.java @@ -7,11 +7,8 @@ import refinedstorage.tile.data.ITileDataProducer; import refinedstorage.tile.data.TileDataParameter; public interface IExcessVoidable { - public static final boolean VOID_EXCESS_OFF = false; - public static final boolean VOID_EXCESS_ON = true; - static TileDataParameter createParameter() { - return new TileDataParameter<>(DataSerializers.BOOLEAN, VOID_EXCESS_OFF, new ITileDataProducer() { + return new TileDataParameter<>(DataSerializers.BOOLEAN, false, new ITileDataProducer() { @Override public Boolean getValue(T tile) { return ((IExcessVoidable) tile).getVoidExcess(); diff --git a/src/main/java/refinedstorage/tile/externalstorage/TileExternalStorage.java b/src/main/java/refinedstorage/tile/externalstorage/TileExternalStorage.java index 8a1083890..71cb79750 100755 --- a/src/main/java/refinedstorage/tile/externalstorage/TileExternalStorage.java +++ b/src/main/java/refinedstorage/tile/externalstorage/TileExternalStorage.java @@ -306,7 +306,9 @@ public class TileExternalStorage extends TileMultipartNode implements IItemStora } @Override - public TileDataParameter getVoidExcessParameter() { return null; } + public TileDataParameter getVoidExcessParameter() { + return null; + } @Override public int getStored() { diff --git a/src/main/resources/assets/refinedstorage/lang/en_US.lang b/src/main/resources/assets/refinedstorage/lang/en_US.lang index 3b075418d..8a3b681f3 100755 --- a/src/main/resources/assets/refinedstorage/lang/en_US.lang +++ b/src/main/resources/assets/refinedstorage/lang/en_US.lang @@ -117,9 +117,9 @@ 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 Item Mode -sidebutton.refinedstorage:void_excess.mode.on=On -sidebutton.refinedstorage:void_excess.mode.off=Off +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