~More Refactoring

Does it ever end?

7 files changed, 40 insertions, 43 deletions

diff --git a/src/Java/miscutil/core/common/CommonProxy.java b/src/Java/miscutil/core/common/CommonProxy.java
index 0c772aa6bb..7c6b9b2d4f 100644
--- a/src/Java/miscutil/core/common/CommonProxy.java
+++ b/src/Java/miscutil/core/common/CommonProxy.java
@@ -10,9 +10,9 @@ import miscutil.core.item.ModItems;
 import miscutil.core.lib.CORE;
 import miscutil.core.lib.LoadedMods;
 import miscutil.core.tileentities.ModTileEntities;
-import miscutil.core.util.PlayerCache;
 import miscutil.core.util.Utils;
 import miscutil.core.util.debug.DEBUG_INIT;
+import miscutil.core.util.player.PlayerCache;
 import net.minecraftforge.common.MinecraftForge;
 import cpw.mods.fml.common.event.FMLInitializationEvent;
 import cpw.mods.fml.common.event.FMLPostInitializationEvent;
diff --git a/src/Java/miscutil/core/common/compat/COMPAT_CompactWindmills.java b/src/Java/miscutil/core/common/compat/COMPAT_CompactWindmills.java
index 247463e975..0760696e86 100644
--- a/src/Java/miscutil/core/common/compat/COMPAT_CompactWindmills.java
+++ b/src/Java/miscutil/core/common/compat/COMPAT_CompactWindmills.java
@@ -2,8 +2,8 @@ package miscutil.core.common.compat;
 
 import static miscutil.core.handler.COMPAT_HANDLER.AddRecipeQueue;
 import static miscutil.core.handler.COMPAT_HANDLER.RemoveRecipeQueue;
-import miscutil.core.util.UtilsItems;
-import miscutil.core.util.recipe.ShapedRecipeObject;
+import miscutil.core.recipe.ShapedRecipeObject;
+import miscutil.core.util.item.UtilsItems;
 import net.minecraft.item.ItemStack;
 
 
