diff --git a/api/build.gradle.kts b/api/build.gradle.kts index d0806ba..d79ef1d 100644 --- a/api/build.gradle.kts +++ b/api/build.gradle.kts @@ -3,9 +3,7 @@ plugins { } dependencies { - compileOnly("com.alttd.cosmos:cosmos-api:1.21.6-R0.1-SNAPSHOT") { - isChanging = true - } + compileOnly("com.alttd.cosmos:cosmos-api:26.2.build.17-stable") compileOnly("org.spongepowered:configurate-yaml:4.1.2") // Configurate compileOnly("net.luckperms:api:5.3") // Luckperms diff --git a/build.gradle.kts b/build.gradle.kts index da5b4e6..2c2390b 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,12 +1,12 @@ plugins { `java-library` `maven-publish` - id("io.github.goooler.shadow") version "8.1.8" + id("com.gradleup.shadow") version "9.6.1" } allprojects { group = "com.alttd.boosters" - version = "1.0.0-BETA-SNAPSHOT" + version = System.getenv("BUILD_NUMBER") ?: "1.0.0-BETA-SNAPSHOT" description = "Easily manage all boosters on the Altitude Minecraft Server Network." apply() diff --git a/plugin/build.gradle.kts b/plugin/build.gradle.kts index 98172b1..d7d2aac 100644 --- a/plugin/build.gradle.kts +++ b/plugin/build.gradle.kts @@ -1,18 +1,15 @@ plugins { `maven-publish` - id("io.github.goooler.shadow") + id("com.gradleup.shadow") id("net.minecrell.plugin-yml.bukkit") version "0.5.1" } dependencies { // API implementation(project(":boosters-api")) - // Galaxy - compileOnly("com.alttd.cosmos:cosmos-api:1.21.6-R0.1-SNAPSHOT") { - isChanging = true - } + compileOnly("com.alttd.cosmos:cosmos-api:26.2.build.17-stable") // MyPet - compileOnly("de.keyle:mypet:3.12-SNAPSHOT") + compileOnly("de.keyle:mypet-api:4.0.0-SNAPSHOT") // mcMMO compileOnly("com.gmail.nossr50.mcMMO:mcMMO:2.2.004") { exclude("com.sk89q.worldguard") @@ -39,7 +36,8 @@ tasks { bukkit { name = rootProject.name main = "$group.BoostersPlugin" - apiVersion = "1.21" + version = "${rootProject.version}" + apiVersion = "26.2" authors = listOf("destro174", "akastijn") softDepend = listOf("MyPet", "mcMMO") commands { diff --git a/plugin/src/main/java/com/alttd/boosters/listeners/MyPetListener.java b/plugin/src/main/java/com/alttd/boosters/listeners/MyPetListener.java index 3797214..e159eea 100755 --- a/plugin/src/main/java/com/alttd/boosters/listeners/MyPetListener.java +++ b/plugin/src/main/java/com/alttd/boosters/listeners/MyPetListener.java @@ -3,7 +3,7 @@ package com.alttd.boosters.listeners; import com.alttd.boosterapi.data.Booster; import com.alttd.boosterapi.data.BoosterCache; import com.alttd.boosterapi.data.BoosterType; -import de.Keyle.MyPet.api.event.MyPetExpEvent; +import de.Keyle.MyPet.api.event.PetExpEvent; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; @@ -18,7 +18,7 @@ public class MyPetListener implements Listener { } @EventHandler - public void onMyPetExpEvent(MyPetExpEvent event) { + public void onMyPetExpEvent(PetExpEvent event) { double exp = event.getPet().getExp(); if (exp == 0) { return; diff --git a/settings.gradle.kts b/settings.gradle.kts index f77e3b3..c8a884a 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,5 +1,8 @@ rootProject.name = "Boosters" +val nexusUser = providers.gradleProperty("alttdSnapshotUsername").orNull ?: System.getenv("NEXUS_USERNAME") +val nexusPass = providers.gradleProperty("alttdSnapshotPassword").orNull ?: System.getenv("NEXUS_PASSWORD") + include(":plugin") include(":velocity") @@ -7,19 +10,29 @@ dependencyResolutionManagement { repositories { // mavenLocal() mavenCentral() + maven { + url = uri("https://repo.alttd.com/repository/alttd-snapshot/") + credentials { + username = nexusUser + password = nexusPass + } + } + maven { + url = uri("https://repo.alttd.com/repository/alttd/") + credentials { + username = nexusUser + password = nexusPass + } + } maven("https://repo.destro.xyz/snapshots") // Altitude - Galaxy maven("https://oss.sonatype.org/content/groups/public/") // Adventure maven("https://repo.papermc.io/repo/repository/maven-public/") // Velocity maven("https://repo.spongepowered.org/maven") // Configurate maven("https://nexus.neetgames.com/repository/maven-releases/") // mcMMO // maven("https://maven.enginehub.org/repo/") // worldguard - maven { // mypet - name = "GitHubPackages" - url = uri("https://maven.pkg.github.com/MyPetORG/MyPet") - credentials { - username = providers.gradleProperty("GitHubPackagesUsername").orNull - password = providers.gradleProperty("GitHubPackagesPassword").orNull - } + maven { + name = "userderezzedRepoSnapshots" + url = uri("https://repo.userderezzed.dev/snapshots") } } diff --git a/velocity/build.gradle.kts b/velocity/build.gradle.kts index 28f5499..20bf866 100644 --- a/velocity/build.gradle.kts +++ b/velocity/build.gradle.kts @@ -1,6 +1,6 @@ plugins { `maven-publish` - id("io.github.goooler.shadow") + id("com.gradleup.shadow") } dependencies {