Skip to content

Commit

Permalink
spotlessApply
Browse files Browse the repository at this point in the history
  • Loading branch information
boubou19 committed Jul 21, 2024
1 parent 445d3b9 commit af5416f
Show file tree
Hide file tree
Showing 44 changed files with 493 additions and 537 deletions.
16 changes: 7 additions & 9 deletions src/main/java/gttweaker/mods/gregtech/Fuels.java
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -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);
}
}
}
22 changes: 10 additions & 12 deletions src/main/java/gttweaker/mods/gregtech/machines/ChemicalBath.java
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*
Expand Down Expand Up @@ -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<ItemStack> outputs = Arrays.asList(
i.nextItem(),
i.nextItem(),
i.nextItem()
);
List<ItemStack> outputs = Arrays.asList(i.nextItem(), i.nextItem(), i.nextItem());
outputs.removeIf(Objects::isNull);
int[] chances = i.nextIntArr();
int duration = i.nextInt();
Expand All @@ -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);
}
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -38,39 +39,39 @@ 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);
}
});
}

@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);
}
});
}
}
10 changes: 5 additions & 5 deletions src/main/java/gttweaker/mods/gregtech/machines/Compressor.java
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
});
}
Expand Down
32 changes: 16 additions & 16 deletions src/main/java/gttweaker/mods/gregtech/machines/CuttingSaw.java
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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);
}
});
}
Expand Down Expand Up @@ -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);
}
});
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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);
}
});
}
Expand All @@ -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);
}
});
}
Expand Down
24 changes: 12 additions & 12 deletions src/main/java/gttweaker/mods/gregtech/machines/Distillery.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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);
}
});
}
Expand Down
Loading

0 comments on commit af5416f

Please sign in to comment.