add support for Spigot and older versions (1.17–1.21.11)

Author: zefir-git

.github/workflows/codeql.yaml

@@ -52,7 +52,7 @@ jobs:
     - uses: actions/setup-java@v4
       with:
         distribution: 'temurin'
-        java-version: 17
+        java-version: 16
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL

.github/workflows/maven.yaml

@@ -24,10 +24,10 @@ jobs:
 
     steps:
       - uses: actions/checkout@v6
-      - name: Set up JDK 17
+      - name: Set up JDK 16
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version: '16'
           distribution: 'temurin'
           cache: maven
       - name: Build with Maven

.github/workflows/release.yaml

@@ -16,7 +16,7 @@ jobs:
       - name: Set up Java
         uses: actions/setup-java@v4
         with:
-          java-version: 17
+          java-version: 16
           distribution: temurin
           cache: maven
 
@@ -50,6 +50,9 @@ jobs:
           changelog: ${{ github.event.release.body }}
           loaders: paper
           game-versions: |-
+            1.17.x
+            1.18.x
+            1.19.x
             1.20.x
             1.21.x
           files: target/EnchantBookPlus-${{ steps.version.outputs.VERSION }}.jar

.idea/jarRepositories.xml

@@ -12,7 +12,7 @@
     <name>EnchantBookPlus</name>
 
     <properties>
-        <java.version>17</java.version>
+        <java.version>16</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
@@ -38,17 +38,23 @@
 
     <repositories>
         <repository>
-            <id>papermc-repo</id>
-            <url>https://repo.papermc.io/repository/maven-public/</url>
+            <id>spigotmc-repo</id>
+            <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
         </repository>
     </repositories>
 
     <dependencies>
         <dependency>
-            <groupId>io.papermc.paper</groupId>
-            <artifactId>paper-api</artifactId>
-            <version>1.20.4-R0.1-SNAPSHOT</version>
+            <groupId>org.spigotmc</groupId>
+            <artifactId>spigot-api</artifactId>
+            <version>1.17-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.jetbrains</groupId>
+            <artifactId>annotations</artifactId>
+            <version>26.0.2</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 </project>

pom.xml

@@ -1,15 +1,13 @@
 package pro.cloudnode.smp.enchantbookplus;
 
-import net.kyori.adventure.text.minimessage.MiniMessage;
-import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.TabCompleter;
+import org.bukkit.plugin.PluginDescriptionFile;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.List;
-import java.util.Optional;
 
 public final class MainCommand implements CommandExecutor, TabCompleter {
     private final @NotNull EnchantBookPlus plugin;
@@ -19,15 +17,25 @@ public MainCommand(final @NotNull EnchantBookPlus plugin) {
     }
 
     @Override
-    public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String @NotNull [] args) {
+    public boolean onCommand(
+            final @NotNull CommandSender sender,
+            final @NotNull Command command,
+            final @NotNull String label,
+            final @NotNull String @NotNull [] args
+    ) {
         if (args.length == 1 && args[0].equalsIgnoreCase("reload"))
             return reload(sender, command);
 
         return overview(sender);
     }
 
     @Override
-    public @NotNull List<String> onTabComplete(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String @NotNull [] args) {
+    public @NotNull List<String> onTabComplete(
+            final @NotNull CommandSender sender,
+            final @NotNull Command command,
+            final @NotNull String label,
+            final @NotNull String @NotNull [] args
+    ) {
         if (sender.hasPermission(Permissions.RELOAD))
             return List.of("reload");
 
@@ -37,15 +45,11 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command
     /**
      * Plugin overview
      */
-    @SuppressWarnings({"UnstableApiUsage", "SameReturnValue"})
+    @SuppressWarnings("SameReturnValue")
     public boolean overview(final @NotNull CommandSender sender) {
-        sender.sendMessage(MiniMessage.miniMessage()
-                .deserialize(
-                        "<green><name></green> <white>v<version> by</white> <gray><author></gray>",
-                        Placeholder.unparsed("name", plugin.getPluginMeta().getName()),
-                        Placeholder.unparsed("version", plugin.getPluginMeta().getVersion()),
-                        Placeholder.unparsed("author", String.join(", ", plugin.getPluginMeta().getAuthors()))
-                ));
+        PluginDescriptionFile description = plugin.getDescription();
+        sender.sendMessage("§а" + description.getName() + " §fv" + description.getVersion() + " by §7"
+                + String.join(", ", description.getAuthors()));
 
         return true;
     }
@@ -55,15 +59,12 @@ public boolean overview(final @NotNull CommandSender sender) {
      */
     @SuppressWarnings("SameReturnValue")
     public boolean reload(final @NotNull CommandSender sender, final @NotNull Command command) {
-        if (!sender.hasPermission(Permissions.RELOAD)) {
-            sender.sendMessage(Optional.ofNullable(command.permissionMessage())
-                            .orElse(sender.getServer().permissionMessage()));
-            return true;
-        }
+        if (!sender.hasPermission(Permissions.RELOAD))
+            return overview(sender);
 
         plugin.reload();
 
-        sender.sendMessage(MiniMessage.miniMessage().deserialize("<green>(!) Plugin configuration reloaded."));
+        sender.sendMessage("§a(!) Plugin configuration reloaded.");
 
         return true;
     }

src/main/java/pro/cloudnode/smp/enchantbookplus/MainCommand.java

@@ -3,7 +3,7 @@ version: '${project.version}'
 author: Cloudnode
 main: pro.cloudnode.smp.enchantbookplus.EnchantBookPlus
 description: "Combine enchantment books to achieve levels above vanilla"
-api-version: '1.20'
+api-version: '1.17'
 softdepend:
   - AnvilUnlocker
 commands: