GameBlockData - change how random bonus chests are chosen

- use min/max instead of random percent

Author: ShaneBeee

src/main/java/com/shanebeestudios/hg/api/game/GameBlockData.java

@@ -183,16 +183,21 @@ public int logBlocksForRollback() {
 
     @SuppressWarnings("UnstableApiUsage")
     public void setupRandomizedBonusChests() {
+        if (!Config.CHESTS_BONUS_RANDOMIZE_ENABLED) return;
+
         Optional<BlockType> first = BlockUtils.getBonusBlockTypes().stream().findFirst();
         if (first.isEmpty()) return;
+
         BlockData blockData = first.get().createBlockData();
+        int bonusChestAmount = this.random.nextInt(Config.CHESTS_BONUS_RANDOMIZE_MIN, Config.CHESTS_BONUS_RANDOMIZE_MAX + 1);
+        List<Block> randoms = new ArrayList<>(this.randomBonusChests);
+        for (int i = 0; i < bonusChestAmount; i++) {
+            if (randoms.isEmpty()) return;
 
-        if (Config.CHESTS_BONUS_RANDOMIZE_ENABLED) {
-            this.randomBonusChests.forEach(bonusChest -> {
-                if (this.random.nextInt(100) < Config.CHESTS_BONUS_RANDOMIZE_CHANCE) {
-                    bonusChest.setBlockData(blockData);
-                }
-            });
+            Collections.shuffle(randoms);
+            Block bonusChest = randoms.getFirst();
+            randoms.remove(bonusChest);
+            bonusChest.setBlockData(blockData);
         }
     }
 

src/main/java/com/shanebeestudios/hg/plugin/configs/Config.java

@@ -74,7 +74,8 @@ public class Config {
     public static List<String> CHESTS_BONUS_BLOCK_TYPES;
     // Chests - Bonus - Randomize
     public static boolean CHESTS_BONUS_RANDOMIZE_ENABLED;
-    public static int CHESTS_BONUS_RANDOMIZE_CHANCE;
+    public static int CHESTS_BONUS_RANDOMIZE_MIN;
+    public static int CHESTS_BONUS_RANDOMIZE_MAX;
     public static String CHESTS_BONUS_RANDOMIZE_BLOCK;
 
     // Chests - Drops
@@ -177,7 +178,8 @@ private void loadConfig() {
         CHESTS_BONUS_MAX_CONTENT = config.getInt("chests.bonus.max-content");
         CHESTS_BONUS_BLOCK_TYPES = config.getStringList("chests.bonus.block-types");
         CHESTS_BONUS_RANDOMIZE_ENABLED = config.getBoolean("chests.bonus.randomize.enabled");
-        CHESTS_BONUS_RANDOMIZE_CHANCE = config.getInt("chests.bonus.randomize.chance");
+        CHESTS_BONUS_RANDOMIZE_MIN = config.getInt("chests.bonus.randomize.min");
+        CHESTS_BONUS_RANDOMIZE_MAX = config.getInt("chests.bonus.randomize.max");
         CHESTS_BONUS_RANDOMIZE_BLOCK = config.getString("chests.bonus.randomize.block");
         CHESTS_CHEST_DROP_ENABLED = config.getBoolean("chests.chest-drop.enabled");
         CHESTS_CHEST_DROP_INTERVAL = config.getInt("chests.chest-drop.interval");

src/main/resources/config.yml

@@ -124,9 +124,12 @@ chests:
       # The blocks will be replaced with the first element of 'chests.bonus.block-types' from above
       enabled: true
       # Place this block randomly around your arena to be replaced when a game starts
+      # Place as many as you'd like
       block: 'minecraft:pink_wool'
-      # Chance a block will be replaced (out of 100)
-      chance: 50
+      # How many random bonus chests to place (randomly selected between min/max)
+      # If there aren't enough blocks placed it will just stop (make sure to place plenty more than your max)
+      min: 2
+      max: 5
   # Chest drops
   chest-drop:
     # Whether to enable chest drops