Merge branch 'master' of https://github.com/draknyte1/GTplusplus

1 files changed, 183 insertions, 147 deletions

diff --git a/src/Java/gtPlusPlus/core/item/ModItems.java b/src/Java/gtPlusPlus/core/item/ModItems.java
index fd7d005e55..2fa0d2c698 100644
--- a/src/Java/gtPlusPlus/core/item/ModItems.java
+++ b/src/Java/gtPlusPlus/core/item/ModItems.java
@@ -2,25 +2,28 @@ package gtPlusPlus.core.item;
 import static gtPlusPlus.core.creative.AddToCreativeTab.tabMachines;
 import static gtPlusPlus.core.creative.AddToCreativeTab.tabMisc;
 import static gtPlusPlus.core.lib.CORE.LOAD_ALL_CONTENT;
-import static gtPlusPlus.core.util.item.UtilsItems.generateItemsFromMaterial;
 import gregtech.api.enums.Materials;
 import gregtech.api.util.GT_OreDictUnificator;
+import gtPlusPlus.core.common.compat.COMPAT_Baubles;
 import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.item.base.BaseEuItem;
 import gtPlusPlus.core.item.base.BaseItemBackpack;
 import gtPlusPlus.core.item.base.CoreItem;
+import gtPlusPlus.core.item.base.dusts.decimal.BaseItemCentidust;
+import gtPlusPlus.core.item.base.dusts.decimal.BaseItemDecidust;
 import gtPlusPlus.core.item.base.foods.BaseItemFood;
 import gtPlusPlus.core.item.base.foods.BaseItemHotFood;
 import gtPlusPlus.core.item.base.ingots.BaseItemIngot;
 import gtPlusPlus.core.item.base.plates.BaseItemPlate;
 import gtPlusPlus.core.item.effects.RarityUncommon;
 import gtPlusPlus.core.item.general.BufferCore;
-import gtPlusPlus.core.item.general.ItemCloakingDevice;
-import gtPlusPlus.core.item.general.ItemHealingDevice;
+import gtPlusPlus.core.item.general.ItemBlueprint;
 import gtPlusPlus.core.item.general.RF2EU_Battery;
 import gtPlusPlus.core.item.general.fuelrods.FuelRod_Base;
 import gtPlusPlus.core.item.init.ItemsFoods;
 import gtPlusPlus.core.item.tool.misc.SandstoneHammer;
 import gtPlusPlus.core.item.tool.staballoy.MultiPickaxeBase;
+import gtPlusPlus.core.item.tool.staballoy.MultiSpadeBase;
 import gtPlusPlus.core.item.tool.staballoy.StaballoyAxe;
 import gtPlusPlus.core.item.tool.staballoy.StaballoyPickaxe;
 import gtPlusPlus.core.lib.CORE;
@@ -28,13 +31,16 @@ import gtPlusPlus.core.lib.CORE.configSwitches;
 import gtPlusPlus.core.lib.LoadedMods;
 import gtPlusPlus.core.material.ALLOY;
 import gtPlusPlus.core.material.ELEMENT;
+import gtPlusPlus.core.material.MaterialGenerator;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.debug.DEBUG_INIT;
-import gtPlusPlus.core.util.item.UtilsItems;
+import gtPlusPlus.core.util.item.ItemUtils;
+import net.minecraft.item.EnumRarity;
 import net.minecraft.item.Item;
 import net.minecraft.item.Item.ToolMaterial;
 import net.minecraft.item.ItemFood;
 import net.minecraft.item.ItemStack;
