Merge pull request #328 from BentoBoxWorld/develop

Release 2.16.0
BentoBoxWorld · Sep 17, 2024 · 5da21b8 · 5da21b8
2 parents fd20a9e + dbf3621
commit 5da21b8
Show file tree

Hide file tree

Showing 13 changed files with 821 additions and 674 deletions.
diff --git a/pom.xml b/pom.xml
@@ -59,7 +59,7 @@
         <powermock.version>2.0.9</powermock.version>
         <!-- More visible way how to change dependency versions -->
         <spigot.version>1.20.4-R0.1-SNAPSHOT</spigot.version>
-        <bentobox.version>2.4.0-SNAPSHOT</bentobox.version>
+        <bentobox.version>2.5.1-SNAPSHOT</bentobox.version>
         <!-- Warps addon version -->
         <warps.version>1.12.0</warps.version>
         <!-- Visit addon version -->
@@ -71,7 +71,7 @@
         <!-- Do not change unless you want different name for local builds. -->
         <build.number>-LOCAL</build.number>
         <!-- This allows to change between versions. -->
-        <build.version>2.15.0</build.version>
+        <build.version>2.16.0</build.version>
         <sonar.projectKey>BentoBoxWorld_Level</sonar.projectKey>
         <sonar.organization>bentobox-world</sonar.organization>
         <sonar.host.url>https://sonarcloud.io</sonar.host.url>

