Merge pull request #36 from LaBoulangerie/fix/lack_of_RandomGenerator

Money, timber et java module

Author: red69leaf

build.gradle.kts

@@ -70,7 +70,6 @@ dependencies {
     compileOnly("redis.clients:jedis:5.1.3") {
         isTransitive = false
     }
-    compileOnly("com.github.MilkBowl:VaultAPI:1.7.1")
     compileOnly("fr.minelet:minelet-api:1.2.0")
     compileOnly("me.clip:placeholderapi:2.11.6")
     compileOnly("com.palmergames.bukkit.towny:towny:0.100.4.0")

src/main/java/net/laboulangerie/laboulangeriemmo/LaBoulangerieMmo.java

@@ -5,10 +5,8 @@
 import java.text.NumberFormat;
 import java.util.Arrays;
 import java.util.Locale;
-import java.util.logging.Level;
 import org.betonquest.betonquest.api.BetonQuestApi;
 import org.betonquest.betonquest.api.BetonQuestApiService;
-import org.bukkit.plugin.RegisteredServiceProvider;
 import org.bukkit.plugin.java.JavaPlugin;
 import net.laboulangerie.laboulangeriemmo.api.ability.AbilitiesRegistry;
 import net.laboulangerie.laboulangeriemmo.api.player.MmoPlayerListener;
@@ -49,11 +47,9 @@
 import net.laboulangerie.laboulangeriemmo.listener.ServerListener;
 import net.laboulangerie.laboulangeriemmo.listener.XpBoostListener;
 import net.laboulangerie.laboulangeriemmo.utils.WolrdGuardSupport;
-import net.milkbowl.vault.economy.Economy;
 
 public class LaBoulangerieMmo extends JavaPlugin {
     public static LaBoulangerieMmo PLUGIN;
-    public static Economy ECONOMY = null;
     public static double XP_MULTIPLIER = 0.1;
     public static TalentsRegistry talentsRegistry = null;
     public static AbilitiesRegistry abilitiesRegistry = null;
@@ -89,12 +85,6 @@ public void onEnable() {
         saveDefaultConfig();
         reloadNumberFormatter();
         setupMineLetProtection();
-        if (!setupEconomy()) {
-            getLogger().log(Level.SEVERE, "Can't load the plugin, Vault isn't present");
-            getServer().getPluginManager().disablePlugin(this);
-            return;
-        }
-
         if (getServer().getPluginManager().getPlugin("MythicMobs") != null) {
             MYTHICMOBS_SUPPORT = true;
             getLogger().info("Hooked into MythicMobs!");
@@ -241,14 +231,4 @@ private void reloadNumberFormatter() {
         formatter.applyPattern("#.##");
     }
 
-    private boolean setupEconomy() {
-        if (getServer().getPluginManager().getPlugin("Vault") == null)
-            return false;
-        RegisteredServiceProvider<Economy> rsp = getServer().getServicesManager().getRegistration(Economy.class);
-        if (rsp == null) {
-            return false;
-        }
-        ECONOMY = rsp.getProvider();
-        return ECONOMY != null;
-    }
 }

src/main/java/net/laboulangerie/laboulangeriemmo/core/abilities/woodcutting/Timber.java

@@ -36,7 +36,9 @@ public Timber(AbilityArchetype archetype) {
                     {1, 1, -1}, {-1, 1, 1}, {-1, 1, -1}, {1, -1, 0}, {-1, -1, 0}, {0, -1, 1},
                     {0, -1, -1}, {1, -1, 1}, {1, -1, -1}, {-1, -1, 1}, {-1, -1, -1}};
 
-    private static final int RANGE = 5;
+    private static final int TIER_ONE_RANGE = 3;
+    private static final int TIER_TWO_RANGE = 5;
+    private static final int TIER_THREE_RANGE = 7;
 
     private Material initType;
     private Location initLocation;
@@ -63,7 +65,8 @@ public void trigger(Event baseEvent, int level) {
 
         initType = block.getType();
         initLocation = block.getLocation();
-        List<List<Block>> treeByDepth = findTreeByDepth();
+        int range = rangeForLevel(level);
+        List<List<Block>> treeByDepth = findTreeByDepth(range);
 
         for (int depth = 0; depth < treeByDepth.size(); depth++) {
             List<Block> allowedBlocks = treeByDepth.get(depth).stream()
@@ -74,19 +77,25 @@ public void trigger(Event baseEvent, int level) {
 
             long delay = depth * 5L;
             if (delay == 0L) {
-                allowedBlocks.forEach(this::breakIfAllowed);
+                allowedBlocks.forEach(candidate -> breakIfAllowed(candidate, range));
             } else {
                 new BukkitRunnable() {
                     @Override
                     public void run() {
-                        allowedBlocks.forEach(Timber.this::breakIfAllowed);
+                        allowedBlocks.forEach(candidate -> Timber.this.breakIfAllowed(candidate, range));
                     }
                 }.runTaskLater(LaBoulangerieMmo.PLUGIN, delay);
             }
         }
     }
 
-    private List<List<Block>> findTreeByDepth() {
+    int rangeForLevel(int level) {
+        if (level >= getTier(2)) return TIER_THREE_RANGE;
+        if (level >= getTier(1)) return TIER_TWO_RANGE;
+        return TIER_ONE_RANGE;
+    }
+
+    private List<List<Block>> findTreeByDepth(int range) {
         List<List<Block>> treeByDepth = new ArrayList<>();
         Queue<TreeNode> queue = new ArrayDeque<>();
         Set<Location> visited = new HashSet<>();
@@ -95,14 +104,14 @@ private List<List<Block>> findTreeByDepth() {
         while (!queue.isEmpty()) {
             TreeNode node = queue.remove();
             Location location = node.block().getLocation();
-            if (!visited.add(location) || !isMatchingTreeBlock(node.block())) continue;
+            if (!visited.add(location) || !isMatchingTreeBlock(node.block(), range)) continue;
 
             while (treeByDepth.size() <= node.depth()) treeByDepth.add(new ArrayList<>());
             treeByDepth.get(node.depth()).add(node.block());
 
             for (int[] coordinate : REL_COORDINATES) {
                 Block neighbour = node.block().getRelative(coordinate[0], coordinate[1], coordinate[2]);
-                if (!visited.contains(neighbour.getLocation()) && isInsideRange(neighbour)) {
+                if (!visited.contains(neighbour.getLocation()) && isInsideRange(neighbour, range)) {
                     queue.add(new TreeNode(neighbour, node.depth() + 1));
                 }
             }
@@ -111,21 +120,21 @@ private List<List<Block>> findTreeByDepth() {
         return treeByDepth;
     }
 
-    private boolean isMatchingTreeBlock(Block candidate) {
+    private boolean isMatchingTreeBlock(Block candidate, int range) {
         Material logType = Material.getMaterial(initType.toString().replace("_WOOD", "_LOG"));
         Material woodType = Material.getMaterial(initType.toString().replace("_LOG", "_WOOD"));
-        return isInsideRange(candidate)
+        return isInsideRange(candidate, range)
                 && (candidate.getType() == logType || candidate.getType() == woodType);
     }
 
-    private boolean isInsideRange(Block candidate) {
+    private boolean isInsideRange(Block candidate, int range) {
         return candidate.getY() >= initLocation.getBlockY()
-                && Math.abs(candidate.getX() - initLocation.getBlockX()) <= RANGE
-                && Math.abs(candidate.getZ() - initLocation.getBlockZ()) <= RANGE;
+                && Math.abs(candidate.getX() - initLocation.getBlockX()) <= range
+                && Math.abs(candidate.getZ() - initLocation.getBlockZ()) <= range;
     }
 
-    private void breakIfAllowed(Block candidate) {
-        if (!isMatchingTreeBlock(candidate)
+    private void breakIfAllowed(Block candidate, int range) {
+        if (!isMatchingTreeBlock(candidate, range)
                 || !LaBoulangerieMmo.PLUGIN.getTalentProtection().canBreak(player, candidate)) {
             return;
         }

src/main/java/net/laboulangerie/laboulangeriemmo/core/rareloot/RareLootEngine.java

@@ -3,6 +3,7 @@
 import java.util.HashSet;
 import java.util.Locale;
 import java.util.Set;
+import java.util.SplittableRandom;
 import java.util.random.RandomGenerator;
 import net.laboulangerie.laboulangeriemmo.LaBoulangerieMmo;
 import net.laboulangerie.laboulangeriemmo.api.player.MmoPlayer;
@@ -23,7 +24,7 @@ public final class RareLootEngine {
     private volatile RareLootRegistry registry = RareLootRegistry.empty();
 
     public RareLootEngine(RareLootItemProviderRegistry providers) {
-        this(providers, RandomGenerator.getDefault());
+        this(providers, new SplittableRandom());
     }
 
     RareLootEngine(RareLootItemProviderRegistry providers, RandomGenerator random) {

src/main/java/net/laboulangerie/laboulangeriemmo/listener/MmoListener.java

@@ -5,9 +5,7 @@
 import java.util.List;
 
 import org.bukkit.Bukkit;
-import org.bukkit.OfflinePlayer;
 import org.bukkit.configuration.file.FileConfiguration;
-import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
@@ -26,40 +24,21 @@
 import net.laboulangerie.laboulangeriemmo.core.XpBar;
 import net.laboulangerie.laboulangeriemmo.events.PlayerLevelUpEvent;
 import net.laboulangerie.laboulangeriemmo.events.XpCountDownFinishedEvent;
-import net.milkbowl.vault.economy.EconomyResponse;
 
 public class MmoListener implements Listener {
 
     @EventHandler
     public void onLevelUp(PlayerLevelUpEvent event) {
         FileConfiguration config = LaBoulangerieMmo.PLUGIN.getConfig();
 
-        OfflinePlayer offlinePlayer = Bukkit.getOfflinePlayer(event.getPlayer().getUniqueId());
-        Player player = offlinePlayer.getPlayer();
+        Player player = Bukkit.getPlayer(event.getPlayer().getUniqueId());
         Talent talent = event.getTalent();
         TalentArchetype talentArchetype = LaBoulangerieMmo.talentsRegistry.getTalent(talent.getTalentId());
 
         List<TagResolver.Single> resolvers = new ArrayList<>();
         resolvers.add(Placeholder.parsed("level", Integer.toString(event.getNewLevel())));
         resolvers.add(Placeholder.parsed("talent", talent.getDisplayName()));
 
-        ConfigurationSection rewards =
-                config.getConfigurationSection("level-up-rewards." + talent.getTalentId());
-        double amount = calculateLevelRewards(
-                rewards, event.getPreviousLevel(), event.getNewLevel(), config.getString("rewards-rounding-method", "no"));
-        boolean rewardPaid = false;
-        if (amount > 0) {
-            EconomyResponse response = LaBoulangerieMmo.ECONOMY.depositPlayer(offlinePlayer, amount);
-            if (response.transactionSuccess()) {
-                rewardPaid = true;
-                resolvers.add(Placeholder.parsed("reward", LaBoulangerieMmo.ECONOMY.format(amount)));
-            } else {
-                LaBoulangerieMmo.PLUGIN.getLogger().warning("Unable to pay " + amount + " to "
-                        + offlinePlayer.getName() + " for " + talent.getTalentId() + " levels "
-                        + (event.getPreviousLevel() + 1) + "-" + event.getNewLevel() + ": " + response.errorMessage);
-            }
-        }
-
         if (player == null) return;
         Component prefix = MiniMessage.miniMessage().deserialize(config.getString("lang.prefix"));
 
@@ -86,9 +65,8 @@ public void onLevelUp(PlayerLevelUpEvent event) {
             }
         }
 
-        String levelMessage = rewardPaid ? "lang.messages.level-up" : "lang.messages.level-up-no-reward";
         Component lvlUpComponent = MiniMessage.miniMessage()
-                .deserialize(config.getString(levelMessage), TagResolver.resolver(resolvers));
+                .deserialize(config.getString("lang.messages.level-up"), TagResolver.resolver(resolvers));
         player.sendMessage(prefix.append(lvlUpComponent));
 
         Component titleComponent =
@@ -129,54 +107,6 @@ public void onCountDownFinished(XpCountDownFinishedEvent event) {
         player.sendActionBar(message);
     }
 
-    static double calculateLevelReward(ConfigurationSection rewards, int level, double levelXp) {
-        if (rewards == null || level <= 0) return 0;
-
-        double amount = processMoneyAmount(rewards.getString("*"), levelXp);
-        amount += processMoneyAmount(rewards.getString(Integer.toString(level)), levelXp);
-
-        ConfigurationSection progressive = rewards.getConfigurationSection("progressive");
-        if (progressive == null || !progressive.isSet("levels-per-step")
-                || !progressive.isSet("amount-per-step")) {
-            return amount;
-        }
-
-        int levelsPerStep = progressive.getInt("levels-per-step");
-        double amountPerStep = progressive.getDouble("amount-per-step");
-        if (levelsPerStep <= 0 || amountPerStep <= 0) return amount;
-
-        return amount + ((level / levelsPerStep) + 1) * amountPerStep;
-    }
-
-    static double calculateLevelRewards(
-            ConfigurationSection rewards, int previousLevel, int newLevel, String roundingMethod) {
-        return calculateLevelRewards(
-                rewards, previousLevel, newLevel, roundingMethod, LaBoulangerieMmo.XP_MULTIPLIER);
-    }
-
-    static double calculateLevelRewards(ConfigurationSection rewards, int previousLevel, int newLevel,
-            String roundingMethod, double xpMultiplier) {
-        if (newLevel <= previousLevel) return 0;
-        if (xpMultiplier <= 0 || !Double.isFinite(xpMultiplier)) return 0;
-
-        double total = 0;
-        for (int level = Math.max(1, previousLevel + 1); level <= newLevel; level++) {
-            double levelXp = Math.pow(level / xpMultiplier, 2);
-            total += roundReward(calculateLevelReward(rewards, level, levelXp), roundingMethod);
-        }
-        return total;
-    }
-
-    private static double roundReward(double amount, String method) {
-        if (method == null) return amount;
-        return switch (method) {
-            case "closest" -> Math.round(amount);
-            case "up" -> Math.ceil(amount);
-            case "down" -> Math.floor(amount);
-            default -> amount;
-        };
-    }
-
     private static boolean crossedLevel(PlayerLevelUpEvent event, int requiredLevel) {
         return requiredLevel > event.getPreviousLevel() && requiredLevel <= event.getNewLevel();
     }
@@ -187,22 +117,4 @@ private static void sendAbilityMessage(Player player, Component prefix, String m
         player.sendMessage(prefix.append(component));
     }
 
-    private static double processMoneyAmount(String rawAmount, double levelXp) {
-        if (rawAmount == null) return 0;
-
-        if (rawAmount.endsWith("%")) {
-            double percentage = 0;
-            try {
-                percentage = Double.parseDouble(rawAmount.split("%")[0]);
-            } catch (Exception e) {
-            }
-            return levelXp * percentage / 100;
-        }
-        try {
-            return Double.parseDouble(rawAmount);
-        } catch (Exception e) {
-        }
-
-        return 0;
-    }
 }

src/main/resources/config.yml

@@ -14,8 +14,7 @@ lang:
         delay: 200
     messages:
         ability_log: <yellow>You used <aqua><ability></aqua>, cooldown for <aqua><cooldown> <unit></aqua>
-        level-up: <yellow>You reached level <aqua><level> <talent></aqua> ! You earned <aqua><reward></aqua>
-        level-up-no-reward: <yellow>You reached level <aqua><level> <talent></aqua> !
+        level-up: <yellow>You reached level <aqua><level> <talent></aqua> !
         level-up-title: <bold><gradient:yellow:green>↑ LEVEL UP ↑
         level-up-subtitle: <aqua>Level <level> <talent>
         ability-unlocked: <yellow>Habilité <aqua><ability></aqua> débloquée !
@@ -319,9 +318,9 @@ talents:
                     - 65
                     - 95
                 tier_descriptions:
+                    - "Abat les bûches connectées de même type dans un rayon horizontal de 3 blocs"
                     - "Abat les bûches connectées de même type dans un rayon horizontal de 5 blocs"
-                    - "Abat les bûches connectées de même type dans un rayon horizontal de 5 blocs"
-                    - "Abat les bûches connectées de même type dans un rayon horizontal de 5 blocs"
+                    - "Abat les bûches connectées de même type dans un rayon horizontal de 7 blocs"
             stun:
                 display_name: Étourdissement
                 display_item: NETHER_STAR
@@ -571,26 +570,6 @@ talent-grinding:
             DIAMOND_HOE: 100
             NETHERITE_HOE: 200
 
-#Define money rewards when a player levels up in one talent
-level-up-rewards:
-    miner:
-        progressive:
-            levels-per-step: 10
-            amount-per-step: 10
-    hunter:
-        progressive:
-            levels-per-step: 10
-            amount-per-step: 10
-    lumberjack:
-        progressive:
-            levels-per-step: 10
-            amount-per-step: 10
-    farmer:
-        progressive:
-            levels-per-step: 10
-            amount-per-step: 10
-rewards-rounding-method: "no" # Round rewards defined above, accepted values no, closest, up, down
-
 blockus-ignored-blocks:
     - CARROTS
     - WHEAT

src/main/resources/plugin.yml

@@ -3,7 +3,6 @@ version: 2.3.2
 main: net.laboulangerie.laboulangeriemmo.LaBoulangerieMmo
 api-version: '1.21.11'
 authors: [TheHunter365, Grooble_, Pikachuz3, PainOchoco, BlackoutBurst, SunshineDev]
-depend: [Vault]
 softdepend: [PlaceholderAPI, Towny, BetonQuest, WorldGuard, MythicMobs, LibsDisguises, Minelet]
 
 libraries:

src/test/java/net/laboulangerie/laboulangeriemmo/core/abilities/woodcutting/TimberTest.java

@@ -0,0 +1,24 @@
+package net.laboulangerie.laboulangeriemmo.core.abilities.woodcutting;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.util.List;
+import org.junit.jupiter.api.Test;
+import net.laboulangerie.laboulangeriemmo.api.ability.AbilityArchetype;
+
+class TimberTest {
+    @Test
+    void usesRangeForCurrentTier() {
+        AbilityArchetype archetype = new AbilityArchetype();
+        archetype.requiredLevel = 35;
+        archetype.tiers = List.of(35, 65, 95);
+        Timber timber = new Timber(archetype);
+
+        assertEquals(3, timber.rangeForLevel(35));
+        assertEquals(3, timber.rangeForLevel(64));
+        assertEquals(5, timber.rangeForLevel(65));
+        assertEquals(5, timber.rangeForLevel(94));
+        assertEquals(7, timber.rangeForLevel(95));
+        assertEquals(7, timber.rangeForLevel(100));
+    }
+}