From d8953412ce5552171b6dd8c0834851a4f8aaebc2 Mon Sep 17 00:00:00 2001 From: Ryder Belserion Date: Sat, 27 Apr 2024 12:19:57 -0400 Subject: [PATCH] Fix compilation error --- api/build.gradle.kts | 2 +- build.gradle.kts | 2 +- buildSrc/build.gradle.kts | 2 +- .../src/main/kotlin/root-plugin.gradle.kts | 4 +- paper/build.gradle.kts | 2 +- paper/run/server.properties | 92 +++++++++---------- 6 files changed, 52 insertions(+), 52 deletions(-) diff --git a/api/build.gradle.kts b/api/build.gradle.kts index c5a002573..38f65787a 100644 --- a/api/build.gradle.kts +++ b/api/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - id("com.github.johnrengelman.shadow") + id("io.github.goooler.shadow") `root-plugin` } diff --git a/build.gradle.kts b/build.gradle.kts index 4f6cf84e2..ab00a6fb0 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -6,7 +6,7 @@ plugins { id("io.papermc.hangar-publish-plugin") version "0.1.2" id("com.modrinth.minotaur") version "2.+" - id("com.github.johnrengelman.shadow") + id("io.github.goooler.shadow") `root-plugin` } diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 0abee03f2..b52f35aa9 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -10,5 +10,5 @@ repositories { dependencies { implementation("io.papermc.paperweight", "paperweight-userdev", "1.5.15") - implementation("com.github.johnrengelman", "shadow", "8.1.1") + implementation("io.github.goooler.shadow", "shadow-gradle-plugin", "8.1.7") } \ No newline at end of file diff --git a/buildSrc/src/main/kotlin/root-plugin.gradle.kts b/buildSrc/src/main/kotlin/root-plugin.gradle.kts index 07eb7e224..31fdba43a 100644 --- a/buildSrc/src/main/kotlin/root-plugin.gradle.kts +++ b/buildSrc/src/main/kotlin/root-plugin.gradle.kts @@ -31,13 +31,13 @@ repositories { } java { - toolchain.languageVersion.set(JavaLanguageVersion.of("17")) + toolchain.languageVersion.set(JavaLanguageVersion.of("21")) } tasks { compileJava { options.encoding = Charsets.UTF_8.name() - options.release.set(17) + options.release.set(21) } javadoc { diff --git a/paper/build.gradle.kts b/paper/build.gradle.kts index 82bf908ac..9a7c93533 100644 --- a/paper/build.gradle.kts +++ b/paper/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - id("com.github.johnrengelman.shadow") + id("io.github.goooler.shadow") alias(libs.plugins.run.paper) diff --git a/paper/run/server.properties b/paper/run/server.properties index f67511812..74be991a3 100644 --- a/paper/run/server.properties +++ b/paper/run/server.properties @@ -1,61 +1,61 @@ #Minecraft server properties -#Thu Apr 25 18:23:54 EDT 2024 -enable-jmx-monitoring=false -rcon.port=25575 -level-seed= -gamemode=survival +#Sat Apr 27 12:19:26 EDT 2024 +allow-flight=false +allow-nether=false +broadcast-console-to-ops=false +broadcast-rcon-to-ops=false +debug=false +difficulty=peaceful enable-command-block=false +enable-jmx-monitoring=false enable-query=false -generator-settings={} +enable-rcon=false +enable-status=true enforce-secure-profile=true -level-name=world -motd=A test server -query.port=25565 -pvp=true +enforce-whitelist=false +entity-broadcast-range-percentage=100 +force-gamemode=false +function-permission-level=2 +gamemode=survival generate-structures=true +generator-settings={} +hardcore=false +hide-online-players=false +initial-disabled-packs= +initial-enabled-packs=vanilla +level-name=world +level-seed= +level-type=minecraft\:normal +log-ips=false max-chained-neighbor-updates=1000000 -difficulty=peaceful -network-compression-threshold=256 -max-tick-time=60000 -require-resource-pack=false -use-native-transport=true max-players=5 +max-tick-time=60000 +max-world-size=29999984 +motd=A test server +network-compression-threshold=256 online-mode=true -enable-status=true -allow-flight=false -initial-disabled-packs= -broadcast-rcon-to-ops=false -view-distance=6 -server-ip= -resource-pack-prompt= -allow-nether=false -server-port=25565 -enable-rcon=false -sync-chunk-writes=false -resource-pack-id= op-permission-level=4 +player-idle-timeout=0 prevent-proxy-connections=false -hide-online-players=false +pvp=true +query.port=25565 +rate-limit=0 +rcon.password= +rcon.port=25575 +require-resource-pack=false resource-pack= -entity-broadcast-range-percentage=100 +resource-pack-id= +resource-pack-prompt= +resource-pack-sha1= +server-ip= +server-port=25565 simulation-distance=10 -rcon.password= -player-idle-timeout=0 -debug=false -force-gamemode=false -rate-limit=0 -hardcore=false -white-list=false -broadcast-console-to-ops=false -spawn-npcs=true spawn-animals=true -log-ips=false -function-permission-level=2 -initial-enabled-packs=vanilla -level-type=minecraft\:normal -text-filtering-config= spawn-monsters=true -enforce-whitelist=false +spawn-npcs=true spawn-protection=32 -resource-pack-sha1= -max-world-size=29999984 +sync-chunk-writes=false +text-filtering-config= +use-native-transport=true +view-distance=6 +white-list=false