$ Further bee work.

6 files changed, 132 insertions, 23 deletions

diff --git a/src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngot_OLD.java b/src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngot_OLD.java
index ca887937df..e821258d8e 100644
--- a/src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngot_OLD.java
+++ b/src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngot_OLD.java
@@ -23,11 +23,9 @@ public class BaseItemIngot_OLD extends Item{
 	public BaseItemIngot_OLD(final String unlocalizedName, final String materialName, final int colour, final int sRadioactivity) {
 		this.setUnlocalizedName(unlocalizedName);
 		this.setCreativeTab(AddToCreativeTab.tabMisc);
-		this.setUnlocalizedName(unlocalizedName);
 		this.unlocalName = unlocalizedName;
 		this.setMaxStackSize(64);
 		this.setTextureName(CORE.MODID + ":" + "itemIngot");
-		this.setMaxStackSize(64);
 		this.colour = colour;
 		this.materialName = materialName;
 		this.sRadiation = sRadioactivity;
@@ -42,7 +40,7 @@ public class BaseItemIngot_OLD extends Item{
 		if ((temp != null) && !temp.equals("")){
 			GT_OreDictUnificator.registerOre(temp, ItemUtils.getSimpleStack(this));
 		}
-		this.generateCompressorRecipe();
+		//this.generateCompressorRecipe();
 	}
 
 	@Override
diff --git a/src/Java/gtPlusPlus/core/item/base/misc/BaseItemMisc.java b/src/Java/gtPlusPlus/core/item/base/misc/BaseItemMisc.java
index effa81362b..27059e8fde 100644
--- a/src/Java/gtPlusPlus/core/item/base/misc/BaseItemMisc.java
+++ b/src/Java/gtPlusPlus/core/item/base/misc/BaseItemMisc.java
@@ -3,23 +3,28 @@ package gtPlusPlus.core.item.base.misc;
 import java.util.List;
 
 import cpw.mods.fml.common.registry.GameRegistry;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.util.GT_OreDictUnificator;
 import gtPlusPlus.core.creative.AddToCreativeTab;
 import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.lib.LoadedMods;
 import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.entity.EntityUtils;
 import gtPlusPlus.core.util.item.ItemUtils;
 import gtPlusPlus.core.util.math.MathUtils;
+import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
 
 public class BaseItemMisc extends Item{
-	
+
 	public final String displayName;
 	public final String unlocalName;
 	public final MiscTypes miscType;
@@ -32,7 +37,7 @@ public class BaseItemMisc extends Item{
 			final int maxStackSize,
 			final MiscTypes miscType,
 			String[] description) {
-		
+
 		//Set-up the Misc Generic Item
 		this.displayName = displayName;
 		String unlocalName = Utils.sanitizeString(displayName);
@@ -41,9 +46,9 @@ public class BaseItemMisc extends Item{
 		this.setCreativeTab(AddToCreativeTab.tabMisc);
 		this.setUnlocalizedName(this.unlocalName);
 		this.setMaxStackSize(maxStackSize);
-		this.setTextureName(this.getCorrectTextures());
+		//this.setTextureName(this.getCorrectTextures());
 		if (RGB != null){
-		this.componentColour = Utils.rgbtoHexValue(RGB[0], RGB[1], RGB[2]);
+			this.componentColour = Utils.rgbtoHexValue(RGB[0], RGB[1], RGB[2]);
 		}
 		else {
 			this.componentColour = null;
@@ -57,11 +62,40 @@ public class BaseItemMisc extends Item{
 	public String getItemStackDisplayName(final ItemStack p_77653_1_) {
 		return this.displayName+miscType.DISPLAY_NAME_SUFFIX;
 	}
-	
-	private String getCorrectTextures(){
+
+	private String getCorrectTextures(){		
 		return CORE.MODID + ":" + "item"+this.miscType.TYPE;
 	}
 
+	@Override
+	@SideOnly(Side.CLIENT)
+	public boolean requiresMultipleRenderPasses() {
+		return this.miscType == MiscTypes.DROP;
+	}
+
+	@Override
+	public int getRenderPasses(int meta) {
+		return (this.miscType == MiscTypes.DROP) ? 2 : 1;
+	}
+
+	@SideOnly(Side.CLIENT)
+	private IIcon secondIcon;
+	@SideOnly(Side.CLIENT)
+	public void registerIcons(IIconRegister par1IconRegister) {
+		if (this.miscType == MiscTypes.DROP && LoadedMods.Forestry){
+			this.itemIcon = par1IconRegister.registerIcon("forestry:honeyDrop.0");
+			this.secondIcon = par1IconRegister.registerIcon("forestry:honeyDrop.1");
+		}
+		else {
+			this.itemIcon = par1IconRegister.registerIcon(getCorrectTextures());
+		}
+	}
+
+	@Override
+	public IIcon getIcon(ItemStack stack, int pass) {
+		return (pass == 0) ? itemIcon : secondIcon;
+	}
+
 	@SuppressWarnings({ "unchecked", "rawtypes" })
 	@Override
 	public final void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) {
@@ -85,8 +119,8 @@ public class BaseItemMisc extends Item{
 		else {
 			return (int) this.componentColour;
 		}
-		
-		
+
+
 	}
 
 	@Override
@@ -107,12 +141,13 @@ public class BaseItemMisc extends Item{
 		BIGKEY("KeyBig", " Big Key", "bosskey"),
 		BOTTLE("Bottle", " Bottle", "bottle"),
 		GEM("Gem", " Gemstone", "gem"),
+		DROP("Droplet", " Droplet", "droplet"),
 		MUSHROOM("Mushroom", " Mushroom", "mushroom");
 
 		private String TYPE;
 		private String DISPLAY_NAME_SUFFIX;
 		private String OREDICT_PREFIX;
-		
+
 		private MiscTypes (final String LocalName, final String DisplayNameSuffix, final String OreDictPrefix){
 			this.TYPE = LocalName;
 			this.DISPLAY_NAME_SUFFIX = DisplayNameSuffix;
diff --git a/src/Java/gtPlusPlus/xmod/forestry/bees/custom/CustomCombs.java b/src/Java/gtPlusPlus/xmod/forestry/bees/custom/CustomCombs.java
index 8217fafdcb..11f6e71b8d 100644
--- a/src/Java/gtPlusPlus/xmod/forestry/bees/custom/CustomCombs.java
+++ b/src/Java/gtPlusPlus/xmod/forestry/bees/custom/CustomCombs.java
@@ -12,7 +12,7 @@ public enum CustomCombs {
     RUBBER("rubber", true, Materials.Rubber, 100),
     PLASTIC("polyethylene", true, Materials.Plastic, 75),
     PTFE("polytetrafluoroethylene", true, GTPP_Bees.PTFE, 50),
-    PBS("styrene butadiene", true, GTPP_Bees.PBS, 25),
+    PBS("styrene-butadiene", true, GTPP_Bees.PBS, 25),
     
     //Fuels
     BIOMASS("biomass", true, Materials.Biomass, 100),
@@ -51,6 +51,7 @@ public enum CustomCombs {
         {Utils.rgbtoHexValue(75, 75, 75), Utils.rgbtoHexValue(125, 125, 125)}, //
         {Utils.rgbtoHexValue(75, 75, 75), Utils.rgbtoHexValue(125, 125, 125)}, //
         {Utils.rgbtoHexValue(30, 230, 230), Utils.rgbtoHexValue(10, 150, 150)}, // Fluorine
+        {Utils.rgbtoHexValue(75, 75, 75), Utils.rgbtoHexValue(125, 125, 125)}, //
         {Utils.rgbtoHexValue(250, 250, 20), Utils.rgbtoHexValue(200, 200, 5)}, // Force
         {Utils.rgbtoHexValue(60, 180, 200), Utils.rgbtoHexValue(40, 150, 170)}, // Nikolite
         {Utils.rgbtoHexValue(75, 75, 75), Utils.rgbtoHexValue(125, 125, 125)}, //
diff --git a/src/Java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bee_Definition.java b/src/Java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bee_Definition.java
index 00d8c4307d..f33d99af29 100644
--- a/src/Java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bee_Definition.java
+++ b/src/Java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bee_Definition.java
@@ -113,7 +113,7 @@ public enum GTPP_Bee_Definition implements IBeeDefinition {
 		@Override
 		protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
 			beeSpecies.addProduct(getStoneComb(), 0.30f);
-			beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.PTFE), 0.10f);
+			beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.PBS), 0.10f);
 			beeSpecies.setHumidity(EnumHumidity.NORMAL);
 			beeSpecies.setTemperature(EnumTemperature.NORMAL);
 		}
@@ -161,7 +161,7 @@ public enum GTPP_Bee_Definition implements IBeeDefinition {
 		@Override
 		protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
 			beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.SAND), 0.40f);
-			beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.BIOMASS), 0.20f);
+			beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.ETHANOL), 0.20f);
 			beeSpecies.setHumidity(EnumHumidity.NORMAL);
 			beeSpecies.setTemperature(EnumTemperature.NORMAL);
 		}
@@ -173,7 +173,7 @@ public enum GTPP_Bee_Definition implements IBeeDefinition {
 
 		@Override
 		protected void registerMutations() {
-			IBeeMutationCustom tMutation = registerMutation(BIOMASS.species, getSpecies("Farmed"), 5);
+			IBeeMutationCustom tMutation = registerMutation(BIOMASS.species, getSpecies("Farmerly"), 5);
 			tMutation.restrictBiomeType(Type.FOREST);
 		}
 	},
diff --git a/src/Java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bees.java b/src/Java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bees.java
index d26e34ba89..2121517bdd 100644
--- a/src/Java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bees.java
+++ b/src/Java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bees.java
@@ -6,15 +6,36 @@ import java.lang.reflect.Method;
 
 import org.apache.commons.lang3.reflect.FieldUtils;
 
+import com.google.common.collect.ImmutableMap;
+
 import cpw.mods.fml.common.Loader;
+import forestry.api.apiculture.IAlleleBeeSpecies;
+import forestry.api.genetics.AlleleManager;
+import forestry.api.genetics.IAllele;
+import forestry.api.recipes.RecipeManagers;
 import gregtech.GT_Mod;
+import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Materials;
+import gtPlusPlus.core.item.base.ingots.BaseItemIngot_OLD;
+import gtPlusPlus.core.item.base.misc.BaseItemMisc;
+import gtPlusPlus.core.item.base.misc.BaseItemMisc.MiscTypes;
 import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.fluid.FluidUtils;
+import gtPlusPlus.core.util.item.ItemUtils;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.FluidStack;
 
 public class GTPP_Bees {
+	
+	//Custom Comb Drop Base Items
+	public static Item dropForceGem;
+	public static Item dropBiomassBlob;
+	public static Item dropEthanolBlob;
+	public static Item dropNikoliteDust;
+	public static Item dropFluorineBlob;
 
 	//Base Comb Item
     public static ItemCustomComb combs;
@@ -33,11 +54,17 @@ public class GTPP_Bees {
     public GTPP_Bees() {
         if (Loader.isModLoaded("Forestry") /*&& tryGetBeesBoolean()*/) {
         	
-        	//Set Bee Defs from GT via Reflection
-        	//definition = new GTPP_Branch_Definition();
+        	for (IAllele o : AlleleManager.alleleRegistry.getRegisteredAlleles().values()){
+        		//Utils.LOG_INFO("[Bees-Debug] ==================================================");
+        		//Utils.LOG_INFO("[Bees-Debug] Name: "+o.getName());
+        		//Utils.LOG_INFO("[Bees-Debug] Name: "+o.getUnlocalizedName());
+        		//Utils.LOG_INFO("[Bees-Debug] getUID: "+o.getUID());
+        		//Utils.LOG_INFO("[Bees-Debug] isDominant: "+o.isDominant());
+        	}
         	
         	//Set Materials and Comb stacks from GT via Reflection
         	setMaterials();
+        	setCustomItems();
         	
             combs = new ItemCustomComb();
             combs.initCombsRecipes();
@@ -45,7 +72,38 @@ public class GTPP_Bees {
         }
     }
     
-    private static boolean tryGetBeesBoolean(){
+    private void setCustomItems() {
+    	dropForceGem = new BaseItemMisc("Force", new short[]{250, 250, 20}, 64, MiscTypes.GEM, null);
+    	dropBiomassBlob = new BaseItemMisc("Biomass", new short[]{33, 225, 24}, 64, MiscTypes.DROP, null);
+    	dropEthanolBlob = new BaseItemMisc("Ethanol", new short[]{255, 128, 0}, 64, MiscTypes.DROP, null);
+    	
+    	//Nikolite may not exist, so lets make it.
+    	dropNikoliteDust = ItemUtils.generateSpecialUseDusts("Nikolite", "Nikolite", Utils.rgbtoHexValue(60, 180, 200))[2];
+    	if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("ingotNikolite", 1) == null){
+    		new BaseItemIngot_OLD("itemIngotNikolite", "Nikolite", Utils.rgbtoHexValue(60, 180, 200), 0);
+    	}
+    	
+    	dropFluorineBlob = new BaseItemMisc("Fluorine", new short[]{30, 230, 230}, 64, MiscTypes.DROP, null);
+	}
+    
+    private void addRecipes(){
+    	addExtractorRecipe(ItemUtils.getSimpleStack(dropBiomassBlob), FluidUtils.getFluidStack("biomass", 30));
+    	addExtractorRecipe(ItemUtils.getSimpleStack(dropEthanolBlob), FluidUtils.getFluidStack("ethanol", 6));
+    	addExtractorRecipe(ItemUtils.getSimpleStack(dropFluorineBlob), FluidUtils.getFluidStack("fluid.fluorine", 4));		
+    }
+    
+    private boolean addExtractorRecipe(ItemStack input, FluidStack output){
+    	return GT_Values.RA.addFluidExtractionRecipe(
+    			input, 
+    			null, 
+    			output, 
+    			0, 
+    			30, 
+    			8);
+    }
+    
+
+	private static boolean tryGetBeesBoolean(){
 		try {
 			Class<?> mProxy = Class.forName("gregtech.GT_Mod.gregtechproxy");
 			Field mNerf = FieldUtils.getDeclaredField(mProxy, "mGTBees", true);
@@ -68,7 +126,7 @@ public class GTPP_Bees {
     	ReflectionUtils.makeAccessible(gtCombs);
     	Enum gtCombTypeSlag = Enum.valueOf(gtCombEnumClass, "SLAG");
     	Enum gtCombTypeStone = Enum.valueOf(gtCombEnumClass, "STONE");    	
-    	Item oCombObject = (Item) gtCombs.get(null);
+    	Object oCombObject = gtCombs.get(null);
 
     	Utils.LOG_INFO("[Bees-Debug] Field getModifiers: "+gtCombs.getModifiers());
     	Utils.LOG_INFO("[Bees-Debug] Field toGenericString: "+gtCombs.toGenericString());
@@ -88,7 +146,7 @@ public class GTPP_Bees {
 		Utils.LOG_INFO("[Bees] oCombObject: "+(oCombObject != null));
     	
     	
-    	if (gtCombItemClass.isInstance(oCombObject)){
+    	//if (gtCombItemClass.isInstance(oCombObject)){
     		Method getStackForType;
     		getStackForType = gtCombItemClass.getDeclaredMethod("getStackForType", gtCombEnumClass);
     		
@@ -101,10 +159,10 @@ public class GTPP_Bees {
         	if (Comb_Stone == null){
         		Comb_Stone = (ItemStack) getStackForType.invoke(gtBees, gtCombTypeStone);        		
         	}
-    	} 	
+    	/*} 	
     	else {
     		Utils.LOG_INFO("[Bees] oCombObject was not an instance of gregtech.common.items.ItemComb");
-    	}
+    	}*/
     	
     	}
     	catch (NullPointerException | ClassNotFoundException | IllegalArgumentException | IllegalAccessException | NoSuchMethodException | SecurityException | InvocationTargetException e){
diff --git a/src/Java/gtPlusPlus/xmod/forestry/bees/custom/ItemCustomComb.java b/src/Java/gtPlusPlus/xmod/forestry/bees/custom/ItemCustomComb.java
index a927f217d2..adfa6cbf11 100644
--- a/src/Java/gtPlusPlus/xmod/forestry/bees/custom/ItemCustomComb.java
+++ b/src/Java/gtPlusPlus/xmod/forestry/bees/custom/ItemCustomComb.java
@@ -14,6 +14,7 @@ import gregtech.api.enums.OrePrefixes;
 import gregtech.api.util.GT_OreDictUnificator;
 import gregtech.api.util.GT_Utility;
 import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.item.ItemUtils;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.Item;
@@ -104,6 +105,7 @@ public class ItemCustomComb extends Item {
 		//addProcess(tComb, Materials.Silver, 100);
 		//addProcess(tComb, Materials.Galena, 100);
 
+		//Rubbers
 		tComb = getStackForType(CustomCombs.RUBBER);
 		addSpecialCent(tComb, GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Rubber, 1), 30);
 		tComb = getStackForType(CustomCombs.PLASTIC);
@@ -113,6 +115,21 @@ public class ItemCustomComb extends Item {
 		tComb = getStackForType(CustomCombs.PBS);
 		addSpecialCent(tComb, GT_OreDictUnificator.get(OrePrefixes.dustTiny, GTPP_Bees.PBS, 1), 5);
 		
+		
+		//Fuels
+		tComb = getStackForType(CustomCombs.BIOMASS);
+		addSpecialCent(tComb, ItemUtils.getSimpleStack(GTPP_Bees.dropBiomassBlob), 5);
+		tComb = getStackForType(CustomCombs.PBS);
+		addSpecialCent(tComb, ItemUtils.getSimpleStack(GTPP_Bees.dropEthanolBlob), 5);
+
+		//Misc Materials
+		tComb = getStackForType(CustomCombs.FORCE);
+		addSpecialCent(tComb, ItemUtils.getSimpleStack(GTPP_Bees.dropForceGem), 5);
+		tComb = getStackForType(CustomCombs.FLUORINE);
+		addSpecialCent(tComb, ItemUtils.getSimpleStack(GTPP_Bees.dropFluorineBlob), 5);
+		tComb = getStackForType(CustomCombs.NIKOLITE);
+		addSpecialCent(tComb, ItemUtils.getSimpleStack(GTPP_Bees.dropNikoliteDust), 5);
+		
 	}
 	public void addSpecialCent(ItemStack tComb, ItemStack aOutput, int chance){
 		GT_Values.RA.addCentrifugeRecipe(tComb, GT_Values.NI, GT_Values.NF, GT_Values.NF, aOutput,	ItemList.FR_Wax.get(1, new Object[0]), GT_Values.NI, GT_Values.NI, GT_Values.NI, GT_Values.NI, new int[] { chance * 100, 3000 }, 128, 5);