improved T.F.F.T code; Prepared for MultiHatch

31 files changed, 3431 insertions, 3171 deletions

diff --git a/src/main/java/blocks/Block_GDCUnit.java b/src/main/java/blocks/Block_GDCUnit.java
index d11681b1d6..ed778b5e8d 100644
--- a/src/main/java/blocks/Block_GDCUnit.java
+++ b/src/main/java/blocks/Block_GDCUnit.java
@@ -1,29 +1,31 @@
-package blocks;
-
-import cpw.mods.fml.common.registry.GameRegistry;
-import kekztech.KekzCore;
-import net.minecraft.block.Block;
-import net.minecraft.block.material.Material;
-import net.minecraft.creativetab.CreativeTabs;
-
-public class Block_GDCUnit extends Block {
-	
-	private static Block_GDCUnit instance = new Block_GDCUnit();
-	
-	private Block_GDCUnit() {
-		// I am a singleton
-		super(Material.iron);
-	}
-	
-	public static Block_GDCUnit getInstance() {
-		return instance;
-	}
-	
-	public void registerBlock() {
-		final String blockName = "kekztech_gdcceramicelectrolyteunit_block";
-		super.setBlockName(blockName);
-		super.setCreativeTab(CreativeTabs.tabMisc);
-		super.setBlockTextureName(KekzCore.MODID + ":" + "GDCCeramicElectrolyteUnit");
-		GameRegistry.registerBlock(getInstance(), blockName);
-	}
-}
+package blocks;

+

+import cpw.mods.fml.common.registry.GameRegistry;

+import kekztech.KekzCore;

+import net.minecraft.block.Block;

+import net.minecraft.block.material.Material;

+import net.minecraft.creativetab.CreativeTabs;

+

+public class Block_GDCUnit extends Block {

+	

+	private static Block_GDCUnit instance = new Block_GDCUnit();

+	

+	private Block_GDCUnit() {

+		// I am a singleton

+		super(Material.iron);

+	}

+	

+	public static Block_GDCUnit getInstance() {

+		return instance;

+	}

+	

+	public void registerBlock() {

+		final String blockName = "kekztech_gdcceramicelectrolyteunit_block";

+		super.setBlockName(blockName);

+		super.setCreativeTab(CreativeTabs.tabMisc);

+		super.setBlockTextureName(KekzCore.MODID + ":" + "GDCCeramicElectrolyteUnit");

+		super.setHardness(5.0f);

+		super.setResistance(6.0f);

+		GameRegistry.registerBlock(getInstance(), blockName);

+	}

+}

diff --git a/src/main/java/blocks/Block_TFFTCasing.java b/src/main/java/blocks/Block_TFFTCasing.java
index eb47860418..f2011a8bae 100644
--- a/src/main/java/blocks/Block_TFFTCasing.java
+++ b/src/main/java/blocks/Block_TFFTCasing.java
@@ -1,29 +1,31 @@
-package blocks;
-
-import cpw.mods.fml.common.registry.GameRegistry;
-import kekztech.KekzCore;
-import net.minecraft.block.Block;
-import net.minecraft.block.material.Material;
-import net.minecraft.creativetab.CreativeTabs;
-
-public class Block_TFFTCasing extends Block {
-	
-	private static Block_TFFTCasing instance = new Block_TFFTCasing();
-	
-	private Block_TFFTCasing() {
-		// I am a singleton
-		super(Material.iron);
-	}
-	
-	public static Block_TFFTCasing getInstance() {
-		return instance;
-	}
-	
-	public void registerBlock() {
-		final String blockName = "kekztech_tfftcasing_block";
-		super.setBlockName(blockName);
-		super.setCreativeTab(CreativeTabs.tabMisc);
-		super.setBlockTextureName(KekzCore.MODID + ":" + "TFFTCasing");
-		GameRegistry.registerBlock(getInstance(), blockName);
-	} 
-}
+package blocks;

+

+import cpw.mods.fml.common.registry.GameRegistry;

+import kekztech.KekzCore;

+import net.minecraft.block.Block;

+import net.minecraft.block.material.Material;

+import net.minecraft.creativetab.CreativeTabs;

+

