From ee6faa2a0f61952c6cda2529f3a675c8b45f272c Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Mon, 10 Oct 2016 23:34:42 +0200 Subject: [PATCH] Minor fixes --- src/main/java/refinedstorage/gui/GuiSolderer.java | 6 +----- src/main/java/refinedstorage/tile/TileFluidStorage.java | 1 + src/main/java/refinedstorage/tile/config/IAccessType.java | 2 +- .../tile/externalstorage/ItemStorageDrawer.java | 4 ++-- src/main/resources/assets/refinedstorage/lang/en_US.lang | 2 +- 5 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/main/java/refinedstorage/gui/GuiSolderer.java b/src/main/java/refinedstorage/gui/GuiSolderer.java index 34cd6067c..0a647b7b2 100755 --- a/src/main/java/refinedstorage/gui/GuiSolderer.java +++ b/src/main/java/refinedstorage/gui/GuiSolderer.java @@ -5,12 +5,8 @@ import refinedstorage.gui.sidebutton.SideButtonRedstoneMode; import refinedstorage.tile.TileSolderer; public class GuiSolderer extends GuiBase { - private TileSolderer solderer; - - public GuiSolderer(ContainerSolderer container, TileSolderer solderer) { + public GuiSolderer(ContainerSolderer container) { super(container, 211, 171); - - this.solderer = solderer; } @Override diff --git a/src/main/java/refinedstorage/tile/TileFluidStorage.java b/src/main/java/refinedstorage/tile/TileFluidStorage.java index 829e7bd5a..83a9baff0 100755 --- a/src/main/java/refinedstorage/tile/TileFluidStorage.java +++ b/src/main/java/refinedstorage/tile/TileFluidStorage.java @@ -50,6 +50,7 @@ public class TileFluidStorage extends TileNode implements IFluidStorageProvider, } FluidStack result = super.insertFluid(stack, size, simulate); + if (voidExcess && result != null) { // Simulate should not matter as the fluids are voided anyway result.amount = -result.amount; diff --git a/src/main/java/refinedstorage/tile/config/IAccessType.java b/src/main/java/refinedstorage/tile/config/IAccessType.java index f0c19157d..a35eb6442 100755 --- a/src/main/java/refinedstorage/tile/config/IAccessType.java +++ b/src/main/java/refinedstorage/tile/config/IAccessType.java @@ -13,7 +13,7 @@ public interface IAccessType { int READ_WRITE = 2; static TileDataParameter createParameter() { - return new TileDataParameter(DataSerializers.VARINT, READ_WRITE, new ITileDataProducer() { + return new TileDataParameter<>(DataSerializers.VARINT, READ_WRITE, new ITileDataProducer() { @Override public Integer getValue(T tile) { return ((IAccessType) tile).getAccessType(); diff --git a/src/main/java/refinedstorage/tile/externalstorage/ItemStorageDrawer.java b/src/main/java/refinedstorage/tile/externalstorage/ItemStorageDrawer.java index 5a0f95fb0..b00419c2f 100755 --- a/src/main/java/refinedstorage/tile/externalstorage/ItemStorageDrawer.java +++ b/src/main/java/refinedstorage/tile/externalstorage/ItemStorageDrawer.java @@ -69,13 +69,13 @@ public class ItemStorageDrawer extends ItemStorageExternal { } if (!simulate) { - drawer.setStoredItem(stack, remainingSpace); + drawer.setStoredItemRedir(stack, remainingSpace); } return isVoidable() ? null : ItemHandlerHelper.copyStackWithSize(stack, size - remainingSpace); } else { if (!simulate) { - drawer.setStoredItem(stack, size); + drawer.setStoredItemRedir(stack, size); } return null; diff --git a/src/main/resources/assets/refinedstorage/lang/en_US.lang b/src/main/resources/assets/refinedstorage/lang/en_US.lang index b79a85d4a..a814158de 100755 --- a/src/main/resources/assets/refinedstorage/lang/en_US.lang +++ b/src/main/resources/assets/refinedstorage/lang/en_US.lang @@ -125,7 +125,7 @@ sidebutton.refinedstorage:constructor.drop=Drop blocks instead of placing sidebutton.refinedstorage:access_type.read=Read sidebutton.refinedstorage:access_type.write=Write -sidebutton.refinedstorage:access_type.read_write=Read & Write +sidebutton.refinedstorage:access_type.read_write=Read and write block.refinedstorage:controller.0.name=Controller block.refinedstorage:controller.1.name=Creative Controller