$ Further bee work.

2 files changed, 45 insertions, 12 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;