Code cleanup

15 files changed, 30 insertions, 80 deletions

diff --git a/src/main/java/common/blocks/BaseGTUpdateableBlock.java b/src/main/java/common/blocks/BaseGTUpdateableBlock.java
index 3d1ce633c1..130598c05e 100644
--- a/src/main/java/common/blocks/BaseGTUpdateableBlock.java
+++ b/src/main/java/common/blocks/BaseGTUpdateableBlock.java
@@ -6,6 +6,11 @@ import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.world.World;
 
+/**
+ * Any blocks that are used as structure parts for GregTech multi machines
+ * have to inherit from this class. Otherwise the checkMachine() method
+ * that verifies a machine's structure won't be called correctly.
+ */
 public abstract class BaseGTUpdateableBlock extends Block {
 
     protected BaseGTUpdateableBlock(Material material) {
diff --git a/src/main/java/common/blocks/Block_ControlRod.java b/src/main/java/common/blocks/Block_ControlRod.java
index f588e9113b..808881dead 100644
--- a/src/main/java/common/blocks/Block_ControlRod.java
+++ b/src/main/java/common/blocks/Block_ControlRod.java
@@ -8,17 +8,13 @@ import net.minecraft.creativetab.CreativeTabs;
 
 public class Block_ControlRod extends BaseGTUpdateableBlock {
 	
-	private static Block_ControlRod instance;
+	private static final Block_ControlRod instance = new Block_ControlRod();
 	
 	private Block_ControlRod() {
 		super(Material.iron);
 	}
 	
 	public static Block registerBlock() {
-		if(instance == null) {
-			instance = new Block_ControlRod();
-		}
-		
 		final String blockName = "kekztech_controlrod_block";
 		instance.setBlockName(blockName);
 		instance.setCreativeTab(CreativeTabs.tabMisc);
diff --git a/src/main/java/common/blocks/Block_GDCUnit.java b/src/main/java/common/blocks/Block_GDCUnit.java
index 0857572121..aab81e1aeb 100644
--- a/src/main/java/common/blocks/Block_GDCUnit.java
+++ b/src/main/java/common/blocks/Block_GDCUnit.java
@@ -8,17 +8,13 @@ import net.minecraft.creativetab.CreativeTabs;
 

 public class Block_GDCUnit extends BaseGTUpdateableBlock {

 	

-	private static Block_GDCUnit instance;

+	private static final Block_GDCUnit instance = new Block_GDCUnit();

 	

 	private Block_GDCUnit() {

 		super(Material.iron);

 	}

 	

 	public static Block registerBlock() {

-		if(instance == null) {

-			instance = new Block_GDCUnit();

-		}

-		

 		final String blockName = "kekztech_gdcceramicelectrolyteunit_block";

 		instance.setBlockName(blockName);

 		instance.setCreativeTab(CreativeTabs.tabMisc);

diff --git a/src/main/java/common/blocks/Block_ItemProxyCable.java b/src/main/java/common/blocks/Block_ItemProxyCable.java
index e32e4cb8f0..8682a2a6dc 100644
--- a/src/main/java/common/blocks/Block_ItemProxyCable.java
+++ b/src/main/java/common/blocks/Block_ItemProxyCable.java
@@ -16,17 +16,13 @@ import render.ConduitRenderer;
 
 public class Block_ItemProxyCable extends Block {
 	
-	private static Block_ItemProxyCable instance;
+	private static Block_ItemProxyCable instance = new Block_ItemProxyCable();
 	
 	private Block_ItemProxyCable() {
 		super(Material.glass);
 	}
 	
 	public static Block registerBlock() {
-		if(instance == null) {
-			instance = new Block_ItemProxyCable();
-		}
-		
 		final String blockName = "kekztech_itemproxycable_block";
 		instance.setBlockName(blockName);
 		instance.setCreativeTab(CreativeTabs.tabMisc);
diff --git a/src/main/java/common/blocks/Block_ItemProxyEndpoint.java b/src/main/java/common/blocks/Block_ItemProxyEndpoint.java
index 68aa206836..6bbf9fbfee 100644
--- a/src/main/java/common/blocks/Block_ItemProxyEndpoint.java
+++ b/src/main/java/common/blocks/Block_ItemProxyEndpoint.java
@@ -18,17 +18,13 @@ import net.minecraft.world.World;
 
 public class Block_ItemProxyEndpoint extends Block {
 	
-	private static Block_ItemProxyEndpoint instance;
+	private static Block_ItemProxyEndpoint instance = new Block_ItemProxyEndpoint();
 	
 	private Block_ItemProxyEndpoint() {
 		super(Material.glass);
 	}
 	
 	public static Block registerBlock() {
-		if(instance == null) {
-			instance = new Block_ItemProxyEndpoint();
-		}
-		
 		final String blockName = "kekztech_itemproxyendpoint_block";
 		instance.setBlockName(blockName);
 		instance.setCreativeTab(CreativeTabs.tabMisc);
@@ -47,7 +43,7 @@ public class Block_ItemProxyEndpoint extends Block {
 		}
 		
 		final TileEntity te = world.getTileEntity(x, y, z);
-		if(te != null && te instanceof TE_ItemProxyEndpoint) {
+		if(te instanceof TE_ItemProxyEndpoint) {
 			final TE_ItemProxyEndpoint endpoint = (TE_ItemProxyEndpoint) te;
 			if(player.inventory.getCurrentItem() != null && player.inventory.getCurrentItem().getItem() instanceof Item_Configurator) {
 				
diff --git a/src/main/java/common/blocks/Block_ItemProxySource.java b/src/main/java/common/blocks/Block_ItemProxySource.java
index d09368a1a2..4c3f65e67a 100644
--- a/src/main/java/common/blocks/Block_ItemProxySource.java
+++ b/src/main/java/common/blocks/Block_ItemProxySource.java
@@ -17,17 +17,13 @@ import net.minecraft.world.World;
 
 public class Block_ItemProxySource extends Block {
 	
-	private static Block_ItemProxySource instance;
+	private static Block_ItemProxySource instance = new Block_ItemProxySource();
 	
 	private Block_ItemProxySource() {
 		super(Material.glass);
 	}
 	
 	public static Block registerBlock() {
-		if(instance == null) {
-			instance = new Block_ItemProxySource();
-		}
-		
 		final String blockName = "kekztech_itemproxysource_block";
 		instance.setBlockName(blockName);
 		instance.setCreativeTab(CreativeTabs.tabMisc);
@@ -46,7 +42,7 @@ public class Block_ItemProxySource extends Block {
 		}
 		
 		final TileEntity te = world.getTileEntity(x, y, z);
-		if(te != null && te instanceof TE_ItemProxySource) {
+		if(te instanceof TE_ItemProxySource) {
 			final TE_ItemProxySource source = (TE_ItemProxySource) te;
 			if(player.inventory.getCurrentItem() != null && player.inventory.getCurrentItem().getItem() instanceof Item_Configurator) {
 				
diff --git a/src/main/java/common/blocks/Block_ItemServerDrive.java b/src/main/java/common/blocks/Block_ItemServerDrive.java
index e6268e5402..63747a8598 100644
--- a/src/main/java/common/blocks/Block_ItemServerDrive.java
+++ b/src/main/java/common/blocks/Block_ItemServerDrive.java
@@ -11,7 +11,7 @@ import net.minecraft.util.IIcon;
 
 public class Block_ItemServerDrive extends BaseGTUpdateableBlock{
 
-	private static Block_ItemServerDrive instance;
+	private static Block_ItemServerDrive instance = new Block_ItemServerDrive();
 	
 	private IIcon[] faces = new IIcon[6];
 	
@@ -20,10 +20,6 @@ public class Block_ItemServerDrive extends BaseGTUpdateableBlock{
 	}
 	
 	public static Block registerBlock() {
-		if(instance == null) {
-			instance = new Block_ItemServerDrive();
-		}
-		
 		final String blockName = "kekztech_itemserverdrive_block";
 		instance.setBlockName(blockName);
 		instance.setCreativeTab(CreativeTabs.tabMisc);
diff --git a/src/main/java/common/blocks/Block_ItemServerIOPort.java b/src/main/java/common/blocks/Block_ItemServerIOPort.java
index cae471dec4..6af90b6e42 100644
--- a/src/main/java/common/blocks/Block_ItemServerIOPort.java
+++ b/src/main/java/common/blocks/Block_ItemServerIOPort.java
@@ -12,17 +12,13 @@ import net.minecraft.world.World;
 
 public class Block_ItemServerIOPort extends BaseGTUpdateableBlock {
 
-	private static Block_ItemServerIOPort instance;
+	private static Block_ItemServerIOPort instance = new Block_ItemServerIOPort();
 		
 	private Block_ItemServerIOPort() {
 		super(Material.iron);
 	}
 	
 	public static Block registerBlock() {
-		if(instance == null) {
-			instance = new Block_ItemServerIOPort();
-		}
-		
 		final String blockName = "kekztech_itemserverioport_block";
 		instance.setBlockName(blockName);
 		instance.setCreativeTab(CreativeTabs.tabMisc);
diff --git a/src/main/java/common/blocks/Block_ItemServerRackCasing.java b/src/main/java/common/blocks/Block_ItemServerRackCasing.java
index 37cca58615..db0ec9c3e6 100644
--- a/src/main/java/common/blocks/Block_ItemServerRackCasing.java
+++ b/src/main/java/common/blocks/Block_ItemServerRackCasing.java
@@ -9,17 +9,13 @@ import net.minecraft.creativetab.CreativeTabs;
 
 public class Block_ItemServerRackCasing extends BaseGTUpdateableBlock {
 
-	private static Block_ItemServerRackCasing instance;
+	private static Block_ItemServerRackCasing instance = new Block_ItemServerRackCasing();
 		
 	private Block_ItemServerRackCasing() {
 		super(Material.iron);
 	}
 	
 	public static Block registerBlock() {
-		if(instance == null) {
-			instance = new Block_ItemServerRackCasing();
-		}
-		
 		final String blockName = "kekztech_itemserverrackcasing_block";
 		instance.setBlockName(blockName);
 		instance.setCreativeTab(CreativeTabs.tabMisc);
diff --git a/src/main/java/common/blocks/Block_ReactorChamber_OFF.java b/src/main/java/common/blocks/Block_ReactorChamber_OFF.java
index 21f3c698e0..e6a5b3c3b3 100644
--- a/src/main/java/common/blocks/Block_ReactorChamber_OFF.java
+++ b/src/main/java/common/blocks/Block_ReactorChamber_OFF.java
@@ -8,17 +8,13 @@ import net.minecraft.creativetab.CreativeTabs;
 
 public class Block_ReactorChamber_OFF extends BaseGTUpdateableBlock {
 	
-	private static Block_ReactorChamber_OFF instance;
+	private static Block_ReactorChamber_OFF instance = new Block_ReactorChamber_OFF();
 	
 	private Block_ReactorChamber_OFF() {
 		super(Material.iron);
 	}
 	
 	public static Block registerBlock() {
-		if(instance == null) {
-			instance = new Block_ReactorChamber_OFF();
-		}
-		
 		final String blockName = "kekztech_reactorchamberoff_block";
 		instance.setBlockName(blockName);
 		instance.setCreativeTab(CreativeTabs.tabMisc);
diff --git a/src/main/java/common/blocks/Block_ReactorChamber_ON.java b/src/main/java/common/blocks/Block_ReactorChamber_ON.java
index 4eb7fdadae..0c7e230a11 100644
--- a/src/main/java/common/blocks/Block_ReactorChamber_ON.java
+++ b/src/main/java/common/blocks/Block_ReactorChamber_ON.java
@@ -8,17 +8,13 @@ import net.minecraft.creativetab.CreativeTabs;
 
 public class Block_ReactorChamber_ON extends BaseGTUpdateableBlock {
 	
-	private static Block_ReactorChamber_ON instance;
+	private static Block_ReactorChamber_ON instance = new Block_ReactorChamber_ON();
 	
 	private Block_ReactorChamber_ON() {
 		super(Material.iron);
 	}
 	
 	public static Block registerBlock() {
-		if(instance == null) {
-			instance = new Block_ReactorChamber_ON();
-		}
-		
 		final String blockName = "kekztech_reactorchamberon_block";
 		instance.setBlockName(blockName);
 		instance.setCreativeTab(CreativeTabs.tabMisc);
diff --git a/src/main/java/common/blocks/Block_TFFTCasing.java b/src/main/java/common/blocks/Block_TFFTCasing.java
index 96696c2ee9..5815a75862 100644
--- a/src/main/java/common/blocks/Block_TFFTCasing.java
+++ b/src/main/java/common/blocks/Block_TFFTCasing.java
@@ -8,17 +8,13 @@ import net.minecraft.creativetab.CreativeTabs;
 

 public class Block_TFFTCasing extends BaseGTUpdateableBlock {

 	

-	private static Block_TFFTCasing instance;

+	private static Block_TFFTCasing instance = new Block_TFFTCasing();

 	

 	private Block_TFFTCasing() {

 		super(Material.iron);

 	}

 	

 	public static Block registerBlock() {

-		if(instance == null) {

-			instance = new Block_TFFTCasing();

-		}

-		

 		final String blockName = "kekztech_tfftcasingblock_block";

 		instance.setBlockName(blockName);

 		instance.setCreativeTab(CreativeTabs.tabMisc);

diff --git a/src/main/java/common/blocks/Block_TFFTMultiHatch.java b/src/main/java/common/blocks/Block_TFFTMultiHatch.java
index 7759988645..be7b588fa5 100644
--- a/src/main/java/common/blocks/Block_TFFTMultiHatch.java
+++ b/src/main/java/common/blocks/Block_TFFTMultiHatch.java
@@ -16,17 +16,13 @@ import net.minecraft.world.World;
 
 public class Block_TFFTMultiHatch extends BaseGTUpdateableBlock {
 	
-	private static Block_TFFTMultiHatch instance;
+	private static Block_TFFTMultiHatch instance = new Block_TFFTMultiHatch();
 	
 	private Block_TFFTMultiHatch() {
 		super(Material.iron);
 	}
 	
 	public static Block registerBlock() {
-		if(instance == null) {
-			instance = new Block_TFFTMultiHatch();
-		}
-		
 		final String blockName = "kekztech_tfftmultihatch_block";
 		instance.setBlockName(blockName);
 		instance.setCreativeTab(CreativeTabs.tabMisc);
@@ -54,9 +50,9 @@ public class Block_TFFTMultiHatch extends BaseGTUpdateableBlock {
 		if (GT_Utility.isStackInList(player.getHeldItem(), GregTech_API.sScrewdriverList)) {
 			if (GT_ModHandler.damageOrDechargeItem(player.getHeldItem(), 1, 200, player)) {
 				final TileEntity te = world.getTileEntity(x, y, z);
-				if(te != null && te instanceof TE_TFFTMultiHatch) {
+				if(te instanceof TE_TFFTMultiHatch) {
 					((TE_TFFTMultiHatch) te).toggleAutoOutput();
-					GT_Utility.sendSoundToPlayers(world, (String) GregTech_API.sSoundList.get(100), 1.0F, -1.0F, x, y, z);
+					GT_Utility.sendSoundToPlayers(world, GregTech_API.sSoundList.get(100), 1.0F, -1.0F, x, y, z);
 					// Give chat feedback
 					GT_Utility.sendChatToPlayer(player, ((TE_TFFTMultiHatch) te).isOutputting() ? "Auto-output enabled" : "Auto-output disabled");
 					
diff --git a/src/main/java/common/blocks/Block_YSZUnit.java b/src/main/java/common/blocks/Block_YSZUnit.java
index 760ebf3d48..fad48dd1b2 100644
--- a/src/main/java/common/blocks/Block_YSZUnit.java
+++ b/src/main/java/common/blocks/Block_YSZUnit.java
@@ -8,17 +8,13 @@ import net.minecraft.creativetab.CreativeTabs;
 

 public class Block_YSZUnit extends BaseGTUpdateableBlock {

 	

-	private static Block_YSZUnit instance;

+	private static Block_YSZUnit instance = new Block_YSZUnit();

 	

 	private Block_YSZUnit() {

 		super(Material.iron);

 	}

 	

 	public static Block registerBlock() {

-		if(instance == null) {

-			instance = new Block_YSZUnit();

-		}

-		

 		final String blockName = "kekztech_yszceramicelectrolyteunit_block";

 		instance.setBlockName(blockName);

 		instance.setCreativeTab(CreativeTabs.tabMisc);

diff --git a/src/main/java/kekztech/MultiFluidHandler.java b/src/main/java/kekztech/MultiFluidHandler.java
index 407fb32e54..f1a527b2c0 100644
--- a/src/main/java/kekztech/MultiFluidHandler.java
+++ b/src/main/java/kekztech/MultiFluidHandler.java
@@ -200,18 +200,15 @@ public class MultiFluidHandler {
 	 * @return Amount of fluid that was (or would have been, if simulated) pulled.
 	 */
 	public int pullFluid(FluidStack pull, boolean doPull) {
-		if(locked) {
-			return 0;
-		}
-		if(!contains(pull)) {
+		if (locked || !contains(pull)) {
 			return 0;
 		} else {
 			final FluidStack src = fluids.get(fluids.indexOf(pull));
 			final int rec = Math.min(pull.amount, src.amount);
-			if(doPull) {
+			if (doPull) {
 				src.amount -= rec;
 			}
-			if(src.amount == 0) {
+			if (src.amount == 0) {
 				fluids.remove(src);
 			}
 			return rec;
@@ -239,13 +236,13 @@ public class MultiFluidHandler {
 		if(!fluids.get(slot).equals(pull)) {
 			return 0;
 		} else {
-			final FluidStack pulled = fluids.get(slot);
-			final int rec = Math.min(pull.amount, pulled.amount);
+			final FluidStack src = fluids.get(slot);
+			final int rec = Math.min(pull.amount, src.amount);
 			if(doPull) {
-				pulled.amount -= rec;
+				src.amount -= rec;
 			}
-			if(pulled.amount == 0) {
-				fluids.remove(pulled);
+			if(src.amount == 0) {
+				fluids.remove(src);
 			}
 			return rec;
 		}