code cleanup

2 files changed, 199 insertions, 199 deletions

diff --git a/src/main/java/kekztech/Items.java b/src/main/java/kekztech/Items.java
index cb79d01947..66a8f996e3 100644
--- a/src/main/java/kekztech/Items.java
+++ b/src/main/java/kekztech/Items.java
@@ -1,94 +1,94 @@
-package kekztech;

-

-import items.MetaItem_CraftingComponent;

-import items.MetaItem_ReactorComponent;

-import net.minecraft.item.ItemStack;

-import net.minecraftforge.oredict.OreDictionary;

-import util.Util;

-

-import java.util.Arrays;

-

-public enum Items {

-	// Heat Vents

-	T1HeatVent(0,0), T2HeatVent(1,0), T3HeatVent(2,0), T4HeatVent(3,0),

-	T1ComponentHeatVent(4,0), T2ComponentHeatVent(5,0), T3ComponentHeatVent(6,0), T4ComponentHeatVent(7,0), 

-	T1OverclockedHeatVent(8,0), T2OverclockedHeatVent(9,0), T3OverclockedHeatVent(10,0), T4OverclockedHeatVent(11,0), 

-	// Heat Exchanger

-	T1HeatExchanger(12,0), T2HeatExchanger(13,0), T3HeatExchanger(14,0), T4HeatExchanger(15,0),

-	// Fuel Rods

-	UraniumFuelRod(16,0), UraniumDualFuelRod(17,0), UraniumQuadFuelRod(18,0),

-	ThoriumFuelRod(19,0), ThoriumDualFuelRod(20,0), ThoriumQuadFuelRod(21,0),

-	MOXFuelRod(22,0), MOXDualFuelRod(23,0), MOXQuadFuelRod(24,0),

-	NaquadahFuelRod(25,0), NaquadahDualFuelRod(26,0), NaquadahQuadFuelRod(27,0),

-	Th_MOXFuelRod(28,0), Th_MOXDualFuelRod(29,0), Th_MOXQuadFuelRod(30,0),

-	// Depleted Fuel Rods

-	DepletedUraniumFuelRod(31,0), DepletedUraniumDualFuelRod(32,0), DepletedUraniumQuadFuelRod(33,0),

-	DepletedThoriumFuelRod(34,0), DepletedThoriumDualFuelRod(35,0), DepletedThoriumQuadFuelRod(36,0),

-	DepletedMOXFuelRod(37,0), DepletedMOXDualFuelRod(38,0), DepletedMOXQuadFuelRod(39,0),

-	DepletedNaquadahFuelRod(40,0), DepletedNaquadahDualFuelRod(41,0), DepletedNaquadahQuadFuelRod(42,0),

-	Th_DepletedMOXFuelRod(43,0), Th_DepletedMOXDualFuelRod(44,0), Th_DepletedMOXQuadFuelRod(45,0),

-	// Neutron Reflectors

-	T1NeutronReflector(46,0), T2NeutronReflector(47,0),

-	// Coolant Cells

-	HeliumCoolantCell360k(48,0), NaKCoolantCell360k(49,0),

-	

-	// Heat Pipes

-	CopperHeatPipe(0,1), SilverHeatPipe(1,1), BoronArsenideHeatPipe(2,1), DiamondHeatPipe(3,1),

-	BoronArsenideDust(4,1), IsotopicallyPureDiamondDust(5,1), AmineCarbamiteDust(6,1), 

-	BoronArsenideCrystal(7,1), IsotopicallyPureDiamondCrystal(8,1),

-	// Ceramics

-	YSZCeramicDust(9,1), GDCCeramicDust(10,1),

-	YttriaDust(11,1), ZirconiaDust(12,1), CeriaDust(13,1),

-	YSZCeramicPlate(14,1), GDCCeramicPlate(15,1),

-	ItemServerBlade(16,1),

-	// Error Item

-	Error(0,1),

-	// Configurator

-	Configurator(0, 1);

-	

-	static {

-			YttriaDust.setOreDictName("dustYttriumOxide");

-			ZirconiaDust.setOreDictName("dustCubicZirconia");

-	}

-	

-	private final int metaID;

-	private final int identifier;

-	

-	private Items(int metaID, int identifier) {

-		this.metaID = metaID;

-		this.identifier = identifier;

-	}

-	

-	public int getMetaID() {

-		return metaID;

-	}

-	

-	String OreDictName;

-

-	private void registerOreDict(){

-		OreDictionary.registerOre(getOreDictName(),getNonOreDictedItemStack(1));

-	}

-

-	public static void registerOreDictNames(){

-		Arrays.stream(Items.values()).filter(e -> e.getOreDictName() != null).forEach(Items::registerOreDict);

-	}

-

-	public ItemStack getNonOreDictedItemStack(int amount){

-		return 	identifier == 0 ? 	new ItemStack(MetaItem_ReactorComponent.getInstance(),amount,this.getMetaID()) :

-									new ItemStack(MetaItem_CraftingComponent.getInstance(),amount,this.getMetaID());

-	}

-

-	public ItemStack getOreDictedItemStack(int amount){

-		return 	this.getOreDictName() != null ? 		Util.getStackofAmountFromOreDict(this.getOreDictName(),amount) :

-				identifier == 0 ? 	new ItemStack(MetaItem_ReactorComponent.getInstance(),amount,this.getMetaID()) :

-									new ItemStack(MetaItem_CraftingComponent.getInstance(),amount,this.getMetaID());

-	}

-	

-	public String getOreDictName() {

-		return OreDictName;

-	}

-

-	public void setOreDictName(String oreDictName) {

-		OreDictName = oreDictName;

-	}

-}

