From 5e68aec1fd2885e4a4bf0a32fb0777a66d73d33c Mon Sep 17 00:00:00 2001 From: mDiyo Date: Wed, 8 Jan 2014 03:13:28 -0800 Subject: [PATCH] Fix obsidian dust exploit with other mods --- src/tconstruct/common/TContent.java | 31 ++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/src/tconstruct/common/TContent.java b/src/tconstruct/common/TContent.java index 7c74ca53..f39e8f27 100644 --- a/src/tconstruct/common/TContent.java +++ b/src/tconstruct/common/TContent.java @@ -2467,7 +2467,7 @@ public class TContent implements IFuelHandler public void addOreDictionarySmelteryRecipes () { - List exceptions = Arrays.asList(new FluidType[] { FluidType.Water, FluidType.Stone, FluidType.Ender, FluidType.Glass, FluidType.Slime }); + List exceptions = Arrays.asList(new FluidType[] { FluidType.Water, FluidType.Stone, FluidType.Ender, FluidType.Glass, FluidType.Slime, FluidType.Obsidian }); for (FluidType ft : FluidType.values()) { if (exceptions.contains(ft)) @@ -2500,6 +2500,35 @@ public class TContent implements IFuelHandler } } + //Obsidian, different dust amount + { + FluidType ft = FluidType.Obsidian; + 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/4); + + // Factorization support + Smeltery.addDictionaryMelting("crystalline" + ft.toString(), ft, -50, TConstruct.ingotLiquidValue); + + // Ores + Smeltery.addDictionaryMelting("ore" + ft.toString(), ft, 0, TConstruct.ingotLiquidValue * PHConstruct.ingotsPerOre); + + // NetherOres support + Smeltery.addDictionaryMelting("oreNether" + ft.toString(), ft, 75, TConstruct.ingotLiquidValue * PHConstruct.ingotsPerOre * 2); + + // Blocks + Smeltery.addDictionaryMelting("block" + ft.toString(), ft, 100, TConstruct.blockLiquidValue); + + if (ft.isToolpart) + { + registerPatternMaterial("ingot" + ft.toString(), 2, ft.toString()); + registerPatternMaterial("block" + ft.toString(), 18, ft.toString()); + } + } + //Compressed materials for (int i = 1; i <= 8; i++) {