Fixed up value panel

Author: tastybento

src/main/java/world/bentobox/level/calculators/IslandLevelCalculator.java

@@ -60,7 +60,7 @@ public class IslandLevelCalculator {
     private final Level addon;
     private final Queue<Pair<Integer, Integer>> chunksToCheck;
     private final Island island;
-    private final Map<Material, Integer> limitCount;
+    private final Map<Object, Integer> limitCount;
     private final CompletableFuture<Results> r;
 
     private final Results results;
@@ -89,7 +89,7 @@ public IslandLevelCalculator(Level addon, Island island, CompletableFuture<Resul
         results = new Results();
         duration = System.currentTimeMillis();
         chunksToCheck = getChunksToScan(island);
-        this.limitCount = new EnumMap<>(addon.getBlockConfig().getBlockLimits());
+        this.limitCount = new HashMap<>();
         // Get the initial island level
         results.initialLevel.set(addon.getInitialIslandLevel(island));
         // Set up the worlds
@@ -159,10 +159,7 @@ private void checkBlock(Material mat, boolean belowSeaLevel) {
      * @param belowSeaLevel - true if below sea level
      */
     private void checkSpawner(EntityType et, boolean belowSeaLevel) {
-        if (limitCount(Material.SPAWNER) == 0) {
-            return;
-        }
-        Integer count = addon.getBlockConfig().getValue(island.getWorld(), et);
+        Integer count = limitCount(et);
         if (count != null) {
             if (belowSeaLevel) {
                 results.underWaterBlockCount.addAndGet(count);
@@ -247,14 +244,9 @@ private List<String> getReport() {
         while (it.hasNext()) {
 
             Entry<Object> type = it.next();
-            Material m = type.getElement() instanceof Material mat ? mat : Material.SPAWNER;
-            Integer limit = addon.getBlockConfig().getBlockLimits().get(m);
+            Integer limit = addon.getBlockConfig().getLimit(type);
             String explain = ")";
-            if (limit == null) {
-                limit = addon.getBlockConfig().getBlockLimits().get(m);
-                explain = " - All types)";
-            }
-            reportLines.add(Util.prettifyText(m.name()) + ": " + String.format("%,d", type.getCount())
+            reportLines.add(Util.prettifyText(type.toString()) + ": " + String.format("%,d", type.getCount())
                     + " blocks (max " + limit + explain);
         }
         reportLines.add(LINE_BREAK);
@@ -271,10 +263,10 @@ public Results getResults() {
     /**
      * Get value of a material World blocks trump regular block values
      * 
-     * @param md - Material to check
-     * @return value of a material
+     * @param md - Material or EntityType to check
+     * @return value
      */
-    private int getValue(Material md) {
+    private int getValue(Object md) {
         Integer value = addon.getBlockConfig().getValue(island.getWorld(), md);
         if (value == null) {
             // Not in config
@@ -335,24 +327,28 @@ private void roseStackerCheck(Chunk chunk) {
     }
 
     /**
-     * Checks if a block has been limited or not and whether a block has any value
-     * or not
-     * 
-     * @param md Material
-     * @return value of the block if can be counted
+     * Checks if the given object (Material or EntityType) has reached its limit.
+     * If it hasn't, the object's value is returned and its count is incremented.
+     * If the object is not a Material or EntityType, or if it has exceeded its limit, 0 is returned.
+     *
+     * @param obj A Material or EntityType
+     * @return The object's value if within limit, otherwise 0.
      */
-    private int limitCount(Material md) {
-        if (limitCount.containsKey(md)) {
-            int count = limitCount.get(md);
-            if (count > 0) {
-                limitCount.put(md, --count);
-                return getValue(md);
-            } else {
-                results.ofCount.add(md);
-                return 0;
-            }
-        }
-        return getValue(md);
+    private int limitCount(Object obj) {
+        // Only process if obj is a Material or EntityType
+        if (!(obj instanceof Material) && !(obj instanceof EntityType))
+            return 0;
+
+        Integer limit = addon.getBlockConfig().getLimit(obj);
+        if (limit == null)
+            return getValue(obj);
+
+        int count = limitCount.getOrDefault(obj, 0);
+        if (count > limit)
+            return 0;
+
+        limitCount.put(obj, count + 1);
+        return getValue(obj);
     }
 
     /**

src/main/java/world/bentobox/level/commands/IslandValueCommand.java

@@ -123,8 +123,8 @@ private void printValue(User user, Material material)
             int count = lvData.getMdCount().getOrDefault(material, 0) + lvData.getUwCount().getOrDefault(material, 0);
             user.sendMessage("level.conversations.you-have", TextVariables.NUMBER,
                     String.valueOf(count));
-            int limit = this.addon.getBlockConfig().getBlockLimits().getOrDefault(material, -1);
-            if (limit > 0) {
+            Integer limit = this.addon.getBlockConfig().getLimit(material);
+            if (limit != null) {
                 user.sendMessage("level.conversations.you-can-place", TextVariables.NUMBER,
                         String.valueOf(limit));
             }

src/main/java/world/bentobox/level/config/BlockConfig.java

@@ -27,7 +27,7 @@
 public class BlockConfig {
 
     private static final String SPAWNER = "_SPAWNER";
-    private Map<Material, Integer> blockLimits = new EnumMap<>(Material.class);
+    private Map<String, Integer> blockLimits = new HashMap<>();
     private Map<Material, Integer> blockValues = new EnumMap<>(Material.class);
     private final Map<World, Map<Material, Integer>> worldBlockValues = new HashMap<>();
     private final Map<World, Map<EntityType, Integer>> worldSpawnerValues = new HashMap<>();
@@ -45,7 +45,9 @@ public class BlockConfig {
     public BlockConfig(Level addon, YamlConfiguration blockValues, File file) throws IOException {
         this.addon = addon;
         if (blockValues.isConfigurationSection("limits")) {
-            setBlockLimits(loadBlockLimits(blockValues));
+            for (String key : blockValues.getConfigurationSection("limits").getKeys(false)) {
+                blockLimits.put(key, blockValues.getConfigurationSection("limits").getInt(key));
+            }
         }
         if (blockValues.isConfigurationSection("blocks")) {
             setBlockValues(loadBlockValues(blockValues));
@@ -144,31 +146,19 @@ private Map<EntityType, Integer> loadSpawnerValues(YamlConfiguration blockValues
         return bv;
     }
 
-    private Map<Material, Integer> loadBlockLimits(YamlConfiguration blockValues2) {
-        Map<Material, Integer> bl = new EnumMap<>(Material.class);
-        ConfigurationSection limits = Objects.requireNonNull(blockValues2.getConfigurationSection("limits"));
-        for (String material : limits.getKeys(false)) {
-            try {
-                Material mat = Material.valueOf(material);
-                bl.put(mat, limits.getInt(material, 0));
-            } catch (Exception e) {
-                addon.logError("Unknown material (" + material + ") in blockconfig.yml Limits section. Skipping...");
-            }
-        }
-        return bl;
-    }
-
     /**
-     * @return the blockLimits
+     * Return the limits for any particular material or entity type
+     * @param obj material or entity type
+     * @return the limit or null if there isn't one
      */
-    public final Map<Material, Integer> getBlockLimits() {
-        return blockLimits;
-    }
-    /**
-     * @param bl the blockLimits to set
-     */
-    private void setBlockLimits(Map<Material, Integer> bl) {
-        this.blockLimits = bl;
+    public Integer getLimit(Object obj) {
+        if (obj instanceof Material m) {
+            return blockLimits.get(m.name());
+        }
+        if (obj instanceof EntityType et) {
+            return blockLimits.get(et.name().concat(SPAWNER));
+        }
+        return null;
     }
     /**
      * @return the blockValues