Merge branch 'version/1.21.1' into feature/block-item-insert-info

CHANGELOG.md

@@ -4,6 +4,35 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [release/v1.21.1-1.53.1] - 2024-08-29
+### :bug: Bug Fixes
+- [`14e11a6`](https://github.com/klikli-dev/theurgy/commit/14e11a6b28c73d0376089b18968bb7030088ec19) - remove duplicate book content *(commit by [@klikli-dev](https://github.com/klikli-dev))*
+
+### :wrench: Chores
+- [`e76ec74`](https://github.com/klikli-dev/theurgy/commit/e76ec74c858e52f568154a4a4aa3def2dab0d320) - ensure mod_version in resource files is not cached *(commit by [@klikli-dev](https://github.com/klikli-dev))*
+
+
+## [release/v1.21.1-1.53.0] - 2024-08-21
+### :sparkles: New Features
+- [`3e7e994`](https://github.com/klikli-dev/theurgy/commit/3e7e99463d652d977bc5fc06604fe9b811c68bea) - support ingredient notation in item recipe results *(commit by [@klikli-dev](https://github.com/klikli-dev))*
+
+
+## [release/v1.21.1-1.52.1] - 2024-08-20
+### :bug: Bug Fixes
+- [`59f2b5e`](https://github.com/klikli-dev/theurgy/commit/59f2b5e982229137614ef724436d2efb9f05fd92) - missing mob niter recipes *(commit by [@klikli-dev](https://github.com/klikli-dev))*
+
+
+## [release/v1.21.1-1.52.0] - 2024-08-20
+### :sparkles: New Features
+- [`ff60029`](https://github.com/klikli-dev/theurgy/commit/ff600295b04c6e055827674b868cb7028fe80468) - make vats not accept ingredients if there are already ingredients of another recipe present *(commit by [@klikli-dev](https://github.com/klikli-dev))*
+
+### :wrench: Chores
+- [`524647b`](https://github.com/klikli-dev/theurgy/commit/524647b4553a4cdb47290b7bac874607f5d144fa) - clean up crafting behaviour *(commit by [@klikli-dev](https://github.com/klikli-dev))*
+- [`5c5bdd8`](https://github.com/klikli-dev/theurgy/commit/5c5bdd89094cfd716c8ca92460199777ffdcf556) - remove todo *(commit by [@klikli-dev](https://github.com/klikli-dev))*
+- [`0b8a717`](https://github.com/klikli-dev/theurgy/commit/0b8a71782b8de02997f8e112557ac438fa6b74f2) - simplify canProcess and extract isIngredient *(commit by [@klikli-dev](https://github.com/klikli-dev))*
+- [`c2af7ad`](https://github.com/klikli-dev/theurgy/commit/c2af7adb73ce5367b2658d6fddf4ec725ae23e63) - rename variables to fit new vanilla conventions *(commit by [@klikli-dev](https://github.com/klikli-dev))*
+
+
 ## [release/v1.21.1-1.51.3] - 2024-08-20
 ### :bug: Bug Fixes
 - [`82969ca`](https://github.com/klikli-dev/theurgy/commit/82969ca147ba96dcd479466ac3d17f0d9aa2d6b1) - earthen materials incubation recipes use mineral instead of strata salt *(commit by [@klikli-dev](https://github.com/klikli-dev))*
@@ -1099,3 +1128,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 [release/v1.21.1-1.51.1]: https://github.com/klikli-dev/theurgy/compare/release/v1.21.1-1.51.0...release/v1.21.1-1.51.1
 [release/v1.21.1-1.51.2]: https://github.com/klikli-dev/theurgy/compare/release/v1.21.1-1.51.1...release/v1.21.1-1.51.2
 [release/v1.21.1-1.51.3]: https://github.com/klikli-dev/theurgy/compare/release/v1.21.1-1.51.2...release/v1.21.1-1.51.3
+[release/v1.21.1-1.52.0]: https://github.com/klikli-dev/theurgy/compare/release/v1.21.1-1.51.3...release/v1.21.1-1.52.0
+[release/v1.21.1-1.52.1]: https://github.com/klikli-dev/theurgy/compare/release/v1.21.1-1.52.0...release/v1.21.1-1.52.1
+[release/v1.21.1-1.53.0]: https://github.com/klikli-dev/theurgy/compare/release/v1.21.1-1.52.1...release/v1.21.1-1.53.0
+[release/v1.21.1-1.53.1]: https://github.com/klikli-dev/theurgy/compare/release/v1.21.1-1.53.0...release/v1.21.1-1.53.1

build.gradle

@@ -173,9 +173,19 @@ dependencies {
 }
 
 processResources {
+    def props = new HashMap<>(project.properties)
+    def keys = new ArrayList<String>(props.keySet()) //to avoid concurrent modification exception
+
+    for (String key : keys) {
+        if (!(props.get(key) instanceof String) && !(props.get(key) instanceof Integer)) {
+            props.remove(key)
+        }
+    }
+
     filesMatching(['META-INF/neoforge.mods.toml']) {
-        expand project.properties
+        expand props
     }
+    getInputs().properties(props)
 }
 
 // Example for how to get properties into the manifest for reading at runtime.

src/generated/resources/.cache/3fa62e6e7a071b2d9f296990c67d7a2df0006913

@@ -1,14 +1,14 @@
-// 1.21.1	2024-08-16T15:38:30.3386581	Books: theurgy
+// 1.21.1	2024-08-29T18:41:12.7572969	Books: theurgy
 c473bf5aa94f847c736c37f1a9f85c86b8bce95d data/theurgy/modonomicon/books/the_hermetica/book.json
 74a2622bcd8dc6316c5977cbea5a026d81dcff87 data/theurgy/modonomicon/books/the_hermetica/categories/apparatus.json
 6f877a9734359091748cca949c8e6c569ad2d67e data/theurgy/modonomicon/books/the_hermetica/categories/getting_started.json
 c901ff2af9083916a51d916567c4d9475469ce80 data/theurgy/modonomicon/books/the_hermetica/categories/logistics.json
 b566a66d301147d1840b1ffd152d40d67b1213d4 data/theurgy/modonomicon/books/the_hermetica/entries/apparatus/basic_vat_automation.json
 1a046a57dc23b1db493fb013bb8969bdcad25cf7 data/theurgy/modonomicon/books/the_hermetica/entries/apparatus/calcination_oven.json
 6a4cf4119c1339960918069c955dd1db251d7a59 data/theurgy/modonomicon/books/the_hermetica/entries/apparatus/caloric_flux_emitter.json
-37e64e777d28f29d7f93a367ec34bbc26d1e1382 data/theurgy/modonomicon/books/the_hermetica/entries/apparatus/digestion_vat.json
+6e24d9f5f1baa3a9baf4c11e09cc1eab19abb62f data/theurgy/modonomicon/books/the_hermetica/entries/apparatus/digestion_vat.json
 48a7044e487fb09077768c0db0d3ed43521fa644 data/theurgy/modonomicon/books/the_hermetica/entries/apparatus/distiller.json
-19914c0b4232ec532259e83f59f8f6d99b30fdc4 data/theurgy/modonomicon/books/the_hermetica/entries/apparatus/fermentation_vat.json
+e6bed2f0f9fe593643d576d290659a22eb6144e2 data/theurgy/modonomicon/books/the_hermetica/entries/apparatus/fermentation_vat.json
 6029216b2e7451d17f6b01aff7bceb4c0c2fb169 data/theurgy/modonomicon/books/the_hermetica/entries/apparatus/how_to.json
 bc3437956682996470624842db82e9e476de4a3e data/theurgy/modonomicon/books/the_hermetica/entries/apparatus/incubator.json
 87b2f0e43694c7737da5aca929a619af194bd357 data/theurgy/modonomicon/books/the_hermetica/entries/apparatus/intro.json

src/generated/resources/.cache/469c78d8f4486110280e6206cdb5f7533d7b17cf

@@ -1,4 +1,4 @@
-// 1.21.1	2024-08-18T10:41:15.7432107	Tags for minecraft:item mod id theurgy
+// 1.21.1	2024-08-20T20:07:01.1176887	Tags for minecraft:item mod id theurgy
 f41150cbf3906d7eb1284a3f289d93bb80e57b9f data/c/tags/item/gems.json
 9d7e0673ca0bd8f1eb04c0813860ac8b7ec5d981 data/c/tags/item/gems/chimerite.json
 f17805722ccaefbf3d1c1b6e6b4f54f30f9af17c data/c/tags/item/gems/dark.json
@@ -42,7 +42,7 @@ b6ad7e4e0e0d2cfdac2db3fba60954abc6ac27f6 data/theurgy/tags/item/alchemical_sulfu
 a87612fd16487cc1b2d87d90f89029e1192c6ec7 data/theurgy/tags/item/alchemical_sulfurs/mobs.json
 8b9950ed06e09f1dff7ce81e6ca2f682ad2257bb data/theurgy/tags/item/alchemical_sulfurs/mobs/abundant.json
 dfc1f995b552c4f98052bdcbf27f2bf33840c498 data/theurgy/tags/item/alchemical_sulfurs/mobs/common.json
-35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/theurgy/tags/item/alchemical_sulfurs/mobs/common/automatic_recipes.json
+70e3d493dcb8ccec20b01981b7454049ab1819b7 data/theurgy/tags/item/alchemical_sulfurs/mobs/common/automatic_recipes.json
 6e7c018111e43af99571ad8e2b45c19535dac716 data/theurgy/tags/item/alchemical_sulfurs/mobs/precious.json
 35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/theurgy/tags/item/alchemical_sulfurs/mobs/precious/automatic_recipes.json
 dade3979da1fdb923d078790f39d021deef64c24 data/theurgy/tags/item/alchemical_sulfurs/mobs/rare.json

src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8

@@ -1,2 +1,2 @@
-// 1.21.1	2024-08-20T17:19:37.857308	Languages: en_us
-b1ef74f7ba020c35f04430821d043095a9a08e80 assets/theurgy/lang/en_us.json
+// 1.21.1	2024-08-29T18:41:12.7618143	Languages: en_us
+3c485f76e1110d2b4929ef4619cd1099eb355163 assets/theurgy/lang/en_us.json

src/generated/resources/assets/theurgy/lang/en_us.json

@@ -115,8 +115,6 @@
   "book.theurgy.the_hermetica.apparatus.digestion_vat.name": "Digestion Vat",
   "book.theurgy.the_hermetica.apparatus.digestion_vat.process.text": "Unlike other apparatus the digestion vat only works when closed.\\\nShift-right-click with an empty hand to open or close the vat.\\\nWhen closed, no items or fluids can be put in or taken out.\n",
   "book.theurgy.the_hermetica.apparatus.digestion_vat.process.title": "Process",
-  "book.theurgy.the_hermetica.apparatus.digestion_vat.redstone.text": "The vat can be closed by applying a redstone signal (if a valid recipe is present).\\\nIf a redstone signal is applied and ingredients for a valid recipe are inserted, the vat will automatically close.\n\\\n\\\nIf the redstone signal is turned off the vat will open again.\n",
-  "book.theurgy.the_hermetica.apparatus.digestion_vat.redstone.title": "Redstone",
   "book.theurgy.the_hermetica.apparatus.digestion_vat.usage.text": "Place the vat on the ground.\\\nThen right-click it with the ingredients (usually an Alchemical Niter and [](item://theurgy:purified_gold))\\\nRight-click the block with a Sal Ammoniac bucket (or supply via pipes)\\\nShift-right-click the vat with an empty hand to close it.\n",
   "book.theurgy.the_hermetica.apparatus.digestion_vat.usage.title": "Usage",
   "book.theurgy.the_hermetica.apparatus.digestion_vat.usage2.text": "Both items and fluids can also be piped in and out of the vat, or hoppers can be used.\n",
@@ -133,10 +131,6 @@
   "book.theurgy.the_hermetica.apparatus.fermentation_vat.name": "Fermentation Vat",
   "book.theurgy.the_hermetica.apparatus.fermentation_vat.process.text": "Unlike other apparatus the fermentation vat only works when closed.\\\nShift-right-click with an empty hand to open or close the vat.\\\nWhen closed, no items or fluids can be put in or taken out.\n",
   "book.theurgy.the_hermetica.apparatus.fermentation_vat.process.title": "Process",
-  "book.theurgy.the_hermetica.apparatus.fermentation_vat.redstone_control.text": "The vat can be closed by applying a redstone signal (if a valid recipe is present).\\\nIf a redstone signal is applied and ingredients for a valid recipe are inserted, the vat will automatically close.\\\nPlease note that the\n\\\n\\\nIf the redstone signal is turned off the vat will open again.\n",
-  "book.theurgy.the_hermetica.apparatus.fermentation_vat.redstone_control.title": "Redstone Control",
-  "book.theurgy.the_hermetica.apparatus.fermentation_vat.redstone_output.text": "The vat can be closed by applying a redstone signal (if a valid recipe is present).\\\nIf a redstone signal is applied and ingredients for a valid recipe are inserted, the vat will automatically close.\n\\\n\\\nIf the redstone signal is turned off the vat will open again.\n",
-  "book.theurgy.the_hermetica.apparatus.fermentation_vat.redstone_output.title": "Redstone Output",
   "book.theurgy.the_hermetica.apparatus.fermentation_vat.usage.text": "Place the vat on the ground.\\\nThen right-click it with the ingredients (usually an Alchemical Sulfur and a source of sugar, such as a crop)\\\nRight-click the block with a water bucket (or supply via pipes)\\\nShift-right-click the vat with an empty hand to close it.\n",
   "book.theurgy.the_hermetica.apparatus.fermentation_vat.usage.title": "Usage",
   "book.theurgy.the_hermetica.apparatus.fermentation_vat.usage2.text": "Both items and fluids can also be piped in and out of the vat, or hoppers can be used.\n",

src/generated/resources/data/theurgy/modonomicon/books/the_hermetica/entries/apparatus/digestion_vat.json

@@ -64,17 +64,6 @@
       "text": "book.theurgy.the_hermetica.apparatus.digestion_vat.usage2.text",
       "title": "book.theurgy.the_hermetica.apparatus.digestion_vat.usage2.title",
       "use_markdown_in_title": false
-    },
-    {
-      "type": "modonomicon:text",
-      "anchor": "",
-      "condition": {
-        "type": "modonomicon:none"
-      },
-      "show_title_separator": true,
-      "text": "book.theurgy.the_hermetica.apparatus.digestion_vat.redstone.text",
-      "title": "book.theurgy.the_hermetica.apparatus.digestion_vat.redstone.title",
-      "use_markdown_in_title": false
     }
   ],
   "parents": [

src/generated/resources/data/theurgy/modonomicon/books/the_hermetica/entries/apparatus/fermentation_vat.json

@@ -75,28 +75,6 @@
       "text": "book.theurgy.the_hermetica.apparatus.fermentation_vat.usage2.text",
       "title": "book.theurgy.the_hermetica.apparatus.fermentation_vat.usage2.title",
       "use_markdown_in_title": false
-    },
-    {
-      "type": "modonomicon:text",
-      "anchor": "",
-      "condition": {
-        "type": "modonomicon:none"
-      },
-      "show_title_separator": true,
-      "text": "book.theurgy.the_hermetica.apparatus.fermentation_vat.redstone_control.text",
-      "title": "book.theurgy.the_hermetica.apparatus.fermentation_vat.redstone_control.title",
-      "use_markdown_in_title": false
-    },
-    {
-      "type": "modonomicon:text",
-      "anchor": "",
-      "condition": {
-        "type": "modonomicon:none"
-      },
-      "show_title_separator": true,
-      "text": "book.theurgy.the_hermetica.apparatus.fermentation_vat.redstone_output.text",
-      "title": "book.theurgy.the_hermetica.apparatus.fermentation_vat.redstone_output.title",
-      "use_markdown_in_title": false
     }
   ],
   "parents": [

src/generated/resources/data/theurgy/tags/item/alchemical_sulfurs/mobs/common/automatic_recipes.json

@@ -1,3 +1,11 @@
 {
-  "values": []
+  "values": [
+    "theurgy:alchemical_sulfur_arrow",
+    "theurgy:alchemical_sulfur_slime_ball",
+    "theurgy:alchemical_sulfur_ender_pearl",
+    "theurgy:alchemical_sulfur_blaze_rod",
+    "theurgy:alchemical_sulfur_prismarine_shard",
+    "theurgy:alchemical_sulfur_phantom_membrane",
+    "theurgy:alchemical_sulfur_magma_cream"
+  ]
 }

src/main/java/com/klikli_dev/theurgy/content/apparatus/digestionvat/DigestionCachedCheck.java

@@ -14,6 +14,7 @@
 import net.minecraft.world.item.crafting.RecipeType;
 import net.minecraft.world.level.Level;
 import net.neoforged.neoforge.fluids.FluidStack;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.Collection;
@@ -27,7 +28,11 @@ public class DigestionCachedCheck implements RecipeManager.CachedCheck<ItemHandl
     private final RecipeType<DigestionRecipe> type;
     private final RecipeManager.CachedCheck<ItemHandlerWithFluidRecipeInput, DigestionRecipe> internal;
     @Nullable
-    private ResourceLocation lastRecipe;
+    private ResourceLocation lastRecipeForFluidStack;
+    @Nullable
+    private ResourceLocation lastRecipeForItemStack;
+    @Nullable
+    private ResourceLocation lastRecipeForItemStackCollection;
 
     public DigestionCachedCheck(RecipeType<DigestionRecipe> type) {
         this.type = type;
@@ -90,10 +95,10 @@ private Optional<RecipeHolder<DigestionRecipe>> getRecipeFor(FluidStack stack, L
      * This only checks ingredients, including ingredients already present, not fluids
      */
     public Optional<RecipeHolder<DigestionRecipe>> getRecipeFor(Collection<ItemStack> input, Level level) {
-        var optional = this.getRecipeFor(input, level, this.lastRecipe);
+        var optional = this.getRecipeFor(input, level, this.lastRecipeForItemStackCollection);
         if (optional.isPresent()) {
             var recipeHolder = optional.get();
-            this.lastRecipe = recipeHolder.id();
+            this.lastRecipeForItemStackCollection = recipeHolder.id();
             return optional;
         } else {
             return Optional.empty();
@@ -104,10 +109,10 @@ public Optional<RecipeHolder<DigestionRecipe>> getRecipeFor(Collection<ItemStack
      * This only checks ingredients, not fluids
      */
     public Optional<RecipeHolder<DigestionRecipe>> getRecipeFor(ItemStack stack, Level level) {
-        var optional = this.getRecipeFor(stack, level, this.lastRecipe);
+        var optional = this.getRecipeFor(stack, level, this.lastRecipeForItemStack);
         if (optional.isPresent()) {
             var recipeHolder = optional.get();
-            this.lastRecipe = recipeHolder.id();
+            this.lastRecipeForItemStack = recipeHolder.id();
             return optional;
         } else {
             return Optional.empty();
@@ -118,10 +123,10 @@ public Optional<RecipeHolder<DigestionRecipe>> getRecipeFor(ItemStack stack, Lev
      * This only checks fluids, not ingredients
      */
     public Optional<RecipeHolder<DigestionRecipe>> getRecipeFor(FluidStack stack, Level level) {
-        var optional = this.getRecipeFor(stack, level, this.lastRecipe);
+        var optional = this.getRecipeFor(stack, level, this.lastRecipeForFluidStack);
         if (optional.isPresent()) {
             var recipeHolder = optional.get();
-            this.lastRecipe = recipeHolder.id();
+            this.lastRecipeForFluidStack = recipeHolder.id();
             return optional;
         } else {
             return Optional.empty();
@@ -132,12 +137,7 @@ public Optional<RecipeHolder<DigestionRecipe>> getRecipeFor(FluidStack stack, Le
      * This checks full recipe validity: ingredients + fluids
      */
     @Override
-    public Optional<RecipeHolder<DigestionRecipe>> getRecipeFor(ItemHandlerWithFluidRecipeInput container, Level level) {
-        var recipe = this.internal.getRecipeFor(container, level);
-        if (recipe.isPresent()) {
-            this.lastRecipe = recipe.get().id();
-        }
-
-        return recipe;
+    public @NotNull Optional<RecipeHolder<DigestionRecipe>> getRecipeFor(@NotNull ItemHandlerWithFluidRecipeInput container, @NotNull Level level) {
+        return this.internal.getRecipeFor(container, level);
     }
 }