diff options
Diffstat (limited to 'src/main/java/gregtech/common')
| -rw-r--r-- | src/main/java/gregtech/common/items/CombType.java | 1 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/items/ItemComb.java | 11 |
2 files changed, 12 insertions, 0 deletions
diff --git a/src/main/java/gregtech/common/items/CombType.java b/src/main/java/gregtech/common/items/CombType.java index 38592d229c..96850727fd 100644 --- a/src/main/java/gregtech/common/items/CombType.java +++ b/src/main/java/gregtech/common/items/CombType.java @@ -210,6 +210,7 @@ public enum CombType { AWAKENEDDRACONIUM(163, "awakeneddraconium", true, Materials.DraconiumAwakened, 50, 0xD41238, 0xFFA157, ItemComb.Voltage.MV), PALLADIUM(164, "palladium", true, Materials.Palladium, 50, 0x8B8B8B, 0xF1D9D9, ItemComb.Voltage.MV), + INFUSEDGOLD(165, "infusedgold", true, Materials.InfusedGold, 50, 0x80641E, 0xFFC83C, ItemComb.Voltage.IV), // 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 f0c01424f5..a44f720f14 100644 --- a/src/main/java/gregtech/common/items/ItemComb.java +++ b/src/main/java/gregtech/common/items/ItemComb.java @@ -1326,6 +1326,17 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer { addProcessGT(CombType.MYTRYL, new Materials[] { Materials.Mytryl }, Voltage.IV); addProcessGT(CombType.QUANTIUM, new Materials[] { Materials.Quantium }, Voltage.IV); addProcessGT(CombType.ORIHARUKON, new Materials[] { Materials.Oriharukon }, Voltage.IV); + addProcessGT(CombType.INFUSEDGOLD, new Materials[] { Materials.InfusedGold }, Voltage.IV); + addCentrifugeToMaterial( + CombType.INFUSEDGOLD, + new Materials[] { Materials.InfusedGold, Materials.Gold }, + new int[] { (GT_Mod.gregtechproxy.mNerfedCombs ? 20 : 50) * 100, + (GT_Mod.gregtechproxy.mNerfedCombs ? 10 : 30) * 100 }, + new int[] {}, + Voltage.IV, + 200, + NI, + 10 * 100); addProcessGT(CombType.MYSTERIOUSCRYSTAL, new Materials[] { Materials.MysteriousCrystal }, Voltage.LuV); addCentrifugeToMaterial( CombType.MYSTERIOUSCRYSTAL, |