From b52313ac7311de1f350877d4e7fb5220b87b7973 Mon Sep 17 00:00:00 2001 From: Squirrely Date: Sun, 17 Nov 2013 20:18:23 -0600 Subject: [PATCH] Added difficulty config option vanillaSmelting. False by default. Makes smeltery ingot return 1 for each ore. Alloy output adjusted for equality to non modified version. --- src/tconstruct/common/TContent.java | 65 +++++++++++++++------ src/tconstruct/util/config/PHConstruct.java | 8 ++- 2 files changed, 51 insertions(+), 22 deletions(-) diff --git a/src/tconstruct/common/TContent.java b/src/tconstruct/common/TContent.java index d44de802..52a5f666 100644 --- a/src/tconstruct/common/TContent.java +++ b/src/tconstruct/common/TContent.java @@ -1647,18 +1647,33 @@ public class TContent implements IFuelHandler private void addRecipesForSmeltery () { //Alloys Smelting - if (PHConstruct.harderBronze) - Smeltery.addAlloyMixing(new FluidStack(moltenBronzeFluid, TConstruct.ingotLiquidValue * 2), new FluidStack(moltenCopperFluid, TConstruct.ingotLiquidValue * 3), new FluidStack( - moltenTinFluid, TConstruct.ingotLiquidValue)); //Bronze - else - Smeltery.addAlloyMixing(new FluidStack(moltenBronzeFluid, TConstruct.ingotLiquidValue * 3), new FluidStack(moltenCopperFluid, TConstruct.ingotLiquidValue * 3), new FluidStack( - moltenTinFluid, TConstruct.ingotLiquidValue)); //Bronze - Smeltery.addAlloyMixing(new FluidStack(moltenAlubrassFluid, TConstruct.ingotLiquidValue * 4), new FluidStack(moltenAluminumFluid, TConstruct.ingotLiquidValue * 3), new FluidStack( - moltenCopperFluid, TConstruct.ingotLiquidValue * 1)); //Aluminum Brass - Smeltery.addAlloyMixing(new FluidStack(moltenManyullynFluid, TConstruct.ingotLiquidValue), new FluidStack(moltenCobaltFluid, TConstruct.ingotLiquidValue * 2), new FluidStack( - moltenArditeFluid, TConstruct.ingotLiquidValue * 2)); //Manyullyn - Smeltery.addAlloyMixing(new FluidStack(moltenAlumiteFluid, TConstruct.ingotLiquidValue * 3), new FluidStack(moltenAluminumFluid, TConstruct.ingotLiquidValue * 5), new FluidStack( - moltenIronFluid, TConstruct.ingotLiquidValue * 2), new FluidStack(moltenObsidianFluid, TConstruct.ingotLiquidValue * 2)); //Alumite + if (PHConstruct.vanillaSmelting) + { + Smeltery.addAlloyMixing(new FluidStack(moltenBronzeFluid, TConstruct.ingotLiquidValue * 4), new FluidStack(moltenCopperFluid, TConstruct.ingotLiquidValue * 3), new FluidStack( + moltenTinFluid, TConstruct.ingotLiquidValue)); //Bronze + Smeltery.addAlloyMixing(new FluidStack(moltenAlubrassFluid, TConstruct.ingotLiquidValue * 4), new FluidStack(moltenAluminumFluid, TConstruct.ingotLiquidValue * 3), new FluidStack( + moltenCopperFluid, TConstruct.ingotLiquidValue * 1)); //Aluminum Brass + Smeltery.addAlloyMixing(new FluidStack(moltenManyullynFluid, TConstruct.ingotLiquidValue * 2), new FluidStack(moltenCobaltFluid, TConstruct.ingotLiquidValue), new FluidStack( + moltenArditeFluid, TConstruct.ingotLiquidValue)); //Manyullyn + Smeltery.addAlloyMixing(new FluidStack(moltenAlumiteFluid, TConstruct.ingotLiquidValue * 6), new FluidStack(moltenAluminumFluid, TConstruct.ingotLiquidValue * 5), new FluidStack( + moltenIronFluid, TConstruct.ingotLiquidValue * 2), new FluidStack(moltenObsidianFluid, TConstruct.ingotLiquidValue * 2)); //Alumite + } + else + { + if (PHConstruct.harderBronze) + Smeltery.addAlloyMixing(new FluidStack(moltenBronzeFluid, TConstruct.ingotLiquidValue * 2), new FluidStack(moltenCopperFluid, TConstruct.ingotLiquidValue * 3), new FluidStack( + moltenTinFluid, TConstruct.ingotLiquidValue)); //Bronze + else + Smeltery.addAlloyMixing(new FluidStack(moltenBronzeFluid, TConstruct.ingotLiquidValue * 4), new FluidStack(moltenCopperFluid, TConstruct.ingotLiquidValue * 3), new FluidStack( + moltenTinFluid, TConstruct.ingotLiquidValue)); //Bronze + + Smeltery.addAlloyMixing(new FluidStack(moltenAlubrassFluid, TConstruct.ingotLiquidValue * 4), new FluidStack(moltenAluminumFluid, TConstruct.ingotLiquidValue * 3), new FluidStack( + moltenCopperFluid, TConstruct.ingotLiquidValue * 1)); //Aluminum Brass + Smeltery.addAlloyMixing(new FluidStack(moltenManyullynFluid, TConstruct.ingotLiquidValue), new FluidStack(moltenCobaltFluid, TConstruct.ingotLiquidValue * 2), new FluidStack( + moltenArditeFluid, TConstruct.ingotLiquidValue * 2)); //Manyullyn + Smeltery.addAlloyMixing(new FluidStack(moltenAlumiteFluid, TConstruct.ingotLiquidValue * 3), new FluidStack(moltenAluminumFluid, TConstruct.ingotLiquidValue * 5), new FluidStack( + moltenIronFluid, TConstruct.ingotLiquidValue * 2), new FluidStack(moltenObsidianFluid, TConstruct.ingotLiquidValue * 2)); //Alumite + } // Stone parts for (int sc = 0; sc < patternOutputs.length; sc++) @@ -1698,7 +1713,7 @@ public class TContent implements IFuelHandler Smeltery.addMelting(FluidType.Iron, new ItemStack(Item.minecartHopper), 50, TConstruct.ingotLiquidValue * 10); Smeltery.addMelting(FluidType.Iron, new ItemStack(Item.doorIron), 0, TConstruct.ingotLiquidValue * 6); Smeltery.addMelting(FluidType.Iron, new ItemStack(Item.cauldron), 0, TConstruct.ingotLiquidValue * 7); - Smeltery.addMelting(FluidType.Iron, new ItemStack(Item.shears), 0, TConstruct.oreLiquidValue); + Smeltery.addMelting(FluidType.Iron, new ItemStack(Item.shears), 0, TConstruct.ingotLiquidValue * 2); // Smeltery.addMelting(FluidType.Slime, new ItemStack(slimeGel, 1, 0), 0, TConstruct.ingotLiquidValue * 4); // Smeltery.addMelting(FluidType.Slime, new ItemStack(strangeFood, 1, 0), 0, TConstruct.ingotLiquidValue); @@ -1707,10 +1722,11 @@ public class TContent implements IFuelHandler //Blocks melt at themselves! //Ore - Smeltery.addMelting(Block.oreIron, 0, 600, new FluidStack(moltenIronFluid, TConstruct.ingotLiquidValue * 2)); - Smeltery.addMelting(Block.oreGold, 0, 400, new FluidStack(moltenGoldFluid, TConstruct.ingotLiquidValue * 2)); - Smeltery.addMelting(oreGravel, 0, 600, new FluidStack(moltenIronFluid, TConstruct.ingotLiquidValue * 2)); - Smeltery.addMelting(oreGravel, 1, 400, new FluidStack(moltenGoldFluid, TConstruct.ingotLiquidValue * 2)); + + // Smeltery.addMelting(Block.oreIron, 0, 600, new FluidStack(moltenIronFluid, TConstruct.ingotLiquidValue * 2)); + // Smeltery.addMelting(Block.oreGold, 0, 400, new FluidStack(moltenGoldFluid, TConstruct.ingotLiquidValue * 2)); + // Smeltery.addMelting(oreGravel, 0, 600, new FluidStack(moltenIronFluid, TConstruct.ingotLiquidValue * 2)); + // Smeltery.addMelting(oreGravel, 1, 400, new FluidStack(moltenGoldFluid, TConstruct.ingotLiquidValue * 2)); //Blocks Smeltery.addMelting(Block.blockIron, 0, 600, new FluidStack(moltenIronFluid, TConstruct.ingotLiquidValue * 9)); @@ -2352,19 +2368,30 @@ public class TContent implements IFuelHandler // Nuggets Smeltery.addDictionaryMelting("nugget" + ft.toString(), ft, -100, TConstruct.nuggetLiquidValue); + // Ingots, Dust registerIngotCasting(ft); Smeltery.addDictionaryMelting("ingot" + ft.toString(), ft, -50, TConstruct.ingotLiquidValue); Smeltery.addDictionaryMelting("dust" + ft.toString(), ft, -75, TConstruct.ingotLiquidValue); + // Factorization support Smeltery.addDictionaryMelting("crystalline" + ft.toString(), ft, -50, TConstruct.ingotLiquidValue); // Ores - Smeltery.addDictionaryMelting("ore" + ft.toString(), ft, 0, TConstruct.oreLiquidValue); + if (PHConstruct.vanillaSmelting) + Smeltery.addDictionaryMelting("ore" + ft.toString(), ft, 0, TConstruct.ingotLiquidValue); + else + Smeltery.addDictionaryMelting("ore" + ft.toString(), ft, 0, TConstruct.oreLiquidValue); + // NetherOres support - Smeltery.addDictionaryMelting("oreNether" + ft.toString(), ft, 75, TConstruct.oreLiquidValue * 2); + if (PHConstruct.vanillaSmelting) + Smeltery.addDictionaryMelting("oreNether" + ft.toString(), ft, 75, TConstruct.oreLiquidValue); + else + Smeltery.addDictionaryMelting("oreNether" + ft.toString(), ft, 75, TConstruct.oreLiquidValue * 2); + // Blocks Smeltery.addDictionaryMelting("block" + ft.toString(), ft, 100, TConstruct.blockLiquidValue); + if (ft.isToolpart) { registerPatternMaterial("ingot" + ft.toString(), 2, ft.toString()); diff --git a/src/tconstruct/util/config/PHConstruct.java b/src/tconstruct/util/config/PHConstruct.java index 8ef95b29..4f660b71 100644 --- a/src/tconstruct/util/config/PHConstruct.java +++ b/src/tconstruct/util/config/PHConstruct.java @@ -64,9 +64,10 @@ public class PHConstruct stencilTableCrafting = config.get("Difficulty Changes", "Craft Stencil Tables", true).getBoolean(true); miningLevelIncrease = config.get("Difficulty Changes", "Modifiers increase Mining Level", true).getBoolean(true); denyMattock = config.get("Difficulty Changes", "Deny creation of non-metal mattocks", false).getBoolean(false); - harderBronze = config.get("Difficulty Changes", "Lower bronze output to 2 ingots", false).getBoolean(false); - stencilTableCrafting = config.get("Difficulty Changes", "Craft Stencil Tables", true).getBoolean(true); - denyMattock = config.get("Difficulty Changes", "Deny creation of non-metal mattocks", false).getBoolean(false); + vanillaSmelting = config.get("Difficulty Changes", "Vanilla furnace smeltery ingot output", false, "If true ingot output lowered to 1 per ore. Could be used in accordance with mods which limit early game ore doubling.").getBoolean(false); +// harderBronze = config.get("Difficulty Changes", "Lower bronze output to 2 ingots", false).getBoolean(false); +// stencilTableCrafting = config.get("Difficulty Changes", "Craft Stencil Tables", true).getBoolean(true); +// denyMattock = config.get("Difficulty Changes", "Deny creation of non-metal mattocks", false).getBoolean(false); //1467-1489 woodStation = config.getBlock("Wood Tool Station", 1471).getInt(1471); @@ -678,6 +679,7 @@ public class PHConstruct public static boolean vanillaMetalBlocks; public static boolean removeVanillaToolRecipes; public static boolean harderBronze; + public static boolean vanillaSmelting; public static boolean stencilTableCrafting; public static boolean miningLevelIncrease; public static boolean denyMattock;