merge to 1.19.3

JamCoreModding · May 9, 2023 · a01d592 · a01d592
1 parent 64fb2a2
commit a01d592
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,8 +2,8 @@
 
 ### Features
 
-### Fixes
+- (#31) Add a config option to modify the amount of hugner used when harvesting, and make the hunger used more balanced.
 
-Closed Issues: None
+Closed Issues: #31
 
-[Full Changelog](https://github.com/JamCoreModding/RightClickHarvest/compare/...)
+[Full Changelog](https://github.com/JamCoreModding/right-click-harvest/compare/3.1.0+1.19.3...3.1.1+1.19.3)
diff --git a/gradle.properties b/gradle.properties
@@ -1,8 +1,8 @@
 org.gradle.jvmargs=-Xmx4G
 org.gradle.parallel=true
 
-mod_version=3.1.0+1.19.3
-release_name=V3.1.0 [1.19.3]
+mod_version=3.1.1+1.19.3
+release_name=V3.1.1 [1.19.3]
 archive_base_name=right-click-harvest
 supported_versions=1.19.3
 

diff --git a/src/main/java/io/github/jamalam360/rightclickharvest/RightClickHarvestModInit.java b/src/main/java/io/github/jamalam360/rightclickharvest/RightClickHarvestModInit.java
@@ -30,7 +30,6 @@
 import io.github.jamalam360.rightclickharvest.config.Config;
 import net.fabricmc.api.ModInitializer;
 import net.fabricmc.fabric.api.event.player.UseBlockCallback;
-import net.fabricmc.fabric.api.tag.convention.v1.ConventionalItemTags;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.Blocks;
@@ -44,6 +43,7 @@
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.Items;
 import net.minecraft.registry.Registries;
+import net.minecraft.registry.tag.ItemTags;
 import net.minecraft.registry.tag.TagKey;
 import net.minecraft.server.world.ServerWorld;
 import net.minecraft.sound.SoundEvents;
@@ -102,7 +102,7 @@ private static ActionResult onBlockUse(PlayerEntity player, World world, Hand ha
         }
 
         if (state.isIn(HOE_REQUIRED) && Config.requireHoe) {
-            if (!stack.isIn(ConventionalItemTags.HOES)) {
+            if (!stack.isIn(ItemTags.HOES)) {
                 return ActionResult.PASS;
             }
         }
@@ -113,7 +113,7 @@ private static ActionResult onBlockUse(PlayerEntity player, World world, Hand ha
 
         if (state.getBlock() instanceof CocoaBlock || state.getBlock() instanceof CropBlock || state.getBlock() instanceof NetherWartBlock) {
             if (isMature(state)) {
-                if (initialCall && Config.harvestInRadius && !state.isIn(RADIUS_HARVEST_BLACKLIST) && stack.isIn(ConventionalItemTags.HOES)) {
+                if (initialCall && Config.harvestInRadius && !state.isIn(RADIUS_HARVEST_BLACKLIST) && stack.isIn(ItemTags.HOES)) {
                     int radius = 0;
                     boolean circle = false;
 
@@ -156,8 +156,9 @@ private static ActionResult onBlockUse(PlayerEntity player, World world, Hand ha
                         stack.damage(1, player, (entity) -> entity.sendToolBreakStatus(hand));
                     }
 
-                    if (Config.useHunger && player.world.random.nextBoolean()) {
-                        player.addExhaustion(1.5f);
+                    if (Config.useHunger) {
+                        // Regular block breaking causes 0.005f exhaustion
+                        player.addExhaustion(0.005f * Config.hungerLevel.modifier);
                     }
                 } else {
                     player.playSound(

diff --git a/src/main/java/io/github/jamalam360/rightclickharvest/config/Config.java b/src/main/java/io/github/jamalam360/rightclickharvest/config/Config.java
@@ -38,4 +38,19 @@ public class Config extends JamLibConfig {
 
     @Entry
     public static boolean useHunger = true;
+
+    @Entry
+    public static HungerLevel hungerLevel = HungerLevel.NORMAL;
+
+    public enum HungerLevel {
+        LOW(0.5f),
+        NORMAL(1.0f),
+        HIGH(1.5f);
+
+        public final float modifier;
+
+        HungerLevel(float modifier) {
+            this.modifier = modifier;
+        }
+    }
 }