diff options
Diffstat (limited to 'src/main/java/gregtech/common/items')
-rw-r--r-- | src/main/java/gregtech/common/items/CombType.java | 4 | ||||
-rw-r--r-- | src/main/java/gregtech/common/items/ItemComb.java | 6 |
2 files changed, 10 insertions, 0 deletions
diff --git a/src/main/java/gregtech/common/items/CombType.java b/src/main/java/gregtech/common/items/CombType.java index 0a79fbb1e1..ebae46d810 100644 --- a/src/main/java/gregtech/common/items/CombType.java +++ b/src/main/java/gregtech/common/items/CombType.java @@ -9,6 +9,8 @@ public enum CombType { COAL("coal", true, Materials.Coal, 100), STICKY("stickyresin", true, Materials._NULL, 50), OIL("oil", true, Materials._NULL, 100), + APATITE("apatite", true, Materials.Apatite, 100), + ASH("ash", true, Materials.Ash, 100), //IC2 Line COOLANT("coolant", true, Materials._NULL, 100), @@ -150,6 +152,8 @@ public enum CombType { {0x525252, 0x666666}, {0x2E8F5B, 0xDCC289}, {0x333333, 0x4C4C4C}, + {0xc1c1f6, 0x676784}, + {0x1e1a18, 0xc6c6c6}, //ic2 {0x144F5A, 0x2494A2}, {0xC11F1F, 0xEBB9B9}, diff --git a/src/main/java/gregtech/common/items/ItemComb.java b/src/main/java/gregtech/common/items/ItemComb.java index 939e5ce97e..4d0b5fd829 100644 --- a/src/main/java/gregtech/common/items/ItemComb.java +++ b/src/main/java/gregtech/common/items/ItemComb.java @@ -111,6 +111,12 @@ public class ItemComb extends Item { tComb = getStackForType(CombType.OIL); addSpecialCentLV(tComb, ItemList.Crop_Drop_OilBerry.get(1, new Object[0]), 70, GT_Bees.drop.getStackForType(DropType.OIL), 100); addProcessLV(tComb, Materials.Oilsands, 100); + tComb = getStackForType(CombType.APATITE); + addProcessLV(tComb, Materials.Apatite, 100); + addProcessLV(tComb, Materials.Calcium, 80); + addProcessLV(tComb, Materials.Phosphate, 80); + tComb = getStackForType(CombType.ASH); + 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.DarkAsh, 1), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Ash, 1), GT_Values.NI, GT_Values.NI, GT_Values.NI, new int[] {5000, 5000, 5000}, 128, 5); //ic2 tComb = getStackForType(CombType.COOLANT); |