Added some bees and shit.

Added Force.
Updated how GT++ material components get localized.

2 files changed, 235 insertions, 215 deletions

diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_BeeDefinition.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_BeeDefinition.java
index 7fcf4bf98f..f94a178007 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_BeeDefinition.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_BeeDefinition.java
@@ -20,22 +20,23 @@ import forestry.core.genetics.alleles.AlleleHelper;
 import forestry.core.genetics.alleles.EnumAllele.Lifespan;
 import forestry.core.genetics.alleles.EnumAllele.Tolerance;
 import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.Materials;
 import gregtech.api.util.GT_LanguageManager;
 import gregtech.api.util.GT_ModHandler;
 import gregtech.common.items.CombType;
 import gregtech.loaders.misc.GT_Bees;
 import gtPlusPlus.core.material.ELEMENT.STANDALONE;
+import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.minecraft.MaterialUtils;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
 import gtPlusPlus.xmod.forestry.bees.handler.GTPP_CombType;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.common.BiomeDictionary.Type;
 
-
-
 public enum GTPP_BeeDefinition implements IBeeDefinition {
 	
-    DRAGONBLOOD(GTPP_BranchDefinition.LEGENDARY, "Dragon Blood", true, Utils.rgbtoHexValue(220, 20, 20), Utils.rgbtoHexValue(20, 20, 20),
+    DRAGONBLOOD(GTPP_BranchDefinition.LEGENDARY, "Dragon Blood", STANDALONE.DRAGON_METAL, true, Utils.rgbtoHexValue(220, 20, 20), Utils.rgbtoHexValue(20, 20, 20),
             beeSpecies -> {
                 beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 8), 0.30f);
                 beeSpecies.addSpecialty(GTPP_Bees.combs.getStackForType(GTPP_CombType.DRAGONBLOOD), 0.10f);
@@ -56,7 +57,7 @@ public enum GTPP_BeeDefinition implements IBeeDefinition {
                 tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(1, "End"));//End Dim
             }
     ),
-    FORCE(GTPP_BranchDefinition.LEGENDARY, "Force", true, Utils.rgbtoHexValue(250, 250, 20), Utils.rgbtoHexValue(200, 200, 5),
+    FORCE(GTPP_BranchDefinition.LEGENDARY, "Force", STANDALONE.FORCE, true, Utils.rgbtoHexValue(250, 250, 20), Utils.rgbtoHexValue(200, 200, 5),
             beeSpecies -> {
                 beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.STONE), 0.30f);
                 beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SALT), 0.15f);
@@ -79,223 +80,215 @@ public enum GTPP_BeeDefinition implements IBeeDefinition {
     ),
     
     ;
