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

fix more reformatter stuff

Browse Source
This commit is contained in:
Raoul Van den Berge
2015-12-29 12:07:59 +01:00
parent b4c3a32806
commit 5b3c5f03f8
25 changed files with 108 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/storagecraft/container/ContainerBase.java
View File

@@ -65,7 +65,8 @@ public abstract class ContainerBase extends Container
if (clickedButton == 2 || player.inventory.getItemStack() == null)
{
slot.putStack(null);
} else if (slot.isItemValid(player.inventory.getItemStack()))
}
else if (slot.isItemValid(player.inventory.getItemStack()))
{
slot.putStack(player.inventory.getItemStack().copy());
}

9
src/main/java/storagecraft/container/ContainerDrive.java
View File

@@ -24,7 +24,8 @@ public class ContainerDrive extends ContainerBase
{
x = 71;
y += 18;
} else
}
else
{
x += 18;
}
@@ -50,7 +51,8 @@ public class ContainerDrive extends ContainerBase
{
return null;
}
} else if (!mergeItemStack(stack, 0, 8, false))
}
else if (!mergeItemStack(stack, 0, 8, false))
{
return null;
}
@@ -58,7 +60,8 @@ public class ContainerDrive extends ContainerBase
if (stack.stackSize == 0)
{
slot.putStack(null);
} else
}
else
{
slot.onSlotChanged();
}

6
src/main/java/storagecraft/container/ContainerSolderer.java
View File

@@ -44,7 +44,8 @@ public class ContainerSolderer extends ContainerBase
{
return null;
}
} else if (!mergeItemStack(stack, 0, 3, false))
}
else if (!mergeItemStack(stack, 0, 3, false))
{
return null;
}
@@ -52,7 +53,8 @@ public class ContainerSolderer extends ContainerBase
if (stack.stackSize == 0)
{
slot.putStack(null);
} else
}
else
{
slot.onSlotChanged();
}

6
src/main/java/storagecraft/container/ContainerWirelessTransmitter.java
View File

@@ -39,7 +39,8 @@ public class ContainerWirelessTransmitter extends ContainerBase
{
return null;
}
} else if (!mergeItemStack(stack, 0, 3, false))
}
else if (!mergeItemStack(stack, 0, 3, false))
{
return null;
}
@@ -47,7 +48,8 @@ public class ContainerWirelessTransmitter extends ContainerBase
if (stack.stackSize == 0)
{
slot.putStack(null);
} else
}
else
{
slot.onSlotChanged();
}

3
src/main/java/storagecraft/gui/GuiDetector.java
View File

@@ -75,7 +75,8 @@ public class GuiDetector extends GuiBase
{
StorageCraft.NETWORK.sendToServer(new MessageDetectorAmountUpdate(detector, result));
}
} else
}
else
{
super.keyTyped(character, keyCode);
}

15
src/main/java/storagecraft/gui/GuiGrid.java
View File

