Rename AdjacentFluid overload (#3960)

Author: jurrejelle

docs/content/Modpacks/Changes/v7.2.0.md

@@ -29,9 +29,11 @@ Where the inputs or outputs will be rolled inclusively from min to max.
 ## Rock breaker conditions
 Previously, rock breaker recipes used the `addData("fluidA", ...)` methods.
 
-Now, they work by AdjacentFluidConditions, added with the `adjacentFluid(Fluid...)` methods. See [our other condition builder methods](https://github.com/GregTechCEu/GregTech-Modern/blob/1.20.1/src/main/java/com/gregtechceu/gtceu/integration/kjs/recipe/GTRecipeSchema.java#L894).
+Now, they work by AdjacentFluidConditions, added with the `adjacentFluids(Fluid...)` methods. See [our other condition builder methods](https://github.com/GregTechCEu/GregTech-Modern/blob/1.20.1/src/main/java/com/gregtechceu/gtceu/integration/kjs/recipe/GTRecipeSchema.java#L894).
 
-In a similar vein, recipes that used to have adjacent block requirements, you now need to use `adjacentBlock(Block...)` rather than `addData("blockA")`.
+In a similar vein, recipes that used to have adjacent block requirements, you now need to use `adjacentBlocks(Block...)` rather than `addData("blockA")`.
+
+There also exist methods for tagged fluids, by using `.adjacentFluidTag(ResourceLocation)` and `.adjacentBlockTag(ResourceLocation)`.
 
 ## Recipe Conditions
 We have moved away from the .serialize, .deserialize, .toNetwork and .fromNetwork calls on the RecipeCondition, and we now exclusively use the recipeCondition's codec.  

docs/content/Modpacks/Changes/v7.2.1.md

@@ -0,0 +1,20 @@
+---
+title: "Version 7.2.1"
+---
+
+
+# Updating from `7.2.0` to `7.2.1`
+
+## AdjacentFluid() and AdjacentBlock()
+
+For ease of use for KJS, we have added overrides for
+
+- `adjacentFluid(ResourceLocation... tagNames)` -> `adjacentFluidTag(ResourceLocation... tagNames)`
+
+and
+
+- `adjacentFluid(Fluid... fluids)` -> `adjacentFluids(Fluid... fluids)`
+
+This way, the old `AdjacentFluid(...)` methods still exist, but there also is a clear way to use the kubejs without ambiguous casts / methods.
+
+These changes hold for the `.adjacentBlock()` too.

docs/content/Modpacks/Recipes/Adding-and-Removing-Recipes.md

@@ -180,15 +180,15 @@ ServerEvents.recipes(event => {
 
 Rock breaker recipes use AdjacentFluidConditions.
 
-To add a condition, you can use the `adjacentFluid(Fluid...)` methods, see [our other condition builder methods](https://github.com/GregTechCEu/GregTech-Modern/blob/1.20.1/src/main/java/com/gregtechceu/gtceu/integration/kjs/recipe/GTRecipeSchema.java#L894).
+To add a condition, you can use the `adjacentFluids(Fluid...)` methods, see [our other condition builder methods](https://github.com/GregTechCEu/GregTech-Modern/blob/1.20.1/src/main/java/com/gregtechceu/gtceu/integration/kjs/recipe/GTRecipeSchema.java#L894).
 
 ```js title="rock_breaker.js"
 ServerEvents.recipes(event => {
     event.recipes.gtceu.rock_breaker('rhino_jank')
         .notConsumable('minecraft:dirt')
         .itemOutputs('minecraft:dirt')
-        .adjacentFluid('minecraft:water')
-        .adjacentFluid('minecraft:lava')
+        .adjacentFluids('minecraft:water')
+        .adjacentFluids('minecraft:lava')
         .duration(16)
         .EUt(30)
 })

src/main/java/com/gregtechceu/gtceu/data/recipe/builder/GTRecipeBuilder.java

@@ -1153,6 +1153,18 @@ public GTRecipeBuilder environmentalHazard(MedicalCondition condition) {
         return environmentalHazard(condition, false);
     }
 
+    public final GTRecipeBuilder adjacentFluids(Fluid... fluids) {
+        return adjacentFluids(false, fluids);
+    }
+
+    public final GTRecipeBuilder adjacentFluids(boolean isReverse, Fluid... fluids) {
+        if (fluids.length > GTUtil.NON_CORNER_NEIGHBOURS.size()) {
+            GTCEu.LOGGER.error("Has too many fluids, not adding to recipe, id: {}", this.id);
+            return this;
+        }
+        return addCondition(AdjacentFluidCondition.fromFluids(fluids).setReverse(isReverse));
+    }
+
     public final GTRecipeBuilder adjacentFluid(Fluid... fluids) {
         return adjacentFluid(false, fluids);
     }
@@ -1165,6 +1177,20 @@ public final GTRecipeBuilder adjacentFluid(boolean isReverse, Fluid... fluids) {
         return addCondition(AdjacentFluidCondition.fromFluids(fluids).setReverse(isReverse));
     }
 
+    @SafeVarargs
+    public final GTRecipeBuilder adjacentFluidTag(TagKey<Fluid>... tags) {
+        return adjacentFluidTag(false, tags);
+    }
+
+    @SafeVarargs
+    public final GTRecipeBuilder adjacentFluidTag(boolean isReverse, TagKey<Fluid>... tags) {
+        if (tags.length > GTUtil.NON_CORNER_NEIGHBOURS.size()) {
+            GTCEu.LOGGER.error("Has too many fluids, not adding to recipe, id: {}", this.id);
+            return this;
+        }
+        return addCondition(AdjacentFluidCondition.fromTags(tags).setReverse(isReverse));
+    }
+
     @SafeVarargs
     public final GTRecipeBuilder adjacentFluid(TagKey<Fluid>... tags) {
         return adjacentFluid(false, tags);
@@ -1191,6 +1217,18 @@ public GTRecipeBuilder adjacentFluid(Collection<HolderSet<Fluid>> fluids, boolea
         return addCondition(new AdjacentFluidCondition(isReverse, new ArrayList<>(fluids)));
     }
 
+    public GTRecipeBuilder adjacentBlocks(Block... blocks) {
+        return adjacentBlocks(false, blocks);
+    }
+
+    public GTRecipeBuilder adjacentBlocks(boolean isReverse, Block... blocks) {
+        if (blocks.length > GTUtil.NON_CORNER_NEIGHBOURS.size()) {
+            GTCEu.LOGGER.error("Has too many blocks, not adding to recipe, id: {}", this.id);
+            return this;
+        }
+        return addCondition(AdjacentBlockCondition.fromBlocks(blocks).setReverse(isReverse));
+    }
+
     public GTRecipeBuilder adjacentBlock(Block... blocks) {
         return adjacentBlock(false, blocks);
     }
@@ -1217,6 +1255,20 @@ public final GTRecipeBuilder adjacentBlock(boolean isReverse, TagKey<Block>... t
         return addCondition(AdjacentBlockCondition.fromTags(tags).setReverse(isReverse));
     }
 
+    @SafeVarargs
+    public final GTRecipeBuilder adjacentBlockTag(TagKey<Block>... tags) {
+        return adjacentBlockTag(false, tags);
+    }
+
+    @SafeVarargs
+    public final GTRecipeBuilder adjacentBlockTag(boolean isReverse, TagKey<Block>... tags) {
+        if (tags.length > GTUtil.NON_CORNER_NEIGHBOURS.size()) {
+            GTCEu.LOGGER.error("Has too many blocks, not adding to recipe, id: {}", this.id);
+            return this;
+        }
+        return addCondition(AdjacentBlockCondition.fromTags(tags).setReverse(isReverse));
+    }
+
     public GTRecipeBuilder adjacentBlock(Collection<HolderSet<Block>> blocks) {
         return adjacentBlock(blocks, false);
     }

src/main/java/com/gregtechceu/gtceu/data/recipe/misc/MiscRecipeLoader.java

@@ -89,95 +89,95 @@ public static void init(Consumer<FinishedRecipe> provider) {
         ROCK_BREAKER_RECIPES.recipeBuilder("cobblestone")
                 .notConsumable(Blocks.COBBLESTONE.asItem())
                 .outputItems(Blocks.COBBLESTONE.asItem())
-                .adjacentFluid(FluidTags.LAVA, FluidTags.WATER)
+                .adjacentFluidTag(FluidTags.LAVA, FluidTags.WATER)
                 .duration(16)
                 .EUt(VA[ULV])
                 .save(provider);
 
         ROCK_BREAKER_RECIPES.recipeBuilder("stone")
                 .notConsumable(Blocks.STONE.asItem())
                 .outputItems(Blocks.STONE.asItem())
-                .adjacentFluid(FluidTags.LAVA, FluidTags.WATER)
+                .adjacentFluidTag(FluidTags.LAVA, FluidTags.WATER)
                 .duration(16)
                 .EUt(VA[ULV])
                 .save(provider);
 
         ROCK_BREAKER_RECIPES.recipeBuilder("andesite")
                 .notConsumable(Blocks.ANDESITE.asItem())
                 .outputItems(Blocks.ANDESITE.asItem())
-                .adjacentFluid(FluidTags.LAVA, FluidTags.WATER)
+                .adjacentFluidTag(FluidTags.LAVA, FluidTags.WATER)
                 .duration(16)
                 .EUt(VHA[MV])
                 .save(provider);
 
         ROCK_BREAKER_RECIPES.recipeBuilder("granite")
                 .notConsumable(Blocks.GRANITE.asItem())
                 .outputItems(Blocks.GRANITE.asItem())
-                .adjacentFluid(FluidTags.LAVA, FluidTags.WATER)
+                .adjacentFluidTag(FluidTags.LAVA, FluidTags.WATER)
                 .duration(16)
                 .EUt(VHA[MV])
                 .save(provider);
 
         ROCK_BREAKER_RECIPES.recipeBuilder("diorite")
                 .notConsumable(Blocks.DIORITE.asItem())
                 .outputItems(Blocks.DIORITE.asItem())
-                .adjacentFluid(FluidTags.LAVA, FluidTags.WATER)
+                .adjacentFluidTag(FluidTags.LAVA, FluidTags.WATER)
                 .duration(16)
                 .EUt(VHA[MV])
                 .save(provider);
 
         ROCK_BREAKER_RECIPES.recipeBuilder("obsidian")
                 .notConsumable(dust, Redstone)
                 .outputItems(Blocks.OBSIDIAN.asItem())
-                .adjacentFluid(FluidTags.LAVA, FluidTags.WATER)
+                .adjacentFluidTag(FluidTags.LAVA, FluidTags.WATER)
                 .duration(16)
                 .EUt(VHA[HV])
                 .save(provider);
 
         ROCK_BREAKER_RECIPES.recipeBuilder("basalt")
                 .notConsumable(Blocks.BASALT.asItem())
                 .outputItems(Blocks.BASALT.asItem())
-                .adjacentFluid(FluidTags.LAVA, FluidTags.WATER)
+                .adjacentFluidTag(FluidTags.LAVA, FluidTags.WATER)
                 .duration(16)
                 .EUt(VHA[HV])
                 .save(provider);
 
         ROCK_BREAKER_RECIPES.recipeBuilder("blackstone")
                 .notConsumable(Blocks.BLACKSTONE.asItem())
                 .outputItems(Blocks.BLACKSTONE.asItem())
-                .adjacentFluid(FluidTags.LAVA, FluidTags.WATER)
+                .adjacentFluidTag(FluidTags.LAVA, FluidTags.WATER)
                 .duration(16)
                 .EUt(VHA[HV])
                 .save(provider);
 
         ROCK_BREAKER_RECIPES.recipeBuilder("deepslate")
                 .notConsumable(Blocks.DEEPSLATE.asItem())
                 .outputItems(Blocks.DEEPSLATE.asItem())
-                .adjacentFluid(FluidTags.LAVA, FluidTags.WATER)
+                .adjacentFluidTag(FluidTags.LAVA, FluidTags.WATER)
                 .duration(16)
                 .EUt(VHA[EV])
                 .save(provider);
 
         ROCK_BREAKER_RECIPES.recipeBuilder("marble")
                 .notConsumable(rock, Marble)
                 .outputItems(rock, Marble)
-                .adjacentFluid(FluidTags.LAVA, FluidTags.WATER)
+                .adjacentFluidTag(FluidTags.LAVA, FluidTags.WATER)
                 .duration(16)
                 .EUt(VHA[HV])
                 .save(provider);
 
         ROCK_BREAKER_RECIPES.recipeBuilder("basalt")
                 .notConsumable(rock, Basalt)
                 .outputItems(rock, Basalt)
-                .adjacentFluid(FluidTags.LAVA, FluidTags.WATER)
+                .adjacentFluidTag(FluidTags.LAVA, FluidTags.WATER)
                 .duration(16)
                 .EUt(VHA[HV])
                 .save(provider);
 
         ROCK_BREAKER_RECIPES.recipeBuilder("red_granite")
                 .notConsumable(rock, GraniteRed)
                 .outputItems(rock, GraniteRed)
-                .adjacentFluid(FluidTags.LAVA, FluidTags.WATER)
+                .adjacentFluidTag(FluidTags.LAVA, FluidTags.WATER)
                 .duration(16)
                 .EUt(VHA[EV])
                 .save(provider);

src/main/java/com/gregtechceu/gtceu/integration/kjs/recipe/GTRecipeSchema.java

@@ -891,6 +891,14 @@ public GTRecipeJS environmentalHazard(MedicalCondition condition) {
             return environmentalHazard(condition, false);
         }
 
+        public GTRecipeJS adjacentFluids(Fluid... fluids) {
+            return adjacentFluids(false, fluids);
+        }
+
+        public GTRecipeJS adjacentFluids(boolean isReverse, Fluid... fluids) {
+            return addCondition(AdjacentFluidCondition.fromFluids(fluids).setReverse(isReverse));
+        }
+
         public GTRecipeJS adjacentFluid(Fluid... fluids) {
             return adjacentFluid(false, fluids);
         }
@@ -910,6 +918,25 @@ public GTRecipeJS adjacentFluid(boolean isReverse, ResourceLocation... tagNames)
             return addCondition(AdjacentFluidCondition.fromTags(tags).setReverse(isReverse));
         }
 
+        public GTRecipeJS adjacentFluidTag(ResourceLocation... tagNames) {
+            return adjacentFluidTag(false, tagNames);
+        }
+
+        public GTRecipeJS adjacentFluidTag(boolean isReverse, ResourceLocation... tagNames) {
+            List<TagKey<Fluid>> tags = Arrays.stream(tagNames)
+                    .map(id -> TagKey.create(Registries.FLUID, id))
+                    .toList();
+            return addCondition(AdjacentFluidCondition.fromTags(tags).setReverse(isReverse));
+        }
+
+        public GTRecipeJS adjacentBlocks(Block... blocks) {
+            return adjacentBlocks(false, blocks);
+        }
+
+        public GTRecipeJS adjacentBlocks(boolean isReverse, Block... blocks) {
+            return addCondition(AdjacentBlockCondition.fromBlocks(blocks).setReverse(isReverse));
+        }
+
         public GTRecipeJS adjacentBlock(Block... blocks) {
             return adjacentBlock(false, blocks);
         }
@@ -918,6 +945,17 @@ public GTRecipeJS adjacentBlock(boolean isReverse, Block... blocks) {
             return addCondition(AdjacentBlockCondition.fromBlocks(blocks).setReverse(isReverse));
         }
 
+        public GTRecipeJS adjacentBlockTag(ResourceLocation... tagNames) {
+            return adjacentBlockTag(false, tagNames);
+        }
+
+        public GTRecipeJS adjacentBlockTag(boolean isReverse, ResourceLocation... tagNames) {
+            List<TagKey<Block>> tags = Arrays.stream(tagNames)
+                    .map(id -> TagKey.create(Registries.BLOCK, id))
+                    .toList();
+            return addCondition(AdjacentBlockCondition.fromTags(tags).setReverse(isReverse));
+        }
+
         public GTRecipeJS adjacentBlock(ResourceLocation... tagNames) {
             return adjacentBlock(false, tagNames);
         }

src/test/java/com/gregtechceu/gtceu/common/recipe/condition/AdjacentFluidConditionTest.java

@@ -38,7 +38,7 @@ public static void prepare(ServerLevel level) {
                 .recipeBuilder(GTCEu.id("test_adjacent_fluid_conditions"))
                 .inputItems(new ItemStack(Blocks.COBBLESTONE))
                 .outputItems(new ItemStack(Blocks.STONE))
-                .adjacentFluid(FluidTags.WATER)
+                .adjacentFluidTag(FluidTags.WATER)
                 .EUt(GTValues.VA[GTValues.HV])
                 .duration(8)
                 .buildRawRecipe());
@@ -47,7 +47,7 @@ public static void prepare(ServerLevel level) {
                 .recipeBuilder(GTCEu.id("test_adjacent_fluid_conditions_multiple_fluids"))
                 .inputItems(new ItemStack(Blocks.OAK_WOOD))
                 .outputItems(new ItemStack(Items.CHARCOAL))
-                .adjacentFluid(FluidTags.WATER, FluidTags.LAVA)
+                .adjacentFluidTag(FluidTags.WATER, FluidTags.LAVA)
                 .EUt(GTValues.VA[GTValues.HV])
                 .duration(8)
                 .buildRawRecipe());