Use spigot-api for Bukkit module, rename Bungeecord package for consistency

Author: RealTriassic

bootstrap/bukkit/build.gradle.kts

@@ -6,17 +6,11 @@ dependencies {
     implementation(projects.core)
 
     runtimeOnly(libs.slf4j.jdk14)
-    compileOnly(libs.paper.api)
+    compileOnly(libs.spigot.api)
     implementation(libs.adventure.bukkit)
     implementation(libs.cloud.paper)
     implementation(libs.slf4j)
 }
 
 relocate("net.kyori")
-relocate("org.spongepowered")
-
-tasks.shadowJar {
-    manifest {
-        attributes["paperweight-mappings-namespace"] = "mojang"
-    }
-}
+relocate("org.spongepowered")

bootstrap/bukkit/src/main/java/dev/triassic/template/bukkit/command/BukkitCommander.java

@@ -46,7 +46,7 @@ public interface BukkitCommander extends Commander, ForwardingAudience.Single {
     /**
      * Create a new {@link BukkitCommander} from a {@link CommandSender}.
      *
-     * @param sender    the {@link CommandSender}
+     * @param sender the {@link CommandSender}
      * @return a new {@link BukkitCommander}
      */
     static BukkitCommander from(final CommandSender sender) {

…emplate/bungee/BungeeTemplatePlugin.java …ate/bungeecord/BungeeTemplatePlugin.javabootstrap/bungeecord/src/main/java/dev/triassic/template/bungee/BungeeTemplatePlugin.java renamed to bootstrap/bungeecord/src/main/java/dev/triassic/template/bungeecord/BungeeTemplatePlugin.java bootstrap/bungeecord/src/main/java/dev/triassic/template/bungee/BungeeTemplatePlugin.java renamed to bootstrap/bungeecord/src/main/java/dev/triassic/template/bungeecord/BungeeTemplatePlugin.java

@@ -25,11 +25,11 @@
  * For more information, please refer to <https://unlicense.org/>
  */
 
-package dev.triassic.template.bungee;
+package dev.triassic.template.bungeecord;
 
 import dev.triassic.template.TemplateImpl;
 import dev.triassic.template.TemplatePlugin;
-import dev.triassic.template.bungee.command.BungeeCommander;
+import dev.triassic.template.bungeecord.command.BungeeCommander;
 import dev.triassic.template.command.Commander;
 import dev.triassic.template.util.PlatformType;
 import java.nio.file.Path;

…late/bungee/command/BungeeCommander.java …/bungeecord/command/BungeeCommander.javabootstrap/bungeecord/src/main/java/dev/triassic/template/bungee/command/BungeeCommander.java renamed to bootstrap/bungeecord/src/main/java/dev/triassic/template/bungeecord/command/BungeeCommander.java bootstrap/bungeecord/src/main/java/dev/triassic/template/bungee/command/BungeeCommander.java renamed to bootstrap/bungeecord/src/main/java/dev/triassic/template/bungeecord/command/BungeeCommander.java

@@ -25,9 +25,9 @@
  * For more information, please refer to <https://unlicense.org/>
  */
 
-package dev.triassic.template.bungee.command;
+package dev.triassic.template.bungeecord.command;
 
-import dev.triassic.template.bungee.BungeeTemplatePlugin;
+import dev.triassic.template.bungeecord.BungeeTemplatePlugin;
 import dev.triassic.template.command.Commander;
 import net.kyori.adventure.audience.Audience;
 import net.kyori.adventure.audience.ForwardingAudience;
@@ -46,7 +46,7 @@ public interface BungeeCommander extends Commander, ForwardingAudience.Single {
     /**
      * Create a new {@link BungeeCommander} from a {@link CommandSender}.
      *
-     * @param sender    the {@link CommandSender}
+     * @param sender the {@link CommandSender}
      * @return a new {@link BungeeCommander}
      */
     static BungeeCommander from(final CommandSender sender) {

bootstrap/bungeecord/src/main/resources/bungee.yml

@@ -1,5 +1,5 @@
 name: ${name}
-main: dev.triassic.template.bungee.BungeeTemplatePlugin
+main: dev.triassic.template.bungeecord.BungeeTemplatePlugin
 version: ${version}
 author: ${author}
 description: ${description}

bootstrap/paper/build.gradle.kts

@@ -9,10 +9,4 @@ dependencies {
     implementation(libs.cloud.paper)
 }
 
-relocate("org.spongepowered")
-
-tasks.shadowJar {
-    manifest {
-        attributes["paperweight-mappings-namespace"] = "mojang"
-    }
-}
+relocate("org.spongepowered")

gradle/libs.versions.toml

@@ -31,6 +31,7 @@ slf4j-jdk14 = { group = "org.slf4j", name = "slf4j-jdk14", version.ref = "slf4j"
 
 # Server APIs
 bungeecord-api = { group = "net.md-5", name = "bungeecord-api", version = "1.19-R0.1-SNAPSHOT" }
+spigot-api = { group = "org.spigotmc", name = "spigot-api", version = "1.20.6-R0.1-SNAPSHOT" }
 paper-api = { group = "io.papermc.paper", name = "paper-api", version = "1.20.6-R0.1-SNAPSHOT" }
 velocity-api = { group = "com.velocitypowered", name = "velocity-api", version = "3.4.0-SNAPSHOT" }