From 927a396030f37f279786e4a84831dd9d60a6d30d Mon Sep 17 00:00:00 2001 From: broccolai Date: Tue, 31 Oct 2023 12:01:34 +0000 Subject: [PATCH] rename bukkit module to paper and use shared ci --- .github/workflows/gradle.yml | 41 ++++++----------- .github/workflows/publish.yml | 44 ------------------- .gitignore | 2 +- build.gradle.kts | 1 + {bukkit => paper}/build.gradle.kts | 0 .../tags/paper/PaperTagsPlatform.java | 42 +++++++++--------- .../tags/paper/commands/PaperTagsCommand.java | 14 +++--- .../commands/context/PaperCommandUser.java | 6 +-- .../context/PaperConsoleCommandUser.java | 6 +-- .../context/PaperPlayerCommandUser.java | 6 +-- .../tags/paper}/inject/PlatformModule.java | 20 ++++----- .../tags/paper}/inject/VaultModule.java | 2 +- .../paper}/integrations/BasicIntegration.java | 2 +- .../paper}/integrations/PapiIntegration.java | 2 +- .../tags/paper}/listeners/PlayerListener.java | 2 +- .../tags/paper}/menu/TagsMenuFactory.java | 2 +- .../paper/service/PaperPermissionService.java | 6 +-- .../service/PaperPipelineUserService.java | 6 +-- .../tags/paper/service/PaperTaskService.java | 6 +-- .../src/main/resources/paper-plugin.yml | 0 .../queries/migrations/V1__create_tables.sql | 0 .../src/main/resources/queries/save-user.sql | 0 .../main/resources/queries/select-user.sql | 0 settings.gradle.kts | 4 +- 24 files changed, 80 insertions(+), 134 deletions(-) delete mode 100644 .github/workflows/publish.yml rename {bukkit => paper}/build.gradle.kts (100%) rename bukkit/src/main/java/broccolai/tags/bukkit/BukkitTagsPlatform.java => paper/src/main/java/broccolai/tags/paper/PaperTagsPlatform.java (75%) rename bukkit/src/main/java/broccolai/tags/bukkit/commands/BukkitTagsCommand.java => paper/src/main/java/broccolai/tags/paper/commands/PaperTagsCommand.java (87%) rename bukkit/src/main/java/broccolai/tags/bukkit/commands/context/BukkitCommandUser.java => paper/src/main/java/broccolai/tags/paper/commands/context/PaperCommandUser.java (72%) rename bukkit/src/main/java/broccolai/tags/bukkit/commands/context/BukkitConsoleCommandUser.java => paper/src/main/java/broccolai/tags/paper/commands/context/PaperConsoleCommandUser.java (60%) rename bukkit/src/main/java/broccolai/tags/bukkit/commands/context/BukkitPlayerCommandUser.java => paper/src/main/java/broccolai/tags/paper/commands/context/PaperPlayerCommandUser.java (73%) rename {bukkit/src/main/java/broccolai/tags/bukkit => paper/src/main/java/broccolai/tags/paper}/inject/PlatformModule.java (56%) rename {bukkit/src/main/java/broccolai/tags/bukkit => paper/src/main/java/broccolai/tags/paper}/inject/VaultModule.java (94%) rename {bukkit/src/main/java/broccolai/tags/bukkit => paper/src/main/java/broccolai/tags/paper}/integrations/BasicIntegration.java (96%) rename {bukkit/src/main/java/broccolai/tags/bukkit => paper/src/main/java/broccolai/tags/paper}/integrations/PapiIntegration.java (97%) rename {bukkit/src/main/java/broccolai/tags/bukkit => paper/src/main/java/broccolai/tags/paper}/listeners/PlayerListener.java (97%) rename {bukkit/src/main/java/broccolai/tags/bukkit => paper/src/main/java/broccolai/tags/paper}/menu/TagsMenuFactory.java (99%) rename bukkit/src/main/java/broccolai/tags/bukkit/service/BukkitPermissionService.java => paper/src/main/java/broccolai/tags/paper/service/PaperPermissionService.java (85%) rename bukkit/src/main/java/broccolai/tags/bukkit/service/BukkitPipelineUserService.java => paper/src/main/java/broccolai/tags/paper/service/PaperPipelineUserService.java (83%) rename bukkit/src/main/java/broccolai/tags/bukkit/service/BukkitTaskService.java => paper/src/main/java/broccolai/tags/paper/service/PaperTaskService.java (78%) rename {bukkit => paper}/src/main/resources/paper-plugin.yml (100%) rename {bukkit => paper}/src/main/resources/queries/migrations/V1__create_tables.sql (100%) rename {bukkit => paper}/src/main/resources/queries/save-user.sql (100%) rename {bukkit => paper}/src/main/resources/queries/select-user.sql (100%) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 6a8fddf..6377f28 100644 --- 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 deleted file mode 100644 index 55023df..0000000 --- a/.github/workflows/publish.yml +++ /dev/null @@ -1,44 +0,0 @@ -name: Publish package to the broccolai repo -on: - release: - types: [created] -jobs: - publish: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - name: Set up Java - uses: actions/setup-java@v1 - with: - java-version: 1.8 - - name: Grant execute permission for gradlew - run: chmod +x gradlew - - name: Publish package - run: ./gradlew build publish -x signMavenPublication - env: - ORG_GRADLE_PROJECT_broccolaiUsername: ${{ secrets.BROCCOLAI_USERNAME }} - ORG_GRADLE_PROJECT_broccolaiPassword: ${{ secrets.BROCCOLAI_PASSWORD }} - - uses: octokit/request-action@v2.x - id: get_latest_release - with: - route: GET /repos/:repository/releases/latest - repository: ${{ github.repository }} - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - name: get upload url - id: get_upload_url - run: | - url=$(echo "$response" | jq -r '.upload_url') - echo "::set-output name=url::$url" - env: - response: ${{ steps.get_latest_release.outputs.data }} - - name: Upload Release Asset - id: upload-release-asset - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.get_upload_url.outputs.url }} - asset_path: ./bukkit/build/libs/tags-bukkit.jar - asset_name: tags-bukkit.jar - asset_content_type: application/java-archive diff --git a/.gitignore b/.gitignore index b523b0e..c3ce99b 100644 --- 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 index 17ef39c..50b84ca 100644 --- 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 b/paper/build.gradle.kts similarity index 100% rename from bukkit/build.gradle.kts rename to paper/build.gradle.kts diff --git a/bukkit/src/main/java/broccolai/tags/bukkit/BukkitTagsPlatform.java b/paper/src/main/java/broccolai/tags/paper/PaperTagsPlatform.java similarity index 75% rename from bukkit/src/main/java/broccolai/tags/bukkit/BukkitTagsPlatform.java rename to paper/src/main/java/broccolai/tags/paper/PaperTagsPlatform.java index 26a2262..0ae2911 100644 --- a/bukkit/src/main/java/broccolai/tags/bukkit/BukkitTagsPlatform.java +++ b/paper/src/main/java/broccolai/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[] BUKKIT_LISTENERS = ArrayUtilities.create( + private static final @NonNull Class[] PAPER_LISTENERS = ArrayUtilities.create( PlayerListener.class, BasicIntegration.class ); - private static final @NonNull Collection> BUKKIT_COMMANDS = ArrayUtilities.merge( + private static final @NonNull Collection> 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 bukkitListener : BUKKIT_LISTENERS) { + for (final Class 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 commandManager( PaperCommandManager commandManager = new PaperCommandManager<>( this, AsynchronousCommandExecutionCoordinator.builder().build(), - BukkitTagsPlatform::from, - user -> user.cast().sender() + PaperTagsPlatform::from, + user -> user.cast().sender() ); if (commandManager.hasCapability(CloudBukkitCapabilities.ASYNCHRONOUS_COMPLETION)) { @@ -126,9 +126,9 @@ private CommandManager 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/bukkit/src/main/java/broccolai/tags/bukkit/commands/BukkitTagsCommand.java b/paper/src/main/java/broccolai/tags/paper/commands/PaperTagsCommand.java similarity index 87% rename from bukkit/src/main/java/broccolai/tags/bukkit/commands/BukkitTagsCommand.java rename to paper/src/main/java/broccolai/tags/paper/commands/PaperTagsCommand.java index 3b96df6..b936f2b 100644 --- a/bukkit/src/main/java/broccolai/tags/bukkit/commands/BukkitTagsCommand.java +++ b/paper/src/main/java/broccolai/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 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 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/bukkit/src/main/java/broccolai/tags/bukkit/commands/context/BukkitCommandUser.java b/paper/src/main/java/broccolai/tags/paper/commands/context/PaperCommandUser.java similarity index 72% rename from bukkit/src/main/java/broccolai/tags/bukkit/commands/context/BukkitCommandUser.java rename to paper/src/main/java/broccolai/tags/paper/commands/context/PaperCommandUser.java index 328c421..81e50f5 100644 --- a/bukkit/src/main/java/broccolai/tags/bukkit/commands/context/BukkitCommandUser.java +++ b/paper/src/main/java/broccolai/tags/paper/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/bukkit/src/main/java/broccolai/tags/bukkit/commands/context/BukkitConsoleCommandUser.java b/paper/src/main/java/broccolai/tags/paper/commands/context/PaperConsoleCommandUser.java similarity index 60% rename from bukkit/src/main/java/broccolai/tags/bukkit/commands/context/BukkitConsoleCommandUser.java rename to paper/src/main/java/broccolai/tags/paper/commands/context/PaperConsoleCommandUser.java index 4d43cb9..8907b55 100644 --- a/bukkit/src/main/java/broccolai/tags/bukkit/commands/context/BukkitConsoleCommandUser.java +++ b/paper/src/main/java/broccolai/tags/paper/commands/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/bukkit/src/main/java/broccolai/tags/bukkit/commands/context/BukkitPlayerCommandUser.java b/paper/src/main/java/broccolai/tags/paper/commands/context/PaperPlayerCommandUser.java similarity index 73% rename from bukkit/src/main/java/broccolai/tags/bukkit/commands/context/BukkitPlayerCommandUser.java rename to paper/src/main/java/broccolai/tags/paper/commands/context/PaperPlayerCommandUser.java index 19f2367..92360c6 100644 --- a/bukkit/src/main/java/broccolai/tags/bukkit/commands/context/BukkitPlayerCommandUser.java +++ b/paper/src/main/java/broccolai/tags/paper/commands/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/bukkit/src/main/java/broccolai/tags/bukkit/inject/PlatformModule.java b/paper/src/main/java/broccolai/tags/paper/inject/PlatformModule.java similarity index 56% rename from bukkit/src/main/java/broccolai/tags/bukkit/inject/PlatformModule.java rename to paper/src/main/java/broccolai/tags/paper/inject/PlatformModule.java index 6f7583a..715cab9 100644 --- a/bukkit/src/main/java/broccolai/tags/bukkit/inject/PlatformModule.java +++ b/paper/src/main/java/broccolai/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/bukkit/src/main/java/broccolai/tags/bukkit/inject/VaultModule.java b/paper/src/main/java/broccolai/tags/paper/inject/VaultModule.java similarity index 94% rename from bukkit/src/main/java/broccolai/tags/bukkit/inject/VaultModule.java rename to paper/src/main/java/broccolai/tags/paper/inject/VaultModule.java index f8bed27..4fca5c1 100644 --- a/bukkit/src/main/java/broccolai/tags/bukkit/inject/VaultModule.java +++ b/paper/src/main/java/broccolai/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/src/main/java/broccolai/tags/bukkit/integrations/BasicIntegration.java b/paper/src/main/java/broccolai/tags/paper/integrations/BasicIntegration.java similarity index 96% rename from bukkit/src/main/java/broccolai/tags/bukkit/integrations/BasicIntegration.java rename to paper/src/main/java/broccolai/tags/paper/integrations/BasicIntegration.java index b7c5886..037bdcd 100644 --- a/bukkit/src/main/java/broccolai/tags/bukkit/integrations/BasicIntegration.java +++ b/paper/src/main/java/broccolai/tags/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/src/main/java/broccolai/tags/bukkit/integrations/PapiIntegration.java b/paper/src/main/java/broccolai/tags/paper/integrations/PapiIntegration.java similarity index 97% rename from bukkit/src/main/java/broccolai/tags/bukkit/integrations/PapiIntegration.java rename to paper/src/main/java/broccolai/tags/paper/integrations/PapiIntegration.java index 70cf399..4445a94 100644 --- a/bukkit/src/main/java/broccolai/tags/bukkit/integrations/PapiIntegration.java +++ b/paper/src/main/java/broccolai/tags/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/bukkit/src/main/java/broccolai/tags/bukkit/listeners/PlayerListener.java b/paper/src/main/java/broccolai/tags/paper/listeners/PlayerListener.java similarity index 97% rename from bukkit/src/main/java/broccolai/tags/bukkit/listeners/PlayerListener.java rename to paper/src/main/java/broccolai/tags/paper/listeners/PlayerListener.java index 226e993..0e30f0f 100644 --- a/bukkit/src/main/java/broccolai/tags/bukkit/listeners/PlayerListener.java +++ b/paper/src/main/java/broccolai/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/bukkit/src/main/java/broccolai/tags/bukkit/menu/TagsMenuFactory.java b/paper/src/main/java/broccolai/tags/paper/menu/TagsMenuFactory.java similarity index 99% rename from bukkit/src/main/java/broccolai/tags/bukkit/menu/TagsMenuFactory.java rename to paper/src/main/java/broccolai/tags/paper/menu/TagsMenuFactory.java index 33d108f..82b74d1 100644 --- a/bukkit/src/main/java/broccolai/tags/bukkit/menu/TagsMenuFactory.java +++ b/paper/src/main/java/broccolai/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/bukkit/src/main/java/broccolai/tags/bukkit/service/BukkitPermissionService.java b/paper/src/main/java/broccolai/tags/paper/service/PaperPermissionService.java similarity index 85% rename from bukkit/src/main/java/broccolai/tags/bukkit/service/BukkitPermissionService.java rename to paper/src/main/java/broccolai/tags/paper/service/PaperPermissionService.java index 30e9547..c36a854 100644 --- a/bukkit/src/main/java/broccolai/tags/bukkit/service/BukkitPermissionService.java +++ b/paper/src/main/java/broccolai/tags/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; } diff --git a/bukkit/src/main/java/broccolai/tags/bukkit/service/BukkitPipelineUserService.java b/paper/src/main/java/broccolai/tags/paper/service/PaperPipelineUserService.java similarity index 83% rename from bukkit/src/main/java/broccolai/tags/bukkit/service/BukkitPipelineUserService.java rename to paper/src/main/java/broccolai/tags/paper/service/PaperPipelineUserService.java index 65da03a..daf7846 100644 --- a/bukkit/src/main/java/broccolai/tags/bukkit/service/BukkitPipelineUserService.java +++ b/paper/src/main/java/broccolai/tags/paper/service/PaperPipelineUserService.java @@ -1,4 +1,4 @@ -package broccolai.tags.bukkit.service; +package broccolai.tags.paper.service; import broccolai.corn.core.Lists; import broccolai.tags.api.model.user.TagsUser; @@ -12,10 +12,10 @@ import org.bukkit.entity.Player; import org.checkerframework.checker.nullness.qual.NonNull; -public final class BukkitPipelineUserService extends PipelineUserService { +public final class PaperPipelineUserService extends PipelineUserService { @Inject - public BukkitPipelineUserService(final @NonNull Injector injector) { + public PaperPipelineUserService(final @NonNull Injector injector) { super(injector); } diff --git a/bukkit/src/main/java/broccolai/tags/bukkit/service/BukkitTaskService.java b/paper/src/main/java/broccolai/tags/paper/service/PaperTaskService.java similarity index 78% rename from bukkit/src/main/java/broccolai/tags/bukkit/service/BukkitTaskService.java rename to paper/src/main/java/broccolai/tags/paper/service/PaperTaskService.java index 0fa1a6b..844774f 100644 --- a/bukkit/src/main/java/broccolai/tags/bukkit/service/BukkitTaskService.java +++ b/paper/src/main/java/broccolai/tags/paper/service/PaperTaskService.java @@ -1,4 +1,4 @@ -package broccolai.tags.bukkit.service; +package broccolai.tags.paper.service; import broccolai.tags.api.service.TaskService; import com.google.inject.Inject; @@ -6,12 +6,12 @@ import org.bukkit.plugin.Plugin; import org.checkerframework.checker.nullness.qual.NonNull; -public final class BukkitTaskService implements TaskService { +public final class PaperTaskService implements TaskService { private final @NonNull Plugin plugin; @Inject - public BukkitTaskService(final @NonNull Plugin plugin) { + public PaperTaskService(final @NonNull Plugin plugin) { this.plugin = plugin; } diff --git a/bukkit/src/main/resources/paper-plugin.yml b/paper/src/main/resources/paper-plugin.yml similarity index 100% rename from bukkit/src/main/resources/paper-plugin.yml rename to paper/src/main/resources/paper-plugin.yml diff --git a/bukkit/src/main/resources/queries/migrations/V1__create_tables.sql b/paper/src/main/resources/queries/migrations/V1__create_tables.sql similarity index 100% rename from bukkit/src/main/resources/queries/migrations/V1__create_tables.sql rename to paper/src/main/resources/queries/migrations/V1__create_tables.sql diff --git a/bukkit/src/main/resources/queries/save-user.sql b/paper/src/main/resources/queries/save-user.sql similarity index 100% rename from bukkit/src/main/resources/queries/save-user.sql rename to paper/src/main/resources/queries/save-user.sql diff --git a/bukkit/src/main/resources/queries/select-user.sql b/paper/src/main/resources/queries/select-user.sql similarity index 100% rename from bukkit/src/main/resources/queries/select-user.sql rename to paper/src/main/resources/queries/select-user.sql diff --git a/settings.gradle.kts b/settings.gradle.kts index 8409008..7d61a8a 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -11,7 +11,7 @@ plugins { rootProject.name = "tags" -use("api", "core", "bukkit") +use("api", "core", "paper") fun use(vararg names: String) { for (name in names) { @@ -19,3 +19,5 @@ fun use(vararg names: String) { project(":$name").name = "${rootProject.name}-$name" } } + +enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")