diff --git a/src/main/java/world/bentobox/level/LevelsManager.java b/src/main/java/world/bentobox/level/LevelsManager.java
@@ -36,16 +36,8 @@
 
 public class LevelsManager {
     private static final String INTOPTEN = "intopten";
-    private static final TreeMap<BigInteger, String> LEVELS;
+    private static final TreeMap<BigInteger, String> LEVELS = new TreeMap<>();
     private static final BigInteger THOUSAND = BigInteger.valueOf(1000);
-    static {
-        LEVELS = new TreeMap<>();
-
-        LEVELS.put(THOUSAND, "k");
-        LEVELS.put(THOUSAND.pow(2), "M");
-        LEVELS.put(THOUSAND.pow(3), "G");
-        LEVELS.put(THOUSAND.pow(4), "T");
-    }
     private final Level addon;
 
     // Database handler for level data
@@ -67,6 +59,12 @@ public LevelsManager(Level addon) {
         levelsCache = new HashMap<>();
         // Initialize top ten lists
         topTenLists = new ConcurrentHashMap<>();
+        // Units
+        LEVELS.put(THOUSAND, addon.getSettings().getKilo());
+        LEVELS.put(THOUSAND.pow(2), addon.getSettings().getMega());
+        LEVELS.put(THOUSAND.pow(3), addon.getSettings().getGiga());
+        LEVELS.put(THOUSAND.pow(4), addon.getSettings().getTera());
+
     }
 
     public void migrate() {

diff --git a/src/main/java/world/bentobox/level/commands/AdminSetInitialLevelCommand.java b/src/main/java/world/bentobox/level/commands/AdminSetInitialLevelCommand.java
@@ -46,10 +46,20 @@ public Optional<List<String>> tabComplete(User user, String alias, List<String>
 
     @Override
     public boolean execute(User user, String label, List<String> args) {
-        String initialLevel = String.valueOf(addon.getManager().getInitialLevel(island));
-        long lv = Long.parseLong(args.get(1));
+        long initialLevel = addon.getManager().getInitialLevel(island);
+        long lv = 0;
+        if (args.get(1).startsWith("+")) {
+            String change = args.get(1).substring(1);
+            lv = initialLevel + Long.parseLong(change);
+        } else if (args.get(1).startsWith("-")) {
+            String change = args.get(1).substring(1);
+            lv = initialLevel - Long.parseLong(change);
+        } else {
+            lv = Long.parseLong(args.get(1));
+        }
         addon.getManager().setInitialIslandLevel(island, lv);
-        user.sendMessage("admin.level.sethandicap.changed", TextVariables.NUMBER, initialLevel, "[new_number]", String.valueOf(lv));
+        user.sendMessage("admin.level.sethandicap.changed", TextVariables.NUMBER, String.valueOf(initialLevel),
+                "[new_number]", String.valueOf(lv));
         return true;
     }
 
@@ -64,10 +74,20 @@ public boolean canExecute(User user, String label, List<String> args) {
             user.sendMessage("general.errors.unknown-player", TextVariables.NAME, args.get(0));
             return false;
         }
-        // Check value
-        if (!Util.isInteger(args.get(1), true)) {
-            user.sendMessage("admin.level.sethandicap.invalid-level");
-            return false;
+        // Check if this is a add or remove
+        if (args.get(1).startsWith("+") || args.get(1).startsWith("-")) {
+            String change = args.get(1).substring(1);
+            if (!Util.isInteger(change, true)) {
+                user.sendMessage("admin.level.sethandicap.invalid-level");
+                return false;
+            }
+            // Value is okay
+        } else {
+            // Check value
+            if (!Util.isInteger(args.get(1), true)) {
+                user.sendMessage("admin.level.sethandicap.invalid-level");
+                return false;
+            }
         }
         // Check island
         island = getAddon().getIslands().getIsland(getWorld(), targetUUID);

diff --git a/src/main/java/world/bentobox/level/config/BlockConfig.java b/src/main/java/world/bentobox/level/config/BlockConfig.java
@@ -2,9 +2,12 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.EnumMap;
 import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Objects;
 
@@ -26,6 +29,7 @@ public class BlockConfig {
     private Map<Material, Integer> blockLimits = new EnumMap<>(Material.class);
     private Map<Material, Integer> blockValues = new EnumMap<>(Material.class);
     private final Map<World, Map<Material, Integer>> worldBlockValues = new HashMap<>();
+    private final List<Material> hiddenBlocks;
     private Level addon;
 
     /**
@@ -49,6 +53,16 @@ public BlockConfig(Level addon, YamlConfiguration blockValues, File file) throws
         if (blockValues.isConfigurationSection("worlds")) {
             loadWorlds(blockValues);
         }
+        // Hidden
+        hiddenBlocks = blockValues.getStringList("hidden-blocks").stream().map(name -> {
+            try {
+                return Material.valueOf(name.toUpperCase(Locale.ENGLISH));
+
+            } catch (Exception e) {
+                return null;
+            }
+        }).filter(Objects::nonNull).toList();
+
         // All done
         blockValues.save(file);
     }
@@ -159,5 +173,22 @@ public Integer getValue(World world, Material md) {
         return null;
     }
 
+    /**
+     * Return true if the block should be hidden
+     * @param m block material
+     * @return true if hidden
+     */
+    public boolean isHiddenBlock(Material m) {
+        return hiddenBlocks.contains(m);
+    }
+
+    /**
+     * Return true if the block should not be hidden
+     * @param m block material
+     * @return false if hidden
+     */
+    public boolean isNotHiddenBlock(Material m) {
+        return !hiddenBlocks.contains(m);
+    }
 
 }
diff --git a/src/main/java/world/bentobox/level/config/ConfigSettings.java b/src/main/java/world/bentobox/level/config/ConfigSettings.java
@@ -3,6 +3,7 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.Objects;
 
 import world.bentobox.bentobox.BentoBox;
 import world.bentobox.bentobox.api.configuration.ConfigComment;
@@ -120,6 +121,17 @@ public class ConfigSettings implements ConfigObject {
     @ConfigComment("Shows large level values rounded down, e.g., 10,345 -> 10k")
     @ConfigEntry(path = "shorthand")
     private boolean shorthand = false;
+
+    @ConfigComment("Shorthand units")
+    @ConfigEntry(path = "units.kilo")
+    private String kilo = "k";
+    @ConfigEntry(path = "units.mega")
+    private String mega = "M";
+    @ConfigEntry(path = "units.giga")
+    private String giga = "G";
+    @ConfigEntry(path = "units.tera")
+    private String tera = "T";
+
     @ConfigComment("")
     @ConfigComment("Include Shulker Box content in chests in level calculations.")
     @ConfigComment("Will count blocks in Shulker Boxes inside of chests.")
@@ -419,4 +431,60 @@ public List<String> getDisabledPluginHooks() {
     public void setDisabledPluginHooks(List<String> disabledPluginHooks) {
         this.disabledPluginHooks = disabledPluginHooks;
     }
+
+    /**
+     * @return the kilo
+     */
+    public String getKilo() {
+        return Objects.requireNonNullElse(kilo, "k");
+    }
+
+    /**
+     * @param kilo the kilo to set
+     */
+    public void setKilo(String kilo) {
+        this.kilo = kilo;
+    }
+
+    /**
+     * @return the mega
+     */
+    public String getMega() {
+        return Objects.requireNonNullElse(mega, "M");
+    }
+
+    /**
+     * @param mega the mega to set
+     */
+    public void setMega(String mega) {
+        this.mega = mega;
+    }
+
+    /**
+     * @return the giga
+     */
+    public String getGiga() {
+        return Objects.requireNonNullElse(giga, "G");
+    }
+
+    /**
+     * @param giga the giga to set
+     */
+    public void setGiga(String giga) {
+        this.giga = giga;
+    }
+
+    /**
+     * @return the tera
+     */
+    public String getTera() {
+        return Objects.requireNonNullElse(tera, "T");
+    }
+
+    /**
+     * @param tera the tera to set
+     */
+    public void setTera(String tera) {
+        this.tera = tera;
+    }
 }