diff options
Diffstat (limited to 'src/main/java/gregtech/common/items')
4 files changed, 15 insertions, 4 deletions
diff --git a/src/main/java/gregtech/common/items/CombType.java b/src/main/java/gregtech/common/items/CombType.java index 0c68a9cb01..0a033bf5e0 100644 --- a/src/main/java/gregtech/common/items/CombType.java +++ b/src/main/java/gregtech/common/items/CombType.java @@ -155,7 +155,8 @@ public enum CombType { STARDUST("stardust", true, Materials._NULL, 60,0xDCBE13, 0xffff00), DRAGONESSENCE("dragonessence", true, Materials._NULL, 30,0xffff00, 0xFFA12B), ENDERMAN("enderman", true, Materials._NULL, 25,0x6200e7, 0x161616), - SILVERFISH("silverfish", true, Materials._NULL, 25,0x0000000, 0xEE053D); + SILVERFISH("silverfish", true, Materials._NULL, 25,0x0000000, 0xEE053D), + ENDIUM("endium", true, Materials.HeeEndium, 50,0x2F5A6C, 0xa0ffff); 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 0814aadc7b..a4b62c7ea1 100644 --- a/src/main/java/gregtech/common/items/ItemComb.java +++ b/src/main/java/gregtech/common/items/ItemComb.java @@ -471,8 +471,10 @@ 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.Dragonessence), GT_Bees.drop.getStackForType(DropType.ENDERGOO), GT_Values.NI, GT_Values.NI, GT_Values.NI, new int[]{3000, 750, 2000}, 640, 7680); tComb = getStackForType(CombType.ENDERMAN); 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.Enderman), GT_Bees.drop.getStackForType(DropType.ENDERGOO), GT_Values.NI, GT_Values.NI, GT_Values.NI, new int[]{3000, 750, 2000}, 640, 7680); - tComb = getStackForType(CombType.ARCANESHARD); + tComb = getStackForType(CombType.SILVERFISH); 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); //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/ItemPropolis.java b/src/main/java/gregtech/common/items/ItemPropolis.java index a4e224af9f..9893e49ad9 100644 --- a/src/main/java/gregtech/common/items/ItemPropolis.java +++ b/src/main/java/gregtech/common/items/ItemPropolis.java @@ -5,7 +5,10 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import forestry.api.core.Tabs; import gregtech.api.enums.GT_Values; +import gregtech.api.enums.Materials; +import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_ModHandler; +import gregtech.api.util.GT_OreDictUnificator; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; @@ -86,6 +89,9 @@ public class ItemPropolis extends Item { addProcessIV(tPropolis, GT_ModHandler.getModItem("HardcoreEnderExpansion", "enderman_head", 1, 0)); tPropolis = getStackForType(PropolisType.Silverfish); addProcessEV(tPropolis, GT_ModHandler.getModItem("HardcoreEnderExpansion", "silverfish_blood", 1, 0)); + tPropolis = getStackForType(PropolisType.Endium); + addProcessHV(tPropolis, GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.HeeEndium, 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 bba0f8f277..0c12cac003 100644 --- a/src/main/java/gregtech/common/items/PropolisType.java +++ b/src/main/java/gregtech/common/items/PropolisType.java @@ -11,7 +11,8 @@ public enum PropolisType { Stardust("Stardust",true), Dragonessence("Dragonessence",true), Enderman("Enderman",true), - Silverfish("Silverfish", true); + Silverfish("Silverfish", true), + Endium("Endium", true); private static int[] colours = new int[]{ 0xCC00FA, @@ -20,7 +21,8 @@ public enum PropolisType { 0xffff00, 0xFFA12B, 0x161616, - 0x000000 + 0x000000, + 0xa0ffff }; public boolean showInList; |