+public class Block_TFFTCasing extends Block {

+	

+	private static Block_TFFTCasing instance = new Block_TFFTCasing();

+	

+	private Block_TFFTCasing() {

+		// I am a singleton

+		super(Material.iron);

+	}

+	

+	public static Block_TFFTCasing getInstance() {

+		return instance;

+	}

+	

+	public void registerBlock() {

+		final String blockName = "kekztech_tfftcasing_block";

+		super.setBlockName(blockName);

+		super.setCreativeTab(CreativeTabs.tabMisc);

+		super.setBlockTextureName(KekzCore.MODID + ":" + "TFFTCasing");

+		super.setHardness(5.0f);

+		super.setResistance(6.0f);

+		GameRegistry.registerBlock(getInstance(), blockName);

+	} 

+}

diff --git a/src/main/java/blocks/Block_TFFTStorageFieldBlockT1.java b/src/main/java/blocks/Block_TFFTStorageFieldBlockT1.java
index 9a94f06121..28d23eec73 100644
--- a/src/main/java/blocks/Block_TFFTStorageFieldBlockT1.java
+++ b/src/main/java/blocks/Block_TFFTStorageFieldBlockT1.java
@@ -1,31 +1,33 @@
-package blocks;
-
-import cpw.mods.fml.common.registry.GameRegistry;
-import kekztech.KekzCore;
-import net.minecraft.block.Block;
-import net.minecraft.block.material.Material;
-import net.minecraft.creativetab.CreativeTabs;
-
-public class Block_TFFTStorageFieldBlockT1 extends Block {
-	
-	private static Block_TFFTStorageFieldBlockT1 instance = new Block_TFFTStorageFieldBlockT1();
-	
-	private Block_TFFTStorageFieldBlockT1() {
-		// I am a singleton
-		super(Material.iron);
-	}
-	
-	public static Block_TFFTStorageFieldBlockT1 getInstance() {
-		return instance;
-	}
-	
-	public void registerBlock() {
-		final String blockName = "kekztech_tfftstoragefieldblock1_block";
-		super.setBlockName(blockName);
-		super.setCreativeTab(CreativeTabs.tabMisc);
-		super.setBlockTextureName(KekzCore.MODID + ":" + "TFFTStorageFieldBlock1");
-		GameRegistry.registerBlock(getInstance(), blockName);
-	}
-	
-	
-}
+package blocks;

+

+import cpw.mods.fml.common.registry.GameRegistry;

+import kekztech.KekzCore;

+import net.minecraft.block.Block;

+import net.minecraft.block.material.Material;

+import net.minecraft.creativetab.CreativeTabs;

+

+public class Block_TFFTStorageFieldBlockT1 extends Block {

+	

+	private static Block_TFFTStorageFieldBlockT1 instance = new Block_TFFTStorageFieldBlockT1();

+	

+	private Block_TFFTStorageFieldBlockT1() {

+		// I am a singleton

+		super(Material.iron);

+	}

+	

+	public static Block_TFFTStorageFieldBlockT1 getInstance() {

+		return instance;

+	}

+	

+	public void registerBlock() {

+		final String blockName = "kekztech_tfftstoragefieldblock1_block";

+		super.setBlockName(blockName);

+		super.setCreativeTab(CreativeTabs.tabMisc);

+		super.setBlockTextureName(KekzCore.MODID + ":" + "TFFTStorageFieldBlock1");

+		super.setHardness(5.0f);

+		super.setResistance(6.0f);

+		GameRegistry.registerBlock(getInstance(), blockName);

+	}

+	

+	

+}

diff --git a/src/main/java/blocks/Block_TFFTStorageFieldBlockT2.java b/src/main/java/blocks/Block_TFFTStorageFieldBlockT2.java
index 965e06dc54..51ddd93a7b 100644
--- a/src/main/java/blocks/Block_TFFTStorageFieldBlockT2.java
+++ b/src/main/java/blocks/Block_TFFTStorageFieldBlockT2.java
@@ -1,29 +1,31 @@
-package blocks;
-
-import cpw.mods.fml.common.registry.GameRegistry;
-import kekztech.KekzCore;
-import net.minecraft.block.Block;
-import net.minecraft.block.material.Material;
-import net.minecraft.creativetab.CreativeTabs;
-
-public class Block_TFFTStorageFieldBlockT2 extends Block {
-	
-	private static Block_TFFTStorageFieldBlockT2 instance = new Block_TFFTStorageFieldBlockT2();
-	
-	private Block_TFFTStorageFieldBlockT2() {
-		// I am a singleton
-		super(Material.iron);
-	}
-	
-	public static Block_TFFTStorageFieldBlockT2 getInstance() {
-		return instance;
-	}
-	
-	public void registerBlock() {
-		final String blockName = "kekztech_tfftstoragefieldblock2_block";
-		super.setBlockName(blockName);
-		super.setCreativeTab(CreativeTabs.tabMisc);
-		super.setBlockTextureName(KekzCore.MODID + ":" + "TFFTStorageFieldBlock2");
-		GameRegistry.registerBlock(getInstance(), blockName);
-	} 
-}
+package blocks;

