feat: 1.20.4

4.1.2 because I removed some debug logging

.github/workflows/build.yml

@@ -20,9 +20,8 @@ jobs:
           path: |
             ~/.gradle/caches
             ~/.gradle/loom-cache
-            ~/.gradle/machete-build
             ~/.gradle/wrapper
-          key: gradle-${{ hashFiles('**/gradle-wrapper.properties') }}
+          key: gradle-${{ hashFiles('**/gradle-wrapper.properties') }}-${{ hashFiles('./gradle.properties') }}
           restore-keys: gradle
 
       - name: Validate Gradle Wrapper

CHANGELOG.md

@@ -1 +1 @@
-Fix an issue with the publishing pipeline. 4.1.0 is broken and will be archived.
+Update to 1.20.4.

common/src/main/java/io/github/jamalam360/rightclickharvest/RightClickHarvest.java

@@ -159,17 +159,11 @@ private static InteractionResult onBlockUse(Player player, Level world, Interact
 
 			Block lookingFor = state.getBlock() instanceof SugarCaneBlock ? Blocks.SUGAR_CANE : Blocks.CACTUS;
 			BlockPos bottom = hitResult.getBlockPos().below();
-			System.out.println("below is " + world.getBlockState(bottom).getBlock());
-			System.out.println("looking for " + lookingFor);
 			while (world.getBlockState(bottom).is(lookingFor)) {
 				bottom = bottom.below();
 				System.out.println("below is " + world.getBlockState(bottom).getBlock());
 			}
 
-			System.out.println("exited loop");
-			System.out.println("bottom is " + bottom);
-			System.out.println("below hitResult is " + hitResult.getBlockPos().below());
-
 			if (bottom.equals(hitResult.getBlockPos().below())) {
 				System.out.println("early return");
 				return InteractionResult.PASS;

fabric/src/main/resources/fabric.mod.json

@@ -24,10 +24,9 @@
     "rightclickharvest.mixins.json"
   ],
   "depends": {
-    "fabricloader": ">=0.14",
     "fabric": "*",
-    "minecraft": ">=1.20",
-    "java": ">=17",
-    "architectury": ">=9.1.12"
+    "minecraft": ">=1.20.4",
+    "architectury": ">=11.0.9",
+    "jamlib": ">=1.0.3+1.20.4"
   }
 }

forge/src/main/resources/META-INF/mods.toml

@@ -17,20 +17,27 @@ Right click crops to harvest them - with style.
 [[dependencies.rightclickharvest]]
 modId = "forge"
 mandatory = true
-versionRange = "[47,)"
+versionRange = "[49,)"
 ordering = "NONE"
 side = "BOTH"
 
 [[dependencies.rightclickharvest]]
 modId = "minecraft"
 mandatory = true
-versionRange = "[1.20,1.21)"
+versionRange = "[1.20.4,)"
 ordering = "NONE"
 side = "BOTH"
 
 [[dependencies.rightclickharvest]]
 modId = "architectury"
 mandatory = true
-versionRange = "[9.1.12,)"
+versionRange = "[11.0.9,)"
+ordering = "AFTER"
+side = "BOTH"
+
+[[dependencies.rightclickharvest]]
+modId = "jamlib"
+mandatory = true
+versionRange = "[1.0.3+1.20.4,)"
 ordering = "AFTER"
 side = "BOTH"

gradle.properties

@@ -1,8 +1,8 @@
 org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
 org.gradle.parallel=true
-version=4.1.1+1.20.2
-minecraft_version=1.20.2
+version=4.1.2+1.20.4
+minecraft_version=1.20.4
 branch=main
 group=io.github.jamalam360
 mod_name=Right Click Harvest

libs.versions.toml

@@ -1,26 +1,26 @@
 [versions]
 # https://modrinth.com/mod/architectury-api/versions
-architectury = "10.0.17"
+architectury = "11.0.9"
 
 # https://files.minecraftforge.net/net/minecraftforge/forge/
-forge = "1.20.2-48.0.33"
+forge = "1.20.4-49.0.12"
 
-# https://neoforged.net/
-neoforge = "20.2.86"
+# https://projects.neoforged.net/neoforged/neoforge
+neoforge = "20.4.69-beta"
 
 # https://fabricmc.net/develop
-fabric-loader = "0.14.24"
-fabric-api = "0.90.4+1.20.2"
+fabric-loader = "0.15.3"
+fabric-api = "0.92.0+1.20.4"
 
 # https://lambdaurora.dev/tools/import_quilt.html
 quilt-loader = "0.21.1"
 quilted-fabric-api = "7.4.0+0.90.0-1.20.1"
 
 # https://maven.jamalam.tech/#/releases
-jamlib = "1.0.3+1.20.2"
+jamlib = "1.0.3+1.20.4"
 
 # https://modrinth.com/mod/modmenu/versions
-modmenu = "8.0.0"
+modmenu = "9.0.0"
 
 [libraries]
 architectury-common = { module = "dev.architectury:architectury", version.ref = "architectury" }

neoforge/src/main/resources/META-INF/mods.toml

@@ -16,22 +16,29 @@ Right click crops to harvest them - with style.
 
 [[dependencies.rightclickharvest]]
 modId = "neoforge"
-mandatory = true
-versionRange = "[20.2,)"
+type = "required"
+versionRange = "[20.4,)"
 ordering = "NONE"
 side = "BOTH"
 
 [[dependencies.rightclickharvest]]
 modId = "minecraft"
-mandatory = true
-versionRange = "[1.20.2,)"
+type = "required"
+versionRange = "[1.20.4,)"
 ordering = "NONE"
 side = "BOTH"
 
 [[dependencies.rightclickharvest]]
 modId = "architectury"
-mandatory = true
-versionRange = "[10.0.17,)"
+type = "required"
+versionRange = "[11.0.9,)"
+ordering = "AFTER"
+side = "BOTH"
+
+[[dependencies.rightclickharvest]]
+modId = "jamlib"
+type = "required"
+versionRange = "[1.0.3+1.20.4,)"
 ordering = "AFTER"
 side = "BOTH"
 

quilt/src/main/resources/quilt.mod.json

@@ -25,21 +25,21 @@
       ]
     },
     "depends": [
-      {
-        "id": "quilt_loader",
-        "version": "*"
-      },
       {
         "id": "quilt_base",
         "version": "*"
       },
       {
         "id": "minecraft",
-        "version": ">=1.20.1"
+        "version": ">=1.20.4"
       },
       {
         "id": "architectury",
-        "version": ">=9.1.12"
+        "version": ">=11.0.9"
+      },
+      {
+        "id": "jamlib",
+        "version": ">=1.0.3+1.20.4"
       }
     ]
   },