feat: support cactus

.github/workflows/build.yml

@@ -34,7 +34,7 @@ jobs:
           java-version: 17
 
       - name: Build
-        run: ./gradlew clean forge:build fabric:build quilt:build
+        run: ./gradlew clean neoforge:build forge:build fabric:build quilt:build
 
       - name: Capture Fabric Build Artifacts
         uses: actions/upload-artifact@v2
@@ -53,3 +53,9 @@ jobs:
         with:
           name: Forge Artifacts
           path: forge/build/libs/
+
+      - name: Capture NeoForge Build Artifacts
+        uses: actions/upload-artifact@v2
+        with:
+          name: NeoForge Artifacts
+          path: neoforge/build/libs/

CHANGELOG.md

@@ -1 +1 @@
-Update to support NeoForge. 1.20.4 will come soon.
+Mod now works with cacti.

build.gradle

@@ -85,9 +85,14 @@ allprojects {
 
     tasks.publish {
         dependsOn(":githubRelease")
+        dependsOn("common:publishAllPublicationsToMavenRepository")
         dependsOn("fabric:publishUnified")
+        dependsOn("fabric:publishAllPublicationsToMavenRepository")
         dependsOn("quilt:publishUnified")
+        dependsOn("quilt:publishAllPublicationsToMavenRepository")
         dependsOn("forge:publishUnified")
+        dependsOn("forge:publishAllPublicationsToMavenRepository")
         dependsOn("neoforge:publishUnified")
+        dependsOn("neoforge:publishAllPublicationsToMavenRepository")
     }
 }

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

@@ -150,20 +150,28 @@ private static InteractionResult onBlockUse(Player player, Level world, Interact
 				RightClickHarvestPlatform.postAfterHarvestEvent(new HarvestContext(player, originalBlock));
 				return InteractionResult.SUCCESS;
 			}
-		} else if (state.getBlock() instanceof SugarCaneBlock) {
-			if (hitResult.getDirection() == Direction.UP && stack.getItem() == Items.SUGAR_CANE) {
+		} else if (state.getBlock() instanceof SugarCaneBlock || state.getBlock() instanceof CactusBlock) {
+			if (hitResult.getDirection() == Direction.UP && ((stack.getItem() == Items.SUGAR_CANE && state
+					.getBlock() instanceof SugarCaneBlock) || (stack.getItem() == Items.CACTUS && state
+					.getBlock() instanceof CactusBlock))) {
 				return InteractionResult.PASS;
 			}
 
-			int count = 1;
-
+			Block lookingFor = state.getBlock() instanceof SugarCaneBlock ? Blocks.SUGAR_CANE : Blocks.CACTUS;
 			BlockPos bottom = hitResult.getBlockPos().below();
-			while (world.getBlockState(bottom).is(Blocks.SUGAR_CANE)) {
-				count++;
+			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());
 			}
 
-			if (count == 1 && !world.getBlockState(hitResult.getBlockPos().above()).is(Blocks.SUGAR_CANE)) {
+			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;
 			}
 

common/src/main/resources/data/rightclickharvest/tags/blocks/hoe_never_required.json

@@ -2,7 +2,6 @@
   "replace": false,
   "values": [
     "minecraft:cocoa",
-    "minecraft:sugar_cane",
     "minecraft:nether_wart"
   ]
 }

gradle.properties

@@ -1,9 +1,9 @@
 org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
 org.gradle.parallel=true
-version=4.0.2
+version=4.1.0+1.20.2
 minecraft_version=1.20.2
-branch=1.20.2-multiloader
+branch=main
 group=io.github.jamalam360
 mod_name=Right Click Harvest
 mod_id=rightclickharvest