+

+import cpw.mods.fml.common.registry.GameRegistry;

+import kekztech.KekzCore;

+import net.minecraft.block.Block;

+import net.minecraft.block.material.Material;

+import net.minecraft.creativetab.CreativeTabs;

+

+public class Block_TFFTStorageFieldBlockT2 extends Block {

+	

+	private static Block_TFFTStorageFieldBlockT2 instance = new Block_TFFTStorageFieldBlockT2();

+	

+	private Block_TFFTStorageFieldBlockT2() {

+		// I am a singleton

+		super(Material.iron);

+	}

+	

+	public static Block_TFFTStorageFieldBlockT2 getInstance() {

+		return instance;

+	}

+	

+	public void registerBlock() {

+		final String blockName = "kekztech_tfftstoragefieldblock2_block";

+		super.setBlockName(blockName);

+		super.setCreativeTab(CreativeTabs.tabMisc);

+		super.setBlockTextureName(KekzCore.MODID + ":" + "TFFTStorageFieldBlock2");

+		super.setHardness(5.0f);

+		super.setResistance(6.0f);

+		GameRegistry.registerBlock(getInstance(), blockName);

+	} 

+}

diff --git a/src/main/java/blocks/Block_TFFTStorageFieldBlockT3.java b/src/main/java/blocks/Block_TFFTStorageFieldBlockT3.java
index 79647c99b7..174812bc48 100644
--- a/src/main/java/blocks/Block_TFFTStorageFieldBlockT3.java
+++ b/src/main/java/blocks/Block_TFFTStorageFieldBlockT3.java
@@ -1,29 +1,31 @@
-package blocks;
-
-import cpw.mods.fml.common.registry.GameRegistry;
-import kekztech.KekzCore;
-import net.minecraft.block.Block;
-import net.minecraft.block.material.Material;
-import net.minecraft.creativetab.CreativeTabs;
-
-public class Block_TFFTStorageFieldBlockT3 extends Block {
-	
-	private static Block_TFFTStorageFieldBlockT3 instance = new Block_TFFTStorageFieldBlockT3();
-	
-	private Block_TFFTStorageFieldBlockT3() {
-		// I am a singleton
-		super(Material.iron);
-	}
-	
-	public static Block_TFFTStorageFieldBlockT3 getInstance() {
-		return instance;
-	}
-	
-	public void registerBlock() {
-		final String blockName = "kekztech_tfftstoragefieldblock3_block";
-		super.setBlockName(blockName);
-		super.setCreativeTab(CreativeTabs.tabMisc);
-		super.setBlockTextureName(KekzCore.MODID + ":" + "TFFTStorageFieldBlock3");
-		GameRegistry.registerBlock(getInstance(), blockName);
-	} 
-}
+package blocks;

+

+import cpw.mods.fml.common.registry.GameRegistry;

+import kekztech.KekzCore;

+import net.minecraft.block.Block;

+import net.minecraft.block.material.Material;

+import net.minecraft.creativetab.CreativeTabs;

+

+public class Block_TFFTStorageFieldBlockT3 extends Block {

+	

+	private static Block_TFFTStorageFieldBlockT3 instance = new Block_TFFTStorageFieldBlockT3();

+	

+	private Block_TFFTStorageFieldBlockT3() {

+		// I am a singleton

+		super(Material.iron);

+	}

+	

+	public static Block_TFFTStorageFieldBlockT3 getInstance() {

+		return instance;

+	}

+	

+	public void registerBlock() {

+		final String blockName = "kekztech_tfftstoragefieldblock3_block";

+		super.setBlockName(blockName);

+		super.setCreativeTab(CreativeTabs.tabMisc);

+		super.setBlockTextureName(KekzCore.MODID + ":" + "TFFTStorageFieldBlock3");

+		super.setHardness(5.0f);

+		super.setResistance(6.0f);

+		GameRegistry.registerBlock(getInstance(), blockName);

+	} 

+}

