README.md

@@ -38,21 +38,21 @@
 This mod enables a variety of features to create better compatibility between mostly [Farmer's Delight][FARMERS_DELIGHT_FORGE] and [Create][CREATE_FORGE].
 While it is designed to work with Farmer's Delight, it does work without it and also adds some compatibility features for other mods.
 
-![](https://raw.githubusercontent.com/PssbleTrngle/SliceAndDice/1.19.x/screenshots/slicer.png)
+![](https://raw.githubusercontent.com/PssbleTrngle/SliceAndDice/1.20.x/screenshots/slicer.png)
 
 ### Automatic Cutting
 
 The Main feature of the mod is the _Slicer_, a machine similar to the _Mechanical Mixer_ or _Mechanical Press_ from Create.
 It automatically registers all cutting recipes from Farmer's Delight. In that sense, it is an automatic _Cutting Board_.  
 In order to use it, the correct tool has to be placed into the machine, using `Right-Click`.
 By default, only knives and axes are allowed, but this behaviour can be overwritten by modifying the `sliceanddice:allowed_tools` item tag.
-An example datapack which adds shears to this tag can be found [here](https://github.com/PssbleTrngle/SliceAndDice/raw/1.19.x/example_datapack.zip)
+An example datapack which adds shears to this tag can be found [here](https://github.com/PssbleTrngle/SliceAndDice/raw/1.20.x/example_datapack.zip)
 
 ### Automatic Cooking
 
 All recipes from Farmer's delight requiring the Cooking Pot are added as heated mixing recipes.
 
-![](https://raw.githubusercontent.com/PssbleTrngle/SliceAndDice/1.19.x/screenshots/cooking.png)
+![](https://raw.githubusercontent.com/PssbleTrngle/SliceAndDice/1.20.x/screenshots/cooking.png)
 
 ### Sprinkler
 
@@ -66,13 +66,13 @@ Different fluids can have different effects.
 
 The latter is meant to enable growing of _Banana Fonds_ from [Neapolitan][NEAPOLITAN] without being dependent on the weather, but it could possibly have other effects on other mods too.
 
-![](https://raw.githubusercontent.com/PssbleTrngle/SliceAndDice/1.19.x/screenshots/sprinkler.png)
+![](https://raw.githubusercontent.com/PssbleTrngle/SliceAndDice/1.20.x/screenshots/sprinkler.png)
 
 ### Overweight Farming
 
 If present, some compatibility features for [Overweight Farming][OVERWEIGHT_FARMING] is added.  
 This includes waxing recipes using the deployer,
 as well as showing the axe-stripping of overweight crops in JEI.
 
-![](https://raw.githubusercontent.com/PssbleTrngle/SliceAndDice/1.19.x/screenshots/strip.png)
-![](https://raw.githubusercontent.com/PssbleTrngle/SliceAndDice/1.19.x/screenshots/wax.png)
+![](https://raw.githubusercontent.com/PssbleTrngle/SliceAndDice/1.20.x/screenshots/strip.png)
+![](https://raw.githubusercontent.com/PssbleTrngle/SliceAndDice/1.20.x/screenshots/wax.png)

build.gradle.kts

@@ -13,9 +13,13 @@ val overweight_farming_version: String by extra
 val farmers_delight_version: String by extra
 val blueprint_version: String by extra
 val neapolitan_version: String by extra
+val cofh_core_version: String by extra
+val thermal_foundation_version: String by extra
+val thermal_expansion_version: String by extra
+val thermal_cultivation_version: String by extra
 
 plugins {
-    id("com.possible-triangle.gradle") version ("0.1.0")
+    id("com.possible-triangle.gradle") version ("0.1.1")
 }
 
 withKotlin()
@@ -86,18 +90,18 @@ dependencies {
     modCompileOnly("mezz.jei:jei-${mc_version}-forge-api:${jei_version}")
     modRuntimeOnly("mezz.jei:jei-${mc_version}-forge:${jei_version}")
 
-    modCompileOnly("com.tterrag.registrate:Registrate:${registrate_version}")
+    modImplementation("com.tterrag.registrate:Registrate:${registrate_version}")
     modImplementation("com.simibubi.create:create-${mc_version}:${create_version}:slim") { isTransitive = false }
     modImplementation("com.jozufozu.flywheel:flywheel-forge-${mc_version}:${flywheel_version}")
 
     modImplementation("curse.maven:farmers-delight-398521:${farmers_delight_version}")
-    modImplementation("curse.maven:overweight-farming-591666:${overweight_farming_version}")
+    //modImplementation("curse.maven:overweight-farming-591666:${overweight_farming_version}")
 
     compileOnly("dev.latvian.mods:kubejs-forge:${kubejs_version}")
 
     if (!env.isCI) {
-        modRuntimeOnly("curse.maven:neapolitan-382016:${neapolitan_version}")
-        modRuntimeOnly("com.teamabnormals:blueprint:${mc_version}-${blueprint_version}")
+        //modRuntimeOnly("curse.maven:neapolitan-382016:${neapolitan_version}")
+        //modRuntimeOnly("com.teamabnormals:blueprint:${mc_version}-${blueprint_version}")
 
         //modRuntimeOnly("curse.maven:cofh-core-69162:${cofh_core_version}")
         //modRuntimeOnly("curse.maven:thermal-foundation-222880:${thermal_foundation_version}")
@@ -112,9 +116,7 @@ tasks.withType<Jar> {
 }
 
 enablePublishing {
-    repositories {
-        githubPackages(project)
-    }
+    githubPackages()
 }
 
 uploadToCurseforge {

gradle.properties

@@ -2,8 +2,8 @@ kotlin.code.style=official
 org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
 
-mc_version=1.19.2
-forge_version=43.2.3
+mc_version=1.20.1
+forge_version=47.1.0
 
 mod_id=sliceanddice
 mod_version=0.0.0-dev
@@ -12,18 +12,18 @@ mod_name=Create Slice & Dice
 mod_author=possible_triangle
 maven_group=com.possible-triangle
 
-kotlin_forge_version=3.12.0
-flywheel_version=0.6.9-18
-create_version=0.5.1.c-36
-registrate_version=MC1.19-1.1.5
+kotlin_forge_version=4.3.0
+flywheel_version=0.6.10-7
+create_version=0.5.1.f-26
+registrate_version=MC1.20-1.3.3
 
-jei_version=11.6.0.1015
+jei_version=15.2.0.22
 kubejs_version=1902.6.1-build.164
 
-farmers_delight_version=4525646
-blueprint_version=6.1.0
-neapolitan_version=4023083
-overweight_farming_version=4395450
+farmers_delight_version=4638874
+#blueprint_version=6.1.0
+#neapolitan_version=4023083
+#overweight_farming_version=4395450
 
 #cofh_core_version=3838025
 #thermal_foundation_version=3837827

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionPath=wrapper/dists
 distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
+zipStorePath=wrapper/dists

gradlew

@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,13 +80,10 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -143,12 +140,16 @@ fi
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -193,6 +194,10 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
 # Collect all arguments for the java command;
 #   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
 #     shell script including quotes and variable substitutions, so put them in
@@ -205,6 +210,12 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.

gradlew.bat

@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,8 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

src/generated/resources/.cache/48519f450a6a1cc5cf547049fe05b34e1198891c

@@ -0,0 +1,21 @@
+// 1.20.1	2023-07-19T14:35:25.765825	Registrate Provider for sliceanddice [Recipes, Advancements, Loot Tables, Tags (blocks), Tags (items), Tags (fluids), Tags (entity_types), Blockstates, Item models, Lang (en_us/en_ud)]
+d1407b71743b468d52f9a3e86dafef3f125643e9 assets/sliceanddice/blockstates/fertilizer.json
+1f09e5b178829c25dc4c53b628548d7b1ae6c227 assets/sliceanddice/blockstates/slicer.json
+b8e84c3e21b8c4dcf4d4470bc200f7b110a7a12e assets/sliceanddice/blockstates/sprinkler.json
+4dc15b4c804226ee848d857f6324e0aed0287af7 assets/sliceanddice/blockstates/wet_air.json
+e7ac474a71367f0e7c599921a75b7f83cec45641 assets/sliceanddice/lang/en_ud.json
+c1f8c730f139de211b7b8a307f5f209a7bb04564 assets/sliceanddice/lang/en_us.json
+247170e192601e13a0152f3935ab162d0cdef553 assets/sliceanddice/models/block/fertilizer.json
+9d21a16228df5099ab7e27176a40dbbaa792b3a9 assets/sliceanddice/models/block/wet_air.json
+7049249fb67bf9327f512312c8c233ec2f0024eb assets/sliceanddice/models/item/slicer.json
+0d9ab99df4f9cf9706b2ee9b3692eab4e880d3b8 assets/sliceanddice/models/item/sprinkler.json
+e5cf9fc7d0cca02006796590494b34ddf3180940 data/minecraft/tags/blocks/mineable/axe.json
+55520c4a5db0c698f63096b362d5257d96d4ce08 data/minecraft/tags/blocks/mineable/pickaxe.json
+0887efbe205b84c8f7d8bb7a16d8b9f9135c83a0 data/sliceanddice/advancements/recipes/misc/slicer.json
+b38bcbb8de3cce3b08e6054fe43b037a81f6495c data/sliceanddice/advancements/recipes/misc/sprinkler.json
+20b22b10f59e9e4371e6ab0135836f8004d1aea0 data/sliceanddice/loot_tables/blocks/slicer.json
+3159b0d6e5ed2e124a57e02cbe915e60c10d15c0 data/sliceanddice/loot_tables/blocks/sprinkler.json
+94f0dafefbbd20e0eda12059818395a6b451cb8a data/sliceanddice/loot_tables/blocks/wet_air.json
+7e430580230199bd0932c754ac141edadbf5b11c data/sliceanddice/recipes/slicer.json
+b6987037a5efdcec88908793e30b56d034194313 data/sliceanddice/recipes/sprinkler.json
+2a6189a1368c2d6eb8f4b1d391a1ecce7ae9cfba data/sliceanddice/tags/fluids/fertilizer.json

src/generated/resources/assets/sliceanddice/lang/en_ud.json

@@ -0,0 +1,8 @@
+{
+  "block.sliceanddice.fertilizer": "ɹǝzıןıʇɹǝℲ",
+  "block.sliceanddice.slicer": "ɹǝɔıןS",
+  "block.sliceanddice.sprinkler": "ɹǝןʞuıɹdS",
+  "block.sliceanddice.wet_air": "ɹıⱯ ʇǝM",
+  "fluid.sliceanddice.fertilizer": "ɹǝzıןıʇɹǝℲ",
+  "item.sliceanddice.fertilizer_bucket": "ʇǝʞɔnᗺ ɹǝzıןıʇɹǝℲ"
+}

src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json

@@ -1,5 +1,4 @@
 {
-  "replace": false,
   "values": [
     "sliceanddice:slicer"
   ]

src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json

@@ -1,5 +1,4 @@
 {
-  "replace": false,
   "values": [
     "sliceanddice:slicer",
     "sliceanddice:sprinkler"

src/generated/resources/data/sliceanddice/advancements/recipes/tools/slicer.json → src/generated/resources/data/sliceanddice/advancements/recipes/misc/slicer.json

@@ -1,23 +1,7 @@
 {
   "parent": "minecraft:recipes/root",
-  "rewards": {
-    "recipes": [
-      "sliceanddice:slicer"
-    ]
-  },
   "criteria": {
-    "has_tool": {
-      "trigger": "minecraft:inventory_changed",
-      "conditions": {
-        "items": [
-          {
-            "tag": "sliceanddice:allowed_tools"
-          }
-        ]
-      }
-    },
     "has_mixer": {
-      "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
           {
@@ -26,13 +10,24 @@
             ]
           }
         ]
-      }
+      },
+      "trigger": "minecraft:inventory_changed"
     },
     "has_the_recipe": {
-      "trigger": "minecraft:recipe_unlocked",
       "conditions": {
         "recipe": "sliceanddice:slicer"
-      }
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    },
+    "has_tool": {
+      "conditions": {
+        "items": [
+          {
+            "tag": "sliceanddice:allowed_tools"
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
     }
   },
   "requirements": [
@@ -41,5 +36,11 @@
       "has_mixer",
       "has_the_recipe"
     ]
-  ]
+  ],
+  "rewards": {
+    "recipes": [
+      "sliceanddice:slicer"
+    ]
+  },
+  "sends_telemetry_event": false
 }