From 7ea5acea3484a3c3ee1642b79932390f2f5c2c05 Mon Sep 17 00:00:00 2001 From: Squirrely Date: Sun, 17 Nov 2013 23:00:15 -0600 Subject: [PATCH] Removed ingotsPerOreNetherOreMod variable. Since Nether Ores from the Nether Ores Mod always give 2x normal amount, config option was removed. --- src/tconstruct/common/TContent.java | 2 +- src/tconstruct/util/config/PHConstruct.java | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/tconstruct/common/TContent.java b/src/tconstruct/common/TContent.java index e99e03d8..ccc7ba0e 100644 --- a/src/tconstruct/common/TContent.java +++ b/src/tconstruct/common/TContent.java @@ -2362,7 +2362,7 @@ public class TContent implements IFuelHandler Smeltery.addDictionaryMelting("ore" + ft.toString(), ft, 0, TConstruct.ingotLiquidValue * PHConstruct.ingotsPerOre); // NetherOres support - Smeltery.addDictionaryMelting("oreNether" + ft.toString(), ft, 75, TConstruct.ingotLiquidValue * PHConstruct.ingotsPerOreNetherOreMod); + Smeltery.addDictionaryMelting("oreNether" + ft.toString(), ft, 75, TConstruct.ingotLiquidValue * PHConstruct.ingotsPerOre * 2); // Blocks Smeltery.addDictionaryMelting("block" + ft.toString(), ft, 100, TConstruct.blockLiquidValue); diff --git a/src/tconstruct/util/config/PHConstruct.java b/src/tconstruct/util/config/PHConstruct.java index 50a6471f..a1c2552f 100644 --- a/src/tconstruct/util/config/PHConstruct.java +++ b/src/tconstruct/util/config/PHConstruct.java @@ -66,7 +66,6 @@ public class PHConstruct denyMattock = config.get("Difficulty Changes", "Deny creation of non-metal mattocks", false).getBoolean(false); ingotsPerOre = config.get("Smeltery Output Modification", "Ingots per ore", 2, "Number of ingots returned from smelting ores in the smeltery").getInt(2); - ingotsPerOreNetherOreMod = config.get("Smeltery Output Modification", "Ingots per ore nether ore mod", 4, "Number of ingots returned from smelting ores from the Nether Ore Mod in the smeltery").getInt(4); ingotsBronzeAlloy = config.get("Smeltery Output Modification", "Bronze ingot return", 4, "Number of ingots returned from smelting Bronze in the smeltery").getInt(4); ingotsAluminumBrassAlloy = config.get("Smeltery Output Modification", "Aluminum Brass ingot return", 4, "Number of ingots returned from smelting Aluminum Brass in the smeltery").getInt(4); ingotsAlumiteAlloy = config.get("Smeltery Output Modification", "Alumite ingot return", 3, "Number of ingots returned from smelting Alumite in the smeltery").getInt(3); @@ -687,7 +686,6 @@ public class PHConstruct //Smeltery Output Modification public static int ingotsPerOre; - public static int ingotsPerOreNetherOreMod; public static int ingotsBronzeAlloy; public static int ingotsAluminumBrassAlloy; public static int ingotsAlumiteAlloy;