+package kekztech;
+
+import common.items.MetaItem_CraftingComponent;
+import common.items.MetaItem_ReactorComponent;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.oredict.OreDictionary;
+import util.Util;
+
+import java.util.Arrays;
+
+public enum Items {
+	// Heat Vents
+	T1HeatVent(0,0), T2HeatVent(1,0), T3HeatVent(2,0), T4HeatVent(3,0),
+	T1ComponentHeatVent(4,0), T2ComponentHeatVent(5,0), T3ComponentHeatVent(6,0), T4ComponentHeatVent(7,0), 
+	T1OverclockedHeatVent(8,0), T2OverclockedHeatVent(9,0), T3OverclockedHeatVent(10,0), T4OverclockedHeatVent(11,0), 
+	// Heat Exchanger
+	T1HeatExchanger(12,0), T2HeatExchanger(13,0), T3HeatExchanger(14,0), T4HeatExchanger(15,0),
+	// Fuel Rods
+	UraniumFuelRod(16,0), UraniumDualFuelRod(17,0), UraniumQuadFuelRod(18,0),
+	ThoriumFuelRod(19,0), ThoriumDualFuelRod(20,0), ThoriumQuadFuelRod(21,0),
+	MOXFuelRod(22,0), MOXDualFuelRod(23,0), MOXQuadFuelRod(24,0),
+	NaquadahFuelRod(25,0), NaquadahDualFuelRod(26,0), NaquadahQuadFuelRod(27,0),
+	Th_MOXFuelRod(28,0), Th_MOXDualFuelRod(29,0), Th_MOXQuadFuelRod(30,0),
+	// Depleted Fuel Rods
+	DepletedUraniumFuelRod(31,0), DepletedUraniumDualFuelRod(32,0), DepletedUraniumQuadFuelRod(33,0),
+	DepletedThoriumFuelRod(34,0), DepletedThoriumDualFuelRod(35,0), DepletedThoriumQuadFuelRod(36,0),
+	DepletedMOXFuelRod(37,0), DepletedMOXDualFuelRod(38,0), DepletedMOXQuadFuelRod(39,0),
+	DepletedNaquadahFuelRod(40,0), DepletedNaquadahDualFuelRod(41,0), DepletedNaquadahQuadFuelRod(42,0),
+	Th_DepletedMOXFuelRod(43,0), Th_DepletedMOXDualFuelRod(44,0), Th_DepletedMOXQuadFuelRod(45,0),
+	// Neutron Reflectors
+	T1NeutronReflector(46,0), T2NeutronReflector(47,0),
+	// Coolant Cells
+	HeliumCoolantCell360k(48,0), NaKCoolantCell360k(49,0),
+	
+	// Heat Pipes
+	CopperHeatPipe(0,1), SilverHeatPipe(1,1), BoronArsenideHeatPipe(2,1), DiamondHeatPipe(3,1),
+	BoronArsenideDust(4,1), IsotopicallyPureDiamondDust(5,1), AmineCarbamiteDust(6,1), 
+	BoronArsenideCrystal(7,1), IsotopicallyPureDiamondCrystal(8,1),
+	// Ceramics
+	YSZCeramicDust(9,1), GDCCeramicDust(10,1),
+	YttriaDust(11,1), ZirconiaDust(12,1), CeriaDust(13,1),
+	YSZCeramicPlate(14,1), GDCCeramicPlate(15,1),
+	ItemServerBlade(16,1),
+	// Error Item
+	Error(0,1),
+	// Configurator
+	Configurator(0, 1);
+	
+	static {
+			YttriaDust.setOreDictName("dustYttriumOxide");
+			ZirconiaDust.setOreDictName("dustCubicZirconia");
+	}
+	
+	private final int metaID;
+	private final int identifier;
+	
+	Items(int metaID, int identifier) {
+		this.metaID = metaID;
+		this.identifier = identifier;
+	}
+	
+	public int getMetaID() {
+		return metaID;
+	}
+	
+	String OreDictName;
+
+	private void registerOreDict(){
+		OreDictionary.registerOre(getOreDictName(),getNonOreDictedItemStack(1));
+	}
+
+	public static void registerOreDictNames(){
+		Arrays.stream(Items.values()).filter(e -> e.getOreDictName() != null).forEach(Items::registerOreDict);
+	}
+
+	public ItemStack getNonOreDictedItemStack(int amount){
+		return 	identifier == 0 ? 	new ItemStack(MetaItem_ReactorComponent.getInstance(),amount,this.getMetaID()) :
+									new ItemStack(MetaItem_CraftingComponent.getInstance(),amount,this.getMetaID());
+	}
+
+	public ItemStack getOreDictedItemStack(int amount){
+		return 	this.getOreDictName() != null ? 		Util.getStackofAmountFromOreDict(this.getOreDictName(),amount) :
+				identifier == 0 ? 	new ItemStack(MetaItem_ReactorComponent.getInstance(),amount,this.getMetaID()) :
+									new ItemStack(MetaItem_CraftingComponent.getInstance(),amount,this.getMetaID());
+	}
+	
+	public String getOreDictName() {
+		return OreDictName;
+	}
+
+	public void setOreDictName(String oreDictName) {
+		OreDictName = oreDictName;
+	}
+}
diff --git a/src/main/java/kekztech/KekzCore.java b/src/main/java/kekztech/KekzCore.java
index 7574c1f399..10d9281c49 100644
--- a/src/main/java/kekztech/KekzCore.java
+++ b/src/main/java/kekztech/KekzCore.java
@@ -1,105 +1,105 @@
-package kekztech;

