From 07bae23126dab7fa8214c7708836d1d53051c85d Mon Sep 17 00:00:00 2001 From: Ryder Belserion Date: Sat, 7 Sep 2024 23:17:08 -0400 Subject: [PATCH] re-work build script --- build.gradle.kts | 75 +---------------- .../src/main/kotlin/java-plugin.gradle.kts | 1 + .../src/main/kotlin/paper-plugin.gradle.kts | 2 - gradle/libs.versions.toml | 5 +- paper/build.gradle.kts | 81 +++++++++++++++++++ .../crazyauctions/CrazyAuctions.java | 0 .../com/badbones69/crazyauctions/Methods.java | 0 .../crazyauctions/api/CrazyManager.java | 0 .../api/builders/ItemBuilder.java | 0 .../crazyauctions/api/enums/Category.java | 0 .../crazyauctions/api/enums/Messages.java | 0 .../crazyauctions/api/enums/Reasons.java | 0 .../crazyauctions/api/enums/ShopType.java | 0 .../crazyauctions/api/enums/misc/Files.java | 0 .../crazyauctions/api/enums/misc/Keys.java | 30 +++++++ .../api/events/AuctionBuyEvent.java | 0 .../api/events/AuctionCancelledEvent.java | 0 .../api/events/AuctionExpireEvent.java | 0 .../api/events/AuctionListEvent.java | 0 .../api/events/AuctionNewBidEvent.java | 0 .../api/events/AuctionWinBidEvent.java | 0 .../api/support/MetricsWrapper.java | 0 .../api/support/SkullCreator.java | 0 .../commands/AuctionCommand.java | 0 .../crazyauctions/commands/AuctionTab.java | 0 .../controllers/GuiListener.java | 0 .../controllers/MarcoListener.java | 0 .../crazyauctions/currency/VaultSupport.java | 0 {src => paper/src}/main/resources/config.yml | 0 {src => paper/src}/main/resources/data.yml | 0 .../src}/main/resources/messages.yml | 0 {src => paper/src}/main/resources/plugin.yml | 0 settings.gradle.kts | 4 +- 33 files changed, 120 insertions(+), 78 deletions(-) create mode 100644 paper/build.gradle.kts rename {src => paper/src}/main/java/com/badbones69/crazyauctions/CrazyAuctions.java (100%) rename {src => paper/src}/main/java/com/badbones69/crazyauctions/Methods.java (100%) rename {src => paper/src}/main/java/com/badbones69/crazyauctions/api/CrazyManager.java (100%) rename {src => paper/src}/main/java/com/badbones69/crazyauctions/api/builders/ItemBuilder.java (100%) rename {src => paper/src}/main/java/com/badbones69/crazyauctions/api/enums/Category.java (100%) rename {src => paper/src}/main/java/com/badbones69/crazyauctions/api/enums/Messages.java (100%) rename {src => paper/src}/main/java/com/badbones69/crazyauctions/api/enums/Reasons.java (100%) rename {src => paper/src}/main/java/com/badbones69/crazyauctions/api/enums/ShopType.java (100%) rename {src => paper/src}/main/java/com/badbones69/crazyauctions/api/enums/misc/Files.java (100%) create mode 100644 paper/src/main/java/com/badbones69/crazyauctions/api/enums/misc/Keys.java rename {src => paper/src}/main/java/com/badbones69/crazyauctions/api/events/AuctionBuyEvent.java (100%) rename {src => paper/src}/main/java/com/badbones69/crazyauctions/api/events/AuctionCancelledEvent.java (100%) rename {src => paper/src}/main/java/com/badbones69/crazyauctions/api/events/AuctionExpireEvent.java (100%) rename {src => paper/src}/main/java/com/badbones69/crazyauctions/api/events/AuctionListEvent.java (100%) rename {src => paper/src}/main/java/com/badbones69/crazyauctions/api/events/AuctionNewBidEvent.java (100%) rename {src => paper/src}/main/java/com/badbones69/crazyauctions/api/events/AuctionWinBidEvent.java (100%) rename {src => paper/src}/main/java/com/badbones69/crazyauctions/api/support/MetricsWrapper.java (100%) rename {src => paper/src}/main/java/com/badbones69/crazyauctions/api/support/SkullCreator.java (100%) rename {src => paper/src}/main/java/com/badbones69/crazyauctions/commands/AuctionCommand.java (100%) rename {src => paper/src}/main/java/com/badbones69/crazyauctions/commands/AuctionTab.java (100%) rename {src => paper/src}/main/java/com/badbones69/crazyauctions/controllers/GuiListener.java (100%) rename {src => paper/src}/main/java/com/badbones69/crazyauctions/controllers/MarcoListener.java (100%) rename {src => paper/src}/main/java/com/badbones69/crazyauctions/currency/VaultSupport.java (100%) rename {src => paper/src}/main/resources/config.yml (100%) rename {src => paper/src}/main/resources/data.yml (100%) rename {src => paper/src}/main/resources/messages.yml (100%) rename {src => paper/src}/main/resources/plugin.yml (100%) diff --git a/build.gradle.kts b/build.gradle.kts index 1463acc..49131a4 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,11 +1,8 @@ plugins { - alias(libs.plugins.paperweight) - alias(libs.plugins.runPaper) alias(libs.plugins.minotaur) alias(libs.plugins.hangar) - alias(libs.plugins.shadow) - `paper-plugin` + `java-plugin` } val buildNumber: String? = System.getenv("BUILD_NUMBER") @@ -16,77 +13,11 @@ val isSnapshot = true val content: String = rootProject.file("CHANGELOG.md").readText(Charsets.UTF_8) -dependencies { - paperweight.paperDevBundle(libs.versions.paper) - - implementation(libs.vital.paper) - - compileOnly(libs.placeholderapi) - - compileOnly(libs.oraxen) - - compileOnly(libs.vault) - - compileOnly(fileTree("libs").include("*.jar")) -} - -paperweight { - reobfArtifactConfiguration = io.papermc.paperweight.userdev.ReobfArtifactConfiguration.REOBF_PRODUCTION +subprojects.filter { it.name != "api" }.forEach { + it.project.version = rootProject.version } tasks { - runServer { - jvmArgs("-Dnet.kyori.ansi.colorLevel=truecolor") - - defaultCharacterEncoding = Charsets.UTF_8.name() - - downloadPlugins { - url("https://github.com/EssentialsX/Essentials/releases/download/2.20.1/EssentialsX-2.20.1.jar") - - url("https://ci.lucko.me/job/TinyVault/lastSuccessfulBuild/artifact/build/libs/Vault.jar") - - url("https://download.luckperms.net/1544/bukkit/loader/LuckPerms-Bukkit-5.4.131.jar") - } - - minecraftVersion(libs.versions.minecraft.get()) - } - - assemble { - dependsOn(reobfJar) - - doLast { - copy { - from(reobfJar.get()) - into(rootProject.projectDir.resolve("jars")) - } - } - } - - shadowJar { - archiveBaseName.set(rootProject.name) - archiveClassifier.set("") - - listOf( - "com.ryderbelserion" - ).forEach { - relocate(it, "libs.$it") - } - } - - processResources { - inputs.properties("name" to rootProject.name) - inputs.properties("version" to project.version) - inputs.properties("group" to project.group) - inputs.properties("apiVersion" to libs.versions.minecraft.get()) - inputs.properties("description" to project.properties["description"]) - inputs.properties("authors" to project.properties["authors"]) - inputs.properties("website" to project.properties["website"]) - - filesMatching("plugin.yml") { - expand(inputs.properties) - } - } - modrinth { token.set(System.getenv("MODRINTH_TOKEN")) diff --git a/buildSrc/src/main/kotlin/java-plugin.gradle.kts b/buildSrc/src/main/kotlin/java-plugin.gradle.kts index eb3a19f..58da24c 100644 --- a/buildSrc/src/main/kotlin/java-plugin.gradle.kts +++ b/buildSrc/src/main/kotlin/java-plugin.gradle.kts @@ -9,6 +9,7 @@ repositories { maven("https://repo.codemc.io/repository/maven-public") + maven("https://repo.crazycrew.us/libraries") maven("https://repo.crazycrew.us/releases") maven("https://repo.oraxen.com/releases") diff --git a/buildSrc/src/main/kotlin/paper-plugin.gradle.kts b/buildSrc/src/main/kotlin/paper-plugin.gradle.kts index 76a2471..ae66a3c 100644 --- a/buildSrc/src/main/kotlin/paper-plugin.gradle.kts +++ b/buildSrc/src/main/kotlin/paper-plugin.gradle.kts @@ -5,7 +5,5 @@ plugins { repositories { maven("https://repo.papermc.io/repository/maven-public") - maven("https://repo.triumphteam.dev/snapshots") - maven("https://maven.enginehub.org/repo") } \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 37a10e9..ebebc05 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -31,7 +31,7 @@ vault = "1.7.1" triumph-cmd = "2.0.0-ALPHA-10" jetbrains = "24.1.0" adventure = "4.17.0" -vital = "2.0.1" +vital-paper = "0.0.2" [libraries] velocity = { module = "com.velocitypowered:velocity-api", version.ref = "velocity" } @@ -53,8 +53,7 @@ oraxen = { module = "io.th0rgal:oraxen", version.ref = "oraxen" } # Libraries triumph-cmds = { module = "dev.triumphteam:triumph-cmd-bukkit", version.ref = "triumph-cmd" } -vital-core = { module = "com.ryderbelserion.vital:core", version.ref = "vital" } -vital-paper = { module = "com.ryderbelserion.vital:paper", version.ref = "vital" } +vital-paper = { module = "com.ryderbelserion.vital:paper", version.ref = "vital-paper" } jetbrains = { module = "org.jetbrains:annotations", version.ref = "jetbrains" } [bundles] diff --git a/paper/build.gradle.kts b/paper/build.gradle.kts new file mode 100644 index 0000000..4f1535d --- /dev/null +++ b/paper/build.gradle.kts @@ -0,0 +1,81 @@ +plugins { + alias(libs.plugins.paperweight) + alias(libs.plugins.runPaper) + alias(libs.plugins.shadow) + + `paper-plugin` +} + +dependencies { + paperweight.paperDevBundle(libs.versions.paper) + + implementation(libs.vital.paper) { + exclude("org.yaml") + } + + compileOnly(libs.placeholderapi) + + compileOnly(libs.oraxen) + + compileOnly(libs.vault) + + compileOnly(fileTree("libs").include("*.jar")) +} + +paperweight { + reobfArtifactConfiguration = io.papermc.paperweight.userdev.ReobfArtifactConfiguration.REOBF_PRODUCTION +} + +tasks { + runServer { + jvmArgs("-Dnet.kyori.ansi.colorLevel=truecolor") + + defaultCharacterEncoding = Charsets.UTF_8.name() + + downloadPlugins { + url("https://github.com/EssentialsX/Essentials/releases/download/2.20.1/EssentialsX-2.20.1.jar") + + url("https://ci.lucko.me/job/TinyVault/lastSuccessfulBuild/artifact/build/libs/Vault.jar") + + url("https://download.luckperms.net/1544/bukkit/loader/LuckPerms-Bukkit-5.4.131.jar") + } + + minecraftVersion(libs.versions.minecraft.get()) + } + + assemble { + dependsOn(reobfJar) + + doLast { + copy { + from(reobfJar.get()) + into(rootProject.projectDir.resolve("jars")) + } + } + } + + shadowJar { + archiveBaseName.set(rootProject.name) + archiveClassifier.set("") + + listOf( + "com.ryderbelserion" + ).forEach { + relocate(it, "libs.$it") + } + } + + processResources { + inputs.properties("name" to rootProject.name) + inputs.properties("version" to project.version) + inputs.properties("group" to project.group) + inputs.properties("apiVersion" to libs.versions.minecraft.get()) + inputs.properties("description" to project.properties["description"]) + inputs.properties("authors" to project.properties["authors"]) + inputs.properties("website" to project.properties["website"]) + + filesMatching("plugin.yml") { + expand(inputs.properties) + } + } +} \ No newline at end of file diff --git a/src/main/java/com/badbones69/crazyauctions/CrazyAuctions.java b/paper/src/main/java/com/badbones69/crazyauctions/CrazyAuctions.java similarity index 100% rename from src/main/java/com/badbones69/crazyauctions/CrazyAuctions.java rename to paper/src/main/java/com/badbones69/crazyauctions/CrazyAuctions.java diff --git a/src/main/java/com/badbones69/crazyauctions/Methods.java b/paper/src/main/java/com/badbones69/crazyauctions/Methods.java similarity index 100% rename from src/main/java/com/badbones69/crazyauctions/Methods.java rename to paper/src/main/java/com/badbones69/crazyauctions/Methods.java diff --git a/src/main/java/com/badbones69/crazyauctions/api/CrazyManager.java b/paper/src/main/java/com/badbones69/crazyauctions/api/CrazyManager.java similarity index 100% rename from src/main/java/com/badbones69/crazyauctions/api/CrazyManager.java rename to paper/src/main/java/com/badbones69/crazyauctions/api/CrazyManager.java diff --git a/src/main/java/com/badbones69/crazyauctions/api/builders/ItemBuilder.java b/paper/src/main/java/com/badbones69/crazyauctions/api/builders/ItemBuilder.java similarity index 100% rename from src/main/java/com/badbones69/crazyauctions/api/builders/ItemBuilder.java rename to paper/src/main/java/com/badbones69/crazyauctions/api/builders/ItemBuilder.java diff --git a/src/main/java/com/badbones69/crazyauctions/api/enums/Category.java b/paper/src/main/java/com/badbones69/crazyauctions/api/enums/Category.java similarity index 100% rename from src/main/java/com/badbones69/crazyauctions/api/enums/Category.java rename to paper/src/main/java/com/badbones69/crazyauctions/api/enums/Category.java diff --git a/src/main/java/com/badbones69/crazyauctions/api/enums/Messages.java b/paper/src/main/java/com/badbones69/crazyauctions/api/enums/Messages.java similarity index 100% rename from src/main/java/com/badbones69/crazyauctions/api/enums/Messages.java rename to paper/src/main/java/com/badbones69/crazyauctions/api/enums/Messages.java diff --git a/src/main/java/com/badbones69/crazyauctions/api/enums/Reasons.java b/paper/src/main/java/com/badbones69/crazyauctions/api/enums/Reasons.java similarity index 100% rename from src/main/java/com/badbones69/crazyauctions/api/enums/Reasons.java rename to paper/src/main/java/com/badbones69/crazyauctions/api/enums/Reasons.java diff --git a/src/main/java/com/badbones69/crazyauctions/api/enums/ShopType.java b/paper/src/main/java/com/badbones69/crazyauctions/api/enums/ShopType.java similarity index 100% rename from src/main/java/com/badbones69/crazyauctions/api/enums/ShopType.java rename to paper/src/main/java/com/badbones69/crazyauctions/api/enums/ShopType.java diff --git a/src/main/java/com/badbones69/crazyauctions/api/enums/misc/Files.java b/paper/src/main/java/com/badbones69/crazyauctions/api/enums/misc/Files.java similarity index 100% rename from src/main/java/com/badbones69/crazyauctions/api/enums/misc/Files.java rename to paper/src/main/java/com/badbones69/crazyauctions/api/enums/misc/Files.java diff --git a/paper/src/main/java/com/badbones69/crazyauctions/api/enums/misc/Keys.java b/paper/src/main/java/com/badbones69/crazyauctions/api/enums/misc/Keys.java new file mode 100644 index 0000000..4d2ae05 --- /dev/null +++ b/paper/src/main/java/com/badbones69/crazyauctions/api/enums/misc/Keys.java @@ -0,0 +1,30 @@ +package com.badbones69.crazyauctions.api.enums.misc; + +import com.badbones69.crazyauctions.CrazyAuctions; +import org.bukkit.NamespacedKey; +import org.bukkit.persistence.PersistentDataType; +import org.jetbrains.annotations.NotNull; + +@SuppressWarnings("rawtypes") +public enum Keys { + + auction_item("auction_item", PersistentDataType.BOOLEAN); + + private final CrazyAuctions plugin = CrazyAuctions.getPlugin(); + + private final String NamespacedKey; + private final PersistentDataType type; + + Keys(@NotNull final String NamespacedKey, @NotNull final PersistentDataType type) { + this.NamespacedKey = NamespacedKey; + this.type = type; + } + + public @NotNull final NamespacedKey getNamespacedKey() { + return new NamespacedKey(this.plugin, this.plugin.getName().toLowerCase() + "_" + this.NamespacedKey); + } + + public @NotNull final PersistentDataType getType() { + return this.type; + } +} \ No newline at end of file diff --git a/src/main/java/com/badbones69/crazyauctions/api/events/AuctionBuyEvent.java b/paper/src/main/java/com/badbones69/crazyauctions/api/events/AuctionBuyEvent.java similarity index 100% rename from src/main/java/com/badbones69/crazyauctions/api/events/AuctionBuyEvent.java rename to paper/src/main/java/com/badbones69/crazyauctions/api/events/AuctionBuyEvent.java diff --git a/src/main/java/com/badbones69/crazyauctions/api/events/AuctionCancelledEvent.java b/paper/src/main/java/com/badbones69/crazyauctions/api/events/AuctionCancelledEvent.java similarity index 100% rename from src/main/java/com/badbones69/crazyauctions/api/events/AuctionCancelledEvent.java rename to paper/src/main/java/com/badbones69/crazyauctions/api/events/AuctionCancelledEvent.java diff --git a/src/main/java/com/badbones69/crazyauctions/api/events/AuctionExpireEvent.java b/paper/src/main/java/com/badbones69/crazyauctions/api/events/AuctionExpireEvent.java similarity index 100% rename from src/main/java/com/badbones69/crazyauctions/api/events/AuctionExpireEvent.java rename to paper/src/main/java/com/badbones69/crazyauctions/api/events/AuctionExpireEvent.java diff --git a/src/main/java/com/badbones69/crazyauctions/api/events/AuctionListEvent.java b/paper/src/main/java/com/badbones69/crazyauctions/api/events/AuctionListEvent.java similarity index 100% rename from src/main/java/com/badbones69/crazyauctions/api/events/AuctionListEvent.java rename to paper/src/main/java/com/badbones69/crazyauctions/api/events/AuctionListEvent.java diff --git a/src/main/java/com/badbones69/crazyauctions/api/events/AuctionNewBidEvent.java b/paper/src/main/java/com/badbones69/crazyauctions/api/events/AuctionNewBidEvent.java similarity index 100% rename from src/main/java/com/badbones69/crazyauctions/api/events/AuctionNewBidEvent.java rename to paper/src/main/java/com/badbones69/crazyauctions/api/events/AuctionNewBidEvent.java diff --git a/src/main/java/com/badbones69/crazyauctions/api/events/AuctionWinBidEvent.java b/paper/src/main/java/com/badbones69/crazyauctions/api/events/AuctionWinBidEvent.java similarity index 100% rename from src/main/java/com/badbones69/crazyauctions/api/events/AuctionWinBidEvent.java rename to paper/src/main/java/com/badbones69/crazyauctions/api/events/AuctionWinBidEvent.java diff --git a/src/main/java/com/badbones69/crazyauctions/api/support/MetricsWrapper.java b/paper/src/main/java/com/badbones69/crazyauctions/api/support/MetricsWrapper.java similarity index 100% rename from src/main/java/com/badbones69/crazyauctions/api/support/MetricsWrapper.java rename to paper/src/main/java/com/badbones69/crazyauctions/api/support/MetricsWrapper.java diff --git a/src/main/java/com/badbones69/crazyauctions/api/support/SkullCreator.java b/paper/src/main/java/com/badbones69/crazyauctions/api/support/SkullCreator.java similarity index 100% rename from src/main/java/com/badbones69/crazyauctions/api/support/SkullCreator.java rename to paper/src/main/java/com/badbones69/crazyauctions/api/support/SkullCreator.java diff --git a/src/main/java/com/badbones69/crazyauctions/commands/AuctionCommand.java b/paper/src/main/java/com/badbones69/crazyauctions/commands/AuctionCommand.java similarity index 100% rename from src/main/java/com/badbones69/crazyauctions/commands/AuctionCommand.java rename to paper/src/main/java/com/badbones69/crazyauctions/commands/AuctionCommand.java diff --git a/src/main/java/com/badbones69/crazyauctions/commands/AuctionTab.java b/paper/src/main/java/com/badbones69/crazyauctions/commands/AuctionTab.java similarity index 100% rename from src/main/java/com/badbones69/crazyauctions/commands/AuctionTab.java rename to paper/src/main/java/com/badbones69/crazyauctions/commands/AuctionTab.java diff --git a/src/main/java/com/badbones69/crazyauctions/controllers/GuiListener.java b/paper/src/main/java/com/badbones69/crazyauctions/controllers/GuiListener.java similarity index 100% rename from src/main/java/com/badbones69/crazyauctions/controllers/GuiListener.java rename to paper/src/main/java/com/badbones69/crazyauctions/controllers/GuiListener.java diff --git a/src/main/java/com/badbones69/crazyauctions/controllers/MarcoListener.java b/paper/src/main/java/com/badbones69/crazyauctions/controllers/MarcoListener.java similarity index 100% rename from src/main/java/com/badbones69/crazyauctions/controllers/MarcoListener.java rename to paper/src/main/java/com/badbones69/crazyauctions/controllers/MarcoListener.java diff --git a/src/main/java/com/badbones69/crazyauctions/currency/VaultSupport.java b/paper/src/main/java/com/badbones69/crazyauctions/currency/VaultSupport.java similarity index 100% rename from src/main/java/com/badbones69/crazyauctions/currency/VaultSupport.java rename to paper/src/main/java/com/badbones69/crazyauctions/currency/VaultSupport.java diff --git a/src/main/resources/config.yml b/paper/src/main/resources/config.yml similarity index 100% rename from src/main/resources/config.yml rename to paper/src/main/resources/config.yml diff --git a/src/main/resources/data.yml b/paper/src/main/resources/data.yml similarity index 100% rename from src/main/resources/data.yml rename to paper/src/main/resources/data.yml diff --git a/src/main/resources/messages.yml b/paper/src/main/resources/messages.yml similarity index 100% rename from src/main/resources/messages.yml rename to paper/src/main/resources/messages.yml diff --git a/src/main/resources/plugin.yml b/paper/src/main/resources/plugin.yml similarity index 100% rename from src/main/resources/plugin.yml rename to paper/src/main/resources/plugin.yml diff --git a/settings.gradle.kts b/settings.gradle.kts index acd6ed5..5f52071 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1 +1,3 @@ -rootProject.name = "CrazyAuctions" \ No newline at end of file +rootProject.name = "CrazyAuctions" + +include("paper") \ No newline at end of file