add more bees and combs and recipes

4 files changed, 62 insertions, 15 deletions

diff --git a/src/main/java/gregtech/common/items/CombType.java b/src/main/java/gregtech/common/items/CombType.java
index cda1916359..ead2a5194e 100644
--- a/src/main/java/gregtech/common/items/CombType.java
+++ b/src/main/java/gregtech/common/items/CombType.java
@@ -44,9 +44,12 @@ public enum CombType {
     //Gem Line
     STONE("stone", true, Materials._NULL, 70),
     CERTUS("certus", true, Materials.CertusQuartz, 100),
+    FLUIX("fluix", true, Materials.Fluix, 100),
     REDSTONE("redstone", true, Materials.Redstone, 100),
+    RAREEARTH("rareearth", true, Materials.RareEarth, 100),
     LAPIS("lapis", true, Materials.Lapis, 100),
     RUBY("ruby", true, Materials.Ruby, 100),
+    REDGARNET("redgarnet", true, Materials.GarnetRed,100),
     SAPPHIRE("sapphire", true, Materials.Sapphire, 100),
     DIAMOND("diamond", true, Materials.Diamond, 100),
     OLIVINE("olivine", true, Materials.Olivine, 100),
@@ -116,12 +119,16 @@ public enum CombType {
             {0x808080, 0x999999},
             {0x57CFFB, 0xBBEEFF},
             {0x7D0F0F, 0xD11919},
+            {0xA375FF, 0xB591FF},
             {0x1947D1, 0x476CDA},
+            {0x555643, 0x343428},
             {0xE6005C, 0xCC0052},
+            {0xBD4C4C, 0xECCECE},
             {0x0033CC, 0x00248F},
             {0xCCFFFF, 0xA3CCCC},
             {0x248F24, 0xCCFFCC},
             {0x248F24, 0x2EB82E},
+            //Metals
             {0xD4D4D4, 0x58300B},
             {0xFF6600, 0xE65C00},
             {0xD4D4D4, 0xDDDDDD},
@@ -132,6 +139,7 @@ public enum CombType {
             {0xF0DEF0, 0xF2E1F2},
             {0xC2C2D6, 0xCECEDE},
             {0xE6B800, 0xCFA600},
+            //Rare Metals
             {0x008AB8, 0xD6D6FF},
             {0xD5D5D5, 0xAAAAAA},
             {0xCC99FF, 0xDBB8FF},
@@ -139,6 +147,7 @@ public enum CombType {
             {0x62626D, 0x161620},
             {0xE6E6E6, 0xFFFFCC},
             {0xDADADA, 0xD1D1E0},
+            //Radioactive Line
             {0x19AF19, 0x169E16},
             {0x335C33, 0x6B8F00},
             {0x003300, 0x002400},
diff --git a/src/main/java/gregtech/common/items/ItemComb.java b/src/main/java/gregtech/common/items/ItemComb.java
index 992b53f707..47f90bbb28 100644
--- a/src/main/java/gregtech/common/items/ItemComb.java
+++ b/src/main/java/gregtech/common/items/ItemComb.java
@@ -187,16 +187,16 @@ public class ItemComb extends Item {
 		GT_Values.RA.addCentrifugeRecipe(tComb, GT_Values.NI, GT_Values.NF, GT_Values.NF, GT_ModHandler.getModItem("MagicBees", "wax", 1, 0), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Shadow, 1), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.ShadowSteel, 1), GT_Values.NI, GT_Values.NI, GT_Values.NI, new int[] {5000, 2000, 1000}, 384, 480);
 		addProcessHV(tComb, Materials.ShadowSteel, 75);
 		tComb = getStackForType(CombType.DIVIDED);
-		GT_Values.RA.addCentrifugeRecipe(tComb, GT_Values.NI, GT_Values.NF, GT_Values.NF, ItemList.FR_Wax.get(1, new Object[0]), GT_ModHandler.getModItem("ExtraUtilities", "unstableingot", 1, 1), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Iron, 1), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Diamond, 1), GT_Values.NI, GT_Values.NI, new int[] {5000, 2000, 1000, 500}, 384, 480);
+		GT_Values.RA.addCentrifugeRecipe(tComb, GT_Values.NI, GT_Values.NF, GT_Values.NF, GT_ModHandler.getModItem("MagicBees", "wax", 1, 0), GT_ModHandler.getModItem("ExtraUtilities", "unstableingot", 1, 1), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Iron, 1), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Diamond, 1), GT_Values.NI, GT_Values.NI, new int[] {5000, 2000, 1000, 500}, 384, 480);
 		addProcessHV(tComb, Materials.Iron, 75);
 		addProcessHV(tComb, Materials.Diamond, 55);
 		tComb = getStackForType(CombType.SPARKELING);