-

-import client.renderer.TESR_SECapacitor;

-import client.renderer.TESR_SETether;

-import common.Blocks;

-import common.Recipes;

-import common.Researches;

-import common.tileentities.*;

-import cpw.mods.fml.client.registry.ClientRegistry;

-import cpw.mods.fml.common.Mod;

-import cpw.mods.fml.common.event.FMLInitializationEvent;

-import cpw.mods.fml.common.event.FMLPostInitializationEvent;

-import cpw.mods.fml.common.event.FMLPreInitializationEvent;

-import cpw.mods.fml.common.network.NetworkRegistry;

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

-import items.ErrorItem;

-import items.MetaItem_CraftingComponent;

-import items.MetaItem_ReactorComponent;

-import org.apache.logging.log4j.LogManager;

-import org.apache.logging.log4j.Logger;

-

-/**

- * My GT-Meta-IDs are: 13101 - 13500

- * 

- * @author kekzdealer

- *

- */

-@Mod(modid = KekzCore.MODID, name = KekzCore.NAME, version = KekzCore.VERSION, 

-		dependencies =

-			  "required-after:IC2;"

-			+ "required-after:gregtech;"

-			+ "required-after:tectech;"

-			+ "required-after:Thaumcraft;"

-			+ "required-after:ThaumicTinkerer;"

-			+ "after:bartworks;"

-			+ "after:dreamcraft"

-		)

