Merge branch 'release/1.4.0'

Author: zetastormy

README.md

@@ -41,8 +41,7 @@ Then you will find the binary under the `build/libs/` directory.
 Reporting a bug or requesting a feature can be useful for further development of the plugin. To do that you just need
 to fill one of the issue templates we made for you:
 [Click here to report a bug](https://github.com/devblook/akropolis/issues/new?assignees=zetastormy&labels=bug&template=bug_report.yml&title=A+brief+description+of+your+report)
-or [click here to request a feature](https://github.com/devblook/akropolis/issues/new?assignees=zetastormy&labels=enhancement&template=feature_request.yml&title=A+brief+description+of+your+request)
-.
+or [click here to request a feature](https://github.com/devblook/akropolis/issues/new?assignees=zetastormy&labels=enhancement&template=feature_request.yml&title=A+brief+description+of+your+request).
 
 ### Contribute
 

build.gradle.kts

@@ -1,6 +1,7 @@
 plugins {
     java
-    id("com.github.johnrengelman.shadow") version ("8.1.0")
+    id("com.github.johnrengelman.shadow") version ("8.1.1")
+    id("io.papermc.paperweight.userdev") version ("1.5.5")
 }
 
 group = "team.devblook"
@@ -20,26 +21,27 @@ repositories {
     maven("https://repo.extendedclip.com/content/repositories/placeholderapi/")
     maven("https://jitpack.io")
     maven("https://repo.papermc.io/repository/maven-public/")
-    mavenCentral()
 }
 
 dependencies {
+    paperweight.paperDevBundle("1.20-R0.1-SNAPSHOT")
+
     implementation("javax.inject:javax.inject:1")
 
-    implementation("com.github.MegavexNetwork.scoreboard-library:scoreboard-library-api:2.0.0-RC7")
-    runtimeOnly("com.github.MegavexNetwork.scoreboard-library:scoreboard-library-implementation:2.0.0-RC7")
-    runtimeOnly("com.github.MegavexNetwork.scoreboard-library:scoreboard-library-v1_19_R3:2.0.0-RC7")
+    implementation("com.github.MegavexNetwork.scoreboard-library:scoreboard-library-api:2.0.0-RC9")
+    runtimeOnly("com.github.MegavexNetwork.scoreboard-library:scoreboard-library-implementation:2.0.0-RC9")
+    runtimeOnly("com.github.MegavexNetwork.scoreboard-library:scoreboard-library-v1_20_R1:2.0.0-RC9")
 
-    compileOnly("net.kyori:adventure-text-minimessage:4.13.1")
-    compileOnly("net.kyori:adventure-api:4.13.1")
+    compileOnly("net.kyori:adventure-text-minimessage:4.14.0")
+    compileOnly("net.kyori:adventure-api:4.14.0")
 
-    compileOnly("io.papermc.paper:paper-api:1.19.4-R0.1-SNAPSHOT")
+    compileOnly("io.papermc.paper:paper-api:1.20.1-R0.1-SNAPSHOT")
 
     compileOnly("com.mojang:authlib:1.5.25")
     compileOnly("me.clip:placeholderapi:2.11.3")
     compileOnly("com.arcaniax:HeadDatabase-API:1.3.1")
-    compileOnly("com.github.cryptomorin:XSeries:9.3.1")
-    compileOnly("io.github.miniplaceholders:miniplaceholders-api:2.1.0")
+    compileOnly("com.github.cryptomorin:XSeries:9.4.0")
+    compileOnly("io.github.miniplaceholders:miniplaceholders-api:2.2.0")
 }
 
 configurations.implementation {
@@ -48,7 +50,7 @@ configurations.implementation {
 
 tasks {
     processResources {
-        filesMatching("plugin.yml") {
+        filesMatching("paper-plugin.yml") {
             expand("version" to project.version)
         }
     }

gradle.properties

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

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -23,6 +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_R1.CraftServer;
 import org.bukkit.event.HandlerList;
 import org.bukkit.plugin.java.JavaPlugin;
 import team.devblook.akropolis.action.ActionManager;
@@ -65,16 +66,6 @@ public void onEnable() {
         getLogger().log(Level.INFO, "Based on DeluxeHub by ItsLewizz.");
         getLogger().log(Level.INFO, "--------");
 
-        // Check if using Paper
-        try {
-            Class.forName("com.destroystokyo.paper.PaperConfig");
-        } catch (ClassNotFoundException ex) {
-            getLogger().severe("Akropolis requires Paper 1.19+ to run, you can download");
-            getLogger().severe("Paper here: https://papermc.io/downloads.");
-            setEnabled(false);
-            return;
-        }
-
         // Check plugin hooks
         hooksManager = new HooksManager(this);
 
@@ -140,7 +131,12 @@ public void reload() {
 
         scoreboardLibrary.close();
 
-        getCommandManager().reload();
+        try {
+            commandManager.reload();
+            ((CraftServer) getServer()).syncCommands();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
 
         try {
             scoreboardLibrary = ScoreboardLibrary.loadScoreboardLibrary(plugin);

gradlew

@@ -0,0 +1,40 @@
+/*
+ * This file is part of Akropolis
+ *
+ * Copyright (c) 2023 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
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Akropolis is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Akropolis. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package team.devblook.akropolis;
+
+import io.papermc.paper.plugin.loader.PluginClasspathBuilder;
+import io.papermc.paper.plugin.loader.PluginLoader;
+import io.papermc.paper.plugin.loader.library.impl.MavenLibraryResolver;
+import org.eclipse.aether.artifact.DefaultArtifact;
+import org.eclipse.aether.graph.Dependency;
+import org.eclipse.aether.repository.RemoteRepository;
+
+@SuppressWarnings("UnstableApiUsage")
+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.4.0"), null));
+        resolver.addRepository(new RemoteRepository.Builder("central", "default", "https://repo1.maven.org/maven2/").build());
+
+        classpathBuilder.addLibrary(resolver);
+    }
+}

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

@@ -50,7 +50,7 @@ public void execute(AkropolisPlugin plugin, Player player, String data) {
             fadeIn = Duration.ofSeconds(Long.parseLong(args[2]));
             stay = Duration.ofSeconds(Long.parseLong(args[3]));
             fadeOut = Duration.ofSeconds(Long.parseLong(args[4]));
-        } catch (NumberFormatException ex) {
+        } catch (NumberFormatException | ArrayIndexOutOfBoundsException e) {
             fadeIn = Duration.ofSeconds(1);
             stay = Duration.ofSeconds(3);
             fadeOut = Duration.ofSeconds(1);

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

@@ -23,6 +23,7 @@
 import org.bukkit.command.CommandMap;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.configuration.file.FileConfiguration;
+import org.bukkit.entity.Player;
 import team.devblook.akropolis.AkropolisPlugin;
 import team.devblook.akropolis.command.commands.*;
 import team.devblook.akropolis.command.commands.gamemode.*;
@@ -35,22 +36,22 @@
 
 public class CommandManager {
     private final AkropolisPlugin plugin;
-    private final FileConfiguration config;
-
     private final Set<InjectableCommand> commands;
     private final List<CustomCommand> customCommands;
     private final CommandMap commandMap;
+    private FileConfiguration config;
 
     public CommandManager(AkropolisPlugin plugin) {
         this.plugin = plugin;
-        this.config = plugin.getConfigManager().getFile(ConfigType.COMMANDS).get();
         this.commands = new HashSet<>();
         this.customCommands = new ArrayList<>();
         this.commandMap = Bukkit.getCommandMap();
     }
 
     public void reload() {
-        commands.forEach(c -> c.unregister(commandMap));
+        config = plugin.getConfigManager().getFile(ConfigType.COMMANDS).get();
+
+        commands.forEach(this::unregisterCommand);
         if (!commands.isEmpty()) commands.clear();
 
         registerCommand(new AkropolisCommand(plugin));
@@ -63,16 +64,21 @@ public void reload() {
         }
 
         for (String command : commandsSection.getKeys(false)) {
-            if (!config.getBoolean("commands." + command + ".enabled")) continue;
+            if (!config.getBoolean("commands." + command + ".enabled")) {
+                continue;
+            }
 
             registerCommand(command, commandsSection.getStringList(command + ".aliases"));
         }
 
         reloadCustomCommands();
+        Bukkit.getOnlinePlayers().forEach(Player::updateCommands);
     }
 
     public void reloadCustomCommands() {
+        customCommands.forEach(this::unregisterCommand);
         if (!customCommands.isEmpty()) customCommands.clear();
+
         if (!config.isSet("custom_commands")) return;
 
         ConfigurationSection customCommandsSection = config.getConfigurationSection("custom_commands");
@@ -83,19 +89,20 @@ public void reloadCustomCommands() {
         }
 
         for (String entry : customCommandsSection.getKeys(false)) {
-
-            CustomCommand customCommand = new CustomCommand(entry,
-                    customCommandsSection.getStringList(entry + ".actions"));
+            List<String> actions = customCommandsSection.getStringList(entry + ".actions");
+            List<String> aliases = new ArrayList<>();
 
             if (customCommandsSection.contains(entry + ".aliases")) {
-                customCommand.addAliases(config.getStringList("custom_commands." + entry + ".aliases"));
+                aliases = config.getStringList("custom_commands." + entry + ".aliases");
             }
 
+            CustomCommand customCommand = new CustomCommand(plugin, entry, aliases, actions);
+
             if (customCommandsSection.contains(entry + ".permission")) {
                 customCommand.setPermission(config.getString("custom_commands." + entry + ".permission"));
             }
 
-            this.customCommands.add(customCommand);
+            registerCommand(customCommand);
         }
     }
 
@@ -126,6 +133,17 @@ private void registerCommand(InjectableCommand command) {
         }
     }
 
+    private void unregisterCommand(InjectableCommand command) {
+        try {
+            command.getAliases().forEach(a -> commandMap.getKnownCommands().remove(a));
+            commandMap.getKnownCommands().remove(command.getName());
+            commandMap.getKnownCommands().remove("akropolis:" + command.getName());
+            command.unregister(commandMap);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
     public List<CustomCommand> getCustomCommands() {
         return customCommands;
     }