new heating coil recipes

GregTechCEu · Jul 23, 2021 · 0e98b6a · 0e98b6a
1 parent 25cc67a
commit 0e98b6a
Show file tree

Hide file tree

Showing 5 changed files with 91 additions and 22 deletions.
diff --git a/src/main/java/gregtech/api/unification/material/Materials.java b/src/main/java/gregtech/api/unification/material/Materials.java
@@ -586,11 +586,11 @@ public static void register() {
     public static IngotMaterial Naquadah = new IngotMaterial(371, "naquadah", 0x323232, METALLIC, 4, of(), EXT_METAL | GENERATE_ORE | GENERATE_FOIL| GENERATE_SPRING, Elements.get("Naquadah"), 6.0F, 4.0f, 1280, 5400);
     public static IngotMaterial NaquadahAlloy = new IngotMaterial(372, "naquadah_alloy", 0x282828, METALLIC, 5, of(new MaterialStack(Naquadah, 1), new MaterialStack(Osmiridium, 1)), EXT2_METAL| GENERATE_SPRING, null, 8.0F, 5.0f, 5120, 7200);
     public static IngotMaterial NaquadahEnriched = new IngotMaterial(373, "naquadah_enriched", 0x323232, METALLIC, 4, of(), EXT_METAL | GENERATE_ORE | GENERATE_FOIL, Elements.get("NaquadahEnriched"), 6.0F, 4.0f, 1280, 4500);
-    public static IngotMaterial Naquadria = new IngotMaterial(374, "naquadria", 0x1E1E1E, SHINY, 3, of(), EXT_METAL, Elements.get("Naquadria"), 9000);
+    public static IngotMaterial Naquadria = new IngotMaterial(374, "naquadria", 0x1E1E1E, SHINY, 3, of(), EXT_METAL | GENERATE_FOIL, Elements.get("Naquadria"), 9000);
     public static IngotMaterial Neutronium = new IngotMaterial(375, "neutronium", 0xFAFAFA, DULL, 6, of(), EXT2_METAL | GENERATE_RING | GENERATE_ROTOR | GENERATE_SMALL_GEAR | GENERATE_LONG_ROD | GENERATE_FRAME, Elements.get("Neutronium"), 24.0F, 12F, 655360);
     public static IngotMaterial Tritanium = new IngotMaterial(376, "tritanium", 0x600000, METALLIC, 6, of(), EXT_METAL | GENERATE_FRAME, Elements.get("Tritanium"), 20.0F, 6.0f, 10240);
     public static IngotMaterial Duranium = new IngotMaterial(377, "duranium", 0xFFFFFF, METALLIC, 5, of(), EXT_METAL | GENERATE_FOIL, Elements.get("Duranium"), 16.0F, 5.0f, 5120);
-    public static IngotMaterial Trinium = new IngotMaterial(378, "trinium", 0xC8C8D2, SHINY, 7, of(), 0, Elements.get("Trinium"), 8600);
+    public static IngotMaterial Trinium = new IngotMaterial(378, "trinium", 0xC8C8D2, SHINY, 7, of(), GENERATE_FOIL, Elements.get("Trinium"), 8600);
     public static IngotMaterial Adamantium = new IngotMaterial(379, "adamantium", 0x2d365c, SHINY, 7, of(), 0, Elements.get("Adamantium"), 10850);
     public static IngotMaterial Vibranium = new IngotMaterial(380, "vibranium", 0x828aad, SHINY, 7, of(), 0, Elements.get("Vibranium"), 11220);
     public static IngotMaterial Taranium = new IngotMaterial(381, "taranium", 0x0c0c0d, SHINY, 7, of(), 0, Elements.get("Taranium"), 10000);

diff --git a/src/main/java/gregtech/common/ConfigHolder.java b/src/main/java/gregtech/common/ConfigHolder.java
@@ -233,12 +233,12 @@ public static class GT5U {
             @Config.Comment("Whether or not to use polymers instead of rare metals for Carbon Fibers. REMOVES THE CHANCED OUTPUT! Default: false")
             public boolean polymerCarbonFiber = false;
 
-            @Config.Comment("The default color to overlay onto machines. \n16777215 (0xFFFFFF in decimal) is no coloring (default), and 13819135 (0xD2DCFF in decimal) is the classic blue from GT5.")
+            @Config.Comment("The default color to overlay onto machines. \n16777215 (0xFFFFFF in decimal) is no coloring (default), and 13819135 (0xD2DCFF in decimal) is the classic blue from GT5. THIS IS SERVER SIDE!!!")
             @Config.Name("Default Machine Color")
             @Config.RequiresMcRestart
             public int defaultPaintingColor = 0xFFFFFF;
 
-            @Config.Comment("The default color to overlay onto machines. \n7829367 (0x777777 in decimal) is no coloring (default), and 4210752 (0x404040 in decimal) is the classic black from GT5.")
+            @Config.Comment("The default color to overlay onto cable insulation. \n7829367 (0x777777 in decimal) is no coloring (default), and 4210752 (0x404040 in decimal) is the classic black from GT5. THIS IS SERVER SIDE!!!")
             @Config.Name("Default Cable Color")
             @Config.RequiresMcRestart
             public int defaultInsulationColor = 0x777777;
@@ -247,6 +247,10 @@ public static class GT5U {
             @Config.Name("Use electric blast furnace temperature bonuses")
             @Config.RequiresMcRestart
             public boolean ebfTemperatureBonuses = true;
+
+            @Config.Comment("Enable more challenging recipes for Electric Blast Furnace Coils. Default: true")
+            @Config.Name("Enable harder heating coil recipes")
+            public boolean harderHeatingCoils = true;
         }
 
         public static class GT6 {

diff --git a/src/main/java/gregtech/loaders/MaterialInfoLoader.java b/src/main/java/gregtech/loaders/MaterialInfoLoader.java
@@ -6,6 +6,7 @@
 import gregtech.api.unification.ore.OrePrefix;
 import gregtech.api.unification.stack.ItemMaterialInfo;
 import gregtech.api.unification.stack.MaterialStack;
+import gregtech.common.ConfigHolder;
 import gregtech.common.blocks.BlockWireCoil.CoilType;
 import gregtech.common.blocks.MetaBlocks;
 import net.minecraft.init.Blocks;
@@ -18,10 +19,59 @@
 public class MaterialInfoLoader {
 
     public static void init() {
-        for (CoilType coilType : CoilType.values()) {
-            if (coilType.getMaterial() instanceof DustMaterial) {
-                ItemStack outputStack = MetaBlocks.WIRE_COIL.getItemVariant(coilType);
-                OreDictUnifier.registerOre(outputStack, new ItemMaterialInfo(new MaterialStack(coilType.getMaterial(), OrePrefix.wireGtDouble.materialAmount * 8)));
+        if (ConfigHolder.U.GT5u.harderHeatingCoils){
+            OreDictUnifier.registerOre(MetaBlocks.WIRE_COIL.getItemVariant(CoilType.CUPRONICKEL),
+                    new ItemMaterialInfo(new MaterialStack(Materials.Cupronickel, OrePrefix.wireGtDouble.materialAmount * 8),
+                            new MaterialStack(Materials.Bronze, OrePrefix.foil.materialAmount * 8),
+                            new MaterialStack(Materials.TinAlloy, OrePrefix.ingot.materialAmount))
+            );
+            OreDictUnifier.registerOre(MetaBlocks.WIRE_COIL.getItemVariant(CoilType.KANTHAL),
+                    new ItemMaterialInfo(new MaterialStack(Materials.Kanthal, OrePrefix.wireGtDouble.materialAmount * 8),
+                            new MaterialStack(Materials.Aluminium, OrePrefix.foil.materialAmount * 8),
+                            new MaterialStack(Materials.Copper, OrePrefix.ingot.materialAmount))
+            );
+            OreDictUnifier.registerOre(MetaBlocks.WIRE_COIL.getItemVariant(CoilType.NICHROME),
+                    new ItemMaterialInfo(new MaterialStack(Materials.Nichrome, OrePrefix.wireGtDouble.materialAmount * 8),
+                            new MaterialStack(Materials.StainlessSteel, OrePrefix.foil.materialAmount * 8),
+                            new MaterialStack(Materials.Aluminium, OrePrefix.ingot.materialAmount))
+            );
+            OreDictUnifier.registerOre(MetaBlocks.WIRE_COIL.getItemVariant(CoilType.TUNGSTENSTEEL),
+                    new ItemMaterialInfo(new MaterialStack(Materials.TungstenSteel, OrePrefix.wireGtDouble.materialAmount * 8),
+                            new MaterialStack(Materials.VanadiumSteel, OrePrefix.foil.materialAmount * 8),
+                            new MaterialStack(Materials.Nichrome, OrePrefix.ingot.materialAmount))
+            );
+            OreDictUnifier.registerOre(MetaBlocks.WIRE_COIL.getItemVariant(CoilType.HSS_G),
+                    new ItemMaterialInfo(new MaterialStack(Materials.HSSG, OrePrefix.wireGtDouble.materialAmount * 8),
+                            new MaterialStack(Materials.TungstenCarbide, OrePrefix.foil.materialAmount * 8),
+                            new MaterialStack(Materials.Tungsten, OrePrefix.ingot.materialAmount))
+            );
+            OreDictUnifier.registerOre(MetaBlocks.WIRE_COIL.getItemVariant(CoilType.NAQUADAH),
+                    new ItemMaterialInfo(new MaterialStack(Materials.Naquadah, OrePrefix.wireGtDouble.materialAmount * 8),
+                            new MaterialStack(Materials.Osmium, OrePrefix.foil.materialAmount * 8),
+                            new MaterialStack(Materials.TungstenSteel, OrePrefix.ingot.materialAmount))
+            );
+            OreDictUnifier.registerOre(MetaBlocks.WIRE_COIL.getItemVariant(CoilType.NAQUADAH_ALLOY),
+                    new ItemMaterialInfo(new MaterialStack(Materials.NaquadahAlloy, OrePrefix.wireGtDouble.materialAmount * 8),
+                            new MaterialStack(Materials.Osmiridium, OrePrefix.foil.materialAmount * 8),
+                            new MaterialStack(Materials.Naquadah, OrePrefix.ingot.materialAmount))
+            );
+            OreDictUnifier.registerOre(MetaBlocks.WIRE_COIL.getItemVariant(CoilType.FLUXED_ELECTRUM),
+                    new ItemMaterialInfo(new MaterialStack(Materials.FluxedElectrum, OrePrefix.wireGtDouble.materialAmount * 8),
+                            new MaterialStack(Materials.Naquadria, OrePrefix.foil.materialAmount * 8),
+                            new MaterialStack(Materials.NaquadahAlloy, OrePrefix.ingot.materialAmount))
+            );
+            OreDictUnifier.registerOre(MetaBlocks.WIRE_COIL.getItemVariant(CoilType.DIAMERICIUM_TITANIUM),
+                    new ItemMaterialInfo(new MaterialStack(Materials.DiamericiumTitanium, OrePrefix.wireGtDouble.materialAmount * 8),
+                            new MaterialStack(Materials.Trinium, OrePrefix.foil.materialAmount * 8),
+                            new MaterialStack(Materials.Neutronium, OrePrefix.ingot.materialAmount))
+            );
+
+        } else {
+            for (CoilType coilType : CoilType.values()) {
+                if (coilType.getMaterial() instanceof DustMaterial) {
+                    ItemStack outputStack = MetaBlocks.WIRE_COIL.getItemVariant(coilType);
+                    OreDictUnifier.registerOre(outputStack, new ItemMaterialInfo(new MaterialStack(coilType.getMaterial(), OrePrefix.wireGtDouble.materialAmount * 8)));
+                }
             }
         }
         OreDictUnifier.registerOre(new ItemStack(Items.IRON_DOOR, 1), new ItemMaterialInfo(new MaterialStack(Materials.Iron, M * 2)));
@@ -143,4 +193,4 @@ public static void init() {
         OreDictUnifier.registerOre(new ItemStack(Blocks.DISPENSER, 1, W), new ItemMaterialInfo(new MaterialStack(Materials.Stone, M * 7), new MaterialStack(Materials.Redstone, M)));
         OreDictUnifier.registerOre(new ItemStack(Blocks.DROPPER, 1, W), new ItemMaterialInfo(new MaterialStack(Materials.Stone, M * 7), new MaterialStack(Materials.Redstone, M)));
     }
-}
+}
diff --git a/src/main/java/gregtech/loaders/recipe/MachineRecipeLoader.java b/src/main/java/gregtech/loaders/recipe/MachineRecipeLoader.java
@@ -511,14 +511,27 @@ private static void registerAssemblerRecipes() {
         RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder().EUt(16).input(OrePrefix.plate, Materials.Osmium, 8).outputs(MetaBlocks.MACHINE_CASING.getItemVariant(MachineCasingType.UV)).circuitMeta(8).duration(50).buildAndRegister();
         RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder().EUt(16).input(OrePrefix.plate, Materials.Neutronium, 8).outputs(MetaBlocks.MACHINE_CASING.getItemVariant(MachineCasingType.MAX)).circuitMeta(8).duration(50).buildAndRegister();
 
-        for (CoilType coilType : CoilType.values()) {
-            if (coilType.getMaterial() != null) {
-                ItemStack outputStack = MetaBlocks.WIRE_COIL.getItemVariant(coilType);
-                ASSEMBLER_RECIPES.recipeBuilder()
-                    .circuitMeta(8)
-                    .input(wireGtDouble, coilType.getMaterial(), 8)
-                    .outputs(outputStack)
-                    .duration(50).EUt(16).buildAndRegister();
+        if (ConfigHolder.U.GT5u.harderHeatingCoils) {
+            RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder().EUt(30).input(OrePrefix.wireGtDouble, Materials.Cupronickel, 8).input(OrePrefix.foil, Materials.Bronze, 8).fluidInputs(Materials.TinAlloy.getFluid(GTValues.L)).outputs(MetaBlocks.WIRE_COIL.getItemVariant(CoilType.CUPRONICKEL)).duration(200).buildAndRegister();
+            RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder().EUt(120).input(OrePrefix.wireGtDouble, Materials.Kanthal, 8).input(OrePrefix.foil, Materials.Aluminium, 8).fluidInputs(Materials.Copper.getFluid(GTValues.L)).outputs(MetaBlocks.WIRE_COIL.getItemVariant(CoilType.KANTHAL)).duration(300).buildAndRegister();
+            RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder().EUt(480).input(OrePrefix.wireGtDouble, Materials.Nichrome, 8).input(OrePrefix.foil, Materials.StainlessSteel, 8).fluidInputs(Materials.Aluminium.getFluid(GTValues.L)).outputs(MetaBlocks.WIRE_COIL.getItemVariant(CoilType.NICHROME)).duration(400).buildAndRegister();
+            RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder().EUt(1920).input(OrePrefix.wireGtDouble, Materials.TungstenSteel, 8).input(OrePrefix.foil, Materials.VanadiumSteel, 8).fluidInputs(Materials.Nichrome.getFluid(GTValues.L)).outputs(MetaBlocks.WIRE_COIL.getItemVariant(CoilType.TUNGSTENSTEEL)).duration(500).buildAndRegister();
+            RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder().EUt(7680).input(OrePrefix.wireGtDouble, Materials.HSSG, 8).input(OrePrefix.foil, Materials.TungstenCarbide, 8).fluidInputs(Materials.Tungsten.getFluid(GTValues.L)).outputs(MetaBlocks.WIRE_COIL.getItemVariant(CoilType.HSS_G)).duration(600).buildAndRegister();
+            RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder().EUt(30720).input(OrePrefix.wireGtDouble, Materials.Naquadah, 8).input(OrePrefix.foil, Materials.Osmium, 8).fluidInputs(Materials.TungstenSteel.getFluid(GTValues.L)).outputs(MetaBlocks.WIRE_COIL.getItemVariant(CoilType.NAQUADAH)).duration(700).buildAndRegister();
+            RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder().EUt(122880).input(OrePrefix.wireGtDouble, Materials.NaquadahAlloy, 8).input(OrePrefix.foil, Materials.Osmiridium, 8).fluidInputs(Materials.Naquadah.getFluid(GTValues.L)).outputs(MetaBlocks.WIRE_COIL.getItemVariant(CoilType.NAQUADAH_ALLOY)).duration(800).buildAndRegister();
+            RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder().EUt(500000).input(OrePrefix.wireGtDouble, Materials.FluxedElectrum, 8).input(OrePrefix.foil, Materials.Naquadria, 8).fluidInputs(Materials.NaquadahAlloy.getFluid(GTValues.L)).outputs(MetaBlocks.WIRE_COIL.getItemVariant(CoilType.FLUXED_ELECTRUM)).duration(900).buildAndRegister();
+            RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder().EUt(2000000).input(OrePrefix.wireGtDouble, Materials.DiamericiumTitanium, 8).input(OrePrefix.foil, Materials.Trinium, 8).fluidInputs(Materials.Neutronium.getFluid(GTValues.L)).outputs(MetaBlocks.WIRE_COIL.getItemVariant(CoilType.DIAMERICIUM_TITANIUM)).duration(1000).buildAndRegister();
+
+        } else {
+            for (CoilType coilType : CoilType.values()) {
+                if (coilType.getMaterial() != null) {
+                    ItemStack outputStack = MetaBlocks.WIRE_COIL.getItemVariant(coilType);
+                    ASSEMBLER_RECIPES.recipeBuilder()
+                            .circuitMeta(8)
+                            .input(wireGtDouble, coilType.getMaterial(), 8)
+                            .outputs(outputStack)
+                            .duration(50).EUt(16).buildAndRegister();
+                }
             }
         }
 

diff --git a/src/main/java/gregtech/loaders/recipe/MetaTileEntityLoader.java b/src/main/java/gregtech/loaders/recipe/MetaTileEntityLoader.java
@@ -92,11 +92,13 @@ public static void init() {
         ModHandler.addShapedRecipe("casing_titanium_firebox", MetaBlocks.BOILER_FIREBOX_CASING.getItemVariant(TITANIUM_FIREBOX, 2), "PSP", "SFS", "PSP", 'P', new UnificationEntry(OrePrefix.plate, Materials.Titanium), 'F', new UnificationEntry(OrePrefix.frameGt, Materials.Titanium), 'S', new UnificationEntry(OrePrefix.stick, Materials.Titanium));
         ModHandler.addShapedRecipe("casing_tungstensteel_firebox", MetaBlocks.BOILER_FIREBOX_CASING.getItemVariant(TUNGSTENSTEEL_FIREBOX, 2), "PSP", "SFS", "PSP", 'P', new UnificationEntry(OrePrefix.plate, Materials.TungstenSteel), 'F', new UnificationEntry(OrePrefix.frameGt, Materials.TungstenSteel), 'S', new UnificationEntry(OrePrefix.stick, Materials.TungstenSteel));
 
-        for (CoilType coilType : CoilType.values()) {
-            if (coilType.getMaterial() != null) {
-                ItemStack outputStack = MetaBlocks.WIRE_COIL.getItemVariant(coilType);
-                ModHandler.addShapedRecipe(String.format("heating_coil_%s", coilType.getName()), outputStack, "XXX", "XwX", "XXX", 'X',
-                    new UnificationEntry(OrePrefix.wireGtDouble, coilType.getMaterial()));
+        if (!ConfigHolder.U.GT5u.harderHeatingCoils) {
+            for (CoilType coilType : CoilType.values()) {
+                if (coilType.getMaterial() != null) {
+                    ItemStack outputStack = MetaBlocks.WIRE_COIL.getItemVariant(coilType);
+                    ModHandler.addShapedRecipe(String.format("heating_coil_%s", coilType.getName()), outputStack, "XXX", "XwX", "XXX", 'X',
+                            new UnificationEntry(OrePrefix.wireGtDouble, coilType.getMaterial()));
+                }
             }
         }