diff --git a/src/main/java/blocks/Block_TFFTStorageFieldBlockT4.java b/src/main/java/blocks/Block_TFFTStorageFieldBlockT4.java
index 5dd20cabcf..0ea69237e6 100644
--- a/src/main/java/blocks/Block_TFFTStorageFieldBlockT4.java
+++ b/src/main/java/blocks/Block_TFFTStorageFieldBlockT4.java
@@ -1,29 +1,31 @@
-package blocks;
-
-import cpw.mods.fml.common.registry.GameRegistry;
-import kekztech.KekzCore;
-import net.minecraft.block.Block;
-import net.minecraft.block.material.Material;
-import net.minecraft.creativetab.CreativeTabs;
-
-public class Block_TFFTStorageFieldBlockT4 extends Block {
-	
-	private static Block_TFFTStorageFieldBlockT4 instance = new Block_TFFTStorageFieldBlockT4();
-	
-	private Block_TFFTStorageFieldBlockT4() {
-		// I am a singleton
-		super(Material.iron);
-	}
-	
-	public static Block_TFFTStorageFieldBlockT4 getInstance() {
-		return instance;
-	}
-	
-	public void registerBlock() {
-		final String blockName = "kekztech_tfftstoragefieldblock4_block";
-		super.setBlockName(blockName);
-		super.setCreativeTab(CreativeTabs.tabMisc);
-		super.setBlockTextureName(KekzCore.MODID + ":" + "TFFTStorageFieldBlock4");
-		GameRegistry.registerBlock(getInstance(), blockName);
-	} 
-}
+package blocks;

+

+import cpw.mods.fml.common.registry.GameRegistry;

+import kekztech.KekzCore;

+import net.minecraft.block.Block;

+import net.minecraft.block.material.Material;

+import net.minecraft.creativetab.CreativeTabs;

+

+public class Block_TFFTStorageFieldBlockT4 extends Block {

+	

+	private static Block_TFFTStorageFieldBlockT4 instance = new Block_TFFTStorageFieldBlockT4();

+	

+	private Block_TFFTStorageFieldBlockT4() {

+		// I am a singleton

+		super(Material.iron);

+	}

+	

+	public static Block_TFFTStorageFieldBlockT4 getInstance() {

+		return instance;

+	}

+	

+	public void registerBlock() {

+		final String blockName = "kekztech_tfftstoragefieldblock4_block";

+		super.setBlockName(blockName);

+		super.setCreativeTab(CreativeTabs.tabMisc);

+		super.setBlockTextureName(KekzCore.MODID + ":" + "TFFTStorageFieldBlock4");

+		super.setHardness(5.0f);

+		super.setResistance(6.0f);

+		GameRegistry.registerBlock(getInstance(), blockName);

+	} 

+}

diff --git a/src/main/java/blocks/Block_YSZUnit.java b/src/main/java/blocks/Block_YSZUnit.java
index 1e4df40c67..a32b28e94d 100644
--- a/src/main/java/blocks/Block_YSZUnit.java
+++ b/src/main/java/blocks/Block_YSZUnit.java
@@ -1,29 +1,31 @@
-package blocks;
-
-import cpw.mods.fml.common.registry.GameRegistry;
-import kekztech.KekzCore;
-import net.minecraft.block.Block;
-import net.minecraft.block.material.Material;
-import net.minecraft.creativetab.CreativeTabs;
-
-public class Block_YSZUnit extends Block {
-	
-	private static Block_YSZUnit instance = new Block_YSZUnit();
-	
-	private Block_YSZUnit() {
-		// I am a singleton
-		super(Material.iron);
-	}
-	
-	public static Block_YSZUnit getInstance() {
-		return instance;
-	}
-	
-	public void registerBlock() {
-		final String blockName = "kekztech_yszceramicelectrolyteunit_block";
-		super.setBlockName(blockName);
-		super.setCreativeTab(CreativeTabs.tabMisc);
-		super.setBlockTextureName(KekzCore.MODID + ":" + "YSZCeramicElectrolyteUnit");
-		GameRegistry.registerBlock(getInstance(), blockName);
-	}
-}
+package blocks;

+

+import cpw.mods.fml.common.registry.GameRegistry;

+import kekztech.KekzCore;

+import net.minecraft.block.Block;

+import net.minecraft.block.material.Material;

