From ea3e92ea6706498f8c5c89b2d44b853b86c3fb6f Mon Sep 17 00:00:00 2001
From: BONNe <bonne@bonne.id.lv>
Date: Thu, 10 Mar 2022 17:50:37 +0200
Subject: [PATCH 1/8] Update to 1.18 version (#126)

* Update versions

* Add proper min height usage
---
 pom.xml                                                |  8 ++++----
 .../bentobox/acidisland/world/ChunkGeneratorWorld.java | 10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1f1065b..27bf1c0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,14 +58,14 @@
         <!-- Non-minecraft related dependencies -->
         <powermock.version>2.0.9</powermock.version>
         <!-- More visible way how to change dependency versions -->
-        <spigot.version>1.17-R0.1-SNAPSHOT</spigot.version>
-        <bentobox.version>1.18.0</bentobox.version>
+        <spigot.version>1.18-R0.1-SNAPSHOT</spigot.version>
+        <bentobox.version>1.20.0</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. -->
         <build.number>-LOCAL</build.number>
         <!-- This allows to change between versions. -->
-        <build.version>1.15.2</build.version>
+        <build.version>1.16.0</build.version>
         <!-- Sonar Cloud -->
         <sonar.projectKey>BentoBoxWorld_AcidIsland</sonar.projectKey>
         <sonar.organization>bentobox-world</sonar.organization>
@@ -366,4 +366,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
\ No newline at end of file
+</project>
diff --git a/src/main/java/world/bentobox/acidisland/world/ChunkGeneratorWorld.java b/src/main/java/world/bentobox/acidisland/world/ChunkGeneratorWorld.java
index 69e094d..9230bc1 100644
--- a/src/main/java/world/bentobox/acidisland/world/ChunkGeneratorWorld.java
+++ b/src/main/java/world/bentobox/acidisland/world/ChunkGeneratorWorld.java
@@ -44,9 +44,9 @@ public class ChunkGeneratorWorld extends ChunkGenerator {
 
     public ChunkData generateChunks(World world) {
         ChunkData result = createChunkData(world);
-        int sh = seaHeight.getOrDefault(world.getEnvironment(), 0);
-        if (sh > 0) {
-            result.setRegion(0, 0, 0, 16, sh + 1, 16, Material.WATER);
+        int sh = seaHeight.getOrDefault(world.getEnvironment(), world.getMinHeight());
+        if (sh > world.getMinHeight()) {
+            result.setRegion(0, world.getMinHeight(), 0, 16, sh + 1, 16, Material.WATER);
         }
         if (world.getEnvironment().equals(Environment.NETHER) && addon.getSettings().isNetherRoof()) {
             roofChunk.forEach((k,v) -> result.setBlock(k.getBlockX(), world.getMaxHeight() + k.getBlockY(), k.getBlockZ(), v));
@@ -65,7 +65,7 @@ public class ChunkGeneratorWorld extends ChunkGenerator {
             world.getEnvironment() == Environment.NETHER ? addon.getSettings().getDefaultNetherBiome() : addon.getSettings().getDefaultEndBiome();
             for (int x = 0; x < 16; x+=4) {
                 for (int z = 0; z < 16; z+=4) {
-                    for (int y = 0; y < world.getMaxHeight(); y+=4) {
+                    for (int y = world.getMinHeight(); y < world.getMaxHeight(); y+=4) {
                         biomeGrid.setBiome(x, y, z, biome);
                     }
                 }
@@ -158,4 +158,4 @@ public class ChunkGeneratorWorld extends ChunkGenerator {
     private void setBlock(int x, int y, int z, Material m) {
         roofChunk.put(new Vector(x, y, z), m);
     }
-}
\ No newline at end of file
+}

From 8c8c70d749fd1f07bbb75c23fcb18ed21912b11c Mon Sep 17 00:00:00 2001
From: tastybento <tastybento@wasteofplastic.com>
Date: Sun, 20 Mar 2022 19:43:12 +0000
Subject: [PATCH 2/8] Added ability to set the default water block

Can be set to anything, but LAVA is the most likely for the nether

Also reworked the nether and end islands to not assume water.

https://github.com/BentoBoxWorld/AcidIsland/issues/63
---
 .../world/bentobox/acidisland/AISettings.java |  33 +++++-
 .../acidisland/world/ChunkGeneratorWorld.java |  15 +--
 src/main/resources/blueprints/end-island.blu  | Bin 6119 -> 1401 bytes
 .../resources/blueprints/nether-island.blu    | Bin 8347 -> 2789 bytes
 src/main/resources/config.yml                 |  12 +++
 .../world/ChunkGeneratorWorldTest.java        |  96 +++++++++++-------
 6 files changed, 114 insertions(+), 42 deletions(-)

diff --git a/src/main/java/world/bentobox/acidisland/AISettings.java b/src/main/java/world/bentobox/acidisland/AISettings.java
index 2ec0599..872a099 100644
--- a/src/main/java/world/bentobox/acidisland/AISettings.java
+++ b/src/main/java/world/bentobox/acidisland/AISettings.java
@@ -9,6 +9,7 @@ import java.util.Set;
 
 import org.bukkit.Difficulty;
 import org.bukkit.GameMode;
+import org.bukkit.Material;
 import org.bukkit.block.Biome;
 import org.bukkit.entity.EntityType;
 import org.bukkit.potion.PotionEffectType;
@@ -206,7 +207,7 @@ public class AISettings implements WorldSettings {
     @ConfigComment("It is the y coordinate of the bedrock block in the schem.")
     @ConfigEntry(path = "world.island-height")
     private int islandHeight = 50;
-
+    
     @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)
@@ -216,6 +217,10 @@ public class AISettings implements WorldSettings {
     @ConfigComment("Minimum is 0, which means you are playing Skyblock!")
     @ConfigEntry(path = "world.sea-height")
     private int seaHeight = 54;
+    
+    @ConfigComment("Water block. This should usually stay as WATER, but may be LAVA for fun")
+    @ConfigEntry(path = "world.water-block", needsReset = true)
+    private Material waterBlock = Material.WATER;
 
     @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.")
@@ -260,6 +265,10 @@ public class AISettings implements WorldSettings {
     @ConfigComment("Changing mid-game will cause problems!")
     @ConfigEntry(path = "world.nether.sea-height", needsReset = true)
     private int netherSeaHeight = 54;
+    
+    @ConfigComment("Water block. This should usually stay as WATER, but may be LAVA for fun")
+    @ConfigEntry(path = "world.nether.water-block", needsReset = true)
+    private Material netherWaterBlock = Material.WATER;
 
     @ConfigComment("Make the nether roof, if false, there is nothing up there")
     @ConfigComment("Change to false if lag is a problem from the generation")
@@ -294,6 +303,10 @@ public class AISettings implements WorldSettings {
     @ConfigComment("Changing mid-game will cause problems!")
     @ConfigEntry(path = "world.end.sea-height", needsReset = true)
     private int endSeaHeight = 54;
+    
+    @ConfigComment("Water block. This should usually stay as WATER, but may be LAVA for fun")
+    @ConfigEntry(path = "world.end.water-block", needsReset = true)
+    private Material endWaterBlock = Material.WATER;
 
     @ConfigComment("This option indicates if obsidian platform in the end should be generated")
     @ConfigComment("when player enters the end world.")
@@ -1960,4 +1973,22 @@ public class AISettings implements WorldSettings {
     public void setMakeEndPortals(boolean makeEndPortals) {
         this.makeEndPortals = makeEndPortals;
     }
+    public Material getWaterBlock() {
+        return waterBlock;
+    }
+    public void setWaterBlock(Material waterBlock) {
+        this.waterBlock = waterBlock;
+    }
+    public Material getNetherWaterBlock() {
+        return netherWaterBlock;
+    }
+    public void setNetherWaterBlock(Material netherWaterBlock) {
+        this.netherWaterBlock = netherWaterBlock;
+    }
+    public Material getEndWaterBlock() {
+        return endWaterBlock;
+    }
+    public void setEndWaterBlock(Material endWaterBlock) {
+        this.endWaterBlock = endWaterBlock;
+    }
 }
diff --git a/src/main/java/world/bentobox/acidisland/world/ChunkGeneratorWorld.java b/src/main/java/world/bentobox/acidisland/world/ChunkGeneratorWorld.java
index 9230bc1..620b991 100644
--- a/src/main/java/world/bentobox/acidisland/world/ChunkGeneratorWorld.java
+++ b/src/main/java/world/bentobox/acidisland/world/ChunkGeneratorWorld.java
@@ -27,8 +27,10 @@ public class ChunkGeneratorWorld extends ChunkGenerator {
 
     private final AcidIsland addon;
     private final Random rand = new Random();
-    private final Map<Environment, Integer> seaHeight = new EnumMap<>(Environment.class);
+    private final Map<Environment, WorldConfig> seaHeight = new EnumMap<>(Environment.class);
     private final Map<Vector, Material> roofChunk = new HashMap<>();
+    
+    private record WorldConfig(int seaHeight, Material waterBlock) {}
 
     /**
      * @param addon - addon
@@ -36,17 +38,18 @@ public class ChunkGeneratorWorld extends ChunkGenerator {
     public ChunkGeneratorWorld(AcidIsland addon) {
         super();
         this.addon = addon;
-        seaHeight.put(Environment.NORMAL, addon.getSettings().getSeaHeight());
-        seaHeight.put(Environment.NETHER, addon.getSettings().getNetherSeaHeight());
-        seaHeight.put(Environment.THE_END, addon.getSettings().getEndSeaHeight());
+        seaHeight.put(Environment.NORMAL, new WorldConfig(addon.getSettings().getSeaHeight(), addon.getSettings().getWaterBlock()));
+        seaHeight.put(Environment.NETHER, new WorldConfig(addon.getSettings().getNetherSeaHeight(), addon.getSettings().getNetherWaterBlock()));
+        seaHeight.put(Environment.THE_END, new WorldConfig(addon.getSettings().getEndSeaHeight(), addon.getSettings().getEndWaterBlock()));
         makeNetherRoof();
     }
 
     public ChunkData generateChunks(World world) {
         ChunkData result = createChunkData(world);
-        int sh = seaHeight.getOrDefault(world.getEnvironment(), world.getMinHeight());
+        WorldConfig wc = seaHeight.get(world.getEnvironment());
+        int sh = wc.seaHeight();
         if (sh > world.getMinHeight()) {
-            result.setRegion(0, world.getMinHeight(), 0, 16, sh + 1, 16, Material.WATER);
+            result.setRegion(0, world.getMinHeight(), 0, 16, sh + 1, 16, wc.waterBlock());
         }
         if (world.getEnvironment().equals(Environment.NETHER) && addon.getSettings().isNetherRoof()) {
             roofChunk.forEach((k,v) -> result.setBlock(k.getBlockX(), world.getMaxHeight() + k.getBlockY(), k.getBlockZ(), v));
diff --git a/src/main/resources/blueprints/end-island.blu b/src/main/resources/blueprints/end-island.blu
index 454b5c44365bc13d060c5915d13551b165976226..33fda34354e168e1762a5f95a15d99ed1742178c 100644
GIT binary patch
delta 1354
zcmV-Q1-1I;FZl`%P)h>@6aWYa2mp(lbX1WJ8h_1PVQ->J6#XlP&(zFdt=5DOzSMM^
z?AoR_d3j+C8Fkc&6by{D-KPKj4WPJb8yIG|NYXY`@yzv}bMHNa#CO9d&(s(g)L&e%
z$Rqy3Fby^jeDT=B@L}{Q{w17~`I;__f#WzARvVdE{9atP(bRl5W?nGg+z?L0E1sE8
z=YJtt@<Bj0Zp2o;69$}c7Wg*4H1~wl&<j>8y0DkTi|ACK$7lT%uZsk{;Y3@q_uVxO
zljjaUQ`4BSAc^zo$H*OxZ^WZ3FW57G^+aE}F-Xuprs72EbH-VW_Wog}!9{7{NzmQ+
zPbV+(8C`_paYJ@Z^N^D`9|h1N$!^30pMRDD#~FBT#&yASBTtxfJo-XC8%-5guqqE9
zLFT=4zy$%fGH?J=t$HG_p3hV)okO9*fkPD%RL*fdIma*s3Y2mLm~jM{@Uk*=XCaG+
zn9>qZebJJyQHA*bS_7a|PvCOd(R%}O0@7Qf`ohg(hh*83V|l(N%y-Bui|n`WJ%6Oi
zlDXV(cj4BfZnWNc8ydQ^;MG}@xd60x+jv3dzX+olgm1!T8c4j9MT6gdt7Y4RRuHb*
zv)yLHcso0-eaGqZMA+y}eAdgLWnK5W@gaZP(n0I~pUK_L-EjQd7udM3jW>C?AK#7=
zG|SRP6B%_M?{5;gN@K&gir7Yvzkh~fck(d&ckGUCZ&T#1KJw51o*st+?L$ppaCL7%
z);-R^uX6WyvxqGi@fES*dJ2~8DddH^goTROxy?fp8%{X5q;Ry>Kvl~J!K(+si3h=H
z2gyk%o@u*K<VL_p$8i<~JH9s8#9P|4fb-zljMijJ?TCkjt=3#~-Xg$ORe!ddsA0o;
z^b#&q4I60t0z_$9)2W7?n{TDTcHBLKZ;6U8yjHXZ@XiR!Yg2CxsGX4<*<r9aHd;y|
zuCP@pCcN_9Q8E8Y2FI#_cdHiObDfQb>&AtyTNfPIc1ws=*%||>64#(g45><7PL-;r
z7*;+APCW=tJV;JEdeFI&Ie(j_hiQW~G%CqHr5S#%)L0n!?u-b+VozZ6a7Rr)2>Cia
zOz2AwzYt~asdz<s&Lq3sStA45AcD5W5>`-czXI#`CGFlPS)_cI(nb7SDOr>?i)z?#
zSHU`|>cBp}LWQKMdt3yg=My&29S`6+0s8D60or~jE-@gN7?4X0$A2Y)OE-ecHj+xV
zs)a31wF+`cVJo^spo9ae8&KSUa{+QJ#G_K?3R)2EB6sT%pF4|S@26hoi`hw!Q@4{I
z@3sfqqh@|j_tNIJ|F7|-tA94>fbr$#FD>7^maF+53rWzinpu2c-NY)lLTQD|+(C0r
zg%{sVaJKle@PMc(zJJZ{ywr4>O%2qYz%lM+gZpk4pR#m{!qd8FlSn6tuUC0bPXez(
z+A92ho4>!Vaa1yJPSKTQx6DL5rLTN^Sid?T<IB<q)EK(W?TLwWx(bC?dwdO@dAQm9
zX6eh7w(>11SF-PXDL`oGkQKGN<pq!|({Ju%xT>sx3PyuYe1DY}&@p`##g~7*NS5F4
z5~y9^(lS3o{<8RTEBt)<i}~#-)Nh>wrl+94ItNTof!{jw*Vp0~erM5dIKL|StJAyp
z8?L`=+4-htL#`{6QT1aUALDCio6X{Dpp2%b@j79D#EI9Y@s=Lpo@x9!93la9_zs7`
z=Wl)Z_#aS92Pg;t;)W*k1ONc>LI40zO928D02BZS2nYa+n{-qF;)W*k1ONc>LI9Jr
M7cB-W1poj501~jFmjD0&

literal 6119
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

diff --git a/src/main/resources/blueprints/nether-island.blu b/src/main/resources/blueprints/nether-island.blu
index 06b38913c0cb1d010a19da02a326bff450934af4..844be5729c56a711abb71262e308f69c49729dcc 100644
GIT binary patch
literal 2789
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

literal 8347
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

diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
index b9275a2..b4c0545 100644
--- a/src/main/resources/config.yml
+++ b/src/main/resources/config.yml
@@ -132,6 +132,10 @@ world:
   # Sea height (don't changes this mid-game unless you delete the world)
   # Minimum is 0, which means you are playing Skyblock!
   sea-height: 54
+  # Water block this should usually stay as WATER, but may be LAVA for fun
+  # Changing mid-game will cause problems!
+  # /!\ 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.
+  water-block: WATER
   # 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
@@ -162,6 +166,10 @@ world:
     # Changing mid-game will cause problems!
     # /!\ 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.
     sea-height: 54
+    # Water block this should usually stay as WATER, but may be LAVA for fun
+    # Changing mid-game will cause problems!
+    # /!\ 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.
+    water-block: WATER
     # Make the nether roof, if false, there is nothing up there
     # Change to false if lag is a problem from the generation
     # Only applies to islands Nether
@@ -186,6 +194,10 @@ world:
     # Changing mid-game will cause problems!
     # /!\ 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.
     sea-height: 54
+    # Water block this should usually stay as WATER, but may be LAVA for fun
+    # Changing mid-game will cause problems!
+    # /!\ 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.
+    water-block: WATER
     # This option indicates if obsidian platform in the end should be generated when player enters the end world.
     # Added since 1.14.6
     create-obsidian-platform: false
diff --git a/src/test/java/world/bentobox/acidisland/world/ChunkGeneratorWorldTest.java b/src/test/java/world/bentobox/acidisland/world/ChunkGeneratorWorldTest.java
index 9decf0e..d3c5d2c 100644
--- a/src/test/java/world/bentobox/acidisland/world/ChunkGeneratorWorldTest.java
+++ b/src/test/java/world/bentobox/acidisland/world/ChunkGeneratorWorldTest.java
@@ -29,8 +29,8 @@ import org.powermock.api.mockito.PowerMockito;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
 
-import world.bentobox.acidisland.AcidIsland;
 import world.bentobox.acidisland.AISettings;
+import world.bentobox.acidisland.AcidIsland;
 
 /**
  * @author tastybento
@@ -48,7 +48,6 @@ public class ChunkGeneratorWorldTest {
     private final Random random = new Random();
     @Mock
     private BiomeGrid biomeGrid;
-    @Mock
     private AISettings settings;
     @Mock
     private ChunkData data;
@@ -66,54 +65,79 @@ public class ChunkGeneratorWorldTest {
         when(world.getEnvironment()).thenReturn(World.Environment.NORMAL);
         when(world.getMaxHeight()).thenReturn(256);
         // Settings
+        settings = new AISettings();
         when(addon.getSettings()).thenReturn(settings);
-        when(settings.getSeaHeight()).thenReturn(0);
-        when(settings.isNetherRoof()).thenReturn(true);
-
-        // Instance
-        cg = new ChunkGeneratorWorld(addon);
     }
 
-    /**
-     */
-    @After
-    public void tearDown() {
-    }
 
     /**
      * Test method for {@link world.bentobox.bskyblock.generators.ChunkGeneratorWorld#generateChunkData(org.bukkit.World, java.util.Random, int, int, org.bukkit.generator.ChunkGenerator.BiomeGrid)}.
      */
+    @SuppressWarnings("deprecation")
     @Test
-    public void testGenerateChunkDataWorldRandomIntIntBiomeGridOverworldVoid() {
+    public void testGenerateChunkDataWorldRandomIntIntBiomeGridOverworldNormal() {
+        // Instance
+        cg = new ChunkGeneratorWorld(addon);
         ChunkData cd = cg.generateChunkData(world, random, 0 , 0 , biomeGrid);
         assertEquals(data, cd);
         // Verifications
         // Default biome
-        verify(settings).getDefaultBiome();
         verify(biomeGrid, times(1024)).setBiome(anyInt(), anyInt(), anyInt(), any());
-        // Sea height
-        verify(settings).getSeaHeight();
         // Void
-        verify(cd, never()).setRegion(anyInt(), anyInt(), anyInt(), anyInt(), anyInt(), anyInt(), any(Material.class));
+        verify(cd).setRegion(0, 0, 0, 16, 55, 16, Material.WATER);
     }
 
     /**
      * Test method for {@link world.bentobox.bskyblock.generators.ChunkGeneratorWorld#generateChunkData(org.bukkit.World, java.util.Random, int, int, org.bukkit.generator.ChunkGenerator.BiomeGrid)}.
      */
+    @SuppressWarnings("deprecation")
+    @Test
+    public void testGenerateChunkDataWorldRandomIntIntBiomeGridOverworldNormalVoid() {
+        settings.setSeaHeight(0);
+        // Instance
+        cg = new ChunkGeneratorWorld(addon);
+        ChunkData cd = cg.generateChunkData(world, random, 0 , 0 , biomeGrid);
+        assertEquals(data, cd);
+        // Verifications
+        // Default biome
+        verify(biomeGrid, times(1024)).setBiome(anyInt(), anyInt(), anyInt(), any());
+        // Void
+        verify(cd, never()).setRegion(anyInt(), anyInt(),anyInt(),anyInt(),anyInt(),anyInt(), any(Material.class));
+    }
+
+    /**
+     * Test method for {@link world.bentobox.bskyblock.generators.ChunkGeneratorWorld#generateChunkData(org.bukkit.World, java.util.Random, int, int, org.bukkit.generator.ChunkGenerator.BiomeGrid)}.
+     */
+    @SuppressWarnings("deprecation")
+    @Test
+    public void testGenerateChunkDataWorldRandomIntIntBiomeGridOverworldVoidLava() {
+        settings.setSeaHeight(54);
+        settings.setWaterBlock(Material.LAVA);
+        cg = new ChunkGeneratorWorld(addon);
+        ChunkData cd = cg.generateChunkData(world, random, 0 , 0 , biomeGrid);
+        assertEquals(data, cd);
+        // Verifications
+        // Default biome
+        verify(biomeGrid, times(1024)).setBiome(anyInt(), anyInt(), anyInt(), any());
+        // Void
+        verify(cd).setRegion(0, 0, 0, 16, 55, 16, Material.LAVA);
+    }
+
+    /**
+     * Test method for {@link world.bentobox.bskyblock.generators.ChunkGeneratorWorld#generateChunkData(org.bukkit.World, java.util.Random, int, int, org.bukkit.generator.ChunkGenerator.BiomeGrid)}.
+     */
+    @SuppressWarnings("deprecation")
     @Test
     public void testGenerateChunkDataWorldRandomIntIntBiomeGridOverworldSea() {
         // Set sea height
-        when(settings.getSeaHeight()).thenReturn(10);
+        settings.setSeaHeight(10);
         // new instance
         cg = new ChunkGeneratorWorld(addon);
         ChunkData cd = cg.generateChunkData(world, random, 0 , 0 , biomeGrid);
         assertEquals(data, cd);
         // Verifications
         // Default biome
-        verify(settings).getDefaultBiome();
         verify(biomeGrid, times(1024)).setBiome(anyInt(), anyInt(), anyInt(), any());
-        // Sea height
-        verify(settings, times(2)).getSeaHeight();
         // Water. Blocks = 16 x 16 x 11 because block 0
         verify(cd).setRegion(0, 0, 0, 16, 11, 16, Material.WATER);
     }
@@ -121,35 +145,34 @@ public class ChunkGeneratorWorldTest {
     /**
      * Test method for {@link world.bentobox.bskyblock.generators.ChunkGeneratorWorld#generateChunkData(org.bukkit.World, java.util.Random, int, int, org.bukkit.generator.ChunkGenerator.BiomeGrid)}.
      */
+    @SuppressWarnings("deprecation")
     @Test
     public void testGenerateChunkDataWorldRandomIntIntBiomeGridEnd() {
+        settings.setEndSeaHeight(0);
+        // Instance
+        cg = new ChunkGeneratorWorld(addon);
         when(world.getEnvironment()).thenReturn(World.Environment.THE_END);
         ChunkData cd = cg.generateChunkData(world, random, 0 , 0 , biomeGrid);
         assertEquals(data, cd);
         // Verifications
-        // Default biome
-        verify(settings).getDefaultEndBiome();
         // Set biome in end
         verify(biomeGrid, times(1024)).setBiome(anyInt(), anyInt(), anyInt(), any());
-        // Sea height
-        verify(settings).getSeaHeight();
         // Void
-        verify(cd, never()).setRegion(anyInt(), anyInt(), anyInt(), anyInt(), anyInt(), anyInt(), any(Material.class));
+        verify(cd, never()).setRegion(anyInt(), anyInt(),anyInt(),anyInt(),anyInt(),anyInt(), any(Material.class));
     }
 
     /**
      * Test method for {@link world.bentobox.bskyblock.generators.ChunkGeneratorWorld#generateChunkData(org.bukkit.World, java.util.Random, int, int, org.bukkit.generator.ChunkGenerator.BiomeGrid)}.
      */
+    @SuppressWarnings("deprecation")
     @Test
     public void testGenerateChunkDataWorldRandomIntIntBiomeGridNetherWithRoof() {
+        // Instance
+        cg = new ChunkGeneratorWorld(addon);
         when(world.getEnvironment()).thenReturn(World.Environment.NETHER);
         ChunkData cd = cg.generateChunkData(world, random, 0 , 0 , biomeGrid);
         assertEquals(data, cd);
         // Verifications
-        // Default biome
-        verify(settings).getDefaultNetherBiome();
-        // Nether roof check
-        verify(settings).isNetherRoof();
         // Never set biome in nether
         verify(biomeGrid, times(1024)).setBiome(anyInt(), anyInt(), anyInt(), any());
         // Nether roof - at least bedrock layer
@@ -159,17 +182,16 @@ public class ChunkGeneratorWorldTest {
     /**
      * Test method for {@link world.bentobox.bskyblock.generators.ChunkGeneratorWorld#generateChunkData(org.bukkit.World, java.util.Random, int, int, org.bukkit.generator.ChunkGenerator.BiomeGrid)}.
      */
+    @SuppressWarnings("deprecation")
     @Test
     public void testGenerateChunkDataWorldRandomIntIntBiomeGridNetherNoRoof() {
-        when(settings.isNetherRoof()).thenReturn(false);
+        settings.setNetherRoof(false);
+        // Instance
+        cg = new ChunkGeneratorWorld(addon);
         when(world.getEnvironment()).thenReturn(World.Environment.NETHER);
         ChunkData cd = cg.generateChunkData(world, random, 0 , 0 , biomeGrid);
         assertEquals(data, cd);
         // Verifications
-        // Nether roof check
-        verify(settings).isNetherRoof();
-        // Nether roof check
-        verify(settings).isNetherRoof();
         // Never set biome in nether
         verify(biomeGrid, times(1024)).setBiome(anyInt(), anyInt(), anyInt(), any());
         // Nether roof - at least bedrock layer
@@ -181,6 +203,8 @@ public class ChunkGeneratorWorldTest {
      */
     @Test
     public void testCanSpawnWorldIntInt() {
+        // Instance
+        cg = new ChunkGeneratorWorld(addon);
         assertTrue(cg.canSpawn(mock(World.class), 0, 1));
     }
 
@@ -189,6 +213,8 @@ public class ChunkGeneratorWorldTest {
      */
     @Test
     public void testGetDefaultPopulatorsWorld() {
+        // Instance
+        cg = new ChunkGeneratorWorld(addon);
         assertTrue(cg.getDefaultPopulators(mock(World.class)).isEmpty());
     }
 

From 5868815e9dc798586fec09f93e3c90e91b1073cd Mon Sep 17 00:00:00 2001
From: BONNe <bonne@bonne.id.lv>
Date: Tue, 4 Oct 2022 15:07:28 +0300
Subject: [PATCH 3/8] Update to BentoBox 1.21 API

---
 pom.xml                                       |  4 +-
 .../world/bentobox/acidisland/AISettings.java | 62 +++++++++++++------
 2 files changed, 44 insertions(+), 22 deletions(-)

diff --git a/pom.xml b/pom.xml
index 27bf1c0..4ef69b8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,8 +58,8 @@
         <!-- Non-minecraft related dependencies -->
         <powermock.version>2.0.9</powermock.version>
         <!-- More visible way how to change dependency versions -->
-        <spigot.version>1.18-R0.1-SNAPSHOT</spigot.version>
-        <bentobox.version>1.20.0</bentobox.version>
+        <spigot.version>1.19-R0.1-SNAPSHOT</spigot.version>
+        <bentobox.version>1.21.0</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 872a099..60a27f8 100644
--- a/src/main/java/world/bentobox/acidisland/AISettings.java
+++ b/src/main/java/world/bentobox/acidisland/AISettings.java
@@ -1,11 +1,6 @@
 package world.bentobox.acidisland;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 
 import org.bukkit.Difficulty;
 import org.bukkit.GameMode;
@@ -21,10 +16,8 @@ import world.bentobox.bentobox.api.configuration.ConfigEntry;
 import world.bentobox.bentobox.api.configuration.StoreAt;
 import world.bentobox.bentobox.api.configuration.WorldSettings;
 import world.bentobox.bentobox.api.flags.Flag;
-import world.bentobox.bentobox.database.objects.adapters.Adapter;
-import world.bentobox.bentobox.database.objects.adapters.FlagSerializer;
-import world.bentobox.bentobox.database.objects.adapters.FlagSerializer2;
-import world.bentobox.bentobox.database.objects.adapters.PotionEffectListAdapter;
+import world.bentobox.bentobox.database.objects.adapters.*;
+
 
 /**
  * Settings for AcidIsland
@@ -331,13 +324,12 @@ public class AISettings implements WorldSettings {
     @ConfigComment("The value is the minimum island rank required allowed to do the action")
     @ConfigComment("Ranks are: Visitor = 0, Member = 900, Owner = 1000")
     @ConfigEntry(path = "world.default-island-flags")
-    @Adapter(FlagSerializer.class)
-    private Map<Flag, Integer> defaultIslandFlags = new HashMap<>();
+    private Map<String, Integer> defaultIslandFlagNames = new HashMap<>();
 
     @ConfigComment("These are the default settings for new islands")
     @ConfigEntry(path = "world.default-island-settings")
-    @Adapter(FlagSerializer2.class)
-    private Map<Flag, Integer> defaultIslandSettings = new HashMap<>();
+    @Adapter(FlagBooleanSerializer.class)
+    private Map<String, Integer> defaultIslandSettingNames = new HashMap<>();
 
     @ConfigComment("These settings/flags are hidden from users")
     @ConfigComment("Ops can toggle hiding in-game using SHIFT-LEFT-CLICK on flags in settings")
@@ -686,20 +678,50 @@ public class AISettings implements WorldSettings {
     public GameMode getDefaultGameMode() {
         return defaultGameMode;
     }
+
+
+    /**
+     * @return the defaultIslandFlags
+     * @since 1.21.0
+     */
+    @Override
+    public Map<String, Integer> getDefaultIslandFlagNames()
+    {
+        return defaultIslandFlagNames;
+    }
+
+
+    /**
+     * @return the defaultIslandSettings
+     * @since 1.21.0
+     */
+    @Override
+    public Map<String, Integer> getDefaultIslandSettingNames()
+    {
+        return defaultIslandSettingNames;
+    }
+
+
     /**
      * @return the defaultIslandProtection
+     * @deprecated since 1.21
      */
     @Override
     public Map<Flag, Integer> getDefaultIslandFlags() {
-        return defaultIslandFlags;
+        return Collections.emptyMap();
     }
+
+
     /**
      * @return the defaultIslandSettings
+     * @deprecated since 1.21
      */
     @Override
     public Map<Flag, Integer> getDefaultIslandSettings() {
-        return defaultIslandSettings;
+        return Collections.emptyMap();
     }
+
+
     /**
      * @return the difficulty
      */
@@ -1203,14 +1225,14 @@ public class AISettings implements WorldSettings {
     }
     /**
      */
-    public void setDefaultIslandFlags(Map<Flag, Integer> defaultIslandFlags) {
-        this.defaultIslandFlags = defaultIslandFlags;
+    public void setDefaultIslandFlagNames(Map<String, Integer> defaultIslandFlags) {
+        this.defaultIslandFlagNames = defaultIslandFlags;
     }
     /**
      * @param defaultIslandSettings the defaultIslandSettings to set
      */
-    public void setDefaultIslandSettings(Map<Flag, Integer> defaultIslandSettings) {
-        this.defaultIslandSettings = defaultIslandSettings;
+    public void setDefaultIslandSettingNames(Map<String, Integer> defaultIslandSettings) {
+        this.defaultIslandSettingNames = defaultIslandSettings;
     }
     /**
      * @param difficulty the difficulty to set

From 7241845a44405b3bffbfaa8cacd13acc4a5723ad Mon Sep 17 00:00:00 2001
From: BONNe <bonne@bonne.id.lv>
Date: Tue, 4 Oct 2022 15:09:47 +0300
Subject: [PATCH 4/8] Update yamls

---
 src/main/resources/addon.yml  | 2 +-
 src/main/resources/plugin.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/addon.yml b/src/main/resources/addon.yml
index e519db3..54d64da 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.16.5
+api-version: 1.19
 metrics: true
 repository: "BentoBoxWorld/AcidIsland"
 icon: "OAK_BOAT"
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index 5b59b51..afad4c3 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -1,7 +1,7 @@
 name: Pladdon
 main: world.bentobox.acidisland.AcidIslandPladdon
 version: ${version}
-api-version: 1.16
+api-version: 1.21
 description: AcidIsland
 author: tastybento
 depend:

From 0e3db2b6962a56accb1fbf406eb68bc8febcffcd Mon Sep 17 00:00:00 2001
From: BONNe <bonne@bonne.id.lv>
Date: Tue, 4 Oct 2022 15:10:20 +0300
Subject: [PATCH 5/8] Update JDK

---
 .github/workflows/build.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c13f2b9..ac22f52 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -14,11 +14,11 @@ jobs:
       - uses: actions/checkout@v2
         with:
           fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
-      - name: Set up JDK 16
+      - name: Set up JDK 17
         uses: actions/setup-java@v2
         with:
           distribution: 'adopt'
-          java-version: '16'
+          java-version: '17'
       - name: Cache SonarCloud packages
         uses: actions/cache@v2
         with:

From 9e21d9dc86e09b65ac1065cda20b1462182b08ba Mon Sep 17 00:00:00 2001
From: BONNe <bonne@bonne.id.lv>
Date: Tue, 4 Oct 2022 15:19:46 +0300
Subject: [PATCH 6/8] Fix failing unit-tests (#129)

* Version 1.15.2 (#118)

* Add support for 1.16.5

* Fix failing unit-tests

Co-authored-by: tastybento <tastybento@users.noreply.github.com>
---
 .../world/bentobox/acidisland/AISettingsTest.java    | 12 ++++++------
 .../bentobox/acidisland/world/AcidTaskTest.java      |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/test/java/world/bentobox/acidisland/AISettingsTest.java b/src/test/java/world/bentobox/acidisland/AISettingsTest.java
index d2e441a..a5c3032 100644
--- a/src/test/java/world/bentobox/acidisland/AISettingsTest.java
+++ b/src/test/java/world/bentobox/acidisland/AISettingsTest.java
@@ -778,21 +778,21 @@ public class AISettingsTest {
     }
 
     /**
-     * Test method for {@link world.bentobox.acidisland.AISettings#setDefaultIslandFlags(java.util.Map)}.
+     * Test method for {@link world.bentobox.acidisland.AISettings#setDefaultIslandFlagNames(java.util.Map)}.
      */
     @Test
     public void testSetDefaultIslandFlags() {
-        s.setDefaultIslandFlags(Collections.singletonMap(Flags.ANIMAL_NATURAL_SPAWN, 10));
-        assertEquals(10, (int)s.getDefaultIslandFlags().get(Flags.ANIMAL_NATURAL_SPAWN));
+        s.setDefaultIslandFlagNames(Collections.singletonMap(Flags.ANIMAL_NATURAL_SPAWN.getID(), 10));
+        assertEquals(10, (int)s.getDefaultIslandFlagNames().get(Flags.ANIMAL_NATURAL_SPAWN.getID()));
     }
 
     /**
-     * Test method for {@link world.bentobox.acidisland.AISettings#setDefaultIslandSettings(java.util.Map)}.
+     * Test method for {@link world.bentobox.acidisland.AISettings#setDefaultIslandSettingNames(java.util.Map)}.
      */
     @Test
     public void testSetDefaultIslandSettings() {
-        s.setDefaultIslandSettings(Collections.singletonMap(Flags.ANIMAL_NATURAL_SPAWN, 10));
-        assertEquals(10, (int)s.getDefaultIslandSettings().get(Flags.ANIMAL_NATURAL_SPAWN));
+        s.setDefaultIslandSettingNames(Collections.singletonMap(Flags.ANIMAL_NATURAL_SPAWN.getID(), 10));
+        assertEquals(10, (int)s.getDefaultIslandSettingNames().get(Flags.ANIMAL_NATURAL_SPAWN.getID()));
 
     }
 
diff --git a/src/test/java/world/bentobox/acidisland/world/AcidTaskTest.java b/src/test/java/world/bentobox/acidisland/world/AcidTaskTest.java
index 2745a7d..f8b300f 100644
--- a/src/test/java/world/bentobox/acidisland/world/AcidTaskTest.java
+++ b/src/test/java/world/bentobox/acidisland/world/AcidTaskTest.java
@@ -190,7 +190,7 @@ public class AcidTaskTest {
         Item e = mock(Item.class);
         at.applyDamage(e, 0);
 
-        verify(world, never()).playSound(any(), any(Sound.class), anyFloat(), anyFloat());
+        verify(world, never()).playSound(any(Location.class), any(Sound.class), anyFloat(), anyFloat());
         verify(e, never()).remove();
     }
 
@@ -213,7 +213,7 @@ public class AcidTaskTest {
         at.setItemsInWater(map);
         at.applyDamage(e, 0);
 
-        verify(world, never()).playSound(any(), any(Sound.class), anyFloat(), anyFloat());
+        verify(world, never()).playSound(any(Location.class), any(Sound.class), anyFloat(), anyFloat());
         verify(e, never()).remove();
         assertTrue(map.isEmpty());
     }

From 41aa6f4d57a12d656e62f64eec767284a160ad33 Mon Sep 17 00:00:00 2001
From: BONNe <bonne@bonne.id.lv>
Date: Tue, 4 Oct 2022 15:20:20 +0300
Subject: [PATCH 7/8] Init next AcidIsland version

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

diff --git a/pom.xml b/pom.xml
index 4ef69b8..80c1d46 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.16.0</build.version>
+        <build.version>1.17.0</build.version>
         <!-- Sonar Cloud -->
         <sonar.projectKey>BentoBoxWorld_AcidIsland</sonar.projectKey>
         <sonar.organization>bentobox-world</sonar.organization>

From 1b14b0afc5fa87b50a1a0162de13a29524354e1e Mon Sep 17 00:00:00 2001
From: "gitlocalize-app[bot]"
 <55277160+gitlocalize-app[bot]@users.noreply.github.com>
Date: Mon, 31 Oct 2022 08:27:45 +0200
Subject: [PATCH 8/8] Translate ru.yml via GitLocalize (#130)

Co-authored-by: DraimCiDo <danilaorlov4@gmail.com>
---
 src/main/resources/locales/ru.yml | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 src/main/resources/locales/ru.yml

diff --git a/src/main/resources/locales/ru.yml b/src/main/resources/locales/ru.yml
new file mode 100644
index 0000000..21d88dc
--- /dev/null
+++ b/src/main/resources/locales/ru.yml
@@ -0,0 +1,7 @@
+---
+acidisland:
+  sign:
+    line0: "&1AcidIsland"
+    line1: "[name]"
+    line2: Выживание в море!
+    line3: Удачной игры! &c<3