From 87d41aaa53752dfeec5e970b7d0836ad2137bf51 Mon Sep 17 00:00:00 2001 From: gigabit101 Date: Sun, 6 Mar 2016 20:14:42 +0000 Subject: [PATCH] Small code clean up --- .../techreborn/blocks/machine/BlockAlloyFurnace.java | 1 - .../techreborn/blocks/machine/BlockAlloySmelter.java | 8 ++------ .../blocks/machine/BlockAssemblingMachine.java | 8 ++------ .../techreborn/blocks/machine/BlockBlastFurnace.java | 10 ++-------- .../techreborn/blocks/machine/BlockCentrifuge.java | 1 - .../techreborn/blocks/machine/BlockChargeBench.java | 5 +---- .../blocks/machine/BlockChemicalReactor.java | 6 +----- .../blocks/machine/BlockImplosionCompressor.java | 8 ++------ .../blocks/machine/BlockIndustrialElectrolyzer.java | 8 ++------ .../blocks/machine/BlockIndustrialGrinder.java | 2 -- .../blocks/machine/BlockIndustrialSawmill.java | 8 ++------ .../blocks/machine/BlockMatterFabricator.java | 7 ++----- .../techreborn/blocks/machine/BlockRollingMachine.java | 8 ++------ .../techreborn/blocks/machine/BlockVacuumFreezer.java | 10 ++-------- src/main/java/techreborn/tiles/TileIronFurnace.java | 4 ---- 15 files changed, 20 insertions(+), 74 deletions(-) diff --git a/src/main/java/techreborn/blocks/machine/BlockAlloyFurnace.java b/src/main/java/techreborn/blocks/machine/BlockAlloyFurnace.java index 54b011969..a3cf87dc5 100644 --- a/src/main/java/techreborn/blocks/machine/BlockAlloyFurnace.java +++ b/src/main/java/techreborn/blocks/machine/BlockAlloyFurnace.java @@ -20,7 +20,6 @@ import techreborn.tiles.TileAlloyFurnace; public class BlockAlloyFurnace extends BlockMachineBase implements IRotationTexture { - public BlockAlloyFurnace(Material material) { super(); setUnlocalizedName("techreborn.alloyfurnace"); diff --git a/src/main/java/techreborn/blocks/machine/BlockAlloySmelter.java b/src/main/java/techreborn/blocks/machine/BlockAlloySmelter.java index 8bd98ff1b..46cf1764c 100644 --- a/src/main/java/techreborn/blocks/machine/BlockAlloySmelter.java +++ b/src/main/java/techreborn/blocks/machine/BlockAlloySmelter.java @@ -13,7 +13,6 @@ import techreborn.tiles.TileAlloySmelter; public class BlockAlloySmelter extends BlockMachineBase implements IRotationTexture { - public BlockAlloySmelter(Material material) { super(); setUnlocalizedName("techreborn.alloysmelter"); @@ -26,11 +25,9 @@ public class BlockAlloySmelter extends BlockMachineBase implements IRotationText } @Override - public boolean onBlockActivated(World world, int x, int y, int z, - EntityPlayer player, int side, float hitX, float hitY, float hitZ) { + public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) { if (!player.isSneaking()) - player.openGui(Core.INSTANCE, GuiHandler.alloySmelterID, world, x, y, - z); + player.openGui(Core.INSTANCE, GuiHandler.alloySmelterID, world, x, y, z); return true; } @@ -60,5 +57,4 @@ public class BlockAlloySmelter extends BlockMachineBase implements IRotationText public String getBottom() { return prefix + "machine_bottom"; } - } diff --git a/src/main/java/techreborn/blocks/machine/BlockAssemblingMachine.java b/src/main/java/techreborn/blocks/machine/BlockAssemblingMachine.java index f5b9f20d6..477eb1049 100644 --- a/src/main/java/techreborn/blocks/machine/BlockAssemblingMachine.java +++ b/src/main/java/techreborn/blocks/machine/BlockAssemblingMachine.java @@ -13,7 +13,6 @@ import techreborn.tiles.TileAssemblingMachine; public class BlockAssemblingMachine extends BlockMachineBase implements IRotationTexture { - public BlockAssemblingMachine(Material material) { super(); setUnlocalizedName("techreborn.assemblingmachine"); @@ -27,11 +26,9 @@ public class BlockAssemblingMachine extends BlockMachineBase implements IRotatio } @Override - public boolean onBlockActivated(World world, int x, int y, int z, - EntityPlayer player, int side, float hitX, float hitY, float hitZ) { + public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) { if (!player.isSneaking()) - player.openGui(Core.INSTANCE, GuiHandler.assemblingmachineID, world, x, y, - z); + player.openGui(Core.INSTANCE, GuiHandler.assemblingmachineID, world, x, y, z); return true; } @@ -61,5 +58,4 @@ public class BlockAssemblingMachine extends BlockMachineBase implements IRotatio public String getBottom() { return prefix + "assembling_machine_top"; } - } diff --git a/src/main/java/techreborn/blocks/machine/BlockBlastFurnace.java b/src/main/java/techreborn/blocks/machine/BlockBlastFurnace.java index 2e7ee3285..a5c5541d1 100644 --- a/src/main/java/techreborn/blocks/machine/BlockBlastFurnace.java +++ b/src/main/java/techreborn/blocks/machine/BlockBlastFurnace.java @@ -13,7 +13,6 @@ import techreborn.tiles.TileBlastFurnace; public class BlockBlastFurnace extends BlockMachineBase implements IRotationTexture { - public BlockBlastFurnace(Material material) { super(); setUnlocalizedName("techreborn.blastfurnace"); @@ -26,16 +25,12 @@ public class BlockBlastFurnace extends BlockMachineBase implements IRotationText } @Override - public boolean onBlockActivated(World world, int x, int y, int z, - EntityPlayer player, int side, float hitX, float hitY, float hitZ) { + public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) { if (!player.isSneaking()) - player.openGui(Core.INSTANCE, GuiHandler.blastFurnaceID, world, x, y, - z); + player.openGui(Core.INSTANCE, GuiHandler.blastFurnaceID, world, x, y, z); return true; } - - @Override public boolean isAdvanced() { return true; @@ -67,5 +62,4 @@ public class BlockBlastFurnace extends BlockMachineBase implements IRotationText public String getBottom() { return prefix + "assembling_machine_top"; } - } diff --git a/src/main/java/techreborn/blocks/machine/BlockCentrifuge.java b/src/main/java/techreborn/blocks/machine/BlockCentrifuge.java index d22b9cf2c..60d17eaa7 100644 --- a/src/main/java/techreborn/blocks/machine/BlockCentrifuge.java +++ b/src/main/java/techreborn/blocks/machine/BlockCentrifuge.java @@ -57,5 +57,4 @@ public class BlockCentrifuge extends BlockMachineBase implements IRotationTextur public String getBottom() { return prefix + "industrial_centrifuge_bottom"; } - } diff --git a/src/main/java/techreborn/blocks/machine/BlockChargeBench.java b/src/main/java/techreborn/blocks/machine/BlockChargeBench.java index 01f1a1206..4d3d9de09 100644 --- a/src/main/java/techreborn/blocks/machine/BlockChargeBench.java +++ b/src/main/java/techreborn/blocks/machine/BlockChargeBench.java @@ -13,7 +13,6 @@ import techreborn.tiles.TileChargeBench; public class BlockChargeBench extends BlockMachineBase implements IRotationTexture { - public BlockChargeBench(Material material) { super(); setUnlocalizedName("techreborn.chargebench"); @@ -28,8 +27,7 @@ public class BlockChargeBench extends BlockMachineBase implements IRotationTextu @Override public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) { if (!player.isSneaking()) - player.openGui(Core.INSTANCE, GuiHandler.chargeBench, world, x, y, - z); + player.openGui(Core.INSTANCE, GuiHandler.chargeBench, world, x, y, z); return true; } @@ -59,5 +57,4 @@ public class BlockChargeBench extends BlockMachineBase implements IRotationTextu public String getBottom() { return prefix + "chargeBench_side"; } - } diff --git a/src/main/java/techreborn/blocks/machine/BlockChemicalReactor.java b/src/main/java/techreborn/blocks/machine/BlockChemicalReactor.java index c1f4119db..c9f409f12 100644 --- a/src/main/java/techreborn/blocks/machine/BlockChemicalReactor.java +++ b/src/main/java/techreborn/blocks/machine/BlockChemicalReactor.java @@ -13,8 +13,6 @@ import techreborn.tiles.TileChemicalReactor; public class BlockChemicalReactor extends BlockMachineBase implements IRotationTexture { - - public BlockChemicalReactor(Material material) { super(); setUnlocalizedName("techreborn.chemicalreactor"); @@ -30,8 +28,7 @@ public class BlockChemicalReactor extends BlockMachineBase implements IRotationT public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) { if (!player.isSneaking()) - player.openGui(Core.INSTANCE, GuiHandler.chemicalReactorID, world, x, y, - z); + player.openGui(Core.INSTANCE, GuiHandler.chemicalReactorID, world, x, y, z); return true; } @@ -61,5 +58,4 @@ public class BlockChemicalReactor extends BlockMachineBase implements IRotationT public String getBottom() { return prefix + "industrial_centrifuge_bottom"; } - } diff --git a/src/main/java/techreborn/blocks/machine/BlockImplosionCompressor.java b/src/main/java/techreborn/blocks/machine/BlockImplosionCompressor.java index bad086f90..0567bcc39 100644 --- a/src/main/java/techreborn/blocks/machine/BlockImplosionCompressor.java +++ b/src/main/java/techreborn/blocks/machine/BlockImplosionCompressor.java @@ -13,7 +13,6 @@ import techreborn.tiles.TileImplosionCompressor; public class BlockImplosionCompressor extends BlockMachineBase implements IRotationTexture { - public BlockImplosionCompressor(Material material) { super(); setUnlocalizedName("techreborn.implosioncompressor"); @@ -26,11 +25,9 @@ public class BlockImplosionCompressor extends BlockMachineBase implements IRotat } @Override - public boolean onBlockActivated(World world, int x, int y, int z, - EntityPlayer player, int side, float hitX, float hitY, float hitZ) { + public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) { if (!player.isSneaking()) - player.openGui(Core.INSTANCE, GuiHandler.implosionCompresserID, world, x, y, - z); + player.openGui(Core.INSTANCE, GuiHandler.implosionCompresserID, world, x, y, z); return true; } @@ -60,5 +57,4 @@ public class BlockImplosionCompressor extends BlockMachineBase implements IRotat public String getBottom() { return prefix + "implosion_compressor_bottom"; } - } diff --git a/src/main/java/techreborn/blocks/machine/BlockIndustrialElectrolyzer.java b/src/main/java/techreborn/blocks/machine/BlockIndustrialElectrolyzer.java index 091ffd5d8..fa80ff122 100644 --- a/src/main/java/techreborn/blocks/machine/BlockIndustrialElectrolyzer.java +++ b/src/main/java/techreborn/blocks/machine/BlockIndustrialElectrolyzer.java @@ -13,7 +13,6 @@ import techreborn.tiles.TileIndustrialElectrolyzer; public class BlockIndustrialElectrolyzer extends BlockMachineBase implements IRotationTexture { - public BlockIndustrialElectrolyzer(Material material) { super(); setUnlocalizedName("techreborn.industrialelectrolyzer"); @@ -26,11 +25,9 @@ public class BlockIndustrialElectrolyzer extends BlockMachineBase implements IRo } @Override - public boolean onBlockActivated(World world, int x, int y, int z, - EntityPlayer player, int side, float hitX, float hitY, float hitZ) { + public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) { if (!player.isSneaking()) - player.openGui(Core.INSTANCE, GuiHandler.industrialElectrolyzerID, world, x, y, - z); + player.openGui(Core.INSTANCE, GuiHandler.industrialElectrolyzerID, world, x, y, z); return true; } @@ -60,5 +57,4 @@ public class BlockIndustrialElectrolyzer extends BlockMachineBase implements IRo public String getBottom() { return prefix + "machine_bottom"; } - } diff --git a/src/main/java/techreborn/blocks/machine/BlockIndustrialGrinder.java b/src/main/java/techreborn/blocks/machine/BlockIndustrialGrinder.java index 22e6bedd1..6f9dd0610 100644 --- a/src/main/java/techreborn/blocks/machine/BlockIndustrialGrinder.java +++ b/src/main/java/techreborn/blocks/machine/BlockIndustrialGrinder.java @@ -14,7 +14,6 @@ import techreborn.tiles.TileIndustrialGrinder; public class BlockIndustrialGrinder extends BlockMachineBase implements IRotationTexture { - public BlockIndustrialGrinder(Material material) { super(); setUnlocalizedName("techreborn.industrialgrinder"); @@ -62,5 +61,4 @@ public class BlockIndustrialGrinder extends BlockMachineBase implements IRotatio public String getBottom() { return prefix + "industrial_centrifuge_bottom"; } - } diff --git a/src/main/java/techreborn/blocks/machine/BlockIndustrialSawmill.java b/src/main/java/techreborn/blocks/machine/BlockIndustrialSawmill.java index b7245743d..2d1f09be7 100644 --- a/src/main/java/techreborn/blocks/machine/BlockIndustrialSawmill.java +++ b/src/main/java/techreborn/blocks/machine/BlockIndustrialSawmill.java @@ -26,14 +26,12 @@ public class BlockIndustrialSawmill extends BlockMachineBase implements IRotatio } @Override - public boolean onBlockActivated(World world, int x, int y, int z, - EntityPlayer player, int side, float hitX, float hitY, float hitZ) { + public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) { if(fillBlockWithFluid(world, new BlockPos(x, y, z), player)){ return true; } if (!player.isSneaking()) - player.openGui(Core.INSTANCE, GuiHandler.sawMillID, world, x, y, - z); + player.openGui(Core.INSTANCE, GuiHandler.sawMillID, world, x, y, z); return true; } @@ -63,6 +61,4 @@ public class BlockIndustrialSawmill extends BlockMachineBase implements IRotatio public String getBottom() { return prefix + "advanced_machine_side"; } - - } diff --git a/src/main/java/techreborn/blocks/machine/BlockMatterFabricator.java b/src/main/java/techreborn/blocks/machine/BlockMatterFabricator.java index 07baecbca..744315cfd 100644 --- a/src/main/java/techreborn/blocks/machine/BlockMatterFabricator.java +++ b/src/main/java/techreborn/blocks/machine/BlockMatterFabricator.java @@ -13,7 +13,6 @@ import techreborn.tiles.TileMatterFabricator; public class BlockMatterFabricator extends BlockMachineBase implements IAdvancedRotationTexture { - public BlockMatterFabricator(Material material) { super(); setUnlocalizedName("techreborn.matterfabricator"); @@ -26,11 +25,9 @@ public class BlockMatterFabricator extends BlockMachineBase implements IAdvanced } @Override - public boolean onBlockActivated(World world, int x, int y, int z, - EntityPlayer player, int side, float hitX, float hitY, float hitZ) { + public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) { if (!player.isSneaking()) - player.openGui(Core.INSTANCE, GuiHandler.matterfabID, world, x, y, - z); + player.openGui(Core.INSTANCE, GuiHandler.matterfabID, world, x, y, z); return true; } diff --git a/src/main/java/techreborn/blocks/machine/BlockRollingMachine.java b/src/main/java/techreborn/blocks/machine/BlockRollingMachine.java index 2f3dd46e4..9f186fb5e 100644 --- a/src/main/java/techreborn/blocks/machine/BlockRollingMachine.java +++ b/src/main/java/techreborn/blocks/machine/BlockRollingMachine.java @@ -13,8 +13,6 @@ import techreborn.tiles.TileRollingMachine; public class BlockRollingMachine extends BlockMachineBase implements IAdvancedRotationTexture { - - public BlockRollingMachine(Material material) { super(); setUnlocalizedName("techreborn.rollingmachine"); @@ -27,11 +25,9 @@ public class BlockRollingMachine extends BlockMachineBase implements IAdvancedRo } @Override - public boolean onBlockActivated(World world, int x, int y, int z, - EntityPlayer player, int side, float hitX, float hitY, float hitZ) { + public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) { if (!player.isSneaking()) - player.openGui(Core.INSTANCE, GuiHandler.rollingMachineID, world, - x, y, z); + player.openGui(Core.INSTANCE, GuiHandler.rollingMachineID, world, x, y, z); return true; } diff --git a/src/main/java/techreborn/blocks/machine/BlockVacuumFreezer.java b/src/main/java/techreborn/blocks/machine/BlockVacuumFreezer.java index be0213265..0dba4d314 100644 --- a/src/main/java/techreborn/blocks/machine/BlockVacuumFreezer.java +++ b/src/main/java/techreborn/blocks/machine/BlockVacuumFreezer.java @@ -14,29 +14,23 @@ import techreborn.tiles.TileVacuumFreezer; public class BlockVacuumFreezer extends BlockMachineBase implements IAdvancedRotationTexture{ - public BlockVacuumFreezer(Material material) { super(); setUnlocalizedName("techreborn.vacuumfreezer"); setCreativeTab(TechRebornCreativeTab.instance); } - @Override public TileEntity createNewTileEntity(World p_149915_1_, int p_149915_2_) { return new TileVacuumFreezer(); } @Override - public boolean onBlockActivated(World world, int x, int y, int z, - EntityPlayer player, int side, float hitX, float hitY, float hitZ) { - + public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) { TileVacuumFreezer tileVacuumFreezer = (TileVacuumFreezer) world.getTileEntity(new BlockPos(x, y, z)); tileVacuumFreezer.multiBlockStatus = tileVacuumFreezer.checkMachine() ? 1 : 0; - if (!player.isSneaking()) - player.openGui(Core.INSTANCE, GuiHandler.vacuumFreezerID, world, x, y, - z); + player.openGui(Core.INSTANCE, GuiHandler.vacuumFreezerID, world, x, y, z); return true; } diff --git a/src/main/java/techreborn/tiles/TileIronFurnace.java b/src/main/java/techreborn/tiles/TileIronFurnace.java index 10f653ee9..3c4eed541 100644 --- a/src/main/java/techreborn/tiles/TileIronFurnace.java +++ b/src/main/java/techreborn/tiles/TileIronFurnace.java @@ -46,10 +46,6 @@ public class TileIronFurnace extends TileMachineBase implements IInventory { public int fuelGague; public int progress; public int fuelScale = 200; - byte direction; - private static final int[] slots_top = new int[] { 0 }; - private static final int[] slots_bottom = new int[] { 2, 1 }; - private static final int[] slots_sides = new int[] { 1 }; public int gaugeProgressScaled (int scale) {