@@ -11,32 +11,32 @@ import net.minecraft.item.ItemStack;
 public class COMPAT_CompactWindmills {
 
 	//Change IC2 Upgrades
-	public static ItemStack kineticWind = UtilsItems.getItemStack("IC2:blockKineticGenerator", 1);
-	public static ItemStack shaftIron = UtilsItems.getItemStack("IC2:itemRecipePart:11", 1);
-	public static ItemStack cableCopper = UtilsItems.getItemStack("gregtech:gt.blockmachines:1367", 1);
-	public static String plateRubber ="ore:plateRubber";
+	public static ItemStack kineticWind = UtilsItems.simpleMetaStack("IC2:blockKineticGenerator", 0, 1);
+	public static ItemStack shaftIron = UtilsItems.simpleMetaStack("IC2:itemRecipePart", 11, 1);
+	public static ItemStack cableCopper = UtilsItems.simpleMetaStack("gregtech:gt.blockmachines", 1367, 1);
+	public static String plateRubber = "ore:plateRubber";
 
 	//Machine Casings
-	public static ItemStack elvCasing = UtilsItems.getItemStack("gregtech:gt.blockcasings", 1);
-	public static ItemStack lvCasing = UtilsItems.getItemStack("gregtech:gt.blockcasings:1", 1);
-	public static ItemStack mvCasing = UtilsItems.getItemStack("gregtech:gt.blockcasings:2", 1);
-	public static ItemStack hvCasing = UtilsItems.getItemStack("gregtech:gt.blockcasings:3", 1);
-	public static ItemStack evCasing = UtilsItems.getItemStack("gregtech:gt.blockcasings:4", 1);
-	public static ItemStack ivCasing = UtilsItems.getItemStack("gregtech:gt.blockcasings:5", 1);
+	public static ItemStack elvCasing = UtilsItems.simpleMetaStack("gregtech:gt.blockcasings", 0, 1);
+	public static ItemStack lvCasing = UtilsItems.simpleMetaStack("gregtech:gt.blockcasings", 1, 1);
+	public static ItemStack mvCasing = UtilsItems.simpleMetaStack("gregtech:gt.blockcasings", 2, 1);
+	public static ItemStack hvCasing = UtilsItems.simpleMetaStack("gregtech:gt.blockcasings", 3, 1);
+	public static ItemStack evCasing = UtilsItems.simpleMetaStack("gregtech:gt.blockcasings", 4, 1);
+	public static ItemStack ivCasing = UtilsItems.simpleMetaStack("gregtech:gt.blockcasings", 5, 1);
 
 	//GT Transformers
-	public static ItemStack elvTransformer = UtilsItems.getItemStack("gregtech:gt.blockmachines:20", 1);
-	public static ItemStack lvTransformer = UtilsItems.getItemStack("gregtech:gt.blockmachines:21", 1);
-	public static ItemStack mvTransformer = UtilsItems.getItemStack("gregtech:gt.blockmachines:22", 1);
-	public static ItemStack hvTransformer = UtilsItems.getItemStack("gregtech:gt.blockmachines:23", 1);
-	public static ItemStack evTransformer = UtilsItems.getItemStack("gregtech:gt.blockmachines:24", 1);
+	public static ItemStack elvTransformer = UtilsItems.simpleMetaStack("gregtech:gt.blockmachines", 20, 1);
+	public static ItemStack lvTransformer = UtilsItems.simpleMetaStack("gregtech:gt.blockmachines", 21, 1);
+	public static ItemStack mvTransformer = UtilsItems.simpleMetaStack("gregtech:gt.blockmachines", 22, 1);
+	public static ItemStack hvTransformer = UtilsItems.simpleMetaStack("gregtech:gt.blockmachines", 23, 1);
+	public static ItemStack evTransformer = UtilsItems.simpleMetaStack("gregtech:gt.blockmachines", 24, 1);
 
 	//Compact Windmills
-	public static ItemStack elvWindmill = UtilsItems.getItemStack("CompactWindmills:blockCompactWindmill", 1);
-	public static ItemStack lvWindmill = UtilsItems.getItemStack("CompactWindmills:blockCompactWindmill:1", 1);
-	public static ItemStack mvWindmill = UtilsItems.getItemStack("CompactWindmills:blockCompactWindmill:2", 1);
-	public static ItemStack hvWindmill = UtilsItems.getItemStack("CompactWindmills:blockCompactWindmill:3", 1);
-	public static ItemStack evWindmill = UtilsItems.getItemStack("CompactWindmills:blockCompactWindmill:4", 1);
+	public static ItemStack elvWindmill = UtilsItems.simpleMetaStack("CompactWindmills:blockCompactWindmill", 0, 1);
+	public static ItemStack lvWindmill = UtilsItems.simpleMetaStack("CompactWindmills:blockCompactWindmill", 1, 1);
+	public static ItemStack mvWindmill = UtilsItems.simpleMetaStack("CompactWindmills:blockCompactWindmill", 2, 1);
+	public static ItemStack hvWindmill = UtilsItems.simpleMetaStack("CompactWindmills:blockCompactWindmill", 3, 1);
+	public static ItemStack evWindmill = UtilsItems.simpleMetaStack("CompactWindmills:blockCompactWindmill", 4, 1);
 
 	//Compact Rotors
 	public static ItemStack rotor2 = UtilsItems.getItemStack("CompactWindmills:WOOL", 1);
@@ -50,10 +50,10 @@ public class COMPAT_CompactWindmills {
 	public static ItemStack rotorIC2 = UtilsItems.getItemStack("IC2:itemironrotor", 1);
 	public static ItemStack rotorIC3 = UtilsItems.getItemStack("IC2:itemsteelrotor", 1);
 	public static ItemStack rotorIC4 = UtilsItems.getItemStack("IC2:itemwcarbonrotor", 1);
-	public static ItemStack rotorBlade1 = UtilsItems.getItemStack("IC2:itemRecipePart:7", 1);
-	public static ItemStack rotorBlade2 = UtilsItems.getItemStack("IC2:itemRecipePart:8", 1);
-	public static ItemStack rotorBlade3 = UtilsItems.getItemStack("IC2:itemRecipePart:10", 1);
-	public static ItemStack rotorBlade4 = UtilsItems.getItemStack("IC2:itemRecipePart:9", 1);
+	public static ItemStack rotorBlade1 = UtilsItems.simpleMetaStack("IC2:itemRecipePart", 7, 1);
+	public static ItemStack rotorBlade2 = UtilsItems.simpleMetaStack("IC2:itemRecipePart", 8, 1);
+	public static ItemStack rotorBlade3 = UtilsItems.simpleMetaStack("IC2:itemRecipePart", 10, 1);
+	public static ItemStack rotorBlade4 = UtilsItems.simpleMetaStack("IC2:itemRecipePart", 9, 1);
 
 	//Plates
 	public static String plateTier1 = "ore:plateMagnalium";
diff --git a/src/Java/miscutil/core/common/compat/COMPAT_EnderIO.java b/src/Java/miscutil/core/common/compat/COMPAT_EnderIO.java
index 1e87907358..8c0f1f72bc 100644
--- a/src/Java/miscutil/core/common/compat/COMPAT_EnderIO.java
+++ b/src/Java/miscutil/core/common/compat/COMPAT_EnderIO.java
@@ -2,7 +2,7 @@ package miscutil.core.common.compat;
 
 import gregtech.api.util.GT_OreDictUnificator;
 import miscutil.core.item.ModItems;
-import miscutil.core.util.UtilsItems;
+import miscutil.core.util.item.UtilsItems;
 import net.minecraft.item.ItemStack;
 
 public class COMPAT_EnderIO {
diff --git a/src/Java/miscutil/core/common/compat/COMPAT_ExtraUtils.java b/src/Java/miscutil/core/common/compat/COMPAT_ExtraUtils.java
index b719085006..04fa966f0d 100644
--- a/src/Java/miscutil/core/common/compat/COMPAT_ExtraUtils.java
+++ b/src/Java/miscutil/core/common/compat/COMPAT_ExtraUtils.java
@@ -2,7 +2,7 @@ package miscutil.core.common.compat;
 
 import gregtech.api.util.GT_OreDictUnificator;
 import miscutil.core.item.ModItems;
-import miscutil.core.util.UtilsItems;
+import miscutil.core.util.item.UtilsItems;
 import net.minecraft.item.ItemStack;
 
 public class COMPAT_ExtraUtils {
diff --git a/src/Java/miscutil/core/common/compat/COMPAT_IC2.java b/src/Java/miscutil/core/common/compat/COMPAT_IC2.java
index 7b5dcc670a..c0b52c5250 100644
--- a/src/Java/miscutil/core/common/compat/COMPAT_IC2.java
+++ b/src/Java/miscutil/core/common/compat/COMPAT_IC2.java
@@ -3,18 +3,16 @@ package miscutil.core.common.compat;
 
 import static miscutil.core.handler.COMPAT_HANDLER.AddRecipeQueue;
 import static miscutil.core.handler.COMPAT_HANDLER.RemoveRecipeQueue;
-import miscutil.core.util.UtilsItems;
-import miscutil.core.util.recipe.ShapedRecipeObject;
+import miscutil.core.recipe.ShapedRecipeObject;
+import miscutil.core.util.item.UtilsItems;
 import net.minecraft.item.ItemStack;
 
 
 public class COMPAT_IC2 {
 
-	private static ItemStack itemCropnalyzer = UtilsItems.getItemStack("IC2:itemCropnalyzer", 1);
-	private static ItemStack itemSolarHelmet = UtilsItems.getItemStack("IC2:itemSolarHelmet", 1);
-	private static ItemStack temp_3;
-	private static ItemStack temp_4;
-	private static ItemStack temp_5;
+	private static ItemStack itemCropnalyzer = UtilsItems.simpleMetaStack("IC2:itemCropnalyzer", 0, 1);
+	private static ItemStack itemSolarHelmet = UtilsItems.simpleMetaStack("IC2:itemSolarHelmet", 0, 1);
+	
 	public static ShapedRecipeObject Cropnalyzer = new ShapedRecipeObject(
 			"ore:cableGt02Copper", "ore:cableGt02Copper", null, 
 			"minecraft:redstone", "ore:blockGlass", "minecraft:redstone", 
diff --git a/src/Java/miscutil/core/common/compat/COMPAT_MorePlanets.java b/src/Java/miscutil/core/common/compat/COMPAT_MorePlanets.java
index 69fefd3f52..855a5d8fc2 100644
--- a/src/Java/miscutil/core/common/compat/COMPAT_MorePlanets.java
+++ b/src/Java/miscutil/core/common/compat/COMPAT_MorePlanets.java
@@ -1,6 +1,6 @@
 package miscutil.core.common.compat;
 
-import miscutil.core.util.UtilsItems;
+import miscutil.core.util.item.UtilsItems;
 
 public class COMPAT_MorePlanets {
 
diff --git a/src/Java/miscutil/core/common/compat/COMPAT_Thaumcraft.java b/src/Java/miscutil/core/common/compat/COMPAT_Thaumcraft.java
index 17741af194..3fbf3e409e 100644
--- a/src/Java/miscutil/core/common/compat/COMPAT_Thaumcraft.java
+++ b/src/Java/miscutil/core/common/compat/COMPAT_Thaumcraft.java
@@ -3,8 +3,7 @@ package miscutil.core.common.compat;
 import gregtech.api.util.GT_OreDictUnificator;
 import miscutil.core.item.ModItems;
 import miscutil.core.lib.LoadedMods;
-import miscutil.core.util.Utils;
-import miscutil.core.util.UtilsItems;
+import miscutil.core.util.item.UtilsItems;
 import net.minecraft.item.ItemStack;
 
 public class COMPAT_Thaumcraft {
@@ -18,22 +17,22 @@ public class COMPAT_Thaumcraft {
 		GT_OreDictUnificator.registerOre("plateVoidMetal", new ItemStack(ModItems.itemPlateVoidMetal));
 
 		for(int i=0; i<=6; i++){
-			Utils.LOG_INFO(""+i);
+			//Utils.LOG_INFO(""+i);
 			UtilsItems.getItemForOreDict("Thaumcraft:ItemShard", "shardAny", "TC Shard "+i, i);
 			GT_OreDictUnificator.registerOre("shardAny", UtilsItems.getItemStack("Thaumcraft:ItemShard:"+i, 1));
 			UtilsItems.getItemForOreDict("Thaumcraft:ItemShard", "gemInfusedAnything", "TC Shard "+i, i);
 			GT_OreDictUnificator.registerOre("gemInfusedAnything", UtilsItems.getItemStack("Thaumcraft:ItemShard:"+i, 1));
-			System.out.println("TC Shard registration count is: "+i);        
+			//System.out.println("TC Shard registration count is: "+i);        
 		}
 		
 		if (LoadedMods.ForbiddenMagic){
 			for(int i=0; i<=6; i++){
-				Utils.LOG_INFO(""+i);
+				//Utils.LOG_INFO(""+i);
 				UtilsItems.getItemForOreDict("ForbiddenMagic:NetherShard", "shardAny", "FM Shard "+i, i);
 				GT_OreDictUnificator.registerOre("shardAny", UtilsItems.getItemStack("ForbiddenMagic:NetherShard:"+i, 1));
 				UtilsItems.getItemForOreDict("ForbiddenMagic:NetherShard", "gemInfusedAnything", "FM Shard "+i, i);
 				GT_OreDictUnificator.registerOre("gemInfusedAnything", UtilsItems.getItemStack("ForbiddenMagic:NetherShard:"+i, 1));
-				System.out.println("TC Shard registration count is: "+i);        
+				//System.out.println("TC Shard registration count is: "+i);        
 			}
 			UtilsItems.getItemForOreDict("ForbiddenMagic:GluttonyShard", "shardAny", "FM Gluttony Shard", 0);
 			GT_OreDictUnificator.registerOre("shardAny", UtilsItems.getItemStack("ForbiddenMagic:GluttonyShard", 1));