-public class KekzCore {

-	

-	public static final String NAME = "KekzTech";

-	public static final String MODID = "kekztech";

-	public static final String VERSION = "0.4.5";

-

-	public static final Logger LOGGER = LogManager.getLogger(NAME);

-

-	@Mod.Instance("kekztech")

-	public static KekzCore instance;

-

-	public static GTMTE_SOFuelCellMK1 sofc1;

-	public static GTMTE_SOFuelCellMK2 sofc2;

-	public static GTMTE_ModularNuclearReactor mdr;

-	public static GTMTE_FluidMultiStorage fms;

-	public static GTMTE_ItemServer is;

-	public static GTMTE_LapotronicSuperCapacitor lsc;

-	public static GTMTE_SpaceElevator se;

-	

-	@Mod.EventHandler

-	public void preInit(FMLPreInitializationEvent event) {

-		// Items

-		ErrorItem.getInstance().registerItem();

-		MetaItem_ReactorComponent.getInstance().registerItem();

-		MetaItem_CraftingComponent.getInstance().registerItem();

-		Items.registerOreDictNames();

-		

-		Blocks.preInit();

-		

-		// Register TileEntities

-		GameRegistry.registerTileEntity(TE_TFFTMultiHatch.class, "kekztech_tfftmultihatch_tile");

-		//GameRegistry.registerTileEntity(TE_ItemServerIOPort.class, "kekztech_itemserverioport_tile");

-		GameRegistry.registerTileEntity(TE_ItemProxyCable.class, "kekztech_itemproxycable_tile");

-		GameRegistry.registerTileEntity(TE_ItemProxySource.class, "kekztech_itemproxysource_tile");

-		GameRegistry.registerTileEntity(TE_ItemProxyEndpoint.class, "kekztech_itemproxyendpoint_tile");

-		GameRegistry.registerTileEntity(TE_ThaumiumReinforcedJar.class, "kekztech_thaumiumreinforcedjar");

-		GameRegistry.registerTileEntity(TE_IchorJar.class, "kekztech_ichorjar");

-		

-		// Register guis

-		NetworkRegistry.INSTANCE.registerGuiHandler(instance, new GuiHandler());

-

-		// Register TESR

-		ClientRegistry.bindTileEntitySpecialRenderer(TE_SpaceElevatorTether.class, new TESR_SETether());

-		ClientRegistry.bindTileEntitySpecialRenderer(TE_SpaceElevatorCapacitor.class, new TESR_SECapacitor());

-

-		Researches.preInit();

-	}

-	

-	@Mod.EventHandler

-	public void init(FMLInitializationEvent event) {

-		// Multiblock controllers

-		sofc1 = new GTMTE_SOFuelCellMK1(13101, "multimachine.fuelcellmk1", "Solid-Oxide Fuel Cell Mk I");

-		sofc2 = new GTMTE_SOFuelCellMK2(13102, "multimachine.fuelcellmk2", "Solid-Oxide Fuel Cell Mk II");

-		mdr = new GTMTE_ModularNuclearReactor(13103, "multimachine.nuclearreactor", "Nuclear Reactor");

-		fms = new GTMTE_FluidMultiStorage(13104, "multimachine.tf_fluidtank", "T.F.F.T");

-		//is = new GTMTE_ItemServer(13105, "multimachine.itemserver", "Item Server");

-        lsc = new GTMTE_LapotronicSuperCapacitor(13106, "multimachine.supercapacitor", "Lapotronic Supercapacitor");

-        se = new GTMTE_SpaceElevator(13107, "multimachine.spaceelevator", "Space Elevator");

-		// Register renderer

-		//RenderingRegistry.registerBlockHandler(ConduitRenderer.getInstance());

-	}

-	

-	@Mod.EventHandler

-	public void postInit(FMLPostInitializationEvent event) {

-		Recipes.postInit();

-		Researches.postInit();

-	}

-}

