Move sources and resources

18 files changed, 2378 insertions, 0 deletions

diff --git a/src/main/java/gtPlusPlus/xmod/forestry/HANDLER_FR.java b/src/main/java/gtPlusPlus/xmod/forestry/HANDLER_FR.java
new file mode 100644
index 0000000000..05d00b06d9
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/forestry/HANDLER_FR.java
@@ -0,0 +1,61 @@
+package gtPlusPlus.xmod.forestry;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
+import cpw.mods.fml.common.Optional;
+
+import net.minecraft.block.Block;
+import net.minecraft.world.World;
+
+import gtPlusPlus.core.lib.LoadedMods;
+import gtPlusPlus.core.util.reflect.ReflectionUtils;
+import gtPlusPlus.xmod.forestry.bees.items.FR_ItemRegistry;
+import gtPlusPlus.xmod.forestry.bees.recipe.FR_Gregtech_Recipes;
+
+public class HANDLER_FR {
+
+	public static void preInit(){
+		if (LoadedMods.Forestry){
+			FR_ItemRegistry.Register();
+		}		
+	}
+
+	public static void Init(){
+		if (LoadedMods.Forestry){
+			//new GTPP_Bees(); TODO- Will Investigate this properly later.
+		}
+	}
+
+	public static void postInit(){
+		if (LoadedMods.Forestry){
+			FR_Gregtech_Recipes.registerItems();
+		}
+	}
+
+	public static boolean createBlockBreakParticles(final World world, final int x, final int y, final int z, final Block block){
+		if (LoadedMods.Forestry){
+			createBlockBreakParticles_INTERNAL(world, x, y, z, block);
+		}
+		return false;
+	}
+
+	@Optional.Method(modid = "Forestry")
+	private static void createBlockBreakParticles_INTERNAL(final World world, final int x, final int y, final int z, final Block block){
+		if (LoadedMods.Forestry){
+			Class oClass;
+			try {
+				oClass = ReflectionUtils.getClass("forestry.core.proxy.ProxyCommon");
+				Object oProxy = ReflectionUtils.getField(oClass, "common");				
+				if (oProxy != null && oClass.isInstance(oProxy)){					
+					Method mParticles = ReflectionUtils.getMethod(oClass, "addBlockDestroyEffects", World.class, int.class, int.class, int.class, Block.class, int.class);					
+					mParticles.invoke(oProxy, world, x, y, z, block, 0);				
+				}
+			}
+			catch (SecurityException | IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
+			}
+		}		
+	}
+
+
+}
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/blocks/BlockDenseBeeHouse.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/blocks/BlockDenseBeeHouse.java
new file mode 100644
index 0000000000..77ee15c5d5
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/blocks/BlockDenseBeeHouse.java
@@ -0,0 +1,24 @@
+
+/*******************************************************************************
+ * Copyright (c) 2011-2014 SirSengir.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Lesser Public License v3
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/lgpl-3.0.txt
+ *
+ * Various Contributors including, but not limited to:
+ * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges
+ ******************************************************************************/
+package gtPlusPlus.xmod.forestry.bees.blocks;
+
+import forestry.apiculture.blocks.BlockApicultureType;
+import forestry.core.blocks.BlockBase;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+
+public class BlockDenseBeeHouse extends BlockBase<BlockApicultureType> {
+	public BlockDenseBeeHouse() {
+		super();
+		setCreativeTab(AddToCreativeTab.tabBOP);
+		setHarvestLevel("axe", 0);
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/blocks/FR_BlockRegistry.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/blocks/FR_BlockRegistry.java
new file mode 100644
index 0000000000..fa36732cb6
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/blocks/FR_BlockRegistry.java
@@ -0,0 +1,26 @@
+package gtPlusPlus.xmod.forestry.bees.blocks;
+
+import cpw.mods.fml.common.registry.GameRegistry;
+
+import net.minecraft.block.Block;
+import net.minecraft.item.ItemBlock;
+import net.minecraft.item.ItemStack;
+
+import forestry.core.utils.StringUtil;
+import forestry.plugins.PluginManager;
+import net.minecraftforge.oredict.OreDictionary;
+
+public abstract class FR_BlockRegistry {
+	protected static <T extends Block> T registerBlock(T block, Class<? extends ItemBlock> itemClass, String name) {
+		if (PluginManager.getStage() != PluginManager.Stage.SETUP) {
+			throw new RuntimeException("Tried to register Block outside of Setup");
+		}
+		block.setBlockName("for." + name);
+		GameRegistry.registerBlock(block, itemClass, StringUtil.cleanBlockName(block));
+		return block;
+	}
+
+	protected static void registerOreDictWildcard(String oreDictName, Block block) {
+		OreDictionary.registerOre(oreDictName, new ItemStack(block, 1, 32767));
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/CustomCombs.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/CustomCombs.java
new file mode 100644
index 0000000000..b4d6e4c2fc
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/CustomCombs.java
@@ -0,0 +1,119 @@
+package gtPlusPlus.xmod.forestry.bees.custom;
+
+import gregtech.api.enums.Materials;
+import gregtech.api.util.GT_LanguageManager;
+
+import gtPlusPlus.core.util.Utils;
+
+public enum CustomCombs {    
+    //Custom Bees
+    	
+    //Rubbers & Silicons
+    SILICON("silicon", true, Materials.Silicon, 100),
+    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),
+    
+    //Fuels
+    BIOMASS("biomass", true, Materials.Biomass, 100),
+    ETHANOL("ethanol", true, Materials.Ethanol, 75),
+    DIESEL("diesel", true, Materials.Fuel, 50),
+    NITRO("nitro", true, Materials.NitroFuel, 25),
+    HOOTCH("hootch", true, Materials.Silicon, 50),
+    ROCKETFUEL("rocket", true, Materials.Silicon, 25),
+    
+    
+    //Materials which are hard, if not impossible to obtain.
+    FLUORINE("fluorine", true, Materials.Fluorine, 25),
+    COKE("coke", true, Materials._NULL, 50),
+    FORCE("force", true, Materials.Force, 50),
+    NIKOLITE("nikolite", true, Materials.Nikolite, 75),  
+    MITHRIL("mithril", true, Materials.Mithril, 10),
+    ADAMANTIUM("adamantium", true, Materials.Adamantium, 5),
+    
+	//Trash
+    SALT("salt", true, Materials.Salt, 75),
+    SAND("sand", true, Materials.Sand, 100), 
+    
+    ;
+
+    private static int[][] colours = new int[][]{
+        {Utils.rgbtoHexValue(75, 75, 75), Utils.rgbtoHexValue(125, 125, 125)}, //SILICON
+        {Utils.rgbtoHexValue(55, 55, 55), Utils.rgbtoHexValue(75, 75, 75)}, //RUBBER
+        {Utils.rgbtoHexValue(245, 245, 245), Utils.rgbtoHexValue(175, 175, 175)}, //PLASTIC
+        {Utils.rgbtoHexValue(150, 150, 150), Utils.rgbtoHexValue(75, 75, 75)}, //PTFE
+        {Utils.rgbtoHexValue(33, 26, 24), Utils.rgbtoHexValue(23, 16, 14)}, //PBS
+        //Unused
+        {Utils.rgbtoHexValue(33, 225, 24), Utils.rgbtoHexValue(23, 175, 14)}, //Biofuel
+        {Utils.rgbtoHexValue(255, 128, 0), Utils.rgbtoHexValue(220, 156, 32)}, //Ethanol
+        {Utils.rgbtoHexValue(75, 75, 75), Utils.rgbtoHexValue(125, 125, 125)}, //
+        {Utils.rgbtoHexValue(75, 75, 75), Utils.rgbtoHexValue(125, 125, 125)}, // 
+        {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)}, //
+        {Utils.rgbtoHexValue(75, 75, 75), Utils.rgbtoHexValue(125, 125, 125)}, //
+        {Utils.rgbtoHexValue(75, 75, 75), Utils.rgbtoHexValue(125, 125, 125)}, //
+        {Utils.rgbtoHexValue(75, 75, 75), Utils.rgbtoHexValue(125, 125, 125)}, //
+        {Utils.rgbtoHexValue(75, 75, 75), Utils.rgbtoHexValue(125, 125, 125)},
+            {0x666666, 0x525252},
+            {0x2E8F5B, 0xDCC289},
+            {0x4C4C4C, 0x333333},
+            {0x808080, 0x999999},
+            {0x57CFFB, 0xBBEEFF},
+            {0x7D0F0F, 0xD11919},
+            {0x1947D1, 0x476CDA},
+            {0xE6005C, 0xCC0052},
+            {0x0033CC, 0x00248F},
+            {0xCCFFFF, 0xA3CCCC},
+            {0x248F24, 0xCCFFCC},
+            {0x248F24, 0x2EB82E},
+            {0xD4D4D4, 0x58300B},
+            {0xFF6600, 0xE65C00},
+            {0xD4D4D4, 0xDDDDDD},
+            {0x666699, 0xA3A3CC},
+            {0xDA9147, 0xDE9C59},
+            {0x808080, 0x999999},
+            {0x8585AD, 0x9D9DBD},
+            {0xF0DEF0, 0xF2E1F2},
+            {0xC2C2D6, 0xCECEDE},
+            {0xE6B800, 0xCFA600},
+            {0x008AB8, 0xD6D6FF},
+            {0xD5D5D5, 0xAAAAAA},
+            {0xCC99FF, 0xDBB8FF},
+            {0xEBA1EB, 0xF2C3F2},
+            {0x62626D, 0x161620},
+            {0xE6E6E6, 0xFFFFCC},
+            {0xDADADA, 0xD1D1E0},
+            {0x19AF19, 0x169E16},
+            {0x335C33, 0x6B8F00},
+            {0x003300, 0x002400},
+    };
+    public boolean showInList;
+    public Materials material;
+    public int chance;
+    private String name;
+    private CustomCombs(String pName, boolean show, Materials material, int chance) {
+        this.name = pName;
+        this.material = material;
+        this.chance = chance;
+        this.showInList = show;
+    }
+
+    public void setHidden() {
+        this.showInList = false;
+    }
+
+    public String getName() {
+//		return "gt.comb."+this.name;
+        return GT_LanguageManager.addStringLocalization("comb." + this.name, this.name.substring(0, 1).toUpperCase() + this.name.substring(1) + " Comb");
+    }
+
+    public int[] getColours() {
+        return colours[this.ordinal()];
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bee_Definition.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bee_Definition.java
new file mode 100644
index 0000000000..b36508f6aa
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bee_Definition.java
@@ -0,0 +1,876 @@
+package gtPlusPlus.xmod.forestry.bees.custom;
+
+import java.lang.reflect.Field;
+import java.util.Arrays;
+import java.util.Locale;
+
+import org.apache.commons.lang3.reflect.FieldUtils;
+import org.apache.commons.lang3.text.WordUtils;
+
+import net.minecraft.item.ItemStack;
+
+import forestry.api.apiculture.*;
+import forestry.api.core.EnumHumidity;
+import forestry.api.core.EnumTemperature;
+import forestry.api.genetics.AlleleManager;
+import forestry.api.genetics.IAllele;
+import forestry.apiculture.genetics.*;
+import forestry.core.genetics.alleles.AlleleHelper;
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.core.item.ModItems;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+import gtPlusPlus.core.util.reflect.ReflectionUtils;
+import net.minecraftforge.common.BiomeDictionary.Type;
+
+public enum GTPP_Bee_Definition implements IBeeDefinition {
+
+
+	SILICON(GTPP_Branch_Definition.ORGANIC, "Silicon", true, Utils.rgbtoHexValue(75, 75, 75), Utils.rgbtoHexValue(125, 125, 125)) {
+		@Override
+		protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
+			beeSpecies.addProduct(getSlagComb(), 0.10f);
+			beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.SILICON), 0.20f);
+			beeSpecies.setHumidity(EnumHumidity.NORMAL);
+			beeSpecies.setTemperature(EnumTemperature.NORMAL);
+		}
+
+		@Override
+		protected void setAlleles(IAllele[] template) {
+			template = BeeDefinition.COMMON.getTemplate();
+		}
+
+		@Override
+		protected void registerMutations() {
+			IBeeMutationCustom tMutation = registerMutation(getGregtechBeeType("SLIMEBALL"), getGregtechBeeType("STICKYRESIN"), 10);
+		}
+	},
+
+	RUBBER(GTPP_Branch_Definition.ORGANIC, "Rubber", true, Utils.rgbtoHexValue(55, 55, 55), Utils.rgbtoHexValue(75, 75, 75)) {
+		@Override
+		protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
+			beeSpecies.addProduct(getSlagComb(), 0.10f);
+			beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.RUBBER), 0.30f);
+			beeSpecies.setHumidity(EnumHumidity.NORMAL);
+			beeSpecies.setTemperature(EnumTemperature.NORMAL);
+		}
+
+		@Override
+		protected void setAlleles(IAllele[] template) {
+			template = BeeDefinition.COMMON.getTemplate();
+		}
+
+		@Override
+		protected void registerMutations() {
+			IBeeMutationCustom tMutation = registerMutation(getGregtechBeeType("SLIMEBALL"), getGregtechBeeType("STICKYRESIN"), 10);
+		}
+	},
+
+	PLASTIC(GTPP_Branch_Definition.ORGANIC, "Plastic", true, Utils.rgbtoHexValue(245, 245, 245), Utils.rgbtoHexValue(175, 175, 175)) {
+		@Override
+		protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
+			beeSpecies.addProduct(getStoneComb(), 0.30f);
+			beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.PLASTIC), 0.15f);
+			beeSpecies.setHumidity(EnumHumidity.NORMAL);
+			beeSpecies.setTemperature(EnumTemperature.NORMAL);
+		}
+
+		@Override
+		protected void setAlleles(IAllele[] template) {
+			template = BeeDefinition.COMMON.getTemplate();
+		}
+
+		@Override
+		protected void registerMutations() {
+			IBeeMutationCustom tMutation = registerMutation(RUBBER.species, getGregtechBeeType("OIL"), 10);
+		}
+	},
+
+	PTFE(GTPP_Branch_Definition.ORGANIC, "Ptfe", true, Utils.rgbtoHexValue(150, 150, 150), Utils.rgbtoHexValue(75, 75, 75)) {
+		@Override
+		protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
+			beeSpecies.addProduct(getStoneComb(), 0.30f);
+			beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.PTFE), 0.10f);
+			beeSpecies.setHumidity(EnumHumidity.NORMAL);
+			beeSpecies.setTemperature(EnumTemperature.NORMAL);
+		}
+
+		@Override
+		protected void setAlleles(IAllele[] template) {
+			template = BeeDefinition.COMMON.getTemplate();
+		}
+
+		@Override
+		protected void registerMutations() {
+			IBeeMutationCustom tMutation = registerMutation(RUBBER.species, PLASTIC.species, 10);
+		}
+	},
+
+	PBS(GTPP_Branch_Definition.ORGANIC, "Pbs", true, Utils.rgbtoHexValue(33, 26, 24), Utils.rgbtoHexValue(23, 16, 14)) {
+		@Override
+		protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
+			beeSpecies.addProduct(getStoneComb(), 0.30f);
+			beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.PBS), 0.10f);
+			beeSpecies.setHumidity(EnumHumidity.NORMAL);
+			beeSpecies.setTemperature(EnumTemperature.NORMAL);
+		}
+
+		@Override
+		protected void setAlleles(IAllele[] template) {
+			template = BeeDefinition.COMMON.getTemplate();
+		}
+
+		@Override
+		protected void registerMutations() {
+			IBeeMutationCustom tMutation = registerMutation(PTFE.species, PLASTIC.species, 10);
+		}
+	},
+
+
+
+
+	/**
+	 * Fuels
+	 */
+
+	BIOMASS(GTPP_Branch_Definition.ORGANIC, "Biomass", true, Utils.rgbtoHexValue(33, 225, 24), Utils.rgbtoHexValue(23, 175, 14)) {
+		@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.setHumidity(EnumHumidity.NORMAL);
+			beeSpecies.setTemperature(EnumTemperature.NORMAL);
+		}
+
+		@Override
+		protected void setAlleles(IAllele[] template) {
+			template = BeeDefinition.COMMON.getTemplate();
+		}
+
+		@Override
+		protected void registerMutations() {
+			IBeeMutationCustom tMutation = registerMutation(getSpecies("Industrious"), getSpecies("Rural"), 10);
+			tMutation.restrictBiomeType(Type.FOREST);
+		}
+	},
+
+	ETHANOL(GTPP_Branch_Definition.ORGANIC, "Ethanol", true, Utils.rgbtoHexValue(255, 128, 0), Utils.rgbtoHexValue(220, 156, 32)) {
+		@Override
+		protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
+			beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.SAND), 0.40f);
+			beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.ETHANOL), 0.20f);
+			beeSpecies.setHumidity(EnumHumidity.NORMAL);
+			beeSpecies.setTemperature(EnumTemperature.NORMAL);
+		}
+
+		@Override
+		protected void setAlleles(IAllele[] template) {
+			template = BeeDefinition.COMMON.getTemplate();
+		}
+
+		@Override
+		protected void registerMutations() {
+			IBeeMutationCustom tMutation = registerMutation(BIOMASS.species, getSpecies("Farmerly"), 5);
+			tMutation.restrictBiomeType(Type.FOREST);
+		}
+	},
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+	/**
+	 * Materials
+	 */
+
+
+	FLUORINE(GTPP_Branch_Definition.ORGANIC, "Fluorine", true, Utils.rgbtoHexValue(30, 230, 230), Utils.rgbtoHexValue(10, 150, 150)) {
+		@Override
+		protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
+			beeSpecies.addProduct(getStoneComb(), 0.40f);
+			beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.FLUORINE), 0.05f);
+			beeSpecies.setHumidity(EnumHumidity.NORMAL);
+			beeSpecies.setTemperature(EnumTemperature.COLD);
+		}
+
+		@Override
+		protected void setAlleles(IAllele[] template) {
+			template = BeeDefinition.COMMON.getTemplate();
+		}
+
+		@Override
+		protected void registerMutations() {
+			IBeeMutationCustom tMutation = registerMutation(getGregtechBeeType("LAPIS"), getGregtechBeeType("SAPPHIRE"), 5);
+			tMutation.restrictBiomeType(Type.COLD);
+		}
+	},
+
+	//Coke
+
+
+
+	//Force
+	FORCE(GTPP_Branch_Definition.METAL, "Force", true, Utils.rgbtoHexValue(250, 250, 20), Utils.rgbtoHexValue(200, 200, 5)) {
+		@Override
+		protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
+			beeSpecies.addProduct(getStoneComb(), 0.30f);
+			beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.SAND), 0.25f);
+			beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.FORCE), 0.25f);
+			beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.SALT), 0.05f);
+			beeSpecies.setHumidity(EnumHumidity.NORMAL);
+			beeSpecies.setTemperature(EnumTemperature.HOT);
+		}
+
+		@Override
+		protected void setAlleles(IAllele[] template) {
+			template = BeeDefinition.COMMON.getTemplate();
+		}
+
+		@Override
+		protected void registerMutations() {
+			IBeeMutationCustom tMutation = registerMutation(getGregtechBeeType("STEEL"), getGregtechBeeType("GOLD"), 10);
+			tMutation.restrictBiomeType(Type.HOT);
+		}
+	},
+
+	//Nikolite
+	NIKOLITE(GTPP_Branch_Definition.METAL, "Nikolite", true, Utils.rgbtoHexValue(60, 180, 200), Utils.rgbtoHexValue(40, 150, 170)) {
+		@Override
+		protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
+			beeSpecies.addProduct(getStoneComb(), 0.30f);
+			beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.NIKOLITE), 0.05f);
+			beeSpecies.setHumidity(EnumHumidity.NORMAL);
+			beeSpecies.setTemperature(EnumTemperature.HOT);
+		}
+
+		@Override
+		protected void setAlleles(IAllele[] template) {
+			template = BeeDefinition.COMMON.getTemplate();
+		}
+
+		@Override
+		protected void registerMutations() {
+			IBeeMutationCustom tMutation = registerMutation(getGregtechBeeType("ALUMINIUM"), getGregtechBeeType("SILVER"), 8);
+			tMutation.restrictBiomeType(Type.HOT);
+		}
+	},
+
+
+
+
+
+
+
+	/*
+
+
+	CLAY(GTPP_Branch_Definition.ORGANIC, "Clay", true, 0x19d0ec, 0xffdc16) {
+        @Override
+        protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
+            beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 0), 0.30f);
+            beeSpecies.addProduct(new ItemStack(Items.clay_ball, 1), 0.15f);
+            beeSpecies.setHumidity(EnumHumidity.DAMP);
+            beeSpecies.setTemperature(EnumTemperature.NORMAL);
+        }
+
+        @Override
+        protected void setAlleles(IAllele[] template) {
+            template = BeeDefinition.MEADOWS.getTemplate();
+        }
+
+        @Override
+        protected void registerMutations() {
+            IBeeMutationCustom tMutation = registerMutation(getSpecies("Industrious"), getSpecies("Diligent"), 20);
+        }
+    },
+    SLIMEBALL(GTPP_Branch_Definition.ORGANIC, "SlimeBall", true, 0x4E9E55, 0x00FF15) {
+        @Override
+        protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
+            beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 15), 0.30f);
+            beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.STICKY), 0.30f);
+            beeSpecies.setHumidity(EnumHumidity.DAMP);
+            beeSpecies.setTemperature(EnumTemperature.NORMAL);
+        }
+
+        @Override
+        protected void setAlleles(IAllele[] template) {
+            template = BeeDefinition.MARSHY.getTemplate();
+        }
+
+        @Override
+        protected void registerMutations() {
+        	IBeeMutationCustom tMutation = registerMutation(getSpecies("Marshy"), CLAY.species, 15);
+        }
+    },
+    PEAT(GTPP_Branch_Definition.ORGANIC, "Peat", true, 0x906237, 0x58300B) {
+        @Override
+        protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
+            beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.LIGNIE), 0.30f);
+            beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 0), 0.15f);
+            beeSpecies.setHumidity(EnumHumidity.NORMAL);
+            beeSpecies.setTemperature(EnumTemperature.NORMAL);
+        }
+
+        @Override
+        protected void setAlleles(IAllele[] template) {
+            template = BeeDefinition.RURAL.getTemplate();
+        }
+
+        @Override
+        protected void registerMutations() {
+        	IBeeMutationCustom tMutation = registerMutation(getSpecies("Rural"), CLAY.species, 20);
+        }
+    },
+    STICKYRESIN(GTPP_Branch_Definition.ORGANIC, "StickyResin", true, 0x2E8F5B, 0xDCC289) {
+        @Override
+        protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
+            beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 0), 0.30f);
+            beeSpecies.addProduct(ItemList.IC2_Resin.get(1, new Object[0]), 0.15f);
+            beeSpecies.setHumidity(EnumHumidity.NORMAL);
+            beeSpecies.setTemperature(EnumTemperature.NORMAL);
+        }
+
+        @Override
+        protected void setAlleles(IAllele[] template) {
+            template = BeeDefinition.MEADOWS.getTemplate();
+        }
+
+        @Override
+        protected void registerMutations() {
+        	IBeeMutationCustom tMutation = registerMutation(SLIMEBALL.species, PEAT.species, 25);
+        }
+    },
+    COAL(GTPP_Branch_Definition.ORGANIC, "Coal", true, 0x666666, 0x525252) {
+        @Override
+        protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
+            beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.LIGNIE), 0.30f);
+            beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.COAL), 0.15f);
+            beeSpecies.setHumidity(EnumHumidity.NORMAL);
+            beeSpecies.setTemperature(EnumTemperature.NORMAL);
+        }
+
+        @Override
+        protected void setAlleles(IAllele[] template) {
+            template = BeeDefinition.AUSTERE.getTemplate();
+        }
+
+        @Override
+        protected void registerMutations() {
+        	IBeeMutationCustom tMutation = registerMutation(getSpecies("Industrious"), PEAT.species, 18);
+        }
+    },
+    OIL(GTPP_Branch_Definition.ORGANIC, "Oil", true, 0x4C4C4C, 0x333333) {
+        @Override
+        protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
+            beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 0), 0.30f);
+            beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.OIL), 0.15f);
+            beeSpecies.setHumidity(EnumHumidity.DAMP);
+            beeSpecies.setTemperature(EnumTemperature.NORMAL);
+            beeSpecies.setNocturnal();
+        }
+
+        @Override
+        protected void setAlleles(IAllele[] template) {
+            template = BeeDefinition.MEADOWS.getTemplate();
+        }
+
+        @Override
+        protected void registerMutations() {
+        	IBeeMutationCustom tMutation = registerMutation(COAL.species, STICKYRESIN.species, 8);
+        }
+    },
+    REDSTONE(GTPP_Branch_Definition.GEM, "Redstone", true, 0x7D0F0F, 0xD11919) {
+        @Override
+        protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
+            beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.STONE), 0.30f);
+            beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.REDSTONE), 0.15f);
+            beeSpecies.setHumidity(EnumHumidity.NORMAL);
+            beeSpecies.setTemperature(EnumTemperature.NORMAL);
+        }
+
+        @Override
+        protected void setAlleles(IAllele[] template) {
+            template = BeeDefinition.COMMON.getTemplate();
+        }
+
+        @Override
+        protected void registerMutations() {
+        	IBeeMutationCustom tMutation = registerMutation(getSpecies("Industrious"), getSpecies("Demonic"), 20);
+        }
+    },
+    LAPIS(GTPP_Branch_Definition.GEM, "Lapis", true, 0x1947D1, 0x476CDA) {
+        @Override
+        protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
+            beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.STONE), 0.30f);
+            beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.LAPIS), 0.15f);
+            beeSpecies.setHumidity(EnumHumidity.NORMAL);
+            beeSpecies.setTemperature(EnumTemperature.NORMAL);
+        }
+
+        @Override
+        protected void setAlleles(IAllele[] template) {
+            template = BeeDefinition.COMMON.getTemplate();
+        }
+
+        @Override
+        protected void registerMutations() {
+        	IBeeMutationCustom tMutation = registerMutation(getSpecies("Demonic"), getSpecies("Imperial"), 20);
+        }
+    },
+    CERTUS(GTPP_Branch_Definition.GEM, "CertusQuartz", true, 0x57CFFB, 0xBBEEFF) {
+        @Override
+        protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
+            beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.STONE), 0.30f);
+            beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.CERTUS), 0.15f);
+            beeSpecies.setHumidity(EnumHumidity.NORMAL);
+            beeSpecies.setTemperature(EnumTemperature.NORMAL);
+        }
+
+        @Override
+        protected void setAlleles(IAllele[] template) {
+            template = BeeDefinition.COMMON.getTemplate();
+        }
+
+        @Override
+        protected void registerMutations() {
+        	IBeeMutationCustom tMutation = registerMutation(getSpecies("Hermitic"), LAPIS.species, 20);
+        }
+    },
+    RUBY(GTPP_Branch_Definition.GEM, "Ruby", true, 0xE6005C, 0xCC0052) {
+        @Override
+        protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
+            beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.STONE), 0.30f);
+            beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.RUBY), 0.15f);
+            beeSpecies.setHumidity(EnumHumidity.NORMAL);
+            beeSpecies.setTemperature(EnumTemperature.NORMAL);
+        }
+
+        @Override
+        protected void setAlleles(IAllele[] template) {
+            template = BeeDefinition.COMMON.getTemplate();
+        }
+
+        @Override
+        protected void registerMutations() {
+        	IBeeMutationCustom tMutation = registerMutation(REDSTONE.species, DIAMOND.species, 10);
+        }
+    },
+    SAPPHIRE(GTPP_Branch_Definition.GEM, "Sapphire", true, 0x0033CC, 0x00248F) {
+        @Override
+        protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
+            beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.STONE), 0.30f);
+            beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.SAPPHIRE), 0.15f);
+            beeSpecies.setHumidity(EnumHumidity.NORMAL);
+            beeSpecies.setTemperature(EnumTemperature.NORMAL);
+        }
+
+        @Override
+        protected void setAlleles(IAllele[] template) {
+            template = BeeDefinition.COMMON.getTemplate();
+        }
+
+        @Override
+        protected void registerMutations() {
+        	IBeeMutationCustom tMutation = registerMutation(CERTUS.species, LAPIS.species, 10);
+        }
+    },
+    DIAMOND(GTPP_Branch_Definition.GEM, "Diamond", true, 0xCCFFFF, 0xA3CCCC) {
+        @Override
+        protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
+            beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.STONE), 0.30f);
+            beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.DIAMOND), 0.15f);
+            beeSpecies.setHumidity(EnumHumidity.NORMAL);
+            beeSpecies.setTemperature(EnumTemperature.NORMAL);
+        }
+
+        @Override
+        protected void setAlleles(IAllele[] template) {
+            template = BeeDefinition.COMMON.getTemplate();
+        }
+
+        @Override
+        protected void registerMutations() {
+        	IBeeMutationCustom tMutation = registerMutation(CERTUS.species, COAL.species, 6);
+        }
+    },
+    OLIVINE(GTPP_Branch_Definition.GEM, "Olivine", true, 0x248F24, 0xCCFFCC) {
+        @Override
+        protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
+            beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.STONE), 0.30f);
+            beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.OLIVINE), 0.15f);
+            beeSpecies.setHumidity(EnumHumidity.NORMAL);
+            beeSpecies.setTemperature(EnumTemperature.NORMAL);
+        }
+
+        @Override
+        protected void setAlleles(IAllele[] template) {
+            template = BeeDefinition.COMMON.getTemplate();
+        }
+
+        @Override
+        protected void registerMutations() {
+        	IBeeMutationCustom tMutation = registerMutation(CERTUS.species, getSpecies("Ended"), 10);
+        }
+    },
+    EMERALD(GTPP_Branch_Definition.GEM, "Emerald", true, 0x248F24, 0x2EB82E) {
+