Bumped mod version up a minor after this last little code cleanup.

11 files changed, 70 insertions, 60 deletions

diff --git a/src/Java/miscutil/core/creative/MiscUtilCreativeTabBlock.java b/src/Java/miscutil/core/creative/MiscUtilCreativeTabBlock.java
index b1b330f93c..b048df7f12 100644
--- a/src/Java/miscutil/core/creative/MiscUtilCreativeTabBlock.java
+++ b/src/Java/miscutil/core/creative/MiscUtilCreativeTabBlock.java
@@ -12,7 +12,7 @@ public class MiscUtilCreativeTabBlock extends CreativeTabs {
 
 	@Override
 	public Item getTabIconItem() {
-		return Item.getItemFromBlock(ModBlocks.blockBloodSteel);
+		return Item.getItemFromBlock(ModBlocks.blockStaballoy);
 	}
 
 }
diff --git a/src/Java/miscutil/core/creative/MiscUtilCreativeTabMachines.java b/src/Java/miscutil/core/creative/MiscUtilCreativeTabMachines.java
index 53d0e92a89..9029e8d3c7 100644
--- a/src/Java/miscutil/core/creative/MiscUtilCreativeTabMachines.java
+++ b/src/Java/miscutil/core/creative/MiscUtilCreativeTabMachines.java
@@ -1,7 +1,7 @@
 package miscutil.core.creative;
 