+package kekztech;
+
+import client.renderer.TESR_SECapacitor;
+import client.renderer.TESR_SETether;
+import common.Blocks;
+import common.Recipes;
+import common.Researches;
+import common.tileentities.*;
+import cpw.mods.fml.client.registry.ClientRegistry;
+import cpw.mods.fml.common.Mod;
+import cpw.mods.fml.common.event.FMLInitializationEvent;
+import cpw.mods.fml.common.event.FMLPostInitializationEvent;
+import cpw.mods.fml.common.event.FMLPreInitializationEvent;
+import cpw.mods.fml.common.network.NetworkRegistry;
+import cpw.mods.fml.common.registry.GameRegistry;
+import common.items.ErrorItem;
+import common.items.MetaItem_CraftingComponent;
+import common.items.MetaItem_ReactorComponent;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+/**
+ * My GT-Meta-IDs are: 13101 - 13500
+ * 
+ * @author kekzdealer
+ *
+ */
+@Mod(modid = KekzCore.MODID, name = KekzCore.NAME, version = KekzCore.VERSION, 
+		dependencies =
+			  "required-after:IC2;"
+			+ "required-after:gregtech;"
+			+ "required-after:tectech;"
+			+ "required-after:Thaumcraft;"
+			+ "required-after:ThaumicTinkerer;"
+			+ "after:bartworks;"
+			+ "after:dreamcraft"
+		)
+public class KekzCore {
+	
+	public static final String NAME = "KekzTech";
+	public static final String MODID = "kekztech";
+	public static final String VERSION = "0.4.5";
+
+	public static final Logger LOGGER = LogManager.getLogger(NAME);
+
+	@Mod.Instance("kekztech")
+	public static KekzCore instance;
+
+	public static GTMTE_SOFuelCellMK1 sofc1;
+	public static GTMTE_SOFuelCellMK2 sofc2;
+	public static GTMTE_ModularNuclearReactor mdr;
+	public static GTMTE_FluidMultiStorage fms;
+	public static GTMTE_ItemServer is;
+	public static GTMTE_LapotronicSuperCapacitor lsc;
+	public static GTMTE_SpaceElevator se;
+	
+	@Mod.EventHandler
+	public void preInit(FMLPreInitializationEvent event) {
+		// Items
+		ErrorItem.getInstance().registerItem();
+		MetaItem_ReactorComponent.getInstance().registerItem();
+		MetaItem_CraftingComponent.getInstance().registerItem();
+		Items.registerOreDictNames();
+		
+		Blocks.preInit();
+		
+		// Register TileEntities
+		GameRegistry.registerTileEntity(TE_TFFTMultiHatch.class, "kekztech_tfftmultihatch_tile");
+		//GameRegistry.registerTileEntity(TE_ItemServerIOPort.class, "kekztech_itemserverioport_tile");
+		GameRegistry.registerTileEntity(TE_ItemProxyCable.class, "kekztech_itemproxycable_tile");
+		GameRegistry.registerTileEntity(TE_ItemProxySource.class, "kekztech_itemproxysource_tile");
+		GameRegistry.registerTileEntity(TE_ItemProxyEndpoint.class, "kekztech_itemproxyendpoint_tile");
+		GameRegistry.registerTileEntity(TE_ThaumiumReinforcedJar.class, "kekztech_thaumiumreinforcedjar");
+		GameRegistry.registerTileEntity(TE_IchorJar.class, "kekztech_ichorjar");
+		
+		// Register guis
+		NetworkRegistry.INSTANCE.registerGuiHandler(instance, new GuiHandler());
+
+		// Register TESR
+		ClientRegistry.bindTileEntitySpecialRenderer(TE_SpaceElevatorTether.class, new TESR_SETether());
+		ClientRegistry.bindTileEntitySpecialRenderer(TE_SpaceElevatorCapacitor.class, new TESR_SECapacitor());
+
+		Researches.preInit();
+	}
+	
+	@Mod.EventHandler
+	public void init(FMLInitializationEvent event) {
+		// Multiblock controllers
+		sofc1 = new GTMTE_SOFuelCellMK1(13101, "multimachine.fuelcellmk1", "Solid-Oxide Fuel Cell Mk I");
+		sofc2 = new GTMTE_SOFuelCellMK2(13102, "multimachine.fuelcellmk2", "Solid-Oxide Fuel Cell Mk II");
+		mdr = new GTMTE_ModularNuclearReactor(13103, "multimachine.nuclearreactor", "Nuclear Reactor");
+		fms = new GTMTE_FluidMultiStorage(13104, "multimachine.tf_fluidtank", "T.F.F.T");
+		//is = new GTMTE_ItemServer(13105, "multimachine.itemserver", "Item Server");
+        lsc = new GTMTE_LapotronicSuperCapacitor(13106, "multimachine.supercapacitor", "Lapotronic Supercapacitor");
+        se = new GTMTE_SpaceElevator(13107, "multimachine.spaceelevator", "Space Elevator");
+		// Register renderer
+		//RenderingRegistry.registerBlockHandler(ConduitRenderer.getInstance());
+	}
+	
+	@Mod.EventHandler
+	public void postInit(FMLPostInitializationEvent event) {
+		Recipes.postInit();
+		Researches.postInit();
+	}
+}