-		GT_Values.RA.addCentrifugeRecipe(tComb, GT_Values.NI, GT_Values.NF, GT_Values.NF, ItemList.FR_Wax.get(1, new Object[0]), GT_ModHandler.getModItem("MagicBees", "miscResources", 1, 5), GT_ModHandler.getModItem("MagicBees", "miscResources", 1, 5), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.NetherStar, 1), GT_Values.NI, GT_Values.NI, new int[] {5000, 1000, 500, 1000}, 512, 1920);
+		GT_Values.RA.addCentrifugeRecipe(tComb, GT_Values.NI, GT_Values.NF, GT_Values.NF, GT_ModHandler.getModItem("MagicBees", "wax", 1, 0), GT_ModHandler.getModItem("MagicBees", "miscResources", 1, 5), GT_ModHandler.getModItem("MagicBees", "miscResources", 1, 5), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.NetherStar, 1), GT_Values.NI, GT_Values.NI, new int[] {5000, 1000, 500, 1000}, 512, 1920);
 		addProcessEV(tComb, Materials.NetherStar, 50);
 
 		//Gem Line
 		tComb = getStackForType(CombType.STONE);
-		addSpecialCentLV(tComb,GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1), 70,GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Salt,1),20,GT_OreDictUnificator.get(OrePrefixes.dust,Materials.RockSalt,1),20);
+		GT_Values.RA.addCentrifugeRecipe(tComb, GT_Values.NI, GT_Values.NF, GT_Values.NF, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1), GT_OreDictUnificator.get(OrePrefixes.dust,Materials.GraniteBlack,1), GT_OreDictUnificator.get(OrePrefixes.dust,Materials.GraniteRed,1),  GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Basalt,1),  GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Marble,1),  GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Redrock,1), new int[] {7000, 5000, 5000, 5000, 5000, 5000}, 128, 5);
 		addProcessLV(tComb, Materials.Soapstone, 100);
 		addProcessLV(tComb, Materials.Talc, 100);
 		addProcessLV(tComb, Materials.Apatite, 100);
@@ -206,9 +206,16 @@ public class ItemComb extends Item {
 		addProcessLV(tComb, Materials.CertusQuartz, 100);
 		addProcessLV(tComb, Materials.Quartzite, 100);
 		addProcessLV(tComb, Materials.Barite, 100);
+		tComb = getStackForType(CombType.FLUIX);
+		GT_Values.RA.addCentrifugeRecipe(tComb, GT_Values.NI, GT_Values.NF, GT_Values.NF,ItemList.FR_Wax.get(1, new Object[0]), GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Fluix,1), GT_Values.NI, GT_Values.NI, GT_Values.NI, GT_Values.NI, new int[] {3000, 2500}, 128, 5);
+		addProcessLV(tComb, Materials.Redstone, 100);
+		addProcessLV(tComb, Materials.CertusQuartz, 100);
+		addProcessLV(tComb, Materials.NetherQuartz, 100);
 		tComb = getStackForType(CombType.REDSTONE);
 		addProcessLV(tComb, Materials.Redstone, 100);
 		addProcessLV(tComb, Materials.Cinnabar, 100);
