deprecate hoe_required in favour of hoe_never_required

JamCoreModding · Aug 9, 2023 · e6f8ecd · e6f8ecd
1 parent bd81657
commit e6f8ecd
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,5 +2,6 @@
 
 - Fix ModMenu icon error.
 - Add French translation.
+- Deprecate the `hoe_required` tag. Use `hoe_never_required` instead. This improves mod compatibility.
 
 [Full Changelog](https://github.com/JamCoreModding/right-click-harvest/compare/3.2.2+1.19.x-1.20.1-fabric...3.2.3+1.19.x-1.20.1-fabric)
diff --git a/src/main/java/io/github/jamalam360/rightclickharvest/RightClickHarvestModInit.java b/src/main/java/io/github/jamalam360/rightclickharvest/RightClickHarvestModInit.java
@@ -63,8 +63,11 @@ public class RightClickHarvestModInit implements ModInitializer {
 
     public static final Direction[] CARDINAL_DIRECTIONS = new Direction[] { Direction.NORTH, Direction.EAST,
             Direction.SOUTH, Direction.WEST };
+    @Deprecated(forRemoval = true)
     public static final TagKey<Block> HOE_REQUIRED = TagKey.of(VersionUtils.BLOCK_KEY,
             new Identifier(MOD_ID, "hoe_required"));
+    public static final TagKey<Block> HOE_NEVER_REQUIRED = TagKey.of(VersionUtils.BLOCK_KEY,
+            new Identifier(MOD_ID, "hoe_never_required"));
     public static final TagKey<Block> RADIUS_HARVEST_BLACKLIST = TagKey.of(VersionUtils.BLOCK_KEY,
             new Identifier(MOD_ID, "radius_harvest_blacklist"));
     public static final TagKey<Item> LOW_TIER_HOES = TagKey.of(VersionUtils.ITEM_KEY,
@@ -102,7 +105,7 @@ private static ActionResult onBlockUse(PlayerEntity player, World world, Hand ha
             }
         }
 
-        if (state.isIn(HOE_REQUIRED) && Config.requireHoe) {
+        if (!state.isIn(HOE_NEVER_REQUIRED) && Config.requireHoe) {
             if (!stack.isIn(VersionUtils.HOES)) {
                 return ActionResult.PASS;
             }

diff --git a/src/main/resources/data/rightclickharvest/tags/blocks/hoe_never_required.json b/src/main/resources/data/rightclickharvest/tags/blocks/hoe_never_required.json
@@ -0,0 +1,7 @@
+{
+  "replace": false,
+  "values": [
+    "minecraft:cocoa",
+    "minecraft:sugar_cane"
+  ]
+}
diff --git a/src/main/resources/data/rightclickharvest/tags/blocks/radius_harvest_blacklist.json b/src/main/resources/data/rightclickharvest/tags/blocks/radius_harvest_blacklist.json
@@ -1,6 +1,7 @@
 {
   "replace": false,
   "values": [
-    "minecraft:cocoa"
+    "minecraft:cocoa",
+    "minecraft:sugar_cane"
   ]
-}
+}
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
@@ -13,7 +13,8 @@
     "FITFC",
     "Fourmisain",
     "Telezhka-the-First",
-    "ShapeLayer"
+    "ShapeLayer",
+    "Calvineries"
   ],
   "contact": {
     "homepage": "https://www.curseforge.com/minecraft/mc-mods/rightclickharvest-fabric",