CHANGELOG.md

@@ -1,4 +1,7 @@
 ## Changelog
 
-Update to 1.20.1
+- 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)

build.gradle.kts

@@ -1,6 +1,6 @@
 plugins {
-    id("fabric-loom") version "1.1-SNAPSHOT"
-    id("io.github.juuxel.loom-quiltflower") version "1.+"
+    id("fabric-loom") version "1.3-SNAPSHOT"
+    id("io.github.juuxel.loom-vineflower") version "1.+"
     id("io.github.p03w.machete") version "1.+"
     id("org.cadixdev.licenser") version "0.6.+"
 }
@@ -40,10 +40,12 @@ dependencies {
     minecraft(libs.minecraft)
     mappings(variantOf(libs.quilt.mappings) { classifier("intermediary-v2") })
 
-    modImplementation(libs.bundles.fabric)
-    modApi(libs.bundles.required)
-    modImplementation(libs.bundles.optional)
-    modRuntimeOnly(libs.bundles.runtime)
+    modImplementation(libs.fabric.loader)
+    modImplementation(libs.fabric.api)
+    modApi(libs.jamlib) {
+        exclude(group = "net.fabricmc.fabric-api")
+    }
+    modImplementation(libs.mod.menu)
 }
 
 sourceSets {

gradle.properties

@@ -1,8 +1,8 @@
 org.gradle.jvmargs=-Xmx4G
 org.gradle.parallel=true
 
-mod_version=3.2.2+1.19.x-1.20.1-fabric
-release_name=V3.2.2 [1.19.x-1.20.1 Fabric]
+mod_version=3.2.3+1.19.x-1.20.1-fabric
+release_name=V3.2.3 [1.19.x-1.20.1 Fabric]
 archive_base_name=right-click-harvest
 supported_versions=1.19,1.19.1,1.19.2,1.19.3,1.19.4,1.20,1.20.1
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

settings.gradle.kts

@@ -14,12 +14,10 @@ pluginManagement {
     }
 }
 
-enableFeaturePreview("VERSION_CATALOGS")
-
 dependencyResolutionManagement {
     versionCatalogs {
         create("libs") {
             from(files("versions.toml"))
         }
     }
-}
+}

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;
             }

src/main/resources/assets/rightclickharvest/lang/en_us.json

@@ -5,5 +5,11 @@
   "rightclickharvest.jamlibconfig.harvestInRadius": "Harvest in Radius",
   "rightclickharvest.jamlibconfig.harvestInRadius.tooltip": "Make hoes of different tiers harvest multiple blocks in a radius. Requires `requireHoe` to be set to true.",
   "rightclickharvest.jamlibconfig.useHunger": "Use Hunger",
-  "rightclickharvest.jamlibconfig.useHunger.tooltip": "Use hunger when harvesting crops."
-}
+  "rightclickharvest.jamlibconfig.useHunger.tooltip": "Use hunger when harvesting crops.",
+  "rightclickharvest.jamlibconfig.hungerLevel": "Hunger Level",
+    "rightclickharvest.jamlibconfig.hungerLevel.tooltip": "The food usage when harvesting crops.",
+  "rightclickharvest.jamlibconfig.enum.HungerLevel.NONE": "None",
+  "rightclickharvest.jamlibconfig.enum.HungerLevel.LOW": "Low",
+  "rightclickharvest.jamlibconfig.enum.HungerLevel.NORMAL": "Normal",
+  "rightclickharvest.jamlibconfig.enum.HungerLevel.HIGH": "High"
+}

src/main/resources/assets/rightclickharvest/lang/fr_fr.json

@@ -0,0 +1,9 @@
+{
+  "rightclickharvest.jamlibconfig.title": "Configuration de Right Click Harvest",
+  "rightclickharvest.jamlibconfig.requireHoe": "Exiger une houe",
+  "rightclickharvest.jamlibconfig.requireHoe.tooltip": "Permet uniquement la récolte de certaines cultures (par exemple, le blé, les carottes) si le joueur tient une houe dans sa main.",
+  "rightclickharvest.jamlibconfig.harvestInRadius": "Récolter en rayon",
+  "rightclickharvest.jamlibconfig.harvestInRadius.tooltip": "Permet aux houes de différents niveaux de récolter plusieurs blocs dans un rayon. Nécessite que 'requireHoe' soit défini sur true.",
+  "rightclickharvest.jamlibconfig.useHunger": "Utiliser la faim",
+  "rightclickharvest.jamlibconfig.useHunger.tooltip": "Utilise la faim lors de la récolte des cultures."
+}

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

@@ -0,0 +1,7 @@
+{
+  "replace": false,
+  "values": [
+    "minecraft:cocoa",
+    "minecraft:sugar_cane"
+  ]
+}

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"
   ]
-}
+}

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",

versions.toml

@@ -1,26 +1,15 @@
 [versions]
 minecraft = "1.20.1"
-loader = "0.14.21"
-quilt-mappings = "1.20.1+build.1"
-fabric-api = "0.83.0+1.20"
-mod-menu = "7.0.0-beta.2"
-lazy-dfu = "0.1.3"
+loader = "0.14.22"
+quilt-mappings = "1.20.1+build.23"
+fabric-api = "0.86.1+1.20.1"
+mod-menu = "7.2.1"
 jamlib = "0.6.0+1.20"
 
 [libraries]
 minecraft = { module = "com.mojang:minecraft", version.ref = "minecraft" }
 quilt-mappings = { module = "org.quiltmc:quilt-mappings", version.ref = "quilt-mappings" }
 fabric-loader = { module = "net.fabricmc:fabric-loader", version.ref = "loader" }
 fabric-api = { module = "net.fabricmc.fabric-api:fabric-api", version.ref = "fabric-api" }
-
 jamlib = { module = "io.github.jamalam360:jamlib", version.ref = "jamlib" }
-
 mod-menu = { module = "com.terraformersmc:modmenu", version.ref = "mod-menu" }
-
-lazy-dfu = { module = "maven.modrinth:lazydfu", version.ref = "lazy-dfu" }
-
-[bundles]
-fabric = ["fabric-loader", "fabric-api"]
-required = ["jamlib"]
-optional = ["mod-menu"]
-runtime = ["lazy-dfu"]