@@ -133,7 +133,8 @@ public class GuiGrid extends GuiBase
if (grid.getType() == EnumGridType.CRAFTING)
{
bindTexture("gui/crafting_grid.png");
} else
}
else
{
bindTexture("gui/grid.png");
}
@@ -306,13 +307,16 @@ public class GuiGrid extends GuiBase
if (isHoveringOverSlot() && container.getPlayer().inventory.getItemStack() != null)
{
StorageCraft.NETWORK.sendToServer(new MessageStoragePush(controller.getPos().getX(), controller.getPos().getY(), controller.getPos().getZ(), -1, clickedButton == 1));
} else if (isHoveringOverValidSlot() && container.getPlayer().inventory.getItemStack() == null)
}
else if (isHoveringOverValidSlot() && container.getPlayer().inventory.getItemStack() == null)
{
StorageCraft.NETWORK.sendToServer(new MessageStoragePull(controller.getPos().getX(), controller.getPos().getY(), controller.getPos().getZ(), hoveringId, clickedButton == 1, Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)));
} else if (clickedClear)
}
else if (clickedClear)
{
StorageCraft.NETWORK.sendToServer(new MessageGridCraftingClear(grid));
} else
}
else
{
for (Slot slot : container.getPlayerInventorySlots())
{
@@ -338,7 +342,8 @@ public class GuiGrid extends GuiBase
{
if (!checkHotbarKeys(keyCode) && searchField.textboxKeyTyped(character, keyCode))
{
} else
}
else
{
super.keyTyped(character, keyCode);
}

3
src/main/java/storagecraft/gui/sidebutton/SideButtonCompare.java
View File

@@ -27,7 +27,8 @@ public class SideButtonCompare extends SideButton
if ((setting.getCompare() & mask) == mask)
{
builder.append(gui.t("misc.storagecraft:yes"));
} else
}
else
{
builder.append(gui.t("misc.storagecraft:no"));
}

3
src/main/java/storagecraft/inventory/InventorySimple.java
View File

@@ -40,7 +40,8 @@ public class InventorySimple implements IInventory
if (stack.stackSize <= amount)
{
setInventorySlotContents(slot, null);
} else
}
else
{
stack = stack.splitStack(amount);

3
src/main/java/storagecraft/item/ItemStorageCell.java
View File

@@ -44,7 +44,8 @@ public class ItemStorageCell extends ItemBase
if (getCapacity(cell) == -1)
{
list.add(String.format(StatCollector.translateToLocal("misc.storagecraft:storage_cell_stored"), getStored(cell)));
} else
}
else
{
list.add(String.format(StatCollector.translateToLocal("misc.storagecraft:storage_cell_stored_capacity"), getStored(cell), getCapacity(cell)));
}

15
src/main/java/storagecraft/item/ItemWirelessGrid.java
View File

@@ -76,23 +76,28 @@ public class ItemWirelessGrid extends ItemBase
if (grid == null)
{
player.addChatComponentMessage(new ChatComponentText(StatCollector.translateToLocal("misc.storagecraft:wireless_grid.no_grid." + stack.getItemDamage())));
} else
}
else
{
player.openGui(StorageCraft.INSTANCE, StorageCraftGUI.GRID, world, grid.getPos().getX(), grid.getPos().getY(), grid.getPos().getZ());
}
} else
}
else
{
player.addChatComponentMessage(new ChatComponentText(StatCollector.translateToLocal("misc.storagecraft:wireless_grid.not_working")));
}
} else
}
else
{
player.addChatComponentMessage(new ChatComponentText(StatCollector.translateToLocal("misc.storagecraft:wireless_grid.not_found")));
}
} else
}
else
{
player.addChatComponentMessage(new ChatComponentText(StatCollector.translateToLocal("misc.storagecraft:wireless_grid.out_of_range")));
}
} else
}
else
{
player.addChatComponentMessage(new ChatComponentText(StatCollector.translateToLocal("misc.storagecraft:wireless_grid.not_set." + stack.getItemDamage())));
}

3
src/main/java/storagecraft/network/MessageStoragePull.java
View File

@@ -89,7 +89,8 @@ public class MessageStoragePull extends MessageHandlerPlayerToServer<MessageStor
{
controller.push(took);
}
} else
}
else
{
player.inventory.setItemStack(took);
player.updateHeldItem();

9
src/main/java/storagecraft/network/MessageStoragePush.java
View File

@@ -68,7 +68,8 @@ public class MessageStoragePush extends MessageHandlerPlayerToServer<MessageStor
{
stack.stackSize = 1;
}
} else
}
else
{
stack = player.inventory.getStackInSlot(message.slot);
}
@@ -89,13 +90,15 @@ public class MessageStoragePush extends MessageHandlerPlayerToServer<MessageStor
{
player.inventory.setItemStack(null);
}
} else
}
else
{
player.inventory.setItemStack(null);
}
player.updateHeldItem();
} else
}
else
{
player.inventory.setInventorySlotContents(message.slot, null);
}

