From bcf49341056c72d44c70e67fd1352569eb7e5a17 Mon Sep 17 00:00:00 2001 From: Dream-Master Date: Thu, 11 Feb 2016 19:01:58 +0100 Subject: [PATCH] Added Ordict support Thanks to Techlone Bump Version --- build.gradle | 2 +- src/main/java/gttweaker/GTTweaker.java | 2 +- .../gttweaker/mods/gregtech/AlloySmelter.java | 8 ++++---- .../java/gttweaker/mods/gregtech/ArcFurnace.java | 6 +++--- .../java/gttweaker/mods/gregtech/Assembler.java | 16 ++++++++-------- .../java/gttweaker/mods/gregtech/Autoclave.java | 6 +++--- .../gttweaker/mods/gregtech/Blastfurnace.java | 12 ++++++------ .../java/gttweaker/mods/gregtech/Brewery.java | 6 +++--- .../java/gttweaker/mods/gregtech/Canner.java | 10 +++++----- .../java/gttweaker/mods/gregtech/Centrifuge.java | 16 ++++++++-------- .../gttweaker/mods/gregtech/ChemicalBath.java | 6 +++--- .../gttweaker/mods/gregtech/ChemicalReactor.java | 16 ++++++++-------- .../java/gttweaker/mods/gregtech/CuttingSaw.java | 8 ++++---- .../gttweaker/mods/gregtech/Electrolyzer.java | 14 +++++++------- .../java/gttweaker/mods/gregtech/Extruder.java | 8 ++++---- .../gttweaker/mods/gregtech/FluidCanner.java | 6 +++--- .../gttweaker/mods/gregtech/FluidExtractor.java | 6 +++--- .../gttweaker/mods/gregtech/ForgeHammer.java | 6 +++--- .../gttweaker/mods/gregtech/FormingPress.java | 8 ++++---- src/main/java/gttweaker/mods/gregtech/Fuels.java | 16 ++++++++-------- .../mods/gregtech/ImplosionCompressor.java | 8 ++++---- src/main/java/gttweaker/mods/gregtech/Lathe.java | 8 ++++---- src/main/java/gttweaker/mods/gregtech/Mixer.java | 12 ++++++------ .../java/gttweaker/mods/gregtech/Packer.java | 8 ++++---- .../mods/gregtech/PlasmaArcFurnace.java | 6 +++--- .../gttweaker/mods/gregtech/PlateBender.java | 6 +++--- .../java/gttweaker/mods/gregtech/Polarizer.java | 6 +++--- .../gttweaker/mods/gregtech/PrecisionLaser.java | 4 ++-- .../java/gttweaker/mods/gregtech/Printer.java | 6 +++--- .../java/gttweaker/mods/gregtech/Pulverizer.java | 6 +++--- .../gttweaker/mods/gregtech/PyrolyseOven.java | 6 +++--- .../java/gttweaker/mods/gregtech/Separator.java | 6 +++--- .../java/gttweaker/mods/gregtech/Sifter.java | 6 +++--- .../java/gttweaker/mods/gregtech/Slicer.java | 6 +++--- .../java/gttweaker/mods/gregtech/Unpacker.java | 6 +++--- .../gttweaker/mods/gregtech/VacuumFreezer.java | 6 +++--- .../java/gttweaker/mods/gregtech/Wiremill.java | 6 +++--- src/main/resources/mcmod.info | 2 +- 38 files changed, 146 insertions(+), 146 deletions(-) diff --git a/build.gradle b/build.gradle index f509359..1eab6bd 100644 --- a/build.gradle +++ b/build.gradle @@ -17,7 +17,7 @@ buildscript { apply plugin: 'forge' -version = "1.7.10-1.2.2" +version = "1.7.10-1.3.0" group= "gttweaker" // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = "GTTweaker" diff --git a/src/main/java/gttweaker/GTTweaker.java b/src/main/java/gttweaker/GTTweaker.java index 9f935d1..bb877fd 100644 --- a/src/main/java/gttweaker/GTTweaker.java +++ b/src/main/java/gttweaker/GTTweaker.java @@ -7,7 +7,7 @@ import minetweaker.MineTweakerAPI; import gregtech.api.*; -@Mod(modid = "GTTweaker", name = "GTTweaker", dependencies = "", version = "1.2.2") +@Mod(modid = "GTTweaker", name = "GTTweaker", dependencies = "", version = "1.3.0") public class GTTweaker { @EventHandler public void init(FMLInitializationEvent event) { diff --git a/src/main/java/gttweaker/mods/gregtech/AlloySmelter.java b/src/main/java/gttweaker/mods/gregtech/AlloySmelter.java index d4d2966..cd0b71a 100644 --- a/src/main/java/gttweaker/mods/gregtech/AlloySmelter.java +++ b/src/main/java/gttweaker/mods/gregtech/AlloySmelter.java @@ -30,7 +30,7 @@ public class AlloySmelter { * @param euPerTick eu consumption per tick */ @ZenMethod - public static void addRecipe(IItemStack output, IIngredient input1, IIngredient input2, int durationTicks, int euPerTick) { + public static void addRecipe(IItemStack output, IItemStack input1, IItemStack input2, int durationTicks, int euPerTick) { MineTweakerAPI.apply(new AddRecipeAction(output, input1, input2, durationTicks, euPerTick)); } @@ -40,12 +40,12 @@ public static void addRecipe(IItemStack output, IIngredient input1, IIngredient private static class AddRecipeAction extends OneWayAction { private final IItemStack output; - private final IIngredient input1; - private final IIngredient input2; + private final IItemStack input1; + private final IItemStack input2; private final int duration; private final int euPerTick; - public AddRecipeAction(IItemStack output, IIngredient input1, IIngredient input2, int duration, int euPerTick) { + public AddRecipeAction(IItemStack output, IItemStack input1, IItemStack input2, int duration, int euPerTick) { this.output = output; this.input1 = input1; this.input2 = input2; diff --git a/src/main/java/gttweaker/mods/gregtech/ArcFurnace.java b/src/main/java/gttweaker/mods/gregtech/ArcFurnace.java index 01ef424..1b71ec2 100644 --- a/src/main/java/gttweaker/mods/gregtech/ArcFurnace.java +++ b/src/main/java/gttweaker/mods/gregtech/ArcFurnace.java @@ -32,7 +32,7 @@ public class ArcFurnace { * @param euPerTick eu consumption per tick */ @ZenMethod - public static void addRecipe(IItemStack[]outputs, IIngredient input, ILiquidStack fluidInput, int[] outChances, int durationTicks, int euPerTick) { + public static void addRecipe(IItemStack[]outputs, IItemStack input, ILiquidStack fluidInput, int[] outChances, int durationTicks, int euPerTick) { if (outputs.length < 1) { MineTweakerAPI.logError("Arc Furnace must have at least 1 output"); } else if(outputs.length!=outChances.length){ @@ -48,13 +48,13 @@ public static void addRecipe(IItemStack[]outputs, IIngredient input, ILiquidStac private static class AddRecipeAction extends OneWayAction { private final IItemStack[] output; - private final IIngredient input; + private final IItemStack input; private final ILiquidStack fluidInput; private final int[] chances; private final int duration; private final int euPerTick; - public AddRecipeAction(IItemStack[] output, IIngredient input, ILiquidStack fluidInput, int[] outChances, int duration, int euPerTick) { + public AddRecipeAction(IItemStack[] output, IItemStack input, ILiquidStack fluidInput, int[] outChances, int duration, int euPerTick) { this.output = output; this.input = input; diff --git a/src/main/java/gttweaker/mods/gregtech/Assembler.java b/src/main/java/gttweaker/mods/gregtech/Assembler.java index f356507..e0ca9b8 100644 --- a/src/main/java/gttweaker/mods/gregtech/Assembler.java +++ b/src/main/java/gttweaker/mods/gregtech/Assembler.java @@ -34,11 +34,11 @@ public class Assembler { * @param euPerTick eu consumption per tick */ @ZenMethod - public static void addRecipe(IItemStack output, IIngredient input1, IIngredient input2, ILiquidStack fluidInput1, int durationTicks, int euPerTick) { + public static void addRecipe(IItemStack output, IItemStack input1, IItemStack input2, ILiquidStack fluidInput1, int durationTicks, int euPerTick) { MineTweakerAPI.apply(new AddFluidRecipeAction(output, input1, input2, fluidInput1, durationTicks, euPerTick)); } @ZenMethod - public static void addRecipe(IItemStack output, IIngredient input1, IIngredient input2, int durationTicks, int euPerTick) { + public static void addRecipe(IItemStack output, IItemStack input1, IItemStack input2, int durationTicks, int euPerTick) { MineTweakerAPI.apply(new AddRecipeAction(output, input1, input2, durationTicks, euPerTick)); } // ###################### @@ -48,12 +48,12 @@ public static void addRecipe(IItemStack output, IIngredient input1, IIngredient private static class AddRecipeAction extends OneWayAction { private final IItemStack output; - private final IIngredient input1; - private final IIngredient input2; + private final IItemStack input1; + private final IItemStack input2; private final int duration; private final int euPerTick; - public AddRecipeAction(IItemStack output, IIngredient input1, IIngredient input2, int duration, int euPerTick) { + public AddRecipeAction(IItemStack output, IItemStack input1, IItemStack input2, int duration, int euPerTick) { this.output = output; this.input1 = input1; @@ -86,13 +86,13 @@ public Object getOverrideKey() { private static class AddFluidRecipeAction extends OneWayAction { private final IItemStack output; - private final IIngredient input1; - private final IIngredient input2; + private final IItemStack input1; + private final IItemStack input2; private final ILiquidStack fluidInput1; private final int duration; private final int euPerTick; - public AddFluidRecipeAction(IItemStack output, IIngredient input1, IIngredient input2, ILiquidStack fluidInput1, int duration, int euPerTick) { + public AddFluidRecipeAction(IItemStack output, IItemStack input1, IItemStack input2, ILiquidStack fluidInput1, int duration, int euPerTick) { this.output = output; this.input1 = input1; diff --git a/src/main/java/gttweaker/mods/gregtech/Autoclave.java b/src/main/java/gttweaker/mods/gregtech/Autoclave.java index 00b2d21..b3c1c0c 100644 --- a/src/main/java/gttweaker/mods/gregtech/Autoclave.java +++ b/src/main/java/gttweaker/mods/gregtech/Autoclave.java @@ -31,7 +31,7 @@ public class Autoclave { * @param euPerTick eu consumption per tick */ @ZenMethod - public static void addRecipe(IItemStack output, IIngredient input, ILiquidStack fluidInput, int chances, int durationTicks, int euPerTick) { + public static void addRecipe(IItemStack output, IItemStack input, ILiquidStack fluidInput, int chances, int durationTicks, int euPerTick) { MineTweakerAPI.apply(new AddRecipeAction(output, input, fluidInput, chances, durationTicks, euPerTick)); } // ###################### @@ -40,13 +40,13 @@ public static void addRecipe(IItemStack output, IIngredient input, ILiquidStack private static class AddRecipeAction extends OneWayAction { private final IItemStack output; - private final IIngredient input; + private final IItemStack input; private final ILiquidStack fluidInput; private final int chances; private final int duration; private final int euPerTick; - public AddRecipeAction(IItemStack output, IIngredient input, ILiquidStack fluidInput, int chances, int duration, int euPerTick) { + public AddRecipeAction(IItemStack output, IItemStack input, ILiquidStack fluidInput, int chances, int duration, int euPerTick) { this.output = output; this.input = input; diff --git a/src/main/java/gttweaker/mods/gregtech/Blastfurnace.java b/src/main/java/gttweaker/mods/gregtech/Blastfurnace.java index c1cf25d..b1c1708 100644 --- a/src/main/java/gttweaker/mods/gregtech/Blastfurnace.java +++ b/src/main/java/gttweaker/mods/gregtech/Blastfurnace.java @@ -34,7 +34,7 @@ public class Blastfurnace { */ @ZenMethod - public static void addRecipe(IItemStack[]output, ILiquidStack fluidInput, IIngredient[] input, int durationTicks, int euPerTick, int heat) { + public static void addRecipe(IItemStack[]output, ILiquidStack fluidInput, IItemStack[] input, int durationTicks, int euPerTick, int heat) { if (output.length == 0) { MineTweakerAPI.logError("Blast furnace recipe requires at least 1 input"); } else { @@ -42,7 +42,7 @@ public static void addRecipe(IItemStack[]output, ILiquidStack fluidInput, IIngre } } @ZenMethod - public static void addRecipe(IItemStack[] output, IIngredient[] input, int durationTicks, int euPerTick, int heat) { + public static void addRecipe(IItemStack[] output, IItemStack[] input, int durationTicks, int euPerTick, int heat) { if (output.length == 0) { MineTweakerAPI.logError("Blast furnace recipe requires at least 1 input"); } else { @@ -58,12 +58,12 @@ public static void addRecipe(IItemStack[] output, IIngredient[] input, int durat private static class AddRecipeAction extends OneWayAction { private final IItemStack[] output; - private final IIngredient[] input; + private final IItemStack[] input; private final int duration; private final int euPerTick; private final int heat; - public AddRecipeAction(IItemStack[] output, IIngredient[] input, int duration, int euPerTick, int heat) { + public AddRecipeAction(IItemStack[] output, IItemStack[] input, int duration, int euPerTick, int heat) { this.output = output; this.input = input; @@ -101,12 +101,12 @@ private static class AddFluidRecipeAction extends OneWayAction { private final IItemStack[] output; private final ILiquidStack fluidInput; - private final IIngredient[] input; + private final IItemStack[] input; private final int duration; private final int euPerTick; private final int heat; - public AddFluidRecipeAction(IItemStack[] output, ILiquidStack fluidInput, IIngredient[] input, int duration, int euPerTick, int heat) { + public AddFluidRecipeAction(IItemStack[] output, ILiquidStack fluidInput, IItemStack[] input, int duration, int euPerTick, int heat) { this.output = output; this.fluidInput = fluidInput; diff --git a/src/main/java/gttweaker/mods/gregtech/Brewery.java b/src/main/java/gttweaker/mods/gregtech/Brewery.java index 5344059..d61d414 100644 --- a/src/main/java/gttweaker/mods/gregtech/Brewery.java +++ b/src/main/java/gttweaker/mods/gregtech/Brewery.java @@ -31,7 +31,7 @@ public class Brewery { * */ @ZenMethod - public static void addRecipe(ILiquidStack fluidOutput, IIngredient Ingredient, ILiquidStack fluidInput, boolean Hidden) { + public static void addRecipe(ILiquidStack fluidOutput, IItemStack Ingredient, ILiquidStack fluidInput, boolean Hidden) { MineTweakerAPI.apply(new AddRecipeAction(fluidOutput, Ingredient, fluidInput, Hidden)); } @@ -41,12 +41,12 @@ public static void addRecipe(ILiquidStack fluidOutput, IIngredient Ingredient, I private static class AddRecipeAction extends OneWayAction { - private final IIngredient Ingredient; + private final IItemStack Ingredient; private final ILiquidStack fluidOutput; private final ILiquidStack fluidInput; private final boolean Hidden; - public AddRecipeAction(ILiquidStack fluidOutput, IIngredient Ingredient, ILiquidStack fluidInput, boolean Hidden) { + public AddRecipeAction(ILiquidStack fluidOutput, IItemStack Ingredient, ILiquidStack fluidInput, boolean Hidden) { this.Ingredient = Ingredient; this.fluidOutput = fluidOutput; diff --git a/src/main/java/gttweaker/mods/gregtech/Canner.java b/src/main/java/gttweaker/mods/gregtech/Canner.java index 29174bc..f0bc669 100644 --- a/src/main/java/gttweaker/mods/gregtech/Canner.java +++ b/src/main/java/gttweaker/mods/gregtech/Canner.java @@ -30,7 +30,7 @@ public class Canner { * @param euPerTick eu consumption per tick */ @ZenMethod - public static void addRecipe(IItemStack output, IIngredient input1, IIngredient input2, int durationTicks, int euPerTick) { + public static void addRecipe(IItemStack output, IItemStack input1, IItemStack input2, int durationTicks, int euPerTick) { MineTweakerAPI.apply(new AddRecipeAction(output, null, input1, input2, durationTicks, euPerTick)); } @@ -44,7 +44,7 @@ public static void addRecipe(IItemStack output, IIngredient input1, IIngredient * @param euPerTick eu consumption per tick */ @ZenMethod - public static void addRecipe(IItemStack[] output, IIngredient input1, IIngredient input2, int durationTicks, int euPerTick) { + public static void addRecipe(IItemStack[] output, IItemStack input1, IItemStack input2, int durationTicks, int euPerTick) { if (output.length == 0) { MineTweakerAPI.logError("canner requires at least 1 output"); } else { @@ -59,12 +59,12 @@ public static void addRecipe(IItemStack[] output, IIngredient input1, IIngredien private static class AddRecipeAction extends OneWayAction { private final IItemStack output1; private final IItemStack output2; - private final IIngredient input1; - private final IIngredient input2; + private final IItemStack input1; + private final IItemStack input2; private final int duration; private final int euPerTick; - public AddRecipeAction(IItemStack output1, IItemStack output2, IIngredient input1, IIngredient input2, int duration, int euPerTick) { + public AddRecipeAction(IItemStack output1, IItemStack output2, IItemStack input1, IItemStack input2, int duration, int euPerTick) { this.output1 = output1; this.output2 = output2; diff --git a/src/main/java/gttweaker/mods/gregtech/Centrifuge.java b/src/main/java/gttweaker/mods/gregtech/Centrifuge.java index 0d5c751..a9e76db 100644 --- a/src/main/java/gttweaker/mods/gregtech/Centrifuge.java +++ b/src/main/java/gttweaker/mods/gregtech/Centrifuge.java @@ -37,7 +37,7 @@ public class Centrifuge { * */ @ZenMethod - public static void addRecipe(IItemStack[] outputs, ILiquidStack fluidOutput, IIngredient input, IIngredient cells, ILiquidStack fluidInput, int[] chances, int durationTicks, int euPerTick) { + public static void addRecipe(IItemStack[] outputs, ILiquidStack fluidOutput, IItemStack input, IItemStack cells, ILiquidStack fluidInput, int[] chances, int durationTicks, int euPerTick) { if (outputs.length < 1) { MineTweakerAPI.logError("Centrifuge must have at least 1 output"); } else if(outputs.length!=chances.length){ @@ -48,7 +48,7 @@ public static void addRecipe(IItemStack[] outputs, ILiquidStack fluidOutput, IIn } @ZenMethod - public static void addRecipeFuelCan(IItemStack[] outputs, IIngredient input, int numCans, int duration) { + public static void addRecipeFuelCan(IItemStack[] outputs, IItemStack input, int numCans, int duration) { if (outputs.length < 1) { MineTweakerAPI.logError("centrifuge must have at least 1 output"); } else { @@ -57,7 +57,7 @@ public static void addRecipeFuelCan(IItemStack[] outputs, IIngredient input, int } @ZenMethod - public static void addRecipe(IItemStack[] outputs, IIngredient input, int cells, int durationTicks) { + public static void addRecipe(IItemStack[] outputs, IItemStack input, int cells, int durationTicks) { if (outputs.length < 1) { MineTweakerAPI.logError("centrifuge must have at least 1 output"); } else { @@ -72,11 +72,11 @@ public static void addRecipe(IItemStack[] outputs, IIngredient input, int cells, private static class AddRecipeAction extends OneWayAction { private final IItemStack[] output; - private final IIngredient input; + private final IItemStack input; private final int cells; private final int duration; - public AddRecipeAction(IItemStack[] output, IIngredient input, int cells, int duration) { + public AddRecipeAction(IItemStack[] output, IItemStack input, int cells, int duration) { this.output = output; this.input = input; @@ -147,14 +147,14 @@ private static class AddFluidRecipeAction extends OneWayAction { private final IItemStack[] outputs; private final ILiquidStack fluidOutput; - private final IIngredient input; - private final IIngredient cells; + private final IItemStack input; + private final IItemStack cells; private final ILiquidStack fluidInput; private final int [] chances; private final int duration; private final int euPerTick; - public AddFluidRecipeAction(IItemStack[] outputs, ILiquidStack fluidOutput, IIngredient input, IIngredient cells, ILiquidStack fluidInput, int[] chances, int duration, int euPerTick) { + public AddFluidRecipeAction(IItemStack[] outputs, ILiquidStack fluidOutput, IItemStack input, IItemStack cells, ILiquidStack fluidInput, int[] chances, int duration, int euPerTick) { this.outputs = outputs; this.fluidOutput = fluidOutput; diff --git a/src/main/java/gttweaker/mods/gregtech/ChemicalBath.java b/src/main/java/gttweaker/mods/gregtech/ChemicalBath.java index ec27e02..41ae4c3 100644 --- a/src/main/java/gttweaker/mods/gregtech/ChemicalBath.java +++ b/src/main/java/gttweaker/mods/gregtech/ChemicalBath.java @@ -32,7 +32,7 @@ public class ChemicalBath { * @param euPerTick eu consumption per tick */ @ZenMethod - public static void addRecipe(IItemStack[] output, IIngredient input, ILiquidStack fluidInput, int[] chances, int durationTicks, int euPerTick) { + public static void addRecipe(IItemStack[] output, IItemStack input, ILiquidStack fluidInput, int[] chances, int durationTicks, int euPerTick) { if (output.length == 0) { MineTweakerAPI.logError("chemical bath requires at least 1 output"); } else { @@ -47,13 +47,13 @@ public static void addRecipe(IItemStack[] output, IIngredient input, ILiquidStac private static class AddRecipeAction extends OneWayAction { private final IItemStack[] output; - private final IIngredient input; + private final IItemStack input; private final ILiquidStack fluidInput; private final int[] chances; private final int duration; private final int euPerTick; - public AddRecipeAction(IItemStack[] output, IIngredient input, ILiquidStack fluidInput, int[] chances, int duration, int euPerTick) { + public AddRecipeAction(IItemStack[] output, IItemStack input, ILiquidStack fluidInput, int[] chances, int duration, int euPerTick) { this.output = output; this.input = input; diff --git a/src/main/java/gttweaker/mods/gregtech/ChemicalReactor.java b/src/main/java/gttweaker/mods/gregtech/ChemicalReactor.java index 760dbe1..371dd08 100644 --- a/src/main/java/gttweaker/mods/gregtech/ChemicalReactor.java +++ b/src/main/java/gttweaker/mods/gregtech/ChemicalReactor.java @@ -32,12 +32,12 @@ public class ChemicalReactor { * @param durationTicks reaction time, in ticks */ @ZenMethod - public static void addRecipe(IItemStack output, ILiquidStack fluidOutput1, IIngredient input1, IIngredient input2, ILiquidStack fluidInput1, int durationTicks) { + public static void addRecipe(IItemStack output, ILiquidStack fluidOutput1, IItemStack input1, IItemStack input2, ILiquidStack fluidInput1, int durationTicks) { MineTweakerAPI.apply(new AddFluidRecipeAction(output, fluidOutput1, input1, input2, fluidInput1, durationTicks)); } @ZenMethod - public static void addRecipe(IItemStack output, IIngredient input1, IIngredient input2, int durationTicks) { + public static void addRecipe(IItemStack output, IItemStack input1, IItemStack input2, int durationTicks) { MineTweakerAPI.apply(new AddRecipeAction(output, input1, input2, durationTicks)); } @@ -48,11 +48,11 @@ public static void addRecipe(IItemStack output, IIngredient input1, IIngredient private static class AddRecipeAction extends OneWayAction { private final IItemStack output; - private final IIngredient input1; - private final IIngredient input2; + private final IItemStack input1; + private final IItemStack input2; private final int duration; - public AddRecipeAction(IItemStack output, IIngredient input1, IIngredient input2, int duration) { + public AddRecipeAction(IItemStack output, IItemStack input1, IItemStack input2, int duration) { this.output = output; this.input1 = input1; @@ -118,12 +118,12 @@ private static class AddFluidRecipeAction extends OneWayAction { private final IItemStack output; private final ILiquidStack fluidOutput1; - private final IIngredient input1; - private final IIngredient input2; + private final IItemStack input1; + private final IItemStack input2; private final ILiquidStack fluidInput1; private final int duration; - public AddFluidRecipeAction(IItemStack output, ILiquidStack fluidOutput1, IIngredient input1, IIngredient input2, ILiquidStack fluidInput1, int duration) { + public AddFluidRecipeAction(IItemStack output, ILiquidStack fluidOutput1, IItemStack input1, IItemStack input2, ILiquidStack fluidInput1, int duration) { this.output = output; this.fluidOutput1 = fluidOutput1; diff --git a/src/main/java/gttweaker/mods/gregtech/CuttingSaw.java b/src/main/java/gttweaker/mods/gregtech/CuttingSaw.java index d096b97..bbdd2fc 100644 --- a/src/main/java/gttweaker/mods/gregtech/CuttingSaw.java +++ b/src/main/java/gttweaker/mods/gregtech/CuttingSaw.java @@ -33,12 +33,12 @@ public class CuttingSaw { * @param euPerTick eu consumption per tick */ @ZenMethod - public static void addRecipe(IItemStack output1, IItemStack output2, IIngredient input, ILiquidStack lubricant, int durationTicks, int euPerTick) { + public static void addRecipe(IItemStack output1, IItemStack output2, IItemStack input, ILiquidStack lubricant, int durationTicks, int euPerTick) { MineTweakerAPI.apply(new AddRecipeAction(output1, output2, input, lubricant, durationTicks, euPerTick)); } @ZenMethod - public static void addRecipe(IItemStack[] output, IIngredient input, ILiquidStack lubricant, int durationTicks, int euPerTick) { + public static void addRecipe(IItemStack[] output, IItemStack input, ILiquidStack lubricant, int durationTicks, int euPerTick) { if (output.length == 0) { MineTweakerAPI.logError("canner requires at least 1 output"); } else { @@ -53,12 +53,12 @@ private static class AddRecipeAction extends OneWayAction { private final IItemStack output1; private final IItemStack output2; - private final IIngredient input; + private final IItemStack input; private final ILiquidStack lubricant; private final int duration; private final int euPerTick; - public AddRecipeAction(IItemStack output1, IItemStack output2, IIngredient input, ILiquidStack lubricant, int duration, int euPerTick1) { + public AddRecipeAction(IItemStack output1, IItemStack output2, IItemStack input, ILiquidStack lubricant, int duration, int euPerTick1) { this.output1 = output1; this.output2 = output2; diff --git a/src/main/java/gttweaker/mods/gregtech/Electrolyzer.java b/src/main/java/gttweaker/mods/gregtech/Electrolyzer.java index fb309fd..ea3fd71 100644 --- a/src/main/java/gttweaker/mods/gregtech/Electrolyzer.java +++ b/src/main/java/gttweaker/mods/gregtech/Electrolyzer.java @@ -37,7 +37,7 @@ public class Electrolyzer { * */ @ZenMethod - public static void addRecipe(IItemStack[] output, ILiquidStack fluidOutput, IIngredient input, IIngredient cells, ILiquidStack fluidInput, int[] chances, int durationTicks, int euPerTick) { + public static void addRecipe(IItemStack[] output, ILiquidStack fluidOutput, IItemStack input, IItemStack cells, ILiquidStack fluidInput, int[] chances, int durationTicks, int euPerTick) { if (output.length < 1) { MineTweakerAPI.logError("Electrolyzer must have at least 1 output"); } else if(output.length!=chances.length){ @@ -48,7 +48,7 @@ public static void addRecipe(IItemStack[] output, ILiquidStack fluidOutput, IIng } @ZenMethod - public static void addRecipe(IItemStack[] output, IIngredient input, int cells, int durationTicks, int euPerTick) { + public static void addRecipe(IItemStack[] output, IItemStack input, int cells, int durationTicks, int euPerTick) { if (output.length == 0) { MineTweakerAPI.logError("Electrolyzer recipe requires at least 1 input"); } else { @@ -63,12 +63,12 @@ public static void addRecipe(IItemStack[] output, IIngredient input, int cells, private static class AddRecipeAction extends OneWayAction { private final IItemStack[] output; - private final IIngredient input; + private final IItemStack input; private final int cells; private final int duration; private final int euPerTick; - public AddRecipeAction(IItemStack[] output, IIngredient input, int cells, int duration, int euPerTick) { + public AddRecipeAction(IItemStack[] output, IItemStack input, int cells, int duration, int euPerTick) { this.output = output; this.input = input; this.cells = cells; @@ -144,14 +144,14 @@ private static class AddFluidRecipeAction extends OneWayAction { private final IItemStack [] output; private final ILiquidStack fluidOutput; - private final IIngredient input; - private final IIngredient cells; + private final IItemStack input; + private final IItemStack cells; private final ILiquidStack fluidInput; private final int [] chances; private final int duration; private final int euPerTick; - public AddFluidRecipeAction(IItemStack [] output, ILiquidStack fluidOutput, IIngredient input, IIngredient cells, ILiquidStack fluidInput, int [] chances, int duration, int euPerTick) { + public AddFluidRecipeAction(IItemStack [] output, ILiquidStack fluidOutput, IItemStack input, IItemStack cells, ILiquidStack fluidInput, int [] chances, int duration, int euPerTick) { this.output = output; this.fluidOutput = fluidOutput; diff --git a/src/main/java/gttweaker/mods/gregtech/Extruder.java b/src/main/java/gttweaker/mods/gregtech/Extruder.java index 56b56ed..d1f1535 100644 --- a/src/main/java/gttweaker/mods/gregtech/Extruder.java +++ b/src/main/java/gttweaker/mods/gregtech/Extruder.java @@ -31,7 +31,7 @@ public class Extruder { * @param euPerTick eu consumption per tick */ @ZenMethod - public static void addRecipe(IItemStack output, IIngredient input, IIngredient shape, int durationTicks, int euPerTick) { + public static void addRecipe(IItemStack output, IItemStack input, IItemStack shape, int durationTicks, int euPerTick) { MineTweakerAPI.apply(new AddRecipeAction(output, input, shape, durationTicks, euPerTick)); } @@ -41,12 +41,12 @@ public static void addRecipe(IItemStack output, IIngredient input, IIngredient s private static class AddRecipeAction extends OneWayAction { private final IItemStack output; - private final IIngredient input; - private final IIngredient shape; + private final IItemStack input; + private final IItemStack shape; private final int duration; private final int euPerTick; - public AddRecipeAction(IItemStack output, IIngredient input, IIngredient shape, int duration, int euPerTick) { + public AddRecipeAction(IItemStack output, IItemStack input, IItemStack shape, int duration, int euPerTick) { this.output = output; this.input = input; this.shape = shape; diff --git a/src/main/java/gttweaker/mods/gregtech/FluidCanner.java b/src/main/java/gttweaker/mods/gregtech/FluidCanner.java index e4805c0..2eca73e 100644 --- a/src/main/java/gttweaker/mods/gregtech/FluidCanner.java +++ b/src/main/java/gttweaker/mods/gregtech/FluidCanner.java @@ -31,7 +31,7 @@ public class FluidCanner { * */ @ZenMethod - public static void addRecipe(IItemStack output, IIngredient input, ILiquidStack fluidOutput, ILiquidStack fluidInput) { + public static void addRecipe(IItemStack output, IItemStack input, ILiquidStack fluidOutput, ILiquidStack fluidInput) { MineTweakerAPI.apply(new AddRecipeAction(output, input, fluidOutput, fluidInput)); } @@ -42,12 +42,12 @@ public static void addRecipe(IItemStack output, IIngredient input, ILiquidStack private static class AddRecipeAction extends OneWayAction { private final IItemStack output; - private final IIngredient input; + private final IItemStack input; private final ILiquidStack fluidOutput; private final ILiquidStack fluidInput; - public AddRecipeAction(IItemStack output, IIngredient input, ILiquidStack fluidOutput, ILiquidStack fluidInput) { + public AddRecipeAction(IItemStack output, IItemStack input, ILiquidStack fluidOutput, ILiquidStack fluidInput) { this.output = output; this.input = input; diff --git a/src/main/java/gttweaker/mods/gregtech/FluidExtractor.java b/src/main/java/gttweaker/mods/gregtech/FluidExtractor.java index 84f4d13..5ba6799 100644 --- a/src/main/java/gttweaker/mods/gregtech/FluidExtractor.java +++ b/src/main/java/gttweaker/mods/gregtech/FluidExtractor.java @@ -33,7 +33,7 @@ public class FluidExtractor { * */ @ZenMethod - public static void addRecipe(IItemStack output, IIngredient input, ILiquidStack fluidOutput, int durationTicks, int euPerTick, int chance) { + public static void addRecipe(IItemStack output, IItemStack input, ILiquidStack fluidOutput, int durationTicks, int euPerTick, int chance) { MineTweakerAPI.apply(new AddRecipeAction(output, input, fluidOutput, durationTicks, euPerTick, chance)); } @@ -44,13 +44,13 @@ public static void addRecipe(IItemStack output, IIngredient input, ILiquidStack private static class AddRecipeAction extends OneWayAction { private final IItemStack output; - private final IIngredient input; + private final IItemStack input; private final ILiquidStack fluidOutput; private final int duration; private final int euPerTick; private final int chance; - public AddRecipeAction(IItemStack output, IIngredient input, ILiquidStack fluidOutput, int duration, int euPerTick, int chance) { + public AddRecipeAction(IItemStack output, IItemStack input, ILiquidStack fluidOutput, int duration, int euPerTick, int chance) { this.output = output; this.input = input; diff --git a/src/main/java/gttweaker/mods/gregtech/ForgeHammer.java b/src/main/java/gttweaker/mods/gregtech/ForgeHammer.java index 465b0c7..8875ce5 100644 --- a/src/main/java/gttweaker/mods/gregtech/ForgeHammer.java +++ b/src/main/java/gttweaker/mods/gregtech/ForgeHammer.java @@ -30,7 +30,7 @@ public class ForgeHammer { * @param euPerTick eu consumption per tick */ @ZenMethod - public static void addRecipe(IItemStack output, IIngredient input, int durationTicks, int euPerTick) { + public static void addRecipe(IItemStack output, IItemStack input, int durationTicks, int euPerTick) { MineTweakerAPI.apply(new AddRecipeAction(output, input, durationTicks, euPerTick)); } @@ -40,11 +40,11 @@ public static void addRecipe(IItemStack output, IIngredient input, int durationT private static class AddRecipeAction extends OneWayAction { private final IItemStack output; - private final IIngredient input; + private final IItemStack input; private final int duration; private final int euPerTick; - public AddRecipeAction(IItemStack output, IIngredient input, int duration, int euPerTick) { + public AddRecipeAction(IItemStack output, IItemStack input, int duration, int euPerTick) { this.output = output; this.input = input; this.duration = duration; diff --git a/src/main/java/gttweaker/mods/gregtech/FormingPress.java b/src/main/java/gttweaker/mods/gregtech/FormingPress.java index d0b8332..c02e7ea 100644 --- a/src/main/java/gttweaker/mods/gregtech/FormingPress.java +++ b/src/main/java/gttweaker/mods/gregtech/FormingPress.java @@ -30,7 +30,7 @@ public class FormingPress{ * @param euPerTick eu consumption per tick */ @ZenMethod - public static void addRecipe(IItemStack output, IIngredient input1, IIngredient input2, int durationTicks, int euPerTick) { + public static void addRecipe(IItemStack output, IItemStack input1, IItemStack input2, int durationTicks, int euPerTick) { MineTweakerAPI.apply(new AddRecipeAction(output, input1, input2, durationTicks, euPerTick)); } // ###################### @@ -39,12 +39,12 @@ public static void addRecipe(IItemStack output, IIngredient input1, IIngredient private static class AddRecipeAction extends OneWayAction { private final IItemStack output; - private final IIngredient input1; - private final IIngredient input2; + private final IItemStack input1; + private final IItemStack input2; private final int duration; private final int euPerTick; - public AddRecipeAction(IItemStack output, IIngredient input1, IIngredient input2, int duration, int euPerTick) { + public AddRecipeAction(IItemStack output, IItemStack input1, IItemStack input2, int duration, int euPerTick) { this.output = output; this.input1 = input1; diff --git a/src/main/java/gttweaker/mods/gregtech/Fuels.java b/src/main/java/gttweaker/mods/gregtech/Fuels.java index 4a832a7..48e88e3 100644 --- a/src/main/java/gttweaker/mods/gregtech/Fuels.java +++ b/src/main/java/gttweaker/mods/gregtech/Fuels.java @@ -29,7 +29,7 @@ public class Fuels { * @param euPerMillibucket eu production per millibucket */ @ZenMethod - public static void addDieselFuel(IItemStack output, IIngredient input, int euPerMillibucket) { + public static void addDieselFuel(IItemStack output, IItemStack input, int euPerMillibucket) { MineTweakerAPI.apply(new AddRecipeAction(output, input, euPerMillibucket, 0)); } @@ -42,7 +42,7 @@ public static void addDieselFuel(IItemStack output, IIngredient input, int euPer * @param euPerMillibucket eu production per millibucket */ @ZenMethod - public static void addGasTurbineFuel(IItemStack output, IIngredient input, int euPerMillibucket) { + public static void addGasTurbineFuel(IItemStack output, IItemStack input, int euPerMillibucket) { MineTweakerAPI.apply(new AddRecipeAction(output, input, euPerMillibucket, 1)); } @@ -55,7 +55,7 @@ public static void addGasTurbineFuel(IItemStack output, IIngredient input, int e * @param euPerMillibucket eu production per millibucket */ @ZenMethod - public static void addThermalGeneratorFuel(IItemStack output, IIngredient input, int euPerMillibucket) { + public static void addThermalGeneratorFuel(IItemStack output, IItemStack input, int euPerMillibucket) { MineTweakerAPI.apply(new AddRecipeAction(output, input, euPerMillibucket, 2)); } @@ -68,7 +68,7 @@ public static void addThermalGeneratorFuel(IItemStack output, IIngredient input, * @param euPerMillibucket eu production per millibucket */ @ZenMethod - public static void addDenseFluidFuel(IItemStack output, IIngredient input, int euPerMillibucket) { + public static void addDenseFluidFuel(IItemStack output, IItemStack input, int euPerMillibucket) { MineTweakerAPI.apply(new AddRecipeAction(output, input, euPerMillibucket, 3)); } @@ -81,7 +81,7 @@ public static void addDenseFluidFuel(IItemStack output, IIngredient input, int e * @param euPerMillibucket eu production per millibucket */ @ZenMethod - public static void addPlasmaGeneratorFuel(IItemStack output, IIngredient input, int euPerMillibucket) { + public static void addPlasmaGeneratorFuel(IItemStack output, IItemStack input, int euPerMillibucket) { MineTweakerAPI.apply(new AddRecipeAction(output, input, euPerMillibucket, 4)); } @@ -94,7 +94,7 @@ public static void addPlasmaGeneratorFuel(IItemStack output, IIngredient input, * @param euPerMillibucket eu production per millibucket */ @ZenMethod - public static void addMagicGeneratorFuel(IItemStack output, IIngredient input, int euPerMillibucket) { + public static void addMagicGeneratorFuel(IItemStack output, IItemStack input, int euPerMillibucket) { MineTweakerAPI.apply(new AddRecipeAction(output, input, euPerMillibucket, 5)); } @@ -113,11 +113,11 @@ private static class AddRecipeAction extends OneWayAction { }; private final IItemStack output; - private final IIngredient input; + private final IItemStack input; private final int euPerMillibucket; private final int type; - public AddRecipeAction(IItemStack output, IIngredient input, int euPerMillibucket, int type) { + public AddRecipeAction(IItemStack output, IItemStack input, int euPerMillibucket, int type) { this.output = output; this.input = input; this.euPerMillibucket = euPerMillibucket; diff --git a/src/main/java/gttweaker/mods/gregtech/ImplosionCompressor.java b/src/main/java/gttweaker/mods/gregtech/ImplosionCompressor.java index 81ebb03..bb6dac6 100644 --- a/src/main/java/gttweaker/mods/gregtech/ImplosionCompressor.java +++ b/src/main/java/gttweaker/mods/gregtech/ImplosionCompressor.java @@ -29,7 +29,7 @@ public class ImplosionCompressor { * @param tnt amount of TNT needed */ @ZenMethod - public static void addRecipe(IItemStack output, IIngredient input, int tnt) { + public static void addRecipe(IItemStack output, IItemStack input, int tnt) { MineTweakerAPI.apply(new AddRecipeAction(output, null, input, tnt)); } @@ -41,7 +41,7 @@ public static void addRecipe(IItemStack output, IIngredient input, int tnt) { * @param tnt amount of TNT needed */ @ZenMethod - public static void addRecipe(IItemStack[] output, IIngredient input, int tnt) { + public static void addRecipe(IItemStack[] output, IItemStack input, int tnt) { if (output.length == 0) { MineTweakerAPI.logError("Implosion compressor recipe requires at least 1 output"); } else { @@ -56,10 +56,10 @@ public static void addRecipe(IItemStack[] output, IIngredient input, int tnt) { private static class AddRecipeAction extends OneWayAction { private final IItemStack output1; private final IItemStack output2; - private final IIngredient input1; + private final IItemStack input1; private final int tnt; - public AddRecipeAction(IItemStack output1, IItemStack output2, IIngredient input1, int tnt) { + public AddRecipeAction(IItemStack output1, IItemStack output2, IItemStack input1, int tnt) { this.output1 = output1; this.output2 = output2; this.input1 = input1; diff --git a/src/main/java/gttweaker/mods/gregtech/Lathe.java b/src/main/java/gttweaker/mods/gregtech/Lathe.java index cbdfcaa..c1b972b 100644 --- a/src/main/java/gttweaker/mods/gregtech/Lathe.java +++ b/src/main/java/gttweaker/mods/gregtech/Lathe.java @@ -30,7 +30,7 @@ public class Lathe { * @param euPerTick eu consumption per tick */ @ZenMethod - public static void addRecipe(IItemStack output, IIngredient input, int durationTicks, int euPerTick) { + public static void addRecipe(IItemStack output, IItemStack input, int durationTicks, int euPerTick) { MineTweakerAPI.apply(new AddRecipeAction(output, null, input, durationTicks, euPerTick)); } @@ -43,7 +43,7 @@ public static void addRecipe(IItemStack output, IIngredient input, int durationT * @param euPerTick eu consumption per tick */ @ZenMethod - public static void addRecipe(IItemStack[] outputs, IIngredient input, int durationTicks, int euPerTick) { + public static void addRecipe(IItemStack[] outputs, IItemStack input, int durationTicks, int euPerTick) { if (outputs.length == 0) { MineTweakerAPI.logError("Lathe recipe requires at least 1 input"); } else { @@ -58,11 +58,11 @@ public static void addRecipe(IItemStack[] outputs, IIngredient input, int durati private static class AddRecipeAction extends OneWayAction { private final IItemStack output1; private final IItemStack output2; - private final IIngredient input; + private final IItemStack input; private final int duration; private final int euPerTick; - public AddRecipeAction(IItemStack output1, IItemStack output2, IIngredient input, int duration, int euPerTick) { + public AddRecipeAction(IItemStack output1, IItemStack output2, IItemStack input, int duration, int euPerTick) { this.output1 = output1; this.output2 = output2; this.input = input; diff --git a/src/main/java/gttweaker/mods/gregtech/Mixer.java b/src/main/java/gttweaker/mods/gregtech/Mixer.java index e4d9996..3553234 100644 --- a/src/main/java/gttweaker/mods/gregtech/Mixer.java +++ b/src/main/java/gttweaker/mods/gregtech/Mixer.java @@ -32,7 +32,7 @@ public class Mixer { * @param euPerTick eu consumption per tick */ @ZenMethod - public static void addRecipe(IItemStack output, ILiquidStack fluidOutput, IIngredient[] input, ILiquidStack fluidInput, int durationTicks, int euPerTick) { + public static void addRecipe(IItemStack output, ILiquidStack fluidOutput, IItemStack[] input, ILiquidStack fluidInput, int durationTicks, int euPerTick) { if (input.length == 0) { MineTweakerAPI.logError("Lathe recipe requires at least 1 input"); } else { @@ -41,7 +41,7 @@ public static void addRecipe(IItemStack output, ILiquidStack fluidOutput, IIngre } @ZenMethod - public static void addRecipe(IItemStack output, IIngredient[] input, int durationTicks, int euPerTick) { + public static void addRecipe(IItemStack output, IItemStack[] input, int durationTicks, int euPerTick) { if (input.length == 0) { MineTweakerAPI.logError("Lathe recipe requires at least 1 input"); } else { @@ -56,12 +56,12 @@ private static class AddFluidRecipeAction extends OneWayAction { private final IItemStack output; private final ILiquidStack fluidOutput; - private final IIngredient[] input; + private final IItemStack[] input; private final ILiquidStack fluidInput; private final int duration; private final int euPerTick; - public AddFluidRecipeAction(IItemStack output, ILiquidStack fluidOutput, IIngredient[] input, ILiquidStack fluidInput, int duration, int euPerTick) { + public AddFluidRecipeAction(IItemStack output, ILiquidStack fluidOutput, IItemStack[] input, ILiquidStack fluidInput, int duration, int euPerTick) { this.output = output; this.fluidOutput = fluidOutput; @@ -141,12 +141,12 @@ private static class AddRecipeAction extends OneWayAction { private final IItemStack output; private final ILiquidStack fluidOutput; - private final IIngredient[] input; + private final IItemStack[] input; private final ILiquidStack fluidInput; private final int duration; private final int euPerTick; - public AddRecipeAction(IItemStack output, ILiquidStack fluidOutput, IIngredient[] input, ILiquidStack fluidInput, int duration, int euPerTick) { + public AddRecipeAction(IItemStack output, ILiquidStack fluidOutput, IItemStack[] input, ILiquidStack fluidInput, int duration, int euPerTick) { this.output = output; this.fluidOutput = fluidOutput; diff --git a/src/main/java/gttweaker/mods/gregtech/Packer.java b/src/main/java/gttweaker/mods/gregtech/Packer.java index ce09d46..2c161fa 100644 --- a/src/main/java/gttweaker/mods/gregtech/Packer.java +++ b/src/main/java/gttweaker/mods/gregtech/Packer.java @@ -30,7 +30,7 @@ public class Packer{ * @param euPerTick eu consumption per tick */ @ZenMethod - public static void addRecipe(IItemStack output, IIngredient input1, IIngredient input2, int durationTicks, int euPerTick) { + public static void addRecipe(IItemStack output, IItemStack input1, IItemStack input2, int durationTicks, int euPerTick) { MineTweakerAPI.apply(new AddRecipeAction(output, input1, input2, durationTicks, euPerTick)); } // ###################### @@ -39,12 +39,12 @@ public static void addRecipe(IItemStack output, IIngredient input1, IIngredient private static class AddRecipeAction extends OneWayAction { private final IItemStack output; - private final IIngredient input1; - private final IIngredient input2; + private final IItemStack input1; + private final IItemStack input2; private final int duration; private final int euPerTick; - public AddRecipeAction(IItemStack output, IIngredient input1, IIngredient input2, int duration, int euPerTick) { + public AddRecipeAction(IItemStack output, IItemStack input1, IItemStack input2, int duration, int euPerTick) { this.output = output; this.input1 = input1; diff --git a/src/main/java/gttweaker/mods/gregtech/PlasmaArcFurnace.java b/src/main/java/gttweaker/mods/gregtech/PlasmaArcFurnace.java index a7638e0..e2b8b05 100644 --- a/src/main/java/gttweaker/mods/gregtech/PlasmaArcFurnace.java +++ b/src/main/java/gttweaker/mods/gregtech/PlasmaArcFurnace.java @@ -33,7 +33,7 @@ public class PlasmaArcFurnace { * @param euPerTick eu consumption per tick */ @ZenMethod - public static void addRecipe(IItemStack[] outputs, ILiquidStack fluidOutput, IIngredient input, ILiquidStack fluidInput, int[] outChances, int durationTicks, int euPerTick) { + public static void addRecipe(IItemStack[] outputs, ILiquidStack fluidOutput, IItemStack input, ILiquidStack fluidInput, int[] outChances, int durationTicks, int euPerTick) { if (outputs.length < 1) { MineTweakerAPI.logError("Plasma Arc Furnace must have at least 1 output"); } else if(outputs.length!=outChances.length){ @@ -50,13 +50,13 @@ private static class AddRecipeAction extends OneWayAction { private final IItemStack[] output; private final ILiquidStack fluidOutput; - private final IIngredient input; + private final IItemStack input; private final ILiquidStack fluidInput; private final int[] chances; private final int duration; private final int euPerTick; - public AddRecipeAction(IItemStack[] output, ILiquidStack fluidOutput, IIngredient input, ILiquidStack fluidInput, int[] outChances, int duration, int euPerTick) { + public AddRecipeAction(IItemStack[] output, ILiquidStack fluidOutput, IItemStack input, ILiquidStack fluidInput, int[] outChances, int duration, int euPerTick) { this.output = output; this.input = input; diff --git a/src/main/java/gttweaker/mods/gregtech/PlateBender.java b/src/main/java/gttweaker/mods/gregtech/PlateBender.java index 09b1817..73469a1 100644 --- a/src/main/java/gttweaker/mods/gregtech/PlateBender.java +++ b/src/main/java/gttweaker/mods/gregtech/PlateBender.java @@ -30,7 +30,7 @@ public class PlateBender { * @param euPerTick eu consumption per tick */ @ZenMethod - public static void addRecipe(IItemStack output, IIngredient input, int durationTicks, int euPerTick) { + public static void addRecipe(IItemStack output, IItemStack input, int durationTicks, int euPerTick) { MineTweakerAPI.apply(new AddRecipeAction(output, input, durationTicks, euPerTick)); } @@ -40,11 +40,11 @@ public static void addRecipe(IItemStack output, IIngredient input, int durationT private static class AddRecipeAction extends OneWayAction { private final IItemStack output; - private final IIngredient input; + private final IItemStack input; private final int duration; private final int euPerTick; - public AddRecipeAction(IItemStack output, IIngredient input, int duration, int euPerTick) { + public AddRecipeAction(IItemStack output, IItemStack input, int duration, int euPerTick) { this.output = output; this.input = input; this.duration = duration; diff --git a/src/main/java/gttweaker/mods/gregtech/Polarizer.java b/src/main/java/gttweaker/mods/gregtech/Polarizer.java index 4dd708f..e68e3fa 100644 --- a/src/main/java/gttweaker/mods/gregtech/Polarizer.java +++ b/src/main/java/gttweaker/mods/gregtech/Polarizer.java @@ -29,7 +29,7 @@ public class Polarizer{ * @param euPerTick eu consumption per tick */ @ZenMethod - public static void addRecipe(IItemStack output, IIngredient input, int durationTicks, int euPerTick) { + public static void addRecipe(IItemStack output, IItemStack input, int durationTicks, int euPerTick) { MineTweakerAPI.apply(new AddRecipeAction(output, input, durationTicks, euPerTick)); } // ###################### @@ -38,11 +38,11 @@ public static void addRecipe(IItemStack output, IIngredient input, int durationT private static class AddRecipeAction extends OneWayAction { private final IItemStack output; - private final IIngredient input; + private final IItemStack input; private final int duration; private final int euPerTick; - public AddRecipeAction(IItemStack output, IIngredient input, int duration, int euPerTick) { + public AddRecipeAction(IItemStack output, IItemStack input, int duration, int euPerTick) { this.output = output; this.input = input; diff --git a/src/main/java/gttweaker/mods/gregtech/PrecisionLaser.java b/src/main/java/gttweaker/mods/gregtech/PrecisionLaser.java index 3e52d71..a99b770 100644 --- a/src/main/java/gttweaker/mods/gregtech/PrecisionLaser.java +++ b/src/main/java/gttweaker/mods/gregtech/PrecisionLaser.java @@ -30,7 +30,7 @@ public class PrecisionLaser{ * @param euPerTick eu consumption per tick */ @ZenMethod - public static void addRecipe(IItemStack output, IIngredient input1, IIngredient input2, int durationTicks, int euPerTick) { + public static void addRecipe(IItemStack output, IItemStack input1, IItemStack input2, int durationTicks, int euPerTick) { MineTweakerAPI.apply(new AddRecipeAction(output, input1, input2, durationTicks, euPerTick)); } // ###################### @@ -43,7 +43,7 @@ private static class AddRecipeAction extends OneWayAction { private final IIngredient input2; private final int duration; private final int euPerTick; - public AddRecipeAction(IItemStack output, IIngredient input1, IIngredient input2, int duration, int euPerTick) { + public AddRecipeAction(IItemStack output, IItemStack input1, IItemStack input2, int duration, int euPerTick) { this.output = output; this.input1 = input1; diff --git a/src/main/java/gttweaker/mods/gregtech/Printer.java b/src/main/java/gttweaker/mods/gregtech/Printer.java index 32965a1..3b570c4 100644 --- a/src/main/java/gttweaker/mods/gregtech/Printer.java +++ b/src/main/java/gttweaker/mods/gregtech/Printer.java @@ -32,7 +32,7 @@ public class Printer { * @param euPerTick eu consumption per tick */ @ZenMethod - public static void addRecipe(IItemStack output, IIngredient input, IItemStack DataStick, ILiquidStack ink, int durationTicks, int euPerTick) { + public static void addRecipe(IItemStack output, IItemStack input, IItemStack DataStick, ILiquidStack ink, int durationTicks, int euPerTick) { MineTweakerAPI.apply(new AddRecipeAction(output, input, DataStick, ink, durationTicks, euPerTick)); } @@ -42,13 +42,13 @@ public static void addRecipe(IItemStack output, IIngredient input, IItemStack Da private static class AddRecipeAction extends OneWayAction { private final IItemStack output; - private final IIngredient input; + private final IItemStack input; private final IItemStack DataStick; private final ILiquidStack ink; private final int duration; private final int euPerTick; - public AddRecipeAction(IItemStack output, IIngredient input, IItemStack DataStick, ILiquidStack ink, int duration, int euPerTick) { + public AddRecipeAction(IItemStack output, IItemStack input, IItemStack DataStick, ILiquidStack ink, int duration, int euPerTick) { this.output = output; this.input = input; diff --git a/src/main/java/gttweaker/mods/gregtech/Pulverizer.java b/src/main/java/gttweaker/mods/gregtech/Pulverizer.java index 7869cc5..5d5ebd7 100644 --- a/src/main/java/gttweaker/mods/gregtech/Pulverizer.java +++ b/src/main/java/gttweaker/mods/gregtech/Pulverizer.java @@ -32,7 +32,7 @@ public class Pulverizer { * @param euPerTick eu consumption per tick */ @ZenMethod - public static void addRecipe(IItemStack[] outputs, IIngredient input, int[] outChances, int durationTicks, int euPerTick) { + public static void addRecipe(IItemStack[] outputs, IItemStack input, int[] outChances, int durationTicks, int euPerTick) { if (outputs.length < 1) { MineTweakerAPI.logError("Pulverizer must have at least 1 output"); } else if (outputs.length != outChances.length) { @@ -48,12 +48,12 @@ public static void addRecipe(IItemStack[] outputs, IIngredient input, int[] outC private static class AddRecipeAction extends OneWayAction { private final IItemStack[] output; - private final IIngredient input; + private final IItemStack input; private final int[] chances; private final int duration; private final int euPerTick; - public AddRecipeAction(IItemStack[] output, IIngredient input, int[] outChances, int duration, int euPerTick1) { + public AddRecipeAction(IItemStack[] output, IItemStack input, int[] outChances, int duration, int euPerTick1) { this.output = output; this.input = input; diff --git a/src/main/java/gttweaker/mods/gregtech/PyrolyseOven.java b/src/main/java/gttweaker/mods/gregtech/PyrolyseOven.java index 959d442..fa011ef 100644 --- a/src/main/java/gttweaker/mods/gregtech/PyrolyseOven.java +++ b/src/main/java/gttweaker/mods/gregtech/PyrolyseOven.java @@ -33,7 +33,7 @@ public class PyrolyseOven { * @param euPerTick eu consumption per tick */ @ZenMethod - public static void addRecipe(IItemStack output, ILiquidStack fluidOutput, int circuit, IIngredient input, ILiquidStack fluidInput, int durationTicks, int euPerTick) { + public static void addRecipe(IItemStack output, ILiquidStack fluidOutput, int circuit, IItemStack input, ILiquidStack fluidInput, int durationTicks, int euPerTick) { MineTweakerAPI.apply(new AddRecipeAction(output, fluidOutput, circuit, input, fluidInput, durationTicks, euPerTick)); } @@ -45,12 +45,12 @@ private static class AddRecipeAction extends OneWayAction { private final IItemStack output; private final ILiquidStack fluidOutput; private final int circuit; - private final IIngredient input; + private final IItemStack input; private final ILiquidStack fluidInput; private final int duration; private final int euPerTick; - public AddRecipeAction(IItemStack output, ILiquidStack fluidOutput, int circuit, IIngredient input, ILiquidStack fluidInput, int duration, int euPerTick) { + public AddRecipeAction(IItemStack output, ILiquidStack fluidOutput, int circuit, IItemStack input, ILiquidStack fluidInput, int duration, int euPerTick) { this.output = output; this.fluidOutput = fluidOutput; diff --git a/src/main/java/gttweaker/mods/gregtech/Separator.java b/src/main/java/gttweaker/mods/gregtech/Separator.java index 349fc26..40fe641 100644 --- a/src/main/java/gttweaker/mods/gregtech/Separator.java +++ b/src/main/java/gttweaker/mods/gregtech/Separator.java @@ -30,7 +30,7 @@ public class Separator{ * @param euPerTick eu consumption per tick */ @ZenMethod - public static void addRecipe(IItemStack[] output, IIngredient input, int[] outChances, int durationTicks, int euPerTick) { + public static void addRecipe(IItemStack[] output, IItemStack input, int[] outChances, int durationTicks, int euPerTick) { if (output.length < 1) { MineTweakerAPI.logError("Seperator must have at least 1 output"); } else if(output.length!=outChances.length){ @@ -45,12 +45,12 @@ public static void addRecipe(IItemStack[] output, IIngredient input, int[] outCh private static class AddRecipeAction extends OneWayAction { private final IItemStack[] output; - private final IIngredient input; + private final IItemStack input; private final int[] chances; private final int duration; private final int euPerTick; - public AddRecipeAction(IItemStack[] output, IIngredient input, int[] outChances, int duration, int euPerTick) { + public AddRecipeAction(IItemStack[] output, IItemStack input, int[] outChances, int duration, int euPerTick) { this.output = output; this.input = input; diff --git a/src/main/java/gttweaker/mods/gregtech/Sifter.java b/src/main/java/gttweaker/mods/gregtech/Sifter.java index 2000fc7..64cec32 100644 --- a/src/main/java/gttweaker/mods/gregtech/Sifter.java +++ b/src/main/java/gttweaker/mods/gregtech/Sifter.java @@ -33,7 +33,7 @@ public class Sifter { * */ @ZenMethod - public static void addRecipe(IItemStack[] outputs, IIngredient input, int[] outChances, int durationTicks, int euPerTick) { + public static void addRecipe(IItemStack[] outputs, IItemStack input, int[] outChances, int durationTicks, int euPerTick) { if (outputs.length < 1) { MineTweakerAPI.logError("Sifter must have at least 1 output"); } else if(outputs.length!=outChances.length){ @@ -50,12 +50,12 @@ public static void addRecipe(IItemStack[] outputs, IIngredient input, int[] outC private static class AddRecipeAction extends OneWayAction { private final IItemStack[] output; - private final IIngredient input; + private final IItemStack input; private final int[] chances; private final int duration; private final int euPerTick; - public AddRecipeAction(IItemStack[] output, IIngredient input, int[] outChances, int duration, int euPerTick) { + public AddRecipeAction(IItemStack[] output, IItemStack input, int[] outChances, int duration, int euPerTick) { this.output = output; this.input = input; diff --git a/src/main/java/gttweaker/mods/gregtech/Slicer.java b/src/main/java/gttweaker/mods/gregtech/Slicer.java index eacc8c6..abac058 100644 --- a/src/main/java/gttweaker/mods/gregtech/Slicer.java +++ b/src/main/java/gttweaker/mods/gregtech/Slicer.java @@ -29,7 +29,7 @@ public class Slicer { * @param euPerTick eu consumption per tick */ @ZenMethod - public static void addRecipe(IItemStack output, IIngredient input, IItemStack blade, int durationTicks, int euPerTick) { + public static void addRecipe(IItemStack output, IItemStack input, IItemStack blade, int durationTicks, int euPerTick) { MineTweakerAPI.apply(new AddRecipeAction(output, input, blade, durationTicks, euPerTick)); } // ###################### @@ -37,11 +37,11 @@ public static void addRecipe(IItemStack output, IIngredient input, IItemStack bl // ###################### private static class AddRecipeAction extends OneWayAction { private final IItemStack output; - private final IIngredient input; + private final IItemStack input; private final IItemStack blade; private final int duration; private final int euPerTick; - public AddRecipeAction(IItemStack output, IIngredient input, IItemStack blade, int duration, int euPerTick) { + public AddRecipeAction(IItemStack output, IItemStack input, IItemStack blade, int duration, int euPerTick) { this.output = output; this.input = input; diff --git a/src/main/java/gttweaker/mods/gregtech/Unpacker.java b/src/main/java/gttweaker/mods/gregtech/Unpacker.java index 0ae7f27..9e03d6e 100644 --- a/src/main/java/gttweaker/mods/gregtech/Unpacker.java +++ b/src/main/java/gttweaker/mods/gregtech/Unpacker.java @@ -30,7 +30,7 @@ public class Unpacker{ * @param euPerTick eu consumption per tick */ @ZenMethod - public static void addRecipe(IItemStack output1, IItemStack output2, IIngredient input, int durationTicks, int euPerTick) { + public static void addRecipe(IItemStack output1, IItemStack output2, IItemStack input, int durationTicks, int euPerTick) { MineTweakerAPI.apply(new AddRecipeAction(output1, output2, input, durationTicks, euPerTick)); } // ###################### @@ -40,11 +40,11 @@ private static class AddRecipeAction extends OneWayAction { private final IItemStack output1; private final IItemStack output2; - private final IIngredient input; + private final IItemStack input; private final int duration; private final int euPerTick; - public AddRecipeAction(IItemStack output1, IItemStack output2, IIngredient input, int duration, int euPerTick) { + public AddRecipeAction(IItemStack output1, IItemStack output2, IItemStack input, int duration, int euPerTick) { this.output1 = output1; this.output2 = output2; diff --git a/src/main/java/gttweaker/mods/gregtech/VacuumFreezer.java b/src/main/java/gttweaker/mods/gregtech/VacuumFreezer.java index b8bbfb5..940526a 100644 --- a/src/main/java/gttweaker/mods/gregtech/VacuumFreezer.java +++ b/src/main/java/gttweaker/mods/gregtech/VacuumFreezer.java @@ -28,7 +28,7 @@ public class VacuumFreezer { * @param durationTicks freezing duration, in ticks */ @ZenMethod - public static void addRecipe(IItemStack output, IIngredient input, int durationTicks) { + public static void addRecipe(IItemStack output, IItemStack input, int durationTicks) { MineTweakerAPI.apply(new AddRecipeAction(output, input, durationTicks)); } @@ -38,10 +38,10 @@ public static void addRecipe(IItemStack output, IIngredient input, int durationT private static class AddRecipeAction extends OneWayAction { private final IItemStack output; - private final IIngredient input; + private final IItemStack input; private final int duration; - public AddRecipeAction(IItemStack output, IIngredient input, int duration) { + public AddRecipeAction(IItemStack output, IItemStack input, int duration) { this.output = output; this.input = input; this.duration = duration; diff --git a/src/main/java/gttweaker/mods/gregtech/Wiremill.java b/src/main/java/gttweaker/mods/gregtech/Wiremill.java index 708f9dd..a2d09f5 100644 --- a/src/main/java/gttweaker/mods/gregtech/Wiremill.java +++ b/src/main/java/gttweaker/mods/gregtech/Wiremill.java @@ -29,7 +29,7 @@ public class Wiremill { * @param euPerTick eu consumption per tick */ @ZenMethod - public static void addRecipe(IItemStack output, IIngredient input, int durationTicks, int euPerTick) { + public static void addRecipe(IItemStack output, IItemStack input, int durationTicks, int euPerTick) { MineTweakerAPI.apply(new AddRecipeAction(output, input, durationTicks, euPerTick)); } @@ -39,11 +39,11 @@ public static void addRecipe(IItemStack output, IIngredient input, int durationT private static class AddRecipeAction extends OneWayAction { private final IItemStack output; - private final IIngredient input; + private final IItemStack input; private final int duration; private final int euPerTick; - public AddRecipeAction(IItemStack output, IIngredient input, int duration, int euPerTick) { + public AddRecipeAction(IItemStack output, IItemStack input, int duration, int euPerTick) { this.output = output; this.input = input; this.duration = duration; diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index 5b77bbb..500ea21 100644 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -3,7 +3,7 @@ "modid": "gttweaker", "name": "GTTweaker", "description": "Minetweaker Addon for GregTech 5.", - "version": "1.2.2", + "version": "1.3.0", "mcversion": "1.7.10", "url": "http://forum.industrial-craft.net/index.php?page=Thread&threadID=11353", "updateUrl": "",