Merge branch 'release/1.6.0' into stable

.github/workflows/build.yml

@@ -1,34 +1,34 @@
 # This workflow will build Akropolis with Gradle.
-# It will be compiled against Java 17.
+# It will be compiled against Java 21.
 name: Build
 on:
   push:
-    branches: [ main ]
+    branches: [ develop ]
   pull_request:
-    branches: [ main ]
+    branches: [ develop ]
 
 jobs:
   # Builds Akropolis in recommended JDK version.
   build-plugin:
     runs-on: ubuntu-latest
 
-    # For Minecraft 1.19, Java 17+ is needed/recommended.
+    # For Minecraft 1.21, Java 21+ is needed/recommended.
     strategy:
       matrix:
-        java_version: [ 17 ]
+        java_version: [ 21 ]
 
     steps:
       - name: Checkout GitHub repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Gradle Wrapper Validation
-        uses: gradle/wrapper-validation-action@v1
+        uses: gradle/actions/wrapper-validation@v3
 
       - name: Cleanup old JARs
         run: rm -f build/libs/*.jar
 
       - name: Set up JDK ${{ matrix.java_version }}
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: ${{ matrix.java_version }}
           distribution: temurin
@@ -45,7 +45,7 @@ jobs:
           rm -f ~/.gradle/caches/modules-2/gc.properties
 
       - name: Upload artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: Akropolis Artifact
           path: build/libs/*.jar

README.md

@@ -1,6 +1,6 @@
 ![Akropolis banner](https://user-images.githubusercontent.com/56933557/188349705-b1f1eb56-8e4b-42d2-b99d-f21552ec84c2.png)
 
-Akropolis is a modern Minecraft hub server solution that is based on DeluxeHub by ItsLewizz.
+Akropolis is a modern Minecraft hub server solution that is based on DeluxeHub by ItsLewizzz.
 It contains almost all of its features and configuration files are almost the same, so you can just
 drop your configuration into the plugin's directory, make a few modifications and use it.
 
@@ -16,7 +16,7 @@ Simply use what you feel meets your needs.
 
 To use this plugin just a grab a binary from the [releases page](https://github.com/devblook/akropolis/releases)
 or [compile it](#compile) yourself and drop it into your `plugins/` directory. Take in mind that you will need to be
-running Paper 1.20+ so Akropolis can run properly. You can download Paper from [here](https://papermc.io/downloads).
+running Paper 1.21+ so Akropolis can run properly. You can download Paper from [here](https://papermc.io/downloads).
 
 ### Compile
 

build.gradle.kts

@@ -1,17 +1,17 @@
 plugins {
     java
-    id("com.github.johnrengelman.shadow") version ("8.1.1")
-    id("io.papermc.paperweight.userdev") version ("1.5.11")
+    id("io.github.goooler.shadow") version ("8.1.8")
+    id("io.papermc.paperweight.userdev") version ("1.7.2")
 }
 
 group = "team.devblook"
 version = property("projectVersion") as String
-description = "A modern Minecraft server hub core solution. Based on DeluxeHub by ItsLewizz."
+description = "A modern Minecraft server hub core solution. Based on DeluxeHub by ItsLewizzz."
 
 val libsPackage = property("libsPackage") as String
 
 java {
-    toolchain.languageVersion.set(JavaLanguageVersion.of(17))
+    toolchain.languageVersion.set(JavaLanguageVersion.of(21))
 }
 
 repositories {
@@ -20,29 +20,26 @@ repositories {
     maven("https://repo.codemc.org/repository/maven-public")
     maven("https://repo.extendedclip.com/content/repositories/placeholderapi/")
     maven("https://jitpack.io")
-    maven("https://repo.papermc.io/repository/maven-public/")
 }
 
 dependencies {
-    paperweight.paperDevBundle("1.20.4-R0.1-SNAPSHOT")
+    paperweight.paperDevBundle("1.21.1-R0.1-SNAPSHOT")
 
     implementation("javax.inject:javax.inject:1")
 
-    implementation("com.github.MegavexNetwork.scoreboard-library:scoreboard-library-api:2.0.1")
-    runtimeOnly("com.github.MegavexNetwork.scoreboard-library:scoreboard-library-implementation:2.0.1")
-    runtimeOnly("com.github.MegavexNetwork.scoreboard-library:scoreboard-library-modern:2.0.1")
+    implementation("net.megavex:scoreboard-library-api:2.1.12")
+    runtimeOnly("net.megavex:scoreboard-library-implementation:2.1.12")
+    runtimeOnly("net.megavex:scoreboard-library-modern:2.1.12:mojmap")
 
-    compileOnly("org.spongepowered:configurate-yaml:4.1.2")
+    //compileOnly("org.spongepowered:configurate-yaml:4.1.2")
 
-    compileOnly("net.kyori:adventure-text-minimessage:4.14.0")
-    compileOnly("net.kyori:adventure-api:4.14.0")
-
-    compileOnly("io.papermc.paper:paper-api:1.20.2-R0.1-SNAPSHOT")
+    compileOnly("net.kyori:adventure-text-minimessage:4.17.0")
+    compileOnly("net.kyori:adventure-api:4.17.0")
 
     compileOnly("com.mojang:authlib:1.5.25")
-    compileOnly("me.clip:placeholderapi:2.11.5")
-    compileOnly("com.arcaniax:HeadDatabase-API:1.3.1")
-    compileOnly("com.github.cryptomorin:XSeries:9.8.0")
+    compileOnly("me.clip:placeholderapi:2.11.6")
+    compileOnly("com.arcaniax:HeadDatabase-API:1.3.2")
+    compileOnly("com.github.cryptomorin:XSeries:11.2.1")
     compileOnly("io.github.miniplaceholders:miniplaceholders-api:2.2.3")
 }
 
@@ -62,7 +59,7 @@ tasks {
         archiveFileName.set("Akropolis-${project.version}.jar")
 
         minimize {
-            exclude(dependency("com.github.MegavexNetwork.scoreboard-library:.*:.*"))
+            exclude(dependency("net.megavex:.*:.*"))
         }
 
         relocate("net.megavex.scoreboardlibrary", "${libsPackage}.scoreboardlibrary")

gradle.properties

@@ -1,5 +1,5 @@
 org.gradle.caching=true
 org.gradle.parallel=true
 org.gradle.jvmargs='-Dfile.encoding=UTF-8'
-projectVersion=1.5.3
+projectVersion=1.6.0
 libsPackage=team.devblook.akropolis.libs

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

gradlew.bat

@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################

src/main/java/team/devblook/akropolis/AkropolisPlugin.java

@@ -1,7 +1,7 @@
 /*
  * This file is part of Akropolis
  *
- * Copyright (c) 2023 DevBlook Team and others
+ * Copyright (c) 2024 DevBlook Team and others
  *
  * Akropolis free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -23,7 +23,7 @@
 import net.megavex.scoreboardlibrary.api.exception.NoPacketAdapterAvailableException;
 import net.megavex.scoreboardlibrary.api.noop.NoopScoreboardLibrary;
 import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_20_R3.CraftServer;
+import org.bukkit.craftbukkit.CraftServer;
 import org.bukkit.event.HandlerList;
 import org.bukkit.plugin.java.JavaPlugin;
 import team.devblook.akropolis.action.ActionManager;
@@ -63,7 +63,7 @@ public void onEnable() {
         getLogger().log(Level.INFO, " /_/   \\_\\_|\\_\\_|  \\___/| .__/ \\___/|_|_|___/");
         getLogger().log(Level.INFO, "                        |_|                  ");
         getLogger().log(Level.INFO, "Author: ZetaStormy");
-        getLogger().log(Level.INFO, "Based on DeluxeHub by ItsLewizz.");
+        getLogger().log(Level.INFO, "Based on DeluxeHub by ItsLewizzz.");
         getLogger().log(Level.INFO, "--------");
 
         // Check plugin hooks

src/main/java/team/devblook/akropolis/AkropolisPluginLoader.java

@@ -1,7 +1,7 @@
 /*
  * This file is part of Akropolis
  *
- * Copyright (c) 2023 DevBlook Team and others
+ * Copyright (c) 2024 DevBlook Team and others
  *
  * Akropolis free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -32,7 +32,7 @@ public class AkropolisPluginLoader implements PluginLoader {
     @Override
     public void classloader(PluginClasspathBuilder classpathBuilder) {
         MavenLibraryResolver resolver = new MavenLibraryResolver();
-        resolver.addDependency(new Dependency(new DefaultArtifact("com.github.cryptomorin:XSeries:9.7.0"), null));
+        resolver.addDependency(new Dependency(new DefaultArtifact("com.github.cryptomorin:XSeries:11.2.1"), null));
         resolver.addRepository(new RemoteRepository.Builder("central", "default", "https://repo1.maven.org/maven2/").build());
 
         classpathBuilder.addLibrary(resolver);

src/main/java/team/devblook/akropolis/Permissions.java

@@ -1,7 +1,7 @@
 /*
  * This file is part of Akropolis
  *
- * Copyright (c) 2023 DevBlook Team and others
+ * Copyright (c) 2024 DevBlook Team and others
  *
  * Akropolis free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/main/java/team/devblook/akropolis/action/Action.java

@@ -1,7 +1,7 @@
 /*
  * This file is part of Akropolis
  *
- * Copyright (c) 2023 DevBlook Team and others
+ * Copyright (c) 2024 DevBlook Team and others
  *
  * Akropolis free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/main/java/team/devblook/akropolis/action/ActionManager.java

@@ -1,7 +1,7 @@
 /*
  * This file is part of Akropolis
  *
- * Copyright (c) 2023 DevBlook Team and others
+ * Copyright (c) 2024 DevBlook Team and others
  *
  * Akropolis free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/main/java/team/devblook/akropolis/action/actions/ActionbarAction.java

@@ -1,7 +1,7 @@
 /*
  * This file is part of Akropolis
  *
- * Copyright (c) 2023 DevBlook Team and others
+ * Copyright (c) 2024 DevBlook Team and others
  *
  * Akropolis free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/main/java/team/devblook/akropolis/action/actions/BroadcastMessageAction.java

@@ -1,7 +1,7 @@
 /*
  * This file is part of Akropolis
  *
- * Copyright (c) 2023 DevBlook Team and others
+ * Copyright (c) 2024 DevBlook Team and others
  *
  * Akropolis free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/main/java/team/devblook/akropolis/action/actions/CloseInventoryAction.java

@@ -1,7 +1,7 @@
 /*
  * This file is part of Akropolis
  *
- * Copyright (c) 2023 DevBlook Team and others
+ * Copyright (c) 2024 DevBlook Team and others
  *
  * Akropolis free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/main/java/team/devblook/akropolis/action/actions/CommandAction.java

@@ -1,7 +1,7 @@
 /*
  * This file is part of Akropolis
  *
- * Copyright (c) 2023 DevBlook Team and others
+ * Copyright (c) 2024 DevBlook Team and others
  *
  * Akropolis free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/main/java/team/devblook/akropolis/action/actions/ConsoleCommandAction.java

@@ -1,7 +1,7 @@
 /*
  * This file is part of Akropolis
  *
- * Copyright (c) 2023 DevBlook Team and others
+ * Copyright (c) 2024 DevBlook Team and others
  *
  * Akropolis free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/main/java/team/devblook/akropolis/action/actions/GamemodeAction.java

@@ -1,7 +1,7 @@
 /*
  * This file is part of Akropolis
  *
- * Copyright (c) 2023 DevBlook Team and others
+ * Copyright (c) 2024 DevBlook Team and others
  *
  * Akropolis free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -19,7 +19,6 @@
 
 package team.devblook.akropolis.action.actions;
 
-import org.bukkit.Bukkit;
 import org.bukkit.GameMode;
 import org.bukkit.entity.Player;
 import team.devblook.akropolis.AkropolisPlugin;
@@ -37,7 +36,7 @@ public void execute(AkropolisPlugin plugin, Player player, String data) {
         try {
             player.setGameMode(GameMode.valueOf(data.toUpperCase()));
         } catch (IllegalArgumentException ex) {
-            Bukkit.getLogger().warning("[Akropolis Action] Invalid gamemode name: " + data.toUpperCase());
+            plugin.getLogger().warning("[Akropolis Action] Invalid gamemode name: " + data.toUpperCase());
         }
     }
 }

src/main/java/team/devblook/akropolis/action/actions/MenuAction.java

@@ -1,7 +1,7 @@
 /*
  * This file is part of Akropolis
  *
- * Copyright (c) 2023 DevBlook Team and others
+ * Copyright (c) 2024 DevBlook Team and others
  *
  * Akropolis free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/main/java/team/devblook/akropolis/action/actions/MessageAction.java

@@ -1,7 +1,7 @@
 /*
  * This file is part of Akropolis
  *
- * Copyright (c) 2023 DevBlook Team and others
+ * Copyright (c) 2024 DevBlook Team and others
  *
  * Akropolis free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/main/java/team/devblook/akropolis/action/actions/PotionEffectAction.java

@@ -1,7 +1,7 @@
 /*
  * This file is part of Akropolis
  *
- * Copyright (c) 2023 DevBlook Team and others
+ * Copyright (c) 2024 DevBlook Team and others
  *
  * Akropolis free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/main/java/team/devblook/akropolis/action/actions/ServerAction.java

@@ -1,7 +1,7 @@
 /*
  * This file is part of Akropolis
  *
- * Copyright (c) 2023 DevBlook Team and others
+ * Copyright (c) 2024 DevBlook Team and others
  *
  * Akropolis free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -34,7 +34,7 @@ public String getIdentifier() {
 
     @Override
     public void execute(AkropolisPlugin plugin, Player player, String data) {
-        @SuppressWarnings("UnstableApiUsage") ByteArrayDataOutput out = ByteStreams.newDataOutput();
+        ByteArrayDataOutput out = ByteStreams.newDataOutput();
         out.writeUTF("ConnectOther");
         out.writeUTF(player.getName());
         out.writeUTF(data);

src/main/java/team/devblook/akropolis/action/actions/SoundAction.java

@@ -1,7 +1,7 @@
 /*
  * This file is part of Akropolis
  *
- * Copyright (c) 2023 DevBlook Team and others
+ * Copyright (c) 2024 DevBlook Team and others
  *
  * Akropolis free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/main/java/team/devblook/akropolis/action/actions/TitleAction.java

@@ -1,7 +1,7 @@
 /*
  * This file is part of Akropolis
  *
- * Copyright (c) 2023 DevBlook Team and others
+ * Copyright (c) 2024 DevBlook Team and others
  *
  * Akropolis free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by