⚡️Performance: Rework World Generation

.github/workflows/build.yml

@@ -16,23 +16,23 @@ jobs:
     steps:
       - name: Checkout PR merge commit
         if: github.event_name == 'pull_request'
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
         with:
           ref: refs/pull/${{ github.event.pull_request.number }}/merge
           fetch-depth: 0
           fetch-tags: true
 
       - name: Checkout main on push
         if: github.event_name == 'push'
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
         with:
           fetch-depth: 0
           fetch-tags: true
 
-      - name: Set up JDK 21
+      - name: Set up JDK 25
         uses: actions/setup-java@v5
         with:
-          java-version: '21'
+          java-version: '25'
           distribution: 'temurin'
 
       - name: Setup Gradle

.github/workflows/crowdin-download.yml

@@ -6,9 +6,8 @@ on:
   schedule:
     - cron: '0 0 */7 * *'
 
-  pull_request:
-    branches: [ main ]
-    types: [ opened ]
+  pull_request_review:
+    types: [ submitted ]
 
 permissions:
   contents: write
@@ -21,6 +20,8 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v7
+        with:
+          ref: main
 
       - name: Save existing translation config-versions
         shell: bash
@@ -55,7 +56,7 @@ jobs:
           PY
 
       - name: Download translations from Crowdin
-        uses: crowdin/github-action@v2
+        uses: crowdin/github-action@v3
         with:
           upload_sources: false
           upload_translations: false
@@ -67,6 +68,7 @@ jobs:
           pull_request_title: "New Crowdin translations"
           commit_message: "New Crowdin translations"
           pull_request_base_branch_name: "main"
+          skip_ref_checkout: true
 
           project_id: ${{ vars.CROWDIN_PROJECT_ID }}
           token: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}
@@ -79,7 +81,20 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: Check Crowdin branch
+        id: crowdin_branch
+        shell: bash
+        run: |
+          BRANCH="l10n_crowdin_translations"
+
+          if git ls-remote --exit-code --heads origin "$BRANCH" > /dev/null 2>&1; then
+            echo "exists=true" >> "$GITHUB_OUTPUT"
+          else
+            echo "exists=false" >> "$GITHUB_OUTPUT"
+          fi
+
       - name: Checkout Crowdin branch
+        if: steps.crowdin_branch.outputs.exists == 'true'
         shell: bash
         run: |
           sudo chown -R "$USER:$USER" "$GITHUB_WORKSPACE"
@@ -90,6 +105,7 @@ jobs:
           git checkout -B "$BRANCH" "origin/$BRANCH"
 
       - name: Restore/bump config-version and update LangUtil
+        if: steps.crowdin_branch.outputs.exists == 'true'
         shell: bash
         run: |
           sudo chown -R "$USER:$USER" "$GITHUB_WORKSPACE" || true
@@ -400,13 +416,14 @@ jobs:
           PY
 
       - name: Amend Crowdin commit
+        if: steps.crowdin_branch.outputs.exists == 'true'
         shell: bash
         run: |
           BRANCH="l10n_crowdin_translations"
 
           git config \
             user.name \
-            "github-actions[bot]"
+            "Crowdin[bot]"
 
           git config \
             user.email \

.github/workflows/crowdin-upload.yml

@@ -15,7 +15,7 @@ jobs:
         uses: actions/checkout@v7
 
       - name: Crowdin push
-        uses: crowdin/github-action@v2
+        uses: crowdin/github-action@v3
         with:
           upload_sources: true
           upload_translations: true

.github/workflows/release-draft.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
         with:
           fetch-depth: 0
           fetch-tags: true

.github/workflows/release.yml

@@ -11,16 +11,16 @@ jobs:
       contents: write
 
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
         with:
           fetch-depth: 0
           fetch-tags: true
           ref: ${{ github.event.release.tag_name }}
 
-      - name: Set up JDK 21
+      - name: Set up JDK 25
         uses: actions/setup-java@v5
         with:
-          java-version: '21'
+          java-version: '25'
           distribution: 'temurin'
 
       - name: Setup Gradle

build.gradle.kts

@@ -43,6 +43,9 @@ val paperNextEnabled = providers.gradleProperty("paperNext")
     .map(String::toBoolean)
     .orElse(false)
 
