Repo-Mirror/Custom-Fishing
9
0
Fork 0
mirror of https://github.com/Xiao-MoMi/Custom-Fishing.git synced 2025-12-19 15:09:24 +00:00
Code Issues Releases Activity

Added earnings multiplier

Browse Source
This commit is contained in:
XiaoMoMi
2024-11-28 15:39:21 +08:00
parent 484ca14c4e
commit 9bdfbf7cf1
6 changed files with 24 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@@ -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) {

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

@@ -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 -> {
return item.getAmount() == 0 || item.getType() == Material.AIR;
});
newItems.removeIf(item -> 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 str.replace(",", ".");
return String.format(Locale.US, "%.2f", money);
}
protected List<ItemStack> storageContentsToList(ItemStack[] itemStacks) {

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

@@ -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))

2
core/src/main/resources/config.yml
View File

@@ -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'

4
gradle.properties
View File

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