From 8882eb260565fbcc16bb16197bfe8164c61c2cdd Mon Sep 17 00:00:00 2001
From: tastybento <tastybento@users.noreply.github.com>
Date: Fri, 23 Feb 2024 22:14:47 -0800
Subject: [PATCH 01/15] Version 1.19.0

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 7f7501e..e7cb61c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -65,7 +65,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>1.18.2</build.version>
+        <build.version>1.19.0</build.version>
         <!-- Sonar Cloud -->
         <sonar.projectKey>BentoBoxWorld_AcidIsland</sonar.projectKey>
         <sonar.organization>bentobox-world</sonar.organization>

From ac5dedf1563587b4f27a41796ae79f639ae38535 Mon Sep 17 00:00:00 2001
From: tastybento <tastybento@users.noreply.github.com>
Date: Fri, 23 Feb 2024 22:15:19 -0800
Subject: [PATCH 02/15] Increased the default distance between islands to 800
 like BSkyBlock

---
 src/main/resources/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
index ce2df30..f894ea4 100644
--- a/src/main/resources/config.yml
+++ b/src/main/resources/config.yml
@@ -106,7 +106,7 @@ world:
   # It is the same for every dimension : Overworld, Nether and End.
   # This value cannot be changed mid-game and the plugin will not start if it is different.
   # /!\ BentoBox currently does not support changing this value mid-game. If you do need to change it, do a full reset of your databases and worlds.
-  distance-between-islands: 64
+  distance-between-islands: 400
   # Default protection range radius in blocks. Cannot be larger than distance.
   # Admins can change protection sizes for players individually using /acid range set <player> <new range>
   # or set this permission: acidisland.island.range.<number>

From abbc9ab319a6391ac9914696ed399cc6d9a60d22 Mon Sep 17 00:00:00 2001
From: tastybento <tastybento@users.noreply.github.com>
Date: Mon, 4 Mar 2024 18:22:56 -0800
Subject: [PATCH 03/15] Reworked nether and end ocean bottomss and added
 configs. #149

---
 .../world/bentobox/acidisland/AISettings.java | 57 +++++++++++++++++++
 .../acidisland/world/ChunkGeneratorWorld.java | 16 ++++--
 src/main/resources/config.yml                 | 30 +++++++++-
 3 files changed, 96 insertions(+), 7 deletions(-)

