From 5202301fdb7307f7f530345c03b6f7863ae137c7 Mon Sep 17 00:00:00 2001 From: Len <40720638+destro174@users.noreply.github.com> Date: Thu, 30 Jul 2026 08:20:03 -0500 Subject: [PATCH] Update to 26.2 --- build.gradle.kts | 15 +++------------ settings.gradle.kts | 20 +++++++++++++++----- 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 2ceac64..0bf1183 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -35,7 +35,7 @@ tasks { file.parentFile.mkdirs() } if (!file.exists()) { - download("https://jenkins.destro.xyz/job/Cosmos/lastSuccessfulBuild/artifact/cosmos-server/build/libs/cosmos-bundler-1.21.11-R0.1-SNAPSHOT-mojmap.jar", fileName) +// download("https://jenkins.destro.xyz/job/Cosmos/lastSuccessfulBuild/artifact/cosmos-server/build/libs/cosmos-bundler-1.21.11-R0.1-SNAPSHOT-mojmap.jar", fileName) } serverJar(file) minecraftVersion("1.21") @@ -67,7 +67,7 @@ publishing { } dependencies { - compileOnly("com.alttd.cosmos:cosmos-api:1.21.11-R0.1-SNAPSHOT") + compileOnly("com.alttd.cosmos:cosmos-api:26.2.build.17-stable") compileOnly("com.github.milkbowl:VaultAPI:1.7") { exclude("org.bukkit","bukkit") } @@ -77,15 +77,6 @@ dependencies { annotationProcessor("org.projectlombok:lombok:1.18.30") } -fun gitCommit(): String { - val os = ByteArrayOutputStream() - project.exec { - commandLine = "git rev-parse --short HEAD".split(" ") - standardOutput = os - } - return String(os.toByteArray()).trim() -} - fun download(link: String, path: String) { URL(link).openStream().use { input -> FileOutputStream(File(path)).use { output -> @@ -98,7 +89,7 @@ paper { name = rootProject.name main = "$group.${rootProject.name}" bootstrapper = "$group.${rootProject.name}Bootstrap" - version = "${rootProject.version}-${gitCommit()}" + version = "${rootProject.version}" apiVersion = "1.21" authors = listOf("destro174") serverDependencies { diff --git a/settings.gradle.kts b/settings.gradle.kts index f342c6f..7200461 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,14 +1,24 @@ rootProject.name = "PlayerShops" +val nexusUser = providers.gradleProperty("alttdSnapshotUsername").orNull ?: System.getenv("NEXUS_USERNAME") +val nexusPass = providers.gradleProperty("alttdSnapshotPassword").orNull ?: System.getenv("NEXUS_PASSWORD") + dependencyResolutionManagement { repositories { mavenCentral() maven { - name = "AlttdNexus" - url = uri( - "https://repo.alttd.com/repository/alttd-snapshot/" - ) - credentials(PasswordCredentials::class) + 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") maven("https://jitpack.io") { // Vault