Skip to content

Commit

Permalink
Merge pull request #66 from GTNewHorizons/fix_list-spotless-fixes
Browse files Browse the repository at this point in the history 
Spotless apply for branch fix_list for #65
  • Loading branch information
@boubou19
boubou19 authored Jul 23, 2024
2 parents 44171ae + 92272c6 commit b632b2b
Show file tree
Hide file tree
Showing 9 changed files with 46 additions and 17 deletions.
4 changes: 2 additions & 2 deletions src/main/java/gttweaker/mods/gregtech/machines/BlastFurnace.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ public static void addRecipe(IItemStack[] output, ILiquidStack fluidOutput, IIng
protected void applySingleRecipe(ArgIterator i) {
ItemStack input1 = i.nextItem();
ItemStack input2 = i.nextItem();
List<ItemStack> inputs =new ArrayList<>(Arrays.asList(input1, input2));
List<ItemStack> inputs = new ArrayList<>(Arrays.asList(input1, input2));
inputs.removeIf(Objects::isNull);

FluidStack fluidInput = i.nextFluid();
Expand Down Expand Up @@ -115,7 +115,7 @@ protected void applySingleRecipe(ArgIterator i) {
FluidStack fluidInput = i.nextFluid();
ItemStack output1 = i.nextItem();
ItemStack output2 = i.nextItem();
List<ItemStack> outputs =new ArrayList<>(Arrays.asList(output1, output2));
List<ItemStack> outputs = new ArrayList<>(Arrays.asList(output1, output2));
outputs.removeIf(Objects::isNull);
int duration = i.nextInt();
int eut = i.nextInt();
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/gttweaker/mods/gregtech/machines/Canner.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ protected void applySingleRecipe(ArgIterator i) {
ItemStack input2 = i.nextItem();
ItemStack output1 = i.nextItem();
ItemStack output2 = i.nextItem();
List<ItemStack> outputs =new ArrayList<>(Arrays.asList(output1, output2));
List<ItemStack> outputs = new ArrayList<>(Arrays.asList(output1, output2));
outputs.removeIf(Objects::isNull);

int duration = i.nextInt();
Expand Down
21 changes: 17 additions & 4 deletions src/main/java/gttweaker/mods/gregtech/machines/Centrifuge.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,14 @@ protected void applySingleRecipe(ArgIterator i) {
ItemStack input2 = i.nextItem();
FluidStack fluidInput = i.nextFluid();
FluidStack fluidOutput = i.nextFluid();
List<ItemStack> outputs = new ArrayList<>(Arrays.asList(i.nextItem(), i.nextItem(), i.nextItem(), i.nextItem(), i.nextItem(), i.nextItem()));
List<ItemStack> outputs = new ArrayList<>(
Arrays.asList(
i.nextItem(),
i.nextItem(),
i.nextItem(),
i.nextItem(),
i.nextItem(),
i.nextItem()));
outputs.removeIf(Objects::isNull);

int[] chances = i.nextIntArr();
Expand Down Expand Up @@ -122,13 +129,19 @@ protected void applySingleRecipe(ArgIterator i) {
ItemStack input1 = i.nextItem();
int cellNumber = i.nextInt();
ItemStack input2 = cellNumber > 0 ? ItemList.Cell_Empty.get(cellNumber) : null;
List<ItemStack> inputs =new ArrayList<>(Arrays.asList(input1, input2));
List<ItemStack> inputs = new ArrayList<>(Arrays.asList(input1, input2));
inputs.removeIf(Objects::isNull);

FluidStack fluidInput = i.nextFluid();
FluidStack fluidOutput = i.nextFluid();
List<ItemStack> outputs =new ArrayList<>(Arrays
.asList(i.nextItem(), i.nextItem(), i.nextItem(), i.nextItem(), i.nextItem(), i.nextItem()));
List<ItemStack> outputs = new ArrayList<>(
Arrays.asList(
i.nextItem(),
i.nextItem(),
i.nextItem(),
i.nextItem(),
i.nextItem(),
i.nextItem()));
outputs.removeIf(Objects::isNull);

int[] chances = i.nextIntArr();
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/gttweaker/mods/gregtech/machines/ChemicalBath.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,8 @@ 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 =new ArrayList<>(Arrays.asList(i.nextItem(), i.nextItem(), i.nextItem()));
List<ItemStack> outputs = new ArrayList<>(
Arrays.asList(i.nextItem(), i.nextItem(), i.nextItem()));
outputs.removeIf(Objects::isNull);
int[] chances = i.nextIntArr();
int duration = i.nextInt();
Expand Down
20 changes: 16 additions & 4 deletions src/main/java/gttweaker/mods/gregtech/machines/Electrolyzer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,14 @@ protected void applySingleRecipe(ArgIterator i) {
ItemStack[] inputs = new ItemStack[] { i.nextItem(), i.nextItem() };
FluidStack fluidInput = i.nextFluid();
FluidStack fluidOutput = i.nextFluid();
List<ItemStack> outputs =new ArrayList<>(Arrays
.asList(i.nextItem(), i.nextItem(), i.nextItem(), i.nextItem(), i.nextItem(), i.nextItem()));
List<ItemStack> outputs = new ArrayList<>(
Arrays.asList(
i.nextItem(),
i.nextItem(),
i.nextItem(),
i.nextItem(),
i.nextItem(),
i.nextItem()));
outputs.removeIf(Objects::isNull);

RA.stdBuilder()
Expand Down Expand Up @@ -114,8 +120,14 @@ protected void applySingleRecipe(ArgIterator i) {
ItemStack[] inputs = new ItemStack[] { i.nextItem(), i.nextItem() };
FluidStack fluidInput = i.nextFluid();
FluidStack fluidOutput = i.nextFluid();
List<ItemStack> outputs =new ArrayList<>(Arrays
.asList(i.nextItem(), i.nextItem(), i.nextItem(), i.nextItem(), i.nextItem(), i.nextItem()));
List<ItemStack> outputs = new ArrayList<>(
Arrays.asList(
i.nextItem(),
i.nextItem(),
i.nextItem(),
i.nextItem(),
i.nextItem(),
i.nextItem()));
outputs.removeIf(Objects::isNull);

RA.stdBuilder()
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/gttweaker/mods/gregtech/machines/ImplosionCompressor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ protected void applySingleRecipe(ArgIterator i) {
int additiveAmount = i.nextInt();
ItemStack output1 = i.nextItem();
ItemStack output2 = i.nextItem();
List<ItemStack> outputs =new ArrayList<>(Arrays.asList(output1, output2));
List<ItemStack> outputs = new ArrayList<>(Arrays.asList(output1, output2));
outputs.removeIf(Objects::isNull);
RA.stdBuilder()
.itemInputs(input)
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/gttweaker/mods/gregtech/machines/Lathe.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ public static void addRecipe(IItemStack[] outputs, IIngredient input, int durati
@Override
protected void applySingleRecipe(ArgIterator i) {
ItemStack input = i.nextItem();
List<ItemStack> outputs =new ArrayList<>(Arrays.asList(i.nextItem(), i.nextItem()));
List<ItemStack> outputs = new ArrayList<>(Arrays.asList(i.nextItem(), i.nextItem()));
outputs.removeIf(Objects::isNull);

RA.stdBuilder()
Expand Down
6 changes: 4 additions & 2 deletions src/main/java/gttweaker/mods/gregtech/machines/Mixer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,8 @@ public static void addRecipe(IItemStack output, ILiquidStack fluidOutput, IIngre

@Override
protected void applySingleRecipe(ArgIterator i) {
List<ItemStack> inputs =new ArrayList<>(Arrays.asList(i.nextItem(), i.nextItem(), i.nextItem(), i.nextItem()));
List<ItemStack> inputs = new ArrayList<>(
Arrays.asList(i.nextItem(), i.nextItem(), i.nextItem(), i.nextItem()));
inputs.removeIf(Objects::isNull);

RA.stdBuilder()
Expand Down Expand Up @@ -94,7 +95,8 @@ public static void addRecipe(IItemStack output, IIngredient[] input, int duratio

@Override
protected void applySingleRecipe(ArgIterator i) {
List<ItemStack> inputs =new ArrayList<>(Arrays.asList(i.nextItem(), i.nextItem(), i.nextItem(), i.nextItem()));
List<ItemStack> inputs = new ArrayList<>(
Arrays.asList(i.nextItem(), i.nextItem(), i.nextItem(), i.nextItem()));
inputs.removeIf(Objects::isNull);

RA.stdBuilder()
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/gttweaker/mods/gregtech/machines/Separator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,8 @@ public static void addRecipe(IItemStack[] output, IIngredient input, int[] outCh
@Override
protected void applySingleRecipe(ArgIterator i) {
ItemStack input = i.nextItem();
List<ItemStack> outputs =new ArrayList<>(Arrays.asList(i.nextItem(), i.nextItem(), i.nextItem()));
List<ItemStack> outputs = new ArrayList<>(
Arrays.asList(i.nextItem(), i.nextItem(), i.nextItem()));
outputs.removeIf(Objects::isNull);

RA.stdBuilder()
Expand Down

0 comments on commit b632b2b

Please sign in to comment.