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

Minor fixes

Browse Source
This commit is contained in:
Raoul Van den Berge
2016-10-10 23:34:42 +02:00
parent fbe5629b40
commit ee6faa2a0f
5 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/refinedstorage/gui/GuiSolderer.java
View File

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

1
src/main/java/refinedstorage/tile/TileFluidStorage.java
View File

@@ -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;

2
src/main/java/refinedstorage/tile/config/IAccessType.java
View File

@@ -13,7 +13,7 @@ public interface IAccessType {
int READ_WRITE = 2;
static <T extends TileEntity> TileDataParameter<Integer> createParameter() {
return new TileDataParameter<Integer>(DataSerializers.VARINT, READ_WRITE, new ITileDataProducer<Integer, T>() {
return new TileDataParameter<>(DataSerializers.VARINT, READ_WRITE, new ITileDataProducer<Integer, T>() {
@Override
public Integer getValue(T tile) {
return ((IAccessType) tile).getAccessType();

4
src/main/java/refinedstorage/tile/externalstorage/ItemStorageDrawer.java
View File

@@ -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;

2
src/main/resources/assets/refinedstorage/lang/en_US.lang
View File

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