finishing hee bees so far

5 files changed, 17 insertions, 11 deletions

diff --git a/src/main/java/gregtech/common/items/CombType.java b/src/main/java/gregtech/common/items/CombType.java
index 0a033bf5e0..e9c7817d95 100644
--- a/src/main/java/gregtech/common/items/CombType.java
+++ b/src/main/java/gregtech/common/items/CombType.java
@@ -153,10 +153,11 @@ public enum CombType {
     ECTOPLASMA("ectoplasma", true, Materials._NULL, 35,0x381C40, 0xDCB0E5),
     ARCANESHARD("arcaneshard", true, Materials._NULL, 35,0x333D82, 0x9010AD),
     STARDUST("stardust", true, Materials._NULL, 60,0xDCBE13, 0xffff00),
-    DRAGONESSENCE("dragonessence", true, Materials._NULL, 30,0xffff00, 0xFFA12B),
+    DRAGONESSENCE("dragonessence", true, Materials._NULL, 30,0x911ECE, 0xFFA12B),
     ENDERMAN("enderman", true, Materials._NULL, 25,0x6200e7, 0x161616),
     SILVERFISH("silverfish", true, Materials._NULL, 25,0x0000000, 0xEE053D),
-    ENDIUM("endium", true, Materials.HeeEndium, 50,0x2F5A6C, 0xa0ffff);
+    ENDIUM("endium", true, Materials.HeeEndium, 50,0x2F5A6C, 0xa0ffff),
+    RUNE("rune", true, Materials._NULL, 10,0x0104D9, 0xE31010);
 
     public boolean showInList;
     public Materials material;
diff --git a/src/main/java/gregtech/common/items/ItemComb.java b/src/main/java/gregtech/common/items/ItemComb.java
index a4b62c7ea1..a6cfda8020 100644
--- a/src/main/java/gregtech/common/items/ItemComb.java
+++ b/src/main/java/gregtech/common/items/ItemComb.java
@@ -475,6 +475,9 @@ public class ItemComb extends Item {
 		GT_Values.RA.addCentrifugeRecipe(tComb, GT_Values.NI, GT_Values.NF, GT_Values.NF, GT_ModHandler.getModItem("MagicBees", "wax", 1L, 0), GT_Bees.propolis.getStackForType(PropolisType.Silverfish),  GT_Bees.drop.getStackForType(DropType.ENDERGOO), new ItemStack(Blocks.monster_egg, 1,60), GT_Values.NI,  GT_Values.NI, new int[]{2500, 1000, 2000, 1500}, 512, 1920);
 		tComb = getStackForType(CombType.ENDIUM);
 		addProcessHV(tComb,Materials.HeeEndium,50);
+		tComb = getStackForType(CombType.RUNE);
+		GT_Values.RA.addCentrifugeRecipe(tComb, GT_Values.NI, GT_Values.NF, GT_Values.NF, GT_ModHandler.getModItem("MagicBees", "wax", 1L, 0), GT_Bees.propolis.getStackForType(PropolisType.Silverfish),  GT_Bees.drop.getStackForType(DropType.ENDERGOO), new ItemStack(Blocks.monster_egg, 1,60), GT_Values.NI,  GT_Values.NI, new int[]{2500, 1000, 2000, 1500}, 512, 1920);
+
 		//Space Line
 		tComb = getStackForType(CombType.SPACE);
 		GT_Values.RA.addCentrifugeRecipe(tComb, GT_Values.NI, GT_Values.NF, GT_Values.NF, ItemList.FR_Wax.get(1L), ItemList.FR_RefractoryWax.get(1L), GT_Bees.drop.getStackForType(DropType.OXYGEN), GT_ModHandler.getModItem("dreamcraft", "item.CoinSpace", 1L, 0), GT_Values.NI, GT_Values.NI, new int[]{5000, 3000, 1500, 500, 0, 0}, 384, 480);
diff --git a/src/main/java/gregtech/common/items/ItemDrop.java b/src/main/java/gregtech/common/items/ItemDrop.java
index 78fdfca57f..921c4ce6af 100644
--- a/src/main/java/gregtech/common/items/ItemDrop.java
+++ b/src/main/java/gregtech/common/items/ItemDrop.java
@@ -111,8 +111,8 @@ public class ItemDrop extends Item {
 		tDrop = getStackForType(DropType.OXYGEN);
 		addProcessLV(tDrop, new FluidStack(FluidRegistry.getFluid("liquidoxygen"), 100), GT_ModHandler.getModItem("ExtraBees", "propolis", 1L, 2), 250, 1200,8);
 		RecipeManagers.squeezerManager.addRecipe(400, new ItemStack[]{tDrop}, new FluidStack(FluidRegistry.getFluid("ic2coolant"), 100), GT_ModHandler.getModItem("ExtraBees", "propolis", 1L, 2), 30);
-		addProcessHV(tDrop, new FluidStack(FluidRegistry.getFluid("endergoo"), 500), GT_Values.NI ,1000);
 		tDrop = getStackForType(DropType.ENDERGOO);
+		addProcessHV(tDrop, new FluidStack(FluidRegistry.getFluid("endergoo"), 500), GT_Values.NI ,1000);
 	}
 
 	public void addProcessLV(ItemStack tDrop, FluidStack aOutput, ItemStack aOutput2, int aChance, int aEUt) {
diff --git a/src/main/java/gregtech/common/items/PropolisType.java b/src/main/java/gregtech/common/items/PropolisType.java
index 0c12cac003..1e83f9680c 100644
--- a/src/main/java/gregtech/common/items/PropolisType.java
+++ b/src/main/java/gregtech/common/items/PropolisType.java
@@ -18,10 +18,10 @@ public enum PropolisType {
         0xCC00FA,
         0xDCB0E5,
         0x9010AD,
-        0xffff00,
-        0xFFA12B,
+        0xFFFF00,
+        0x911ECE,
         0x161616,
-        0x000000,
+        0xEE053D,
         0xa0ffff
     };
 
diff --git a/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java b/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java
index ef90c96ca7..371798b6fa 100644
--- a/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java
+++ b/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java
@@ -2033,7 +2033,8 @@ public enum GT_BeeDefinition implements IBeeDefinition {
 
         @Override
         protected void registerMutations() {
-            IBeeMutationCustom tMutation = registerMutation(getSpecies(FORRESTRY,"End"), STAINLESSSTEEL.species,  8);
+            IBeeMutationCustom tMutation = registerMutation(getSpecies(FORRESTRY,"Ended"), STAINLESSSTEEL.species,  8);
+
             tMutation.restrictHumidity(EnumHumidity.ARID);
             if (Loader.isModLoaded("HardcoreEnderExpansion"))
             tMutation.requireResource(GameRegistry.findBlock("HardcoreEnderExpansion", "end_powder_ore"), 0);
@@ -2062,7 +2063,7 @@ public enum GT_BeeDefinition implements IBeeDefinition {
 
         @Override
         protected void registerMutations() {
-            IBeeMutationCustom tMutation = registerMutation(getSpecies(FORRESTRY,"End"), THAUMIUMDUST.species,  8);
+            IBeeMutationCustom tMutation = registerMutation(getSpecies(FORRESTRY,"Ended"), THAUMIUMDUST.species,  8);
             tMutation.restrictHumidity(EnumHumidity.ARID);
             if (Loader.isModLoaded("HardcoreEnderExpansion"))
                 tMutation.requireResource("blockHeeEndium");
@@ -2091,7 +2092,7 @@ public enum GT_BeeDefinition implements IBeeDefinition {
 
         @Override
         protected void registerMutations() {
-            IBeeMutationCustom tMutation = registerMutation(getSpecies(FORRESTRY,"End"), ZINC.species,  8);
+            IBeeMutationCustom tMutation = registerMutation(getSpecies(FORRESTRY,"Ended"), ZINC.species,  8);
             tMutation.restrictHumidity(EnumHumidity.ARID);
             if (Loader.isModLoaded("HardcoreEnderExpansion"))
                 tMutation.requireResource(GameRegistry.findBlock("HardcoreEnderExpansion", "stardust_ore"), 0);
@@ -2119,7 +2120,7 @@ public enum GT_BeeDefinition implements IBeeDefinition {
 
         @Override
         protected void registerMutations() {
-            IBeeMutationCustom tMutation = registerMutation(getSpecies(FORRESTRY,"End"), ENDDUST.species,  5);
+            IBeeMutationCustom tMutation = registerMutation(getSpecies(FORRESTRY,"Ended"), ENDDUST.species,  5);
             tMutation.restrictHumidity(EnumHumidity.ARID);
             if (Loader.isModLoaded("HardcoreEnderExpansion"))
             tMutation.requireResource(GameRegistry.findBlock("HardcoreEnderExpansion", "spooky_log"), 0);
@@ -2159,7 +2160,7 @@ public enum GT_BeeDefinition implements IBeeDefinition {
         }
     },
 
-    DRAGONESSENCE(GT_BranchDefinition.HEE, "Dragonessence", true, 0xFFA12B, 0xffff00) {
+    DRAGONESSENCE(GT_BranchDefinition.HEE, "Dragonessence", true, 0xFFA12B, 0x911ECE) {
         @Override
         protected void setSpeciesProperties(GT_AlleleBeeSpecies beeSpecies) {
             beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 8), 0.30f);
@@ -3330,6 +3331,7 @@ public enum GT_BeeDefinition implements IBeeDefinition {
         @Override
         protected void setAlleles(IAllele[] template) {
             AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.SHORTEST);
+            AlleleHelper.instance.set(template, EnumBeeChromosome.EFFECT, getEffect(EXTRABEES, "blindness"));
         }
 
         @Override