From 13e4966a1210b57d5a398c4181849b275c28d584 Mon Sep 17 00:00:00 2001 From: Len <40720638+destro174@users.noreply.github.com> Date: Fri, 19 Jul 2024 21:09:26 +0200 Subject: [PATCH 1/2] Revert "Update to 1.21?" This reverts commit 3ea078237db5dbe4bf239abb534d2afd7cee81d1. --- api/build.gradle.kts | 4 ++-- build.gradle.kts | 6 +++--- galaxy/build.gradle.kts | 8 +++----- velocity/build.gradle.kts | 4 ++-- 4 files changed, 10 insertions(+), 12 deletions(-) diff --git a/api/build.gradle.kts b/api/build.gradle.kts index ead619d..d4e432d 100644 --- a/api/build.gradle.kts +++ b/api/build.gradle.kts @@ -3,8 +3,8 @@ plugins { } dependencies { - compileOnly("com.alttd:Galaxy-API:1.21-R0.1-SNAPSHOT") { - isChanging = true + compileOnly("com.alttd:Galaxy-API:1.19.2-R0.1-SNAPSHOT") { +// exclude("net.kyori") } 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 ec18af0..75b8e7d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,11 +1,11 @@ plugins { `java-library` - id("com.github.johnrengelman.shadow") version "8.1.1" + id("com.github.johnrengelman.shadow") version "7.1.0" } allprojects { group = "com.alttd.chat" - version = "2.0.1-SNAPSHOT" + version = "2.0.0-SNAPSHOT" description = "All in one minecraft chat plugin" // repositories { @@ -27,7 +27,7 @@ subprojects { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(21)) + languageVersion.set(JavaLanguageVersion.of(17)) } } diff --git a/galaxy/build.gradle.kts b/galaxy/build.gradle.kts index 9faee32..a3b7501 100644 --- a/galaxy/build.gradle.kts +++ b/galaxy/build.gradle.kts @@ -4,14 +4,12 @@ import java.net.URL plugins { `maven-publish` id("com.github.johnrengelman.shadow") - id("xyz.jpenilla.run-paper") version "2.3.0" + id("xyz.jpenilla.run-paper") version "1.0.6" } dependencies { implementation(project(":api")) // API - compileOnly("com.alttd:Galaxy-API:1.21-R0.1-SNAPSHOT") { - isChanging = true - } + compileOnly("com.alttd:Galaxy-API:1.20.4-R0.1-SNAPSHOT") // Galaxy compileOnly("com.gitlab.ruany:LiteBansAPI:0.3.5") // move to proxy compileOnly("org.apache.commons:commons-lang3:3.12.0") // needs an alternative, already removed from upstream api and will be removed in server compileOnly("net.luckperms:api:5.3") // Luckperms @@ -47,7 +45,7 @@ tasks { download("https://repo.destro.xyz/snapshots/com/alttd/Galaxy-Server/Galaxy-paperclip-1.19.2-R0.1-SNAPSHOT-reobf.jar", file) } serverJar(file) - minecraftVersion("1.21") + minecraftVersion("1.19.2") } } diff --git a/velocity/build.gradle.kts b/velocity/build.gradle.kts index 797d83d..3fb4877 100644 --- a/velocity/build.gradle.kts +++ b/velocity/build.gradle.kts @@ -5,8 +5,8 @@ plugins { dependencies { implementation(project(":api")) // API - compileOnly("com.velocitypowered:velocity-api:3.3.0-SNAPSHOT") - annotationProcessor("com.velocitypowered:velocity-api:3.3.0-SNAPSHOT") + compileOnly("com.velocitypowered:velocity-api:3.2.0-SNAPSHOT") + annotationProcessor("com.velocitypowered:velocity-api:3.2.0-SNAPSHOT") implementation("mysql:mysql-connector-java:8.0.27") // mysql implementation("org.spongepowered", "configurate-yaml", "4.1.2") compileOnly("net.kyori:adventure-text-minimessage:4.10.1") From e1d6da56d0078525f5f2386067d7c2c6be6409b8 Mon Sep 17 00:00:00 2001 From: Len <40720638+destro174@users.noreply.github.com> Date: Fri, 19 Jul 2024 21:09:26 +0200 Subject: [PATCH 2/2] Revert "Update gradle-wrapper.properties to 8.8" This reverts commit 2c3feac36789f7114b57f76bece113f477921f9d. --- gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a441313..1af9e09 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME