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

Coding style corrections, naming corrections.

Browse Source
This commit is contained in:
Geldorn
2016-10-07 12:30:09 +02:00
parent 96f17eb41a
commit fc554c288f
8 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/refinedstorage/gui/sidebutton/SideButtonVoidExcess.java
View File

@@ -16,7 +16,7 @@ public class SideButtonVoidExcess extends SideButton {
@Override @Override
public String getTooltip() { 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 @Override

6
src/main/java/refinedstorage/tile/TileController.java
View File

@@ -532,12 +532,10 @@ public class TileController extends TileBase implements INetworkMaster, IEnergyR
int inserted; int inserted;
if(remainder == null) { if(remainder == null) {
inserted = orginalSize; inserted = orginalSize;
} } else if(remainder.stackSize < 0) {
else if(remainder.stackSize < 0) {
inserted = orginalSize + remainder.stackSize; inserted = orginalSize + remainder.stackSize;
remainder = null; remainder = null;
} } else {
else {
inserted = orginalSize - remainder.stackSize; inserted = orginalSize - remainder.stackSize;
} }

4
src/main/java/refinedstorage/tile/TileDiskDrive.java
View File

@@ -376,7 +376,9 @@ public class TileDiskDrive extends TileNode implements IItemStorageProvider, IFl
} }
@Override @Override
public TileDataParameter<Boolean> getVoidExcessParameter() { return null; } public TileDataParameter<Boolean> getVoidExcessParameter() {
return null;
}
@Override @Override
public int getPriority() { public int getPriority() {

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

@@ -225,7 +225,9 @@ public class TileFluidStorage extends TileNode implements IFluidStorageProvider,
} }
@Override @Override
public TileDataParameter<Boolean> getVoidExcessParameter() { return null; } public TileDataParameter<Boolean> getVoidExcessParameter() {
return null;
}
public NBTTagCompound getStorageTag() { public NBTTagCompound getStorageTag() {
return storageTag; return storageTag;

4
src/main/java/refinedstorage/tile/TileStorage.java
View File

@@ -254,7 +254,9 @@ public class TileStorage extends TileNode implements IItemStorageProvider, IStor
} }
@Override @Override
public TileDataParameter<Boolean> getVoidExcessParameter() { return VOID_EXCESS; } public TileDataParameter<Boolean> getVoidExcessParameter() {
return VOID_EXCESS;
}
public NBTTagCompound getStorageTag() { public NBTTagCompound getStorageTag() {
return storageTag; return storageTag;

5
src/main/java/refinedstorage/tile/config/IExcessVoidable.java
View File

@@ -7,11 +7,8 @@ import refinedstorage.tile.data.ITileDataProducer;
import refinedstorage.tile.data.TileDataParameter; import refinedstorage.tile.data.TileDataParameter;
public interface IExcessVoidable { public interface IExcessVoidable {
public static final boolean VOID_EXCESS_OFF = false;
public static final boolean VOID_EXCESS_ON = true;
static <T extends TileEntity> TileDataParameter<Boolean> createParameter() { static <T extends TileEntity> TileDataParameter<Boolean> createParameter() {
return new TileDataParameter<>(DataSerializers.BOOLEAN, VOID_EXCESS_OFF, new ITileDataProducer<Boolean, T>() { return new TileDataParameter<>(DataSerializers.BOOLEAN, false, new ITileDataProducer<Boolean, T>() {
@Override @Override
public Boolean getValue(T tile) { public Boolean getValue(T tile) {
return ((IExcessVoidable) tile).getVoidExcess(); return ((IExcessVoidable) tile).getVoidExcess();

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

@@ -306,7 +306,9 @@ public class TileExternalStorage extends TileMultipartNode implements IItemStora
} }
@Override @Override
public TileDataParameter<Boolean> getVoidExcessParameter() { return null; } public TileDataParameter<Boolean> getVoidExcessParameter() {
return null;
}
@Override @Override
public int getStored() { public int getStored() {

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

@@ -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:crafter.triggered_autocrafting=Trigger autocrafting with redstone signal
sidebutton.refinedstorage:void_excess.mode=Void Excess Item Mode sidebutton.refinedstorage:void_excess.mode=Void excess items
sidebutton.refinedstorage:void_excess.mode.on=On sidebutton.refinedstorage:void_excess.mode.yes=Yes
sidebutton.refinedstorage:void_excess.mode.off=Off sidebutton.refinedstorage:void_excess.mode.no=No
block.refinedstorage:controller.0.name=Controller block.refinedstorage:controller.0.name=Controller
block.refinedstorage:controller.1.name=Creative Controller block.refinedstorage:controller.1.name=Creative Controller