From 4a890a28a16a72cb7cc3e2c1f0a5f6187c5d1c7f Mon Sep 17 00:00:00 2001
From: Dominykas <37642364+dnocturne@users.noreply.github.com>
Date: Sat, 17 Jan 2026 22:51:39 +0200
Subject: [PATCH] Add support for sweet berry bush harvesting and replanting
 (#5238)

* Add support for sweet berry bush harvesting and replanting

* Accidentally left my test code for torchflower replanting.
---
 .../skills/herbalism/HerbalismManager.java       | 16 ++++++++++++++++
 src/main/resources/config.yml                    |  1 +
 2 files changed, 17 insertions(+)

diff --git a/src/main/java/com/gmail/nossr50/skills/herbalism/HerbalismManager.java b/src/main/java/com/gmail/nossr50/skills/herbalism/HerbalismManager.java
index f415fafcd..40082391a 100644
--- a/src/main/java/com/gmail/nossr50/skills/herbalism/HerbalismManager.java
+++ b/src/main/java/com/gmail/nossr50/skills/herbalism/HerbalismManager.java
@@ -535,6 +535,10 @@ public class HerbalismManager extends SkillManager {
     }
 
     public boolean isAgeableMature(Ageable ageable) {
+        // Sweet berry bush is harvestable at age 2 and 3 (max is 3)
+        if (ageable.getMaterial() == Material.SWEET_BERRY_BUSH) {
+            return ageable.getAge() >= 2;
+        }
         return ageable.getAge() == ageable.getMaximumAge()
                 && ageable.getAge() != 0;
     }
@@ -868,6 +872,7 @@ public class HerbalismManager extends SkillManager {
             case "beetroots" -> replantMaterial = Material.matchMaterial("BEETROOT_SEEDS");
             case "cocoa" -> replantMaterial = Material.matchMaterial("COCOA_BEANS");
             case "torchflower" -> replantMaterial = Material.matchMaterial("TORCHFLOWER_SEEDS");
+            case "sweet_berry_bush" -> replantMaterial = Material.matchMaterial("SWEET_BERRIES");
             default -> {
                 return false;
             }
@@ -956,6 +961,17 @@ public class HerbalismManager extends SkillManager {
                 }
                 break;
 
+            case "sweet_berry_bush":
+
+                // Sweet berry bush has ages 0-3, where 2+ has berries
+                // Cap at age 1 to prevent instant re-harvest exploit with enough herbalism levels
+                if (greenTerra || greenThumbStage >= 2) {
+                    finalAge = 1;
+                } else {
+                    finalAge = 0;
+                }
+                break;
+
             default:
                 return false;
         }
diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
index c3706f43a..ff53f5109 100644
--- a/src/main/resources/config.yml
+++ b/src/main/resources/config.yml
@@ -484,6 +484,7 @@ Green_Thumb_Replanting_Crops:
     Potatoes: true
     Beetroots: true
     Cocoa: true
+    Sweet_Berry_Bush: true
 #
 #  Settings for Double Drops
 ###