rename bukkit module to paper and use shared ci

broccolai · Oct 31, 2023 · 927a396 · 927a396
1 parent a11a8a2
commit 927a396
Show file tree

Hide file tree

Showing 24 changed files with 80 additions and 134 deletions.
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -1,29 +1,16 @@
-on : [ push, pull_request ]
+name: "build"
 
-jobs :
-  build :
+on:
+    push:
+        branches: [ "**" ]
+        tags-ignore: [ "**" ]
+    pull_request:
+    release:
+        types: [ released ]
 
-    runs-on : ubuntu-latest
-
-    steps :
-      - uses : actions/checkout@v2
-      - name : Set up JDK 1.8
-        uses : actions/setup-java@v1
-        with :
-          java-version : 8
-      - name : Cache Gradle data
-        uses : actions/cache@v2
-        with :
-          path : |
-            ~/.gradle/caches
-            ~/.gradle/wrapper
-          key : ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle.kts') }}
-          restore-keys : ${{ runner.os }}-gradle
-      - name : Grant execute permission for gradlew
-        run : chmod +x gradlew
-      - name : Build with Gradle
-        run : ./gradlew build
-      - uses : actions/upload-artifact@v2
-        with :
-          name : tags-bukkit.jar
-          path : bukkit/build/libs/tags-bukkit.jar
+jobs:
+    call-build:
+        uses: "broccolai/actions/.github/workflows/shared-ci.yml@master"
+        secrets: inherit
+        with:
+            artifacts-path: 'paper/build/libs/tags-paper.jar'
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
diff --git a/.gitignore b/.gitignore
@@ -155,4 +155,4 @@ gradle-app.setting
 # Custom Ignores
 build.sh
 .env
