+ Added a dust handler - Staballoy is now added.

6 files changed, 106 insertions, 8 deletions

diff --git a/src/Java/miscutil/core/item/ModItems.java b/src/Java/miscutil/core/item/ModItems.java
index 48ddde3f0b..ad3204e0be 100644
--- a/src/Java/miscutil/core/item/ModItems.java
+++ b/src/Java/miscutil/core/item/ModItems.java
@@ -5,6 +5,7 @@ import static miscutil.core.lib.CORE.LOAD_ALL_CONTENT;
 import gregtech.api.util.GT_OreDictUnificator;
 import miscutil.core.creative.AddToCreativeTab;
 import miscutil.core.item.base.CoreItem;
+import miscutil.core.item.base.dusts.BaseItemDust;
 import miscutil.core.item.effects.RarityUncommon;
 import miscutil.core.item.general.BufferCore;
 import miscutil.core.item.general.fuelrods.FuelRod_Base;
@@ -95,6 +96,12 @@ Gold Tool: 22*/
 	public static Item itemStaballoyAxe;
 	public static Item itemPlateStaballoy;
 	public static Item itemIngotStaballoy;
+	public static Item itemDustStaballoy;
+	public static Item itemDustTinyStaballoy;
+	public static Item itemDustSmallStaballoy;
+	public static Item itemDustBloodSteel;
+	public static Item itemDustTinyBloodSteel;
+	public static Item itemDustSmallBloodSteel;
 	//Tools
 	public static Item itemSandstoneHammer;
 	//Machine Related
@@ -262,11 +269,32 @@ Gold Tool: 22*/
 		GameRegistry.registerItem(itemIngotStaballoy, "itemIngotStaballoy");
 		itemPlateStaballoy = new Item().setUnlocalizedName("itemPlateStaballoy").setCreativeTab(tabMisc).setTextureName(CORE.MODID + ":itemPlateStaballoy");
 		GameRegistry.registerItem(itemPlateStaballoy, "itemPlateStaballoy");
+
+
+		//Staballoy Dusts
+		itemDustStaballoy = new BaseItemDust("itemDustStaballoy", "Staballoy", Utils.rgbtoHexValue(68, 75, 66), "Dust").setCreativeTab(tabMisc);
+		GT_OreDictUnificator.registerOre("dustStaballoy", UtilsItems.getItemStack(CORE.MODID+":itemDustStaballoy", 1));
+		itemDustTinyStaballoy = new BaseItemDust("itemDustTinyStaballoy", "Staballoy", Utils.rgbtoHexValue(68, 75, 66), "Tiny").setCreativeTab(tabMisc);
+		GT_OreDictUnificator.registerOre("dustTinyStaballoy", UtilsItems.getItemStack(CORE.MODID+":itemDustTinyStaballoy", 1));
+		itemDustSmallStaballoy = new BaseItemDust("itemDustSmallStaballoy", "Staballoy", Utils.rgbtoHexValue(68, 75, 66), "Small").setCreativeTab(tabMisc);
+		GT_OreDictUnificator.registerOre("dustSmallStaballoy", UtilsItems.getItemStack(CORE.MODID+":itemDustSmallStaballoy", 1));
+
+
 		//Blood Steel Ingot/Plate
 		itemIngotBloodSteel = new Item().setUnlocalizedName("itemIngotBloodSteel").setCreativeTab(tabMisc).setTextureName(CORE.MODID + ":itemIngotBloodSteel");
 		GameRegistry.registerItem(itemIngotBloodSteel, "itemIngotBloodSteel");
 		itemPlateBloodSteel = new Item().setUnlocalizedName("itemPlateBloodSteel").setCreativeTab(tabMisc).setTextureName(CORE.MODID + ":itemPlateBloodSteel");
 		GameRegistry.registerItem(itemPlateBloodSteel, "itemPlateBloodSteel");
+
+		//BloodSteel Dusts
+		itemDustBloodSteel = new BaseItemDust("itemDustBloodSteel", "BloodSteel", Utils.rgbtoHexValue(68, 75, 66), "Dust").setCreativeTab(tabMisc);
+		GT_OreDictUnificator.registerOre("dustBloodSteel", UtilsItems.getItemStack(CORE.MODID+":itemDustBloodSteel", 1));
+		itemDustTinyBloodSteel = new BaseItemDust("itemDustTinyBloodSteel", "BloodSteel", Utils.rgbtoHexValue(68, 75, 66), "Tiny").setCreativeTab(tabMisc);
+		GT_OreDictUnificator.registerOre("dustTinyBloodSteel", UtilsItems.getItemStack(CORE.MODID+":itemDustTinyBloodSteel", 1));
+		itemDustSmallBloodSteel = new BaseItemDust("itemDustSmallBloodSteel", "BloodSteel", Utils.rgbtoHexValue(68, 75, 66), "Small").setCreativeTab(tabMisc);
+		GT_OreDictUnificator.registerOre("dustSmallBloodSteel", UtilsItems.getItemStack(CORE.MODID+":itemDustSmallBloodSteel", 1));
+
+
 		//Sandstone Hammer
 		itemSandstoneHammer = new SandstoneHammer("itemSandstoneHammer").setCreativeTab(AddToCreativeTab.tabTools);
 		GameRegistry.registerItem(itemSandstoneHammer, itemSandstoneHammer.getUnlocalizedName());