+import net.minecraft.creativetab.CreativeTabs;

+

+public class Block_YSZUnit extends Block {

+	

+	private static Block_YSZUnit instance = new Block_YSZUnit();

+	

+	private Block_YSZUnit() {

+		// I am a singleton

+		super(Material.iron);

+	}

+	

+	public static Block_YSZUnit getInstance() {

+		return instance;

+	}

+	

+	public void registerBlock() {

+		final String blockName = "kekztech_yszceramicelectrolyteunit_block";

+		super.setBlockName(blockName);

+		super.setCreativeTab(CreativeTabs.tabMisc);

+		super.setBlockTextureName(KekzCore.MODID + ":" + "YSZCeramicElectrolyteUnit");

+		super.setHardness(5.0f);

+		super.setResistance(6.0f);

+		GameRegistry.registerBlock(getInstance(), blockName);

+	}

+}

diff --git a/src/main/java/container/Container_ModularNuclearReactor.java b/src/main/java/container/Container_ModularNuclearReactor.java
index 41b686c901..a8fdd5f25a 100644
--- a/src/main/java/container/Container_ModularNuclearReactor.java
+++ b/src/main/java/container/Container_ModularNuclearReactor.java
@@ -1,70 +1,70 @@
-package container;
-
-import gregtech.api.gui.GT_Container_MultiMachine;
-import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.inventory.IInventory;
-import net.minecraft.inventory.Slot;
-import reactor.ButtonSlot;
-import tileentities.GTMTE_ModularNuclearReactor;
-
-public class Container_ModularNuclearReactor extends GT_Container_MultiMachine {
-
-	private final GTMTE_ModularNuclearReactor REACTOR_TILE;
-	private final IInventory PLAYER_INVENTORY;
-	
-	private int nextSlotID = 0;
-	private final Slot[] REACTOR_SLOTS = new Slot[54];
-	private final Slot SLOT_CONFIGURATION;
-	private final Slot BUTTON_EU_MODE;
-	private final Slot BUTTON_FLUID_MODE;
-	private final Slot BUTTON_CONDITION;
-	private final Slot BUTTON_CONFIGURE;
-	private final Slot BUTTON_RESET;
-
-	
-	public Container_ModularNuclearReactor(InventoryPlayer inventoryPlayer, IGregTechTileEntity reactorTile) {
-		
-		super(inventoryPlayer, reactorTile);
-		
-		this.REACTOR_TILE = (GTMTE_ModularNuclearReactor) reactorTile;
-		this.PLAYER_INVENTORY = inventoryPlayer;
-		
-		// Add the reactor chamber
-		for(int x = 0; x < 9; x++) {
-			for(int y = 0; y < 6; y++){
-				REACTOR_SLOTS[nextSlotID] = super.addSlotToContainer(new Slot(PLAYER_INVENTORY, getNextSlotID(), (16 + 67 * x), (16 + 67 * y)));
-			}
-		}
-		// Add the configuration slot
-		SLOT_CONFIGURATION = super.addSlotToContainer(new Slot(PLAYER_INVENTORY, getNextSlotID(), 0, 0));
-		
-		// Add buttons (they're also slots)
-		BUTTON_EU_MODE = super.addSlotToContainer(new ButtonSlot(PLAYER_INVENTORY, getNextSlotID(), 0, 0));	
-		BUTTON_FLUID_MODE = super.addSlotToContainer(new ButtonSlot(PLAYER_INVENTORY, getNextSlotID(), 0, 0));
-		BUTTON_CONDITION = super.addSlotToContainer(new ButtonSlot(PLAYER_INVENTORY, getNextSlotID(), 0, 0));
-		BUTTON_CONFIGURE = super.addSlotToContainer(new ButtonSlot(PLAYER_INVENTORY, getNextSlotID(), 0, 0));
-		BUTTON_RESET = super.addSlotToContainer(new ButtonSlot(PLAYER_INVENTORY, getNextSlotID(), 0, 0));
-		
-	}
-	
-	private int getNextSlotID() {
-		nextSlotID++;
-		return nextSlotID - 1;
-	}
-	
-	@Override
-	public boolean canInteractWith(EntityPlayer p_75145_1_) {		
-		return true;
-	}
-	
-	 @Override
-	    public void detectAndSendChanges() {
-	        super.detectAndSendChanges();
-	        if (REACTOR_TILE.getBaseMetaTileEntity().isServerSide() == false) {
-	        	return;
-	        }
-	 }
-
-}
+package container;