-bukkit/run
+paper/run
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -22,6 +22,7 @@ subprojects {
     repositories {
         mavenCentral()
         sonatype.ossSnapshots()
+        sonatype.s01Snapshots()
         maven("https://papermc.io/repo/repository/maven-public/")
         maven("https://repo.extendedclip.com/content/repositories/placeholderapi/")
         maven("https://jitpack.io")

diff --git a/bukkit/build.gradle.kts → paper/build.gradle.kts b/bukkit/build.gradle.kts → paper/build.gradle.kts
diff --git a/...colai/tags/bukkit/BukkitTagsPlatform.java → ...occolai/tags/paper/PaperTagsPlatform.java b/...colai/tags/bukkit/BukkitTagsPlatform.java → ...occolai/tags/paper/PaperTagsPlatform.java
@@ -1,15 +1,15 @@
-package broccolai.tags.bukkit;
+package broccolai.tags.paper;
 
 import broccolai.tags.api.service.MessageService;
-import broccolai.tags.bukkit.commands.BukkitTagsCommand;
-import broccolai.tags.bukkit.commands.context.BukkitCommandUser;
-import broccolai.tags.bukkit.commands.context.BukkitConsoleCommandUser;
-import broccolai.tags.bukkit.commands.context.BukkitPlayerCommandUser;
-import broccolai.tags.bukkit.inject.PlatformModule;
-import broccolai.tags.bukkit.inject.VaultModule;
-import broccolai.tags.bukkit.integrations.BasicIntegration;
-import broccolai.tags.bukkit.integrations.PapiIntegration;
-import broccolai.tags.bukkit.listeners.PlayerListener;
+import broccolai.tags.paper.commands.PaperTagsCommand;
+import broccolai.tags.paper.commands.context.PaperCommandUser;
+import broccolai.tags.paper.commands.context.PaperConsoleCommandUser;
+import broccolai.tags.paper.commands.context.PaperPlayerCommandUser;
+import broccolai.tags.paper.inject.PlatformModule;
+import broccolai.tags.paper.inject.VaultModule;
+import broccolai.tags.paper.integrations.BasicIntegration;
+import broccolai.tags.paper.integrations.PapiIntegration;
+import broccolai.tags.paper.listeners.PlayerListener;
 import broccolai.tags.core.TagsPlugin;
 import broccolai.tags.core.commands.PluginCommand;
 import broccolai.tags.core.commands.arguments.TagArgument;
@@ -35,16 +35,16 @@
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.incendo.interfaces.paper.PaperInterfaceListeners;
 
-public final class BukkitTagsPlatform extends JavaPlugin implements TagsPlatform {
+public final class PaperTagsPlatform extends JavaPlugin implements TagsPlatform {
 
-    private static final @NonNull Class<? extends Listener>[] BUKKIT_LISTENERS = ArrayUtilities.create(
+    private static final @NonNull Class<? extends Listener>[] PAPER_LISTENERS = ArrayUtilities.create(
             PlayerListener.class,
             BasicIntegration.class
     );
 
-    private static final @NonNull Collection<Class<? extends PluginCommand>> BUKKIT_COMMANDS = ArrayUtilities.merge(
+    private static final @NonNull Collection<Class<? extends PluginCommand>> PAPER_COMMANDS = ArrayUtilities.merge(
             COMMANDS,
-            BukkitTagsCommand.class
+            PaperTagsCommand.class
     );
 
     private @MonotonicNonNull TagsPlugin plugin;
@@ -70,14 +70,14 @@ public void onEnable() {
             injector.getInstance(PapiIntegration.class).register();
         }
 
-        for (final Class<? extends Listener> bukkitListener : BUKKIT_LISTENERS) {
+        for (final Class<? extends Listener> paperListener : PAPER_LISTENERS) {
             this.getServer().getPluginManager().registerEvents(
-                    injector.getInstance(bukkitListener),
+                    injector.getInstance(paperListener),
                     this
             );
         }
 
-        this.plugin.commands(commandManager, BUKKIT_COMMANDS);
+        this.plugin.commands(commandManager, PAPER_COMMANDS);
 
         PaperInterfaceListeners.install(this);
     }
@@ -94,8 +94,8 @@ private CommandManager<CommandUser> commandManager(
             PaperCommandManager<CommandUser> commandManager = new PaperCommandManager<>(
                     this,
                     AsynchronousCommandExecutionCoordinator.<CommandUser>builder().build(),
-                    BukkitTagsPlatform::from,
-                    user -> user.<BukkitCommandUser>cast().sender()
+                    PaperTagsPlatform::from,
+                    user -> user.<PaperCommandUser>cast().sender()
             );
 
             if (commandManager.hasCapability(CloudBukkitCapabilities.ASYNCHRONOUS_COMPLETION)) {
@@ -126,9 +126,9 @@ private CommandManager<CommandUser> commandManager(
 
     private static CommandUser from(final @NonNull CommandSender sender) {
         if (sender instanceof ConsoleCommandSender console) {
-            return new BukkitConsoleCommandUser(console);
+            return new PaperConsoleCommandUser(console);
         } else if (sender instanceof Player player) {
-            return new BukkitPlayerCommandUser(player);
+            return new PaperPlayerCommandUser(player);
         }
 
         return null;

diff --git a/...gs/bukkit/commands/BukkitTagsCommand.java → ...tags/paper/commands/PaperTagsCommand.java b/...gs/bukkit/commands/BukkitTagsCommand.java → ...tags/paper/commands/PaperTagsCommand.java
@@ -1,12 +1,12 @@
-package broccolai.tags.bukkit.commands;
+package broccolai.tags.paper.commands;
 
 import broccolai.corn.paper.item.PaperItemBuilder;
 import broccolai.tags.api.model.tag.ConstructedTag;
 import broccolai.tags.api.model.tag.TagDisplayInformation;
 import broccolai.tags.api.model.user.TagsUser;
 import broccolai.tags.api.service.UserService;
-import broccolai.tags.bukkit.commands.context.BukkitPlayerCommandUser;
-import broccolai.tags.bukkit.menu.TagsMenuFactory;
+import broccolai.tags.paper.commands.context.PaperPlayerCommandUser;
+import broccolai.tags.paper.menu.TagsMenuFactory;
 import broccolai.tags.core.commands.PluginCommand;
 import broccolai.tags.core.commands.arguments.modes.TagParserMode;
 import broccolai.tags.core.commands.context.CommandUser;
@@ -20,14 +20,14 @@
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.incendo.interfaces.paper.PlayerViewer;
 
-public final class BukkitTagsCommand implements PluginCommand {
+public final class PaperTagsCommand implements PluginCommand {
 
     private final UserService userService;
     private final CloudArgumentFactory argumentFactory;
     private final TagsMenuFactory tagsMenuFactory;
 
     @Inject
-    public BukkitTagsCommand(
+    public PaperTagsCommand(
             final @NonNull UserService userService,
             final @NonNull CloudArgumentFactory argumentFactory,
             final @NonNull TagsMenuFactory tagsMenuFactory
@@ -66,12 +66,12 @@ private void handleTestItem(final @NonNull CommandContext<CommandUser> context)
                 .customModelData(displayInformation.customModelData())
                 .build();
 
-        BukkitPlayerCommandUser user = context.getSender().cast();
+        PaperPlayerCommandUser user = context.getSender().cast();
         user.player().getInventory().addItem(item);
     }
 
     private void handleMenu(final @NonNull CommandContext<CommandUser> context) {
-        BukkitPlayerCommandUser sender = context.getSender().cast();
+        PaperPlayerCommandUser sender = context.getSender().cast();
         TagsUser user = this.userService.get(sender.uuid());
 
         this.tagsMenuFactory.create(user).open(PlayerViewer.of(sender.player()));

diff --git a/...t/commands/context/BukkitCommandUser.java → ...er/commands/context/PaperCommandUser.java b/...t/commands/context/BukkitCommandUser.java → ...er/commands/context/PaperCommandUser.java
@@ -1,15 +1,15 @@
-package broccolai.tags.bukkit.commands.context;
+package broccolai.tags.paper.commands.context;
 
 import broccolai.tags.core.commands.context.CommandUser;
 import net.kyori.adventure.audience.Audience;
 import org.bukkit.command.CommandSender;
 import org.checkerframework.checker.nullness.qual.NonNull;
 
-public abstract class BukkitCommandUser implements CommandUser {
+public abstract class PaperCommandUser implements CommandUser {
 
     private final CommandSender source;
 
-    public BukkitCommandUser(final @NonNull CommandSender source) {
+    public PaperCommandUser(final @NonNull CommandSender source) {
         this.source = source;
     }
 

diff --git a/...nds/context/BukkitConsoleCommandUser.java → ...ands/context/PaperConsoleCommandUser.java b/...nds/context/BukkitConsoleCommandUser.java → ...ands/context/PaperConsoleCommandUser.java
@@ -1,13 +1,13 @@
-package broccolai.tags.bukkit.commands.context;
+package broccolai.tags.paper.commands.context;
 
 import broccolai.tags.api.model.user.impl.ConsoleTagsUser;
 import java.util.UUID;
 import org.bukkit.command.CommandSender;
 import org.checkerframework.checker.nullness.qual.NonNull;
 
-public final class BukkitConsoleCommandUser extends BukkitCommandUser {
+public final class PaperConsoleCommandUser extends PaperCommandUser {
 
-    public BukkitConsoleCommandUser(final @NonNull CommandSender source) {
+    public PaperConsoleCommandUser(final @NonNull CommandSender source) {
         super(source);
     }
 

diff --git a/...ands/context/BukkitPlayerCommandUser.java → ...mands/context/PaperPlayerCommandUser.java b/...ands/context/BukkitPlayerCommandUser.java → ...mands/context/PaperPlayerCommandUser.java
@@ -1,14 +1,14 @@
-package broccolai.tags.bukkit.commands.context;
+package broccolai.tags.paper.commands.context;
 
 import java.util.UUID;
 import org.bukkit.entity.Player;
 import org.checkerframework.checker.nullness.qual.NonNull;
 
-public final class BukkitPlayerCommandUser extends BukkitCommandUser {
+public final class PaperPlayerCommandUser extends PaperCommandUser {
 
     private final Player player;
 
-    public BukkitPlayerCommandUser(
+    public PaperPlayerCommandUser(
             final @NonNull Player player
     ) {
         super(player);

diff --git a/...ai/tags/bukkit/inject/PlatformModule.java → ...lai/tags/paper/inject/PlatformModule.java b/...ai/tags/bukkit/inject/PlatformModule.java → ...lai/tags/paper/inject/PlatformModule.java
@@ -1,12 +1,12 @@
-package broccolai.tags.bukkit.inject;
+package broccolai.tags.paper.inject;
 
 import broccolai.tags.api.service.PermissionService;
 import broccolai.tags.api.service.TaskService;
 import broccolai.tags.api.service.UserService;
-import broccolai.tags.bukkit.BukkitTagsPlatform;
-import broccolai.tags.bukkit.service.BukkitPermissionService;
-import broccolai.tags.bukkit.service.BukkitPipelineUserService;
-import broccolai.tags.bukkit.service.BukkitTaskService;
+import broccolai.tags.paper.PaperTagsPlatform;
+import broccolai.tags.paper.service.PaperPermissionService;
+import broccolai.tags.paper.service.PaperPipelineUserService;
+import broccolai.tags.paper.service.PaperTaskService;
 import broccolai.tags.core.platform.TagsPlatform;
 import com.google.inject.AbstractModule;
 import java.io.File;
@@ -16,9 +16,9 @@
 
 public final class PlatformModule extends AbstractModule {
 
-    private final @NonNull BukkitTagsPlatform plugin;
+    private final @NonNull PaperTagsPlatform plugin;
 
-    public PlatformModule(final @NonNull BukkitTagsPlatform plugin) {
+    public PlatformModule(final @NonNull PaperTagsPlatform plugin) {
         this.plugin = plugin;
     }
 
@@ -28,9 +28,9 @@ protected void configure() {
         this.bind(TagsPlatform.class).toInstance(this.plugin);
         this.bind(File.class).toInstance(this.plugin.getDataFolder());
         this.bind(Logger.class).toInstance(this.plugin.getSLF4JLogger());
-        this.bind(TaskService.class).to(BukkitTaskService.class);
-        this.bind(UserService.class).to(BukkitPipelineUserService.class);
-        this.bind(PermissionService.class).to(BukkitPermissionService.class);
+        this.bind(TaskService.class).to(PaperTaskService.class);
+        this.bind(UserService.class).to(PaperPipelineUserService.class);
+        this.bind(PermissionService.class).to(PaperPermissionService.class);
     }
 
 }
diff --git a/...colai/tags/bukkit/inject/VaultModule.java → ...ccolai/tags/paper/inject/VaultModule.java b/...colai/tags/bukkit/inject/VaultModule.java → ...ccolai/tags/paper/inject/VaultModule.java
@@ -1,4 +1,4 @@
-package broccolai.tags.bukkit.inject;
+package broccolai.tags.paper.inject;
 
 import com.google.inject.AbstractModule;
 import com.google.inject.Provides;

diff --git a/...bukkit/integrations/BasicIntegration.java → .../paper/integrations/BasicIntegration.java b/...bukkit/integrations/BasicIntegration.java → .../paper/integrations/BasicIntegration.java
@@ -1,4 +1,4 @@
-package broccolai.tags.bukkit.integrations;
+package broccolai.tags.paper.integrations;
 
 import broccolai.tags.api.model.tag.ConstructedTag;
 import broccolai.tags.api.service.TagsService;

diff --git a/.../bukkit/integrations/PapiIntegration.java → ...s/paper/integrations/PapiIntegration.java b/.../bukkit/integrations/PapiIntegration.java → ...s/paper/integrations/PapiIntegration.java
@@ -1,4 +1,4 @@
-package broccolai.tags.bukkit.integrations;
+package broccolai.tags.paper.integrations;
 
 import broccolai.tags.api.model.tag.ConstructedTag;
 import broccolai.tags.api.model.user.TagsUser;

diff --git a/...tags/bukkit/listeners/PlayerListener.java → .../tags/paper/listeners/PlayerListener.java b/...tags/bukkit/listeners/PlayerListener.java → .../tags/paper/listeners/PlayerListener.java
@@ -1,4 +1,4 @@
-package broccolai.tags.bukkit.listeners;
+package broccolai.tags.paper.listeners;
 
 import broccolai.tags.api.events.event.UserLoginEvent;
 import broccolai.tags.api.model.user.TagsUser;

diff --git a/...lai/tags/bukkit/menu/TagsMenuFactory.java → ...olai/tags/paper/menu/TagsMenuFactory.java b/...lai/tags/bukkit/menu/TagsMenuFactory.java → ...olai/tags/paper/menu/TagsMenuFactory.java
@@ -1,4 +1,4 @@
-package broccolai.tags.bukkit.menu;
+package broccolai.tags.paper.menu;
 
 import broccolai.corn.paper.item.PaperItemBuilder;
 import broccolai.tags.api.model.tag.ConstructedTag;

diff --git a/...kkit/service/BukkitPermissionService.java → ...paper/service/PaperPermissionService.java b/...kkit/service/BukkitPermissionService.java → ...paper/service/PaperPermissionService.java
@@ -1,4 +1,4 @@
-package broccolai.tags.bukkit.service;
+package broccolai.tags.paper.service;
 
 import broccolai.tags.api.model.Permissible;
 import broccolai.tags.api.model.user.TagsUser;
@@ -9,12 +9,12 @@
 import org.bukkit.entity.Player;
 import org.checkerframework.checker.nullness.qual.NonNull;
 
-public final class BukkitPermissionService implements PermissionService {
+public final class PaperPermissionService implements PermissionService {
 
     private final @NonNull Permission permission;
 
     @Inject
-    public BukkitPermissionService(final @NonNull Permission permission) {
+    public PaperPermissionService(final @NonNull Permission permission) {
         this.permission = permission;
     }