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 | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/main/java/gregtech/common/items/CombType.java b/src/main/java/gregtech/common/items/CombType.java index cb746ca32e..38592d229c 100644 --- a/src/main/java/gregtech/common/items/CombType.java +++ b/src/main/java/gregtech/common/items/CombType.java @@ -206,6 +206,10 @@ public enum CombType { INDIUM(159, "indium", true, Materials.Indium, 100, 0x8F5D99, 0xFFA9FF, ItemComb.Voltage.ZPM), BLIZZ(160, "blizz", true, Materials.Blizz, 50, 0xFF99A5, 0x5af7ff, ItemComb.Voltage.MV), KEVLAR(161, "kevlar", true, Materials._NULL, 50, 0xa2baa3, 0x2d542f, ItemComb.Voltage.MV), + DRACONIC(162, "draconium", true, Materials.Draconium, 50, 0x161616, 0x6200e7, ItemComb.Voltage.MV), + AWAKENEDDRACONIUM(163, "awakeneddraconium", true, Materials.DraconiumAwakened, 50, 0xD41238, 0xFFA157, + ItemComb.Voltage.MV), + PALLADIUM(164, "palladium", true, Materials.Palladium, 50, 0x8B8B8B, 0xF1D9D9, ItemComb.Voltage.MV), // ALWAYS KEEP _NULL AT THE BOTTOM _NULL(-1, "INVALIDCOMB", false, Materials._NULL, 0, 0, 0); diff --git a/src/main/java/gregtech/common/items/ItemComb.java b/src/main/java/gregtech/common/items/ItemComb.java index 791bc336ff..cff7d25704 100644 --- a/src/main/java/gregtech/common/items/ItemComb.java +++ b/src/main/java/gregtech/common/items/ItemComb.java @@ -969,9 +969,12 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer { addProcessGT(CombType.PLATINUM, new Materials[] { Materials.Platinum }, Voltage.HV); addProcessGT(CombType.MOLYBDENUM, new Materials[] { Materials.Molybdenum }, Voltage.LV); addProcessGT(CombType.IRIDIUM, new Materials[] { Materials.Iridium }, Voltage.IV); + addProcessGT(CombType.PALLADIUM, new Materials[] { Materials.Palladium }, Voltage.IV); addProcessGT(CombType.OSMIUM, new Materials[] { Materials.Osmium }, Voltage.IV); addProcessGT(CombType.LITHIUM, new Materials[] { Materials.Lithium }, Voltage.MV); addProcessGT(CombType.ELECTROTINE, new Materials[] { Materials.Electrotine }, Voltage.MV); + addProcessGT(CombType.DRACONIC, new Materials[] { Materials.Draconium }, Voltage.IV); + addProcessGT(CombType.AWAKENEDDRACONIUM, new Materials[] { Materials.DraconiumAwakened }, Voltage.ZPM); if (GT_Mod.gregtechproxy.mNerfedCombs) { addCentrifugeToItemStack( CombType.SALT, |