aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common
diff options
context:
space:
mode:
authorDream-Master <dream-master@gmx.net>2018-10-05 20:48:54 +0200
committerDream-Master <dream-master@gmx.net>2018-10-05 20:48:54 +0200
commitf7f295e049646aa202994b0e03d7f245b8334953 (patch)
treecda14b1007c2944170e3bbf7bb2f28324157a6dc /src/main/java/gregtech/common
parent02d0ac18a11240541d591f1b4eaf00e1f4e399d7 (diff)
downloadGT5-Unofficial-f7f295e049646aa202994b0e03d7f245b8334953.tar.gz
GT5-Unofficial-f7f295e049646aa202994b0e03d7f245b8334953.tar.bz2
GT5-Unofficial-f7f295e049646aa202994b0e03d7f245b8334953.zip
Pyrotheum and Cryotheum bees
Diffstat (limited to 'src/main/java/gregtech/common')
-rw-r--r--src/main/java/gregtech/common/items/CombType.java4
-rw-r--r--src/main/java/gregtech/common/items/ItemComb.java5
2 files changed, 8 insertions, 1 deletions
diff --git a/src/main/java/gregtech/common/items/CombType.java b/src/main/java/gregtech/common/items/CombType.java
index ebae46d810..9ff5eb359c 100644
--- a/src/main/java/gregtech/common/items/CombType.java
+++ b/src/main/java/gregtech/common/items/CombType.java
@@ -16,6 +16,8 @@ public enum CombType {
COOLANT("coolant", true, Materials._NULL, 100),
ENERGY("energy", true, Materials._NULL, 80),
LAPOTRON("lapotron", true, Materials._NULL, 60),
+ PYROTHEUM("pyrotheum", true, Materials.Pyrotheum, 50),
+ CRYOTHEUM("cryotheum", true, Materials.Pyrotheum, 50),
//Alloy Line
REDALLOY("redalloy", true, Materials.RedAlloy, 100),
@@ -158,6 +160,8 @@ public enum CombType {
{0x144F5A, 0x2494A2},
{0xC11F1F, 0xEBB9B9},
{0x1414FF, 0x6478FF},
+ {0xffebc4, 0xe36400},
+ {0x2660ff, 0x5af7ff},
//alloy
{0xE60000, 0xB80000},
{0xB80000, 0xA50808},
diff --git a/src/main/java/gregtech/common/items/ItemComb.java b/src/main/java/gregtech/common/items/ItemComb.java
index 4d0b5fd829..8940231160 100644
--- a/src/main/java/gregtech/common/items/ItemComb.java
+++ b/src/main/java/gregtech/common/items/ItemComb.java
@@ -125,7 +125,10 @@ public class ItemComb extends Item {
addSpecialCentHV(tComb, GT_Bees.drop.getStackForType(DropType.HOT_COOLANT), 20, ItemList.IC2_Energium_Dust.get(1L), 20, ItemList.FR_RefractoryWax.get(1, new Object[0]), 50);
tComb = getStackForType(CombType.LAPOTRON);
addSpecialCentHV(tComb, GT_Bees.drop.getStackForType(DropType.LAPIS), 20, GT_ModHandler.getModItem("dreamcraft", "item.LapotronDust", 1, 0), 15, GT_ModHandler.getModItem("MagicBees", "wax", 1, 2), 40);
-
+ tComb = getStackForType(CombType.PYROTHEUM);
+ 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.Blizz,1), GT_OreDictUnificator.get(OrePrefixes.dustTiny,Materials.Pyrotheum,1), GT_Values.NI, GT_Values.NI, GT_Values.NI, new int[]{3000, 2500, 2000, 0, 0, 0}, 384, 480);
+ tComb = getStackForType(CombType.CRYOTHEUM);
+ 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.Blaze,1), GT_OreDictUnificator.get(OrePrefixes.dustTiny,Materials.Cryotheum,1), GT_Values.NI, GT_Values.NI, GT_Values.NI, new int[]{3000, 2500, 2000, 0, 0, 0}, 384, 480);
//Alloy
tComb = getStackForType(CombType.REDALLOY);
GT_Values.RA.addCentrifugeRecipe(tComb, GT_Values.NI, GT_Values.NF, GT_Values.NF, ItemList.FR_RefractoryWax.get(1, new Object[0]),GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.RedAlloy, 1), GT_Values.NI, GT_Values.NI, GT_Values.NI, GT_Values.NI, new int[] {5000, 10000}, 128, 5);