+val guavaPackage = "com.google.guava"
+val gsonPackage = "com.google.code.gson"
+
 dependencies {
     implementation(libs.com.alpsbte.canvas)
     implementation(libs.com.alpsbte.alpslib.alpslib.io)
@@ -52,9 +55,18 @@ dependencies {
     implementation(libs.com.zaxxer.hikaricp) {
         exclude(group = "org.slf4j")
     }
-    implementation(platform(libs.com.intellectualsites.bom.bom.newest))
-    compileOnly("com.fastasyncworldedit:FastAsyncWorldEdit-Core")
-    compileOnly(libs.com.sk89q.worldguard.worldguard.bukkit)
+    implementation(platform(libs.com.intellectualsites.bom.bom.newest)) {
+        exclude(group = guavaPackage)
+        exclude(group = gsonPackage)
+    }
+    compileOnly("com.fastasyncworldedit:FastAsyncWorldEdit-Core") {
+        exclude(group = guavaPackage)
+        exclude(group = gsonPackage)
+    }
+    compileOnly(libs.com.sk89q.worldguard.worldguard.bukkit) {
+        exclude(group = guavaPackage)
+        exclude(group = gsonPackage)
+    }
     compileOnly(libs.multiverse.core)
     compileOnly(libs.com.github.fierioziy.particlenativeapi.particlenativeapi.plugin)
     compileOnly(libs.com.arcaniax.headdatabase.api)
@@ -66,8 +78,7 @@ dependencies {
 
     if (paperNextEnabled.get()) {
         constraints {
-            compileOnly("io.papermc.paper:paper-api:26.1.2.build.+")
-            compileOnly("com.github.decentsoftware-eu:decentholograms:2.10.0")
+            compileOnly("io.papermc.paper:paper-api:26.2-rc-2.build.+")
         }
     }
 }
@@ -122,7 +133,7 @@ tasks.processResources {
 
 val targetJava = providers.gradleProperty("targetJava")
     .map(String::toInt)
-    .orElse(21)
+    .orElse(25)
 
 java {
     toolchain {
@@ -141,14 +152,13 @@ tasks.withType<Javadoc>().configureEach {
 
 tasks.register<GradleBuild>("buildPaperNext") {
     group = "verification"
-    description = "Builds against Java 25 and the Paper-next dependency set"
+    description = "Builds against Paper-next dependency set"
 
     tasks = listOf("clean", "build")
 
     startParameter.projectProperties.putAll(
         mapOf(
-            "paperNext" to "true",
-            "targetJava" to "25"
+            "paperNext" to "true"
         )
     )
 }

gradle/libs.versions.toml

@@ -8,27 +8,27 @@ com-alpsbte-alpslib-alpslib-hologram = "1.1.3"
 # https://mvn.alps-bte.com/service/rest/repository/browse/alps-bte/com/alpsbte/alpslib/alpslib-io/
 com-alpsbte-alpslib-alpslib-io = "1.2.5"
 # https://mvn.alps-bte.com/service/rest/repository/browse/alps-bte/com/alpsbte/alpslib/alpslib-utils/
-com-alpsbte-alpslib-alpslib-utils = "1.4.6"
+com-alpsbte-alpslib-alpslib-utils = "1.5.0"
 # https://mvn.alps-bte.com/service/rest/repository/browse/alps-bte/com/alpsbte/canvas/
-com-alpsbte-canvas = "1.3"
+com-alpsbte-canvas = "1.3.2"
 # https://github.com/Arcaniax-Development/HeadDatabase-API/releases
 com-arcaniax-headdatabase-api = "1.3.3-SNAPSHOT"
-# @pin https://github.com/DecentSoftware-eu/DecentHolograms/releases 2.10+ require java 25 (MC 26.1+ mainly)
-com-github-decentsoftware-eu-decentholograms = "2.9.9"
+# https://github.com/DecentSoftware-eu/DecentHolograms/releases
+com-github-decentsoftware-eu-decentholograms = "2.10.0"
 # @pin https://github.com/Fierioziy/ParticleNativeAPI/releases - we are stuck at v3 for now. Need to migrate some time or remove it
 com-github-fierioziy-particlenativeapi-particlenativeapi-plugin = "3.3.2"
 # Ref: https://github.com/IntellectualSites/bom
 com-intellectualsites-bom-bom-newest = "1.56"
 # https://maven.enginehub.org/repo/com/sk89q/worldguard/worldguard-bukkit/
-com-sk89q-worldguard-worldguard-bukkit = "7.0.17"
+com-sk89q-worldguard-worldguard-bukkit = "7.0.18-SNAPSHOT"
 # https://github.com/brettwooldridge/HikariCP/tags
-com-zaxxer-hikaricp = "7.0.2"
+com-zaxxer-hikaricp = "7.1.0"
 # Provided by Minecraft (Libs folder)
 commons-io-commons-io = "2.22.0"
 # https://fancyspaces.net/spaces/fancynpcs/maven-repos/fi-releases/de.oliver:FancyNpcs
 de-oliver-fancynpcs = "2.9.2"
-# @pin https://artifactory.papermc.io/ui/native/universe/io/papermc/paper/paper-api/ 26.1+ requires java 25
-io-papermc-paper-paper-api = "1.21.11-R0.1-SNAPSHOT"
+# @pin https://artifactory.papermc.io/ui/native/universe/io/papermc/paper/paper-api/ We want to use the latest api buld
+io-papermc-paper-paper-api = "26.1.2.build.+"
 # https://mvn.alps-bte.com/service/rest/repository/browse/alps-bte/li/cinnazeyy/LangLibs-API/
 li-cinnazeyy-langlibs-api = "1.5.3"
 # https://repo.onarandombox.com/#/multiverse-releases/org/mvplugins/multiverse/core/multiverse-core
@@ -39,7 +39,7 @@ org-mariadb-jdbc-mariadb-java-client = "3.6.0-SNAPSHOT"
 # Plugins
 #
 # https://github.com/jmongard/Git.SemVersioning.Gradle/releases
-git-semver = "0.19.1"
+git-semver = "0.19.2"
 # https://github.com/GradleUp/shadow/releases
 shadow = "9.4.2"
 

src/main/java/com/alpsbte/plotsystem/PlotSystem.java

@@ -12,13 +12,16 @@
 import com.alpsbte.plotsystem.core.holograms.HologramRegister;
 import com.alpsbte.plotsystem.core.system.Builder;
 import com.alpsbte.plotsystem.core.system.plot.Plot;
+import com.alpsbte.plotsystem.core.system.plot.PlotHandler;
+import com.alpsbte.plotsystem.core.system.plot.generator.world.SkeletonWorldGenerator;
 import com.alpsbte.plotsystem.core.system.plot.utils.PlotUtils;
 import com.alpsbte.plotsystem.core.system.tutorial.AbstractTutorial;
 import com.alpsbte.plotsystem.core.system.tutorial.BeginnerTutorial;
 import com.alpsbte.plotsystem.core.system.tutorial.Tutorial;
 import com.alpsbte.plotsystem.core.system.tutorial.TutorialEventListener;
 import com.alpsbte.plotsystem.core.system.tutorial.utils.TutorialNPCTurnTracker;
 import com.alpsbte.plotsystem.core.system.tutorial.utils.TutorialUtils;
+import com.alpsbte.plotsystem.utils.DependencyManager;
 import com.alpsbte.plotsystem.utils.Utils;
 import com.alpsbte.plotsystem.utils.io.ConfigPaths;
 import com.alpsbte.plotsystem.utils.io.ConfigUtil;
@@ -28,6 +31,7 @@
 import net.kyori.adventure.text.Component;
 import org.bukkit.Bukkit;
 import org.bukkit.configuration.file.FileConfiguration;
+import org.bukkit.generator.ChunkGenerator;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.ipvp.canvas.MenuFunctionListener;
 import org.jetbrains.annotations.NotNull;
@@ -117,14 +121,22 @@ public void onEnable() {
 
         DecentHologramDisplay.registerPlugin(this);
         HologramRegister.init();
-        PlotUtils.checkPlotsForLastActivity();
         Utils.ChatUtils.checkForChatInputExpiry();
         PlotUtils.Effects.startTimer();
 
+        // Start task that checks for and abandons inactive plots every hour
+        Bukkit.getScheduler().runTaskTimerAsynchronously(PlotSystem.getPlugin(), PlotHandler::abandonInactivePlots, 0L, 20 * 60 * 60L);
+
         // Register tutorials
         if (getConfig().getBoolean(ConfigPaths.TUTORIAL_ENABLE)) {
             AbstractTutorial.registerTutorials(Collections.singletonList(BeginnerTutorial.class));
-            Bukkit.getScheduler().runTaskTimerAsynchronously(FancyNpcsPlugin.get().getPlugin(), new TutorialNPCTurnTracker(), 0, 1L);
+            Bukkit.getScheduler().runTaskTimer(FancyNpcsPlugin.get().getPlugin(), new TutorialNPCTurnTracker(), 0, 1L);
+        }
+
+        // Generate Skeleton World
+        if (!DependencyManager.getMultiverseCore().getWorldManager().isWorld(SkeletonWorldGenerator.WORLD_KEY.value())) {
+            getComponentLogger().info("No skeleton world found! Generating skeleton world...");
+            new SkeletonWorldGenerator();
         }
 
         pluginEnabled = true;
@@ -196,4 +208,9 @@ public void initDatabase() throws IOException, SQLException {
             s.execute(initScript);
         }
     }
+
+    @Override
+    public ChunkGenerator getDefaultWorldGenerator(@NotNull String worldName, String id) {
+        return new SkeletonWorldGenerator.EmptyChunkGenerator();
+    }
 }