+import net.minecraft.util.EnumChatFormatting;
 import net.minecraftforge.common.util.EnumHelper;
 import cpw.mods.fml.common.registry.GameRegistry;
 public final class ModItems {
@@ -46,11 +52,6 @@ public final class ModItems {
 	public static Item itemDebugShapeSpawner;
 
 	public static Item itemBaseSpawnEgg;
-	
-	
-	//Tantaloy60(789, TextureSet.SET_DULL, 8.0F, 5120, 3, 1 | 2 | 16 | 32 | 64 | 128, 213, 231, 237, 0, "Tantaloy 60", 0, 0, 3035, 2200, true, false, 1, 2, 1, Dyes.dyeLightGray, 2, Arrays.asList(new MaterialStack(Tungsten, 1), new MaterialStack(Tantalum, 9)), Arrays.asList(new TC_AspectStack(TC_Aspects.METALLUM, 8), new TC_AspectStack(TC_Aspects.STRONTIO, 3))),
-	//Tantaloy61(790, TextureSet.SET_DULL, 7.0F, 5120, 2, 1 | 2 | 16 | 32 | 64 | 128, 193, 211, 217, 0, "Tantaloy 61", 0, 0, 3015, 2150, true, false, 1, 2, 1, Dyes.dyeLightGray, 2, Arrays.asList(new MaterialStack(Tungsten, 1), new MaterialStack(Tantalum, 9), new MaterialStack(Titanium, 1)), Arrays.asList(new TC_AspectStack(TC_Aspects.METALLUM, 8), new TC_AspectStack(TC_Aspects.STRONTIO, 3))),
-
 
 	//EnderIO
 	public static Item itemPlateSoularium;
@@ -102,16 +103,20 @@ public final class ModItems {
 	public static BaseItemHotFood itemHotFoodRaisinToast;
 	public static BaseItemFood itemFoodCurriedSausages;
 	public static BaseItemHotFood itemHotFoodCurriedSausages;
-	
+
 	public static Item RfEuBattery;
 	public static Item itemPersonalCloakingDevice;
 	public static Item itemPersonalCloakingDeviceCharged;
 	public static Item itemPersonalHealingDevice;
 
 	public static MultiPickaxeBase MP_GTMATERIAL;
+	public static MultiSpadeBase MS_GTMATERIAL;
 	
+	public static BaseItemDecidust itemBaseDecidust;
+	public static BaseItemCentidust itemBaseCentidust;
+
 	public static ItemStack FluidCell;
-	
+
 	public static BaseItemBackpack backpack_Red;
 	public static BaseItemBackpack backpack_Green;
 	public static BaseItemBackpack backpack_Blue;
@@ -128,11 +133,30 @@ public final class ModItems {
 	public static BaseItemBackpack backpack_Gray;
 	public static BaseItemBackpack backpack_Black;
 	public static BaseItemBackpack backpack_White;
-	
+
+	public static ItemBlueprint itemBlueprintBase;
+
 	public static Item dustLithiumCarbonate;
+	public static Item dustLithiumHydroxide;
+	public static Item dustLithiumPeroxide;
+	public static Item dustLithiumFluoride;
+
+	public static Item dustUraniumTetraFluoride;
+	public static Item dustUraniumHexaFluoride;
+
+	public static Item dustBerylliumFluoride;
+
+	public static Item dustQuicklime;
+	public static Item dustCalciumHydroxide;
+	public static Item dustCalciumCarbonate;
+	public static Item dust2LiOH_CaCO3;
+	public static Item dustLi2BeF4;
+	
+	public static BaseEuItem metaItem2;
 
 
 	//@SuppressWarnings("unused")
+	@SuppressWarnings("unused")
 	public static final void init(){
 
 		AAA_Broken = new BaseItemIngot("AAA_Broken", "Errors - Tell Alkalus", Utils.rgbtoHexValue(128, 128, 128), 0);
@@ -142,6 +166,16 @@ public final class ModItems {
 			DEBUG_INIT.registerItems();
 		}		
 		
+		
+		//Some Simple forms of materials
+		itemStickyRubber = new Item().setUnlocalizedName("itemStickyRubber").setCreativeTab(tabMachines).setTextureName(CORE.MODID + ":itemStickyRubber");
+		GameRegistry.registerItem(itemStickyRubber, "itemStickyRubber");
+		GT_OreDictUnificator.registerOre("ingotRubber", ItemUtils.getItemStack(CORE.MODID+":itemStickyRubber", 1));
+
+		itemHeliumBlob = new CoreItem("itemHeliumBlob", tabMisc).setTextureName(CORE.MODID + ":itemHeliumBlob");
+		GT_OreDictUnificator.registerOre("dustHydrogen", new ItemStack(ModItems.itemHeliumBlob));
+		//GameRegistry.registerItem(itemHeliumBlob, "itemHeliumBlob");
+
 		//Make some backpacks
 		//Primary colours
 		backpack_Red = new BaseItemBackpack("backpackRed", Utils.rgbtoHexValue(200, 0, 0));
@@ -163,59 +197,77 @@ public final class ModItems {
 		backpack_Gray = new BaseItemBackpack("backpackGray", Utils.rgbtoHexValue(128, 128, 128));
 		backpack_Black = new BaseItemBackpack("backpackBlack", Utils.rgbtoHexValue(20, 20, 20));
 		backpack_White = new BaseItemBackpack("backpackWhite", Utils.rgbtoHexValue(240, 240, 240));
-		
+
+		itemBlueprintBase = new ItemBlueprint("itemBlueprint");
+
 		//Start meta Item Generation
 		ItemsFoods.load();
 
 		try{
-		generateItemsFromMaterial(ALLOY.ENERGYCRYSTAL);
-		generateItemsFromMaterial(ALLOY.BLOODSTEEL);
-		generateItemsFromMaterial(ALLOY.STABALLOY);
-		generateItemsFromMaterial(ALLOY.TANTALLOY_60);
-		generateItemsFromMaterial(ALLOY.TANTALLOY_61);
-		generateItemsFromMaterial(ALLOY.BEDROCKIUM);
-		generateItemsFromMaterial(ALLOY.QUANTUM);
-		
+			//Elements generate first so they can be used in compounds.
+				     		
+			//Uranium-233 is a fissile isotope of uranium that is bred from thorium-232 as part of the thorium fuel cycle.
+	        MaterialGenerator.generate(ELEMENT.getInstance().URANIUM233);
+	        MaterialGenerator.generate(ELEMENT.getInstance().ZIRCONIUM);
+			
+			//Carbides - Tungsten Carbide exists in .09 so don't generate it. - Should still come before alloys though
+			if (!CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK){
+				MaterialGenerator.generate(ALLOY.TUNGSTEN_CARBIDE);
+			}
+			MaterialGenerator.generate(ALLOY.SILICON_CARBIDE);
+			MaterialGenerator.generate(ALLOY.ZIRCONIUM_CARBIDE);
+			MaterialGenerator.generate(ALLOY.TANTALUM_CARBIDE);
+			MaterialGenerator.generate(ALLOY.NIOBIUM_CARBIDE);	
+			
+			//Generate some Alloys
+			
+			//Misc Alloys
+			MaterialGenerator.generate(ALLOY.ENERGYCRYSTAL);
+			MaterialGenerator.generate(ALLOY.BLOODSTEEL);
+			MaterialGenerator.generate(ALLOY.BEDROCKIUM);
+			MaterialGenerator.generate(ALLOY.ZERON_100);
+			//Tumbaga was the name given by Spaniards to a non-specific alloy of gold and copper 
+			MaterialGenerator.generate(ALLOY.TUMBAGA);
+			//Potin is traditionally an alloy of bronze, tin and lead, with varying quantities of each possible
+			MaterialGenerator.generate(ALLOY.POTIN);
+			
+			//Staballoy & Tantalloy
+			MaterialGenerator.generate(ALLOY.STABALLOY);
+			MaterialGenerator.generate(ALLOY.TANTALLOY_60);
+			MaterialGenerator.generate(ALLOY.TANTALLOY_61);
 
-		generateItemsFromMaterial(ALLOY.INCONEL_625);
-		generateItemsFromMaterial(ALLOY.INCONEL_690);
-		generateItemsFromMaterial(ALLOY.INCONEL_792);
+			//Inconel
+			MaterialGenerator.generate(ALLOY.INCONEL_625);
+			MaterialGenerator.generate(ALLOY.INCONEL_690);
+			MaterialGenerator.generate(ALLOY.INCONEL_792);
 
-		if (!CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK){
-			generateItemsFromMaterial(ALLOY.TUNGSTEN_CARBIDE);
-		}
-		generateItemsFromMaterial(ALLOY.SILICON_CARBIDE);
-		generateItemsFromMaterial(ALLOY.ZERON_100);
-		generateItemsFromMaterial(ALLOY.MARAGING250);
-		generateItemsFromMaterial(ALLOY.MARAGING300);
-		generateItemsFromMaterial(ALLOY.MARAGING350);
-		generateItemsFromMaterial(ALLOY.STELLITE);
-		generateItemsFromMaterial(ALLOY.TALONITE);
-		
-		//Tumbaga was the name given by Spaniards to a non-specific alloy of gold and copper 
-		generateItemsFromMaterial(ALLOY.TUMBAGA);
-		//Potin is traditionally an alloy of bronze, tin and lead, with varying quantities of each possible
-		generateItemsFromMaterial(ALLOY.POTIN);
-		
+			
+			//Maraging Steel
+			MaterialGenerator.generate(ALLOY.MARAGING250);
+			MaterialGenerator.generate(ALLOY.MARAGING300);
+			MaterialGenerator.generate(ALLOY.MARAGING350);
+			
+			//Composite Alloys
+			MaterialGenerator.generate(ALLOY.STELLITE);
+			MaterialGenerator.generate(ALLOY.TALONITE);			
+
+			//Hastelloy
+			MaterialGenerator.generate(ALLOY.HASTELLOY_W);
+			MaterialGenerator.generate(ALLOY.HASTELLOY_X);
+			MaterialGenerator.generate(ALLOY.HASTELLOY_C276);
+			MaterialGenerator.generate(ALLOY.HASTELLOY_N);
+
+			//Incoloy
+			MaterialGenerator.generate(ALLOY.INCOLOY_020);
+			MaterialGenerator.generate(ALLOY.INCOLOY_DS);
+			MaterialGenerator.generate(ALLOY.INCOLOY_MA956);
+			
+			//Leagrisium
+			MaterialGenerator.generate(ALLOY.LEAGRISIUM);			
+			//Must be the final Alloy to Generate
+			MaterialGenerator.generate(ALLOY.QUANTUM);		
+			
 
-		generateItemsFromMaterial(ALLOY.HASTELLOY_W);
-		generateItemsFromMaterial(ALLOY.HASTELLOY_X);
-		generateItemsFromMaterial(ALLOY.HASTELLOY_C276);
-		generateItemsFromMaterial(ALLOY.HASTELLOY_N);
-		
-		generateItemsFromMaterial(ALLOY.INCOLOY_020);
-		generateItemsFromMaterial(ALLOY.INCOLOY_DS);
-		generateItemsFromMaterial(ALLOY.INCOLOY_MA956);
-		
-		
-		generateItemsFromMaterial(ELEMENT.ZIRCONIUM);
-		generateItemsFromMaterial(ALLOY.ZIRCONIUM_CARBIDE);
-		generateItemsFromMaterial(ALLOY.TANTALUM_CARBIDE);
-		generateItemsFromMaterial(ALLOY.NIOBIUM_CARBIDE);		
-		
-		//Uranium-233 is a fissile isotope of uranium that is bred from thorium-232 as part of the thorium fuel cycle.
-		UtilsItems.generateItemsFromMaterial(ELEMENT.URANIUM233);
-		
 		} catch (Throwable r){
 			Utils.LOG_INFO("Failed to Generated a Material. "+r.getMessage());
 			//Utils.LOG_INFO("Failed to Generated a Material. "+r.getCause().getMessage());
@@ -224,73 +276,64 @@ public final class ModItems {
 			r.printStackTrace();
 			System.exit(1);
 		}
-		
-		
-		dustLithiumCarbonate = UtilsItems.generateSpecialUseDusts("LithiumCarbonate", "Lithium Carbonate", Utils.rgbtoHexValue(137, 139, 142))[0];
 
+
+
+		//Nuclear Fuel Dusts
+		dustUraniumTetraFluoride = ItemUtils.generateSpecialUseDusts("UraniumTetrafluoride", "Uranium Tetrafluoride", Utils.rgbtoHexValue(17, 179, 42))[0];
+		dustUraniumHexaFluoride = ItemUtils.generateSpecialUseDusts("UraniumHexafluoride", "Uranium Hexafluoride", Utils.rgbtoHexValue(9, 199, 32))[0];
+
+		dustBerylliumFluoride = ItemUtils.generateSpecialUseDusts("BerylliumFluoride", "Beryllium Fluoride", Utils.rgbtoHexValue(175, 175, 175))[0]; //https://en.wikipedia.org/wiki/Beryllium_fluoride
+
+		dustLithiumCarbonate = ItemUtils.generateSpecialUseDusts("LithiumCarbonate", "Lithium Carbonate", Utils.rgbtoHexValue(240, 240, 240))[0]; //https://en.wikipedia.org/wiki/Lithium_carbonate
+		dustLithiumFluoride = ItemUtils.generateSpecialUseDusts("LithiumFluoride", "Lithium Fluoride", Utils.rgbtoHexValue(245, 245, 245))[0]; //https://en.wikipedia.org/wiki/Lithium_fluoride
+		dustLithiumPeroxide = ItemUtils.generateSpecialUseDusts("LithiumPeroxide", "Lithium Peroxide", Utils.rgbtoHexValue(250, 250, 250))[0]; //https://en.wikipedia.org/wiki/Lithium_peroxide
+		dustLithiumHydroxide = ItemUtils.generateSpecialUseDusts("LithiumHydroxide", "Lithium Hydroxide", Utils.rgbtoHexValue(250, 250, 250))[0]; //https://en.wikipedia.org/wiki/Lithium_hydroxide
+
+		if (ItemUtils.getItemStackOfAmountFromOreDict("dustQuicklime", 1).getItem() == ModItems.AAA_Broken || !LoadedMods.IHL){
+			dustQuicklime = ItemUtils.generateSpecialUseDusts("Quicklime", "Quicklime", Utils.rgbtoHexValue(255, 255, 255))[0]; //https://en.wikipedia.org/wiki/Calcium_oxide
+		}
+		dustCalciumHydroxide = ItemUtils.generateSpecialUseDusts("CalciumHydroxide", "Hydrated Lime", Utils.rgbtoHexValue(255, 255, 255))[0]; //https://en.wikipedia.org/wiki/Calcium_hydroxide
+		dustCalciumCarbonate = ItemUtils.generateSpecialUseDusts("CalciumCarbonate", "Calcium Carbonate", Utils.rgbtoHexValue(255, 255, 255))[0]; //https://en.wikipedia.org/wiki/Calcium_carbonate
+		dust2LiOH_CaCO3 = ItemUtils.generateSpecialUseDusts("2LiOHCaCO3", "2LiOH & CaCO3 Compound", Utils.rgbtoHexValue(255, 255, 255))[0]; //https://en.wikipedia.org/wiki/Calcium_carbonate
 		
+		//FLiBe Fuel Compounds
+		dustLi2BeF4 = ItemUtils.generateSpecialUseDusts("Li2BeF4", "Li2BeF4 Fuel Compound", Utils.rgbtoHexValue(255, 255, 255))[0]; //https://en.wikipedia.org/wiki/FLiBe
+
+		metaItem2 = new BaseEuItem();
+		metaItem2.registerItem(0, EnumChatFormatting.BLACK+"Test Item 0", 0, 0, "I am 0.");
+		metaItem2.registerItem(1, EnumChatFormatting.GREEN+"Test Item 1", 1006346000, 1, "I Hold EU 1.", 500);
+		metaItem2.registerItem(2, EnumChatFormatting.GOLD+"Test Item 2", 1004630000, 2, "I Hold EU 2.", 8000);
+		metaItem2.registerItem(3, "Test Item 3", 1000765000, 4, "I Hold EU 3.", 32000);
+		metaItem2.registerItem(4, "Whirlygig", 1043644000, (short) 5, "Spin me right round.", EnumRarity.rare, EnumChatFormatting.DARK_GREEN, true);
+		metaItem2.registerItem(5, "Whirlygig 2", 2124867000, (short) 7, "Spin me right round.", EnumRarity.uncommon, EnumChatFormatting.RED, true);
+	
+		// ItemList.Battery_RE_HV_Cadmium.set(BaseEuItem.
+
+		//GameRegistry.registerItem(this, unlocalName);
 		
 		boolean gtStyleTools = LoadedMods.Gregtech;
 
-		MP_GTMATERIAL = UtilsItems.generateMultiPick(gtStyleTools, Materials.Wood);
-		MP_GTMATERIAL = UtilsItems.generateMultiPick(gtStyleTools, Materials.Cobblestone);
-		MP_GTMATERIAL = UtilsItems.generateMultiPick(gtStyleTools, Materials.Iron);
-		MP_GTMATERIAL = UtilsItems.generateMultiPick(gtStyleTools, Materials.WroughtIron);
-		MP_GTMATERIAL = UtilsItems.generateMultiPick(gtStyleTools, Materials.DarkIron);
-		MP_GTMATERIAL = UtilsItems.generateMultiPick(gtStyleTools, Materials.Gold);
-		MP_GTMATERIAL = UtilsItems.generateMultiPick(gtStyleTools, Materials.Silver);
-		
-		MP_GTMATERIAL = UtilsItems.generateMultiPick(gtStyleTools, Materials.Diamond);
-		MP_GTMATERIAL = UtilsItems.generateMultiPick(gtStyleTools, Materials.Emerald);
-		MP_GTMATERIAL = UtilsItems.generateMultiPick(gtStyleTools, Materials.Ruby);
-		MP_GTMATERIAL = UtilsItems.generateMultiPick(gtStyleTools, Materials.Sapphire);
-
-		MP_GTMATERIAL = UtilsItems.generateMultiPick(gtStyleTools, Materials.Cupronickel);
-		MP_GTMATERIAL = UtilsItems.generateMultiPick(gtStyleTools, Materials.Brass);
-		MP_GTMATERIAL = UtilsItems.generateMultiPick(gtStyleTools, Materials.Bronze);
-		MP_GTMATERIAL = UtilsItems.generateMultiPick(gtStyleTools, Materials.Steel);
-		MP_GTMATERIAL = UtilsItems.generateMultiPick(gtStyleTools, Materials.Lead);
-		MP_GTMATERIAL = UtilsItems.generateMultiPick(gtStyleTools, Materials.Titanium);
-		MP_GTMATERIAL = UtilsItems.generateMultiPick(gtStyleTools, Materials.Tungsten);
-		MP_GTMATERIAL = UtilsItems.generateMultiPick(gtStyleTools, Materials.Platinum);
-		MP_GTMATERIAL = UtilsItems.generateMultiPick(gtStyleTools, Materials.Chrome);
-		MP_GTMATERIAL = UtilsItems.generateMultiPick(gtStyleTools, Materials.TungstenSteel);
-		MP_GTMATERIAL = UtilsItems.generateMultiPick(gtStyleTools, Materials.Aluminium);
-		MP_GTMATERIAL = UtilsItems.generateMultiPick(gtStyleTools, Materials.Thaumium);
-		MP_GTMATERIAL = UtilsItems.generateMultiPick(gtStyleTools, Materials.Cobalt);
-		MP_GTMATERIAL = UtilsItems.generateMultiPick(gtStyleTools, Materials.Iridium);
-		MP_GTMATERIAL = UtilsItems.generateMultiPick(gtStyleTools, Materials.Ultimet);
-		MP_GTMATERIAL = UtilsItems.generateMultiPick(gtStyleTools, Materials.Osmiridium);
-		MP_GTMATERIAL = UtilsItems.generateMultiPick(gtStyleTools, Materials.NetherStar);
-		MP_GTMATERIAL = UtilsItems.generateMultiPick(gtStyleTools, Materials.Naquadah);
-		MP_GTMATERIAL = UtilsItems.generateMultiPick(gtStyleTools, Materials.NaquadahAlloy);
-		MP_GTMATERIAL = UtilsItems.generateMultiPick(gtStyleTools, Materials.NaquadahEnriched);
-		MP_GTMATERIAL = UtilsItems.generateMultiPick(gtStyleTools, Materials.Neutronium);
-		
-		MP_GTMATERIAL = UtilsItems.generateMultiPick(gtStyleTools, Materials.Thorium);
-		MP_GTMATERIAL = UtilsItems.generateMultiPick(gtStyleTools, Materials.DamascusSteel);
-		MP_GTMATERIAL = UtilsItems.generateMultiPick(gtStyleTools, Materials.Magnalium);
-		MP_GTMATERIAL = UtilsItems.generateMultiPick(gtStyleTools, Materials.BlackSteel);
-		MP_GTMATERIAL = UtilsItems.generateMultiPick(gtStyleTools, Materials.Invar);
-		MP_GTMATERIAL = UtilsItems.generateMultiPick(gtStyleTools, Materials.MeteoricSteel);
-		MP_GTMATERIAL = UtilsItems.generateMultiPick(gtStyleTools, Materials.StainlessSteel);
-		MP_GTMATERIAL = UtilsItems.generateMultiPick(gtStyleTools, Materials.BlueSteel);
-		MP_GTMATERIAL = UtilsItems.generateMultiPick(gtStyleTools, Materials.Neodymium);
-		MP_GTMATERIAL = UtilsItems.generateMultiPick(gtStyleTools, Materials.Desh);
-		MP_GTMATERIAL = UtilsItems.generateMultiPick(gtStyleTools, Materials.ElectrumFlux);
-		
+		Materials[] rm = Materials.values();
+		for (Materials m : rm){
+			MP_GTMATERIAL = ItemUtils.generateMultiPick(gtStyleTools, m);
+			MS_GTMATERIAL = ItemUtils.generateMultiShovel(gtStyleTools, m);
+			/*itemBaseDecidust = UtilsItems.generateDecidust(m);
+			itemBaseCentidust = UtilsItems.generateCentidust(m);*/
+		}
+
 		//EnderIO Resources
 		if (LoadedMods.EnderIO || LOAD_ALL_CONTENT){
 			Utils.LOG_INFO("EnderIO Found - Loading Resources.");
 			//Item Init
-			itemPlateSoularium = new BaseItemPlate("itemPlate"+"Soularium", "Soularium", Utils.rgbtoHexValue(95, 90, 54), 2, 0);
-			itemPlateRedstoneAlloy = new BaseItemPlate("itemPlate"+"RedstoneAlloy", "Redstone Alloy", Utils.rgbtoHexValue(178,34,34), 2, 0);
-			itemPlateElectricalSteel =new BaseItemPlate("itemPlate"+"ElectricalSteel", "Electrical Steel", Utils.rgbtoHexValue(194, 194, 194), 2, 0);
-			itemPlatePulsatingIron = new BaseItemPlate("itemPlate"+"PhasedIron", "Pulsating Iron", Utils.rgbtoHexValue(50, 91, 21), 2, 0);
-			itemPlateEnergeticAlloy = new BaseItemPlate("itemPlate"+"EnergeticAlloy", "Energetic Alloy", Utils.rgbtoHexValue(252, 152, 45), 2, 0);
-			itemPlateVibrantAlloy = new BaseItemPlate("itemPlate"+"VibrantAlloy", "Vibrant Alloy", Utils.rgbtoHexValue(204, 242, 142), 2, 0);
-			itemPlateConductiveIron = new BaseItemPlate("itemPlate"+"ConductiveIron", "Conductive Iron", Utils.rgbtoHexValue(164, 109, 100), 2, 0);
-					
+			itemPlateSoularium = new BaseItemPlate("itemPlate"+"Soularium", "Soularium", new short[]{95, 90, 54}, 2, 0);
+			itemPlateRedstoneAlloy = new BaseItemPlate("itemPlate"+"RedstoneAlloy", "Redstone Alloy", new short[]{178,34,34}, 2, 0);
+			itemPlateElectricalSteel =new BaseItemPlate("itemPlate"+"ElectricalSteel", "Electrical Steel", new short[]{194, 194, 194}, 2, 0);
+			itemPlatePulsatingIron = new BaseItemPlate("itemPlate"+"PhasedIron", "Phased Iron", new short[]{50, 91, 21}, 2, 0);
+			itemPlateEnergeticAlloy = new BaseItemPlate("itemPlate"+"EnergeticAlloy", "Energetic Alloy", new short[]{252, 152, 45}, 2, 0);
+			itemPlateVibrantAlloy = new BaseItemPlate("itemPlate"+"VibrantAlloy", "Vibrant Alloy", new short[]{204, 242, 142}, 2, 0);
+			itemPlateConductiveIron = new BaseItemPlate("itemPlate"+"ConductiveIron", "Conductive Iron", new short[]{164, 109, 100}, 2, 0);
+
 		}
 		else {
 			Utils.LOG_WARNING("EnderIO not Found - Skipping Resources.");
@@ -299,10 +342,10 @@ public final class ModItems {
 		if (LoadedMods.Big_Reactors|| LOAD_ALL_CONTENT){
 			Utils.LOG_INFO("BigReactors Found - Loading Resources.");
 			//Item Init
-			itemPlateBlutonium = new BaseItemPlate("itemPlate"+"Blutonium", "Blutonium", Utils.rgbtoHexValue(0, 0, 255), 2, 0);
-			itemPlateCyanite = new BaseItemPlate("itemPlate"+"Cyanite", "Cyanite", Utils.rgbtoHexValue(0, 191, 255), 2, 0);
-			itemPlateLudicrite = new BaseItemPlate("itemPlate"+"Ludicrite", "Ludicrite", Utils.rgbtoHexValue(167, 5, 179), 2, 0);
-			
+			itemPlateBlutonium = new BaseItemPlate("itemPlate"+"Blutonium", "Blutonium", new short[]{0, 0, 255}, 2, 0);
+			itemPlateCyanite = new BaseItemPlate("itemPlate"+"Cyanite", "Cyanite", new short[]{0, 191, 255}, 2, 0);
+			itemPlateLudicrite = new BaseItemPlate("itemPlate"+"Ludicrite", "Ludicrite", new short[]{167, 5, 179}, 2, 0);
+
 		}
 		else {
 			Utils.LOG_WARNING("BigReactors not Found - Skipping Resources.");
@@ -312,15 +355,14 @@ public final class ModItems {
 			Utils.LOG_INFO("Thaumcraft Found - Loading Resources.");
 			//Item Init
 			try {
-				
-				UtilsItems.getItemForOreDict("Thaumcraft:ItemResource", "ingotVoidMetal", "Void Metal Ingot", 16);
+
+				ItemUtils.getItemForOreDict("Thaumcraft:ItemResource", "ingotVoidMetal", "Void Metal Ingot", 16);				
+				itemPlateVoidMetal = new BaseItemPlate("itemPlate"+"Void", "Void", new short[]{82, 17, 82}, 2, 0);
 				GT_OreDictUnificator.registerOre("plateVoidMetal", new ItemStack(ModItems.itemPlateVoidMetal));
-				
-				itemPlateVoidMetal = new BaseItemPlate("itemPlate"+"Void", "Void Metal", Utils.rgbtoHexValue(82, 17, 82), 2, 0);
 			} catch (NullPointerException e){
 				e.getClass();
 			}
-			
+
 		}
 		else {
 			Utils.LOG_WARNING("Thaumcraft not Found - Skipping Resources.");
@@ -344,7 +386,7 @@ public final class ModItems {
 		if (LoadedMods.PneumaticCraft|| LOAD_ALL_CONTENT){
 			Utils.LOG_INFO("PneumaticCraft Found - Loading Resources.");
 			//Item Init
-			itemPlateCompressedIron = new BaseItemPlate("itemPlate"+"CompressedIron", "Compressed Iron", Utils.rgbtoHexValue(128, 128, 128), 2, 0);
+			itemPlateCompressedIron = new BaseItemPlate("itemPlate"+"CompressedIron", "Compressed Iron", new short[]{128, 128, 128}, 2, 0);
 		}
 		else {
 			Utils.LOG_WARNING("PneumaticCraft not Found - Skipping Resources.");
@@ -364,7 +406,7 @@ public final class ModItems {
 		if (LoadedMods.RFTools|| LOAD_ALL_CONTENT){
 			Utils.LOG_INFO("rfTools Found - Loading Resources.");
 			//Item Init
-			itemPlateDimensionShard = new BaseItemPlate("itemPlate"+"DimensionShard", "Dimensional Shard", Utils.rgbtoHexValue(170, 230, 230), 2, 0);
+			itemPlateDimensionShard = new BaseItemPlate("itemPlate"+"DimensionShard", "Dimensional Shard", new short[]{170, 230, 230}, 2, 0);
 		}
 		else {
 			Utils.LOG_WARNING("rfTools not Found - Skipping Resources.");
@@ -378,25 +420,26 @@ public final class ModItems {
 			FuelRod_Uranium = new FuelRod_Base("itemFuelRod_Uranium", "Uranium", 2500, 2500);
 			FuelRod_Plutonium = new FuelRod_Base("itemFuelRod_Plutonium", "Plutonium", 5000, 5000);
 			RfEuBattery = new RF2EU_Battery();
-			
-			if (LoadedMods.Baubles){
-				Utils.LOG_INFO("Baubles Found - Loading Wearables.");
-			itemPersonalCloakingDevice = new ItemCloakingDevice(0);
-			//itemPersonalCloakingDeviceCharged = new ItemCloakingDevice(0).set;
-			itemPersonalHealingDevice = new ItemHealingDevice();
+
+			try {Class baublesTest = Class.forName("baubles.api.IBauble");
+			if (baublesTest != null){					
+				COMPAT_Baubles.run();
 			}
 			else {
-				Utils.LOG_INFO("Baubles Not Found - Skipping Resources.");
+				Utils.LOG_INFO("Baubles Not Found - Skipping Resources.");					
+			}
+			} catch(Throwable T){
+				Utils.LOG_INFO("Baubles Not Found - Skipping Resources.");				
 			}
 			//Registry
 			//GameRegistry.registerItem(FuelRod_Empty, "itemFuelRod_Empty");
 			//GameRegistry.registerItem(FuelRod_Thorium, "itemFuelRod_Thorium");
 			//GameRegistry.registerItem(FuelRod_Uranium, "itemFuelRod_Uranium");
 			//GameRegistry.registerItem(FuelRod_Plutonium, "itemFuelRod_Plutonium");
-			
+
 			//FluidCell = new ItemStack(new IC2_ItemFluidCell("itemGT++FluidCell"));
-			
-			
+
+
 		}
 		else {
 			Utils.LOG_WARNING("IndustrialCraft2 not Found - Skipping Resources.");
@@ -405,8 +448,8 @@ public final class ModItems {
 
 		//Special Item Handling Case
 		if (configSwitches.enableAlternativeBatteryAlloy) {
-			ModItems.itemIngotBatteryAlloy = new BaseItemIngot("itemIngotBatteryAlloy", "Battery Alloy", Utils.rgbtoHexValue(35, 228, 141), 0);
-			ModItems.itemPlateBatteryAlloy = new BaseItemPlate("itemPlateBatteryAlloy", "Battery Alloy", Utils.rgbtoHexValue(35, 228, 141), 2, 0);
+			//ModItems.itemIngotBatteryAlloy = new BaseItemIngot("itemIngotBatteryAlloy", "Battery Alloy", new short[]{35, 228, 141}, 0); TODO
+			ModItems.itemPlateBatteryAlloy = new BaseItemPlate("itemPlateBatteryAlloy", "Battery Alloy", new short[]{35, 228, 141}, 2, 0);
 		}
 
 
@@ -437,17 +480,10 @@ public final class ModItems {
 			//System.out.println("Buffer Core registration count is: "+i);
 		}
 
-		itemStickyRubber = new Item().setUnlocalizedName("itemStickyRubber").setCreativeTab(tabMachines).setTextureName(CORE.MODID + ":itemStickyRubber");
-		GameRegistry.registerItem(itemStickyRubber, "itemStickyRubber");
-		GT_OreDictUnificator.registerOre("ingotRubber", UtilsItems.getItemStack(CORE.MODID+":itemStickyRubber", 1));
-
-		itemHeliumBlob = new CoreItem("itemHeliumBlob", tabMisc).setTextureName(CORE.MODID + ":itemHeliumBlob");
-		//GameRegistry.registerItem(itemHeliumBlob, "itemHeliumBlob");
-
 		itemPLACEHOLDER_Circuit = new Item().setUnlocalizedName("itemPLACEHOLDER_Circuit").setTextureName(CORE.MODID + ":itemPLACEHOLDER_Circuit");
 		GameRegistry.registerItem(itemPLACEHOLDER_Circuit, "itemPLACEHOLDER_Circuit");
 
 		//ItemBlockGtFrameBox = new ItemBlockGtFrameBox(ModBlocks.blockGtFrameSet1);
 		//GameRegistry.registerItem(ItemBlockGtFrameBox, "itemGtFrameBoxSet1");		
 	}
-}
\ No newline at end of file
+}