Add Propolis and Pollen

optimize imports

7 files changed, 281 insertions, 7 deletions

diff --git a/src/main/java/gregtech/common/items/ItemPollen.java b/src/main/java/gregtech/common/items/ItemPollen.java
new file mode 100644
index 0000000000..6b1d5be2c8
--- /dev/null
+++ b/src/main/java/gregtech/common/items/ItemPollen.java
@@ -0,0 +1,100 @@
+package gregtech.common.items;
+
+import com.google.common.collect.ImmutableMap;
+import cpw.mods.fml.common.registry.GameRegistry;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import forestry.api.core.Tabs;
+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 gregtech.api.enums.OrePrefixes;
+import gregtech.api.util.GT_ModHandler;
+import gregtech.api.util.GT_OreDictUnificator;
+import gregtech.api.util.GT_Utility;
+import gregtech.loaders.materialprocessing.ProcessingModSupport;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.IIcon;
+import net.minecraftforge.fluids.FluidStack;
+
+import java.util.List;
+
+import static gregtech.api.enums.GT_Values.MOD_ID;
+
+public class ItemPollen extends Item {
+	@SideOnly(Side.CLIENT)
+	private IIcon secondIcon;
+
+	public ItemPollen() {
+		super();
+		this.setCreativeTab(Tabs.tabApiculture);
+		this.setHasSubtypes(true);
+		this.setUnlocalizedName("gt.pollen");
+		GameRegistry.registerItem(this, "gt.pollen", MOD_ID);
+	}
+
+	public ItemStack getStackForType(PollenType type) {
+		return new ItemStack(this, 1, type.ordinal());
+	}
+
+	public ItemStack getStackForType(PollenType type, int count) {
+		return new ItemStack(this, count, type.ordinal());
+	}
+
+	@Override
+	@SideOnly(Side.CLIENT)
+	public void getSubItems(Item item, CreativeTabs tabs, List list) {
+		for (PollenType type : PollenType.values()) {
+			if (type.showInList) {
+				list.add(this.getStackForType(type));
+			}
+		}
+	}
+
+	@Override
+	@SideOnly(Side.CLIENT)
+	public boolean requiresMultipleRenderPasses() {
+		return true;
+	}
+
+	@Override
+	public int getRenderPasses(int meta) {
+		return 2;
+	}
+
+	@SideOnly(Side.CLIENT)
+	public void registerIcons(IIconRegister par1IconRegister) {
+		this.itemIcon = par1IconRegister.registerIcon("forestry:pollen.0");
+		this.secondIcon = par1IconRegister.registerIcon("forestry:pollen.1");
+	}
+
+	@Override
+	public IIcon getIcon(ItemStack stack, int pass) {
+		return (pass == 0) ? itemIcon : secondIcon;
+	}
+
+	@Override
+	@SideOnly(Side.CLIENT)
+	public int getColorFromItemStack(ItemStack stack, int pass) {
+		int meta = Math.max(0, Math.min(PollenType.values().length - 1, stack.getItemDamage()));
+		int colour = PollenType.values()[meta].getColours()[0];
+
+		if (pass >= 1) {
+			colour = PollenType.values()[meta].getColours()[1];
+		}
+
+		return colour;
+	}
+
+	@Override
+	public String getItemStackDisplayName(ItemStack stack) {
+		return DropType.values()[stack.getItemDamage()].getName();
+	}
+
+
+}
diff --git a/src/main/java/gregtech/common/items/ItemPropolis.java b/src/main/java/gregtech/common/items/ItemPropolis.java
new file mode 100644
index 0000000000..e4fbd7b416
--- /dev/null
+++ b/src/main/java/gregtech/common/items/ItemPropolis.java
@@ -0,0 +1,92 @@
+package gregtech.common.items;
+
+import com.google.common.collect.ImmutableMap;
+import cpw.mods.fml.common.registry.GameRegistry;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import forestry.api.core.Tabs;
+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 gregtech.api.enums.OrePrefixes;
+import gregtech.api.util.GT_ModHandler;
+import gregtech.api.util.GT_OreDictUnificator;
+import gregtech.api.util.GT_Utility;
+import gregtech.loaders.materialprocessing.ProcessingModSupport;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.IIcon;
+import net.minecraftforge.fluids.FluidStack;
+
+import java.util.List;
+
+import static gregtech.api.enums.GT_Values.MOD_ID;
+
+public class ItemPropolis extends Item {
+	@SideOnly(Side.CLIENT)
+	private IIcon secondIcon;
+
+	public ItemPropolis() {
+		super();
+		this.setCreativeTab(Tabs.tabApiculture);
+		this.setHasSubtypes(true);
+		this.setUnlocalizedName("gt.propolis");
+		GameRegistry.registerItem(this, "gt.propolis", MOD_ID);
+	}
+
+	public ItemStack getStackForType(PropolisType type) {
+		return new ItemStack(this, 1, type.ordinal());
+	}
+
+	public ItemStack getStackForType(PropolisType type, int count) {
+		return new ItemStack(this, count, type.ordinal());
+	}
+
+	@Override
+	@SideOnly(Side.CLIENT)
+	public void getSubItems(Item item, CreativeTabs tabs, List list) {
+		for (PropolisType type : PropolisType.values()) {
+			if (type.showInList) {
+				list.add(this.getStackForType(type));
+			}
+		}
+	}
+
+
+	@SideOnly(Side.CLIENT)
+	public void registerIcons(IIconRegister par1IconRegister) {
+		this.itemIcon = par1IconRegister.registerIcon("forestry:propolis.0");
+	}
+
+	@Override
+	public IIcon getIcon(ItemStack stack, int pass) {
+		return itemIcon;
+	}
+
+	@Override
+	@SideOnly(Side.CLIENT)
+	public int getColorFromItemStack(ItemStack stack, int pass) {
+		int meta = Math.max(0, Math.min(PropolisType.values().length - 1, stack.getItemDamage()));
+		return PropolisType.values()[meta].getColours();
+	}
+
+	@Override
+	public String getItemStackDisplayName(ItemStack stack) {
+		return PropolisType.values()[stack.getItemDamage()].getName();
+	}
+	public void initPropolisRecipes() {
+		ItemStack tPropolis;
+
+		tPropolis = getStackForType(PropolisType.Zoko);
+		//addRecipe(tDrop, aOutput, aOutput2, aChance, aEUt);
+	}
+
+	public void addRecipe(ItemStack tDrop, FluidStack aOutput, ItemStack aOutput2, int aChance, int aEUt) {
+		GT_Values.RA.addFluidExtractionRecipe(tDrop, aOutput2, aOutput, aChance, 40, aEUt);
+	}
+
+}
diff --git a/src/main/java/gregtech/common/items/PollenType.java b/src/main/java/gregtech/common/items/PollenType.java
new file mode 100644
index 0000000000..4ecdbed857
--- /dev/null
+++ b/src/main/java/gregtech/common/items/PollenType.java
@@ -0,0 +1,41 @@
+package gregtech.common.items;
+
+import gregtech.api.enums.Materials;
+import gregtech.api.util.GT_LanguageManager;
+
+public enum PollenType {
+
+	MATRIX("matrix",true);
+
+    private static int[][] colours = new int[][]{
+    	{0x19191B, 0x303032},
+    	{0xffc100, 0x00ff11},
+    	{0x144F5A, 0x2494A2},
+    	{0xC11F1F, 0xEBB9B9},
+    	{0x872836, 0xB8132C},
+    	{0xD02001, 0x9C0018},
+    	{0x003366, 0x0066BB},
+    	{0x1727b1, 0x008ce3},
+    };
+    public boolean showInList;
+    public Materials material;
+    public int chance;
+    private String name;
+    private PollenType(String pName, boolean show) {
+        this.name = pName;
+        this.showInList = show;
+    }
+
+    public void setHidden() {
+        this.showInList = false;
+    }
+
+    public String getName() {
+//		return "gt.comb."+this.name;
+        return GT_LanguageManager.addStringLocalization("pollen." + this.name, this.name.substring(0, 1).toUpperCase() + this.name.substring(1) + " Pollen");
+    }
+
+    public int[] getColours() {
+        return colours[this.ordinal()];
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/gregtech/common/items/PropolisType.java b/src/main/java/gregtech/common/items/PropolisType.java
new file mode 100644
index 0000000000..e9519c5c94
--- /dev/null
+++ b/src/main/java/gregtech/common/items/PropolisType.java
@@ -0,0 +1,35 @@
+package gregtech.common.items;
+
+import gregtech.api.enums.Materials;
+import gregtech.api.util.GT_LanguageManager;
+
+public enum PropolisType {
+
+	Zoko("zoko",true);
+
+    private static int[] colours = new int[]{
+    	0x3A9898
+    };
+
+    public boolean showInList;
+    public Materials material;
+    public int chance;
+    private String name;
+    private PropolisType(String pName, boolean show) {
+        this.name = pName;
+        this.showInList = show;
+    }
+
+    public void setHidden() {
+        this.showInList = false;
+    }
+
+    public String getName() {
+//		return "gt.comb."+this.name;
+        return GT_LanguageManager.addStringLocalization("propolis." + this.name, this.name.substring(0, 1).toUpperCase() + this.name.substring(1) + " Propolis");
+    }
+
+    public int getColours() {
+        return colours[this.ordinal()];
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java b/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java
index b59d58301e..70d9198b9c 100644
--- a/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java
+++ b/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java
@@ -649,6 +649,8 @@ public enum GT_BeeDefinition implements IBeeDefinition {
             AlleleHelper.instance.set(template, EnumBeeChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.UP_1);
             AlleleHelper.instance.set(template, EnumBeeChromosome.FLOWER_PROVIDER, EnumAllele.Flowers.JUNGLE);
             AlleleHelper.instance.set(template, EnumBeeChromosome.EFFECT, AlleleEffect.effectMiasmic);
+            AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.SHORT);
+            AlleleHelper.instance.set(template, EnumBeeChromosome.SPEED, EnumAllele.Speed.SLOWER);
         }
 
         @Override
@@ -783,6 +785,8 @@ public enum GT_BeeDefinition implements IBeeDefinition {
             AlleleHelper.instance.set(template, EnumBeeChromosome.SPEED, EnumAllele.Speed.SLOWER);
             AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.SHORT);
             AlleleHelper.instance.set(template, EnumBeeChromosome.FLOWERING, EnumAllele.Flowering.SLOW);
+            AlleleHelper.instance.set(template, EnumBeeChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.NONE);
+            AlleleHelper.instance.set(template, EnumBeeChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.NONE);
         }
 
         @Override
diff --git a/src/main/java/gregtech/loaders/misc/GT_Bees.java b/src/main/java/gregtech/loaders/misc/GT_Bees.java
index 1dc1479acb..9a302d46c8 100644
--- a/src/main/java/gregtech/loaders/misc/GT_Bees.java
+++ b/src/main/java/gregtech/loaders/misc/GT_Bees.java
@@ -16,8 +16,8 @@ import forestry.api.genetics.IMutationCondition;
 import forestry.core.genetics.alleles.Allele;
 import forestry.core.utils.StringUtil;
 import gregtech.GT_Mod;
-import gregtech.common.items.ItemComb;
-import gregtech.common.items.ItemDrop;
+import gregtech.common.items.*;
+import gregtech.common.items.ItemPropolis;
 import net.minecraft.world.World;
 import net.minecraft.world.biome.BiomeGenBase;
 import net.minecraftforge.common.BiomeManager;
@@ -41,12 +41,17 @@ public class GT_Bees {
     static IAlleleInteger blinkLife;
     static IAlleleInteger superLife;
 
+    public static ItemPropolis propolis;
+    public static ItemPollen pollen;
     public static ItemDrop drop;
     public static ItemComb combs;
 
     public GT_Bees() {
         if (Loader.isModLoaded("Forestry") && GT_Mod.gregtechproxy.mGTBees) {
             setupGTAlleles();
+            propolis = new ItemPropolis();
+            propolis.initPropolisRecipes();
+            pollen = new ItemPollen();
             drop = new ItemDrop();
             drop.initDropsRecipes();
             combs = new ItemComb();
diff --git a/src/main/java/gregtech/loaders/misc/GT_BranchDefinition.java b/src/main/java/gregtech/loaders/misc/GT_BranchDefinition.java
index 0a42467b8e..4066e7f80b 100644
--- a/src/main/java/gregtech/loaders/misc/GT_BranchDefinition.java
+++ b/src/main/java/gregtech/loaders/misc/GT_BranchDefinition.java
@@ -52,11 +52,8 @@ public enum GT_BranchDefinition {
     THAUMIC("Arcanis") {
         @Override
         protected void setBranchProperties(IAllele[] alleles) {
-            AlleleHelper.instance.set(alleles, EnumBeeChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.UP_1);
-            AlleleHelper.instance.set(alleles, EnumBeeChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.DOWN_1);
-            AlleleHelper.instance.set(alleles, EnumBeeChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.UP_1);
-            AlleleHelper.instance.set(alleles, EnumBeeChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.DOWN_1);
-            AlleleHelper.instance.set(alleles, EnumBeeChromosome.NOCTURNAL, true);
+            AlleleHelper.instance.set(alleles, EnumBeeChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.BOTH_1);
+            AlleleHelper.instance.set(alleles, EnumBeeChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.BOTH_1);
             AlleleHelper.instance.set(alleles, EnumBeeChromosome.FLOWER_PROVIDER, EnumAllele.Flowers.VANILLA);
             AlleleHelper.instance.set(alleles, EnumBeeChromosome.FLOWERING, EnumAllele.Flowering.FASTER);
         }