diff --git a/src/main/java/gttweaker/mods/gregtech/Fuels.java b/src/main/java/gttweaker/mods/gregtech/Fuels.java index 96ea7ae..0b57374 100644 --- a/src/main/java/gttweaker/mods/gregtech/Fuels.java +++ b/src/main/java/gttweaker/mods/gregtech/Fuels.java @@ -1,12 +1,10 @@ package gttweaker.mods.gregtech; -import static gregtech.api.enums.GT_Values.RA; import static gregtech.api.util.GT_RecipeConstants.FUEL_TYPE; import static gregtech.api.util.GT_RecipeConstants.FUEL_VALUE; import gregtech.api.enums.GT_Values; import gregtech.api.util.GT_RecipeConstants; -import gtPlusPlus.core.util.minecraft.ItemUtils; import gttweaker.mods.AddMultipleRecipeAction; import minetweaker.MineTweakerAPI; import minetweaker.annotations.ModOnly; @@ -118,13 +116,13 @@ public AddRecipeAction(IItemStack output, IIngredient input, int euPerMillibucke @Override protected void applySingleRecipe(ArgIterator i) { GT_Values.RA.stdBuilder() - .itemInputs(i.nextItem()) - .itemOutputs(i.nextItem()) - .metadata(FUEL_VALUE, i.nextInt()) - .metadata(FUEL_TYPE, i.nextInt()) - .duration(0) - .eut(0) - .addTo(GT_RecipeConstants.Fuel); + .itemInputs(i.nextItem()) + .itemOutputs(i.nextItem()) + .metadata(FUEL_VALUE, i.nextInt()) + .metadata(FUEL_TYPE, i.nextInt()) + .duration(0) + .eut(0) + .addTo(GT_RecipeConstants.Fuel); } } } diff --git a/src/main/java/gttweaker/mods/gregtech/machines/ChemicalBath.java b/src/main/java/gttweaker/mods/gregtech/machines/ChemicalBath.java index b932b23..7b96cac 100644 --- a/src/main/java/gttweaker/mods/gregtech/machines/ChemicalBath.java +++ b/src/main/java/gttweaker/mods/gregtech/machines/ChemicalBath.java @@ -4,21 +4,22 @@ import static gregtech.api.recipe.RecipeMaps.chemicalBathRecipes; import static gttweaker.util.ArrayHelper.itemOrNull; +import java.util.Arrays; +import java.util.List; +import java.util.Objects; + +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidStack; + import gttweaker.mods.AddMultipleRecipeAction; import minetweaker.MineTweakerAPI; import minetweaker.annotations.ModOnly; import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; import minetweaker.api.liquid.ILiquidStack; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidStack; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; -import java.util.Arrays; -import java.util.List; -import java.util.Objects; - /** * Provides access to the Chemical Bath recipes. * @@ -60,11 +61,7 @@ public static void addRecipe(IItemStack[] output, IIngredient input, ILiquidStac protected void applySingleRecipe(ArgIterator i) { ItemStack input = i.nextItem(); FluidStack fluidInput = i.nextFluid(); - List outputs = Arrays.asList( - i.nextItem(), - i.nextItem(), - i.nextItem() - ); + List outputs = Arrays.asList(i.nextItem(), i.nextItem(), i.nextItem()); outputs.removeIf(Objects::isNull); int[] chances = i.nextIntArr(); int duration = i.nextInt(); @@ -74,7 +71,8 @@ protected void applySingleRecipe(ArgIterator i) { .itemOutputs(outputs.toArray(new ItemStack[0])) .outputChances(chances) .fluidInputs(fluidInput) - .duration(duration).eut(eut) + .duration(duration) + .eut(eut) .addTo(chemicalBathRecipes); } }); diff --git a/src/main/java/gttweaker/mods/gregtech/machines/CircuitAssembler.java b/src/main/java/gttweaker/mods/gregtech/machines/CircuitAssembler.java index ab9ee6c..3c8b8c6 100644 --- a/src/main/java/gttweaker/mods/gregtech/machines/CircuitAssembler.java +++ b/src/main/java/gttweaker/mods/gregtech/machines/CircuitAssembler.java @@ -3,14 +3,15 @@ import static gregtech.api.enums.GT_Values.RA; import static gregtech.api.recipe.RecipeMaps.circuitAssemblerRecipes; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidStack; + import gttweaker.mods.AddMultipleRecipeAction; import minetweaker.MineTweakerAPI; import minetweaker.annotations.ModOnly; import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; import minetweaker.api.liquid.ILiquidStack; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidStack; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; @@ -38,12 +39,12 @@ protected void applySingleRecipe(ArgIterator i) { int duration = i.nextInt(); int eut = i.nextInt(); RA.stdBuilder() - .itemInputs(inputs) - .itemOutputs(output) - .fluidInputs(fluidInput) - .duration(duration) - .eut(eut) - .addTo(circuitAssemblerRecipes); + .itemInputs(inputs) + .itemOutputs(output) + .fluidInputs(fluidInput) + .duration(duration) + .eut(eut) + .addTo(circuitAssemblerRecipes); } }); } @@ -51,26 +52,26 @@ protected void applySingleRecipe(ArgIterator i) { @ZenMethod public static void addRecipe(IItemStack output, IIngredient[] inputs, int durationTicks, int euPerTick) { MineTweakerAPI.apply( - new AddMultipleRecipeAction( - "Adding circuit assembler recipe for " + output, - inputs, - output, - durationTicks, - euPerTick) { + new AddMultipleRecipeAction( + "Adding circuit assembler recipe for " + output, + inputs, + output, + durationTicks, + euPerTick) { - @Override - protected void applySingleRecipe(ArgIterator i) { - ItemStack[] inputs = i.nextItemArr(); - ItemStack output = i.nextItem(); - int duration = i.nextInt(); - int eut = i.nextInt(); - RA.stdBuilder() - .itemInputs(inputs) - .itemOutputs(output) - .duration(duration) - .eut(eut) - .addTo(circuitAssemblerRecipes); - } - }); + @Override + protected void applySingleRecipe(ArgIterator i) { + ItemStack[] inputs = i.nextItemArr(); + ItemStack output = i.nextItem(); + int duration = i.nextInt(); + int eut = i.nextInt(); + RA.stdBuilder() + .itemInputs(inputs) + .itemOutputs(output) + .duration(duration) + .eut(eut) + .addTo(circuitAssemblerRecipes); + } + }); } } diff --git a/src/main/java/gttweaker/mods/gregtech/machines/Compressor.java b/src/main/java/gttweaker/mods/gregtech/machines/Compressor.java index c7e7fc9..a29e27d 100644 --- a/src/main/java/gttweaker/mods/gregtech/machines/Compressor.java +++ b/src/main/java/gttweaker/mods/gregtech/machines/Compressor.java @@ -28,11 +28,11 @@ public static void addRecipe(IItemStack output, IIngredient input, int durationT @Override protected void applySingleRecipe(ArgIterator i) { RA.stdBuilder() - .itemInputs(i.nextItem()) - .itemOutputs(i.nextItem()) - .duration(i.nextInt()) - .eut(i.nextInt()) - .addTo(compressorRecipes); + .itemInputs(i.nextItem()) + .itemOutputs(i.nextItem()) + .duration(i.nextInt()) + .eut(i.nextInt()) + .addTo(compressorRecipes); } }); } diff --git a/src/main/java/gttweaker/mods/gregtech/machines/CuttingSaw.java b/src/main/java/gttweaker/mods/gregtech/machines/CuttingSaw.java index 06235b2..280f2bc 100644 --- a/src/main/java/gttweaker/mods/gregtech/machines/CuttingSaw.java +++ b/src/main/java/gttweaker/mods/gregtech/machines/CuttingSaw.java @@ -49,11 +49,11 @@ public static void addRecipe(IItemStack output1, IItemStack output2, IIngredient @Override protected void applySingleRecipe(ArgIterator i) { RA.stdBuilder() - .itemInputs(i.nextItem()) - .itemOutputs(i.nextItem(), i.nextItem()) - .duration(i.nextInt()) - .eut(i.nextInt()) - .addTo(cutterRecipes); + .itemInputs(i.nextItem()) + .itemOutputs(i.nextItem(), i.nextItem()) + .duration(i.nextInt()) + .eut(i.nextInt()) + .addTo(cutterRecipes); } }); } else { @@ -70,12 +70,12 @@ protected void applySingleRecipe(ArgIterator i) { @Override protected void applySingleRecipe(ArgIterator i) { RA.stdBuilder() - .itemInputs(i.nextItem()) - .fluidInputs(i.nextFluid()) - .itemOutputs(i.nextItem(), i.nextItem()) - .duration(i.nextInt()) - .eut(i.nextInt()) - .addTo(cutterRecipes); + .itemInputs(i.nextItem()) + .fluidInputs(i.nextFluid()) + .itemOutputs(i.nextItem(), i.nextItem()) + .duration(i.nextInt()) + .eut(i.nextInt()) + .addTo(cutterRecipes); } }); } @@ -107,11 +107,11 @@ public static void addRecipe(IItemStack output1, IItemStack output2, IIngredient @Override protected void applySingleRecipe(ArgIterator i) { RA.stdBuilder() - .itemInputs(i.nextItem(), i.nextItem()) - .itemOutputs(i.nextItem(), i.nextItem()) - .duration(i.nextInt()) - .eut(i.nextInt()) - .addTo(cutterRecipes); + .itemInputs(i.nextItem(), i.nextItem()) + .itemOutputs(i.nextItem(), i.nextItem()) + .duration(i.nextInt()) + .eut(i.nextInt()) + .addTo(cutterRecipes); } }); } diff --git a/src/main/java/gttweaker/mods/gregtech/machines/DistillationTower.java b/src/main/java/gttweaker/mods/gregtech/machines/DistillationTower.java index 28649d8..5e1cc00 100644 --- a/src/main/java/gttweaker/mods/gregtech/machines/DistillationTower.java +++ b/src/main/java/gttweaker/mods/gregtech/machines/DistillationTower.java @@ -4,14 +4,15 @@ import static gregtech.api.recipe.RecipeMaps.distillationTowerRecipes; import static gregtech.api.recipe.RecipeMaps.distilleryRecipes; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidStack; + import gregtech.api.util.GT_Utility; import gttweaker.mods.AddMultipleRecipeAction; import minetweaker.MineTweakerAPI; import minetweaker.annotations.ModOnly; import minetweaker.api.item.IItemStack; import minetweaker.api.liquid.ILiquidStack; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidStack; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; @@ -58,12 +59,12 @@ protected void applySingleRecipe(ArgIterator i) { int eut = i.nextInt(); RA.stdBuilder() - .itemOutputs(output) - .fluidInputs(fluidInput) - .fluidOutputs(fluidOutputs) - .duration(duration) - .eut(eut) - .addTo(distillationTowerRecipes); + .itemOutputs(output) + .fluidInputs(fluidInput) + .fluidOutputs(fluidOutputs) + .duration(duration) + .eut(eut) + .addTo(distillationTowerRecipes); } }); } @@ -89,25 +90,24 @@ protected void applySingleRecipe(ArgIterator i) { int duration = i.nextInt(); int eut = i.nextInt(); - for (int idx = 0; idx < Math.min(fluidOutputs.length, 11); idx++) { RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(idx+1)) - .itemOutputs(output) - .fluidInputs(fluidInput) - .fluidOutputs(fluidOutputs[idx]) - .duration(duration*2) - .eut(eut/4) - .addTo(distilleryRecipes); + .itemInputs(GT_Utility.getIntegratedCircuit(idx + 1)) + .itemOutputs(output) + .fluidInputs(fluidInput) + .fluidOutputs(fluidOutputs[idx]) + .duration(duration * 2) + .eut(eut / 4) + .addTo(distilleryRecipes); } RA.stdBuilder() - .itemOutputs(output) - .fluidInputs(fluidInput) - .fluidOutputs(fluidOutputs) - .duration(duration) - .eut(eut) - .addTo(distillationTowerRecipes); + .itemOutputs(output) + .fluidInputs(fluidInput) + .fluidOutputs(fluidOutputs) + .duration(duration) + .eut(eut) + .addTo(distillationTowerRecipes); } }); } diff --git a/src/main/java/gttweaker/mods/gregtech/machines/Distillery.java b/src/main/java/gttweaker/mods/gregtech/machines/Distillery.java index 7b23f75..11a0fb4 100644 --- a/src/main/java/gttweaker/mods/gregtech/machines/Distillery.java +++ b/src/main/java/gttweaker/mods/gregtech/machines/Distillery.java @@ -3,14 +3,14 @@ import static gregtech.api.enums.GT_Values.RA; import static gregtech.api.recipe.RecipeMaps.distilleryRecipes; -import gregtech.api.util.GT_Utility; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidStack; + import gttweaker.mods.AddMultipleRecipeAction; import minetweaker.MineTweakerAPI; import minetweaker.annotations.ModOnly; import minetweaker.api.item.IItemStack; import minetweaker.api.liquid.ILiquidStack; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidStack; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; @@ -56,21 +56,21 @@ protected void applySingleRecipe(ArgIterator i) { boolean hidden = i.nextBool(); if (hidden) { RA.stdBuilder() - .itemInputs(input) - .fluidInputs(fluidInput) - .fluidOutputs(fluidOutput) - .duration(duration) - .eut(eut) - .addTo(distilleryRecipes); - return; - } - RA.stdBuilder() .itemInputs(input) .fluidInputs(fluidInput) .fluidOutputs(fluidOutput) .duration(duration) .eut(eut) .addTo(distilleryRecipes); + return; + } + RA.stdBuilder() + .itemInputs(input) + .fluidInputs(fluidInput) + .fluidOutputs(fluidOutput) + .duration(duration) + .eut(eut) + .addTo(distilleryRecipes); } }); } diff --git a/src/main/java/gttweaker/mods/gregtech/machines/Electrolyzer.java b/src/main/java/gttweaker/mods/gregtech/machines/Electrolyzer.java index 62799dc..537b8ae 100644 --- a/src/main/java/gttweaker/mods/gregtech/machines/Electrolyzer.java +++ b/src/main/java/gttweaker/mods/gregtech/machines/Electrolyzer.java @@ -4,21 +4,22 @@ import static gregtech.api.recipe.RecipeMaps.electrolyzerRecipes; import static gttweaker.util.ArrayHelper.itemOrNull; +import java.util.Arrays; +import java.util.List; +import java.util.Objects; + +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidStack; + import gttweaker.mods.AddMultipleRecipeAction; import minetweaker.MineTweakerAPI; import minetweaker.annotations.ModOnly; import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; import minetweaker.api.liquid.ILiquidStack; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidStack; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; -import java.util.Arrays; -import java.util.List; -import java.util.Objects; - /** * Provides access to the Electrolyzer recipes. * @@ -67,29 +68,22 @@ public static void addRecipe(IItemStack[] outputs, ILiquidStack fluidOutput, IIn @Override protected void applySingleRecipe(ArgIterator i) { - ItemStack[] inputs = new ItemStack[]{i.nextItem(), i.nextItem()}; + ItemStack[] inputs = new ItemStack[] { i.nextItem(), i.nextItem() }; FluidStack fluidInput = i.nextFluid(); - FluidStack fluidOutput= i.nextFluid(); - List outputs = Arrays.asList( - i.nextItem(), - i.nextItem(), - i.nextItem(), - i.nextItem(), - i.nextItem(), - i.nextItem() - ); + FluidStack fluidOutput = i.nextFluid(); + List outputs = Arrays + .asList(i.nextItem(), i.nextItem(), i.nextItem(), i.nextItem(), i.nextItem(), i.nextItem()); outputs.removeIf(Objects::isNull); RA.stdBuilder() - .itemInputs(inputs) - .fluidInputs(fluidInput) - .fluidOutputs(fluidOutput) - .itemOutputs(outputs.toArray(new ItemStack[0])) - .outputChances(i.nextIntArr()) - .duration(i.nextInt()) - .eut(i.nextInt()) - .addTo(electrolyzerRecipes) - ; + .itemInputs(inputs) + .fluidInputs(fluidInput) + .fluidOutputs(fluidOutput) + .itemOutputs(outputs.toArray(new ItemStack[0])) + .outputChances(i.nextIntArr()) + .duration(i.nextInt()) + .eut(i.nextInt()) + .addTo(electrolyzerRecipes); } }); } @@ -116,29 +110,22 @@ public static void addRecipe(IItemStack[] outputs, IIngredient input, int cells, @Override protected void applySingleRecipe(ArgIterator i) { - ItemStack[] inputs = new ItemStack[]{i.nextItem(), i.nextItem()}; + ItemStack[] inputs = new ItemStack[] { i.nextItem(), i.nextItem() }; FluidStack fluidInput = i.nextFluid(); - FluidStack fluidOutput= i.nextFluid(); - List outputs = Arrays.asList( - i.nextItem(), - i.nextItem(), - i.nextItem(), - i.nextItem(), - i.nextItem(), - i.nextItem() - ); + FluidStack fluidOutput = i.nextFluid(); + List outputs = Arrays + .asList(i.nextItem(), i.nextItem(), i.nextItem(), i.nextItem(), i.nextItem(), i.nextItem()); outputs.removeIf(Objects::isNull); RA.stdBuilder() - .itemInputs(inputs) - .fluidInputs(fluidInput) - .fluidOutputs(fluidOutput) - .itemOutputs(outputs.toArray(new ItemStack[0])) - .outputChances(i.nextIntArr()) - .duration(i.nextInt()) - .eut(i.nextInt()) - .addTo(electrolyzerRecipes) - ; + .itemInputs(inputs) + .fluidInputs(fluidInput) + .fluidOutputs(fluidOutput) + .itemOutputs(outputs.toArray(new ItemStack[0])) + .outputChances(i.nextIntArr()) + .duration(i.nextInt()) + .eut(i.nextInt()) + .addTo(electrolyzerRecipes); } }); } diff --git a/src/main/java/gttweaker/mods/gregtech/machines/Extractor.java b/src/main/java/gttweaker/mods/gregtech/machines/Extractor.java index 8d59555..e3f51a5 100644 --- a/src/main/java/gttweaker/mods/gregtech/machines/Extractor.java +++ b/src/main/java/gttweaker/mods/gregtech/machines/Extractor.java @@ -28,12 +28,11 @@ public static void addRecipe(IItemStack output, IIngredient input, int durationT @Override protected void applySingleRecipe(ArgIterator i) { RA.stdBuilder() - .itemInputs(i.nextItem()) - .itemOutputs(i.nextItem()) - .duration(i.nextInt()) - .eut(i.nextInt()) - .addTo(extractorRecipes) - ; + .itemInputs(i.nextItem()) + .itemOutputs(i.nextItem()) + .duration(i.nextInt()) + .eut(i.nextInt()) + .addTo(extractorRecipes); } }); } diff --git a/src/main/java/gttweaker/mods/gregtech/machines/Extruder.java b/src/main/java/gttweaker/mods/gregtech/machines/Extruder.java index 9989aeb..cb35456 100644 --- a/src/main/java/gttweaker/mods/gregtech/machines/Extruder.java +++ b/src/main/java/gttweaker/mods/gregtech/machines/Extruder.java @@ -43,11 +43,10 @@ public static void addRecipe(IItemStack output, IIngredient input, IItemStack sh @Override protected void applySingleRecipe(ArgIterator i) { RA.stdBuilder() - .itemInputs(i.nextItem(), i.nextItem()) - .itemOutputs(i.nextItem()) - .duration(i.nextInt()) - .eut(i.nextInt()) - ; + .itemInputs(i.nextItem(), i.nextItem()) + .itemOutputs(i.nextItem()) + .duration(i.nextInt()) + .eut(i.nextInt()); } }); } diff --git a/src/main/java/gttweaker/mods/gregtech/machines/Fermenter.java b/src/main/java/gttweaker/mods/gregtech/machines/Fermenter.java index 2999bf9..861ca19 100644 --- a/src/main/java/gttweaker/mods/gregtech/machines/Fermenter.java +++ b/src/main/java/gttweaker/mods/gregtech/machines/Fermenter.java @@ -3,11 +3,12 @@ import static gregtech.api.enums.GT_Values.RA; import static gregtech.api.recipe.RecipeMaps.fermentingRecipes; +import net.minecraftforge.fluids.FluidStack; + import gttweaker.mods.AddMultipleRecipeAction; import minetweaker.MineTweakerAPI; import minetweaker.annotations.ModOnly; import minetweaker.api.liquid.ILiquidStack; -import net.minecraftforge.fluids.FluidStack; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; @@ -45,21 +46,22 @@ protected void applySingleRecipe(ArgIterator i) { int duration = i.nextInt(); int eut = 2; boolean hidden = i.nextBool(); - if (hidden){ + if (hidden) { RA.stdBuilder() - .fluidInputs(input) - .fluidOutputs(output) - .duration(duration) - .eut(eut) - .hidden() - .addTo(fermentingRecipes); - return; - } - RA.stdBuilder().fluidInputs(input) + .fluidInputs(input) .fluidOutputs(output) .duration(duration) .eut(eut) + .hidden() .addTo(fermentingRecipes); + return; + } + RA.stdBuilder() + .fluidInputs(input) + .fluidOutputs(output) + .duration(duration) + .eut(eut) + .addTo(fermentingRecipes); } }); } diff --git a/src/main/java/gttweaker/mods/gregtech/machines/FluidCanner.java b/src/main/java/gttweaker/mods/gregtech/machines/FluidCanner.java index 48cdc97..5832253 100644 --- a/src/main/java/gttweaker/mods/gregtech/machines/FluidCanner.java +++ b/src/main/java/gttweaker/mods/gregtech/machines/FluidCanner.java @@ -3,14 +3,15 @@ import static gregtech.api.enums.GT_Values.RA; import static gregtech.api.recipe.RecipeMaps.fluidCannerRecipes; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidStack; + import gttweaker.mods.AddMultipleRecipeAction; import minetweaker.MineTweakerAPI; import minetweaker.annotations.ModOnly; import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; import minetweaker.api.liquid.ILiquidStack; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidStack; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; @@ -51,13 +52,13 @@ protected void applySingleRecipe(ArgIterator i) { int duration = fluidOutput == null ? fluidInput.amount / 62 : fluidOutput.amount / 62; int eut = 1; RA.stdBuilder() - .itemInputs(input) - .itemOutputs(output) - .fluidInputs(fluidInput) - .fluidOutputs() - .duration(duration) - .eut(eut) - .addTo(fluidCannerRecipes); + .itemInputs(input) + .itemOutputs(output) + .fluidInputs(fluidInput) + .fluidOutputs() + .duration(duration) + .eut(eut) + .addTo(fluidCannerRecipes); } }); } diff --git a/src/main/java/gttweaker/mods/gregtech/machines/FluidExtractor.java b/src/main/java/gttweaker/mods/gregtech/machines/FluidExtractor.java index 29fe233..62dab5a 100644 --- a/src/main/java/gttweaker/mods/gregtech/machines/FluidExtractor.java +++ b/src/main/java/gttweaker/mods/gregtech/machines/FluidExtractor.java @@ -3,14 +3,15 @@ import static gregtech.api.enums.GT_Values.RA; import static gregtech.api.recipe.RecipeMaps.fluidExtractionRecipes; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidStack; + import gttweaker.mods.AddMultipleRecipeAction; import minetweaker.MineTweakerAPI; import minetweaker.annotations.ModOnly; import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; import minetweaker.api.liquid.ILiquidStack; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidStack; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; @@ -56,13 +57,13 @@ protected void applySingleRecipe(ArgIterator i) { int chance = i.nextInt(); RA.stdBuilder() - .itemInputs(input) - .itemOutputs(output) - .outputChances(chance) - .fluidOutputs(fluidOutput) - .duration(duration) - .eut(eut) - .addTo(fluidExtractionRecipes); + .itemInputs(input) + .itemOutputs(output) + .outputChances(chance) + .fluidOutputs(fluidOutput) + .duration(duration) + .eut(eut) + .addTo(fluidExtractionRecipes); } }); } diff --git a/src/main/java/gttweaker/mods/gregtech/machines/FluidHeater.java b/src/main/java/gttweaker/mods/gregtech/machines/FluidHeater.java index 4b97742..f634afd 100644 --- a/src/main/java/gttweaker/mods/gregtech/machines/FluidHeater.java +++ b/src/main/java/gttweaker/mods/gregtech/machines/FluidHeater.java @@ -44,12 +44,12 @@ public static void addRecipe(ILiquidStack fluidOutput, IItemStack circuit, ILiqu @Override protected void applySingleRecipe(ArgIterator i) { RA.stdBuilder() - .itemInputs(i.nextItem()) - .fluidInputs(i.nextFluid()) - .fluidOutputs(i.nextFluid()) - .duration(i.nextInt()) - .eut(i.nextInt()) - .addTo(fluidHeaterRecipes); + .itemInputs(i.nextItem()) + .fluidInputs(i.nextFluid()) + .fluidOutputs(i.nextFluid()) + .duration(i.nextInt()) + .eut(i.nextInt()) + .addTo(fluidHeaterRecipes); } }); } diff --git a/src/main/java/gttweaker/mods/gregtech/machines/FluidSolidifier.java b/src/main/java/gttweaker/mods/gregtech/machines/FluidSolidifier.java index 3c2c0bf..539876c 100644 --- a/src/main/java/gttweaker/mods/gregtech/machines/FluidSolidifier.java +++ b/src/main/java/gttweaker/mods/gregtech/machines/FluidSolidifier.java @@ -45,12 +45,12 @@ public static void addRecipe(IItemStack output, IItemStack mold, ILiquidStack fl protected void applySingleRecipe(ArgIterator i) { RA.stdBuilder() - .itemInputs(i.nextItem()) - .fluidInputs(i.nextFluid()) - .itemOutputs(i.nextItem()) - .duration(i.nextInt()) - .eut(i.nextInt()) - .addTo(fluidSolidifierRecipes); + .itemInputs(i.nextItem()) + .fluidInputs(i.nextFluid()) + .itemOutputs(i.nextItem()) + .duration(i.nextInt()) + .eut(i.nextInt()) + .addTo(fluidSolidifierRecipes); } }); } diff --git a/src/main/java/gttweaker/mods/gregtech/machines/ForgeHammer.java b/src/main/java/gttweaker/mods/gregtech/machines/ForgeHammer.java index 0c37990..c52d773 100644 --- a/src/main/java/gttweaker/mods/gregtech/machines/ForgeHammer.java +++ b/src/main/java/gttweaker/mods/gregtech/machines/ForgeHammer.java @@ -41,11 +41,11 @@ public static void addRecipe(IItemStack output, IIngredient input, int durationT @Override protected void applySingleRecipe(ArgIterator i) { RA.stdBuilder() - .itemInputs(i.nextItem()) - .itemOutputs(i.nextItem()) - .duration(i.nextInt()) - .eut(i.nextInt()) - .addTo(hammerRecipes); + .itemInputs(i.nextItem()) + .itemOutputs(i.nextItem()) + .duration(i.nextInt()) + .eut(i.nextInt()) + .addTo(hammerRecipes); } }); } diff --git a/src/main/java/gttweaker/mods/gregtech/machines/FormingPress.java b/src/main/java/gttweaker/mods/gregtech/machines/FormingPress.java index e57199a..bd0c006 100644 --- a/src/main/java/gttweaker/mods/gregtech/machines/FormingPress.java +++ b/src/main/java/gttweaker/mods/gregtech/machines/FormingPress.java @@ -44,11 +44,11 @@ public static void addRecipe(IItemStack output, IIngredient input1, IIngredient @Override protected void applySingleRecipe(ArgIterator i) { RA.stdBuilder() - .itemInputs(i.nextItem(), i.nextItem()) - .itemOutputs(i.nextItem()) - .duration(i.nextInt()) - .eut(i.nextInt()) - .addTo(formingPressRecipes); + .itemInputs(i.nextItem(), i.nextItem()) + .itemOutputs(i.nextItem()) + .duration(i.nextInt()) + .eut(i.nextInt()) + .addTo(formingPressRecipes); } }); } diff --git a/src/main/java/gttweaker/mods/gregtech/machines/FusionReactor.java b/src/main/java/gttweaker/mods/gregtech/machines/FusionReactor.java index 466e024..88150e8 100644 --- a/src/main/java/gttweaker/mods/gregtech/machines/FusionReactor.java +++ b/src/main/java/gttweaker/mods/gregtech/machines/FusionReactor.java @@ -46,11 +46,12 @@ public static void addRecipe(ILiquidStack fluidOutput, ILiquidStack fluidInput1, @Override protected void applySingleRecipe(ArgIterator i) { RA.stdBuilder() - .fluidInputs(i.nextFluid(), i.nextFluid()) - .fluidOutputs(i.nextFluid()).duration(i.nextInt()) - .eut(i.nextInt()) - .metadata(FUSION_THRESHOLD, i.nextInt()) - .addTo(fusionRecipes); + .fluidInputs(i.nextFluid(), i.nextFluid()) + .fluidOutputs(i.nextFluid()) + .duration(i.nextInt()) + .eut(i.nextInt()) + .metadata(FUSION_THRESHOLD, i.nextInt()) + .addTo(fusionRecipes); } }); } diff --git a/src/main/java/gttweaker/mods/gregtech/machines/Lathe.java b/src/main/java/gttweaker/mods/gregtech/machines/Lathe.java index fc63851..15120ef 100644 --- a/src/main/java/gttweaker/mods/gregtech/machines/Lathe.java +++ b/src/main/java/gttweaker/mods/gregtech/machines/Lathe.java @@ -4,19 +4,20 @@ import static gregtech.api.recipe.RecipeMaps.latheRecipes; import static gttweaker.util.ArrayHelper.itemOrNull; +import java.util.Arrays; +import java.util.List; +import java.util.Objects; + +import net.minecraft.item.ItemStack; + import gttweaker.mods.AddMultipleRecipeAction; import minetweaker.MineTweakerAPI; import minetweaker.annotations.ModOnly; import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; -import net.minecraft.item.ItemStack; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; -import java.util.Arrays; -import java.util.List; -import java.util.Objects; - /** * Access point for Lathe recipes. * @@ -68,11 +69,11 @@ protected void applySingleRecipe(ArgIterator i) { outputs.removeIf(Objects::isNull); RA.stdBuilder() - .itemInputs(input) - .itemOutputs(outputs.toArray(new ItemStack[0])) - .duration(i.nextInt()) - .eut(i.nextInt()) - .addTo(latheRecipes); + .itemInputs(input) + .itemOutputs(outputs.toArray(new ItemStack[0])) + .duration(i.nextInt()) + .eut(i.nextInt()) + .addTo(latheRecipes); } }); } diff --git a/src/main/java/gttweaker/mods/gregtech/machines/Mixer.java b/src/main/java/gttweaker/mods/gregtech/machines/Mixer.java index 2ca211a..d518041 100644 --- a/src/main/java/gttweaker/mods/gregtech/machines/Mixer.java +++ b/src/main/java/gttweaker/mods/gregtech/machines/Mixer.java @@ -4,20 +4,21 @@ import static gregtech.api.recipe.RecipeMaps.mixerRecipes; import static gttweaker.util.ArrayHelper.itemOrNull; +import java.util.Arrays; +import java.util.List; +import java.util.Objects; + +import net.minecraft.item.ItemStack; + import gttweaker.mods.AddMultipleRecipeAction; import minetweaker.MineTweakerAPI; import minetweaker.annotations.ModOnly; import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; import minetweaker.api.liquid.ILiquidStack; -import net.minecraft.item.ItemStack; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; -import java.util.Arrays; -import java.util.List; -import java.util.Objects; - /** * Provides access to the Mixer recipes. * @@ -58,22 +59,17 @@ public static void addRecipe(IItemStack output, ILiquidStack fluidOutput, IIngre @Override protected void applySingleRecipe(ArgIterator i) { - List inputs = Arrays.asList( - i.nextItem(), - i.nextItem(), - i.nextItem(), - i.nextItem() - ); + List inputs = Arrays.asList(i.nextItem(), i.nextItem(), i.nextItem(), i.nextItem()); inputs.removeIf(Objects::isNull); RA.stdBuilder() - .itemInputs(inputs.toArray(new ItemStack[0])) - .fluidInputs(i.nextFluid()) - .fluidOutputs(i.nextFluid()) - .itemOutputs(i.nextItem()) - .duration(i.nextInt()) - .eut(i.nextInt()) - .addTo(mixerRecipes); + .itemInputs(inputs.toArray(new ItemStack[0])) + .fluidInputs(i.nextFluid()) + .fluidOutputs(i.nextFluid()) + .itemOutputs(i.nextItem()) + .duration(i.nextInt()) + .eut(i.nextInt()) + .addTo(mixerRecipes); } }); } @@ -85,34 +81,29 @@ public static void addRecipe(IItemStack output, IIngredient[] input, int duratio MineTweakerAPI.logError("Mixer recipe requires at least 1 input"); } else { MineTweakerAPI.apply( - new AddMultipleRecipeAction( - "Adding Mixer recipe for " + output, - input[0], - itemOrNull(input, 1), - itemOrNull(input, 2), - itemOrNull(input, 3), - output, - durationTicks, - euPerTick) { + new AddMultipleRecipeAction( + "Adding Mixer recipe for " + output, + input[0], + itemOrNull(input, 1), + itemOrNull(input, 2), + itemOrNull(input, 3), + output, + durationTicks, + euPerTick) { - @Override - protected void applySingleRecipe(ArgIterator i) { - List inputs = Arrays.asList( - i.nextItem(), - i.nextItem(), - i.nextItem(), - i.nextItem() - ); - inputs.removeIf(Objects::isNull); + @Override + protected void applySingleRecipe(ArgIterator i) { + List inputs = Arrays.asList(i.nextItem(), i.nextItem(), i.nextItem(), i.nextItem()); + inputs.removeIf(Objects::isNull); - RA.stdBuilder() - .itemInputs(inputs.toArray(new ItemStack[0])) - .itemOutputs(i.nextItem()) - .duration(i.nextInt()) - .eut(i.nextInt()) - .addTo(mixerRecipes); - } - }); + RA.stdBuilder() + .itemInputs(inputs.toArray(new ItemStack[0])) + .itemOutputs(i.nextItem()) + .duration(i.nextInt()) + .eut(i.nextInt()) + .addTo(mixerRecipes); + } + }); } } } diff --git a/src/main/java/gttweaker/mods/gregtech/machines/OilCracker.java b/src/main/java/gttweaker/mods/gregtech/machines/OilCracker.java index dc8887c..db8ae53 100644 --- a/src/main/java/gttweaker/mods/gregtech/machines/OilCracker.java +++ b/src/main/java/gttweaker/mods/gregtech/machines/OilCracker.java @@ -45,12 +45,12 @@ public static void addRecipe(int circuitConfig, ILiquidStack fluidOutput, ILiqui @Override protected void applySingleRecipe(ArgIterator i) { RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(i.nextInt())) - .fluidInputs(i.nextFluid(), i.nextFluid()) - .fluidOutputs(i.nextFluid()) - .duration(i.nextInt()) - .eut(i.nextInt()) - .addTo(crackingRecipes); + .itemInputs(GT_Utility.getIntegratedCircuit(i.nextInt())) + .fluidInputs(i.nextFluid(), i.nextFluid()) + .fluidOutputs(i.nextFluid()) + .duration(i.nextInt()) + .eut(i.nextInt()) + .addTo(crackingRecipes); } }); } diff --git a/src/main/java/gttweaker/mods/gregtech/machines/OreWasher.java b/src/main/java/gttweaker/mods/gregtech/machines/OreWasher.java index c1daad1..c122793 100644 --- a/src/main/java/gttweaker/mods/gregtech/machines/OreWasher.java +++ b/src/main/java/gttweaker/mods/gregtech/machines/OreWasher.java @@ -35,12 +35,12 @@ public static void addRecipe(IItemStack output1, IItemStack output2, IItemStack @Override protected void applySingleRecipe(ArgIterator i) { RA.stdBuilder() - .itemInputs(i.nextItem()) - .itemOutputs(i.nextItem(), i.nextItem(), i.nextItem()) - .fluidInputs(i.nextFluid()) - .duration(i.nextInt()) - .eut(i.nextInt()) - .addTo(oreWasherRecipes); + .itemInputs(i.nextItem()) + .itemOutputs(i.nextItem(), i.nextItem(), i.nextItem()) + .fluidInputs(i.nextFluid()) + .duration(i.nextInt()) + .eut(i.nextInt()) + .addTo(oreWasherRecipes); } }); } diff --git a/src/main/java/gttweaker/mods/gregtech/machines/Packer.java b/src/main/java/gttweaker/mods/gregtech/machines/Packer.java index 0ae146f..562b316 100644 --- a/src/main/java/gttweaker/mods/gregtech/machines/Packer.java +++ b/src/main/java/gttweaker/mods/gregtech/machines/Packer.java @@ -44,11 +44,11 @@ public static void addRecipe(IItemStack output, IIngredient input1, IIngredient @Override protected void applySingleRecipe(ArgIterator i) { RA.stdBuilder() - .itemInputs(i.nextItem(), i.nextItem()) - .itemOutputs(i.nextItem()) - .duration(i.nextInt()) - .eut(i.nextInt()) - .addTo(packagerRecipes); + .itemInputs(i.nextItem(), i.nextItem()) + .itemOutputs(i.nextItem()) + .duration(i.nextInt()) + .eut(i.nextInt()) + .addTo(packagerRecipes); } }); } diff --git a/src/main/java/gttweaker/mods/gregtech/machines/PlasmaArcFurnace.java b/src/main/java/gttweaker/mods/gregtech/machines/PlasmaArcFurnace.java index 9d192e2..17132e2 100644 --- a/src/main/java/gttweaker/mods/gregtech/machines/PlasmaArcFurnace.java +++ b/src/main/java/gttweaker/mods/gregtech/machines/PlasmaArcFurnace.java @@ -3,15 +3,15 @@ import static gregtech.api.enums.GT_Values.RA; import static gregtech.api.recipe.RecipeMaps.plasmaArcFurnaceRecipes; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidStack; + import gttweaker.mods.AddMultipleRecipeAction; import minetweaker.MineTweakerAPI; import minetweaker.annotations.ModOnly; import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; import minetweaker.api.liquid.ILiquidStack; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidStack; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; @@ -60,19 +60,19 @@ protected void applySingleRecipe(ArgIterator i) { FluidStack fluidInput = i.nextFluid(); ItemStack[] outputs = i.nextItemArr(); FluidStack fluidOutput = i.nextFluid(); - int[] chances =i.nextIntArr(); + int[] chances = i.nextIntArr(); int duration = i.nextInt(); int eut = i.nextInt(); RA.stdBuilder() - .itemInputs(input) - .itemOutputs(outputs) - .outputChances(chances) - .fluidInputs(fluidInput) - .fluidOutputs(fluidOutput) - .duration(duration) - .eut(eut) - .addTo(plasmaArcFurnaceRecipes); + .itemInputs(input) + .itemOutputs(outputs) + .outputChances(chances) + .fluidInputs(fluidInput) + .fluidOutputs(fluidOutput) + .duration(duration) + .eut(eut) + .addTo(plasmaArcFurnaceRecipes); } }); } @@ -97,34 +97,34 @@ public static void addRecipe(IItemStack[] outputs, ILiquidStack fluidOutput, IIn MineTweakerAPI.logError("Number of Outputs does not equal number of Chances"); } else { MineTweakerAPI.apply( - new AddMultipleRecipeAction( - "Adding Plasma Arc Furnace recipe for " + input, - input, - outputs, - fluidOutput, - outChances, - durationTicks, - euPerTick) { + new AddMultipleRecipeAction( + "Adding Plasma Arc Furnace recipe for " + input, + input, + outputs, + fluidOutput, + outChances, + durationTicks, + euPerTick) { - @Override - protected void applySingleRecipe(ArgIterator i) { - ItemStack input = i.nextItem(); - ItemStack[] outputs = i.nextItemArr(); - FluidStack fluidOutput = i.nextFluid(); - int[] chances =i.nextIntArr(); - int duration = i.nextInt(); - int eut = i.nextInt(); + @Override + protected void applySingleRecipe(ArgIterator i) { + ItemStack input = i.nextItem(); + ItemStack[] outputs = i.nextItemArr(); + FluidStack fluidOutput = i.nextFluid(); + int[] chances = i.nextIntArr(); + int duration = i.nextInt(); + int eut = i.nextInt(); - RA.stdBuilder() - .itemInputs(input) - .itemOutputs(outputs) - .outputChances(chances) - .fluidOutputs(fluidOutput) - .duration(duration) - .eut(eut) - .addTo(plasmaArcFurnaceRecipes); - } - }); + RA.stdBuilder() + .itemInputs(input) + .itemOutputs(outputs) + .outputChances(chances) + .fluidOutputs(fluidOutput) + .duration(duration) + .eut(eut) + .addTo(plasmaArcFurnaceRecipes); + } + }); } } } diff --git a/src/main/java/gttweaker/mods/gregtech/machines/PlateBender.java b/src/main/java/gttweaker/mods/gregtech/machines/PlateBender.java index b09faa5..8889eaa 100644 --- a/src/main/java/gttweaker/mods/gregtech/machines/PlateBender.java +++ b/src/main/java/gttweaker/mods/gregtech/machines/PlateBender.java @@ -41,11 +41,11 @@ public static void addRecipe(IItemStack output, IIngredient input, int durationT @Override protected void applySingleRecipe(ArgIterator i) { RA.stdBuilder() - .itemInputs(i.nextItem()) - .itemOutputs(i.nextItem()) - .duration(i.nextInt()) - .duration(i.nextInt()) - .addTo(benderRecipes); + .itemInputs(i.nextItem()) + .itemOutputs(i.nextItem()) + .duration(i.nextInt()) + .duration(i.nextInt()) + .addTo(benderRecipes); } }); } diff --git a/src/main/java/gttweaker/mods/gregtech/machines/Polarizer.java b/src/main/java/gttweaker/mods/gregtech/machines/Polarizer.java index feaa21a..31f32b5 100644 --- a/src/main/java/gttweaker/mods/gregtech/machines/Polarizer.java +++ b/src/main/java/gttweaker/mods/gregtech/machines/Polarizer.java @@ -41,11 +41,11 @@ public static void addRecipe(IItemStack output, IIngredient input, int durationT @Override protected void applySingleRecipe(ArgIterator i) { RA.stdBuilder() - .itemInputs(i.nextItem()) - .itemOutputs(i.nextItem()) - .duration(i.nextInt()) - .duration(i.nextInt()) - .addTo(polarizerRecipes); + .itemInputs(i.nextItem()) + .itemOutputs(i.nextItem()) + .duration(i.nextInt()) + .duration(i.nextInt()) + .addTo(polarizerRecipes); } }); } diff --git a/src/main/java/gttweaker/mods/gregtech/machines/PrecisionLaser.java b/src/main/java/gttweaker/mods/gregtech/machines/PrecisionLaser.java index 5d6c14b..4903aa7 100644 --- a/src/main/java/gttweaker/mods/gregtech/machines/PrecisionLaser.java +++ b/src/main/java/gttweaker/mods/gregtech/machines/PrecisionLaser.java @@ -47,12 +47,12 @@ public static void addRecipe(IItemStack output, IIngredient input1, IIngredient @Override protected void applySingleRecipe(ArgIterator i) { RA.stdBuilder() - .itemInputs(i.nextItem(), i.nextItem()) - .itemOutputs(i.nextItem()) - .duration(i.nextInt()) - .eut(i.nextInt()) - .metadata(CLEANROOM, i.nextBool()) - .addTo(laserEngraverRecipes); + .itemInputs(i.nextItem(), i.nextItem()) + .itemOutputs(i.nextItem()) + .duration(i.nextInt()) + .eut(i.nextInt()) + .metadata(CLEANROOM, i.nextBool()) + .addTo(laserEngraverRecipes); } }); } diff --git a/src/main/java/gttweaker/mods/gregtech/machines/PrimitiveBlastFurnace.java b/src/main/java/gttweaker/mods/gregtech/machines/PrimitiveBlastFurnace.java index c17e3da..0b88751 100644 --- a/src/main/java/gttweaker/mods/gregtech/machines/PrimitiveBlastFurnace.java +++ b/src/main/java/gttweaker/mods/gregtech/machines/PrimitiveBlastFurnace.java @@ -32,11 +32,11 @@ public static void addRecipe(IItemStack output1, IItemStack output2, IIngredient @Override protected void applySingleRecipe(ArgIterator i) { RA.stdBuilder() - .itemInputs(i.nextItem(), i.nextItem()) - .metadata(ADDITIVE_AMOUNT, i.nextInt()) - .itemOutputs(i.nextItem(), i.nextItem()) - .duration(i.nextInt()) - .addTo(primitiveBlastRecipes); + .itemInputs(i.nextItem(), i.nextItem()) + .metadata(ADDITIVE_AMOUNT, i.nextInt()) + .itemOutputs(i.nextItem(), i.nextItem()) + .duration(i.nextInt()) + .addTo(primitiveBlastRecipes); } }); } diff --git a/src/main/java/gttweaker/mods/gregtech/machines/Printer.java b/src/main/java/gttweaker/mods/gregtech/machines/Printer.java index 657e786..85a1a3b 100644 --- a/src/main/java/gttweaker/mods/gregtech/machines/Printer.java +++ b/src/main/java/gttweaker/mods/gregtech/machines/Printer.java @@ -47,13 +47,13 @@ public static void addRecipe(IItemStack output, IIngredient input, IItemStack da @Override protected void applySingleRecipe(ArgIterator i) { RA.stdBuilder() - .itemInputs(i.nextItem()) - .fluidInputs(i.nextFluid()) - .special(i.nextItem()) - .itemOutputs(i.nextItem()) - .duration(i.nextInt()) - .eut(i.nextInt()) - .addTo(printerRecipes); + .itemInputs(i.nextItem()) + .fluidInputs(i.nextFluid()) + .special(i.nextItem()) + .itemOutputs(i.nextItem()) + .duration(i.nextInt()) + .eut(i.nextInt()) + .addTo(printerRecipes); } }); } diff --git a/src/main/java/gttweaker/mods/gregtech/machines/Pulverizer.java b/src/main/java/gttweaker/mods/gregtech/machines/Pulverizer.java index 239fc66..b75dde9 100644 --- a/src/main/java/gttweaker/mods/gregtech/machines/Pulverizer.java +++ b/src/main/java/gttweaker/mods/gregtech/machines/Pulverizer.java @@ -1,7 +1,6 @@ package gttweaker.mods.gregtech.machines; import static gregtech.api.enums.GT_Values.RA; -import static gregtech.api.recipe.RecipeMaps.benderRecipes; import static gregtech.api.recipe.RecipeMaps.maceratorRecipes; import gttweaker.mods.AddMultipleRecipeAction; @@ -50,12 +49,12 @@ public static void addRecipe(IItemStack[] outputs, IIngredient input, int[] outC @Override protected void applySingleRecipe(ArgIterator i) { RA.stdBuilder() - .itemInputs(i.nextItem()) - .itemOutputs(i.nextItemArr()) - .outputChances(i.nextIntArr()) - .duration(i.nextInt()) - .duration(i.nextInt()) - .addTo(maceratorRecipes); + .itemInputs(i.nextItem()) + .itemOutputs(i.nextItemArr()) + .outputChances(i.nextIntArr()) + .duration(i.nextInt()) + .duration(i.nextInt()) + .addTo(maceratorRecipes); } }); } diff --git a/src/main/java/gttweaker/mods/gregtech/machines/PyrolyseOven.java b/src/main/java/gttweaker/mods/gregtech/machines/PyrolyseOven.java index 8eb4a54..4d402f2 100644 --- a/src/main/java/gttweaker/mods/gregtech/machines/PyrolyseOven.java +++ b/src/main/java/gttweaker/mods/gregtech/machines/PyrolyseOven.java @@ -3,6 +3,9 @@ import static gregtech.api.enums.GT_Values.RA; import static gregtech.api.recipe.RecipeMaps.pyrolyseRecipes; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidStack; + import gregtech.api.util.GT_Utility; import gttweaker.mods.AddMultipleRecipeAction; import minetweaker.MineTweakerAPI; @@ -10,8 +13,6 @@ import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; import minetweaker.api.liquid.ILiquidStack; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidStack; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; @@ -55,13 +56,13 @@ protected void applySingleRecipe(ArgIterator i) { FluidStack fluidInput = i.nextFluid(); ItemStack circuit = GT_Utility.getIntegratedCircuit(i.nextInt()); RA.stdBuilder() - .itemInputs(input, circuit) - .fluidInputs(fluidInput) - .itemOutputs(i.nextItem()) - .fluidOutputs(i.nextFluid()) - .duration(i.nextInt()) - .eut(i.nextInt()) - .addTo(pyrolyseRecipes); + .itemInputs(input, circuit) + .fluidInputs(fluidInput) + .itemOutputs(i.nextItem()) + .fluidOutputs(i.nextFluid()) + .duration(i.nextInt()) + .eut(i.nextInt()) + .addTo(pyrolyseRecipes); } }); } diff --git a/src/main/java/gttweaker/mods/gregtech/machines/Separator.java b/src/main/java/gttweaker/mods/gregtech/machines/Separator.java index 7b85a74..6fa7401 100644 --- a/src/main/java/gttweaker/mods/gregtech/machines/Separator.java +++ b/src/main/java/gttweaker/mods/gregtech/machines/Separator.java @@ -1,24 +1,23 @@ package gttweaker.mods.gregtech.machines; import static gregtech.api.enums.GT_Values.RA; -import static gregtech.api.recipe.RecipeMaps.benderRecipes; import static gregtech.api.recipe.RecipeMaps.electroMagneticSeparatorRecipes; import static gttweaker.util.ArrayHelper.itemOrNull; +import java.util.Arrays; +import java.util.List; +import java.util.Objects; + +import net.minecraft.item.ItemStack; + import gttweaker.mods.AddMultipleRecipeAction; import minetweaker.MineTweakerAPI; import minetweaker.annotations.ModOnly; import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; -import java.util.Arrays; -import java.util.List; -import java.util.Objects; - /** * Provides access to the Separator recipes. * @@ -63,12 +62,12 @@ protected void applySingleRecipe(ArgIterator i) { outputs.removeIf(Objects::isNull); RA.stdBuilder() - .itemInputs(input) - .itemOutputs(outputs.toArray(new ItemStack[0])) - .outputChances(i.nextIntArr()) - .duration(i.nextInt()) - .eut(i.nextInt()) - .addTo(electroMagneticSeparatorRecipes); + .itemInputs(input) + .itemOutputs(outputs.toArray(new ItemStack[0])) + .outputChances(i.nextIntArr()) + .duration(i.nextInt()) + .eut(i.nextInt()) + .addTo(electroMagneticSeparatorRecipes); } }); } diff --git a/src/main/java/gttweaker/mods/gregtech/machines/Sifter.java b/src/main/java/gttweaker/mods/gregtech/machines/Sifter.java index 11a0e80..67614ca 100644 --- a/src/main/java/gttweaker/mods/gregtech/machines/Sifter.java +++ b/src/main/java/gttweaker/mods/gregtech/machines/Sifter.java @@ -49,12 +49,12 @@ public static void addRecipe(IItemStack[] outputs, IIngredient input, int[] outC @Override protected void applySingleRecipe(ArgIterator i) { RA.stdBuilder() - .itemInputs(i.nextItem()) - .itemOutputs(i.nextItemArr()) - .outputChances(i.nextIntArr()) - .duration(i.nextInt()) - .eut(i.nextInt()) - .addTo(sifterRecipes); + .itemInputs(i.nextItem()) + .itemOutputs(i.nextItemArr()) + .outputChances(i.nextIntArr()) + .duration(i.nextInt()) + .eut(i.nextInt()) + .addTo(sifterRecipes); } }); } diff --git a/src/main/java/gttweaker/mods/gregtech/machines/Slicer.java b/src/main/java/gttweaker/mods/gregtech/machines/Slicer.java index 8e5e9f5..0f59056 100644 --- a/src/main/java/gttweaker/mods/gregtech/machines/Slicer.java +++ b/src/main/java/gttweaker/mods/gregtech/machines/Slicer.java @@ -1,7 +1,6 @@ package gttweaker.mods.gregtech.machines; import static gregtech.api.enums.GT_Values.RA; -import static gregtech.api.recipe.RecipeMaps.benderRecipes; import static gregtech.api.recipe.RecipeMaps.slicerRecipes; import gttweaker.mods.AddMultipleRecipeAction; @@ -45,11 +44,11 @@ public static void addRecipe(IItemStack output, IIngredient input, IItemStack bl @Override protected void applySingleRecipe(ArgIterator i) { RA.stdBuilder() - .itemInputs(i.nextItem(), i.nextItem()) - .itemOutputs(i.nextItem()) - .duration(i.nextInt()) - .duration(i.nextInt()) - .addTo(slicerRecipes); + .itemInputs(i.nextItem(), i.nextItem()) + .itemOutputs(i.nextItem()) + .duration(i.nextInt()) + .duration(i.nextInt()) + .addTo(slicerRecipes); } }); } diff --git a/src/main/java/gttweaker/mods/gregtech/machines/ThermalCentrifuge.java b/src/main/java/gttweaker/mods/gregtech/machines/ThermalCentrifuge.java index 5870fd4..6e4a15d 100644 --- a/src/main/java/gttweaker/mods/gregtech/machines/ThermalCentrifuge.java +++ b/src/main/java/gttweaker/mods/gregtech/machines/ThermalCentrifuge.java @@ -31,11 +31,11 @@ public static void addRecipe(IItemStack output1, IItemStack output2, IItemStack @Override protected void applySingleRecipe(ArgIterator i) { RA.stdBuilder() - .itemInputs(i.nextItem()) - .itemOutputs(i.nextItem(), i.nextItem(), i.nextItem()) - .duration(i.nextInt()) - .eut(i.nextInt()) - .addTo(thermalCentrifugeRecipes); + .itemInputs(i.nextItem()) + .itemOutputs(i.nextItem(), i.nextItem(), i.nextItem()) + .duration(i.nextInt()) + .eut(i.nextInt()) + .addTo(thermalCentrifugeRecipes); } }); } diff --git a/src/main/java/gttweaker/mods/gregtech/machines/Unpacker.java b/src/main/java/gttweaker/mods/gregtech/machines/Unpacker.java index 8100a89..8e936e3 100644 --- a/src/main/java/gttweaker/mods/gregtech/machines/Unpacker.java +++ b/src/main/java/gttweaker/mods/gregtech/machines/Unpacker.java @@ -1,7 +1,6 @@ package gttweaker.mods.gregtech.machines; import static gregtech.api.enums.GT_Values.RA; -import static gregtech.api.recipe.RecipeMaps.benderRecipes; import static gregtech.api.recipe.RecipeMaps.unpackagerRecipes; import gttweaker.mods.AddMultipleRecipeAction; @@ -45,11 +44,11 @@ public static void addRecipe(IItemStack output1, IItemStack output2, IIngredient @Override protected void applySingleRecipe(ArgIterator i) { RA.stdBuilder() - .itemInputs(i.nextItem()) - .itemOutputs(i.nextItem(), i.nextItem()) - .duration(i.nextInt()) - .duration(i.nextInt()) - .addTo(unpackagerRecipes); + .itemInputs(i.nextItem()) + .itemOutputs(i.nextItem(), i.nextItem()) + .duration(i.nextInt()) + .duration(i.nextInt()) + .addTo(unpackagerRecipes); } }); } diff --git a/src/main/java/gttweaker/mods/gregtech/machines/VacuumFreezer.java b/src/main/java/gttweaker/mods/gregtech/machines/VacuumFreezer.java index 8464a72..e3ed803 100644 --- a/src/main/java/gttweaker/mods/gregtech/machines/VacuumFreezer.java +++ b/src/main/java/gttweaker/mods/gregtech/machines/VacuumFreezer.java @@ -3,6 +3,9 @@ import static gregtech.api.enums.GT_Values.RA; import static gregtech.api.recipe.RecipeMaps.vacuumFreezerRecipes; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidStack; + import gregtech.api.enums.TierEU; import gregtech.api.util.GT_Utility; import gttweaker.mods.AddMultipleRecipeAction; @@ -10,8 +13,6 @@ import minetweaker.annotations.ModOnly; import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidStack; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; @@ -40,23 +41,23 @@ public static void addRecipe(IItemStack output, IIngredient input, int durationT protected void applySingleRecipe(ArgIterator i) { ItemStack input = i.nextItem(); ItemStack output = i.nextItem(); - int duration =i.nextInt(); + int duration = i.nextInt(); RA.stdBuilder() - .itemInputs(input) - .itemOutputs(output) - .duration(duration) - .eut(TierEU.RECIPE_MV) - .addTo(vacuumFreezerRecipes); + .itemInputs(input) + .itemOutputs(output) + .duration(duration) + .eut(TierEU.RECIPE_MV) + .addTo(vacuumFreezerRecipes); FluidStack fluidInput = GT_Utility.getFluidForFilledItem(input, true); FluidStack fluidOutput = GT_Utility.getFluidForFilledItem(output, true); if (fluidInput != null && fluidOutput != null) { RA.stdBuilder() - .fluidInputs(fluidInput) - .fluidOutputs(fluidOutput) - .duration(duration) - .eut(TierEU.RECIPE_MV) - .addTo(vacuumFreezerRecipes); + .fluidInputs(fluidInput) + .fluidOutputs(fluidOutput) + .duration(duration) + .eut(TierEU.RECIPE_MV) + .addTo(vacuumFreezerRecipes); } } diff --git a/src/main/java/gttweaker/mods/gregtech/machines/Wiremill.java b/src/main/java/gttweaker/mods/gregtech/machines/Wiremill.java index 8df6026..2ef7547 100644 --- a/src/main/java/gttweaker/mods/gregtech/machines/Wiremill.java +++ b/src/main/java/gttweaker/mods/gregtech/machines/Wiremill.java @@ -1,7 +1,6 @@ package gttweaker.mods.gregtech.machines; import static gregtech.api.enums.GT_Values.RA; -import static gregtech.api.recipe.RecipeMaps.benderRecipes; import static gregtech.api.recipe.RecipeMaps.wiremillRecipes; import gttweaker.mods.AddMultipleRecipeAction; @@ -42,11 +41,11 @@ public static void addRecipe(IItemStack output, IIngredient input, int durationT @Override protected void applySingleRecipe(ArgIterator i) { RA.stdBuilder() - .itemInputs(i.nextItem()) - .itemOutputs(i.nextItem()) - .duration(i.nextInt()) - .duration(i.nextInt()) - .addTo(wiremillRecipes); + .itemInputs(i.nextItem()) + .itemOutputs(i.nextItem()) + .duration(i.nextInt()) + .duration(i.nextInt()) + .addTo(wiremillRecipes); } }); } diff --git a/src/main/java/gttweaker/mods/gtpp/machines/BlastSmelter.java b/src/main/java/gttweaker/mods/gtpp/machines/BlastSmelter.java index 727892c..f212b56 100644 --- a/src/main/java/gttweaker/mods/gtpp/machines/BlastSmelter.java +++ b/src/main/java/gttweaker/mods/gtpp/machines/BlastSmelter.java @@ -1,20 +1,19 @@ package gttweaker.mods.gtpp.machines; -import gtPlusPlus.api.recipe.GTPPRecipeMaps; -import gtPlusPlus.core.lib.CORE; +import static gregtech.api.enums.GT_Values.RA; +import static gtPlusPlus.api.recipe.GTPPRecipeMaps.alloyBlastSmelterRecipes; + +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidStack; + import gttweaker.mods.AddMultipleRecipeAction; import minetweaker.MineTweakerAPI; import minetweaker.annotations.ModOnly; import minetweaker.api.item.IIngredient; import minetweaker.api.liquid.ILiquidStack; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidStack; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; -import static gregtech.api.enums.GT_Values.RA; -import static gtPlusPlus.api.recipe.GTPPRecipeMaps.alloyBlastSmelterRecipes; - /** * Adds a Recipe for the Alloy Blast Smelter. (up to 9 Inputs) * @@ -59,11 +58,11 @@ protected void applySingleRecipe(ArgIterator i) { int eut = i.nextInt(); RA.stdBuilder() - .itemInputs(inputs) - .fluidOutputs(output) - .duration(duration) - .eut(eut) - .addTo(alloyBlastSmelterRecipes); + .itemInputs(inputs) + .fluidOutputs(output) + .duration(duration) + .eut(eut) + .addTo(alloyBlastSmelterRecipes); } }); } @@ -91,12 +90,12 @@ protected void applySingleRecipe(ArgIterator i) { int eut = i.nextInt(); RA.stdBuilder() - .itemInputs(inputs) - .fluidInputs(input) - .fluidOutputs(output) - .duration(duration) - .eut(eut) - .addTo(alloyBlastSmelterRecipes); + .itemInputs(inputs) + .fluidInputs(input) + .fluidOutputs(output) + .duration(duration) + .eut(eut) + .addTo(alloyBlastSmelterRecipes); } }); } @@ -126,14 +125,14 @@ protected void applySingleRecipe(ArgIterator i) { int eut = i.nextInt(); RA.stdBuilder() - .itemInputs(inputs) - .itemOutputs(outputs) - .outputChances(chances) - .fluidInputs(input) - .fluidOutputs(output) - .duration(duration) - .eut(eut) - .addTo(alloyBlastSmelterRecipes); + .itemInputs(inputs) + .itemOutputs(outputs) + .outputChances(chances) + .fluidInputs(input) + .fluidOutputs(output) + .duration(duration) + .eut(eut) + .addTo(alloyBlastSmelterRecipes); } }); } @@ -163,12 +162,12 @@ protected void applySingleRecipe(ArgIterator i) { // special value is useless in ABS recipes RA.stdBuilder() - .itemInputs(inputs) - .fluidInputs(input) - .fluidOutputs(output) - .duration(duration) - .eut(eut) - .addTo(alloyBlastSmelterRecipes); + .itemInputs(inputs) + .fluidInputs(input) + .fluidOutputs(output) + .duration(duration) + .eut(eut) + .addTo(alloyBlastSmelterRecipes); } }); } @@ -199,14 +198,14 @@ protected void applySingleRecipe(ArgIterator i) { int eut = i.nextInt(); // special value is useless in ABS recipes RA.stdBuilder() - .itemInputs(inputs) - .itemOutputs(outputs) - .outputChances(chances) - .fluidInputs(input) - .fluidOutputs(output) - .duration(duration) - .eut(eut) - .addTo(alloyBlastSmelterRecipes); + .itemInputs(inputs) + .itemOutputs(outputs) + .outputChances(chances) + .fluidInputs(input) + .fluidOutputs(output) + .duration(duration) + .eut(eut) + .addTo(alloyBlastSmelterRecipes); } }); } diff --git a/src/main/java/gttweaker/mods/gtpp/machines/CokeOven.java b/src/main/java/gttweaker/mods/gtpp/machines/CokeOven.java index 3958224..fc58d96 100644 --- a/src/main/java/gttweaker/mods/gtpp/machines/CokeOven.java +++ b/src/main/java/gttweaker/mods/gtpp/machines/CokeOven.java @@ -1,23 +1,17 @@ package gttweaker.mods.gtpp.machines; -import gregtech.api.util.GT_Recipe; -import gtPlusPlus.api.recipe.GTPPRecipeMaps; -import gtPlusPlus.core.lib.CORE; +import static gregtech.api.enums.GT_Values.RA; +import static gtPlusPlus.api.recipe.GTPPRecipeMaps.cokeOvenRecipes; + import gttweaker.mods.AddMultipleRecipeAction; import minetweaker.MineTweakerAPI; import minetweaker.annotations.ModOnly; import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; import minetweaker.api.liquid.ILiquidStack; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidStack; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; -import static gregtech.api.enums.GT_Values.RA; -import static gtPlusPlus.api.recipe.GTPPRecipeMaps.chemicalDehydratorRecipes; -import static gtPlusPlus.api.recipe.GTPPRecipeMaps.cokeOvenRecipes; - @ZenClass("mods.gtpp.CokeOven") @ModOnly("miscutils") public class CokeOven { @@ -39,16 +33,13 @@ public static void addRecipe(IItemStack output, ILiquidStack fluidOutput, IIngre @Override protected void applySingleRecipe(ArgIterator i) { RA.stdBuilder() - .itemInputs( - i.nextItem(), - i.nextItem() - ) - .fluidInputs(i.nextFluid()) - .fluidOutputs(i.nextFluid()) - .itemOutputs(i.nextItem()) - .duration(i.nextInt()) - .eut(i.nextInt()) - .addTo(cokeOvenRecipes); + .itemInputs(i.nextItem(), i.nextItem()) + .fluidInputs(i.nextFluid()) + .fluidOutputs(i.nextFluid()) + .itemOutputs(i.nextItem()) + .duration(i.nextInt()) + .eut(i.nextInt()) + .addTo(cokeOvenRecipes); } }); } diff --git a/src/main/java/gttweaker/mods/gtpp/machines/Dehydrator.java b/src/main/java/gttweaker/mods/gtpp/machines/Dehydrator.java index cb2af9b..cee8d52 100644 --- a/src/main/java/gttweaker/mods/gtpp/machines/Dehydrator.java +++ b/src/main/java/gttweaker/mods/gtpp/machines/Dehydrator.java @@ -1,6 +1,8 @@ package gttweaker.mods.gtpp.machines; -import gtPlusPlus.core.lib.CORE; +import static gregtech.api.enums.GT_Values.RA; +import static gregtech.api.recipe.RecipeMaps.centrifugeNonCellRecipes; + import gttweaker.mods.AddMultipleRecipeAction; import gttweaker.util.ArrayHelper; import minetweaker.MineTweakerAPI; @@ -11,9 +13,6 @@ import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; -import static gregtech.api.enums.GT_Values.RA; -import static gregtech.api.recipe.RecipeMaps.centrifugeNonCellRecipes; - @ZenClass("mods.gtpp.Dehydrator") @ModOnly("miscutils") public class Dehydrator { @@ -35,14 +34,14 @@ public static void addRecipe(IItemStack[] outputs, ILiquidStack fluidOutput, IIn @Override protected void applySingleRecipe(ArgIterator i) { RA.stdBuilder() - .itemInputs(i.nextItemArr()) - .fluidInputs(i.nextFluid()) - .fluidOutputs(i.nextFluid()) - .itemOutputs(i.nextItemArr()) - .outputChances(i.nextIntArr()) - .duration(i.nextInt()) - .eut(i.nextInt()) - .addTo(centrifugeNonCellRecipes); + .itemInputs(i.nextItemArr()) + .fluidInputs(i.nextFluid()) + .fluidOutputs(i.nextFluid()) + .itemOutputs(i.nextItemArr()) + .outputChances(i.nextIntArr()) + .duration(i.nextInt()) + .eut(i.nextInt()) + .addTo(centrifugeNonCellRecipes); } }); } diff --git a/src/main/java/gttweaker/mods/gtpp/machines/MatterFabricator.java b/src/main/java/gttweaker/mods/gtpp/machines/MatterFabricator.java index 3615b15..01fa75f 100644 --- a/src/main/java/gttweaker/mods/gtpp/machines/MatterFabricator.java +++ b/src/main/java/gttweaker/mods/gtpp/machines/MatterFabricator.java @@ -1,6 +1,8 @@ package gttweaker.mods.gtpp.machines; -import gtPlusPlus.core.lib.CORE; +import static gregtech.api.enums.GT_Values.RA; +import static gtPlusPlus.api.recipe.GTPPRecipeMaps.multiblockMassFabricatorRecipes; + import gttweaker.mods.AddMultipleRecipeAction; import minetweaker.MineTweakerAPI; import minetweaker.annotations.ModOnly; @@ -8,9 +10,6 @@ import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; -import static gregtech.api.enums.GT_Values.RA; -import static gtPlusPlus.api.recipe.GTPPRecipeMaps.multiblockMassFabricatorRecipes; - @ZenClass("mods.gtpp.MatterFabricator") @ModOnly("miscutils") public class MatterFabricator { @@ -28,11 +27,11 @@ public static void addRecipe(ILiquidStack fluidOutput, ILiquidStack fluidInput, @Override protected void applySingleRecipe(ArgIterator i) { RA.stdBuilder() - .fluidInputs(i.nextFluid()) - .fluidOutputs(i.nextFluid()) - .duration(i.nextInt()) - .eut(i.nextInt()) - .addTo(multiblockMassFabricatorRecipes); + .fluidInputs(i.nextFluid()) + .fluidOutputs(i.nextFluid()) + .duration(i.nextInt()) + .eut(i.nextInt()) + .addTo(multiblockMassFabricatorRecipes); } }); diff --git a/src/main/java/gttweaker/mods/gtpp/machines/MultiblockCentrifuge.java b/src/main/java/gttweaker/mods/gtpp/machines/MultiblockCentrifuge.java index ec89441..30b3e29 100644 --- a/src/main/java/gttweaker/mods/gtpp/machines/MultiblockCentrifuge.java +++ b/src/main/java/gttweaker/mods/gtpp/machines/MultiblockCentrifuge.java @@ -1,8 +1,8 @@ package gttweaker.mods.gtpp.machines; -import gregtech.api.util.GT_Recipe; -import gtPlusPlus.api.recipe.GTPPRecipeMaps; -import gtPlusPlus.core.lib.CORE; +import static gregtech.api.enums.GT_Values.RA; +import static gtPlusPlus.api.recipe.GTPPRecipeMaps.chemicalDehydratorRecipes; + import gttweaker.mods.AddMultipleRecipeAction; import minetweaker.MineTweakerAPI; import minetweaker.annotations.ModOnly; @@ -11,11 +11,6 @@ import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; -import static gregtech.api.enums.GT_Values.RA; -import static gregtech.api.recipe.RecipeMaps.centrifugeNonCellRecipes; -import static gregtech.api.recipe.RecipeMaps.electrolyzerNonCellRecipes; -import static gtPlusPlus.api.recipe.GTPPRecipeMaps.chemicalDehydratorRecipes; - @ZenClass("mods.gtpp.MultiblockCentrifuge") @ModOnly("miscutils") @@ -39,16 +34,16 @@ public static void addRecipe(IItemStack[] outputs, ILiquidStack[] fluidOutput, I @Override protected void applySingleRecipe(ArgIterator i) { RA.stdBuilder() - .noOptimize() - .itemInputs(i.nextItemArr()) - .fluidInputs(i.nextFluidArr()) - .fluidOutputs(i.nextFluidArr()) - .itemOutputs(i.nextItemArr()) - .outputChances(i.nextIntArr()) - .duration(i.nextInt()) - .eut(i.nextInt()) - .specialValue(i.nextInt()) // unused, added for full backward compat - .addTo(chemicalDehydratorRecipes); + .noOptimize() + .itemInputs(i.nextItemArr()) + .fluidInputs(i.nextFluidArr()) + .fluidOutputs(i.nextFluidArr()) + .itemOutputs(i.nextItemArr()) + .outputChances(i.nextIntArr()) + .duration(i.nextInt()) + .eut(i.nextInt()) + .specialValue(i.nextInt()) // unused, added for full backward compat + .addTo(chemicalDehydratorRecipes); } }); diff --git a/src/main/java/gttweaker/mods/gtpp/machines/MultiblockElectrolyzer.java b/src/main/java/gttweaker/mods/gtpp/machines/MultiblockElectrolyzer.java index 5d9bbe6..3bf9475 100644 --- a/src/main/java/gttweaker/mods/gtpp/machines/MultiblockElectrolyzer.java +++ b/src/main/java/gttweaker/mods/gtpp/machines/MultiblockElectrolyzer.java @@ -1,8 +1,8 @@ package gttweaker.mods.gtpp.machines; -import gregtech.api.util.GT_Recipe; -import gtPlusPlus.api.recipe.GTPPRecipeMaps; -import gtPlusPlus.core.lib.CORE; +import static gregtech.api.enums.GT_Values.RA; +import static gregtech.api.recipe.RecipeMaps.electrolyzerNonCellRecipes; + import gttweaker.mods.AddMultipleRecipeAction; import minetweaker.MineTweakerAPI; import minetweaker.annotations.ModOnly; @@ -11,9 +11,6 @@ import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; -import static gregtech.api.enums.GT_Values.RA; -import static gregtech.api.recipe.RecipeMaps.electrolyzerNonCellRecipes; - @ZenClass("mods.gtpp.MultiblockElectrolyzer") @ModOnly("miscutils") /* @@ -46,16 +43,16 @@ public static void addRecipe(IItemStack[] inputs, ILiquidStack[] fluidInput, ILi @Override protected void applySingleRecipe(ArgIterator i) { RA.stdBuilder() - .noOptimize() - .itemInputs(i.nextItemArr()) - .fluidInputs(i.nextFluidArr()) - .fluidOutputs(i.nextFluidArr()) - .itemOutputs(i.nextItemArr()) - .outputChances(i.nextIntArr()) - .duration(i.nextInt()) - .eut(i.nextInt()) - .specialValue(i.nextInt()) // unused, added for full backward compat - .addTo(electrolyzerNonCellRecipes); + .noOptimize() + .itemInputs(i.nextItemArr()) + .fluidInputs(i.nextFluidArr()) + .fluidOutputs(i.nextFluidArr()) + .itemOutputs(i.nextItemArr()) + .outputChances(i.nextIntArr()) + .duration(i.nextInt()) + .eut(i.nextInt()) + .specialValue(i.nextInt()) // unused, added for full backward compat + .addTo(electrolyzerNonCellRecipes); } }); }