Merge pull request #345 from BentoBoxWorld/develop

Release 2.18.0

Author: tastybento

.github/workflows/build.yml

@@ -11,22 +11,22 @@ jobs:
     name: Build
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
-      - name: Set up JDK 17
-        uses: actions/setup-java@v3
+      - name: Set up JDK 21
+        uses: actions/setup-java@v4
         with:
           distribution: 'adopt'
-          java-version: 17
+          java-version: '21'
       - name: Cache SonarCloud packages
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.sonar/cache
           key: ${{ runner.os }}-sonar
           restore-keys: ${{ runner.os }}-sonar
       - name: Cache Maven packages
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.m2
           key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}

pom.xml

@@ -50,12 +50,12 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <java.version>17</java.version>
+        <java.version>21</java.version>
         <!-- Non-minecraft related dependencies -->
         <powermock.version>2.0.9</powermock.version>
         <!-- More visible way how to change dependency versions -->
         <spigot.version>1.21.3-R0.1-SNAPSHOT</spigot.version>
-        <bentobox.version>2.7.1-SNAPSHOT</bentobox.version>
+        <bentobox.version>3.2.4-SNAPSHOT</bentobox.version>
         <!-- Warps addon version -->
         <warps.version>1.12.0</warps.version>
         <!-- Visit addon version -->
@@ -67,7 +67,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>2.17.1</build.version>
+        <build.version>2.18.0</build.version>
         <sonar.projectKey>BentoBoxWorld_Level</sonar.projectKey>
         <sonar.organization>bentobox-world</sonar.organization>
         <sonar.host.url>https://sonarcloud.io</sonar.host.url>

src/main/java/world/bentobox/level/Level.java

@@ -106,7 +106,7 @@ public void onEnable() {
 		// Register listeners
 		this.registerListener(new IslandActivitiesListeners(this));
 		this.registerListener(new JoinLeaveListener(this));
-		this.registerListener(new MigrationListener(this));
+        this.registerListener(new MigrationListener(this));
 
 		// Register commands for GameModes
 		registeredGameModes.clear();

src/main/java/world/bentobox/level/LevelsManager.java

@@ -30,7 +30,6 @@
 import world.bentobox.level.events.IslandLevelCalculatedEvent;
 import world.bentobox.level.events.IslandPreLevelEvent;
 import world.bentobox.level.objects.IslandLevels;
-import world.bentobox.level.objects.LevelsData;
 import world.bentobox.level.objects.TopTenData;
 import world.bentobox.level.util.CachedData;
 
@@ -67,38 +66,6 @@ public LevelsManager(Level addon) {
 
     }
 
-    public void migrate() {
-        Database<LevelsData> oldDb = new Database<>(addon, LevelsData.class);
-        oldDb.loadObjects().forEach(ld -> {
-            try {
-                UUID owner = UUID.fromString(ld.getUniqueId());
-                // Step through each world
-                ld.getLevels().keySet().stream()
-                        // World
-                        .map(Bukkit::getWorld).filter(Objects::nonNull)
-                        // Island
-                        .map(w -> addon.getIslands().getIsland(w, owner)).filter(Objects::nonNull).forEach(i -> {
-                            // Make new database entry
-                            World w = i.getWorld();
-                            IslandLevels il = new IslandLevels(i.getUniqueId());
-                            il.setInitialLevel(ld.getInitialLevel(w));
-                            il.setLevel(ld.getLevel(w));
-                            il.setMdCount(ld.getMdCount(w));
-                            il.setPointsToNextLevel(ld.getPointsToNextLevel(w));
-                            il.setUwCount(ld.getUwCount(w));
-                            // Save it
-                            handler.saveObjectAsync(il);
-                        });
-                // Now delete the old database entry
-                oldDb.deleteID(ld.getUniqueId());
-            } catch (Exception e) {
-                addon.logError("Could not migrate level data database! " + e.getMessage());
-                e.printStackTrace();
-                return;
-            }
-        });
-    }
-
     /**
      * Add an island to a top ten
      * 
@@ -289,6 +256,7 @@ public IslandLevels getLevelsData(@NonNull Island island) {
             if (ld != null) {
                 levelsCache.put(id, ld);
             } else {
+                // Clean up just in case 
                 handler.deleteID(id);
                 levelsCache.put(id, new IslandLevels(id));
             }