+

+import gregtech.api.gui.GT_Container_MultiMachine;

+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;

+import net.minecraft.entity.player.EntityPlayer;

+import net.minecraft.entity.player.InventoryPlayer;

+import net.minecraft.inventory.IInventory;

+import net.minecraft.inventory.Slot;

+import reactor.ButtonSlot;

+import tileentities.GTMTE_ModularNuclearReactor;

+

+public class Container_ModularNuclearReactor extends GT_Container_MultiMachine {

+

+	private final GTMTE_ModularNuclearReactor REACTOR_TILE;

+	private final IInventory PLAYER_INVENTORY;

+	

+	private int nextSlotID = 0;

+	private final Slot[] REACTOR_SLOTS = new Slot[54];

+	private final Slot SLOT_CONFIGURATION;

+	private final Slot BUTTON_EU_MODE;

+	private final Slot BUTTON_FLUID_MODE;

+	private final Slot BUTTON_CONDITION;

+	private final Slot BUTTON_CONFIGURE;

+	private final Slot BUTTON_RESET;

+

+	

+	public Container_ModularNuclearReactor(InventoryPlayer inventoryPlayer, IGregTechTileEntity reactorTile) {

+		

+		super(inventoryPlayer, reactorTile);

+		

+		this.REACTOR_TILE = (GTMTE_ModularNuclearReactor) reactorTile;

+		this.PLAYER_INVENTORY = inventoryPlayer;

+		

+		// Add the reactor chamber

+		for(int x = 0; x < 9; x++) {

+			for(int y = 0; y < 6; y++){

+				REACTOR_SLOTS[nextSlotID] = super.addSlotToContainer(new Slot(PLAYER_INVENTORY, getNextSlotID(), (16 + 67 * x), (16 + 67 * y)));

+			}

+		}

+		// Add the configuration slot

+		SLOT_CONFIGURATION = super.addSlotToContainer(new Slot(PLAYER_INVENTORY, getNextSlotID(), 0, 0));

+		

+		// Add buttons (they're also slots)

+		BUTTON_EU_MODE = super.addSlotToContainer(new ButtonSlot(PLAYER_INVENTORY, getNextSlotID(), 0, 0));	

+		BUTTON_FLUID_MODE = super.addSlotToContainer(new ButtonSlot(PLAYER_INVENTORY, getNextSlotID(), 0, 0));

+		BUTTON_CONDITION = super.addSlotToContainer(new ButtonSlot(PLAYER_INVENTORY, getNextSlotID(), 0, 0));

+		BUTTON_CONFIGURE = super.addSlotToContainer(new ButtonSlot(PLAYER_INVENTORY, getNextSlotID(), 0, 0));

+		BUTTON_RESET = super.addSlotToContainer(new ButtonSlot(PLAYER_INVENTORY, getNextSlotID(), 0, 0));

+		

+	}

+	

+	private int getNextSlotID() {

+		nextSlotID++;

+		return nextSlotID - 1;

+	}

+	

+	@Override

+	public boolean canInteractWith(EntityPlayer p_75145_1_) {		

+		return true;

+	}

+	

+	 @Override

+	    public void detectAndSendChanges() {

+	        super.detectAndSendChanges();

+	        if (REACTOR_TILE.getBaseMetaTileEntity().isServerSide() == false) {

+	        	return;

+	        }

+	 }

+

+}