-import miscutil.core.block.ModBlocks;
 import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.init.Items;
 import net.minecraft.item.Item;
 
 public class MiscUtilCreativeTabMachines extends CreativeTabs {
@@ -12,7 +12,7 @@ public class MiscUtilCreativeTabMachines extends CreativeTabs {
 
 	@Override
 	public Item getTabIconItem() {
-		return Item.getItemFromBlock(ModBlocks.blockGriefSaver);
+		return Items.experience_bottle;
 	}
 
 }
diff --git a/src/Java/miscutil/core/creative/MiscUtilCreativeTabMisc.java b/src/Java/miscutil/core/creative/MiscUtilCreativeTabMisc.java
index 16de793be8..ee8aebe16d 100644
--- a/src/Java/miscutil/core/creative/MiscUtilCreativeTabMisc.java
+++ b/src/Java/miscutil/core/creative/MiscUtilCreativeTabMisc.java
@@ -12,7 +12,7 @@ public class MiscUtilCreativeTabMisc extends CreativeTabs {
 
 	@Override
 	public Item getTabIconItem() {
-		return ModItems.itemIngotBloodSteel;
+		return ModItems.itemPlateVibrantAlloy;
 	}
 
 }
diff --git a/src/Java/miscutil/core/creative/MiscUtilCreativeTabTools.java b/src/Java/miscutil/core/creative/MiscUtilCreativeTabTools.java
index eb0bf320cc..75fba9e0ff 100644
--- a/src/Java/miscutil/core/creative/MiscUtilCreativeTabTools.java
+++ b/src/Java/miscutil/core/creative/MiscUtilCreativeTabTools.java
@@ -12,7 +12,7 @@ public class MiscUtilCreativeTabTools extends CreativeTabs {
 
 	@Override
 	public Item getTabIconItem() {
-		return ModItems.itemStaballoyPickaxe;
+		return ModItems.itemStaballoyAxe;
 	}
 
 }
diff --git a/src/Java/miscutil/core/item/ModItems.java b/src/Java/miscutil/core/item/ModItems.java
index d71c60f1e3..fb8230b682 100644
--- a/src/Java/miscutil/core/item/ModItems.java
+++ b/src/Java/miscutil/core/item/ModItems.java
@@ -121,6 +121,13 @@ public final class ModItems {
 
 	//Machine Related
 	public static Item itemBufferCore0;
+	
+	//Material related
+	public static Item itemStickyRubber;
+	public static Item item_PLEASE_FACTOR_ME_1;
+	public static Item item_PLEASE_FACTOR_ME_2;
+	public static Item item_PLEASE_FACTOR_ME_3;
+	public static Item item_PLEASE_FACTOR_ME_4;
 
 
 	//@SuppressWarnings("unused")
@@ -159,14 +166,14 @@ public final class ModItems {
 		if (LoadedMods.EnderIO || LOAD_ALL_CONTENT){
 			Utils.LOG_INFO("EnderIO Found - Loading Resources.");
 			//Item Init
-			itemPlateSoularium = new Item().setUnlocalizedName("itemPlateSoularium").setCreativeTab(AddToCreativeTab.tabMisc).setTextureName(CORE.MODID + ":itemPlateSoularium");;
-			itemPlateRedstoneAlloy = new Item().setUnlocalizedName("itemPlateRedstoneAlloy").setCreativeTab(AddToCreativeTab.tabMisc).setTextureName(CORE.MODID + ":itemPlateRedstoneAlloy");;
-			itemPlateElectricalSteel = new Item().setUnlocalizedName("itemPlateElectricalSteel").setCreativeTab(AddToCreativeTab.tabMisc).setTextureName(CORE.MODID + ":itemPlateElectricalSteel");;
-			itemPlatePulsatingIron = new Item().setUnlocalizedName("itemPlatePulsatingIron").setCreativeTab(AddToCreativeTab.tabMisc).setTextureName(CORE.MODID + ":itemPlatePulsatingIron");;
-			itemPlateEnergeticAlloy = new Item().setUnlocalizedName("itemPlateEnergeticAlloy").setCreativeTab(AddToCreativeTab.tabMisc).setTextureName(CORE.MODID + ":itemPlateEnergeticAlloy");;
-			itemPlateVibrantAlloy = new Item().setUnlocalizedName("itemPlateVibrantAlloy").setCreativeTab(AddToCreativeTab.tabMisc).setTextureName(CORE.MODID + ":itemPlateVibrantAlloy");;
-			itemPlateConductiveIron = new Item().setUnlocalizedName("itemPlateConductiveIron").setCreativeTab(AddToCreativeTab.tabMisc).setTextureName(CORE.MODID + ":itemPlateConductiveIron");;
-			itemPlateDarkSteel = new Item().setUnlocalizedName("itemPlateDarkSteel").setCreativeTab(AddToCreativeTab.tabMisc).setTextureName(CORE.MODID + ":itemPlateDarkSteel");;
+			itemPlateSoularium = new Item().setUnlocalizedName("itemPlateSoularium").setCreativeTab(AddToCreativeTab.tabMisc).setTextureName(CORE.MODID + ":itemPlateSoularium");
+			itemPlateRedstoneAlloy = new Item().setUnlocalizedName("itemPlateRedstoneAlloy").setCreativeTab(AddToCreativeTab.tabMisc).setTextureName(CORE.MODID + ":itemPlateRedstoneAlloy");
+			itemPlateElectricalSteel = new Item().setUnlocalizedName("itemPlateElectricalSteel").setCreativeTab(AddToCreativeTab.tabMisc).setTextureName(CORE.MODID + ":itemPlateElectricalSteel");
+			itemPlatePulsatingIron = new Item().setUnlocalizedName("itemPlatePulsatingIron").setCreativeTab(AddToCreativeTab.tabMisc).setTextureName(CORE.MODID + ":itemPlatePulsatingIron");
+			itemPlateEnergeticAlloy = new Item().setUnlocalizedName("itemPlateEnergeticAlloy").setCreativeTab(AddToCreativeTab.tabMisc).setTextureName(CORE.MODID + ":itemPlateEnergeticAlloy");
+			itemPlateVibrantAlloy = new Item().setUnlocalizedName("itemPlateVibrantAlloy").setCreativeTab(AddToCreativeTab.tabMisc).setTextureName(CORE.MODID + ":itemPlateVibrantAlloy");
+			itemPlateConductiveIron = new Item().setUnlocalizedName("itemPlateConductiveIron").setCreativeTab(AddToCreativeTab.tabMisc).setTextureName(CORE.MODID + ":itemPlateConductiveIron");
+			itemPlateDarkSteel = new Item().setUnlocalizedName("itemPlateDarkSteel").setCreativeTab(AddToCreativeTab.tabMisc).setTextureName(CORE.MODID + ":itemPlateDarkSteel");
 
 
 			//Registry
@@ -187,9 +194,9 @@ public final class ModItems {
 		if (LoadedMods.Big_Reactors|| LOAD_ALL_CONTENT){
 			Utils.LOG_INFO("BigReactors Found - Loading Resources.");
 			//Item Init
-			itemPlateBlutonium = new Item().setUnlocalizedName("itemPlateBlutonium").setCreativeTab(AddToCreativeTab.tabMisc).setTextureName(CORE.MODID + ":itemPlateBlutonium");;
-			itemPlateCyanite = new Item().setUnlocalizedName("itemPlateCyanite").setCreativeTab(AddToCreativeTab.tabMisc).setTextureName(CORE.MODID + ":itemPlateCyanite");;
-			itemPlateLudicrite = new Item().setUnlocalizedName("itemPlateLudicrite").setCreativeTab(AddToCreativeTab.tabMisc).setTextureName(CORE.MODID + ":itemPlateLudicrite");;
+			itemPlateBlutonium = new Item().setUnlocalizedName("itemPlateBlutonium").setCreativeTab(AddToCreativeTab.tabMisc).setTextureName(CORE.MODID + ":itemPlateBlutonium");
+			itemPlateCyanite = new Item().setUnlocalizedName("itemPlateCyanite").setCreativeTab(AddToCreativeTab.tabMisc).setTextureName(CORE.MODID + ":itemPlateCyanite");
+			itemPlateLudicrite = new Item().setUnlocalizedName("itemPlateLudicrite").setCreativeTab(AddToCreativeTab.tabMisc).setTextureName(CORE.MODID + ":itemPlateLudicrite");
 
 			//Registry
 			GameRegistry.registerItem(itemPlateBlutonium, "itemPlateBlutonium");
@@ -206,7 +213,7 @@ public final class ModItems {
 			Utils.LOG_INFO("Thaumcraft Found - Loading Resources.");
 			//Item Init
 			try {
-				itemPlateVoidMetal = new Item().setUnlocalizedName("itemPlateVoidMetal").setCreativeTab(AddToCreativeTab.tabMisc).setTextureName(CORE.MODID + ":itemPlateVoidMetal");;
+				itemPlateVoidMetal = new Item().setUnlocalizedName("itemPlateVoidMetal").setCreativeTab(AddToCreativeTab.tabMisc).setTextureName(CORE.MODID + ":itemPlateVoidMetal");
 			} catch (NullPointerException e){
 				e.getClass();
 			}
@@ -224,7 +231,7 @@ public final class ModItems {
 			Utils.LOG_INFO("ExtraUtilities Found - Loading Resources.");
 			//Item Init
 			try {
-				itemPlateBedrockium = new Item().setUnlocalizedName("itemPlateBedrockium").setCreativeTab(AddToCreativeTab.tabMisc).setTextureName(CORE.MODID + ":itemPlateBedrockium");;
+				itemPlateBedrockium = new Item().setUnlocalizedName("itemPlateBedrockium").setCreativeTab(AddToCreativeTab.tabMisc).setTextureName(CORE.MODID + ":itemPlateBedrockium");
 			} catch (NullPointerException e){
 				e.getClass();
 			}
@@ -240,7 +247,7 @@ public final class ModItems {
 		if (LoadedMods.PneumaticCraft|| LOAD_ALL_CONTENT){
 			Utils.LOG_INFO("PneumaticCraft Found - Loading Resources.");
 			//Item Init
-			itemPlateCompressedIron = new Item().setUnlocalizedName("itemPlateCompressedIron").setCreativeTab(AddToCreativeTab.tabMisc).setTextureName(CORE.MODID + ":itemPlateCompressedIron");;
+			itemPlateCompressedIron = new Item().setUnlocalizedName("itemPlateCompressedIron").setCreativeTab(AddToCreativeTab.tabMisc).setTextureName(CORE.MODID + ":itemPlateCompressedIron");
 
 			//Registry
 			GameRegistry.registerItem(itemPlateCompressedIron, "itemPlateCompressedIron");
@@ -254,7 +261,7 @@ public final class ModItems {
 		if (LoadedMods.Simply_Jetpacks|| LOAD_ALL_CONTENT){
 			Utils.LOG_INFO("SimplyJetpacks Found - Loading Resources.");
 			//Item Init
-			itemPlateEnrichedSoularium = new RarityUncommon().setUnlocalizedName("itemPlateEnrichedSoularium").setCreativeTab(AddToCreativeTab.tabMisc).setTextureName(CORE.MODID + ":itemPlateSoularium");;
+			itemPlateEnrichedSoularium = new RarityUncommon().setUnlocalizedName("itemPlateEnrichedSoularium").setCreativeTab(AddToCreativeTab.tabMisc).setTextureName(CORE.MODID + ":itemPlateSoularium");
 
 			//Registry
 			GameRegistry.registerItem(itemPlateEnrichedSoularium, "itemPlateEnrichedSoularium");
@@ -269,7 +276,7 @@ public final class ModItems {
 		if (LoadedMods.RFTools|| LOAD_ALL_CONTENT){
 			Utils.LOG_INFO("rfTools Found - Loading Resources.");
 			//Item Init
-			itemPlateDimensionShard = new Item().setUnlocalizedName("itemPlateDimensionShard").setCreativeTab(AddToCreativeTab.tabMisc).setTextureName(CORE.MODID + ":itemPlateDimensionShard");;
+			itemPlateDimensionShard = new Item().setUnlocalizedName("itemPlateDimensionShard").setCreativeTab(AddToCreativeTab.tabMisc).setTextureName(CORE.MODID + ":itemPlateDimensionShard");
 
 			//Registry
 			GameRegistry.registerItem(itemPlateDimensionShard, "itemPlateDimensionShard");
@@ -284,44 +291,49 @@ public final class ModItems {
 		 */
 
 		//Staballoy Equipment
-		Utils.LOG_INFO("Interest in Stablloy Found - Loading Resources.");
-		//Pickaxe
 		itemStaballoyPickaxe = new StaballoyPickaxe("itemStaballoyPickaxe", STABALLOY).setCreativeTab(AddToCreativeTab.tabTools);
 		GameRegistry.registerItem(itemStaballoyPickaxe, itemStaballoyPickaxe.getUnlocalizedName());
-		//Axe
 		itemStaballoyAxe = new StaballoyAxe("itemStaballoyAxe", STABALLOY).setCreativeTab(AddToCreativeTab.tabTools);
 		GameRegistry.registerItem(itemStaballoyAxe, itemStaballoyAxe.getUnlocalizedName());
+		
 		//Staballoy Ingot/Plate
-		itemIngotStaballoy = new Item().setUnlocalizedName("itemIngotStaballoy").setCreativeTab(tabMisc).setTextureName(CORE.MODID + ":itemIngotStaballoy");;
+		itemIngotStaballoy = new Item().setUnlocalizedName("itemIngotStaballoy").setCreativeTab(tabMisc).setTextureName(CORE.MODID + ":itemIngotStaballoy");
 		GameRegistry.registerItem(itemIngotStaballoy, "itemIngotStaballoy");
-		itemPlateStaballoy = new Item().setUnlocalizedName("itemPlateStaballoy").setCreativeTab(tabMisc).setTextureName(CORE.MODID + ":itemPlateStaballoy");;
+		itemPlateStaballoy = new Item().setUnlocalizedName("itemPlateStaballoy").setCreativeTab(tabMisc).setTextureName(CORE.MODID + ":itemPlateStaballoy");
 		GameRegistry.registerItem(itemPlateStaballoy, "itemPlateStaballoy");
-		//GregTech_API.sRecipeAdder.addAlloySmelterRecipe(, aInput2, aOutput1, aDuration, aEUt)
-
-
-		//Blood Steel Ingot
-		itemIngotBloodSteel = new Item().setUnlocalizedName("itemIngotBloodSteel").setCreativeTab(tabMisc).setTextureName(CORE.MODID + ":itemIngotBloodSteel");;
+		
+		//Blood Steel Ingot/Plate
+		itemIngotBloodSteel = new Item().setUnlocalizedName("itemIngotBloodSteel").setCreativeTab(tabMisc).setTextureName(CORE.MODID + ":itemIngotBloodSteel");
 		GameRegistry.registerItem(itemIngotBloodSteel, "itemIngotBloodSteel");
-		//Blood Steel Plate
-		itemPlateBloodSteel = new Item().setUnlocalizedName("itemPlateBloodSteel").setCreativeTab(tabMisc).setTextureName(CORE.MODID + ":itemPlateBloodSteel");;
+		itemPlateBloodSteel = new Item().setUnlocalizedName("itemPlateBloodSteel").setCreativeTab(tabMisc).setTextureName(CORE.MODID + ":itemPlateBloodSteel");
 		GameRegistry.registerItem(itemPlateBloodSteel, "itemPlateBloodSteel");
-
+		
 		//Sandstone Hammer
 		itemSandstoneHammer = new SandstoneHammer("itemSandstoneHammer").setCreativeTab(AddToCreativeTab.tabTools);
-		GameRegistry.registerItem(itemSandstoneHammer, itemSandstoneHammer.getUnlocalizedName());
-		
-		/*itemBufferCore0 = new BufferCore("itemBufferCore", 1).setCreativeTab(AddToCreativeTab.tabMisc);
-		GameRegistry.registerItem(itemBufferCore0, itemBufferCore0.getUnlocalizedName()+((BufferCore) itemBufferCore0).getCoreTier());*/
-		
+		GameRegistry.registerItem(itemSandstoneHammer, itemSandstoneHammer.getUnlocalizedName());		
 		
+		//Buffer Cores!
 		Item itemBufferCore;
 		for(int i=1; i<=10; i++){
 			Utils.LOG_INFO(""+i);
 			itemBufferCore = new BufferCore("itemBufferCore", i).setCreativeTab(AddToCreativeTab.tabMisc);
 			GameRegistry.registerItem(itemBufferCore, itemBufferCore.getUnlocalizedName()+i);
-            System.out.println("Buffer Core registration count is: "+i);
+            System.out.println("Buffer Core registration count is: "+i);        
        }
 		
+		//Dev Items
+		itemStickyRubber = new Item().setUnlocalizedName("itemStickyRubber").setCreativeTab(tabMisc).setTextureName(CORE.MODID + ":itemDefault");
+		GameRegistry.registerItem(itemStickyRubber, "itemStickyRubber");
+		/*
+		item_PLEASE_FACTOR_ME_1 = new Item().setUnlocalizedName("unlocalName1").setCreativeTab(tabMisc).setTextureName(CORE.MODID + ":itemDefault");
+		GameRegistry.registerItem(item_PLEASE_FACTOR_ME_1, "localName1");
+		item_PLEASE_FACTOR_ME_2 = new Item().setUnlocalizedName("unlocalName2").setCreativeTab(tabMisc).setTextureName(CORE.MODID + ":itemDefault");
+		GameRegistry.registerItem(item_PLEASE_FACTOR_ME_2, "localName2");
+		item_PLEASE_FACTOR_ME_3 = new Item().setUnlocalizedName("unlocalName3").setCreativeTab(tabMisc).setTextureName(CORE.MODID + ":itemDefault");
+		GameRegistry.registerItem(item_PLEASE_FACTOR_ME_3, "localName3");
+		item_PLEASE_FACTOR_ME_4 = new Item().setUnlocalizedName("unlocalName4").setCreativeTab(tabMisc).setTextureName(CORE.MODID + ":itemDefault");
+		GameRegistry.registerItem(item_PLEASE_FACTOR_ME_4, "localName4");*/
+		
 		
 		//Try some New Tools from GT
 		//GT_Tool_Item x = null;
diff --git a/src/Java/miscutil/core/util/UtilsItems.java b/src/Java/miscutil/core/util/UtilsItems.java
index 48e1629ee3..bb10fa4f06 100644
--- a/src/Java/miscutil/core/util/UtilsItems.java
+++ b/src/Java/miscutil/core/util/UtilsItems.java
@@ -18,7 +18,7 @@ public class UtilsItems {
 			try{
 				Item em = null;
 
-				Item em1 = UtilsItems.getItem(mod_itemname_meta);
+				Item em1 = getItem(mod_itemname_meta);
 				Utils.LOG_WARNING("Found: "+em1.toString());
 				if (!em1.equals(null)){
 					em = em1;
@@ -44,7 +44,7 @@ public class UtilsItems {
 	public static void getItemForOreDict(String FQRN, String oreDictName, String itemName, int meta){
 		try {
 			Item em = null;			
-			Item em1 = UtilsItems.getItem(FQRN);
+			Item em1 = getItem(FQRN);
 			Utils.LOG_WARNING("Found: "+em1.getUnlocalizedName()+":"+meta);
 			if (em1 != null){
 				em = em1;
diff --git a/src/Java/miscutil/core/util/uptime/Uptime.java b/src/Java/miscutil/core/util/uptime/Uptime.java
index 865337d9f7..d18a542a23 100644
--- a/src/Java/miscutil/core/util/uptime/Uptime.java
+++ b/src/Java/miscutil/core/util/uptime/Uptime.java
@@ -25,7 +25,7 @@ import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.common.FMLLog;
 import cpw.mods.fml.common.gameevent.PlayerEvent;
 
-public class Uptime {
+public class Uptime implements ActionListener {
 	private static MinecraftServer server;
 	//public static CommonProxy proxy;
 	private static Timer updater;
@@ -71,7 +71,7 @@ public class Uptime {
 		this.uptime_file = new File(file_path + "/uptime.txt");
 		if (this.uptime_backup.exists())
 		{
-			UptimeLog.log("INFO","Uptime: Uptime has found a backup of the uptime file, trying to restore it.", new Object[0]);
+			UptimeLog.log("INFO","Uptime has found a backup of the uptime file, trying to restore it.", new Object[0]);
 			try
 			{
 				this.uptime_file.delete();
@@ -81,24 +81,24 @@ public class Uptime {
 
 				uptime_data = new UptimeData(this.uptime_file, false);
 
-				UptimeLog.log("INFO","Uptime: Uptime restored the backup.", new Object[0]);
+				UptimeLog.log("INFO","Uptime restored the backup.", new Object[0]);
 			}
 			catch (IOException ioe)
 			{
-				UptimeLog.log("WARNING","Uptime: Failed to restore backup of uptime file, uptime has been reset and the backup removed.", new Object[] { ioe });
+				UptimeLog.log("WARNING","Failed to restore backup of uptime file, uptime has been reset and the backup removed.", new Object[] { ioe });
 				this.uptime_backup.delete();
 				uptime_data = new UptimeData(this.uptime_file, true);
 			}
 			catch (NumberFormatException npe)
 			{
-				UptimeLog.log("WARNING","Uptime: Backup file is corrupt, uptime has been reset and the backup removed.", new Object[0]);
+				UptimeLog.log("WARNING","Backup file is corrupt, uptime has been reset and the backup removed.", new Object[0]);
 				this.uptime_backup.delete();
 				uptime_data = new UptimeData(this.uptime_file, true);
 			}
 		}
 		else if (this.uptime_file.exists())
 		{
-			UptimeLog.log("INFO","Uptime: Found uptime file, restoring it.", new Object[0]);
+			UptimeLog.log("INFO","Found uptime file, restoring it.", new Object[0]);
 			if (this.uptime_file.length() > 1L)
 			{
 				try
@@ -107,24 +107,24 @@ public class Uptime {
 				}
 				catch (NumberFormatException npe)
 				{
-					UptimeLog.log("WARNING","Uptime: Uptime file is corrupt, uptime has been reset.", new Object[0]);
+					UptimeLog.log("WARNING","Uptime file is corrupt, uptime has been reset.", new Object[0]);
 					uptime_data = new UptimeData(this.uptime_file, true);
 				}
 			}
 			else
 			{
-				UptimeLog.log("WARNING","Uptime: Uptime file is empty, uptime has been reset.", new Object[0]);
+				UptimeLog.log("WARNING","Uptime file is empty, uptime has been reset.", new Object[0]);
 				uptime_data = new UptimeData(this.uptime_file, true);
 			}
 		}
 		else
 		{
-			UptimeLog.log("INFO","Uptime: No uptime or backup found, creating a new one.", new Object[0]);
+			UptimeLog.log("INFO","No uptime or backup found, creating a new one.", new Object[0]);
 
 
 			uptime_data = new UptimeData(this.uptime_file, true);
 		}
-		updater = new Timer(60000, (ActionListener) this);
+		updater = new Timer(60000, this);
 		updater.setRepeats(true);
 		updater.start();
 
@@ -163,7 +163,7 @@ public class Uptime {
 	{
 		updateUptime();
 
-		FMLLog.finer("Uptime: Uptime is currently saving its data.", new Object[0]);
+		FMLLog.finer("Uptime is currently saving its data.", new Object[0]);
 		try
 		{
 			this.uptime_backup.delete();
@@ -181,9 +181,9 @@ public class Uptime {
 		}
 		catch (IOException ioe)
 		{
-			UptimeLog.log("WARNING","Uptime: Failed while perpairing to save uptime file.", new Object[] { ioe });
+			UptimeLog.log("WARNING","Failed while perpairing to save uptime file.", new Object[] { ioe });
 		}
-		FMLLog.finer("Uptime: Uptime has finished saving it's data.", new Object[0]);
+		FMLLog.finer("Uptime has finished saving it's data.", new Object[0]);
 	}
 
 	@SuppressWarnings("static-method")
@@ -251,6 +251,7 @@ public class Uptime {
 		}
 	}
 
+	@Override
 	public void actionPerformed(ActionEvent event)
 	{
 		if (event.getSource() == updater) {
diff --git a/src/Java/miscutil/gregtech/common/blocks/GregtechMetaCasingBlocksAbstract.java b/src/Java/miscutil/gregtech/common/blocks/GregtechMetaCasingBlocksAbstract.java
index 8d028dc064..d4ac2a03c3 100644
--- a/src/Java/miscutil/gregtech/common/blocks/GregtechMetaCasingBlocksAbstract.java
+++ b/src/Java/miscutil/gregtech/common/blocks/GregtechMetaCasingBlocksAbstract.java
@@ -4,20 +4,17 @@ import gregtech.api.GregTech_API;
 import gregtech.api.util.GT_LanguageManager;
 import gregtech.common.blocks.GT_Block_Casings_Abstract;
 
-import java.util.List;
 import java.util.Random;
 
 import miscutil.core.creative.AddToCreativeTab;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EnumCreatureType;
 import net.minecraft.init.Blocks;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemBlock;
-import net.minecraft.item.ItemStack;
 import net.minecraft.util.StatCollector;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
@@ -133,11 +130,11 @@ public abstract class GregtechMetaCasingBlocksAbstract
     public void registerBlockIcons(IIconRegister aIconRegister) {
     }
 
-    @Override
+    /*@Override
 	@SideOnly(Side.CLIENT)
     public void getSubBlocks(Item aItem, CreativeTabs par2CreativeTabs, List aList) {
         for (int i = 0; i < 16; i++) {
             aList.add(new ItemStack(aItem, 1, i));
         }
-    }
+    }*/
 }
diff --git a/src/resources/assets/miscutils/textures/items/itemBufferCore_OLD (2).png b/src/resources/assets/miscutils/textures/items/itemBufferCore_OLD (2).png
deleted file mode 100644
index fe24141968..0000000000
--- a/src/resources/assets/miscutils/textures/items/itemBufferCore_OLD (2).png
+++ /dev/null
diff --git a/src/resources/assets/miscutils/textures/items/itemBufferCore_OLD.png b/src/resources/assets/miscutils/textures/items/itemBufferCore_OLD.png
deleted file mode 100644
index fc6c4163a6..0000000000
--- a/src/resources/assets/miscutils/textures/items/itemBufferCore_OLD.png
+++ /dev/null
diff --git a/src/resources/assets/miscutils/textures/items/itemPlateElectricalSteel2.png b/src/resources/assets/miscutils/textures/items/itemDefault.png
index d8b79ae78a..af251b7711 100644
--- a/src/resources/assets/miscutils/textures/items/itemPlateElectricalSteel2.png
+++ b/src/resources/assets/miscutils/textures/items/itemDefault.png