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

Some more coding style corrections.

Browse Source
This commit is contained in:
Geldorn
2016-10-07 22:48:54 +02:00
parent 0f71ca9d7f
commit 6ee3cb7df3
5 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/refinedstorage/gui/GuiStorage.java
View File

@@ -55,7 +55,7 @@ public class GuiStorage extends GuiBase {
addSideButton(new SideButtonCompare(this, gui.getCompareParameter(), IComparer.COMPARE_NBT)); addSideButton(new SideButtonCompare(this, gui.getCompareParameter(), IComparer.COMPARE_NBT));
} }
if(gui.getVoidExcessParameter() != null) { if (gui.getVoidExcessParameter() != null) {
addSideButton(new SideButtonVoidExcess(this, gui.getVoidExcessParameter())); addSideButton(new SideButtonVoidExcess(this, gui.getVoidExcessParameter()));
} }

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() ? "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 @Override

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

@@ -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 //If the stack size of the remainder is negative, it means of the original size abs(remainder.stackSize) items have been voided
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 {

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

@@ -53,7 +53,7 @@ public class TileStorage extends TileNode implements IItemStorageProvider, IStor
ItemStack result = super.insertItem(stack, size, simulate); 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 //Simulate should not matter as the items are voided anyway
result.stackSize = -result.stackSize; result.stackSize = -result.stackSize;
} }

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

@@ -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:crafter.triggered_autocrafting=Trigger autocrafting with redstone signal
sidebutton.refinedstorage:void_excess.mode=Void excess items 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.0.name=Controller
block.refinedstorage:controller.1.name=Creative Controller block.refinedstorage:controller.1.name=Creative Controller