diff --git a/src/main/java/world/bentobox/acidisland/AISettings.java b/src/main/java/world/bentobox/acidisland/AISettings.java
index b3ac824..bc427de 100644
--- a/src/main/java/world/bentobox/acidisland/AISettings.java
+++ b/src/main/java/world/bentobox/acidisland/AISettings.java
@@ -220,6 +220,21 @@ public class AISettings implements WorldSettings {
     @ConfigEntry(path = "world.ocean-floor", needsReset = true)
     private boolean oceanFloor = false;
 
+    @ConfigComment("Structures")
+    @ConfigComment("This creates an vanilla structures in the worlds.")
+    @ConfigEntry(path = "world.make-structures", needsReset = true)
+    private boolean makeStructures = false;
+
+    @ConfigComment("Caves")
+    @ConfigComment("This creates an vanilla caves in the worlds.")
+    @ConfigEntry(path = "world.make-caves", needsReset = true)
+    private boolean makeCaves = false;
+
+    @ConfigComment("Decorations")
+    @ConfigComment("This creates an vanilla decorations in the worlds.")
+    @ConfigEntry(path = "world.make-decorations", needsReset = true)
+    private boolean makeDecorations = true;
+
     @ConfigComment("Maximum number of islands in the world. Set to -1 or 0 for unlimited. ")
     @ConfigComment("If the number of islands is greater than this number, no new island will be created.")
     @ConfigEntry(path = "world.max-islands")
@@ -2024,4 +2039,46 @@ public boolean isOceanFloor() {
     public void setOceanFloor(boolean oceanFloor) {
         this.oceanFloor = oceanFloor;
     }
+
+    /**
+     * @return the makeStructures
+     */
+    public boolean isMakeStructures() {
+        return makeStructures;
+    }
+
+    /**
+     * @param makeStructures the makeStructures to set
+     */
+    public void setMakeStructures(boolean makeStructures) {
+        this.makeStructures = makeStructures;
+    }
+
+    /**
+     * @return the makeCaves
+     */
+    public boolean isMakeCaves() {
+        return makeCaves;
+    }
+
+    /**
+     * @param makeCaves the makeCaves to set
+     */
+    public void setMakeCaves(boolean makeCaves) {
+        this.makeCaves = makeCaves;
+    }
+
+    /**
+     * @return the makeDecorations
+     */
+    public boolean isMakeDecorations() {
+        return makeDecorations;
+    }
+
+    /**
+     * @param makeDecorations the makeDecorations to set
+     */
+    public void setMakeDecorations(boolean makeDecorations) {
+        this.makeDecorations = makeDecorations;
+    }
 }
diff --git a/src/main/java/world/bentobox/acidisland/world/ChunkGeneratorWorld.java b/src/main/java/world/bentobox/acidisland/world/ChunkGeneratorWorld.java
index fbbbe56..748c0c0 100644
--- a/src/main/java/world/bentobox/acidisland/world/ChunkGeneratorWorld.java
+++ b/src/main/java/world/bentobox/acidisland/world/ChunkGeneratorWorld.java
@@ -27,10 +27,17 @@
  */
 public class ChunkGeneratorWorld extends ChunkGenerator {
 
+    private record FloorMats(Material base, Material top) {
+    }
+
     private final AcidIsland addon;
     private final Random rand = new Random();
     private final Map<Environment, WorldConfig> seaHeight = new EnumMap<>(Environment.class);
     private final Map<Vector, Material> roofChunk = new HashMap<>();
+    private static final Map<Environment, FloorMats> floorMats = Map.of(Environment.NETHER,
+            new FloorMats(Material.NETHERRACK, Material.SOUL_SAND), Environment.NORMAL,
+            new FloorMats(Material.SANDSTONE, Material.SAND), Environment.THE_END,
+            new FloorMats(Material.END_STONE, Material.END_STONE));
     private PerlinOctaveGenerator gen;
 
     private record WorldConfig(int seaHeight, Material waterBlock) {}
@@ -72,7 +79,8 @@ private void addNoise(@NonNull WorldInfo worldInfo, int chunkX, int chunkZ, @Non
             for (int z = 0; z < 16; z++) {
                 int n = (int)(25 * gen.noise((chunkX << 4) + (double)x, (chunkZ << 4) + (double)z, 0.5, 0.5, true));
                 for (int y = worldInfo.getMinHeight(); y < 25 + n; y++) {
-                    chunkData.setBlock(x, y, z, rand.nextBoolean() ? Material.SAND : Material.SANDSTONE);
+                    chunkData.setBlock(x, y, z, rand.nextBoolean() ? floorMats.get(worldInfo.getEnvironment()).top()
+                            : floorMats.get(worldInfo.getEnvironment()).base());
                 }
             }
         }
@@ -90,11 +98,11 @@ public boolean shouldGenerateSurface()  {
     }
     @Override
     public boolean shouldGenerateCaves()  {
-        return addon.getSettings().isOceanFloor();
+        return addon.getSettings().isMakeCaves();
     }
     @Override
     public boolean shouldGenerateDecorations()  {
-        return addon.getSettings().isOceanFloor();
+        return addon.getSettings().isMakeDecorations();
     }
     @Override
     public boolean shouldGenerateMobs()  {
@@ -102,7 +110,7 @@ public boolean shouldGenerateMobs()  {
     }
     @Override
     public boolean shouldGenerateStructures()  {
-        return addon.getSettings().isOceanFloor();
+        return addon.getSettings().isMakeStructures();
     }
 
     @Override
diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
index f894ea4..a75dde6 100644
--- a/src/main/resources/config.yml
+++ b/src/main/resources/config.yml
@@ -139,6 +139,18 @@ world:
   # This creates an ocean floor environment, with vanilla elements.
   # /!\ BentoBox currently does not support changing this value mid-game. If you do need to change it, do a full reset of your databases and worlds.
   ocean-floor: true
+  # Structures
+  # This creates an vanilla structures in the worlds.
+  # /!\ BentoBox currently does not support changing this value mid-game. If you do need to change it, do a full reset of your databases and worlds.
+  make-structures: false
+  # Caves
+  # This creates an vanilla caves in the worlds.
+  # /!\ BentoBox currently does not support changing this value mid-game. If you do need to change it, do a full reset of your databases and worlds.
+  make-caves: false
+  # Decorations
+  # This creates an vanilla decorations in the worlds.
+  # /!\ BentoBox currently does not support changing this value mid-game. If you do need to change it, do a full reset of your databases and worlds.
+  make-decorations: true
   # Maximum number of islands in the world. Set to -1 or 0 for unlimited. 
   # If the number of islands is greater than this number, no new island will be created.
   max-islands: 0
@@ -212,9 +224,9 @@ world:
   # Mob white list - these mobs will NOT be removed when logging in or doing /island
   remove-mobs-whitelist:
   - ZOMBIE_VILLAGER
-  - ENDERMAN
-  - ZOMBIFIED_PIGLIN
   - WITHER
+  - ZOMBIFIED_PIGLIN
+  - ENDERMAN
   # World flags. These are boolean settings for various flags for this world
   flags:
     CREEPER_DAMAGE: true
@@ -229,18 +241,21 @@ world:
     NATURAL_SPAWNING_OUTSIDE_RANGE: true
     ENTER_EXIT_MESSAGES: true
     ENDERMAN_DEATH_DROP: true
+    LIQUIDS_FLOWING_OUT: false
     OFFLINE_REDSTONE: true
     REMOVE_END_EXIT_ISLAND: true
     OFFLINE_GROWTH: true
     REMOVE_MOBS: true
     ENDER_CHEST: false
     ITEM_FRAME_DAMAGE: false
+    TREES_GROWING_OUTSIDE_RANGE: false
     BOAT: true
   # These are the default protection settings for new islands.
   # The value is the minimum island rank required allowed to do the action
   # Ranks are: Visitor = 0, Member = 900, Owner = 1000
   default-island-flags:
     HURT_ANIMALS: 500
+    LOOM: 500
     DRAGON_EGG: 500
     REDSTONE: 500
     BUCKET: 500
@@ -256,6 +271,8 @@ world:
     END_PORTAL: 500
     BREEDING: 500
     HURT_VILLAGERS: 500
+    BOOKSHELF: 500
+    HARVEST: 500
     TURTLE_EGGS: 500
     FROST_WALKER: 500
     COLLECT_LAVA: 500
@@ -268,6 +285,7 @@ world:
     NAME_TAG: 500
     ARMOR_STAND: 500
     CHANGE_SETTINGS: 1000
+    SIGN_EDITING: 500
     TRADING: 0
     EGGS: 500
     ITEM_DROP: 0
@@ -278,6 +296,7 @@ world:
     SCULK_SENSOR: 500
     LECTERN: 500
     SHULKER_BOX: 500
+    GRINDSTONE: 500
     ITEM_PICKUP: 0
     CROP_TRAMPLE: 500
     DROPPER: 500
@@ -287,6 +306,7 @@ world:
     AXOLOTL_SCOOPING: 500
     BUTTON: 500
     COMPOSTER: 500
+    STONECUTTING: 500
     FIRE_EXTINGUISH: 500
     COMMAND_RANKS: 500
     BEACON: 500
@@ -298,6 +318,7 @@ world:
     HIVE: 500
     ITEM_FRAME: 500
     PLACE_BLOCKS: 500
+    CROP_PLANTING: 500
     CRAFTING: 0
     SHEARING: 500
     ENCHANTING: 0
@@ -309,6 +330,7 @@ world:
     DISPENSER: 500
     SCULK_SHRIEKER: 500
     GATE: 0
+    SMITHING: 500
     EXPERIENCE_PICKUP: 500
     HOPPER: 500
     LEASH: 500
@@ -320,13 +342,16 @@ world:
     POTION_THROWING: 500
     BARREL: 500
     COLLECT_POWDERED_SNOW: 500
+    CARTOGRAPHY: 500
   # These are the default settings for new islands
   default-island-settings:
     PVP_END: false
     PVP_NETHER: false
     LEAF_DECAY: true
+    ENDERMAN_TELEPORT: true
     ANIMAL_NATURAL_SPAWN: true
     MONSTER_NATURAL_SPAWN: true
+    SHULKER_TELEPORT: true
     FIRE_SPREAD: true
     FIRE_BURNING: true
     PVP_OVERWORLD: false
@@ -551,4 +576,3 @@ protection:
 do-not-edit-these-settings:
   # These settings should not be edited
   reset-epoch: 0
-

From 1058b5fbc1981849102168e0d8f677453fcfbdba Mon Sep 17 00:00:00 2001
From: tastybento <tastybento@users.noreply.github.com>
Date: Sat, 6 Apr 2024 09:02:40 -0700
Subject: [PATCH 04/15] Add setting for team member islands

---
 pom.xml                                       |  2 +-
 .../world/bentobox/acidisland/AISettings.java | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index e7cb61c..13f7cad 100644
--- 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.0.0-SNAPSHOT</bentobox.version>
+        <bentobox.version>2.3.0-SNAPSHOT</bentobox.version>
         <!-- Revision variable removes warning about dynamic version -->
         <revision>${build.version}-SNAPSHOT</revision>
         <!-- Do not change unless you want different name for local builds. -->
diff --git a/src/main/java/world/bentobox/acidisland/AISettings.java b/src/main/java/world/bentobox/acidisland/AISettings.java
index bc427de..3b9c39b 100644
--- a/src/main/java/world/bentobox/acidisland/AISettings.java
+++ b/src/main/java/world/bentobox/acidisland/AISettings.java
@@ -201,6 +201,10 @@ public class AISettings implements WorldSettings {
     @ConfigEntry(path = "world.island-height")
     private int islandHeight = 50;
     
+    @ConfigComment("Disallow team members from having their own islands.")
+    @ConfigEntry(path = "world.disallow-team-member-islands")
+    private boolean disallowTeamMemberIslands = false;
+
     @ConfigComment("Use your own world generator for this world.")
     @ConfigComment("In this case, the plugin will not generate anything.")
     @ConfigEntry(path = "world.use-own-generator", experimental = true)
@@ -2081,4 +2085,19 @@ public boolean isMakeDecorations() {
     public void setMakeDecorations(boolean makeDecorations) {
         this.makeDecorations = makeDecorations;
     }
+
+    /**
+     * @return the disallowTeamMemberIslands
+     */
+    @Override
+    public boolean isDisallowTeamMemberIslands() {
+        return disallowTeamMemberIslands;
+    }
+
+    /**
+     * @param disallowTeamMemberIslands the disallowTeamMemberIslands to set
+     */
+    public void setDisallowTeamMemberIslands(boolean disallowTeamMemberIslands) {
+        this.disallowTeamMemberIslands = disallowTeamMemberIslands;
+    }
 }

From e32e0df220b51c127a29b8c9a0a701cccbae7f57 Mon Sep 17 00:00:00 2001
From: tastybento <tastybento@wasteofplastic.com>
Date: Tue, 14 May 2024 11:14:49 -0700
Subject: [PATCH 05/15] Fixes #150 EntityDamageByAcidEvent should be
 cancellable

---
 .../events/EntityDamageByAcidEvent.java         | 17 +++++++++++++++--
 .../acidisland/listeners/AcidEffect.java        | 16 ++++++++++------
 .../bentobox/acidisland/world/AcidTask.java     |  4 +++-
 3 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/src/main/java/world/bentobox/acidisland/events/EntityDamageByAcidEvent.java b/src/main/java/world/bentobox/acidisland/events/EntityDamageByAcidEvent.java
index cdeb4f6..e041c02 100644
--- a/src/main/java/world/bentobox/acidisland/events/EntityDamageByAcidEvent.java
+++ b/src/main/java/world/bentobox/acidisland/events/EntityDamageByAcidEvent.java
@@ -1,21 +1,23 @@
 package world.bentobox.acidisland.events;
 
 import org.bukkit.entity.Entity;
+import org.bukkit.event.Cancellable;
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
 
 /**
  * Fired when an entity (items excluded) receives damage from acid
- * @author Poslovitch
+ * @author Poslovitch, tastybento
  * @since 1.0
  */
-public class EntityDamageByAcidEvent extends Event {
+public class EntityDamageByAcidEvent extends Event implements Cancellable {
 
     private final Entity entity;
     private double damage;
 
     public enum Acid { RAIN, WATER }
     private final Acid cause;
+    private boolean cancelled;
     private static final HandlerList handlers = new HandlerList();
 
     @Override
@@ -64,4 +66,15 @@ public void setDamage(double damage) {
     public Acid getCause() {
         return cause;
     }
+
+    @Override
+    public boolean isCancelled() {
+        return cancelled;
+    }
+
+    @Override
+    public void setCancelled(boolean cancel) {
+        this.cancelled = cancel;
+        
+    }
 }
diff --git a/src/main/java/world/bentobox/acidisland/listeners/AcidEffect.java b/src/main/java/world/bentobox/acidisland/listeners/AcidEffect.java
index 887454a..5b16f65 100644
--- a/src/main/java/world/bentobox/acidisland/listeners/AcidEffect.java
+++ b/src/main/java/world/bentobox/acidisland/listeners/AcidEffect.java
@@ -187,11 +187,13 @@ protected boolean checkForRain(Player player) {
                         .addPotionEffect(new PotionEffect(t, addon.getSettings().getRainEffectDuation() * 20, 1)));
                 // Apply damage if there is any
                 if (event.getRainDamage() > 0D) {
-                    player.damage(event.getRainDamage());
-                    player.getWorld().playSound(player.getLocation(), Sound.ENTITY_CREEPER_PRIMED, 3F, 3F);
                     EntityDamageByAcidEvent e = new EntityDamageByAcidEvent(player, event.getRainDamage(), Acid.RAIN);
                     // Fire event
                     Bukkit.getPluginManager().callEvent(e);
+                    if (!e.isCancelled()) {
+                        player.damage(event.getRainDamage());
+                        player.getWorld().playSound(player.getLocation(), Sound.ENTITY_CREEPER_PRIMED, 3F, 3F);
+                    }
                 }
             }
         }
@@ -211,12 +213,14 @@ protected boolean continuouslyHurtPlayer(Player player) {
                 event.getPotionEffects().stream().filter(EFFECTS::contains).forEach(t -> player
                         .addPotionEffect(new PotionEffect(t, addon.getSettings().getAcidEffectDuation() * 20, 1)));
                 // Apply damage if there is any
-                if (event.getTotalDamage() > 0D) {
-                    player.damage(event.getTotalDamage());
-                    player.getWorld().playSound(player.getLocation(), Sound.ENTITY_CREEPER_PRIMED, 3F, 3F);
+                if (event.getTotalDamage() > 0D) {               
                     EntityDamageByAcidEvent e = new EntityDamageByAcidEvent(player, event.getTotalDamage(), Acid.WATER);
                     // Fire event
                     Bukkit.getPluginManager().callEvent(e);
+                    if (!e.isCancelled()) {
+                        player.damage(event.getTotalDamage());
+                        player.getWorld().playSound(player.getLocation(), Sound.ENTITY_CREEPER_PRIMED, 3F, 3F);
+                    }
                 }
             }
         }
@@ -232,7 +236,7 @@ private boolean isSafeFromRain(Player player) {
         if (isEssentialsGodMode(player) || player.getWorld().getEnvironment().equals(Environment.NETHER)
                 || player.getWorld().getEnvironment().equals(Environment.THE_END)
                 || (addon.getSettings().isHelmetProtection() && (player.getInventory().getHelmet() != null
-                        && player.getInventory().getHelmet().getType().name().contains("HELMET")))
+                && player.getInventory().getHelmet().getType().name().contains("HELMET")))
                 || (!addon.getSettings().isAcidDamageSnow() && player.getLocation().getBlock().getTemperature() < 0.1) // snow falls
                 || player.getLocation().getBlock().getHumidity() == 0 // dry
                 || (player.getActivePotionEffects().stream().map(PotionEffect::getType)
diff --git a/src/main/java/world/bentobox/acidisland/world/AcidTask.java b/src/main/java/world/bentobox/acidisland/world/AcidTask.java
index 1e9dab2..f5be30e 100644
--- a/src/main/java/world/bentobox/acidisland/world/AcidTask.java
+++ b/src/main/java/world/bentobox/acidisland/world/AcidTask.java
@@ -86,10 +86,12 @@ void findEntities() {
     void applyDamage(Entity e, long damage) {
         if (e instanceof LivingEntity) {
             double actualDamage = Math.max(0, damage - damage * AcidEffect.getDamageReduced((LivingEntity)e));
-            ((LivingEntity)e).damage(actualDamage);
             EntityDamageByAcidEvent event = new EntityDamageByAcidEvent(e, actualDamage, Acid.WATER);
             // Fire event
             Bukkit.getPluginManager().callEvent(event);
+            if (!event.isCancelled()) {
+                ((LivingEntity)e).damage(actualDamage);
+            }
         } else if (addon.getSettings().getAcidDestroyItemTime() > 0 && e instanceof Item){
             // Item
             if (e.getLocation().getBlock().getType().equals(Material.WATER)) {

From eb1d21fee1f6b32059790af40211f3821f2cd7d0 Mon Sep 17 00:00:00 2001
From: tastybento <tastybento@users.noreply.github.com>
Date: Thu, 16 May 2024 21:20:55 -0700
Subject: [PATCH 06/15] Fixes #153. Switching to creative didn't stop damage
 that had started

---
 .../java/world/bentobox/acidisland/listeners/AcidEffect.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/world/bentobox/acidisland/listeners/AcidEffect.java b/src/main/java/world/bentobox/acidisland/listeners/AcidEffect.java
index 5b16f65..914fcb8 100644
--- a/src/main/java/world/bentobox/acidisland/listeners/AcidEffect.java
+++ b/src/main/java/world/bentobox/acidisland/listeners/AcidEffect.java
@@ -234,6 +234,7 @@ protected boolean continuouslyHurtPlayer(Player player) {
      */
     private boolean isSafeFromRain(Player player) {
         if (isEssentialsGodMode(player) || player.getWorld().getEnvironment().equals(Environment.NETHER)
+                || player.getGameMode() != GameMode.SURVIVAL
                 || player.getWorld().getEnvironment().equals(Environment.THE_END)
                 || (addon.getSettings().isHelmetProtection() && (player.getInventory().getHelmet() != null
                 && player.getInventory().getHelmet().getType().name().contains("HELMET")))
@@ -264,7 +265,7 @@ private boolean isSafeFromRain(Player player) {
      */
     boolean isSafeFromAcid(Player player) {
         // Check for GodMode
-        if (isEssentialsGodMode(player)
+        if (isEssentialsGodMode(player) || player.getGameMode() != GameMode.SURVIVAL
                 // Protect visitors
                 || (addon.getPlugin().getIWM().getIvSettings(player.getWorld()).contains(DamageCause.CUSTOM.name())
                         && !addon.getIslands().userIsOnIsland(player.getWorld(), User.getInstance(player)))) {

From a83320da5c129adb814cdb921110f830fa79068c Mon Sep 17 00:00:00 2001
From: mt-gitlocalize <mt@gitlocalize.com>
Date: Sat, 8 Jun 2024 16:56:54 +0000
Subject: [PATCH 07/15] Translate hr.yml via GitLocalize

---
 src/main/resources/locales/hr.yml | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 src/main/resources/locales/hr.yml

diff --git a/src/main/resources/locales/hr.yml b/src/main/resources/locales/hr.yml
new file mode 100644
index 0000000..5332d57
--- /dev/null
+++ b/src/main/resources/locales/hr.yml
@@ -0,0 +1,7 @@
+---
+acidisland:
+  sign:
+    line0: "&1Otok kiseline"
+    line1: "[Ime]"
+    line2: Voda je kiselina!
+    line3: Budi oprezan! &c<3

From 429db88702bbf6124eb675735376a1536bc2553f Mon Sep 17 00:00:00 2001
From: CuteLittleSky <62592731+CuteLittleSky@users.noreply.github.com>
Date: Sat, 15 Jun 2024 15:45:28 +0800
Subject: [PATCH 08/15] Update AcidTask.java

---
 src/main/java/world/bentobox/acidisland/world/AcidTask.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/java/world/bentobox/acidisland/world/AcidTask.java b/src/main/java/world/bentobox/acidisland/world/AcidTask.java
index f5be30e..fd2a416 100644
--- a/src/main/java/world/bentobox/acidisland/world/AcidTask.java
+++ b/src/main/java/world/bentobox/acidisland/world/AcidTask.java
@@ -37,6 +37,8 @@ public class AcidTask {
         i.add(EntityType.POLAR_BEAR);
         i.add(EntityType.TURTLE);
         i.add(EntityType.DROWNED);
+        i.add(EntityType.GUARDIAN);
+        i.add(EntityType.ELDER_GUARDIAN);
         Enums.getIfPresent(EntityType.class, "AXOLOTL").toJavaUtil().ifPresent(i::add);
         IMMUNE = Collections.unmodifiableList(i);
     }

From 3e728916eecf8b2648d2aefc64317fdf330cc521 Mon Sep 17 00:00:00 2001
From: tastybento <tastybento@users.noreply.github.com>
Date: Sat, 20 Jul 2024 07:48:19 -0700
Subject: [PATCH 09/15] Return the Pladdon that was created

---
 .../java/world/bentobox/acidisland/AcidIslandPladdon.java | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/main/java/world/bentobox/acidisland/AcidIslandPladdon.java b/src/main/java/world/bentobox/acidisland/AcidIslandPladdon.java
index a54acd5..f345450 100644
--- a/src/main/java/world/bentobox/acidisland/AcidIslandPladdon.java
+++ b/src/main/java/world/bentobox/acidisland/AcidIslandPladdon.java
@@ -2,12 +2,18 @@
 
 
 import world.bentobox.bentobox.api.addons.Addon;
+import world.bentobox.bentobox.api.addons.GameModeAddon;
 import world.bentobox.bentobox.api.addons.Pladdon;
 
 public class AcidIslandPladdon extends Pladdon {
 
+    private GameModeAddon addon;
+
     @Override
     public Addon getAddon() {
-        return new AcidIsland();
+        if (addon == null) {
+            addon = new AcidIsland();
+        }
+        return addon;
     }
 }

From 48d5b63c1111815e8fffbeb955986d3d8f2aa3b3 Mon Sep 17 00:00:00 2001
From: tastybento <tastybento@users.noreply.github.com>
Date: Sun, 21 Jul 2024 19:19:35 -0700
Subject: [PATCH 10/15] Add permissions to reduce acid damage

---
 .../acidisland/listeners/AcidEffect.java       | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/main/java/world/bentobox/acidisland/listeners/AcidEffect.java b/src/main/java/world/bentobox/acidisland/listeners/AcidEffect.java
index 914fcb8..c0f0806 100644
--- a/src/main/java/world/bentobox/acidisland/listeners/AcidEffect.java
+++ b/src/main/java/world/bentobox/acidisland/listeners/AcidEffect.java
@@ -178,7 +178,14 @@ protected boolean checkForRain(Player player) {
             // Check they are still in this world
         } else if (wetPlayers.containsKey(player) && wetPlayers.get(player) < System.currentTimeMillis()) {
             double protection = addon.getSettings().getAcidRainDamage() * getDamageReduced(player);
-            double totalDamage = Math.max(0, addon.getSettings().getAcidRainDamage() - protection);
+
+            User user = User.getInstance(player);
+            // Get the percentage reduction and ensure the value is between 0 and 100
+            double percent = (100
+                    - Math.max(0, Math.min(100, user.getPermissionValue("acidisland.protection.rain", 0)))) / 100D;
+
+            double totalDamage = Math.max(0, addon.getSettings().getAcidRainDamage() - protection) * percent;
+
             AcidRainEvent event = new AcidRainEvent(player, totalDamage, protection,
                     addon.getSettings().getAcidRainEffects());
             Bukkit.getPluginManager().callEvent(event);
@@ -206,7 +213,14 @@ protected boolean continuouslyHurtPlayer(Player player) {
             return true;
         } else if (burningPlayers.containsKey(player) && burningPlayers.get(player) < System.currentTimeMillis()) {
             double protection = addon.getSettings().getAcidDamage() * getDamageReduced(player);
-            double totalDamage = Math.max(0, addon.getSettings().getAcidDamage() - protection);
+
+            User user = User.getInstance(player);
+            // Get the percentage reduction and ensure the value is between 0 and 100
+            double percent = (100
+                    - Math.max(0, Math.min(100, user.getPermissionValue("acidisland.protection.acid", 0)))) / 100D;
+
+            double totalDamage = Math.max(0, addon.getSettings().getAcidDamage() - protection) * percent;
+
             AcidEvent event = new AcidEvent(player, totalDamage, protection, addon.getSettings().getAcidEffects());
             addon.getServer().getPluginManager().callEvent(event);
             if (!event.isCancelled()) {

From 47830d1befdf69d7e46bd66e51b085602d0e4a7b Mon Sep 17 00:00:00 2001
From: tastybento <tastybento@users.noreply.github.com>
Date: Sat, 17 Aug 2024 08:16:24 -0700
Subject: [PATCH 11/15] Latest config.yml

---
 src/main/resources/config.yml | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
index a75dde6..efc95dc 100644
--- a/src/main/resources/config.yml
+++ b/src/main/resources/config.yml
@@ -106,7 +106,7 @@ world:
   # It is the same for every dimension : Overworld, Nether and End.
   # This value cannot be changed mid-game and the plugin will not start if it is different.
   # /!\ BentoBox currently does not support changing this value mid-game. If you do need to change it, do a full reset of your databases and worlds.
-  distance-between-islands: 400
+  distance-between-islands: 64
   # Default protection range radius in blocks. Cannot be larger than distance.
   # Admins can change protection sizes for players individually using /acid range set <player> <new range>
   # or set this permission: acidisland.island.range.<number>
@@ -125,6 +125,8 @@ world:
   # Island height - Lowest is 5.
   # It is the y coordinate of the bedrock block in the schem.
   island-height: 60
+  # Disallow team members from having their own islands.
+  disallow-team-member-islands: false
   # Use your own world generator for this world.
   # In this case, the plugin will not generate anything.
   # /!\ This feature is experimental and might not work as expected or might not work at all.
@@ -223,10 +225,10 @@ world:
   # This setting is toggled in world flags and set by the settings GUI.
   # Mob white list - these mobs will NOT be removed when logging in or doing /island
   remove-mobs-whitelist:
+  - ENDERMAN
+  - ZOMBIFIED_PIGLIN
   - ZOMBIE_VILLAGER
   - WITHER
-  - ZOMBIFIED_PIGLIN
-  - ENDERMAN
   # World flags. These are boolean settings for various flags for this world
   flags:
     CREEPER_DAMAGE: true
@@ -241,14 +243,12 @@ world:
     NATURAL_SPAWNING_OUTSIDE_RANGE: true
     ENTER_EXIT_MESSAGES: true
     ENDERMAN_DEATH_DROP: true
-    LIQUIDS_FLOWING_OUT: false
     OFFLINE_REDSTONE: true
     REMOVE_END_EXIT_ISLAND: true
     OFFLINE_GROWTH: true
     REMOVE_MOBS: true
     ENDER_CHEST: false
     ITEM_FRAME_DAMAGE: false
-    TREES_GROWING_OUTSIDE_RANGE: false
     BOAT: true
   # These are the default protection settings for new islands.
   # The value is the minimum island rank required allowed to do the action
@@ -261,9 +261,11 @@ world:
     BUCKET: 500
     LOCK: 0
     ENDER_PEARL: 500
+    BELL_RINGING: 500
     DOOR: 500
     BREAK_HOPPERS: 500
     FURNACE: 500
+    HURT_TAMED_ANIMALS: 500
     ANVIL: 500
     MINECART: 500
     FISH_SCOOPING: 500
@@ -301,7 +303,9 @@ world:
     CROP_TRAMPLE: 500
     DROPPER: 500
     BREWING: 500
+    MOVE_BOX: 1000
     TNT_PRIMING: 500
+    PARKOUR_CREATIVE: 500
     COLLECT_WATER: 500
     AXOLOTL_SCOOPING: 500
     BUTTON: 500
@@ -333,6 +337,7 @@ world:
     SMITHING: 500
     EXPERIENCE_PICKUP: 500
     HOPPER: 500
+    CANDLES: 500
     LEASH: 500
     MOUNT_INVENTORY: 500
     BREAK_BLOCKS: 500

From 57a287a5772a0b420add676a35e64409ee7bd6eb Mon Sep 17 00:00:00 2001
From: tastybento <tastybento@users.noreply.github.com>
Date: Sat, 17 Aug 2024 08:18:23 -0700
Subject: [PATCH 12/15] Update disallow team member islands

---
 src/main/java/world/bentobox/acidisland/AISettings.java | 1 +
 src/main/resources/config.yml                           | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/main/java/world/bentobox/acidisland/AISettings.java b/src/main/java/world/bentobox/acidisland/AISettings.java
index 3b9c39b..a5354e3 100644
--- a/src/main/java/world/bentobox/acidisland/AISettings.java
+++ b/src/main/java/world/bentobox/acidisland/AISettings.java
@@ -202,6 +202,7 @@ public class AISettings implements WorldSettings {
     private int islandHeight = 50;
     
     @ConfigComment("Disallow team members from having their own islands.")
+    @ConfigComment("Only works if players are allowed multiple islands.")
     @ConfigEntry(path = "world.disallow-team-member-islands")
     private boolean disallowTeamMemberIslands = false;
 
diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
index efc95dc..fd2fbeb 100644
--- a/src/main/resources/config.yml
+++ b/src/main/resources/config.yml
@@ -126,6 +126,7 @@ world:
   # It is the y coordinate of the bedrock block in the schem.
   island-height: 60
   # Disallow team members from having their own islands.
+  # Only works if players are allowed multiple islands.
   disallow-team-member-islands: false
   # Use your own world generator for this world.
   # In this case, the plugin will not generate anything.

From 19902684adbe00af8340d099f4a062075b267a8f Mon Sep 17 00:00:00 2001
From: tastybento <tastybento@users.noreply.github.com>
Date: Sat, 17 Aug 2024 08:50:47 -0700
Subject: [PATCH 13/15] Revert

---
 src/main/java/world/bentobox/acidisland/AISettings.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/main/java/world/bentobox/acidisland/AISettings.java b/src/main/java/world/bentobox/acidisland/AISettings.java
index a5354e3..3b9c39b 100644
--- a/src/main/java/world/bentobox/acidisland/AISettings.java
+++ b/src/main/java/world/bentobox/acidisland/AISettings.java
@@ -202,7 +202,6 @@ public class AISettings implements WorldSettings {
     private int islandHeight = 50;
     
     @ConfigComment("Disallow team members from having their own islands.")
-    @ConfigComment("Only works if players are allowed multiple islands.")
     @ConfigEntry(path = "world.disallow-team-member-islands")
     private boolean disallowTeamMemberIslands = false;
 

From 2a144b562ffa7684cbd5805c8baf9a1c2c9d8399 Mon Sep 17 00:00:00 2001
From: tastybento <tastybento@users.noreply.github.com>
Date: Sat, 17 Aug 2024 09:35:59 -0700
Subject: [PATCH 14/15] Add settings to config.yml

https://github.com/BentoBoxWorld/BentoBox/issues/2470
---
 pom.xml                                       |  2 +-
 .../world/bentobox/acidisland/AISettings.java | 28 +++++++++++++++++--
 src/main/resources/config.yml                 | 13 ++++++---
 3 files changed, 36 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index 13f7cad..77f934b 100644
--- 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.3.0-SNAPSHOT</bentobox.version>
+        <bentobox.version>2.5.0-SNAPSHOT</bentobox.version>
         <!-- Revision variable removes warning about dynamic version -->
         <revision>${build.version}-SNAPSHOT</revision>
         <!-- Do not change unless you want different name for local builds. -->
diff --git a/src/main/java/world/bentobox/acidisland/AISettings.java b/src/main/java/world/bentobox/acidisland/AISettings.java
index 3b9c39b..2dc9988 100644
--- a/src/main/java/world/bentobox/acidisland/AISettings.java
+++ b/src/main/java/world/bentobox/acidisland/AISettings.java
@@ -11,6 +11,7 @@
 
 import com.google.common.base.Enums;
 
+import world.bentobox.bentobox.BentoBox;
 import world.bentobox.bentobox.api.configuration.ConfigComment;
 import world.bentobox.bentobox.api.configuration.ConfigEntry;
 import world.bentobox.bentobox.api.configuration.StoreAt;
@@ -201,9 +202,14 @@ public class AISettings implements WorldSettings {
     @ConfigEntry(path = "world.island-height")
     private int islandHeight = 50;
     
-    @ConfigComment("Disallow team members from having their own islands.")
+    @ConfigComment("The number of concurrent islands a player can have in the world")
+    @ConfigComment("A value of 0 will use the BentoBox config.yml default")
+    @ConfigEntry(path = "world.concurrent-islands")
+    private int concurrentIslands = 0;
+
+    @ConfigComment("Disallow players to have other islands if they are in a team.")
     @ConfigEntry(path = "world.disallow-team-member-islands")
-    private boolean disallowTeamMemberIslands = false;
+    boolean disallowTeamMemberIslands = true;
 
     @ConfigComment("Use your own world generator for this world.")
     @ConfigComment("In this case, the plugin will not generate anything.")
@@ -2100,4 +2106,22 @@ public boolean isDisallowTeamMemberIslands() {
     public void setDisallowTeamMemberIslands(boolean disallowTeamMemberIslands) {
         this.disallowTeamMemberIslands = disallowTeamMemberIslands;
     }
+
+    /**
+     * @return the concurrentIslands
+     */
+    @Override
+    public int getConcurrentIslands() {
+        if (concurrentIslands <= 0) {
+            return BentoBox.getInstance().getSettings().getIslandNumber();
+        }
+        return concurrentIslands;
+    }
+
+    /**
+     * @param concurrentIslands the concurrentIslands to set
+     */
+    public void setConcurrentIslands(int concurrentIslands) {
+        this.concurrentIslands = concurrentIslands;
+    }
 }
diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
index fd2fbeb..984485e 100644
--- a/src/main/resources/config.yml
+++ b/src/main/resources/config.yml
@@ -125,9 +125,11 @@ world:
   # Island height - Lowest is 5.
   # It is the y coordinate of the bedrock block in the schem.
   island-height: 60
-  # Disallow team members from having their own islands.
-  # Only works if players are allowed multiple islands.
-  disallow-team-member-islands: false
+  # The number of concurrent islands a player can have in the world
+  # A value of 0 will use the BentoBox config.yml default
+  concurrent-islands: 1
+  # Disallow players to have other islands if they are in a team.
+  disallow-team-member-islands: true
   # Use your own world generator for this world.
   # In this case, the plugin will not generate anything.
   # /!\ This feature is experimental and might not work as expected or might not work at all.
@@ -227,9 +229,9 @@ world:
   # Mob white list - these mobs will NOT be removed when logging in or doing /island
   remove-mobs-whitelist:
   - ENDERMAN
-  - ZOMBIFIED_PIGLIN
   - ZOMBIE_VILLAGER
   - WITHER
+  - ZOMBIFIED_PIGLIN
   # World flags. These are boolean settings for various flags for this world
   flags:
     CREEPER_DAMAGE: true
@@ -243,13 +245,16 @@ world:
     PREVENT_TELEPORT_WHEN_FALLING: false
     NATURAL_SPAWNING_OUTSIDE_RANGE: true
     ENTER_EXIT_MESSAGES: true
+    ALLOW_MOVE_BOX: true
     ENDERMAN_DEATH_DROP: true
+    LIQUIDS_FLOWING_OUT: false
     OFFLINE_REDSTONE: true
     REMOVE_END_EXIT_ISLAND: true
     OFFLINE_GROWTH: true
     REMOVE_MOBS: true
     ENDER_CHEST: false
     ITEM_FRAME_DAMAGE: false
+    TREES_GROWING_OUTSIDE_RANGE: false
     BOAT: true
   # These are the default protection settings for new islands.
   # The value is the minimum island rank required allowed to do the action

From 284e7e9601bbac408969d9fb753fe24e01754c56 Mon Sep 17 00:00:00 2001
From: tastybento <tastybento@users.noreply.github.com>
Date: Sat, 17 Aug 2024 09:41:29 -0700
Subject: [PATCH 15/15] Update API requirement

---
 src/main/resources/addon.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/addon.yml b/src/main/resources/addon.yml
index ffff1f8..ec1e131 100755
--- a/src/main/resources/addon.yml
+++ b/src/main/resources/addon.yml
@@ -1,7 +1,7 @@
 name: AcidIsland
 main: world.bentobox.acidisland.AcidIsland
 version: ${version}${build.number}
-api-version: 1.22.1
+api-version: 2.4.0
 metrics: true
 repository: "BentoBoxWorld/AcidIsland"
 icon: "OAK_BOAT"