diff options
Diffstat (limited to 'src/main/java/gregtech/common')
4 files changed, 10 insertions, 3 deletions
diff --git a/src/main/java/gregtech/common/items/CombType.java b/src/main/java/gregtech/common/items/CombType.java index f114997c8b..6f7ea9141d 100644 --- a/src/main/java/gregtech/common/items/CombType.java +++ b/src/main/java/gregtech/common/items/CombType.java @@ -158,7 +158,8 @@ public enum CombType { SILVERFISH("silverfish", true, Materials._NULL, 25,0x0000000, 0xEE053D), ENDIUM("endium", true, Materials.HeeEndium, 50,0x2F5A6C, 0xa0ffff), RUNEI("rune1", true, Materials._NULL, 10,0x0104D9, 0xE31010), - RUNEII("rune2", true, Materials._NULL, 10,0xE31010, 0x0104D9); + RUNEII("rune2", true, Materials._NULL, 10,0xE31010, 0x0104D9), + FIREESSENSE("fireessence", true, Materials._NULL, 30,0xFFA157, 0xD41238); 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 d5023d2266..5877b694ae 100644 --- a/src/main/java/gregtech/common/items/ItemComb.java +++ b/src/main/java/gregtech/common/items/ItemComb.java @@ -479,6 +479,8 @@ 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_ModHandler.getModItem("dreamcraft", "item.RuneOfPowerFragment", 1L, 0), GT_ModHandler.getModItem("dreamcraft", "item.RuneOfAgilityFragment", 1L, 0), GT_ModHandler.getModItem("dreamcraft", "item.RuneOfVigorFragment", 1L, 0), GT_ModHandler.getModItem("dreamcraft", "item.RuneOfDefenseFragment", 1L, 0), GT_ModHandler.getModItem("dreamcraft", "item.RuneOfMagicFragment", 1L, 0), new int[]{2500, 500, 500, 500, 500, 500}, 640, 7680); tComb = getStackForType(CombType.RUNEII); GT_Values.RA.addCentrifugeRecipe(tComb, GT_Values.NI, GT_Values.NF, GT_Values.NF, GT_ModHandler.getModItem("MagicBees", "wax", 1L, 0), GT_ModHandler.getModItem("dreamcraft", "item.RuneOfVoidFragment", 1L, 0), GT_Values.NI, GT_Values.NI, GT_Values.NI, GT_Values.NI, new int[]{5000, 250}, 640, 7680); + tComb = getStackForType(CombType.FIREESSENSE); + 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.Fireessence), GT_Bees.drop.getStackForType(DropType.ENDERGOO), GT_Values.NI, GT_Values.NI, GT_Values.NI, new int[]{3000, 750, 2000}, 640, 7680); //Space Line tComb = getStackForType(CombType.SPACE); diff --git a/src/main/java/gregtech/common/items/ItemPropolis.java b/src/main/java/gregtech/common/items/ItemPropolis.java index 9893e49ad9..20d18d4470 100644 --- a/src/main/java/gregtech/common/items/ItemPropolis.java +++ b/src/main/java/gregtech/common/items/ItemPropolis.java @@ -91,6 +91,8 @@ public class ItemPropolis extends Item { addProcessEV(tPropolis, GT_ModHandler.getModItem("HardcoreEnderExpansion", "silverfish_blood", 1, 0)); tPropolis = getStackForType(PropolisType.Endium); addProcessHV(tPropolis, GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.HeeEndium, 1)); + tPropolis = getStackForType(PropolisType.Fireessence); + addProcessIV(tPropolis, GT_ModHandler.getModItem("HardcoreEnderExpansion", "essence", 16, 1)); //addRecipe(tDrop, aOutput, aOutput2, aChance, aDuration, aEUt); } diff --git a/src/main/java/gregtech/common/items/PropolisType.java b/src/main/java/gregtech/common/items/PropolisType.java index 1e83f9680c..3ea14555a0 100644 --- a/src/main/java/gregtech/common/items/PropolisType.java +++ b/src/main/java/gregtech/common/items/PropolisType.java @@ -12,7 +12,8 @@ public enum PropolisType { Dragonessence("Dragonessence",true), Enderman("Enderman",true), Silverfish("Silverfish", true), - Endium("Endium", true); + Endium("Endium", true), + Fireessence("Fireessence",true); private static int[] colours = new int[]{ 0xCC00FA, @@ -22,7 +23,8 @@ public enum PropolisType { 0x911ECE, 0x161616, 0xEE053D, - 0xa0ffff + 0xa0ffff, + 0xD41238 }; public boolean showInList; |