+		tComb = getStackForType(CombType.RAREEARTH);
+		GT_Values.RA.addCentrifugeRecipe(tComb, GT_Values.NI, GT_Values.NF, GT_Values.NF,ItemList.FR_Wax.get(1, new Object[0]), GT_OreDictUnificator.get(OrePrefixes.dustTiny,Materials.RareEarth,1), GT_Values.NI, GT_Values.NI, GT_Values.NI, GT_Values.NI, new int[] {3000, 10000}, 128, 5);
 		tComb = getStackForType(CombType.LAPIS);
 		addProcessLV(tComb, Materials.Lapis, 100);
 		addProcessLV(tComb, Materials.Sodalite, 100);
@@ -217,6 +224,9 @@ public class ItemComb extends Item {
 		tComb = getStackForType(CombType.RUBY);
 		addProcessLV(tComb, Materials.Ruby, 100);
 		addProcessLV(tComb, Materials.Redstone, 100);
+		tComb = getStackForType(CombType.REDGARNET);
+		addProcessLV(tComb, Materials.GarnetRed, 100);
+		addProcessLV(tComb, Materials.GarnetYellow, 100);
 		tComb = getStackForType(CombType.SAPPHIRE);
 		addProcessLV(tComb, Materials.Sapphire, 100);
 		addProcessLV(tComb, Materials.GreenSapphire, 100);
diff --git a/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java b/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java
index ed91f0d7ec..6cb43f2176 100644
--- a/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java
+++ b/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java
@@ -20,6 +20,7 @@ import gregtech.api.enums.ItemList;
 import gregtech.api.util.GT_ModHandler;
 import gregtech.common.items.CombType;
 import net.minecraft.block.Block;
+import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
 import org.apache.commons.lang3.text.WordUtils;
@@ -849,76 +850,102 @@ public enum GT_BeeDefinition implements IBeeDefinition {
         @Override
         protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
             beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.STONE), 0.30f);
-            beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.REDSTONE), 0.15f);
+            beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.REDSTONE), 0.15f);
+            beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.RAREEARTH), 0.15f);
             beeSpecies.setHumidity(EnumHumidity.NORMAL);
             beeSpecies.setTemperature(EnumTemperature.NORMAL);
         }
 
         @Override
         protected void setAlleles(IAllele[] template) {
-            template = BeeDefinition.COMMON.getTemplate();
+            AlleleHelper.instance.set(template, EnumBeeChromosome.SPEED, EnumAllele.Speed.SLOWER);
         }
 
         @Override
         protected void registerMutations() {
-        	IBeeMutationCustom tMutation = registerMutation(getSpecies(FORRESTRY,"Industrious"), getSpecies(FORRESTRY,"Demonic"), 20);
+        	IBeeMutationCustom tMutation = registerMutation(getSpecies(FORRESTRY,"Industrious"), getSpecies(FORRESTRY,"Demonic"), 10);
+            tMutation.requireResource("blockRedstone");
         }
     },
     LAPIS(GT_BranchDefinition.GEM, "Lapis", true, 0x1947D1, 0x476CDA) {
         @Override
         protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
             beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.STONE), 0.30f);
-            beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.LAPIS), 0.15f);
+            beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.LAPIS), 0.15f);
             beeSpecies.setHumidity(EnumHumidity.NORMAL);
             beeSpecies.setTemperature(EnumTemperature.NORMAL);
         }
 
         @Override
         protected void setAlleles(IAllele[] template) {
-            template = BeeDefinition.COMMON.getTemplate();
+            AlleleHelper.instance.set(template, EnumBeeChromosome.SPEED, EnumAllele.Speed.SLOWER);
         }
 
         @Override
         protected void registerMutations() {
-        	IBeeMutationCustom tMutation = registerMutation(getSpecies(FORRESTRY,"Demonic"), getSpecies(FORRESTRY,"Imperial"), 20);
+        	IBeeMutationCustom tMutation = registerMutation(getSpecies(FORRESTRY,"Demonic"), getSpecies(FORRESTRY,"Imperial"), 5);
+            tMutation.requireResource("blockLapis");
         }
     },
     CERTUS(GT_BranchDefinition.GEM, "CertusQuartz", true, 0x57CFFB, 0xBBEEFF) {
         @Override
         protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
             beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.STONE), 0.30f);
