From 0396dbe917447fb648dc2dbe0bd366d0b83bca50 Mon Sep 17 00:00:00 2001 From: NotAlexNoyle Date: Wed, 1 Apr 2026 13:16:04 -0400 Subject: [PATCH] Update config file --- build.gradle.kts | 101 +++++++++++++++++++++++++++------- settings.gradle.kts | 5 +- src/main/resources/config.yml | 26 ++++----- 3 files changed, 97 insertions(+), 35 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index c25b8a46..5668607d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -7,7 +7,7 @@ import org.gradle.language.jvm.tasks.ProcessResources plugins { id("java-library") id("eclipse") - id("com.gradleup.shadow") version "8.3.8" + id("com.gradleup.shadow") version "8.3.9" } group = "com.comphenix.protocol" @@ -17,13 +17,59 @@ description = "Provides access to the Minecraft protocol" val isSnapshot = version.toString().endsWith("-SNAPSHOT") repositories { - mavenLocal() + maven { + url = uri("file://${System.getProperty("user.home")}/.m2/repository") + content { + includeGroup("org.spigotmc") + } + } + System.getProperty("SELF_MAVEN_LOCAL_REPO")?.let { // TrueOG Bootstrap mavenLocal(). + val dir = file(it) + if (dir.isDirectory) { + println("Using SELF_MAVEN_LOCAL_REPO at: $it") + maven { + url = uri("file://${dir.absolutePath}") + content { + includeGroup("org.spigotmc") + } + } + } else { + logger.error("TrueOG Bootstrap not found, defaulting to ~/.m2 for mavenLocal()") + mavenLocal { + content { + includeGroup("org.spigotmc") + } + } + } + } ?: logger.error("TrueOG Bootstrap not found, defaulting to ~/.m2 for mavenLocal()") mavenCentral() maven { - url = uri("https://repo.dmulloy2.net/repository/public/") + name = "Rosewood Public" + url = uri("https://repo.rosewooddev.io/repository/public/") + content { + includeGroup("org.spigotmc") + } } maven { + name = "ElMakers Mirror" + url = uri("https://maven.elmakers.com/repository/") + content { + includeGroup("org.spigotmc") + } + } + maven { + name = "dmulloy2" + url = uri("https://repo.dmulloy2.net/repository/public/") + content { + excludeGroup("org.spigotmc") + } + } + maven { + name = "Spigot Snapshots" url = uri("https://hub.spigotmc.org/nexus/content/groups/public/") + content { + includeGroup("org.spigotmc") + } } maven { url = uri("https://libraries.minecraft.net/") @@ -33,41 +79,55 @@ repositories { ignoreGradleMetadataRedirection() } } - val customMavenLocal = System.getProperty("SELF_MAVEN_LOCAL_REPO") - if (customMavenLocal != null) { - val mavenLocalDir = file(customMavenLocal) - if (mavenLocalDir.isDirectory) { - println("Using SELF_MAVEN_LOCAL_REPO at: $customMavenLocal") - maven { - url = uri("file://${mavenLocalDir.absolutePath}") - } - } else { - logger.error("TrueOG Bootstrap not found, defaulting to ~/.m2 for mavenLocal()") - } - } else { - logger.error("TrueOG Bootstrap not found, defaulting to ~/.m2 to mavenLocal()") - } } dependencies { implementation("net.bytebuddy:byte-buddy:1.14.3") - compileOnly("org.spigotmc:spigot-api:1.19.4-R0.1-SNAPSHOT") - compileOnly("org.spigotmc:spigot:1.19.4-R0.1-SNAPSHOT") + compileOnly("org.spigotmc:spigot-api:1.19.4-R0.1-SNAPSHOT") { + isTransitive = false + } + compileOnly("com.google.guava:guava:31.1-jre") + compileOnly("org.apache.commons:commons-lang3:3.17.0") + compileOnly("commons-lang:commons-lang:2.6") + compileOnly("com.google.code.findbugs:jsr305:3.0.2") + compileOnly("com.mojang:datafixerupper:6.0.6") + compileOnly("net.md-5:bungeecord-chat:1.16-R0.4") + compileOnly("org.yaml:snakeyaml:1.33") + compileOnly("org.joml:joml:1.10.5") compileOnly("io.netty:netty-all:4.0.23.Final") compileOnly("net.kyori:adventure-text-serializer-gson:4.13.0") - compileOnly("com.googlecode.json-simple:json-simple:1.1.1") + compileOnly("com.googlecode.json-simple:json-simple:1.1.1") { + isTransitive = false + } testImplementation("org.junit.jupiter:junit-jupiter:5.9.2") testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.9.2") testImplementation("org.mockito:mockito-core:4.11.0") testImplementation("org.mockito:mockito-inline:4.11.0") testImplementation("io.netty:netty-common:4.1.77.Final") testImplementation("io.netty:netty-transport:4.1.77.Final") + testImplementation("org.spigotmc:spigot-api:1.19.4-R0.1-SNAPSHOT") testImplementation("org.spigotmc:spigot:1.19.4-R0.1-SNAPSHOT") + testImplementation("com.google.guava:guava:31.1-jre") + testImplementation("org.apache.commons:commons-lang3:3.17.0") + testImplementation("commons-lang:commons-lang:2.6") + testImplementation("com.google.code.findbugs:jsr305:3.0.2") + testImplementation("com.mojang:authlib:3.17.30") + testImplementation("com.mojang:brigadier:1.0.18") + testImplementation("com.mojang:datafixerupper:6.0.6") + testImplementation("com.mojang:logging:1.1.1") + testImplementation("net.md-5:bungeecord-chat:1.16-R0.4") + testImplementation("org.apache.logging.log4j:log4j-api:2.17.1") + testRuntimeOnly("org.slf4j:slf4j-api:2.0.0") + testImplementation("org.yaml:snakeyaml:1.33") + testImplementation("org.joml:joml:1.10.5") testImplementation("net.kyori:adventure-text-serializer-gson:4.13.0") testImplementation("net.kyori:adventure-text-serializer-plain:4.13.1") } java { + toolchain { + languageVersion = JavaLanguageVersion.of(17) + } sourceCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = JavaVersion.VERSION_1_8 withJavadocJar() @@ -113,4 +173,3 @@ testing { } } } - diff --git a/settings.gradle.kts b/settings.gradle.kts index 269a651e..2b7da32a 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,2 +1,5 @@ -rootProject.name = "ProtocolLib" +plugins { + id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0" +} +rootProject.name = "ProtocolLib" diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index 6bf6d627..91dbede1 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -1,30 +1,30 @@ global: # Settings for the automatic version updater auto updater: - notify: true + notify: false download: false - + # Number of seconds to wait until a new update is downloaded delay: 43200 # 12 hours - - metrics: true + + metrics: false # Prints certain warnings to players with the protocol.info permission chat warnings: true - - # Automatically compile structure modifiers + + # Automatically compile structure modifiers background compiler: true - + # Disable version checking for the given Minecraft version. Backup your world first! - ignore version check: + ignore version check: false # Whether or not to enable the filter command debug: false - + # Whether or not to print a stack trace for every warning - detailed error: false - + detailed error: true + # The engine used by the filter command script engine: JavaScript - - suppressed reports: \ No newline at end of file + + suppressed reports: all \ No newline at end of file