-    private final GTPP_BranchDefinition branch;
-    private final GTPP_AlleleBeeSpecies species;
-    private final Consumer<GTPP_AlleleBeeSpecies> mSpeciesProperties;
-    private final Consumer<IAllele[]> mAlleles;
-    private final Consumer<GTPP_BeeDefinition> mMutations;
-    private IAllele[] template;
-    private IBeeGenome genome;
-
-    GTPP_BeeDefinition(GTPP_BranchDefinition branch,
-                     String binomial,
-                     boolean dominant,
-                     int primary,
-                     int secondary,
-                     Consumer<GTPP_AlleleBeeSpecies> aSpeciesProperties,
-                     Consumer<IAllele[]> aAlleles,
-                     Consumer<GTPP_BeeDefinition> aMutations
-    ) {
-        this.mAlleles = aAlleles;
-        this.mMutations = aMutations;
-        this.mSpeciesProperties = aSpeciesProperties;
-        String lowercaseName = this.toString().toLowerCase(Locale.ENGLISH);
-        String species = WordUtils.capitalize(binomial);
-
-        String uid = "gtpp.bee.species" + species;
-        String description = "for.description." + species;
-        String name = "for.bees.species." + lowercaseName;
-        GT_LanguageManager.addStringLocalization("for.bees.species." + lowercaseName, species, true);
-
-        this.branch = branch;
-        this.species = new GTPP_AlleleBeeSpecies(uid, dominant, name, "GT++", description, branch.getBranch(), binomial, primary, secondary);
-    }
-
-    public static void initBees() {
-        for (GTPP_BeeDefinition bee : values()) {
-            bee.init();
-        }
-        for (GTPP_BeeDefinition bee : values()) {
-            bee.registerMutations();
-        }
-    }
-
-    protected static IAlleleBeeEffect getEffect(byte modid, String name) {
-        String s;
-        switch (modid) {
-            case GTPP_Bees.EXTRABEES:
-                s = "extrabees.effect." + name;
-                break;
-            case GTPP_Bees.GENDUSTRY:
-                s = "gendustry.effect." + name;
-                break;
-            case GTPP_Bees.MAGICBEES:
-                s = "magicbees.effect" + name;
-                break;
-            case GTPP_Bees.GREGTECH:
-                s = "gregtech.effect" + name;
-                break;
-            default:
-                s = "forestry.effect" + name;
-                break;
-
-        }
-        return (IAlleleBeeEffect) AlleleManager.alleleRegistry.getAllele(s);
-    }
-
-    protected static IAlleleFlowers getFlowers(byte modid, String name) {
-        String s;
-        switch (modid) {
-            case GTPP_Bees.EXTRABEES:
-                s = "extrabees.flower." + name;
-                break;
-            case GTPP_Bees.GENDUSTRY:
-                s = "gendustry.flower." + name;
-                break;
-            case GTPP_Bees.MAGICBEES:
-                s = "magicbees.flower" + name;
-                break;
-            case GTPP_Bees.GREGTECH:
-                s = "gregtech.flower" + name;
-                break;
-            default:
-                s = "forestry.flowers" + name;
-                break;
-
-        }
-        return (IAlleleFlowers) AlleleManager.alleleRegistry.getAllele(s);
-    }
-
-    protected static IAlleleBeeSpecies getSpecies(byte modid, String name) {
-        String s;
-        switch (modid) {
-            case GTPP_Bees.EXTRABEES:
-                s = "extrabees.species." + name;
-                break;
-            case GTPP_Bees.GENDUSTRY:
-                s = "gendustry.bee." + name;
-                break;
-            case GTPP_Bees.MAGICBEES:
-                s = "magicbees.species" + name;
-                break;
-            case GTPP_Bees.GREGTECH:
-                s = "gregtech.species" + name;
-                break;
-            default:
-                s = "forestry.species" + name;
-                break;
-
-        }
-        IAlleleBeeSpecies ret = (IAlleleBeeSpecies) AlleleManager.alleleRegistry.getAllele(s);
-        return ret;
-    }
-
-
-    protected final void setSpeciesProperties(GTPP_AlleleBeeSpecies species2) {
-        this.mSpeciesProperties.accept(species2);
-    }
-
-    protected final void setAlleles(IAllele[] template) {
-        this.mAlleles.accept(template);
-    }
-
-    protected final void registerMutations() {
-        this.mMutations.accept(this);
-    }
-
-    private void init() {
-        setSpeciesProperties(species);
-
-        template = branch.getTemplate();
-        AlleleHelper.instance.set(template, SPECIES, species);
-        setAlleles(template);
-
-        genome = BeeManager.beeRoot.templateAsGenome(template);
-
-        BeeManager.beeRoot.registerTemplate(template);
-    }
-
-    protected final IBeeMutationCustom registerMutation(IAlleleBeeSpecies parent1, IAlleleBeeSpecies parent2, int chance) {
-        return registerMutation(parent1, parent2, chance, 1f);
-    }
-
-    protected final IBeeMutationCustom registerMutation(GTPP_BeeDefinition parent1, IAlleleBeeSpecies parent2, int chance) {
-        return registerMutation(parent1, parent2, chance, 1f);
-    }
-
-    protected final IBeeMutationCustom registerMutation(IAlleleBeeSpecies parent1, GTPP_BeeDefinition parent2, int chance) {
-        return registerMutation(parent1, parent2, chance, 1f);
-    }
-
-    protected final IBeeMutationCustom registerMutation(GTPP_BeeDefinition parent1, GTPP_BeeDefinition parent2, int chance) {
-        return registerMutation(parent1, parent2, chance, 1f);
-    }
-    
-    protected final IBeeMutationCustom registerMutation(String parent1, String parent2, int chance) {
-        return registerMutation(getGregtechBeeType(parent1), getGregtechBeeType(parent2), chance, 1f);
-    }
-
-    /**
-     * Diese neue Funtion erlaubt Mutationsraten unter 1%. Setze dazu die Mutationsrate als Bruch mit chance / chancedivider
-     * This new function allows Mutation percentages under 1%. Set them as a fraction with chance / chancedivider
-     */
-    protected final IBeeMutationCustom registerMutation(IAlleleBeeSpecies parent1, IAlleleBeeSpecies parent2, int chance, float chancedivider) {
-        return new GTPP_Bee_Mutation(parent1, parent2, this.getTemplate(), chance, chancedivider);
-    }
-
-    protected final IBeeMutationCustom registerMutation(GTPP_BeeDefinition parent1, IAlleleBeeSpecies parent2, int chance, float chancedivider) {
-        return registerMutation(parent1.species, parent2, chance, chancedivider);
-    }
-
-    protected final IBeeMutationCustom registerMutation(IAlleleBeeSpecies parent1, GTPP_BeeDefinition parent2, int chance, float chancedivider) {
-        return registerMutation(parent1, parent2.species, chance, chancedivider);
-    }
-
-    protected final IBeeMutationCustom registerMutation(GTPP_BeeDefinition parent1, GTPP_BeeDefinition parent2, int chance, float chancedivider) {
-        return registerMutation(parent1.species, parent2, chance, chancedivider);
-    }
-
-    protected final IBeeMutationCustom registerMutation(String parent1, String parent2, int chance, float chancedivider) {
-        return registerMutation(getGregtechBeeType(parent1), getGregtechBeeType(parent2), chance, chancedivider);
-    }
-
-    @Override
-    public final IAllele[] getTemplate() {
-        return Arrays.copyOf(template, template.length);
-    }
-
-    @Override
-    public final IBeeGenome getGenome() {
-        return genome;
-    }
-
-    @Override
-    public final IBee getIndividual() {
-        return new Bee(genome);
-    }
-
-    @Override
-    public final ItemStack getMemberStack(EnumBeeType beeType) {
-        return BeeManager.beeRoot.getMemberStack(getIndividual(), beeType.ordinal());
-    }
-
-    public final IBeeDefinition getRainResist() {
-        return new BeeVariation.RainResist(this);
-    }
-    
-    private static final Class sGtBees = ReflectionUtils.getClass("gregtech.loaders.misc.GT_BeeDefinition");
-    
-	public static IAlleleBeeSpecies getGregtechBeeType(String name){
+	private final GTPP_BranchDefinition branch;
+	private final GTPP_AlleleBeeSpecies species;
+	private final Consumer<GTPP_AlleleBeeSpecies> mSpeciesProperties;
+	private final Consumer<IAllele[]> mAlleles;
+	private final Consumer<GTPP_BeeDefinition> mMutations;
+	private IAllele[] template;
+	private IBeeGenome genome;
+
+	GTPP_BeeDefinition(GTPP_BranchDefinition branch, String binomial, Materials aMat, boolean dominant, int primary, int secondary, Consumer<GTPP_AlleleBeeSpecies> aSpeciesProperties, Consumer<IAllele[]> aAlleles, Consumer<GTPP_BeeDefinition> aMutations) {
+		this(branch, binomial, MaterialUtils.generateMaterialFromGtENUM(aMat), dominant, primary, secondary, aSpeciesProperties, aAlleles, aMutations);
+	}
+	
+	GTPP_BeeDefinition(GTPP_BranchDefinition branch, String binomial, Material aMat, boolean dominant, int primary, int secondary, Consumer<GTPP_AlleleBeeSpecies> aSpeciesProperties, Consumer<IAllele[]> aAlleles, Consumer<GTPP_BeeDefinition> aMutations) {
+		this.mAlleles = aAlleles;
+		this.mMutations = aMutations;
+		this.mSpeciesProperties = aSpeciesProperties;
+		String lowercaseName = this.toString().toLowerCase(Locale.ENGLISH);
+		String species = WordUtils.capitalize(binomial);
+		String uid = "gtpp.bee.species" + species;
+		String description = "for.description." + species;
+		String name = "for.bees.species." + lowercaseName;
+		GT_LanguageManager.addStringLocalization("for.bees.species." + lowercaseName, species, true);
+		GTPP_Bees.sMaterialMappings.put(binomial.toLowerCase().replaceAll(" ", ""), aMat);
+		this.branch = branch;
+		this.species = new GTPP_AlleleBeeSpecies(uid, dominant, name, "GT++", description, branch.getBranch(), binomial, primary, secondary);
+	}
+
+	public static void initBees() {
+		for (GTPP_BeeDefinition bee : values()) { bee.init(); }
+		for (GTPP_BeeDefinition bee : values()) { bee.registerMutations(); }
+	}
+
+	protected static IAlleleBeeEffect getEffect(byte modid, String name) {
+		String s;
+		switch (modid) {
+			case GTPP_Bees.EXTRABEES :
+				s = "extrabees.effect." + name;
+				break;
+			case GTPP_Bees.GENDUSTRY :
+				s = "gendustry.effect." + name;
+				break;
+			case GTPP_Bees.MAGICBEES :
+				s = "magicbees.effect" + name;
+				break;
+			case GTPP_Bees.GREGTECH :
+				s = "gregtech.effect" + name;
+				break;
+			default :
+				s = "forestry.effect" + name;
+				break;
+
+		}
+		return (IAlleleBeeEffect) AlleleManager.alleleRegistry.getAllele(s);
+	}
+
+	protected static IAlleleFlowers getFlowers(byte modid, String name) {
+		String s;
+		switch (modid) {
+			case GTPP_Bees.EXTRABEES :
+				s = "extrabees.flower." + name;
+				break;
+			case GTPP_Bees.GENDUSTRY :
+				s = "gendustry.flower." + name;
+				break;
+			case GTPP_Bees.MAGICBEES :
+				s = "magicbees.flower" + name;
+				break;
+			case GTPP_Bees.GREGTECH :
+				s = "gregtech.flower" + name;
+				break;
+			default :
+				s = "forestry.flowers" + name;
+				break;
+
+		}
+		return (IAlleleFlowers) AlleleManager.alleleRegistry.getAllele(s);
+	}
+
+	protected static IAlleleBeeSpecies getSpecies(byte modid, String name) {
+		String s;
+		switch (modid) {
+			case GTPP_Bees.EXTRABEES :
+				s = "extrabees.species." + name;
+				break;
+			case GTPP_Bees.GENDUSTRY :
+				s = "gendustry.bee." + name;
+				break;
+			case GTPP_Bees.MAGICBEES :
+				s = "magicbees.species" + name;
+				break;
+			case GTPP_Bees.GREGTECH :
+				s = "gregtech.species" + name;
+				break;
+			default :
+				s = "forestry.species" + name;
+				break;
+
+		}
+		IAlleleBeeSpecies ret = (IAlleleBeeSpecies) AlleleManager.alleleRegistry.getAllele(s);
+		return ret;
+	}
+
+	protected final void setSpeciesProperties(GTPP_AlleleBeeSpecies species2) {
+		this.mSpeciesProperties.accept(species2);
+	}
+
+	protected final void setAlleles(IAllele[] template) {
+		this.mAlleles.accept(template);
+	}
+
+	protected final void registerMutations() {
+		this.mMutations.accept(this);
+	}
+
+	private void init() {
+		setSpeciesProperties(species);
+
+		template = branch.getTemplate();
+		AlleleHelper.instance.set(template, SPECIES, species);
+		setAlleles(template);
+
+		genome = BeeManager.beeRoot.templateAsGenome(template);
+
+		BeeManager.beeRoot.registerTemplate(template);
+	}
+
+	protected final IBeeMutationCustom registerMutation(IAlleleBeeSpecies parent1, IAlleleBeeSpecies parent2, int chance) {
+		return registerMutation(parent1, parent2, chance, 1f);
+	}
+
+	protected final IBeeMutationCustom registerMutation(GTPP_BeeDefinition parent1, IAlleleBeeSpecies parent2, int chance) {
+		return registerMutation(parent1, parent2, chance, 1f);
+	}
+
+	protected final IBeeMutationCustom registerMutation(IAlleleBeeSpecies parent1, GTPP_BeeDefinition parent2, int chance) {
+		return registerMutation(parent1, parent2, chance, 1f);
+	}
+
+	protected final IBeeMutationCustom registerMutation(GTPP_BeeDefinition parent1, GTPP_BeeDefinition parent2, int chance) {
+		return registerMutation(parent1, parent2, chance, 1f);
+	}
+
+	protected final IBeeMutationCustom registerMutation(String parent1, String parent2, int chance) {
+		return registerMutation(getGregtechBeeType(parent1), getGregtechBeeType(parent2), chance, 1f);
+	}
+
+	/**
+	 * Diese neue Funtion erlaubt Mutationsraten unter 1%. Setze dazu die
+	 * Mutationsrate als Bruch mit chance / chancedivider This new function
+	 * allows Mutation percentages under 1%. Set them as a fraction with chance
+	 * / chancedivider
+	 */
+	protected final IBeeMutationCustom registerMutation(IAlleleBeeSpecies parent1, IAlleleBeeSpecies parent2, int chance, float chancedivider) {
+		return new GTPP_Bee_Mutation(parent1, parent2, this.getTemplate(), chance, chancedivider);
+	}
+
+	protected final IBeeMutationCustom registerMutation(GTPP_BeeDefinition parent1, IAlleleBeeSpecies parent2, int chance, float chancedivider) {
+		return registerMutation(parent1.species, parent2, chance, chancedivider);
+	}
+
+	protected final IBeeMutationCustom registerMutation(IAlleleBeeSpecies parent1, GTPP_BeeDefinition parent2, int chance, float chancedivider) {
+		return registerMutation(parent1, parent2.species, chance, chancedivider);
+	}
+
+	protected final IBeeMutationCustom registerMutation(GTPP_BeeDefinition parent1, GTPP_BeeDefinition parent2, int chance, float chancedivider) {
+		return registerMutation(parent1.species, parent2, chance, chancedivider);
+	}
+
+	protected final IBeeMutationCustom registerMutation(String parent1, String parent2, int chance, float chancedivider) {
+		return registerMutation(getGregtechBeeType(parent1), getGregtechBeeType(parent2), chance, chancedivider);
+	}
+
+	@Override
+	public final IAllele[] getTemplate() {
+		return Arrays.copyOf(template, template.length);
+	}
+
+	@Override
+	public final IBeeGenome getGenome() {
+		return genome;
+	}
+
+	@Override
+	public final IBee getIndividual() {
+		return new Bee(genome);
+	}
+
+	@Override
+	public final ItemStack getMemberStack(EnumBeeType beeType) {
+		return BeeManager.beeRoot.getMemberStack(getIndividual(), beeType.ordinal());
+	}
+
+	public final IBeeDefinition getRainResist() {
+		return new BeeVariation.RainResist(this);
+	}
+
+	private static final Class sGtBees = ReflectionUtils.getClass("gregtech.loaders.misc.GT_BeeDefinition");
+
+	public static IAlleleBeeSpecies getGregtechBeeType(String name) {
 		try {
 			Enum aBeeObject = ReflectionUtils.getEnum(sGtBees, name);
 			Field gtBeesField = ReflectionUtils.getField(sGtBees, "species");
-			IAlleleBeeSpecies beeType = ReflectionUtils.getFieldValue(gtBeesField, aBeeObject);    		    	
+			IAlleleBeeSpecies beeType = ReflectionUtils.getFieldValue(gtBeesField, aBeeObject);
 			return beeType != null ? beeType : null;
 		}
 		catch (Throwable t) {
 			t.printStackTrace();
 			return null;
 		}
-		  
+
 	}
 }
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_Bees.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_Bees.java
index 68da927a1c..14b5a7e8ea 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_Bees.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_Bees.java
@@ -6,7 +6,9 @@ import java.util.HashMap;
 
 import cpw.mods.fml.common.Loader;
 import gregtech.GT_Mod;
