diff --git a/libs/Mantle-1.9.4-0.10.1.jenkins142.jar b/libs/Mantle-1.10.2-0.10.3.jenkins161.jar similarity index 92% rename from libs/Mantle-1.9.4-0.10.1.jenkins142.jar rename to libs/Mantle-1.10.2-0.10.3.jenkins161.jar index 96df434..99eb74a 100644 Binary files a/libs/Mantle-1.9.4-0.10.1.jenkins142.jar and b/libs/Mantle-1.10.2-0.10.3.jenkins161.jar differ diff --git a/libs/TConstruct-1.9.4-2.3.1.jenkins229.jar b/libs/TConstruct-1.10.2-2.3.3a.jenkins227.jar similarity index 55% rename from libs/TConstruct-1.9.4-2.3.1.jenkins229.jar rename to libs/TConstruct-1.10.2-2.3.3a.jenkins227.jar index 15aa08a..a31f8b7 100644 Binary files a/libs/TConstruct-1.9.4-2.3.1.jenkins229.jar and b/libs/TConstruct-1.10.2-2.3.3a.jenkins227.jar differ diff --git a/libs/forestry_1.10.2-5.1.10.192(1).jar b/libs/forestry_1.10.2-5.2.1.204.jar similarity index 79% rename from libs/forestry_1.10.2-5.1.10.192(1).jar rename to libs/forestry_1.10.2-5.2.1.204.jar index 36d8e29..2e6337e 100644 Binary files a/libs/forestry_1.10.2-5.1.10.192(1).jar and b/libs/forestry_1.10.2-5.2.1.204.jar differ diff --git a/src/main/java/modtweaker/mods/tconstruct/handlers/Casting.java b/src/main/java/modtweaker/mods/tconstruct/handlers/Casting.java index b13e5a1..db47087 100644 --- a/src/main/java/modtweaker/mods/tconstruct/handlers/Casting.java +++ b/src/main/java/modtweaker/mods/tconstruct/handlers/Casting.java @@ -29,18 +29,18 @@ public class Casting { ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// @ZenMethod - public static void addBasinRecipe(IItemStack output, ILiquidStack metal, @Optional IItemStack cast) { - if (metal == null || output == null) { + public static void addBasinRecipe(IItemStack output, ILiquidStack liquid, @Optional IItemStack cast) { + if (liquid == null || output == null) { LogHelper.logError(String.format("Required parameters missing for %s Recipe.", name)); return; } - CastingRecipe rec = new CastingRecipe(toStack(output), RecipeMatch.of(toStack(cast)), toFluid(metal).getFluid(), metal.getAmount()); + CastingRecipe rec = new CastingRecipe(toStack(output), RecipeMatch.of(toStack(cast)), toFluid(liquid).getFluid(), liquid.getAmount()); MineTweakerAPI.apply(new Add(rec, (LinkedList) TConstructHelper.basinCasting)); } @ZenMethod - public static void addTableRecipe(IItemStack output, ILiquidStack metal, @Optional IItemStack cast) { - if (metal == null || output == null) { + public static void addTableRecipe(IItemStack output, ILiquidStack liquid, @Optional IItemStack cast) { + if (liquid == null || output == null) { LogHelper.logError(String.format("Required parameters missing for %s Recipe.", name)); return; } @@ -48,7 +48,7 @@ public class Casting { if (cast != null) { match = RecipeMatch.of(toStack(cast)); } - CastingRecipe rec = new CastingRecipe(toStack(output), match, toFluid(metal).getFluid(), metal.getAmount()); + CastingRecipe rec = new CastingRecipe(toStack(output), match, toFluid(liquid).getFluid(), liquid.getAmount()); MineTweakerAPI.apply(new Add(rec, (LinkedList) TConstructHelper.tableCasting)); } @@ -68,24 +68,24 @@ public class Casting { ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// @ZenMethod - public static void removeTableRecipe(IIngredient output, @Optional IIngredient material, @Optional IIngredient cast) { - removeRecipe(output, material, cast, TConstructHelper.tableCasting); + public static void removeTableRecipe(IIngredient output, @Optional IIngredient liquid, @Optional IIngredient cast) { + removeRecipe(output, liquid, cast, TConstructHelper.tableCasting); } @ZenMethod - public static void removeBasinRecipe(IIngredient output, @Optional IIngredient material, @Optional IIngredient cast) { + public static void removeBasinRecipe(IIngredient output, @Optional IIngredient liquid, @Optional IIngredient cast) { - removeRecipe(output, material, cast, TConstructHelper.basinCasting); + removeRecipe(output, liquid, cast, TConstructHelper.basinCasting); } - public static void removeRecipe(IIngredient output, IIngredient material, IIngredient cast, List list) { + public static void removeRecipe(IIngredient output, IIngredient liquid, IIngredient cast, List list) { if (output == null) { LogHelper.logError(String.format("Required parameters missing for %s Recipe.", name)); return; } - if (material == null) { - material = IngredientAny.INSTANCE; + if (liquid == null) { + liquid = IngredientAny.INSTANCE; } List recipes = new LinkedList(); @@ -97,7 +97,7 @@ public class Casting { continue; } - if (!matches(material, toILiquidStack(recipe.getFluid()))) { + if (!matches(liquid, toILiquidStack(recipe.getFluid()))) { continue; } @@ -116,7 +116,7 @@ public class Casting { } else { - LogHelper.logWarning(String.format("No %s Recipe found for output %s, material %s and cast %s. Command ignored!", Casting.name, output.toString(), material.toString(), cast != null ? cast.toString() : null)); + LogHelper.logWarning(String.format("No %s Recipe found for output %s, material %s and cast %s. Command ignored!", Casting.name, output.toString(), liquid.toString(), cast != null ? cast.toString() : null)); } } diff --git a/src/main/java/modtweaker/mods/tconstruct/handlers/Smeltery.java b/src/main/java/modtweaker/mods/tconstruct/handlers/Smeltery.java index 016ecc8..83dc5fd 100644 --- a/src/main/java/modtweaker/mods/tconstruct/handlers/Smeltery.java +++ b/src/main/java/modtweaker/mods/tconstruct/handlers/Smeltery.java @@ -98,7 +98,7 @@ public class Smeltery { // Adding a TConstruct Melting recipe @ZenMethod - public static void addMelting(IIngredient input, ILiquidStack output, int temp, @Optional IItemStack block) { + public static void addMelting(ILiquidStack output, IIngredient input, int temp, @Optional IItemStack block) { if (input == null || output == null) { LogHelper.logError(String.format("Required parameters missing for %s Recipe.", nameMelting)); @@ -210,6 +210,30 @@ public class Smeltery { * TConstruct Fuel Recipes **********************************************/ + @ZenMethod + public static void addFuel(ILiquidStack liquid) { + if (liquid == null) { + LogHelper.logError(String.format("Required parameters missing for %s Recipe.", nameFuel)); + return; + } + + List stacks = new ArrayList(); + stacks.add(toFluid(liquid)); + MineTweakerAPI.apply(new AddFuel(stacks)); + } + + public static class AddFuel extends BaseListAddition { + + public AddFuel(List recipes) { + super(Smeltery.nameFuel, TConstructHelper.fuelList, recipes); + } + + @Override + public String getRecipeInfo(FluidStack recipe) { + return LogHelper.getStackDescription(recipe); + } + } + ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// @ZenMethod public static void removeFuel(IIngredient input) { @@ -238,30 +262,4 @@ public class Smeltery { return LogHelper.getStackDescription(recipe); } } - - ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - - @ZenMethod - public static void addFuel(ILiquidStack liquid) { - if (liquid == null) { - LogHelper.logError(String.format("Required parameters missing for %s Recipe.", nameFuel)); - return; - } - - List stacks = new ArrayList(); - stacks.add(toFluid(liquid)); - MineTweakerAPI.apply(new AddFuel(stacks)); - } - - public static class AddFuel extends BaseListAddition { - - public AddFuel(List recipes) { - super(Smeltery.nameFuel, TConstructHelper.fuelList, recipes); - } - - @Override - public String getRecipeInfo(FluidStack recipe) { - return LogHelper.getStackDescription(recipe); - } - } }