9
src/main/java/storagecraft/render/model/CableModel.java
View File

@@ -58,7 +58,8 @@ public class CableModel extends ModelBase
if (cable.getItemDamage() == 1)
{
Minecraft.getMinecraft().renderEngine.bindTexture(CABLE_UNPOWERED_RESOURCE);
} else
}
else
{
Minecraft.getMinecraft().renderEngine.bindTexture(CABLE_RESOURCE);
}
@@ -81,11 +82,13 @@ public class CableModel extends ModelBase
if (cable.isPowered())
{
Minecraft.getMinecraft().renderEngine.bindTexture(CABLE_POWERED_RESOURCE);
} else
}
else
{
Minecraft.getMinecraft().renderEngine.bindTexture(CABLE_UNPOWERED_RESOURCE);
}
} else
}
else
{
Minecraft.getMinecraft().renderEngine.bindTexture(CABLE_RESOURCE);
}

6
src/main/java/storagecraft/tile/TileCable.java
View File

@@ -85,10 +85,12 @@ public class TileCable extends TileBase
machines.add((TileMachine) tile);
visited.add(newPos);
} else if (tile instanceof TileCable && ((TileCable) tile).isEnabled())
}
else if (tile instanceof TileCable && ((TileCable) tile).isEnabled())
{
((TileCable) tile).addMachines(visited, machines, controller);
} else if (tile instanceof TileController && !controller.getPos().equals(newPos))
}
else if (tile instanceof TileController && !controller.getPos().equals(newPos))
{
worldObj.createExplosion(null, pos.getX(), pos.getY(), pos.getZ(), 4.5f, true);
}

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

@@ -49,7 +49,8 @@ public class TileController extends TileBase implements IEnergyReceiver, INetwor
if (!isActive())
{
disconnectAll();
} else
}
else
{
visitedCables.clear();
@@ -246,7 +247,8 @@ public class TileController extends TileBase implements IEnergyReceiver, INetwor
if (newStack == null)
{
newStack = took;
} else
}
else
{
newStack.stackSize += took.stackSize;
}

9
src/main/java/storagecraft/tile/TileDetector.java
View File

@@ -83,15 +83,18 @@ public class TileDetector extends TileMachine implements IInventory, ISidedInven
if (mode == MODE_UNDER && amount != 0)
{
providesPower = true;
} else if (mode == MODE_EQUAL && amount == 0)
}
else if (mode == MODE_EQUAL && amount == 0)
{
providesPower = true;
} else
}
else
{
providesPower = false;
}
}
} else
}
else
{
providesPower = false;
}

6
src/main/java/storagecraft/tile/TileExporter.java
View File

@@ -73,10 +73,12 @@ public class TileExporter extends TileMachine implements IInventory, ISidedInven
{
getController().push(took);
}
} else if (InventoryUtils.canPushToInventory(connectedInventory, took))
}
else if (InventoryUtils.canPushToInventory(connectedInventory, took))
{
InventoryUtils.pushToInventory(connectedInventory, took);
} else
}
else
{
getController().push(took);
}

6
src/main/java/storagecraft/tile/TileImporter.java
View File

@@ -69,7 +69,8 @@ public class TileImporter extends TileMachine implements IInventory, ISidedInven
connectedInventory.setInventorySlotContents(currentSlot, null);
}
}
} else if (getController().push(slot.copy()))
}
else if (getController().push(slot.copy()))
{
connectedInventory.setInventorySlotContents(currentSlot, null);
}
@@ -104,7 +105,8 @@ public class TileImporter extends TileMachine implements IInventory, ISidedInven
if (mode == MODE_WHITELIST)
{
return true;
} else if (mode == MODE_BLACKLIST)
}
else if (mode == MODE_BLACKLIST)
{
return false;
}

6
src/main/java/storagecraft/tile/TileSolderer.java
View File