diff --git a/src/main/java/container/GUIContainer_ModularNuclearReactor.java b/src/main/java/container/GUIContainer_ModularNuclearReactor.java
index 58a9ff6caf..9bea52badc 100644
--- a/src/main/java/container/GUIContainer_ModularNuclearReactor.java
+++ b/src/main/java/container/GUIContainer_ModularNuclearReactor.java
@@ -1,53 +1,53 @@
-package container;
-
-import org.lwjgl.opengl.GL11;
-
-import gregtech.api.gui.GT_GUIContainerMetaTile_Machine;
-import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import kekztech.KekzCore;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.GuiButton;
-import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.util.ResourceLocation;
-
-public class GUIContainer_ModularNuclearReactor extends GT_GUIContainerMetaTile_Machine {
-	
-	private final String resourceName;
-	private final ResourceLocation texture;
-	
-	public GUIContainer_ModularNuclearReactor(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity,
-			String aName, String aTextureFile) {
-		
-		super(new Container_ModularNuclearReactor(aInventoryPlayer, aTileEntity), aTextureFile);
-		
-		this.resourceName = aTextureFile;
-		this.texture = new ResourceLocation(KekzCore.MODID, "textures/gui/" + resourceName);
-	}
-	
-	@SuppressWarnings("unchecked")
-	@Override
-	public void initGui() {
-		super.initGui();
-		
-		// The parameters of GuiButton are (id, x, y, width, height, text)
-		super.buttonList.add(new GuiButton(1, 100, 200, 100, 20, "Hello"));
-	}
-	
-	@Override
-	protected void drawGuiContainerBackgroundLayer(float f, int mouseX, int mouseY) {
-		
-		Minecraft.getMinecraft().renderEngine.bindTexture(texture);
-		GL11.glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
-		
-		final int x = (super.width - super.xSize);
-		final int y = (super.height - super.ySize);
-		
-		super.drawTexturedModalRect(x, y, 0, 0, super.xSize, super.ySize);
-	}
-	
-	@Override
-	protected void drawGuiContainerForegroundLayer(int par1, int par2) {
-		
-	}
-
-}
+package container;

+

+import org.lwjgl.opengl.GL11;

+

+import gregtech.api.gui.GT_GUIContainerMetaTile_Machine;

+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;

+import kekztech.KekzCore;

+import net.minecraft.client.Minecraft;

+import net.minecraft.client.gui.GuiButton;

+import net.minecraft.entity.player.InventoryPlayer;

+import net.minecraft.util.ResourceLocation;

+

+public class GUIContainer_ModularNuclearReactor extends GT_GUIContainerMetaTile_Machine {

+	

+	private final String resourceName;

+	private final ResourceLocation texture;

+	

+	public GUIContainer_ModularNuclearReactor(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity,

+			String aName, String aTextureFile) {

+		

+		super(new Container_ModularNuclearReactor(aInventoryPlayer, aTileEntity), aTextureFile);

+		

+		this.resourceName = aTextureFile;

+		this.texture = new ResourceLocation(KekzCore.MODID, "textures/gui/" + resourceName);

+	}

+	

+	@SuppressWarnings("unchecked")

+	@Override

+	public void initGui() {

+		super.initGui();

+		

+		// The parameters of GuiButton are (id, x, y, width, height, text)

+		super.buttonList.add(new GuiButton(1, 100, 200, 100, 20, "Hello"));

+	}

+	

+	@Override

+	protected void drawGuiContainerBackgroundLayer(float f, int mouseX, int mouseY) {

+		

+		Minecraft.getMinecraft().renderEngine.bindTexture(texture);

+		GL11.glColor4f(1.0f, 1.0f, 1.0f, 1.0f);

+		

+		final int x = (super.width - super.xSize);

+		final int y = (super.height - super.ySize);

+		

+		super.drawTexturedModalRect(x, y, 0, 0, super.xSize, super.ySize);

+	}

+	

+	@Override

+	protected void drawGuiContainerForegroundLayer(int par1, int par2) {

+		

+	}

+

+}

diff --git a/src/main/java/items/ErrorItem.java b/src/main/java/items/ErrorItem.java
index e622197565..0ab41873f1 100644
--- a/src/main/java/items/ErrorItem.java
+++ b/src/main/java/items/ErrorItem.java
@@ -1,43 +1,50 @@
-package items;
-
-import java.util.List;
-
-import cpw.mods.fml.common.registry.GameRegistry;
-import kekztech.KekzCore;
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-
-public class ErrorItem extends Item {
-	
-	private static final ErrorItem instance = new ErrorItem();
-	
-	private ErrorItem() {
-		// I am a singleton
-	}
-	
-	public static ErrorItem getInstance() {
-		return instance;
-	}
-	
-	public void registerItem() {
-		super.setHasSubtypes(false);
-		final String unlocalizedName = "kekztech_error_item";
-		super.setUnlocalizedName(unlocalizedName);
-		super.setCreativeTab(CreativeTabs.tabMisc);
-		super.setMaxStackSize(64);
-		super.setTextureName(KekzCore.MODID + ":" + "Error");
-		GameRegistry.registerItem(getInstance(), unlocalizedName);
-	}
-	
-	@SuppressWarnings({"unchecked", "rawtypes"})
-	@Override
-	public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean b) {
-		list.add("REMINDER: Ke