@@ -280,6 +308,7 @@ Gold Tool: 22*/
 		}
 		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));
 		//Battery Alloy For cheap Niggers
 		itemIngotBatteryAlloy = new Item().setUnlocalizedName("itemIngotBatteryAlloy").setCreativeTab(tabMachines).setTextureName(CORE.MODID + ":itemIngotBatteryAlloy");
 		GameRegistry.registerItem(itemIngotBatteryAlloy, "itemIngotBatteryAlloy");
diff --git a/src/Java/miscutil/core/item/base/dusts/BaseItemDust.java b/src/Java/miscutil/core/item/base/dusts/BaseItemDust.java
new file mode 100644
index 0000000000..e4dab2a72e
--- /dev/null
+++ b/src/Java/miscutil/core/item/base/dusts/BaseItemDust.java
@@ -0,0 +1,59 @@
+package miscutil.core.item.base.dusts;
+
+import java.util.List;
+
+import miscutil.core.lib.CORE;
+import miscutil.core.util.Utils;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.EnumChatFormatting;
+import cpw.mods.fml.common.registry.GameRegistry;
+
+public class BaseItemDust extends Item{
+
+	protected int colour;
+	protected String materialName;
+	protected String pileType;
+
+	public BaseItemDust(String unlocalizedName, String materialName, int colour, String pileSize) {
+		setUnlocalizedName(unlocalizedName);
+		this.setUnlocalizedName(unlocalizedName);
+		this.setMaxStackSize(64);	
+		if (pileSize == "dust" || pileSize == "Dust"){
+			this.setTextureName(CORE.MODID + ":" + "dust");}
+		else{
+			this.setTextureName(CORE.MODID + ":" + "dust"+pileSize);}
+		this.setMaxStackSize(64);
+		this.colour = colour;
+		this.materialName = materialName;
+		GameRegistry.registerItem(this, unlocalizedName);
+	}
+
+	@Override
+	public void addInformation(ItemStack stack, EntityPlayer aPlayer, List list, boolean bool) {
+		if (pileType != null && materialName != null && pileType != "" && materialName != "" && !pileType.equals("") && !materialName.equals("")){
+			if (this.pileType == "dust"){
+				list.add(EnumChatFormatting.GRAY+"A pile of " + materialName + " dust.");		
+			}
+			else{
+				list.add(EnumChatFormatting.GRAY+"A "+this.pileType.toLowerCase()+" pile of " + materialName + " dust.");		
+			}
+		}
+		super.addInformation(stack, aPlayer, list, bool);
+	}
+
+	public final String getMaterialName() {
+		return materialName;
+	}
+
+	@Override
+	public int getColorFromItemStack(ItemStack stack, int HEX_OxFFFFFF) {
+		if (colour == 0){
+			return Utils.generateSingularRandomHexValue();
+		}
+		return colour;
+
+	}
+
+}
diff --git a/src/Java/miscutil/core/lib/CORE.java b/src/Java/miscutil/core/lib/CORE.java
index ada4460ada..2dc857eeac 100644
--- a/src/Java/miscutil/core/lib/CORE.java
+++ b/src/Java/miscutil/core/lib/CORE.java
@@ -16,7 +16,7 @@ public class CORE {
 
 	public static final String name = "GT++";	
 	public static final String MODID = "miscutils";
-	public static final String VERSION = "1.4.3";
+	public static final String VERSION = "1.4.3.1";
 	public static final boolean DEBUG = false;	
 	public static final boolean LOAD_ALL_CONTENT = false;
 	public static final int GREG_FIRST_ID = 760;
diff --git a/src/Java/miscutil/core/recipe/RECIPES_GREGTECH.java b/src/Java/miscutil/core/recipe/RECIPES_GREGTECH.java
index 80c7a7f2ba..7c28243ef5 100644
--- a/src/Java/miscutil/core/recipe/RECIPES_GREGTECH.java
+++ b/src/Java/miscutil/core/recipe/RECIPES_GREGTECH.java
@@ -6,9 +6,7 @@ import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_OreDictUnificator;
-
-import java.util.Arrays;
-
+import miscutil.core.item.ModItems;
 import miscutil.core.lib.CORE;
 import miscutil.core.util.Utils;
 import miscutil.core.util.fluid.FluidUtils;
@@ -132,9 +130,10 @@ public class RECIPES_GREGTECH {
 	}
 	
 	private static void mixerRecipes(){
-		for (OrePrefixes tPrefix : Arrays.asList(new OrePrefixes[]{OrePrefixes.dust, OrePrefixes.dustSmall, OrePrefixes.dustTiny})) {
-			GT_Values.RA.addMixerRecipe(GT_OreDictUnificator.get(tPrefix, Materials.Uranium, 8L), GT_OreDictUnificator.get(tPrefix, Materials.Titanium, 1L), null, null, GT_Values.NF, GT_Values.NF, UtilsItems.getSimpleStack(RECIPES_Shapeless.dustStaballoy.getItem(), (int) (9L * tPrefix.mMaterialAmount)), (int) (900L * tPrefix.mMaterialAmount / 3628800L), 8);
-			}
+		Utils.LOG_INFO("Registering Mixer Recipes.");
+		GT_Values.RA.addMixerRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Uranium, 8L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Titanium, 1L), null, null, GT_Values.NF, GT_Values.NF, UtilsItems.getSimpleStack(ModItems.itemDustStaballoy, 2), 32, 8);
+		GT_Values.RA.addMixerRecipe(GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Uranium, 8L), GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Titanium, 1L), null, null, GT_Values.NF, GT_Values.NF, UtilsItems.getSimpleStack(ModItems.itemDustSmallStaballoy, 2), 32, 8);
+		GT_Values.RA.addMixerRecipe(GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Uranium, 8L), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Titanium, 1L), null, null, GT_Values.NF, GT_Values.NF, UtilsItems.getSimpleStack(ModItems.itemDustTinyStaballoy, 2), 32, 8);
 		
 	}
 	
