Skip to content

Commit 883efac

Browse files
committed
fix mod compat
1 parent 026502e commit 883efac

File tree

17 files changed

+50
-38
lines changed

17 files changed

+50
-38
lines changed

src/main/java/com/cleanroommc/groovyscript/compat/mods/botaniatweaks/AgglomerationPlate.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,20 +39,20 @@ public Collection<AgglomerationRecipe> getRecipes() {
3939

4040
@MethodDescription(example = @Example("item('botania:manaresource:4')"))
4141
public boolean removeByOutput(IIngredient output) {
42-
return getRecipes().removeIf(r -> output.test(r.getRecipeOutputCopy()) && addBackup(r));
42+
return getRecipes().removeIf(r -> output.test(r.getRecipeOutputCopy()) && doAddBackup(r));
4343
}
4444

4545
@MethodDescription(example = @Example(value = "item('botania:manaresource:2')", commented = true))
4646
public boolean removeByInput(IIngredient input) {
4747
return getRecipes().removeIf(r -> {
4848
for (var stack : r.getRecipeStacks()) {
4949
if (input.test(stack)) {
50-
return addBackup(r);
50+
return doAddBackup(r);
5151
}
5252
}
5353
for (var string : r.getRecipeOreKeys()) {
5454
if (input instanceof OreDictIngredient ore && ore.getOreDict().equals(string)) {
55-
return addBackup(r);
55+
return doAddBackup(r);
5656
}
5757
}
5858
return false;
@@ -61,17 +61,17 @@ public boolean removeByInput(IIngredient input) {
6161

6262
@MethodDescription(example = @Example(value = "blockstate('botania:livingrock')", commented = true))
6363
public boolean removeByCenter(IBlockState center) {
64-
return getRecipes().removeIf(x -> x.multiblockCenter == center && addBackup(x));
64+
return getRecipes().removeIf(x -> x.multiblockCenter == center && doAddBackup(x));
6565
}
6666

6767
@MethodDescription(example = @Example(value = "blockstate('minecraft:lapis_block')", commented = true))
6868
public boolean removeByEdge(IBlockState edge) {
69-
return getRecipes().removeIf(x -> x.multiblockEdge == edge && addBackup(x));
69+
return getRecipes().removeIf(x -> x.multiblockEdge == edge && doAddBackup(x));
7070
}
7171

7272
@MethodDescription(example = @Example(value = "blockstate('botania:livingrock')", commented = true))
7373
public boolean removeByCorner(IBlockState corner) {
74-
return getRecipes().removeIf(x -> x.multiblockCorner == corner && addBackup(x));
74+
return getRecipes().removeIf(x -> x.multiblockCorner == corner && doAddBackup(x));
7575
}
7676

7777
@Property(property = "input", comp = @Comp(gte = 1))

src/main/java/com/cleanroommc/groovyscript/compat/mods/futuremc/BlastFurnace.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@ public RecipeBuilder recipeBuilder() {
3131

3232
@MethodDescription(example = @Example("item('minecraft:gold_ore')"))
3333
public void removeByInput(IIngredient input) {
34-
getRecipes().removeIf(r -> Arrays.stream(r.getInput().getMatchingStacks()).anyMatch(input) && addBackup(r));
34+
getRecipes().removeIf(r -> Arrays.stream(r.getInput().getMatchingStacks()).anyMatch(input) && doAddBackup(r));
3535
}
3636

3737
@MethodDescription(example = @Example("item('minecraft:iron_ingot')"))
3838
public void removeByOutput(IIngredient output) {
39-
getRecipes().removeIf(r -> output.test(r.getOutput()) && addBackup(r));
39+
getRecipes().removeIf(r -> output.test(r.getOutput()) && doAddBackup(r));
4040
}
4141

4242
@Property(property = "input", comp = @Comp(eq = 1))

src/main/java/com/cleanroommc/groovyscript/compat/mods/futuremc/Campfire.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@ public RecipeBuilder recipeBuilder() {
3131

3232
@MethodDescription(example = @Example("item('minecraft:fish')"))
3333
public void removeByInput(IIngredient input) {
34-
getRecipes().removeIf(r -> Arrays.stream(r.getInput().getMatchingStacks()).anyMatch(input) && addBackup(r));
34+
getRecipes().removeIf(r -> Arrays.stream(r.getInput().getMatchingStacks()).anyMatch(input) && doAddBackup(r));
3535
}
3636

3737
@MethodDescription(example = @Example("item('minecraft:cooked_mutton')"))
3838
public void removeByOutput(IIngredient output) {
39-
getRecipes().removeIf(r -> output.test(r.getOutput()) && addBackup(r));
39+
getRecipes().removeIf(r -> output.test(r.getOutput()) && doAddBackup(r));
4040
}
4141

4242
@Property(property = "input", comp = @Comp(eq = 1))

src/main/java/com/cleanroommc/groovyscript/compat/mods/futuremc/Smithing.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@ public RecipeBuilder recipeBuilder() {
3333
@Example("item('minecraft:diamond_hoe')"), @Example(value = "item('futuremc:netherite_ingot')", commented = true),
3434
})
3535
public void removeByInput(IIngredient input) {
36-
getRecipes().removeIf(r -> Arrays.stream(r.getInput().getMatchingStacks()).anyMatch(input) && addBackup(r));
36+
getRecipes().removeIf(r -> Arrays.stream(r.getInput().getMatchingStacks()).anyMatch(input) && doAddBackup(r));
3737
}
3838

3939
@MethodDescription(example = @Example("item('futuremc:netherite_pickaxe')"))
4040
public void removeByOutput(IIngredient output) {
41-
getRecipes().removeIf(r -> output.test(r.getOutput()) && addBackup(r));
41+
getRecipes().removeIf(r -> output.test(r.getOutput()) && doAddBackup(r));
4242
}
4343

4444
@Property(property = "input", comp = @Comp(eq = 2))

src/main/java/com/cleanroommc/groovyscript/compat/mods/futuremc/Smoker.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@ public RecipeBuilder recipeBuilder() {
3131

3232
@MethodDescription(example = @Example("item('minecraft:porkchop')"))
3333
public void removeByInput(IIngredient input) {
34-
getRecipes().removeIf(r -> Arrays.stream(r.getInput().getMatchingStacks()).anyMatch(input) && addBackup(r));
34+
getRecipes().removeIf(r -> Arrays.stream(r.getInput().getMatchingStacks()).anyMatch(input) && doAddBackup(r));
3535
}
3636

3737
@MethodDescription(example = @Example("item('minecraft:baked_potato')"))
3838
public void removeByOutput(IIngredient output) {
39-
getRecipes().removeIf(r -> output.test(r.getOutput()) && addBackup(r));
39+
getRecipes().removeIf(r -> output.test(r.getOutput()) && doAddBackup(r));
4040
}
4141

4242
@Property(property = "input", comp = @Comp(eq = 1))

src/main/java/com/cleanroommc/groovyscript/compat/mods/futuremc/Stonecutter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@ public RecipeBuilder recipeBuilder() {
3131

3232
@MethodDescription(example = @Example("item('minecraft:stonebrick')"))
3333
public void removeByInput(IIngredient input) {
34-
getRecipes().removeIf(r -> Arrays.stream(r.getInput().getMatchingStacks()).anyMatch(input) && addBackup(r));
34+
getRecipes().removeIf(r -> Arrays.stream(r.getInput().getMatchingStacks()).anyMatch(input) && doAddBackup(r));
3535
}
3636

3737
@MethodDescription(example = @Example("item('minecraft:stone_slab')"))
3838
public void removeByOutput(IIngredient output) {
39-
getRecipes().removeIf(r -> output.test(r.getOutput()) && addBackup(r));
39+
getRecipes().removeIf(r -> output.test(r.getOutput()) && doAddBackup(r));
4040
}
4141

4242
@Property(property = "input", comp = @Comp(eq = 1))

src/main/java/com/cleanroommc/groovyscript/compat/mods/magneticraft/CrushingTable.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,12 @@ public Collection<ICrushingTableRecipe> getRecipes() {
3838

3939
@MethodDescription(example = @Example("item('minecraft:iron_ore')"))
4040
public boolean removeByInput(IIngredient input) {
41-
return getRecipes().removeIf(r -> input.test(r.getInput()) && addBackup(r));
41+
return getRecipes().removeIf(r -> input.test(r.getInput()) && doAddBackup(r));
4242
}
4343

4444
@MethodDescription(example = @Example("item('minecraft:gunpowder')"))
4545
public boolean removeByOutput(IIngredient output) {
46-
return getRecipes().removeIf(r -> output.test(r.getOutput()) && addBackup(r));
46+
return getRecipes().removeIf(r -> output.test(r.getOutput()) && doAddBackup(r));
4747
}
4848

4949
@Property(property = "input", comp = @Comp(eq = 1))

src/main/java/com/cleanroommc/groovyscript/compat/mods/magneticraft/GasificationUnit.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,12 @@ public Collection<IGasificationUnitRecipe> getRecipes() {
3838

3939
@MethodDescription
4040
public boolean removeByInput(IIngredient input) {
41-
return getRecipes().removeIf(r -> input.test(r.getInput()) && addBackup(r));
41+
return getRecipes().removeIf(r -> input.test(r.getInput()) && doAddBackup(r));
4242
}
4343

4444
@MethodDescription
4545
public boolean removeByOutput(IIngredient output) {
46-
return getRecipes().removeIf(r -> (output.test(r.getItemOutput()) || output.test(r.getFluidOutput())) && addBackup(r));
46+
return getRecipes().removeIf(r -> (output.test(r.getItemOutput()) || output.test(r.getFluidOutput())) && doAddBackup(r));
4747
}
4848

4949
@Property(property = "input", comp = @Comp(eq = 1))

src/main/java/com/cleanroommc/groovyscript/compat/mods/magneticraft/Grinder.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@ public Collection<IGrinderRecipe> getRecipes() {
3131

3232
@MethodDescription(example = @Example("item('minecraft:iron_ore')"))
3333
public boolean removeByInput(IIngredient input) {
34-
return getRecipes().removeIf(r -> input.test(r.getInput()) && addBackup(r));
34+
return getRecipes().removeIf(r -> input.test(r.getInput()) && doAddBackup(r));
3535
}
3636

3737
@MethodDescription(example = @Example("item('minecraft:gravel')"))
3838
public boolean removeByOutput(IIngredient output) {
39-
return getRecipes().removeIf(r -> (output.test(r.getPrimaryOutput()) || output.test(r.getSecondaryOutput())) && addBackup(r));
39+
return getRecipes().removeIf(r -> (output.test(r.getPrimaryOutput()) || output.test(r.getSecondaryOutput())) && doAddBackup(r));
4040
}
4141

4242
@Property(property = "input", comp = @Comp(eq = 1))

src/main/java/com/cleanroommc/groovyscript/compat/mods/magneticraft/HydraulicPress.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,17 +42,17 @@ public Collection<IHydraulicPressRecipe> getRecipes() {
4242

4343
@MethodDescription(example = @Example("item('minecraft:iron_ingot')"))
4444
public boolean removeByInput(IIngredient input) {
45-
return getRecipes().removeIf(r -> input.test(r.getInput()) && addBackup(r));
45+
return getRecipes().removeIf(r -> input.test(r.getInput()) && doAddBackup(r));
4646
}
4747

4848
@MethodDescription(example = @Example("item('minecraft:cobblestone')"))
4949
public boolean removeByOutput(IIngredient output) {
50-
return getRecipes().removeIf(r -> output.test(r.getOutput()) && addBackup(r));
50+
return getRecipes().removeIf(r -> output.test(r.getOutput()) && doAddBackup(r));
5151
}
5252

5353
@MethodDescription(example = @Example(value = "HydraulicPressMode.MEDIUM", imports = "com.cout970.magneticraft.api.registries.machines.hydraulicpress.HydraulicPressMode"))
5454
public boolean removeByMode(HydraulicPressMode mode) {
55-
return getRecipes().removeIf(r -> mode == r.getMode() && addBackup(r));
55+
return getRecipes().removeIf(r -> mode == r.getMode() && doAddBackup(r));
5656
}
5757

5858
@Property(property = "input", comp = @Comp(eq = 1))

src/main/java/com/cleanroommc/groovyscript/compat/mods/magneticraft/OilHeater.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,12 @@ public Collection<IOilHeaterRecipe> getRecipes() {
3030

3131
@MethodDescription(example = @Example("fluid('oil')"))
3232
public boolean removeByInput(IIngredient input) {
33-
return getRecipes().removeIf(r -> input.test(r.getInput()) && addBackup(r));
33+
return getRecipes().removeIf(r -> input.test(r.getInput()) && doAddBackup(r));
3434
}
3535

3636
@MethodDescription(example = @Example("fluid('steam')"))
3737
public boolean removeByOutput(IIngredient output) {
38-
return getRecipes().removeIf(r -> output.test(r.getOutput()) && addBackup(r));
38+
return getRecipes().removeIf(r -> output.test(r.getOutput()) && doAddBackup(r));
3939
}
4040

4141
@Property(property = "fluidInput", comp = @Comp(eq = 1))

src/main/java/com/cleanroommc/groovyscript/compat/mods/magneticraft/Refinery.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,12 @@ public Collection<IRefineryRecipe> getRecipes() {
3030

3131
@MethodDescription(example = @Example("fluid('steam')"))
3232
public boolean removeByInput(IIngredient input) {
33-
return getRecipes().removeIf(r -> input.test(r.getInput()) && addBackup(r));
33+
return getRecipes().removeIf(r -> input.test(r.getInput()) && doAddBackup(r));
3434
}
3535

3636
@MethodDescription(example = @Example("fluid('fuel')"))
3737
public boolean removeByOutput(IIngredient output) {
38-
return getRecipes().removeIf(r -> (output.test(r.getOutput0()) || output.test(r.getOutput1()) || output.test(r.getOutput2())) && addBackup(r));
38+
return getRecipes().removeIf(r -> (output.test(r.getOutput0()) || output.test(r.getOutput1()) || output.test(r.getOutput2())) && doAddBackup(r));
3939
}
4040

4141
@Property(property = "fluidInput", comp = @Comp(eq = 1))

src/main/java/com/cleanroommc/groovyscript/compat/mods/magneticraft/Sieve.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,12 @@ public Collection<ISieveRecipe> getRecipes() {
3434

3535
@MethodDescription(example = @Example("item('minecraft:sand')"))
3636
public boolean removeByInput(IIngredient input) {
37-
return getRecipes().removeIf(r -> input.test(r.getInput()) && addBackup(r));
37+
return getRecipes().removeIf(r -> input.test(r.getInput()) && doAddBackup(r));
3838
}
3939

4040
@MethodDescription(example = @Example("item('minecraft:quartz')"))
4141
public boolean removeByOutput(IIngredient output) {
42-
return getRecipes().removeIf(r -> (output.test(r.getPrimary()) || output.test(r.getSecondary()) || output.test(r.getTertiary())) && addBackup(r));
42+
return getRecipes().removeIf(r -> (output.test(r.getPrimary()) || output.test(r.getSecondary()) || output.test(r.getTertiary())) && doAddBackup(r));
4343
}
4444

4545
@Property(property = "input", comp = @Comp(eq = 1))

src/main/java/com/cleanroommc/groovyscript/compat/mods/magneticraft/SluiceBox.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,12 @@ public Collection<ISluiceBoxRecipe> getRecipes() {
3535

3636
@MethodDescription(example = @Example("item('minecraft:sand')"))
3737
public boolean removeByInput(IIngredient input) {
38-
return getRecipes().removeIf(r -> input.test(r.getInput()) && addBackup(r));
38+
return getRecipes().removeIf(r -> input.test(r.getInput()) && doAddBackup(r));
3939
}
4040

4141
@MethodDescription(example = @Example("item('minecraft:cobblestone')"))
4242
public boolean removeByOutput(IIngredient output) {
43-
return getRecipes().removeIf(r -> r.getOutputs().stream().map(Pair::getFirst).anyMatch(output) && addBackup(r));
43+
return getRecipes().removeIf(r -> r.getOutputs().stream().map(Pair::getFirst).anyMatch(output) && doAddBackup(r));
4444
}
4545

4646
@Property(property = "input", comp = @Comp(eq = 1))

src/main/java/com/cleanroommc/groovyscript/compat/mods/magneticraft/Thermopile.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public Collection<IThermopileRecipe> getRecipes() {
3737

3838
@MethodDescription(example = @Example("blockstate('minecraft:ice')"))
3939
public boolean removeByInput(IBlockState input) {
40-
return getRecipes().removeIf(r -> input == r.getBlockState() && addBackup(r));
40+
return getRecipes().removeIf(r -> input == r.getBlockState() && doAddBackup(r));
4141
}
4242

4343
public static class RecipeBuilder extends AbstractRecipeBuilder<IThermopileRecipe> {

src/main/java/com/cleanroommc/groovyscript/registry/StandardListRegistry.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,12 @@ public void onReload() {
4040

4141
@MethodDescription(type = MethodDescription.Type.ADDITION, description = "groovyscript.wiki.add_to_list", priority = 500)
4242
public boolean add(R recipe) {
43-
return recipe != null && getRecipes().add(recipe) && addScripted(recipe);
43+
return recipe != null && getRecipes().add(recipe) && doAddScripted(recipe);
4444
}
4545

4646
@MethodDescription(description = "groovyscript.wiki.remove_from_list", priority = 500)
4747
public boolean remove(R recipe) {
48-
return recipe != null && getRecipes().removeIf(r -> r == recipe) && addBackup(recipe);
48+
return recipe != null && getRecipes().removeIf(r -> r == recipe) && doAddBackup(recipe);
4949
}
5050

5151
@MethodDescription(priority = 2000, example = @Example(commented = true))

src/main/java/com/cleanroommc/groovyscript/registry/VirtualizedRegistry.java

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,12 +74,24 @@ public Collection<R> getScriptedRecipes() {
7474
}
7575

7676
@GroovyBlacklist
77-
public boolean addBackup(R recipe) {
77+
public void addBackup(R recipe) {
78+
doAddBackup(recipe);
79+
}
80+
81+
@GroovyBlacklist
82+
public void addScripted(R recipe) {
83+
doAddScripted(recipe);
84+
}
85+
86+
@ApiStatus.Experimental
87+
@GroovyBlacklist
88+
public boolean doAddBackup(R recipe) {
7889
return recipeStorage.addBackup(recipe);
7990
}
8091

92+
@ApiStatus.Experimental
8193
@GroovyBlacklist
82-
public boolean addScripted(R recipe) {
94+
public boolean doAddScripted(R recipe) {
8395
return recipeStorage.addScripted(recipe);
8496
}
8597

0 commit comments

Comments
 (0)