3 files changed, 293 insertions, 286 deletions
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: KekzTech recipes are only confirmed to work in GTNH!");
-		list.add("Placeholder item in case something went wrong");
-		list.add("If this item shows up in GTNH, you may report it to:");
-		list.add("https://github.com/kekzdealer/KekzTech");
-	}
-	
-}
+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;
+import net.minecraft.world.World;
+
+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: KekzTech recipes are only confirmed to work in GTNH!");
+		list.add("Placeholder item in case something went wrong");
+		list.add("If this item shows up in GTNH, you may report it to:");
+		list.add("https://github.com/kekzdealer/KekzTech");
+	}
+	
+	@Override
+	public ItemStack onItemRightClick(ItemStack item, World world, EntityPlayer player) {
+		player.swingItem();
+		return item;
+	}
+	
+}
diff --git a/src/main/java/items/MetaItem_CraftingComponent.java b/src/main/java/items/MetaItem_CraftingComponent.java
index 29b8e8ac1f..0d6a1897f0 100644
--- a/src/main/java/items/MetaItem_CraftingComponent.java
+++ b/src/main/java/items/MetaItem_CraftingComponent.java
@@ -1,103 +1,103 @@
-package items;
-
-import java.util.List;
-
-import cpw.mods.fml.common.registry.GameRegistry;
-import kekztech.KekzCore;
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.IIcon;
-
-public class MetaItem_CraftingComponent extends Item {
-	
-	private static MetaItem_CraftingComponent instance = new MetaItem_CraftingComponent();
-	private final IIcon[] icons = new IIcon[16];
-	
-	private MetaItem_CraftingComponent() {
-		// I am a singleton
-	}
-	
-	public static MetaItem_CraftingComponent getInstance() {
-		return instance;
-	}
-	
-	public void registerItem() {
-		super.setHasSubtypes(true);
-		final String unlocalizedName = "kekztech_crafting_item";
-		super.setUnlocalizedName(unlocalizedName);
-		super.setCreativeTab(CreativeTabs.tabMisc);
-		super.setMaxStackSize(64);
-		GameRegistry.registerItem(getInstance(), unlocalizedName);
-	}
-	
-	@Override
-	public void registerIcons(IIconRegister reg) {
-		int counter = 0;
-		// Raw heat pipes
-		icons[counter++] = reg.registerIcon(KekzCore.MODID + ":" + "CopperHeatPipe");
-		icons[counter++] = reg.registerIcon(KekzCore.MODID + ":" + "SilverHeatPipe");
-		icons[counter++] = reg.registerIcon(KekzCore.MODID + ":" + "BoronArsenideHeatPipe");
-		icons[counter++] = reg.registerIcon(KekzCore.MODID + ":" + "DiamondHeatPipe");
-		// Dust
-		icons[counter++] = reg.registerIcon(KekzCore.MODID + ":" + "BoronArsenideDust");
-		icons[counter++] = reg.registerIcon(KekzCore.MODID + ":" + "IsotopicallyPureDiamondDust");
-		icons[counter++] = reg.registerIcon(KekzCore.MODID + ":" + "AmineCarbamateDust");
-		// Crystal
-		icons[counter++] = reg.registerIcon(KekzCore.MODID + ":" + "BoronArsenideCrystal");
-		icons[counter++] = reg.registerIcon(KekzCore.MODID + ":" + "IsotopicallyPureDiamondCrystal");
-		// Ceramics
-		icons[counter++] = reg.registerIcon(KekzCore.MODID + ":" + "YSZCeramicDust");
-		icons[counter++] = reg.registerIcon(KekzCore.MODID + ":" + "GDCCeramicDust");
-		icons[counter++] = reg.registerIcon(KekzCore.MODID + ":" + "YttriaDust");
-		icons[counter++] = reg.registerIcon(KekzCore.MODID + ":" + "ZirconiaDust");
-		icons[counter++] = reg.registerIcon(KekzCore.MODID + ":" + "CeriaDust");
-		icons[counter++] = reg.registerIcon(KekzCore.MODID + ":" + "YSZCeramicPlate");
-		icons[counter++] = reg.registerIcon(KekzCore.MODID + ":" + "GDCCeramicPlate");
-	}
-	
-	@Override
-	public IIcon getIconFromDamage(int meta) {
-		return icons[meta];
-	}
-	
-	@SuppressWarnings({"unchecked", "rawtypes"})
-	@Override
-	public void getSubItems(Item item, CreativeTabs tab, List list) {
-		for(int i = 0; i < icons.length; i++) {
-			list.add(new ItemStack(item, 1, i));
-		}
-	}
-	
-	@Override
-	public String getUnlocalizedName(ItemStack stack) {
-		return super.getUnlocalizedName() + "." + stack.getItemDamage();
-	}
-	
-	@SuppressWarnings({"unchecked", "rawtypes"})
-	@Override
-	public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean b) {
-		list.add("Crafting component for KekzTech things");
-	}
-	
-	@Override
-	public double getDurabilityForDisplay(ItemStack stack) {
-		return 0.0d;
-	}
-	
-	@Override
-	public boolean showDurabilityBar(ItemStack stack) {
-		return false;
-	}
-	
-	public ItemStack getStackFromDamage(int meta) {
-		return new ItemStack(getInstance(), 1, meta);
-	}
-	
-	public ItemStack getStackOfAmountFromDamage(int meta, int amount) {
-		return new ItemStack(getInstance(), amount, meta);
-	}
-	
-}
+package items;
+
+import java.util.List;
+
+import cpw.mods.fml.common.registry.GameRegistry;
+import kekztech.KekzCore;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.IIcon;
+
+public class MetaItem_CraftingComponent extends Item {
+	
+	private static MetaItem_CraftingComponent instance = new MetaItem_CraftingComponent();
+	private final IIcon[] icons = new IIcon[16];
+	
+	private MetaItem_CraftingComponent() {
+		// I am a singleton
+	}
+	
+	public static MetaItem_CraftingComponent getInstance() {
+		return instance;
+	}
+	
+	public void registerItem() {
+		super.setHasSubtypes(true);
+		final String unlocalizedName = "kekztech_crafting_item";
+		super.setUnlocalizedName(unlocalizedName);
+		super.setCreativeTab(CreativeTabs.tabMisc);
+		super.setMaxStackSize(64);
+		GameRegistry.registerItem(getInstance(), unlocalizedName);
+	}
+	
+	@Override
+	public void registerIcons(IIconRegister reg) {
+		int counter = 0;
+		// Raw heat pipes
+		icons[counter++] = reg.registerIcon(KekzCore.MODID + ":" + "CopperHeatPipe");
+		icons[counter++] = reg.registerIcon(KekzCore.MODID + ":" + "SilverHeatPipe");
+		icons[counter++] = reg.registerIcon(KekzCore.MODID + ":" + "BoronArsenideHeatPipe");
+		icons[counter++] = reg.registerIcon(KekzCore.MODID + ":" + "DiamondHeatPipe");
+		// Dust
+		icons[counter++] = reg.registerIcon(KekzCore.MODID + ":" + "BoronArsenideDust");
+		icons[counter++] = reg.registerIcon(KekzCore.MODID + ":" + "IsotopicallyPureDiamondDust");
+		icons[counter++] = reg.registerIcon(KekzCore.MODID + ":" + "AmineCarbamateDust");
+		// Crystal
+		icons[counter++] = reg.registerIcon(KekzCore.MODID + ":" + "BoronArsenideCrystal");
+		icons[counter++] = reg.registerIcon(KekzCore.MODID + ":" + "IsotopicallyPureDiamondCrystal");
+		// Ceramics
+		icons[counter++] = reg.registerIcon(KekzCore.MODID + ":" + "YSZCeramicDust");
+		icons[counter++] = reg.registerIcon(KekzCore.MODID + ":" + "GDCCeramicDust");
+		icons[counter++] = reg.registerIcon(KekzCore.MODID + ":" + "YttriaDust");
+		icons[counter++] = reg.registerIcon(KekzCore.MODID + ":" + "ZirconiaDust");
+		icons[counter++] = reg.registerIcon(KekzCore.MODID + ":" + "CeriaDust");
+		icons[counter++] = reg.registerIcon(KekzCore.MODID + ":" + "YSZCeramicPlate");
+		icons[counter++] = reg.registerIcon(KekzCore.MODID + ":" + "GDCCeramicPlate");
+	}
+	
+	@Override
+	public IIcon getIconFromDamage(int meta) {
+		return icons[meta];
+	}
+	
+	@SuppressWarnings({"unchecked", "rawtypes"})
+	@Override
+	public void getSubItems(Item item, CreativeTabs tab, List list) {
+		for(int i = 0; i < icons.length; i++) {
+			list.add(new ItemStack(item, 1, i));
+		}
+	}
+	
+	@Override
+	public String getUnlocalizedName(ItemStack stack) {
+		return super.getUnlocalizedName() + "." + stack.getItemDamage();
+	}
+	
+	@SuppressWarnings({"unchecked", "rawtypes"})
+	@Override
+	public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean b) {
+		list.add("Crafting component for KekzTech things");
+	}
+	
+	@Override
+	public double getDurabilityForDisplay(ItemStack stack) {
+		return 0.0d;
+	}
+	
+	@Override
+	public boolean showDurabilityBar(ItemStack stack) {
+		return false;
+	}
+	
+	public ItemStack getStackFromDamage(int meta) {
+		return new ItemStack(getInstance(), 1, meta);
+	}
+	
+	public ItemStack getStackOfAmountFromDamage(int meta, int amount) {
+		return new ItemStack(getInstance(), amount, meta);
+	}
+	
+}
diff --git a/src/main/java/items/MetaItem_ReactorComponent.java b/src/main/java/items/MetaItem_ReactorComponent.java
index 458de48a00..9a8d668a40 100644
--- a/src/main/java/items/MetaItem_ReactorComponent.java
+++ b/src/main/java/items/MetaItem_ReactorComponent.java
@@ -1,140 +1,140 @@
-package items;
-
-import java.util.List;
-
-import cpw.mods.fml.common.registry.GameRegistry;
-import kekztech.KekzCore;
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.IIcon;
-import reactor.items.CoolantCell;
-import reactor.items.FuelRod;
-import reactor.items.HeatExchanger;
-import reactor.items.HeatVent;
-import reactor.items.NeutronReflector;
-
-public class MetaItem_ReactorComponent extends Item {
-	
-	private static MetaItem_ReactorComponent instance = new MetaItem_ReactorComponent();
-	private final IIcon[] icons = new IIcon[50];
-	
-	private MetaItem_ReactorComponent() {
-		// I am a singleton
-	}
-	
-	public static MetaItem_ReactorComponent getInstance() {
-		return instance;
-	}
-	
-	public void registerItem() {
-		super.setHasSubtypes(true);
-		final String unlocalizedName = "kekztech_reactor_item";
-		super.setUnlocalizedName(unlocalizedName);
-		super.setCreativeTab(CreativeTabs.tabMisc);
-		super.setMaxStackSize(1);
-		GameRegistry.registerItem(getInstance(), unlocalizedName);
-	}
-	
-	@Override
-	public void registerIcons(IIconRegister reg) {
-		int counter = 0;
-		for(String s : HeatVent.RESOURCE_NAMES) {
-			icons[counter++] = reg.registerIcon(KekzCore.MODID + ":" + s);
-		}
-		for(String s : HeatExchanger.RESOURCE_NAME) {
-			icons[counter++] = reg.registerIcon(KekzCore.MODID + ":" + s);
-		}
-		for(String s : FuelRod.RESOURCE_NAME) {
-			icons[counter++] = reg.registerIcon(KekzCore.MODID + ":" + s);
-		}
-		for(String s : FuelRod.RESOURCE_NAME_DEPLETED) {
-			icons[counter++] = reg.registerIcon(KekzCore.MODID + ":" + s);
-		}
-		for(String s : NeutronReflector.RESOURCE_NAME) {
-			icons[counter++] = reg.registerIcon(KekzCore.MODID + ":" + s);
-		}
-		for(String s : CoolantCell.RESOURCE_NAME) {
-			icons[counter++] = reg.registerIcon(KekzCore.MODID + ":" + s);
-		}
-	}
-	
-	@Override
-	public IIcon getIconFromDamage(int meta) {
-		return icons[meta];
-	}
-	
-	@SuppressWarnings({"unchecked", "rawtypes"})
-	@Override
-	public void getSubItems(Item item, CreativeTabs tab, List list) {
-		for(int i = 0; i < icons.length; i++) {
-			list.add(new ItemStack(item, 1, i));
-		}
-	}
-	
-	@Override
-	public String getUnlocalizedName(ItemStack stack) {
-		return super.getUnlocalizedName() + "." + stack.getItemDamage();
-	}
-	
-	@SuppressWarnings({"unchecked", "rawtypes"})
-	@Override
-	public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean b) {
-		list.add("Part for the Modular Nuclear Reactor");
-	}
-	
-	@Override
-	public double getDurabilityForDisplay(ItemStack stack) {
-		NBTTagCompound nbt = (stack.getTagCompound() == null) ? new NBTTagCompound() : stack.getTagCompound();
-		if(nbt.getInteger("HEALTH") != 0 && nbt.getInteger("MAXHEALTH") != 0) {
-			return 1 - (double) (nbt.getInteger("HEALTH") / nbt.getInteger("MAXHEALTH"));
-		} else {
-			return 0.0d;
-		}
-	}
-	
-	@Override
-	public boolean showDurabilityBar(ItemStack stack) {
-		final int meta = stack.getItemDamage();
-		if(meta >= 31 && meta <= 45) {
-			return false;
-		} else {
-			return true;
-		}
-	}
-	
-	public ItemStack getStackFromDamage(int meta) {
-		return new ItemStack(getInstance(), 1, meta);
-	}
-	
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-}
+package items;
+
+import java.util.List;
+
+import cpw.mods.fml.common.registry.GameRegistry;
+import kekztech.KekzCore;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.IIcon;
+import reactor.items.CoolantCell;
+import reactor.items.FuelRod;
+import reactor.items.HeatExchanger;
+import reactor.items.HeatVent;
+import reactor.items.NeutronReflector;
+
+public class MetaItem_ReactorComponent extends Item {
+	
+	private static MetaItem_ReactorComponent instance = new MetaItem_ReactorComponent();
+	private final IIcon[] icons = new IIcon[50];
+	
+	private MetaItem_ReactorComponent() {
+		// I am a singleton
+	}
+	
+	public static MetaItem_ReactorComponent getInstance() {
+		return instance;
+	}
+	
+	public void registerItem() {
+		super.setHasSubtypes(true);
+		final String unlocalizedName = "kekztech_reactor_item";
+		super.setUnlocalizedName(unlocalizedName);
+		super.setCreativeTab(CreativeTabs.tabMisc);
+		super.setMaxStackSize(1);
+		GameRegistry.registerItem(getInstance(), unlocalizedName);
+	}
+	
+	@Override
+	public void registerIcons(IIconRegister reg) {
+		int counter = 0;
+		for(String s : HeatVent.RESOURCE_NAMES) {
+			icons[counter++] = reg.registerIcon(KekzCore.MODID + ":" + s);
+		}
+		for(String s : HeatExchanger.RESOURCE_NAME) {
+			icons[counter++] = reg.registerIcon(KekzCore.MODID + ":" + s);
+		}
+		for(String s : FuelRod.RESOURCE_NAME) {
+			icons[counter++] = reg.registerIcon(KekzCore.MODID + ":" + s);
+		}
+		for(String s : FuelRod.RESOURCE_NAME_DEPLETED) {
+			icons[counter++] = reg.registerIcon(KekzCore.MODID + ":" + s);
+		}
+		for(String s : NeutronReflector.RESOURCE_NAME) {
+			icons[counter++] = reg.registerIcon(KekzCore.MODID + ":" + s);
+		}
+		for(String s : CoolantCell.RESOURCE_NAME) {
+			icons[counter++] = reg.registerIcon(KekzCore.MODID + ":" + s);
+		}
+	}
+	
+	@Override
+	public IIcon getIconFromDamage(int meta) {
+		return icons[meta];
+	}
+	
+	@SuppressWarnings({"unchecked", "rawtypes"})
+	@Override
+	public void getSubItems(Item item, CreativeTabs tab, List list) {
+		for(int i = 0; i < icons.length; i++) {
+			list.add(new ItemStack(item, 1, i));
+		}
+	}
+	
+	@Override
+	public String getUnlocalizedName(ItemStack stack) {
+		return super.getUnlocalizedName() + "." + stack.getItemDamage();
+	}
+	
+	@SuppressWarnings({"unchecked", "rawtypes"})
+	@Override
+	public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean b) {
+		list.add("Part for the Modular Nuclear Reactor");
+	}
+	
+	@Override
+	public double getDurabilityForDisplay(ItemStack stack) {
+		NBTTagCompound nbt = (stack.getTagCompound() == null) ? new NBTTagCompound() : stack.getTagCompound();
+		if(nbt.getInteger("HEALTH") != 0 && nbt.getInteger("MAXHEALTH") != 0) {
+			return 1 - (double) (nbt.getInteger("HEALTH") / nbt.getInteger("MAXHEALTH"));
+		} else {
+			return 0.0d;
+		}
+	}
+	
+	@Override
+	public boolean showDurabilityBar(ItemStack stack) {
+		final int meta = stack.getItemDamage();
+		if(meta >= 31 && meta <= 45) {
+			return false;
+		} else {
+			return true;
+		}
+	}
+	
+	public ItemStack getStackFromDamage(int meta) {
+		return new ItemStack(getInstance(), 1, meta);
+	}
+	
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+}