Merge branch 'develop'

pom.xml

@@ -59,13 +59,13 @@
         <powermock.version>2.0.4</powermock.version>
         <!-- More visible way how to change dependency versions -->
         <spigot.version>1.15-R0.1-SNAPSHOT</spigot.version>
-        <bentobox.version>1.9.0</bentobox.version>
+        <bentobox.version>1.11.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.9.2</build.version>
+        <build.version>1.11.0</build.version>
     </properties>
 
     <!-- Profiles will allow to automatically change build version. -->

src/main/java/world/bentobox/acidisland/AISettings.java

@@ -414,6 +414,13 @@ public class AISettings implements WorldSettings {
     @ConfigEntry(path = "island.create-island-on-first-login.abort-on-logout")
     private boolean createIslandOnFirstLoginAbortOnLogout = true;
 
+    @ConfigComment("Create Nether or End islands if they are missing when a player goes through a portal.")
+    @ConfigComment("Nether and End islands are usually pasted when a player makes their island, but if they are")
+    @ConfigComment("missing for some reason, you can switch this on.")
+    @ConfigComment("Note that bedrock removal glitches can exploit this option.")
+    @ConfigEntry(path = "island.create-missing-nether-end-islands")
+    private boolean pasteMissingIslands = false;
+
     // Commands
     @ConfigComment("List of commands to run when a player joins.")
     @ConfigEntry(path = "island.commands.on-join")
@@ -1531,8 +1538,25 @@ public class AISettings implements WorldSettings {
     }
 
     /**
-     *
+     * @return the pasteMissingIslands
-     * @return
+     * @since 1.10.0
+     */
+    @Override
+    public boolean isPasteMissingIslands() {
+        return pasteMissingIslands;
+    }
+
+    /**
+     * @param pasteMissingIslands the pasteMissingIslands to set
+     * @since 1.10.0
+     */
+    public void setPasteMissingIslands(boolean pasteMissingIslands) {
+        this.pasteMissingIslands = pasteMissingIslands;
+    }
+
+    /**
+     * Get acid rain potion effects
+     * @return liust of potion effects
      * @since 1.9.1
      */
     public List<PotionEffectType> getAcidRainEffects() {

src/main/java/world/bentobox/acidisland/events/AcidEvent.java

@@ -1,6 +1,5 @@
 package world.bentobox.acidisland.events;
 
-import java.util.ArrayList;
 import java.util.List;
 
 import org.bukkit.entity.Player;

src/main/java/world/bentobox/acidisland/world/ChunkGeneratorWorld.java

@@ -60,6 +60,7 @@ public class ChunkGeneratorWorld extends ChunkGenerator {
         return generateChunks(world);
     }
 
+    @SuppressWarnings("deprecation")
     private void setBiome(BiomeGrid biomeGrid) {
         Biome biome = addon.getSettings().getDefaultBiome();
         for (int x = 0; x < 16; x++) {

src/main/resources/addon.yml

@@ -51,7 +51,25 @@ permissions:
     description: Player can use the island reset or restart command
     default: true  
   acidisland.island.team:
-    description: Let a player use team commands
+    description: Let a player use team command
+    default: true
+  acidisland.island.team.setowner:
+    description: Let a player change the team owner
+    default: true
+  acidisland.island.team.invite:
+    description: Let a player invite others
+    default: true
+  acidisland.island.team.reject:
+    description: Let a player reject invites
+    default: true
+  acidisland.island.team.leave:
+    description: Let a player leave the team
+    default: true
+  acidisland.island.team.kick:
+    description: Let a player kick team members
+    default: true
+  acidisland.island.team.accept:
+    description: Let a player accept invitations
     default: true
   acidisland.island.team.trust:
     description: Let a player use team trust commands

src/main/resources/config.yml

@@ -358,6 +358,11 @@ island:
     # If set to false, the player's island will be created even if he went offline in the meantime.
     # Note this option has no effect if the delay (see the option above) is set to 0 or less.
     abort-on-logout: true
+  # Create Nether or End islands if they are missing when a player goes through a portal.
+  # Nether and End islands are usually pasted when a player makes their island, but if they are
+  # missing for some reason, you can switch this on.
+  # Note that bedrock removal glitches can exploit this option.
+  create-missing-nether-end-islands: false
   commands:
     # List of commands to run when a player joins.
     on-join: []

src/main/resources/locales/de.yml

@@ -0,0 +1,7 @@
+---
+acidisland:
+  sign:
+    line0: "&1AcidIsland"
+    line1: "[name]"
+    line2: Achtung! Das Wasser
+    line3: ist vergiftet! &c<3

src/main/resources/locales/lv.yml

@@ -0,0 +1,7 @@
+---
+acidisland:
+  sign:
+    line0: "&1Skābes Sala"
+    line1: "[name]"
+    line2: Ūdens satur skābi!
+    line3: Esi uzmanīgs! &c<3

src/test/java/world/bentobox/acidisland/world/ChunkGeneratorWorldTest.java

@@ -84,6 +84,7 @@ 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 testGenerateChunkDataWorldRandomIntIntBiomeGridOverworldVoid() {
         ChunkData cd = cg.generateChunkData(world, random, 0 , 0 , biomeGrid);
@@ -101,6 +102,7 @@ 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 testGenerateChunkDataWorldRandomIntIntBiomeGridOverworldSea() {
         // Set sea height
@@ -122,6 +124,7 @@ 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() {
         when(world.getEnvironment()).thenReturn(World.Environment.THE_END);
@@ -141,6 +144,7 @@ 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 testGenerateChunkDataWorldRandomIntIntBiomeGridNetherWithRoof() {
         when(world.getEnvironment()).thenReturn(World.Environment.NETHER);
@@ -158,6 +162,7 @@ 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);