@@ -41,14 +41,16 @@ public class TileSolderer extends TileMachine implements IInventory, ISidedInven
if (newRecipe == null)
{
reset();
} else if (newRecipe != recipe && inventory.getStackInSlot(3) == null)
}
else if (newRecipe != recipe && inventory.getStackInSlot(3) == null)
{
recipe = newRecipe;
progress = 0;
working = true;
markDirty();
} else if (working)
}
else if (working)
{
progress++;

3
src/main/java/storagecraft/tile/TileWirelessTransmitter.java
View File

@@ -40,7 +40,8 @@ public class TileWirelessTransmitter extends TileMachine implements IInventory
{
reset();
}
} else if (inventory.getStackInSlot(0) != null)
}
else if (inventory.getStackInSlot(0) != null)
{
inventory.decrStackSize(0, 1);

6
src/main/java/storagecraft/tile/solderer/SoldererRecipeCraftingGrid.java
View File

@@ -14,10 +14,12 @@ public class SoldererRecipeCraftingGrid implements ISoldererRecipe
if (row == 0)
{
return new ItemStack(StorageCraftItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED);
} else if (row == 1)
}
else if (row == 1)
{
return new ItemStack(StorageCraftBlocks.GRID, 1, 0);
} else if (row == 2)
}
else if (row == 2)
{
return new ItemStack(Blocks.crafting_table);
}

6
src/main/java/storagecraft/tile/solderer/SoldererRecipeDrive.java
View File

@@ -14,10 +14,12 @@ public class SoldererRecipeDrive implements ISoldererRecipe
if (row == 0)
{
return new ItemStack(StorageCraftItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED);
} else if (row == 1)
}
else if (row == 1)
{
return new ItemStack(StorageCraftBlocks.MACHINE_CASING);
} else if (row == 2)
}
else if (row == 2)
{
return new ItemStack(Blocks.chest);
}

6
src/main/java/storagecraft/tile/solderer/SoldererRecipeProcessor.java
View File

@@ -28,10 +28,12 @@ public class SoldererRecipeProcessor implements ISoldererRecipe
case ItemProcessor.TYPE_ADVANCED:
return new ItemStack(StorageCraftItems.PROCESSOR, 1, ItemProcessor.TYPE_PRINTED_ADVANCED);
}
} else if (row == 1)
}
else if (row == 1)
{
return new ItemStack(Items.redstone);
} else if (row == 2)
}
else if (row == 2)
{
return new ItemStack(StorageCraftItems.PROCESSOR, 1, ItemProcessor.TYPE_PRINTED_SILICON);
}

6
src/main/java/storagecraft/tile/solderer/SoldererRecipeWirelessGrid.java
View File

@@ -20,10 +20,12 @@ public class SoldererRecipeWirelessGrid implements ISoldererRecipe
if (row == 0)
{
return new ItemStack(StorageCraftItems.WIRELESS_GRID_PLATE);
} else if (row == 1)
}
else if (row == 1)
{
return new ItemStack(StorageCraftBlocks.GRID, 1, type);
} else if (row == 2)
}
else if (row == 2)
{
return new ItemStack(StorageCraftItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED);
}

9
src/main/java/storagecraft/util/InventoryUtils.java
View File

@@ -107,7 +107,8 @@ public class InventoryUtils
if (slot == null)
{
inventory.setInventorySlotContents(i, stack);
} else if (compareStackNoQuantity(slot, stack))
}
else if (compareStackNoQuantity(slot, stack))
{
slot.stackSize += stack.stackSize;
}
@@ -143,7 +144,8 @@ public class InventoryUtils
inventory.setInventorySlotContents(i, stack);
return;
} else if (compareStackNoQuantity(slot, stack))
}
else if (compareStackNoQuantity(slot, stack))
{
int toAdd = toGo;
@@ -175,7 +177,8 @@ public class InventoryUtils
if (slot == null)
{
return true;
} else if (compareStackNoQuantity(slot, stack))
}
else if (compareStackNoQuantity(slot, stack))
{
int toAdd = toGo;