Added more Thaumic bees

5 files changed, 107 insertions, 10 deletions

diff --git a/src/main/java/gregtech/api/util/GT_Recipe.java b/src/main/java/gregtech/api/util/GT_Recipe.java
index 2e420f13cd..6750fb895f 100644
--- a/src/main/java/gregtech/api/util/GT_Recipe.java
+++ b/src/main/java/gregtech/api/util/GT_Recipe.java
@@ -583,7 +583,6 @@ public class GT_Recipe implements Comparable<GT_Recipe> {
         public static final GT_Recipe_Map_Fuel sHugeNaquadahReactorFuels = new GT_Recipe_Map_Fuel(new HashSet<GT_Recipe>(10), "gt.recipe.fluidnaquadahreactor", "Naquadah Reactor MkIII", null, RES_PATH_GUI + "basicmachines/Default", 1, 1, 0, 0, 1, "Fuel Value: ", 1000, " EU", true, true);

         public static final GT_Recipe_Map_Fuel sExtremeNaquadahReactorFuels = new GT_Recipe_Map_Fuel(new HashSet<GT_Recipe>(10), "gt.recipe.hugenaquadahreactor", "Naquadah Reactor MkIV", null, RES_PATH_GUI + "basicmachines/Default", 1, 1, 0, 0, 1, "Fuel Value: ", 1000, " EU", true, true);

         public static final GT_Recipe_Map_Fuel sUltraHugeNaquadahReactorFuels = new GT_Recipe_Map_Fuel(new HashSet<GT_Recipe>(10), "gt.recipe.extrahugenaquadahreactor", "Naquadah Reactor MkV", null, RES_PATH_GUI + "basicmachines/Default", 1, 1, 0, 0, 1, "Fuel Value: ", 1000, " EU", true, true);

-        //public static final GT_Recipe_Map_Fuel sUltraHugeNaquadahReactorFuels = new GT_Recipe_Map_Fuel(new HashSet<GT_Recipe>(10), "gt.recipe.ultrahugenaquadahreactor", "Naquadah Reactor MkV", null, RES_PATH_GUI + "basicmachines/Default", 1, 1, 0, 0, 1, "Fuel Value: ", 1000, " EU", true, true);

         public static final GT_Recipe_Map_LargeBoilerFakeFuels sLargeBoilerFakeFuels = new GT_Recipe_Map_LargeBoilerFakeFuels();

         

         /**

diff --git a/src/main/java/gregtech/common/items/CombType.java b/src/main/java/gregtech/common/items/CombType.java
index 6c6a2b06e5..57d7086f2f 100644
--- a/src/main/java/gregtech/common/items/CombType.java
+++ b/src/main/java/gregtech/common/items/CombType.java
@@ -4,7 +4,7 @@ import gregtech.api.enums.Materials;
 import gregtech.api.util.GT_LanguageManager;
 
 public enum CombType {
-    //Organic
+    //Organic Line
     LIGNIE("lignite", true, Materials.Lignite, 100),
     COAL("coal", true, Materials.Coal, 100),
     STICKY("stickyresin", true, Materials._NULL, 50),
@@ -27,6 +27,20 @@ public enum CombType {
     STAINLESSSTEL("steainlesssteel", true, Materials.StainlessSteel, 75),
     ENDERIUM("enderium", true, Materials.Enderium, 40),
 
+    //Thaumcraft Line
+    THAUMIUMDUST("thaumiumdust", true, Materials.Thaumium, 100),
+    THAUMIUMSHARD("tahumiumshard", true, Materials._NULL, 85),
+    AMBER("amber", true, Materials.Amber, 90),
+    QUICKSILVER("quicksilver", true, Materials.Mercury, 90),
+    SALISMUNDUS("salismundus", true, Materials._NULL, 75),
+    TAINTED("tainted", true, Materials._NULL, 80),
+    MITHRIL("mithril", true, Materials.Mithril, 70),
+    ASTRALSILVER("astralsilver", true, Materials.AstralSilver, 70),
+    THAUMINITE("thauminte", true, Materials._NULL, 50),
+    SCHADOWMETAL("shadowmetal", true, Materials.Shadow, 50),
+    DIVIDED("devided", true, Materials.Unstable, 40),
+    SPARKELING("sparkeling", true, Materials.NetherStar, 40),
+
     //Gem Line
     STONE("stone", true, Materials._NULL, 70),
     CERTUS("certus", true, Materials.CertusQuartz, 100),
@@ -38,7 +52,7 @@ public enum CombType {
     OLIVINE("olivine", true, Materials.Olivine, 100),
     EMERALD("emerald", true, Materials.Emerald, 100),
 
-    // Metals Line
+    //Metals Line
     SLAG("slag", true, Materials._NULL, 50),
     COPPER("coppon", true, Materials.Copper, 100),
     TIN("tine", true, Materials.Tin, 100),
@@ -50,7 +64,7 @@ public enum CombType {
     SILVER("argentia", true, Materials.Silver, 100),
     GOLD("aurelia", true, Materials.Gold, 100),
 
-    // Rare Metals Line    
+    //Rare Metals Line
     ALUMINIUM("bauxia", true, Materials.Aluminium, 60),
     MANGANESE("pyrolusium", true, Materials.Manganese, 30),
     TITANIUM("titanium", true, Materials.Ilmenite, 100),
@@ -59,7 +73,7 @@ public enum CombType {
     PLATINUM("platina", true, Materials.Platinum, 40),
     IRIDIUM("quantaria", true, Materials.Iridium, 20),
 
-    // Radioactive Line
+    //Radioactive Line
     URANIUM("urania", true, Materials.Uranium, 50),
     PLUTONIUM("plutonium", true, Materials.Plutonium, 10),
     NAQUADAH("stargatium", true, Materials.Naquadah, 10);
@@ -85,6 +99,19 @@ public enum CombType {
             {0x6DD284, 0x006600},
             {0x778899, 0xC8C8DC},
             {0x2E8B57, 0x599087},
+            //Thaumcraft
+            {0x7A007A, 0x5C005C},
+            {0x9966FF, 0xAD85FF},
+            {0xE60000, 0x774B15},
+            {0x7A007A, 0x5C005C},
+            {0xF7ADDE, 0x592582},
+            {0x904BB8, 0xE800FF},
+            {0xF0E68C, 0xFFFFD2},
+            {0xAFEEEE, 0xE6E6FF},
+            {0x2E2D79, 0x7581E0},
+            {0x2E2D79, 0x7581E0},
+            {0xF0F0F0, 0xDCDCDC},
+            {0x7A007A, 0xFFFFFF},
             //gems
             {0x808080, 0x999999},
             {0x57CFFB, 0xBBEEFF},
diff --git a/src/main/java/gregtech/loaders/load/GT_FuelLoader.java b/src/main/java/gregtech/loaders/load/GT_FuelLoader.java
index 2d1083ed79..6437a95a33 100644
--- a/src/main/java/gregtech/loaders/load/GT_FuelLoader.java
+++ b/src/main/java/gregtech/loaders/load/GT_FuelLoader.java
@@ -26,8 +26,6 @@ public class GT_FuelLoader
         ItemList.sIndiumConcentrate = GT_Mod.gregtechproxy.addFluid("indiumconcentrate", "Indium Concentrate", null, 1, 295);//TODO CHECK NEW x3

         ItemList.sLeadZincSolution = GT_Mod.gregtechproxy.addFluid("leadzincsolution", "Lead-Zinc solution", null, 1, 295);

         ItemList.sRocketFuel = GT_Mod.gregtechproxy.addFluid("rocket_fuel", "Rocket Fuel", null, 1, 295);

-        //ItemList.sIron3Chloride = GT_Mod.gregtechproxy.addFluid("iron3chloride", "Iron III Chloride", Materials.IronIIIChloride, 1, 295);

-        //ItemList.sLifeEssence = GT_Mod.gregtechproxy.addFluid("lifeessence", "Life Essence", Materials.LifeEssence, 1, 295);

         new GT_Recipe(new ItemStack(Items.lava_bucket), new ItemStack(Blocks.obsidian), GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Copper, 1L), GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Tin, 1L), GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Electrum, 1L), 30, 2);

 

         GT_Recipe.GT_Recipe_Map.sSmallNaquadahReactorFuels.addRecipe(true, new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.NaquadahEnriched, 1L)}, new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Naquadah, 1L)}, null, null, null, 0, 0, 25000);

@@ -35,7 +33,6 @@ public class GT_FuelLoader
         GT_Recipe.GT_Recipe_Map.sHugeNaquadahReactorFuels.addRecipe(true, new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.NaquadahEnriched, 1L)}, new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.stickLong,  Materials.Naquadah, 1L)}, null, null, null, 0, 0, 250000);

         GT_Recipe.GT_Recipe_Map.sExtremeNaquadahReactorFuels.addRecipe(true, new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Naquadria, 1L)}, new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.stick,  Materials.Naquadah, 1L)}, null, null, null, 0, 0, 500000);

         GT_Recipe.GT_Recipe_Map.sUltraHugeNaquadahReactorFuels.addRecipe(true, new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Naquadria, 1L)}, new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.stickLong,  Materials.Naquadah, 1L)}, null, null, null, 0, 0, 1000000);

-        //GT_Recipe.GT_Recipe_Map.sUltraHugeNaquadahReactorFuels.addRecipe(true, new ItemStack[]{null}, new ItemStack[]{null}, null, new FluidStack[]{Materials.FluidNaquadahFuel.getFluid(1000L)}, new FluidStack[]{Materials.Naquadah.getFluid(1000L)}, 0, 0, 2000000);

 

         GT_Values.RA.addFuel(GT_ModHandler.getModItem("Thaumcraft", "ItemResource", 1L, 4), null, 4, 5);

         GT_Values.RA.addFuel(new ItemStack(Items.experience_bottle, 1), null, 10, 5);

diff --git a/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java b/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java
index b1f540d37e..778019e4a3 100644
--- a/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java
+++ b/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java
@@ -17,6 +17,7 @@ import gregtech.api.util.GT_ModHandler;
 import gregtech.common.items.CombType;
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
+import net.minecraftforge.common.BiomeDictionary;
 import org.apache.commons.lang3.text.WordUtils;
 
 import java.util.Arrays;
@@ -451,6 +452,69 @@ public enum GT_BeeDefinition implements IBeeDefinition {
             tMutation.requireResource("blockEnderium");
         }
     },
+    THAUMIMDUST(GT_BranchDefinition.THAUMIC, "ThaumiumDust", true, 0x7A007A, 0x5C005C) {
+        @Override
+        protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
+            beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 3), 0.30f);
+            beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.THAUMIUMDUST), 0.15f);
+            beeSpecies.setHumidity(EnumHumidity.NORMAL);
+            beeSpecies.setTemperature(EnumTemperature.NORMAL);
+        }
+
+        @Override
+        protected void setAlleles(IAllele[] template) {
+            template = BeeDefinition.EDENIC.getTemplate();
+        }
+
+        @Override
+        protected void registerMutations() {
+            IBeeMutationCustom tMutation = registerMutation(getSpecies(EXTRABEES,"TCFire"), getSpecies(FORRESTRY,"Edenic"), 10);
+            tMutation.requireResource("blockThaumium");
+            tMutation.restrictBiomeType(BiomeDictionary.Type.MAGICAL, BiomeDictionary.Type.FOREST);
+        }
+    },
+    THAUMIMSHARD(GT_BranchDefinition.THAUMIC, "ThaumiumShard", true, 0x9966FF, 0xAD85FF) {
+        @Override
+        protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
+            beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.THAUMIUMDUST), 0.30f);
+            beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.THAUMIUMSHARD), 0.15f);
+            beeSpecies.setHumidity(EnumHumidity.NORMAL);
+            beeSpecies.setTemperature(EnumTemperature.NORMAL);
+            beeSpecies.setHasEffect();
+        }
+
+        @Override
+        protected void setAlleles(IAllele[] template) {
+            template = BeeDefinition.GLACIAL.getTemplate();
+        }
+
+        @Override
+        protected void registerMutations() {
+            IBeeMutationCustom tMutation = registerMutation(THAUMIMDUST.species, getSpecies(EXTRABEES,"TCWater"), 10);
+            tMutation.restrictBiomeType(BiomeDictionary.Type.MAGICAL, BiomeDictionary.Type.FOREST);
+        }
+    },
+    AMBER(GT_BranchDefinition.THAUMIC, "Amber", true, 0xEE7700, 0x774B15) {
+        @Override
+        protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
+            beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 3), 0.30f);
+            beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.AMBER), 0.25f);
+            beeSpecies.setHumidity(EnumHumidity.NORMAL);
+            beeSpecies.setTemperature(EnumTemperature.NORMAL);
+            beeSpecies.setHasEffect();
+        }
+
+        @Override
+        protected void setAlleles(IAllele[] template) {
+            template = BeeDefinition.COMMON.getTemplate();
+        }
+
+        @Override
+        protected void registerMutations() {
+            IBeeMutationCustom tMutation = registerMutation(THAUMIMDUST.species, STICKYRESIN.species, 10);
+            tMutation.requireResource("blockAmber");
+        }
+    },
 //gems
     REDSTONE(GT_BranchDefinition.GEM, "Redstone", true, 0x7D0F0F, 0xD11919) {
         @Override
diff --git a/src/main/resources/assets/gregtech/lang/en_US.lang b/src/main/resources/assets/gregtech/lang/en_US.lang
index 0b36be4247..6da9d2ec04 100644
--- a/src/main/resources/assets/gregtech/lang/en_US.lang
+++ b/src/main/resources/assets/gregtech/lang/en_US.lang
@@ -826,8 +826,18 @@ for.bees.species.darksteel=Dark Steel
 for.bees.species.pulsatingiron=Pulsating Iron
 for.bees.species.stainlesssteel=Stainless Steel
 for.bees.species.enderium=Enderium
-for.bees.species.redstone=Redstone
-for.bees.species.lapis=Lapis
+for.bees.species.thaumiumdust=Thaumium Dust
+for.bees.species.thaumiumshard=Thaumic Shards
+for.bees.species.amber=Amber
+for.bees.species.quicksilver=Quicksilver
+for.bees.species.salismundus=Salis Mundus
+for.bees.species.tainted=Tainted
+for.bees.species.mithril=Mithril
+for.bees.species.astralsilver=Astral Silver
+for.bees.species.thauminite=Thauminite
+for.bees.species.shadowmetal=Shadow Metal
+for.bees.species.devided=Unstable
+for.bees.species.sparkeling=Wither
 for.bees.species.certus=Certus
 for.bees.species.ruby=Ruby
 for.bees.species.sapphire=Sapphire