Added earnings multiplier

api/src/main/java/net/momirealms/customfishing/api/mechanic/market/MarketManager.java

@@ -58,4 +58,6 @@ public interface MarketManager extends Reloadable {
      * @return the earning limit as a double
      */
     double earningLimit(Context<Player> context);
+
+    double earningsMultiplier(Context<Player> context);
 }

core/src/main/java/net/momirealms/customfishing/bukkit/config/BukkitConfigManager.java

@@ -638,7 +638,7 @@ public class BukkitConfigManager extends ConfigManager {
                     }
                 }));
             }
-            case "group-mod" -> {
+            case "group-mod", "group_mod" -> {
                 var op = parseGroupWeightOperation(section.getStringList("value"));
                 return (((effect, context, phase) -> {
                     if (phase == 1) {
@@ -647,7 +647,7 @@ public class BukkitConfigManager extends ConfigManager {
                     }
                 }));
             }
-            case "group-mod-ignore-conditions" -> {
+            case "group-mod-ignore-conditions", "group_mod_ignore_conditions" -> {
                 var op = parseGroupWeightOperation(section.getStringList("value"));
                 return (((effect, context, phase) -> {
                     if (phase == 1) {
@@ -656,7 +656,7 @@ public class BukkitConfigManager extends ConfigManager {
                     }
                 }));
             }
-            case "wait-time" -> {
+            case "wait-time", "wait_time" -> {
                 MathValue<Player> value = MathValue.auto(section.get("value"));
                 return (((effect, context, phase) -> {
                     if (phase == 2) {
@@ -665,7 +665,7 @@ public class BukkitConfigManager extends ConfigManager {
                     }
                 }));
             }
-            case "hook-time", "wait-time-multiplier" -> {
+            case "hook-time", "hook_time", "wait-time-multiplier", "wait_time_multiplier" -> {
                 MathValue<Player> value = MathValue.auto(section.get("value"));
                 return (((effect, context, phase) -> {
                     if (phase == 2) {
@@ -683,7 +683,7 @@ public class BukkitConfigManager extends ConfigManager {
                     }
                 }));
             }
-            case "difficulty-multiplier", "difficulty-bonus" -> {
+            case "difficulty-multiplier", "difficulty_multiplier", "difficulty-bonus" -> {
                 MathValue<Player> value = MathValue.auto(section.get("value"));
                 return (((effect, context, phase) -> {
                     if (phase == 2) {

core/src/main/java/net/momirealms/customfishing/bukkit/market/BukkitMarketManager.java

@@ -62,6 +62,7 @@ public class BukkitMarketManager implements MarketManager, Listener {
     private final HashMap<String, MathValue<Player>> priceMap;
     private String formula;
     private MathValue<Player> earningsLimit;
+    private MathValue<Player> earningsMultiplier;
     private boolean allowItemWithNoPrice;
     protected boolean sellFishingBag;
 
@@ -173,6 +174,7 @@ public class BukkitMarketManager implements MarketManager, Listener {
         }
 
         this.earningsLimit = config.getBoolean("limitation.enable", true) ? MathValue.auto(config.getString("limitation.earnings", "10000")) : MathValue.plain(-1);
+        this.earningsMultiplier = MathValue.auto(config.get("earnings-multiplier", 1d));
 
         // Load item prices from the configuration
         Section priceSection = config.getSection("item-price");
@@ -337,7 +339,7 @@ public class BukkitMarketManager implements MarketManager, Listener {
             if (element.getSymbol() == sellSlot) {
 
                 Pair<Integer, Double> pair = getItemsToSell(gui.context, gui.getItemsInGUI());
-                double totalWorth = pair.right();
+                double totalWorth = pair.right() * earningsMultiplier(gui.context);
                 gui.context.arg(ContextKeys.MONEY, money(totalWorth))
                         .arg(ContextKeys.MONEY_FORMATTED, String.format("%.2f", totalWorth))
                         .arg(ContextKeys.REST, money(earningLimit - earningData.earnings))
@@ -367,7 +369,7 @@ public class BukkitMarketManager implements MarketManager, Listener {
                     optionalUserData.ifPresent(userData -> itemStacksToSell.addAll(storageContentsToList(userData.holder().getInventory().getStorageContents())));
                 }
                 Pair<Integer, Double> pair = getItemsToSell(gui.context, itemStacksToSell);
-                double totalWorth = pair.right();
+                double totalWorth = pair.right() * earningsMultiplier(gui.context);
                 gui.context.arg(ContextKeys.MONEY, money(totalWorth))
                         .arg(ContextKeys.MONEY_FORMATTED, String.format("%.2f", totalWorth))
                         .arg(ContextKeys.REST, money(earningLimit - earningData.earnings))
@@ -485,6 +487,11 @@ public class BukkitMarketManager implements MarketManager, Listener {
         return earningsLimit.evaluate(context);
     }
 
+    @Override
+    public double earningsMultiplier(Context<Player> context) {
+        return earningsMultiplier.evaluate(context);
+    }
+
     public Pair<Integer, Double> getItemsToSell(Context<Player> context, List<ItemStack> itemStacks) {
         int amount = 0;
         double worth = 0d;
@@ -506,9 +513,7 @@ public class BukkitMarketManager implements MarketManager, Listener {
                 if (allowBundle && itemStack.getItemMeta() instanceof BundleMeta bundleMeta) {
                     clearWorthyItems(context, bundleMeta.getItems());
                     List<ItemStack> newItems = new ArrayList<>(bundleMeta.getItems());
-                    newItems.removeIf(item -> {
+                    newItems.removeIf(item -> item.getAmount() == 0 || item.getType() == Material.AIR);
-                        return item.getAmount() == 0 || item.getType() == Material.AIR;
-                    });
                     bundleMeta.setItems(newItems);
                     itemStack.setItemMeta(bundleMeta);
                     continue;
@@ -527,8 +532,7 @@ public class BukkitMarketManager implements MarketManager, Listener {
     }
 
     protected String money(double money) {
-        String str = String.format("%.2f", money);
+        return String.format(Locale.US, "%.2f", money);
-        return str.replace(",", ".");
     }
 
     protected List<ItemStack> storageContentsToList(ItemStack[] itemStacks) {

core/src/main/java/net/momirealms/customfishing/bukkit/market/MarketGUI.java

@@ -114,7 +114,7 @@ public class MarketGUI {
         MarketDynamicGUIElement sellElement = (MarketDynamicGUIElement) getElement(manager.sellSlot);
         if (sellElement != null && !sellElement.getSlots().isEmpty()) {
             Pair<Integer, Double> pair = manager.getItemsToSell(context, getItemsInGUI());
-            double totalWorth = pair.right();
+            double totalWorth = pair.right() * manager.earningsMultiplier(context);
             int soldAmount = pair.left();
             context.arg(ContextKeys.MONEY, manager.money(totalWorth))
                     .arg(ContextKeys.MONEY_FORMATTED, String.format("%.2f", totalWorth))
@@ -138,7 +138,7 @@ public class MarketGUI {
                 optionalUserData.ifPresent(userData -> itemStacksToSell.addAll(manager.storageContentsToList(userData.holder().getInventory().getStorageContents())));
             }
             Pair<Integer, Double> pair = manager.getItemsToSell(context, itemStacksToSell);
-            double totalWorth = pair.right();
+            double totalWorth = pair.right() * manager.earningsMultiplier(context);
             int soldAmount = pair.left();
             context.arg(ContextKeys.MONEY, manager.money(totalWorth))
                     .arg(ContextKeys.MONEY_FORMATTED, String.format("%.2f", totalWorth))

core/src/main/resources/config.yml

@@ -202,6 +202,8 @@ mechanics:
     limitation:
       enable: true
       earnings: '10000' # Expressions can be used here
+    # You can use expressions here if you want some players to earn more from selling fish
+    earnings-multiplier: 1
     # Layout for the market menu
     layout:
       - 'AAAAAAAAA'

gradle.properties

@@ -1,7 +1,7 @@
 # Project settings
 # Rule: [major update].[feature update].[bug fix]
-project_version=2.2.33
+project_version=2.2.34
-config_version=36
+config_version=37
 project_group=net.momirealms
 
 # Supported languages