From b4c3a32806e8f06ea3fbc6995a256011845c9b9a Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Tue, 29 Dec 2015 12:04:22 +0100 Subject: [PATCH] reformat + optimize imports --- src/main/java/storagecraft/StorageCraft.java | 0 .../java/storagecraft/StorageCraftBlocks.java | 14 +------ .../java/storagecraft/StorageCraftItems.java | 9 +---- .../java/storagecraft/block/BlockBase.java | 6 +-- .../java/storagecraft/block/BlockCable.java | 15 ++++---- .../storagecraft/block/BlockConstructor.java | 3 +- .../storagecraft/block/BlockController.java | 11 +++--- .../storagecraft/block/BlockDestructor.java | 3 +- .../storagecraft/block/BlockDetector.java | 3 +- .../java/storagecraft/block/BlockDrive.java | 4 +- .../storagecraft/block/BlockExporter.java | 4 +- .../block/BlockExternalStorage.java | 4 +- .../java/storagecraft/block/BlockGrid.java | 19 +++++----- .../storagecraft/block/BlockImporter.java | 4 +- .../java/storagecraft/block/BlockMachine.java | 8 ++-- .../storagecraft/block/BlockSolderer.java | 4 +- .../block/BlockWirelessTransmitter.java | 4 +- .../storagecraft/container/ContainerBase.java | 8 ++-- .../container/ContainerDetector.java | 0 .../container/ContainerDrive.java | 9 ++--- .../container/ContainerExporter.java | 0 .../container/ContainerExternalStorage.java | 0 .../storagecraft/container/ContainerGrid.java | 0 .../container/ContainerImporter.java | 0 .../container/ContainerSolderer.java | 6 +-- .../ContainerWirelessTransmitter.java | 6 +-- .../container/slot/SlotItemFilter.java | 0 .../container/slot/SlotSpecimen.java | 0 src/main/java/storagecraft/gui/GuiBase.java | 9 +++-- .../java/storagecraft/gui/GuiDetector.java | 6 +-- src/main/java/storagecraft/gui/GuiDrive.java | 0 .../java/storagecraft/gui/GuiExporter.java | 0 src/main/java/storagecraft/gui/GuiGrid.java | 26 ++++++------- .../java/storagecraft/gui/GuiHandler.java | 24 +----------- .../java/storagecraft/gui/GuiImporter.java | 0 .../gui/sidebutton/SideButton.java | 0 .../gui/sidebutton/SideButtonCompare.java | 3 +- .../sidebutton/SideButtonDetectorMode.java | 0 .../SideButtonGridSortingDirection.java | 0 .../sidebutton/SideButtonGridSortingType.java | 0 .../sidebutton/SideButtonImporterMode.java | 0 .../inventory/InventorySimple.java | 3 +- src/main/java/storagecraft/item/ItemBase.java | 0 .../java/storagecraft/item/ItemBlockBase.java | 0 .../storagecraft/item/ItemBlockCable.java | 0 src/main/java/storagecraft/item/ItemCore.java | 3 +- .../java/storagecraft/item/ItemProcessor.java | 3 +- .../storagecraft/item/ItemStorageCell.java | 6 +-- .../storagecraft/item/ItemStoragePart.java | 3 +- .../storagecraft/item/ItemWirelessGrid.java | 18 ++++----- .../network/MessageDetectorAmountUpdate.java | 0 .../network/MessageDetectorModeUpdate.java | 0 .../network/MessageImporterModeUpdate.java | 0 .../network/MessageStoragePull.java | 3 +- .../network/MessageStoragePush.java | 9 ++--- .../network/MessageTileUpdate.java | 0 .../java/storagecraft/proxy/ClientProxy.java | 1 - .../java/storagecraft/proxy/CommonProxy.java | 38 ++----------------- .../render/BlockCableRenderer.java | 0 .../storagecraft/render/model/CableModel.java | 9 ++--- .../storagecraft/storage/CellStorage.java | 3 +- .../java/storagecraft/storage/IStorage.java | 3 +- .../storage/IStorageProvider.java | 0 .../storagecraft/storage/StorageItem.java | 0 .../java/storagecraft/tile/INetworkTile.java | 0 .../java/storagecraft/tile/RedstoneMode.java | 20 +++++----- .../java/storagecraft/tile/TileCable.java | 9 ++--- .../storagecraft/tile/TileConstructor.java | 4 +- .../storagecraft/tile/TileController.java | 11 +++--- .../storagecraft/tile/TileDestructor.java | 3 +- .../java/storagecraft/tile/TileDetector.java | 13 +++---- .../java/storagecraft/tile/TileDrive.java | 3 +- .../java/storagecraft/tile/TileExporter.java | 10 ++--- .../tile/TileExternalStorage.java | 3 +- src/main/java/storagecraft/tile/TileGrid.java | 0 .../java/storagecraft/tile/TileImporter.java | 10 ++--- .../java/storagecraft/tile/TileSolderer.java | 18 ++++----- .../tile/TileWirelessTransmitter.java | 3 +- .../solderer/SoldererRecipeCraftingGrid.java | 6 +-- .../tile/solderer/SoldererRecipeDrive.java | 6 +-- .../solderer/SoldererRecipeProcessor.java | 6 +-- .../solderer/SoldererRecipeWirelessGrid.java | 6 +-- .../tile/solderer/SoldererRegistry.java | 5 ++- .../storagecraft/util/InventoryUtils.java | 9 ++--- 84 files changed, 178 insertions(+), 281 deletions(-) mode change 100644 => 100755 src/main/java/storagecraft/StorageCraft.java mode change 100644 => 100755 src/main/java/storagecraft/StorageCraftItems.java mode change 100644 => 100755 src/main/java/storagecraft/container/ContainerBase.java mode change 100644 => 100755 src/main/java/storagecraft/container/ContainerDetector.java mode change 100644 => 100755 src/main/java/storagecraft/container/ContainerDrive.java mode change 100644 => 100755 src/main/java/storagecraft/container/ContainerExporter.java mode change 100644 => 100755 src/main/java/storagecraft/container/ContainerExternalStorage.java mode change 100644 => 100755 src/main/java/storagecraft/container/ContainerGrid.java mode change 100644 => 100755 src/main/java/storagecraft/container/ContainerImporter.java mode change 100644 => 100755 src/main/java/storagecraft/container/slot/SlotItemFilter.java mode change 100644 => 100755 src/main/java/storagecraft/container/slot/SlotSpecimen.java mode change 100644 => 100755 src/main/java/storagecraft/gui/GuiBase.java mode change 100644 => 100755 src/main/java/storagecraft/gui/GuiDetector.java mode change 100644 => 100755 src/main/java/storagecraft/gui/GuiDrive.java mode change 100644 => 100755 src/main/java/storagecraft/gui/GuiExporter.java mode change 100644 => 100755 src/main/java/storagecraft/gui/GuiImporter.java mode change 100644 => 100755 src/main/java/storagecraft/gui/sidebutton/SideButton.java mode change 100644 => 100755 src/main/java/storagecraft/gui/sidebutton/SideButtonDetectorMode.java mode change 100644 => 100755 src/main/java/storagecraft/gui/sidebutton/SideButtonGridSortingDirection.java mode change 100644 => 100755 src/main/java/storagecraft/gui/sidebutton/SideButtonGridSortingType.java mode change 100644 => 100755 src/main/java/storagecraft/gui/sidebutton/SideButtonImporterMode.java mode change 100644 => 100755 src/main/java/storagecraft/item/ItemBase.java mode change 100644 => 100755 src/main/java/storagecraft/item/ItemBlockBase.java mode change 100644 => 100755 src/main/java/storagecraft/item/ItemBlockCable.java mode change 100644 => 100755 src/main/java/storagecraft/network/MessageDetectorAmountUpdate.java mode change 100644 => 100755 src/main/java/storagecraft/network/MessageDetectorModeUpdate.java mode change 100644 => 100755 src/main/java/storagecraft/network/MessageImporterModeUpdate.java mode change 100644 => 100755 src/main/java/storagecraft/network/MessageStoragePull.java mode change 100644 => 100755 src/main/java/storagecraft/network/MessageStoragePush.java mode change 100644 => 100755 src/main/java/storagecraft/network/MessageTileUpdate.java mode change 100644 => 100755 src/main/java/storagecraft/render/BlockCableRenderer.java mode change 100644 => 100755 src/main/java/storagecraft/render/model/CableModel.java mode change 100644 => 100755 src/main/java/storagecraft/storage/IStorage.java mode change 100644 => 100755 src/main/java/storagecraft/storage/IStorageProvider.java mode change 100644 => 100755 src/main/java/storagecraft/storage/StorageItem.java mode change 100644 => 100755 src/main/java/storagecraft/tile/INetworkTile.java mode change 100644 => 100755 src/main/java/storagecraft/tile/TileCable.java mode change 100644 => 100755 src/main/java/storagecraft/tile/TileGrid.java mode change 100644 => 100755 src/main/java/storagecraft/util/InventoryUtils.java diff --git a/src/main/java/storagecraft/StorageCraft.java b/src/main/java/storagecraft/StorageCraft.java old mode 100644 new mode 100755 diff --git a/src/main/java/storagecraft/StorageCraftBlocks.java b/src/main/java/storagecraft/StorageCraftBlocks.java index 5a3c3c8e9..1f4c7a731 100755 --- a/src/main/java/storagecraft/StorageCraftBlocks.java +++ b/src/main/java/storagecraft/StorageCraftBlocks.java @@ -1,18 +1,6 @@ package storagecraft; -import storagecraft.block.BlockCable; -import storagecraft.block.BlockConstructor; -import storagecraft.block.BlockController; -import storagecraft.block.BlockDestructor; -import storagecraft.block.BlockDetector; -import storagecraft.block.BlockDrive; -import storagecraft.block.BlockExporter; -import storagecraft.block.BlockGrid; -import storagecraft.block.BlockImporter; -import storagecraft.block.BlockMachineCasing; -import storagecraft.block.BlockSolderer; -import storagecraft.block.BlockExternalStorage; -import storagecraft.block.BlockWirelessTransmitter; +import storagecraft.block.*; public final class StorageCraftBlocks { diff --git a/src/main/java/storagecraft/StorageCraftItems.java b/src/main/java/storagecraft/StorageCraftItems.java old mode 100644 new mode 100755 index 27cdb8f62..d2c8a63ea --- a/src/main/java/storagecraft/StorageCraftItems.java +++ b/src/main/java/storagecraft/StorageCraftItems.java @@ -1,13 +1,6 @@ package storagecraft; -import storagecraft.item.ItemCore; -import storagecraft.item.ItemProcessor; -import storagecraft.item.ItemSilicon; -import storagecraft.item.ItemStorageCell; -import storagecraft.item.ItemQuartzEnrichedIron; -import storagecraft.item.ItemStoragePart; -import storagecraft.item.ItemWirelessGrid; -import storagecraft.item.ItemWirelessGridPlate; +import storagecraft.item.*; public final class StorageCraftItems { diff --git a/src/main/java/storagecraft/block/BlockBase.java b/src/main/java/storagecraft/block/BlockBase.java index 2e149b1d9..aa0600b5c 100755 --- a/src/main/java/storagecraft/block/BlockBase.java +++ b/src/main/java/storagecraft/block/BlockBase.java @@ -43,9 +43,9 @@ public abstract class BlockBase extends Block protected BlockState createBlockState() { return new BlockState(this, new IProperty[] - { - DIRECTION, - }); + { + DIRECTION, + }); } @Override diff --git a/src/main/java/storagecraft/block/BlockCable.java b/src/main/java/storagecraft/block/BlockCable.java index 8004c6f22..6bc7a0755 100755 --- a/src/main/java/storagecraft/block/BlockCable.java +++ b/src/main/java/storagecraft/block/BlockCable.java @@ -1,7 +1,5 @@ package storagecraft.block; -import java.util.List; -import net.minecraft.block.ITileEntityProvider; import net.minecraft.block.properties.IProperty; import net.minecraft.block.properties.PropertyBool; import net.minecraft.block.state.BlockState; @@ -13,6 +11,8 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import storagecraft.tile.TileCable; +import java.util.List; + public class BlockCable extends BlockBase { public static final PropertyBool SENSITIVE = PropertyBool.create("sensitive"); @@ -26,10 +26,10 @@ public class BlockCable extends BlockBase protected BlockState createBlockState() { return new BlockState(this, new IProperty[] - { - DIRECTION, - SENSITIVE - }); + { + DIRECTION, + SENSITIVE + }); } @Override @@ -51,7 +51,8 @@ public class BlockCable extends BlockBase } @Override - public TileEntity createTileEntity(World world, IBlockState state) { + public TileEntity createTileEntity(World world, IBlockState state) + { return new TileCable(); } diff --git a/src/main/java/storagecraft/block/BlockConstructor.java b/src/main/java/storagecraft/block/BlockConstructor.java index b4c2a7169..033837a74 100755 --- a/src/main/java/storagecraft/block/BlockConstructor.java +++ b/src/main/java/storagecraft/block/BlockConstructor.java @@ -18,7 +18,8 @@ public class BlockConstructor extends BlockMachine } @Override - public TileEntity createTileEntity(World world, IBlockState state) { + public TileEntity createTileEntity(World world, IBlockState state) + { return new TileConstructor(); } diff --git a/src/main/java/storagecraft/block/BlockController.java b/src/main/java/storagecraft/block/BlockController.java index ca4752a47..61da6c1cf 100755 --- a/src/main/java/storagecraft/block/BlockController.java +++ b/src/main/java/storagecraft/block/BlockController.java @@ -27,10 +27,10 @@ public class BlockController extends BlockBase protected BlockState createBlockState() { return new BlockState(this, new IProperty[] - { - DIRECTION, - ENERGY - }); + { + DIRECTION, + ENERGY + }); } @Override @@ -47,7 +47,8 @@ public class BlockController extends BlockBase } @Override - public TileEntity createTileEntity(World world, IBlockState state) { + public TileEntity createTileEntity(World world, IBlockState state) + { return new TileController(); } diff --git a/src/main/java/storagecraft/block/BlockDestructor.java b/src/main/java/storagecraft/block/BlockDestructor.java index 144ec52e6..bc2baaf79 100755 --- a/src/main/java/storagecraft/block/BlockDestructor.java +++ b/src/main/java/storagecraft/block/BlockDestructor.java @@ -18,7 +18,8 @@ public class BlockDestructor extends BlockMachine } @Override - public TileEntity createTileEntity(World world, IBlockState state) { + public TileEntity createTileEntity(World world, IBlockState state) + { return new TileDestructor(); } diff --git a/src/main/java/storagecraft/block/BlockDetector.java b/src/main/java/storagecraft/block/BlockDetector.java index 582ba1030..c70180aa0 100755 --- a/src/main/java/storagecraft/block/BlockDetector.java +++ b/src/main/java/storagecraft/block/BlockDetector.java @@ -19,7 +19,8 @@ public class BlockDetector extends BlockMachine } @Override - public TileEntity createTileEntity(World world, IBlockState state) { + public TileEntity createTileEntity(World world, IBlockState state) + { return new TileDetector(); } diff --git a/src/main/java/storagecraft/block/BlockDrive.java b/src/main/java/storagecraft/block/BlockDrive.java index 8cdbbfa64..88758b295 100755 --- a/src/main/java/storagecraft/block/BlockDrive.java +++ b/src/main/java/storagecraft/block/BlockDrive.java @@ -8,7 +8,6 @@ import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import storagecraft.StorageCraft; import storagecraft.StorageCraftGUI; -import storagecraft.tile.TileCable; import storagecraft.tile.TileDrive; public class BlockDrive extends BlockMachine @@ -19,7 +18,8 @@ public class BlockDrive extends BlockMachine } @Override - public TileEntity createTileEntity(World world, IBlockState state) { + public TileEntity createTileEntity(World world, IBlockState state) + { return new TileDrive(); } diff --git a/src/main/java/storagecraft/block/BlockExporter.java b/src/main/java/storagecraft/block/BlockExporter.java index 30867c29e..662a03551 100755 --- a/src/main/java/storagecraft/block/BlockExporter.java +++ b/src/main/java/storagecraft/block/BlockExporter.java @@ -8,7 +8,6 @@ import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import storagecraft.StorageCraft; import storagecraft.StorageCraftGUI; -import storagecraft.tile.TileCable; import storagecraft.tile.TileExporter; public class BlockExporter extends BlockMachine @@ -19,7 +18,8 @@ public class BlockExporter extends BlockMachine } @Override - public TileEntity createTileEntity(World world, IBlockState state) { + public TileEntity createTileEntity(World world, IBlockState state) + { return new TileExporter(); } diff --git a/src/main/java/storagecraft/block/BlockExternalStorage.java b/src/main/java/storagecraft/block/BlockExternalStorage.java index f384da285..0f901712d 100755 --- a/src/main/java/storagecraft/block/BlockExternalStorage.java +++ b/src/main/java/storagecraft/block/BlockExternalStorage.java @@ -8,7 +8,6 @@ import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import storagecraft.StorageCraft; import storagecraft.StorageCraftGUI; -import storagecraft.tile.TileCable; import storagecraft.tile.TileExternalStorage; public class BlockExternalStorage extends BlockMachine @@ -19,7 +18,8 @@ public class BlockExternalStorage extends BlockMachine } @Override - public TileEntity createTileEntity(World world, IBlockState state) { + public TileEntity createTileEntity(World world, IBlockState state) + { return new TileExternalStorage(); } diff --git a/src/main/java/storagecraft/block/BlockGrid.java b/src/main/java/storagecraft/block/BlockGrid.java index 1e4acbd12..0d8e9a777 100755 --- a/src/main/java/storagecraft/block/BlockGrid.java +++ b/src/main/java/storagecraft/block/BlockGrid.java @@ -1,6 +1,5 @@ package storagecraft.block; -import java.util.List; import net.minecraft.block.properties.IProperty; import net.minecraft.block.properties.PropertyEnum; import net.minecraft.block.state.BlockState; @@ -15,11 +14,10 @@ import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import storagecraft.StorageCraft; import storagecraft.StorageCraftGUI; -import static storagecraft.block.BlockMachine.CONNECTED; - -import storagecraft.tile.TileCable; import storagecraft.tile.TileGrid; +import java.util.List; + public class BlockGrid extends BlockMachine { public static final PropertyEnum TYPE = PropertyEnum.create("type", EnumGridType.class); @@ -30,7 +28,8 @@ public class BlockGrid extends BlockMachine } @Override - public TileEntity createTileEntity(World world, IBlockState state) { + public TileEntity createTileEntity(World world, IBlockState state) + { return new TileGrid(); } @@ -47,11 +46,11 @@ public class BlockGrid extends BlockMachine protected BlockState createBlockState() { return new BlockState(this, new IProperty[] - { - DIRECTION, - CONNECTED, - TYPE - }); + { + DIRECTION, + CONNECTED, + TYPE + }); } @Override diff --git a/src/main/java/storagecraft/block/BlockImporter.java b/src/main/java/storagecraft/block/BlockImporter.java index b2871e688..e97dc5cb2 100755 --- a/src/main/java/storagecraft/block/BlockImporter.java +++ b/src/main/java/storagecraft/block/BlockImporter.java @@ -8,7 +8,6 @@ import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import storagecraft.StorageCraft; import storagecraft.StorageCraftGUI; -import storagecraft.tile.TileCable; import storagecraft.tile.TileImporter; public class BlockImporter extends BlockMachine @@ -19,7 +18,8 @@ public class BlockImporter extends BlockMachine } @Override - public TileEntity createTileEntity(World world, IBlockState state) { + public TileEntity createTileEntity(World world, IBlockState state) + { return new TileImporter(); } diff --git a/src/main/java/storagecraft/block/BlockMachine.java b/src/main/java/storagecraft/block/BlockMachine.java index cdee37f7b..7980e193a 100755 --- a/src/main/java/storagecraft/block/BlockMachine.java +++ b/src/main/java/storagecraft/block/BlockMachine.java @@ -27,10 +27,10 @@ public abstract class BlockMachine extends BlockBase protected BlockState createBlockState() { return new BlockState(this, new IProperty[] - { - DIRECTION, - CONNECTED - }); + { + DIRECTION, + CONNECTED + }); } @Override diff --git a/src/main/java/storagecraft/block/BlockSolderer.java b/src/main/java/storagecraft/block/BlockSolderer.java index 61443e827..3e71d4ea9 100755 --- a/src/main/java/storagecraft/block/BlockSolderer.java +++ b/src/main/java/storagecraft/block/BlockSolderer.java @@ -8,7 +8,6 @@ import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import storagecraft.StorageCraft; import storagecraft.StorageCraftGUI; -import storagecraft.tile.TileCable; import storagecraft.tile.TileSolderer; public class BlockSolderer extends BlockMachine @@ -19,7 +18,8 @@ public class BlockSolderer extends BlockMachine } @Override - public TileEntity createTileEntity(World world, IBlockState state) { + public TileEntity createTileEntity(World world, IBlockState state) + { return new TileSolderer(); } diff --git a/src/main/java/storagecraft/block/BlockWirelessTransmitter.java b/src/main/java/storagecraft/block/BlockWirelessTransmitter.java index c6810bd78..0bf2f3373 100755 --- a/src/main/java/storagecraft/block/BlockWirelessTransmitter.java +++ b/src/main/java/storagecraft/block/BlockWirelessTransmitter.java @@ -8,7 +8,6 @@ import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import storagecraft.StorageCraft; import storagecraft.StorageCraftGUI; -import storagecraft.tile.TileCable; import storagecraft.tile.TileWirelessTransmitter; // @TODO: This texture behaves differently @@ -20,7 +19,8 @@ public class BlockWirelessTransmitter extends BlockMachine } @Override - public TileEntity createTileEntity(World world, IBlockState state) { + public TileEntity createTileEntity(World world, IBlockState state) + { return new TileWirelessTransmitter(); } diff --git a/src/main/java/storagecraft/container/ContainerBase.java b/src/main/java/storagecraft/container/ContainerBase.java old mode 100644 new mode 100755 index abe52e947..538311280 --- a/src/main/java/storagecraft/container/ContainerBase.java +++ b/src/main/java/storagecraft/container/ContainerBase.java @@ -1,13 +1,14 @@ package storagecraft.container; -import java.util.ArrayList; -import java.util.List; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import storagecraft.container.slot.SlotSpecimen; +import java.util.ArrayList; +import java.util.List; + public abstract class ContainerBase extends Container { private EntityPlayer player; @@ -64,8 +65,7 @@ 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()); } diff --git a/src/main/java/storagecraft/container/ContainerDetector.java b/src/main/java/storagecraft/container/ContainerDetector.java old mode 100644 new mode 100755 diff --git a/src/main/java/storagecraft/container/ContainerDrive.java b/src/main/java/storagecraft/container/ContainerDrive.java old mode 100644 new mode 100755 index a5dc8870b..0edc1f955 --- a/src/main/java/storagecraft/container/ContainerDrive.java +++ b/src/main/java/storagecraft/container/ContainerDrive.java @@ -24,8 +24,7 @@ public class ContainerDrive extends ContainerBase { x = 71; y += 18; - } - else + } else { x += 18; } @@ -51,8 +50,7 @@ public class ContainerDrive extends ContainerBase { return null; } - } - else if (!mergeItemStack(stack, 0, 8, false)) + } else if (!mergeItemStack(stack, 0, 8, false)) { return null; } @@ -60,8 +58,7 @@ public class ContainerDrive extends ContainerBase if (stack.stackSize == 0) { slot.putStack(null); - } - else + } else { slot.onSlotChanged(); } diff --git a/src/main/java/storagecraft/container/ContainerExporter.java b/src/main/java/storagecraft/container/ContainerExporter.java old mode 100644 new mode 100755 diff --git a/src/main/java/storagecraft/container/ContainerExternalStorage.java b/src/main/java/storagecraft/container/ContainerExternalStorage.java old mode 100644 new mode 100755 diff --git a/src/main/java/storagecraft/container/ContainerGrid.java b/src/main/java/storagecraft/container/ContainerGrid.java old mode 100644 new mode 100755 diff --git a/src/main/java/storagecraft/container/ContainerImporter.java b/src/main/java/storagecraft/container/ContainerImporter.java old mode 100644 new mode 100755 diff --git a/src/main/java/storagecraft/container/ContainerSolderer.java b/src/main/java/storagecraft/container/ContainerSolderer.java index 54b8ff796..f4b0113ef 100755 --- a/src/main/java/storagecraft/container/ContainerSolderer.java +++ b/src/main/java/storagecraft/container/ContainerSolderer.java @@ -44,8 +44,7 @@ public class ContainerSolderer extends ContainerBase { return null; } - } - else if (!mergeItemStack(stack, 0, 3, false)) + } else if (!mergeItemStack(stack, 0, 3, false)) { return null; } @@ -53,8 +52,7 @@ public class ContainerSolderer extends ContainerBase if (stack.stackSize == 0) { slot.putStack(null); - } - else + } else { slot.onSlotChanged(); } diff --git a/src/main/java/storagecraft/container/ContainerWirelessTransmitter.java b/src/main/java/storagecraft/container/ContainerWirelessTransmitter.java index d19113605..e57ed1e0a 100755 --- a/src/main/java/storagecraft/container/ContainerWirelessTransmitter.java +++ b/src/main/java/storagecraft/container/ContainerWirelessTransmitter.java @@ -39,8 +39,7 @@ public class ContainerWirelessTransmitter extends ContainerBase { return null; } - } - else if (!mergeItemStack(stack, 0, 3, false)) + } else if (!mergeItemStack(stack, 0, 3, false)) { return null; } @@ -48,8 +47,7 @@ public class ContainerWirelessTransmitter extends ContainerBase if (stack.stackSize == 0) { slot.putStack(null); - } - else + } else { slot.onSlotChanged(); } diff --git a/src/main/java/storagecraft/container/slot/SlotItemFilter.java b/src/main/java/storagecraft/container/slot/SlotItemFilter.java old mode 100644 new mode 100755 diff --git a/src/main/java/storagecraft/container/slot/SlotSpecimen.java b/src/main/java/storagecraft/container/slot/SlotSpecimen.java old mode 100644 new mode 100755 diff --git a/src/main/java/storagecraft/gui/GuiBase.java b/src/main/java/storagecraft/gui/GuiBase.java old mode 100644 new mode 100755 index 44b1c8521..28da6e60b --- a/src/main/java/storagecraft/gui/GuiBase.java +++ b/src/main/java/storagecraft/gui/GuiBase.java @@ -1,9 +1,5 @@ package storagecraft.gui; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.inventory.GuiContainer; @@ -16,6 +12,11 @@ import org.lwjgl.opengl.GL11; import storagecraft.StorageCraft; import storagecraft.gui.sidebutton.SideButton; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + public abstract class GuiBase extends GuiContainer { public static final int SIDE_BUTTON_WIDTH = 20; diff --git a/src/main/java/storagecraft/gui/GuiDetector.java b/src/main/java/storagecraft/gui/GuiDetector.java old mode 100644 new mode 100755 index 2692857f0..22ec390c3 --- a/src/main/java/storagecraft/gui/GuiDetector.java +++ b/src/main/java/storagecraft/gui/GuiDetector.java @@ -1,7 +1,6 @@ package storagecraft.gui; import com.google.common.primitives.Ints; -import java.io.IOException; import net.minecraft.client.gui.GuiTextField; import storagecraft.StorageCraft; import storagecraft.container.ContainerDetector; @@ -11,6 +10,8 @@ import storagecraft.network.MessageDetectorAmountUpdate; import storagecraft.tile.TileDetector; import storagecraft.util.InventoryUtils; +import java.io.IOException; + public class GuiDetector extends GuiBase { private TileDetector detector; @@ -74,8 +75,7 @@ public class GuiDetector extends GuiBase { StorageCraft.NETWORK.sendToServer(new MessageDetectorAmountUpdate(detector, result)); } - } - else + } else { super.keyTyped(character, keyCode); } diff --git a/src/main/java/storagecraft/gui/GuiDrive.java b/src/main/java/storagecraft/gui/GuiDrive.java old mode 100644 new mode 100755 diff --git a/src/main/java/storagecraft/gui/GuiExporter.java b/src/main/java/storagecraft/gui/GuiExporter.java old mode 100644 new mode 100755 diff --git a/src/main/java/storagecraft/gui/GuiGrid.java b/src/main/java/storagecraft/gui/GuiGrid.java index b374126f3..5a631d3c7 100755 --- a/src/main/java/storagecraft/gui/GuiGrid.java +++ b/src/main/java/storagecraft/gui/GuiGrid.java @@ -1,10 +1,5 @@ package storagecraft.gui; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Comparator; -import java.util.Iterator; -import java.util.List; import net.minecraft.client.audio.PositionedSoundRecord; import net.minecraft.client.gui.GuiTextField; import net.minecraft.client.renderer.GlStateManager; @@ -26,6 +21,12 @@ import storagecraft.storage.StorageItem; import storagecraft.tile.TileController; import storagecraft.tile.TileGrid; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Comparator; +import java.util.Iterator; +import java.util.List; + public class GuiGrid extends GuiBase { public static final int SORTING_DIRECTION_ASCENDING = 0; @@ -132,8 +133,7 @@ public class GuiGrid extends GuiBase if (grid.getType() == EnumGridType.CRAFTING) { bindTexture("gui/crafting_grid.png"); - } - else + } else { bindTexture("gui/grid.png"); } @@ -306,16 +306,13 @@ 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()) { @@ -341,8 +338,7 @@ public class GuiGrid extends GuiBase { if (!checkHotbarKeys(keyCode) && searchField.textboxKeyTyped(character, keyCode)) { - } - else + } else { super.keyTyped(character, keyCode); } diff --git a/src/main/java/storagecraft/gui/GuiHandler.java b/src/main/java/storagecraft/gui/GuiHandler.java index fa131a57c..427b5bfc7 100755 --- a/src/main/java/storagecraft/gui/GuiHandler.java +++ b/src/main/java/storagecraft/gui/GuiHandler.java @@ -7,28 +7,8 @@ import net.minecraft.util.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fml.common.network.IGuiHandler; import storagecraft.StorageCraftGUI; -import storagecraft.container.ContainerConstructor; -import storagecraft.container.ContainerController; -import storagecraft.container.ContainerDestructor; -import storagecraft.container.ContainerDetector; -import storagecraft.container.ContainerDrive; -import storagecraft.container.ContainerExporter; -import storagecraft.container.ContainerGrid; -import storagecraft.container.ContainerImporter; -import storagecraft.container.ContainerSolderer; -import storagecraft.container.ContainerExternalStorage; -import storagecraft.container.ContainerWirelessTransmitter; -import storagecraft.tile.TileConstructor; -import storagecraft.tile.TileController; -import storagecraft.tile.TileDestructor; -import storagecraft.tile.TileDetector; -import storagecraft.tile.TileDrive; -import storagecraft.tile.TileExporter; -import storagecraft.tile.TileGrid; -import storagecraft.tile.TileImporter; -import storagecraft.tile.TileSolderer; -import storagecraft.tile.TileExternalStorage; -import storagecraft.tile.TileWirelessTransmitter; +import storagecraft.container.*; +import storagecraft.tile.*; public class GuiHandler implements IGuiHandler { diff --git a/src/main/java/storagecraft/gui/GuiImporter.java b/src/main/java/storagecraft/gui/GuiImporter.java old mode 100644 new mode 100755 diff --git a/src/main/java/storagecraft/gui/sidebutton/SideButton.java b/src/main/java/storagecraft/gui/sidebutton/SideButton.java old mode 100644 new mode 100755 diff --git a/src/main/java/storagecraft/gui/sidebutton/SideButtonCompare.java b/src/main/java/storagecraft/gui/sidebutton/SideButtonCompare.java index 1cc33f180..4e38259c1 100755 --- a/src/main/java/storagecraft/gui/sidebutton/SideButtonCompare.java +++ b/src/main/java/storagecraft/gui/sidebutton/SideButtonCompare.java @@ -27,8 +27,7 @@ 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")); } diff --git a/src/main/java/storagecraft/gui/sidebutton/SideButtonDetectorMode.java b/src/main/java/storagecraft/gui/sidebutton/SideButtonDetectorMode.java old mode 100644 new mode 100755 diff --git a/src/main/java/storagecraft/gui/sidebutton/SideButtonGridSortingDirection.java b/src/main/java/storagecraft/gui/sidebutton/SideButtonGridSortingDirection.java old mode 100644 new mode 100755 diff --git a/src/main/java/storagecraft/gui/sidebutton/SideButtonGridSortingType.java b/src/main/java/storagecraft/gui/sidebutton/SideButtonGridSortingType.java old mode 100644 new mode 100755 diff --git a/src/main/java/storagecraft/gui/sidebutton/SideButtonImporterMode.java b/src/main/java/storagecraft/gui/sidebutton/SideButtonImporterMode.java old mode 100644 new mode 100755 diff --git a/src/main/java/storagecraft/inventory/InventorySimple.java b/src/main/java/storagecraft/inventory/InventorySimple.java index ffe2aac60..1c84b0c92 100755 --- a/src/main/java/storagecraft/inventory/InventorySimple.java +++ b/src/main/java/storagecraft/inventory/InventorySimple.java @@ -40,8 +40,7 @@ public class InventorySimple implements IInventory if (stack.stackSize <= amount) { setInventorySlotContents(slot, null); - } - else + } else { stack = stack.splitStack(amount); diff --git a/src/main/java/storagecraft/item/ItemBase.java b/src/main/java/storagecraft/item/ItemBase.java old mode 100644 new mode 100755 diff --git a/src/main/java/storagecraft/item/ItemBlockBase.java b/src/main/java/storagecraft/item/ItemBlockBase.java old mode 100644 new mode 100755 diff --git a/src/main/java/storagecraft/item/ItemBlockCable.java b/src/main/java/storagecraft/item/ItemBlockCable.java old mode 100644 new mode 100755 diff --git a/src/main/java/storagecraft/item/ItemCore.java b/src/main/java/storagecraft/item/ItemCore.java index 578e2fc7e..9dec0a5f0 100755 --- a/src/main/java/storagecraft/item/ItemCore.java +++ b/src/main/java/storagecraft/item/ItemCore.java @@ -1,10 +1,11 @@ package storagecraft.item; -import java.util.List; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import java.util.List; + public class ItemCore extends ItemBase { public static final int TYPE_CONSTRUCTION = 0; diff --git a/src/main/java/storagecraft/item/ItemProcessor.java b/src/main/java/storagecraft/item/ItemProcessor.java index 9e7d159bd..ac7c0dba8 100755 --- a/src/main/java/storagecraft/item/ItemProcessor.java +++ b/src/main/java/storagecraft/item/ItemProcessor.java @@ -1,10 +1,11 @@ package storagecraft.item; -import java.util.List; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import java.util.List; + public class ItemProcessor extends ItemBase { public static final int TYPE_PRINTED_BASIC = 0; diff --git a/src/main/java/storagecraft/item/ItemStorageCell.java b/src/main/java/storagecraft/item/ItemStorageCell.java index 568448027..4a560f994 100755 --- a/src/main/java/storagecraft/item/ItemStorageCell.java +++ b/src/main/java/storagecraft/item/ItemStorageCell.java @@ -1,6 +1,5 @@ package storagecraft.item; -import java.util.List; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -11,6 +10,8 @@ import net.minecraft.util.StatCollector; import net.minecraft.world.World; import storagecraft.storage.CellStorage; +import java.util.List; + public class ItemStorageCell extends ItemBase { public static final int TYPE_1K = 0; @@ -43,8 +44,7 @@ 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))); } diff --git a/src/main/java/storagecraft/item/ItemStoragePart.java b/src/main/java/storagecraft/item/ItemStoragePart.java index 31e243463..073680195 100755 --- a/src/main/java/storagecraft/item/ItemStoragePart.java +++ b/src/main/java/storagecraft/item/ItemStoragePart.java @@ -1,10 +1,11 @@ package storagecraft.item; -import java.util.List; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import java.util.List; + public class ItemStoragePart extends ItemBase { public static final int TYPE_1K = 0; diff --git a/src/main/java/storagecraft/item/ItemWirelessGrid.java b/src/main/java/storagecraft/item/ItemWirelessGrid.java index 82b14ded3..994775e18 100755 --- a/src/main/java/storagecraft/item/ItemWirelessGrid.java +++ b/src/main/java/storagecraft/item/ItemWirelessGrid.java @@ -1,6 +1,5 @@ package storagecraft.item; -import java.util.List; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -16,6 +15,8 @@ import storagecraft.block.EnumGridType; import storagecraft.tile.TileGrid; import storagecraft.tile.TileWirelessTransmitter; +import java.util.List; + public class ItemWirelessGrid extends ItemBase { public static final String NBT_WIRELESS_TRANSMITTER_X = "WirelessTransmitterX"; @@ -75,28 +76,23 @@ 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()))); } diff --git a/src/main/java/storagecraft/network/MessageDetectorAmountUpdate.java b/src/main/java/storagecraft/network/MessageDetectorAmountUpdate.java old mode 100644 new mode 100755 diff --git a/src/main/java/storagecraft/network/MessageDetectorModeUpdate.java b/src/main/java/storagecraft/network/MessageDetectorModeUpdate.java old mode 100644 new mode 100755 diff --git a/src/main/java/storagecraft/network/MessageImporterModeUpdate.java b/src/main/java/storagecraft/network/MessageImporterModeUpdate.java old mode 100644 new mode 100755 diff --git a/src/main/java/storagecraft/network/MessageStoragePull.java b/src/main/java/storagecraft/network/MessageStoragePull.java old mode 100644 new mode 100755 index 4552dcf52..23e35c6bd --- a/src/main/java/storagecraft/network/MessageStoragePull.java +++ b/src/main/java/storagecraft/network/MessageStoragePull.java @@ -89,8 +89,7 @@ public class MessageStoragePull extends MessageHandlerPlayerToServer items); diff --git a/src/main/java/storagecraft/storage/IStorageProvider.java b/src/main/java/storagecraft/storage/IStorageProvider.java old mode 100644 new mode 100755 diff --git a/src/main/java/storagecraft/storage/StorageItem.java b/src/main/java/storagecraft/storage/StorageItem.java old mode 100644 new mode 100755 diff --git a/src/main/java/storagecraft/tile/INetworkTile.java b/src/main/java/storagecraft/tile/INetworkTile.java old mode 100644 new mode 100755 diff --git a/src/main/java/storagecraft/tile/RedstoneMode.java b/src/main/java/storagecraft/tile/RedstoneMode.java index 46fe48dff..049ef5eb1 100755 --- a/src/main/java/storagecraft/tile/RedstoneMode.java +++ b/src/main/java/storagecraft/tile/RedstoneMode.java @@ -8,28 +8,28 @@ public enum RedstoneMode IGNORE(0), HIGH(1), LOW(2); - + public static final String NBT = "RedstoneMode"; - + public final int id; - + RedstoneMode(int id) { this.id = id; } - + public RedstoneMode next() { RedstoneMode next = getById(id + 1); - + if (next == null) { return getById(0); } - + return next; } - + public boolean isEnabled(World world, BlockPos pos) { switch (this) @@ -41,10 +41,10 @@ public enum RedstoneMode case LOW: return !world.isBlockPowered(pos); } - + return false; } - + public static RedstoneMode getById(int id) { for (RedstoneMode control : values()) @@ -54,7 +54,7 @@ public enum RedstoneMode return control; } } - + return null; } } diff --git a/src/main/java/storagecraft/tile/TileCable.java b/src/main/java/storagecraft/tile/TileCable.java old mode 100644 new mode 100755 index 161ab7be7..038f2ae28 --- a/src/main/java/storagecraft/tile/TileCable.java +++ b/src/main/java/storagecraft/tile/TileCable.java @@ -1,12 +1,13 @@ package storagecraft.tile; -import java.util.List; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import storagecraft.block.BlockCable; +import java.util.List; + public class TileCable extends TileBase { public static boolean isCable(World world, BlockPos pos) @@ -84,12 +85,10 @@ 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); } diff --git a/src/main/java/storagecraft/tile/TileConstructor.java b/src/main/java/storagecraft/tile/TileConstructor.java index 0349a2f9d..311a5fd02 100755 --- a/src/main/java/storagecraft/tile/TileConstructor.java +++ b/src/main/java/storagecraft/tile/TileConstructor.java @@ -205,8 +205,8 @@ public class TileConstructor extends TileMachine implements IInventory, ISidedIn public int[] getSlotsForFace(EnumFacing side) { return new int[] - { - }; + { + }; } @Override diff --git a/src/main/java/storagecraft/tile/TileController.java b/src/main/java/storagecraft/tile/TileController.java index d1789a698..1d06a87ab 100755 --- a/src/main/java/storagecraft/tile/TileController.java +++ b/src/main/java/storagecraft/tile/TileController.java @@ -3,8 +3,6 @@ package storagecraft.tile; import cofh.api.energy.EnergyStorage; import cofh.api.energy.IEnergyReceiver; import io.netty.buffer.ByteBuf; -import java.util.ArrayList; -import java.util.List; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; @@ -15,6 +13,9 @@ import storagecraft.storage.IStorageProvider; import storagecraft.storage.StorageItem; import storagecraft.util.InventoryUtils; +import java.util.ArrayList; +import java.util.List; + public class TileController extends TileBase implements IEnergyReceiver, INetworkTile, IRedstoneModeSetting { private List items = new ArrayList(); @@ -48,8 +49,7 @@ public class TileController extends TileBase implements IEnergyReceiver, INetwor if (!isActive()) { disconnectAll(); - } - else + } else { visitedCables.clear(); @@ -246,8 +246,7 @@ public class TileController extends TileBase implements IEnergyReceiver, INetwor if (newStack == null) { newStack = took; - } - else + } else { newStack.stackSize += took.stackSize; } diff --git a/src/main/java/storagecraft/tile/TileDestructor.java b/src/main/java/storagecraft/tile/TileDestructor.java index c1f990d3a..1ac44baa1 100755 --- a/src/main/java/storagecraft/tile/TileDestructor.java +++ b/src/main/java/storagecraft/tile/TileDestructor.java @@ -1,11 +1,12 @@ package storagecraft.tile; -import java.util.List; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; import storagecraft.util.InventoryUtils; +import java.util.List; + public class TileDestructor extends TileMachine { @Override diff --git a/src/main/java/storagecraft/tile/TileDetector.java b/src/main/java/storagecraft/tile/TileDetector.java index df9ae77d9..bbebdf947 100755 --- a/src/main/java/storagecraft/tile/TileDetector.java +++ b/src/main/java/storagecraft/tile/TileDetector.java @@ -83,18 +83,15 @@ 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; } @@ -311,8 +308,8 @@ public class TileDetector extends TileMachine implements IInventory, ISidedInven public int[] getSlotsForFace(EnumFacing side) { return new int[] - { - }; + { + }; } @Override diff --git a/src/main/java/storagecraft/tile/TileDrive.java b/src/main/java/storagecraft/tile/TileDrive.java index dda6d4066..c32ccafaa 100755 --- a/src/main/java/storagecraft/tile/TileDrive.java +++ b/src/main/java/storagecraft/tile/TileDrive.java @@ -1,6 +1,5 @@ package storagecraft.tile; -import java.util.List; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; @@ -12,6 +11,8 @@ import storagecraft.storage.IStorage; import storagecraft.storage.IStorageProvider; import storagecraft.util.InventoryUtils; +import java.util.List; + public class TileDrive extends TileMachine implements IInventory, IStorageProvider { private InventorySimple inventory = new InventorySimple("drive", 8); diff --git a/src/main/java/storagecraft/tile/TileExporter.java b/src/main/java/storagecraft/tile/TileExporter.java index dd072f221..4af51ec7c 100755 --- a/src/main/java/storagecraft/tile/TileExporter.java +++ b/src/main/java/storagecraft/tile/TileExporter.java @@ -73,12 +73,10 @@ 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); } @@ -248,8 +246,8 @@ public class TileExporter extends TileMachine implements IInventory, ISidedInven public int[] getSlotsForFace(EnumFacing side) { return new int[] - { - }; + { + }; } @Override diff --git a/src/main/java/storagecraft/tile/TileExternalStorage.java b/src/main/java/storagecraft/tile/TileExternalStorage.java index 169b40975..bfb87e09a 100755 --- a/src/main/java/storagecraft/tile/TileExternalStorage.java +++ b/src/main/java/storagecraft/tile/TileExternalStorage.java @@ -1,6 +1,5 @@ package storagecraft.tile; -import java.util.List; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -9,6 +8,8 @@ import storagecraft.storage.IStorageProvider; import storagecraft.storage.StorageItem; import storagecraft.util.InventoryUtils; +import java.util.List; + public class TileExternalStorage extends TileMachine implements IStorageProvider, IStorage { public IInventory getInventory() diff --git a/src/main/java/storagecraft/tile/TileGrid.java b/src/main/java/storagecraft/tile/TileGrid.java old mode 100644 new mode 100755 diff --git a/src/main/java/storagecraft/tile/TileImporter.java b/src/main/java/storagecraft/tile/TileImporter.java index 9881abd52..e219655b2 100755 --- a/src/main/java/storagecraft/tile/TileImporter.java +++ b/src/main/java/storagecraft/tile/TileImporter.java @@ -69,8 +69,7 @@ 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); } @@ -105,8 +104,7 @@ 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; } @@ -301,8 +299,8 @@ public class TileImporter extends TileMachine implements IInventory, ISidedInven public int[] getSlotsForFace(EnumFacing side) { return new int[] - { - }; + { + }; } @Override diff --git a/src/main/java/storagecraft/tile/TileSolderer.java b/src/main/java/storagecraft/tile/TileSolderer.java index 429526840..670893a92 100755 --- a/src/main/java/storagecraft/tile/TileSolderer.java +++ b/src/main/java/storagecraft/tile/TileSolderer.java @@ -41,16 +41,14 @@ 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++; @@ -276,16 +274,16 @@ public class TileSolderer extends TileMachine implements IInventory, ISidedInven if (side != EnumFacing.DOWN) { return new int[] - { - 0, 1, 2 - }; + { + 0, 1, 2 + }; } // On the bottom we can only reach the output slot return new int[] - { - 3 - }; + { + 3 + }; } @Override diff --git a/src/main/java/storagecraft/tile/TileWirelessTransmitter.java b/src/main/java/storagecraft/tile/TileWirelessTransmitter.java index da6913b9a..59924c4f5 100755 --- a/src/main/java/storagecraft/tile/TileWirelessTransmitter.java +++ b/src/main/java/storagecraft/tile/TileWirelessTransmitter.java @@ -40,8 +40,7 @@ public class TileWirelessTransmitter extends TileMachine implements IInventory { reset(); } - } - else if (inventory.getStackInSlot(0) != null) + } else if (inventory.getStackInSlot(0) != null) { inventory.decrStackSize(0, 1); diff --git a/src/main/java/storagecraft/tile/solderer/SoldererRecipeCraftingGrid.java b/src/main/java/storagecraft/tile/solderer/SoldererRecipeCraftingGrid.java index c5f8eeb0e..073499883 100755 --- a/src/main/java/storagecraft/tile/solderer/SoldererRecipeCraftingGrid.java +++ b/src/main/java/storagecraft/tile/solderer/SoldererRecipeCraftingGrid.java @@ -14,12 +14,10 @@ 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); } diff --git a/src/main/java/storagecraft/tile/solderer/SoldererRecipeDrive.java b/src/main/java/storagecraft/tile/solderer/SoldererRecipeDrive.java index 648681eae..c80ca6c5d 100755 --- a/src/main/java/storagecraft/tile/solderer/SoldererRecipeDrive.java +++ b/src/main/java/storagecraft/tile/solderer/SoldererRecipeDrive.java @@ -14,12 +14,10 @@ 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); } diff --git a/src/main/java/storagecraft/tile/solderer/SoldererRecipeProcessor.java b/src/main/java/storagecraft/tile/solderer/SoldererRecipeProcessor.java index d36a42dcf..5b5b42b05 100755 --- a/src/main/java/storagecraft/tile/solderer/SoldererRecipeProcessor.java +++ b/src/main/java/storagecraft/tile/solderer/SoldererRecipeProcessor.java @@ -28,12 +28,10 @@ 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); } diff --git a/src/main/java/storagecraft/tile/solderer/SoldererRecipeWirelessGrid.java b/src/main/java/storagecraft/tile/solderer/SoldererRecipeWirelessGrid.java index 85028601a..d377c21c0 100755 --- a/src/main/java/storagecraft/tile/solderer/SoldererRecipeWirelessGrid.java +++ b/src/main/java/storagecraft/tile/solderer/SoldererRecipeWirelessGrid.java @@ -20,12 +20,10 @@ 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); } diff --git a/src/main/java/storagecraft/tile/solderer/SoldererRegistry.java b/src/main/java/storagecraft/tile/solderer/SoldererRegistry.java index 90b24dfdc..895cd13f9 100755 --- a/src/main/java/storagecraft/tile/solderer/SoldererRegistry.java +++ b/src/main/java/storagecraft/tile/solderer/SoldererRegistry.java @@ -1,11 +1,12 @@ package storagecraft.tile.solderer; -import java.util.ArrayList; -import java.util.List; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import storagecraft.util.InventoryUtils; +import java.util.ArrayList; +import java.util.List; + public class SoldererRegistry { public static List recipes = new ArrayList(); diff --git a/src/main/java/storagecraft/util/InventoryUtils.java b/src/main/java/storagecraft/util/InventoryUtils.java old mode 100644 new mode 100755 index 5a6ccfbc8..119ca8452 --- a/src/main/java/storagecraft/util/InventoryUtils.java +++ b/src/main/java/storagecraft/util/InventoryUtils.java @@ -107,8 +107,7 @@ public class InventoryUtils if (slot == null) { inventory.setInventorySlotContents(i, stack); - } - else if (compareStackNoQuantity(slot, stack)) + } else if (compareStackNoQuantity(slot, stack)) { slot.stackSize += stack.stackSize; } @@ -144,8 +143,7 @@ public class InventoryUtils inventory.setInventorySlotContents(i, stack); return; - } - else if (compareStackNoQuantity(slot, stack)) + } else if (compareStackNoQuantity(slot, stack)) { int toAdd = toGo; @@ -177,8 +175,7 @@ public class InventoryUtils if (slot == null) { return true; - } - else if (compareStackNoQuantity(slot, stack)) + } else if (compareStackNoQuantity(slot, stack)) { int toAdd = toGo;