+import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
 import gtPlusPlus.xmod.forestry.bees.handler.*;
 import gtPlusPlus.xmod.forestry.bees.items.output.*;
@@ -24,6 +26,8 @@ public class GTPP_Bees {
     public static GTPP_Drop drop;
     public static GTPP_Comb combs;
     
+    
+    public static HashMap<String, Material> sMaterialMappings = new HashMap<String, Material>();
 	public static HashMap<Integer, GTPP_PropolisType> sPropolisMappings = new HashMap<Integer, GTPP_PropolisType>();
 	public static HashMap<Integer, GTPP_PollenType> sPollenMappings = new HashMap<Integer, GTPP_PollenType>();
 	public static HashMap<Integer, GTPP_DropType> sDropMappings = new HashMap<Integer, GTPP_DropType>();
@@ -35,13 +39,36 @@ public class GTPP_Bees {
         	if (!ReflectionUtils.doesClassExist("gregtech.loaders.misc.GT_BeeDefinition")) {
         		CORE.crash("Missing gregtech.loaders.misc.GT_BeeDefinition.");
         	}
+        	else {
+        		Logger.BEES("Loading GT++ Bees!");
+        	}
+
+    		Logger.BEES("Creating required items.");
             propolis = new GTPP_Propolis();
             pollen = new GTPP_Pollen();
             drop = new GTPP_Drop();
-            drop.initDropsRecipes();
             combs = new GTPP_Comb();
-            combs.initCombsRecipes();
+
+    		Logger.BEES("Loading types.");
+            initTypes();
+
+    		Logger.BEES("Adding recipes.");
+            GTPP_Drop.initDropsRecipes();
+            GTPP_Propolis.initPropolisRecipes();
+            GTPP_Comb.initCombsRecipes();
+
+    		Logger.BEES("Initialising bees.");
             GTPP_BeeDefinition.initBees();
+            
+    		Logger.BEES("Done!");
         }
     }
+    
+    private static void initTypes() {
+    	ReflectionUtils.loadClass("gtPlusPlus.xmod.forestry.bees.registry.GTPP_BeeDefinition");
+    	ReflectionUtils.loadClass("gtPlusPlus.xmod.forestry.bees.handler.GTPP_CombType");
+    	ReflectionUtils.loadClass("gtPlusPlus.xmod.forestry.bees.handler.GTPP_DropType");
+    	ReflectionUtils.loadClass("gtPlusPlus.xmod.forestry.bees.handler.GTPP_PollenType");
+    	ReflectionUtils.loadClass("gtPlusPlus.xmod.forestry.bees.handler.GTPP_PropolisType");
+    }
 }