From b834a33da9db39fb90cafb41be76052e626cc5d5 Mon Sep 17 00:00:00 2001
From: okx-code <okx@okx.sh>
Date: Wed, 27 Aug 2025 14:08:15 +0100
Subject: [PATCH] add set yield command + remove fishing

---
 PrivateConfig                                 |  2 +-
 .../gamma-plugins/even-more-fish-2.0.8.jar    |  1 -
 .../realisticbiomes/RealisticBiomes.java      |  2 ++
 .../noise/BiomeConfiguration.java             |  8 +++++
 .../noise/SetYieldCommand.java                | 29 +++++++++++++++++++
 5 files changed, 40 insertions(+), 2 deletions(-)
 delete mode 120000 ansible/src/gamma-plugins/even-more-fish-2.0.8.jar
 create mode 100644 plugins/realisticbiomes2-paper/src/main/java/com/untamedears/realisticbiomes/noise/SetYieldCommand.java

diff --git a/PrivateConfig b/PrivateConfig
index c5de8ff7f..97e981d54 160000
--- a/PrivateConfig
+++ b/PrivateConfig
@@ -1 +1 @@
-Subproject commit c5de8ff7f74a74b1ef78c07b69838fa51f11068e
+Subproject commit 97e981d54d3a8c35dbd2dd5ad22ce6f2c6d3d561
diff --git a/ansible/src/gamma-plugins/even-more-fish-2.0.8.jar b/ansible/src/gamma-plugins/even-more-fish-2.0.8.jar
deleted file mode 120000
index 835ce2bb5..000000000
--- a/ansible/src/gamma-plugins/even-more-fish-2.0.8.jar
+++ /dev/null
@@ -1 +0,0 @@
-../paper-plugins/even-more-fish-2.0.8.jar
\ No newline at end of file
diff --git a/plugins/realisticbiomes2-paper/src/main/java/com/untamedears/realisticbiomes/RealisticBiomes.java b/plugins/realisticbiomes2-paper/src/main/java/com/untamedears/realisticbiomes/RealisticBiomes.java
index bca4ef8d6..fb5a841fc 100644
--- a/plugins/realisticbiomes2-paper/src/main/java/com/untamedears/realisticbiomes/RealisticBiomes.java
+++ b/plugins/realisticbiomes2-paper/src/main/java/com/untamedears/realisticbiomes/RealisticBiomes.java
@@ -14,6 +14,7 @@ import com.untamedears.realisticbiomes.model.RBDAO;
 import com.untamedears.realisticbiomes.breaker.AutoReplantListener;
 import com.untamedears.realisticbiomes.noise.MeasureCommand;
 import com.untamedears.realisticbiomes.noise.MeasureListener;
+import com.untamedears.realisticbiomes.noise.SetYieldCommand;
 import org.bukkit.Bukkit;
 import org.bukkit.plugin.PluginManager;
 import vg.civcraft.mc.civmodcore.ACivMod;
@@ -111,6 +112,7 @@ public class RealisticBiomes extends ACivMod {
         getServer().getPluginManager().registerEvents(new TreeBlockListener(), this);
 
         commandManager.registerCommand(new MeasureCommand(configManager.getBiomeConfiguration(), breakManager));
+        commandManager.registerCommand(new SetYieldCommand(configManager.getBiomeConfiguration()));
 
         plantLogicManager = new PlantLogicManager(plantManager, growthConfigManager);
 
diff --git a/plugins/realisticbiomes2-paper/src/main/java/com/untamedears/realisticbiomes/noise/BiomeConfiguration.java b/plugins/realisticbiomes2-paper/src/main/java/com/untamedears/realisticbiomes/noise/BiomeConfiguration.java
index 85a8a41ad..5671b90d3 100644
--- a/plugins/realisticbiomes2-paper/src/main/java/com/untamedears/realisticbiomes/noise/BiomeConfiguration.java
+++ b/plugins/realisticbiomes2-paper/src/main/java/com/untamedears/realisticbiomes/noise/BiomeConfiguration.java
@@ -16,6 +16,7 @@ public class BiomeConfiguration {
     private final CropNoise noise;
     private final FarmBeaconManager farmBeaconManager;
     private final Map<Biome, Climate> biomeClimates;
+    private double yieldOverride = -1;
 
     private BiomeConfiguration(CropNoise noise, FarmBeaconManager farmBeaconManager, Map<Biome, Climate> biomeClimates) {
         this.noise = noise;
@@ -64,7 +65,14 @@ public class BiomeConfiguration {
         return noise.getHumidityScale();
     }
 
+    public void setYieldOverride(double yieldOverride) {
+        this.yieldOverride = yieldOverride;
+    }
+
     public double getYield(Block block, Climate climate, Material mat, int maxYield) {
+        if (yieldOverride != -1) {
+            return yieldOverride;
+        }
         Climate biomeClimate = biomeClimates.get(block.getBiome());
         if (biomeClimate == null || biomeClimate.saline() != climate.saline() || biomeClimate.hell() != climate.hell()) {
             return 0;
diff --git a/plugins/realisticbiomes2-paper/src/main/java/com/untamedears/realisticbiomes/noise/SetYieldCommand.java b/plugins/realisticbiomes2-paper/src/main/java/com/untamedears/realisticbiomes/noise/SetYieldCommand.java
new file mode 100644
index 000000000..f0f4ecbd4
--- /dev/null
+++ b/plugins/realisticbiomes2-paper/src/main/java/com/untamedears/realisticbiomes/noise/SetYieldCommand.java
@@ -0,0 +1,29 @@
+package com.untamedears.realisticbiomes.noise;
+
+import co.aikar.commands.BaseCommand;
+import co.aikar.commands.annotation.CommandAlias;
+import co.aikar.commands.annotation.CommandPermission;
+import com.untamedears.realisticbiomes.breaker.BreakManager;
+import java.text.DecimalFormat;
+import java.text.NumberFormat;
+import java.util.Map;
+import net.kyori.adventure.text.Component;
+import org.bukkit.Material;
+import org.bukkit.block.Block;
+import org.bukkit.entity.Player;
+
+public class SetYieldCommand extends BaseCommand {
+
+    private final BiomeConfiguration biomes;
+
+    public SetYieldCommand(BiomeConfiguration biomes) {
+        this.biomes = biomes;
+    }
+
+    @CommandAlias("rbsetyield")
+    @CommandPermission("realisticbiomes.rbsetyield")
+    public void measure(Player player, double yield) {
+        biomes.setYieldOverride(yield);
+        player.sendMessage("Set yield to " + yield);
+    }
+}