-            beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.CERTUS), 0.15f);
+            beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.CERTUS), 0.15f);
             beeSpecies.setHumidity(EnumHumidity.NORMAL);
             beeSpecies.setTemperature(EnumTemperature.NORMAL);
         }
 
         @Override
         protected void setAlleles(IAllele[] template) {
-            template = BeeDefinition.COMMON.getTemplate();
+            AlleleHelper.instance.set(template, EnumBeeChromosome.SPEED, EnumAllele.Speed.SLOWER);
         }
 
         @Override
         protected void registerMutations() {
-        	IBeeMutationCustom tMutation = registerMutation(getSpecies(FORRESTRY,"Hermitic"), LAPIS.species, 20);
+        	IBeeMutationCustom tMutation = registerMutation(getSpecies(FORRESTRY,"Hermitic"), LAPIS.species, 10);
+            tMutation.requireResource("blockCertusQuartz");
         }
     },
-    RUBY(GT_BranchDefinition.GEM, "Ruby", true, 0xE6005C, 0xCC0052) {
+    FLUIX(GT_BranchDefinition.GEM, "FluixDust", true, 0xA375FF, 0xB591FF) {
         @Override
         protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
             beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.STONE), 0.30f);
-            beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.RUBY), 0.15f);
+            beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.FLUIX), 0.15f);
             beeSpecies.setHumidity(EnumHumidity.NORMAL);
             beeSpecies.setTemperature(EnumTemperature.NORMAL);
         }
 
         @Override
         protected void setAlleles(IAllele[] template) {
-            template = BeeDefinition.COMMON.getTemplate();
+            AlleleHelper.instance.set(template, EnumBeeChromosome.SPEED, EnumAllele.Speed.SLOWER);
+        }
+
+        @Override
+        protected void registerMutations() {
+            IBeeMutationCustom tMutation = registerMutation(REDSTONE.species, LAPIS.species, 7);
+            tMutation.requireResource("blockFluix");
+        }
+    },
+    RUBY(GT_BranchDefinition.GEM, "Ruby", true, 0xE6005C, 0xCC0052) {
+        @Override
+        protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
+            beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.STONE), 0.30f);
+            beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.RUBY), 0.15f);
+            beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.REDGARNET), 0.05f);
+            beeSpecies.setHumidity(EnumHumidity.DAMP);
+            beeSpecies.setTemperature(EnumTemperature.HOT);
+        }
+
+        @Override
+        protected void setAlleles(IAllele[] template) {
+            AlleleHelper.instance.set(template, EnumBeeChromosome.SPEED, EnumAllele.Speed.SLOWER);
         }
 
         @Override
         protected void registerMutations() {
         	IBeeMutationCustom tMutation = registerMutation(REDSTONE.species, DIAMOND.species, 10);
+            tMutation.requireResource(GregTech_API.sBlockGem2, 11);
         }
     },
     SAPPHIRE(GT_BranchDefinition.GEM, "Sapphire", true, 0x0033CC, 0x00248F) {
diff --git a/src/main/resources/assets/gregtech/lang/en_US.lang b/src/main/resources/assets/gregtech/lang/en_US.lang
index 9783400fbd..29200668ce 100644
--- a/src/main/resources/assets/gregtech/lang/en_US.lang
+++ b/src/main/resources/assets/gregtech/lang/en_US.lang
@@ -841,6 +841,7 @@ for.bees.species.sparkeling=Wither
 for.bees.species.redstone=Redstone
 for.bees.species.certus=Certus
 for.bees.species.ruby=Ruby
+for.bees.species.redgarnet=Red Garnet
 for.bees.species.sapphire=Sapphire
 for.bees.species.diamond=Diamond
 for.bees.species.olivine=Olivine