Merge pull request #164 from BentoBoxWorld/develop

Release 1.20.1

Author: tastybento

.github/workflows/build.yml

@@ -38,7 +38,7 @@ jobs:
       - run: mvn --batch-mode clean org.jacoco:jacoco-maven-plugin:prepare-agent install
       - run: mkdir staging && cp target/*.jar staging
       - name: Save artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: Package
           path: staging

pom.xml

@@ -61,7 +61,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.20.0</build.version>
+        <build.version>1.20.1</build.version>
         <!-- Sonar Cloud -->
         <sonar.projectKey>BentoBoxWorld_AcidIsland</sonar.projectKey>
         <sonar.organization>bentobox-world</sonar.organization>
@@ -111,6 +111,13 @@
     </profiles>
 
     <repositories>
+        <repository>
+            <id>papermc-public</id>
+            <name>PaperMC Official</name>
+            <url>https://repo.papermc.io/repository/maven-public/</url>
+            <releases><enabled>true</enabled></releases>
+            <snapshots><enabled>false</enabled></snapshots>
+      </repository>
         <repository>
             <id>spigot-repo</id>
             <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots</url>
@@ -120,8 +127,8 @@
             <url>https://repo.codemc.io/repository/bentoboxworld/</url>
         </repository>
         <repository>
-            <id>ess-repo</id>
-            <url>https://ci.ender.zone/plugin/repository/everything/</url>
+            <id>EssentialsX</id>
+            <url>https://repo.essentialsx.net/releases/</url>
         </repository>
     </repositories>
 
@@ -170,9 +177,9 @@
         </dependency>
         <!-- EssentialsX -->
         <dependency>
-            <groupId>net.ess3</groupId>
+            <groupId>net.essentialsx</groupId>
             <artifactId>EssentialsX</artifactId>
-            <version>2.17.2</version>
+            <version>2.21.1</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>

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

@@ -1,6 +1,12 @@
 package world.bentobox.acidisland;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 import org.bukkit.Difficulty;
 import org.bukkit.GameMode;
@@ -9,15 +15,15 @@
 import org.bukkit.entity.EntityType;
 import org.bukkit.potion.PotionEffectType;
 
-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;
 import world.bentobox.bentobox.api.configuration.WorldSettings;
 import world.bentobox.bentobox.api.flags.Flag;
-import world.bentobox.bentobox.database.objects.adapters.*;
+import world.bentobox.bentobox.database.objects.adapters.Adapter;
+import world.bentobox.bentobox.database.objects.adapters.FlagBooleanSerializer;
+import world.bentobox.bentobox.database.objects.adapters.PotionEffectListAdapter;
 
 
 /**

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

@@ -156,7 +156,7 @@ private World getWorld(String worldName2, Environment env, @Nullable ChunkGenera
         // Set world name
         worldName2 = env.equals(World.Environment.NETHER) ? worldName2 + NETHER : worldName2;
         worldName2 = env.equals(World.Environment.THE_END) ? worldName2 + THE_END : worldName2;
-        WorldCreator wc = WorldCreator.name(worldName2).type(WorldType.FLAT).environment(env);
+        WorldCreator wc = WorldCreator.name(worldName2).environment(env).type(WorldType.NORMAL);
         World w = settings.isUseOwnGenerator() ? wc.createWorld() : wc.generator(chunkGenerator2).createWorld();
         // Set spawn rates
         if (w != null && getSettings() != null) {

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

@@ -19,8 +19,6 @@
 import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.Mockito;
-import org.powermock.api.mockito.PowerMockito;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;