diff --git a/src/Java/miscutil/core/recipe/RECIPES_Machines.java b/src/Java/miscutil/core/recipe/RECIPES_Machines.java
index b34bda233f..6f48e1539d 100644
--- a/src/Java/miscutil/core/recipe/RECIPES_Machines.java
+++ b/src/Java/miscutil/core/recipe/RECIPES_Machines.java
@@ -246,7 +246,7 @@ public class RECIPES_Machines {
 			IC2MFSU = UtilsItems.getItemStackWithMeta(LoadedMods.IndustrialCraft2, "IC2:blockElectric", "IC2_MFSU", 2, 1);
 		}
 		if (LoadedMods.Gregtech){
-			RECIPES_Shapeless.dustStaballoy = UtilsItems.getItemStackWithMeta(LoadedMods.Gregtech, "gregtech:gt.metaitem.01", "Staballoy Dust", 2319, 2);
+			RECIPES_Shapeless.dustStaballoy = UtilsItems.getItemStackWithMeta(LoadedMods.MiscUtils, "gregtech:gt.metaitem.01", "Staballoy Dust", 2319, 2);
 			machineCasing_ULV = ItemList.Casing_ULV.get(1);
 			machineCasing_LV = ItemList.Casing_LV.get(1);
 			machineCasing_MV = ItemList.Casing_MV.get(1);
diff --git a/src/Java/miscutil/core/util/Utils.java b/src/Java/miscutil/core/util/Utils.java
index 9a91a03ed8..0e49521ccc 100644
--- a/src/Java/miscutil/core/util/Utils.java
+++ b/src/Java/miscutil/core/util/Utils.java
@@ -366,6 +366,17 @@ public class Utils {
 		int result = getHexNumberFromInt(randInt(min, max));
 		return result;
 	}
+	
+	public static int rgbtoHexValue(int r, int g, int b){		    
+		      Color c = new Color(r,g,b);
+		      String temp = Integer.toHexString( c.getRGB() & 0xFFFFFF ).toUpperCase();	
+
+		      System.out.println( "hex: " + Integer.toHexString( c.getRGB() & 0xFFFFFF ) + " hex value:"+temp); 
+		      temp = Utils.appenedHexNotationToString(String.valueOf(temp));
+				Utils.LOG_INFO("Made "+temp+" - Hopefully it's not a mess.");
+				Utils.LOG_INFO("It will decode into "+Integer.decode(temp)+".");
+				return Integer.decode(temp);
+	}
 
 	/*
 	 * http://javadevnotes.com/java-left-pad-string-with-zeros-examples