diff --git a/Jenkinsfile b/Jenkinsfile index 34ed17c..aee907a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,7 +1,7 @@ pipeline { agent any tools { - jdk 'JDK 21.0.7' + jdk 'jdk-21-latest' } stages { stage("build") { diff --git a/build.gradle.kts b/build.gradle.kts index df106c1..eb240f1 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,13 +1,13 @@ plugins { id("java") id("maven-publish") - id("org.jetbrains.gradle.plugin.idea-ext") version "1.1.10" - id("net.kyori.blossom") version "2.1.0" - id("com.gradleup.shadow") version "9.2.2" + id("org.jetbrains.gradle.plugin.idea-ext") version "1.3" + id("net.kyori.blossom") version "2.2.0" + id("com.gradleup.shadow") version "9.3.0" } group = "dev.plex" -version = "1.6" +version = "1.7-SNAPSHOT" description = "Plex" subprojects { diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 9bbc975..f8e1ee3 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index bad7c24..23449a2 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-9.2.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index faf9300..adff685 100755 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright © 2015-2021 the original authors. +# Copyright © 2015 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -114,7 +114,6 @@ case "$( uname )" in #( NONSTOP* ) nonstop=true ;; esac -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar # Determine the Java command to use to start the JVM. @@ -172,7 +171,6 @@ fi # For Cygwin or MSYS, switch paths to Windows format before running java if "$cygwin" || "$msys" ; then APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) - CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) JAVACMD=$( cygpath --unix "$JAVACMD" ) @@ -212,8 +210,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ - -classpath "$CLASSPATH" \ - org.gradle.wrapper.GradleWrapperMain \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ "$@" # Stop when "xargs" is not available. diff --git a/gradlew.bat b/gradlew.bat index 9b42019..e509b2d 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -70,11 +70,10 @@ goto fail :execute @rem Setup the command line -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* :end @rem End local scope for the variables with windows NT shell diff --git a/proxy/build.gradle.kts b/proxy/build.gradle.kts index 0a0ebfb..74d5324 100644 --- a/proxy/build.gradle.kts +++ b/proxy/build.gradle.kts @@ -39,9 +39,9 @@ publishing { } dependencies { - compileOnly("org.projectlombok:lombok:1.18.38") - annotationProcessor("org.projectlombok:lombok:1.18.38") - compileOnly("org.json:json:20250107") + compileOnly("org.projectlombok:lombok:1.18.42") + annotationProcessor("org.projectlombok:lombok:1.18.42") + compileOnly("org.json:json:20251224") compileOnly("com.velocitypowered:velocity-api:3.4.0-SNAPSHOT") annotationProcessor("com.velocitypowered:velocity-api:3.4.0-SNAPSHOT") } \ No newline at end of file diff --git a/server/build.gradle.kts b/server/build.gradle.kts index c75ea72..0107780 100644 --- a/server/build.gradle.kts +++ b/server/build.gradle.kts @@ -3,8 +3,8 @@ import java.text.SimpleDateFormat import java.util.* plugins { - id("net.kyori.indra.git") version "3.1.3" - id("de.eldoria.plugin-yml.paper") version "0.7.1" + id("net.kyori.indra.git") version "4.0.0" + id("de.eldoria.plugin-yml.paper") version "0.8.0" } repositories { @@ -14,25 +14,22 @@ repositories { dependencies { library("org.projectlombok:lombok:1.18.42") - library("org.json:json:20250517") - library("commons-io:commons-io:2.20.0") - library("redis.clients:jedis:7.0.0") - library("org.mariadb.jdbc:mariadb-java-client:3.5.6") - library("com.zaxxer:HikariCP:6.3.3") - library("org.apache.maven.resolver:maven-resolver-transport-http:1.9.24") + library("org.json:json:20251224") + library("commons-io:commons-io:2.21.0") + library("redis.clients:jedis:7.2.0") + library("org.mariadb.jdbc:mariadb-java-client:3.5.7") + library("com.zaxxer:HikariCP:7.0.2") + library("org.apache.maven.resolver:maven-resolver-transport-http:1.9.25") library("org.jetbrains:annotations:26.0.2") - compileOnly("io.papermc.paper:paper-api:1.21.10-R0.1-SNAPSHOT") + compileOnly("io.papermc.paper:paper-api:1.21.11-R0.1-SNAPSHOT") compileOnly("com.github.MilkBowl:VaultAPI:1.7.1") { exclude("org.bukkit", "bukkit") } - compileOnly("net.coreprotect:coreprotect:22.4") + compileOnly("net.coreprotect:coreprotect:23.1") compileOnly("network.darkhelmet.prism:Prism-Api:1.0.0") compileOnly("com.github.LeonMangler:SuperVanish:6.2.19") - implementation("org.bstats:bstats-base:3.1.0") implementation("org.bstats:bstats-bukkit:3.1.0") - - annotationProcessor("org.projectlombok:lombok:1.18.42") } @@ -108,6 +105,10 @@ tasks { dependsOn(shadowJar) } + generatePaperPluginDescription { + useGoogleMavenCentralProxy() + } + jar { enabled = false } @@ -119,7 +120,7 @@ tasks { property("author", if (System.getenv("JENKINS_URL") != null) "jenkins" else System.getProperty("user.name")) property("buildNumber", if (System.getenv("BUILD_NUMBER") != null) System.getenv("BUILD_NUMBER") else getBuildNumber()) property("date", SimpleDateFormat("MM/dd/yyyy 'at' hh:mm:ss a z").format(Date())) - property("gitCommit", indraGit.commit()?.name?.take(7)) + property("gitCommit", indraGit.commit().get().name.take(7)) } } } diff --git a/server/src/main/java/dev/plex/PlexLibraryManager.java b/server/src/main/java/dev/plex/PlexLibraryManager.java index b9f586d..2c4bb48 100644 --- a/server/src/main/java/dev/plex/PlexLibraryManager.java +++ b/server/src/main/java/dev/plex/PlexLibraryManager.java @@ -42,10 +42,6 @@ public class PlexLibraryManager implements PluginLoader try (var in = getClass().getResourceAsStream("/paper-libraries.json")) { PluginLibraries libraries = new Gson().fromJson(new InputStreamReader(in, StandardCharsets.UTF_8), PluginLibraries.class); - - // Patch the MavenRepo to use the default mirror - libraries.repositories.put("MavenRepo", MavenLibraryResolver.MAVEN_CENTRAL_DEFAULT_MIRROR); - return libraries; } catch (IOException e) diff --git a/server/src/main/resources/config.yml b/server/src/main/resources/config.yml index 164e282..5ba840c 100644 --- a/server/src/main/resources/config.yml +++ b/server/src/main/resources/config.yml @@ -60,15 +60,23 @@ data: # By default this includes all mobs, as the mobpurge command can be used to purge mobs. entitywipe_list: - "ITEM_FRAME" + - "ALLAY" + - "ARMADILLO" - "AXOLOTL" - "BAT" - "BEE" - "BLAZE" + - "BOGGED" + - "BREEZE" + - "CAMEL" + - "CAMEL_HUSK" - "CAT" - "CAVE_SPIDER" - "CHICKEN" - "COD" + - "COPPER_GOLEM" - "COW" + - "CREAKING" - "CREEPER" - "DOLPHIN" - "DONKEY" @@ -79,11 +87,13 @@ entitywipe_list: - "ENDERMITE" - "EVOKER" - "FOX" + - "FROG" - "GHAST" - "GIANT" - "GLOW_SQUID" - "GOAT" - "GUARDIAN" + - "HAPPY_GHAST" - "HOGLIN" - "HORSE" - "HUSK" @@ -93,8 +103,10 @@ entitywipe_list: - "MAGMA_CUBE" - "MULE" - "MUSHROOM_COW" + - "NAUTILUS" - "OCELOT" - "PANDA" + - "PARCHED" - "PARROT" - "PHANTOM" - "PIG" @@ -102,6 +114,7 @@ entitywipe_list: - "PIGLIN_BRUTE" - "PILLAGER" - "POLAR_BEAR" + - "PUFFERFISH" - "RABBIT" - "RAVAGER" - "SALMON" @@ -111,11 +124,13 @@ entitywipe_list: - "SKELETON" - "SKELETON_HORSE" - "SLIME" + - "SNIFFER" - "SNOWMAN" - "SPIDER" - "SQUID" - "STRAY" - "STRIDER" + - "TADPOLE" - "TRADER_LLAMA" - "TROPICAL_FISH" - "TURTLE" @@ -123,6 +138,7 @@ entitywipe_list: - "VILLAGER" - "VINDICATOR" - "WANDERING_TRADER" + - "WARDEN" - "WITCH" - "WITHER" - "WITHER_SKELETON" @@ -130,9 +146,9 @@ entitywipe_list: - "ZOGLIN" - "ZOMBIE" - "ZOMBIE_HORSE" + - "ZOMBIE_NAUTILUS" - "ZOMBIE_VILLAGER" - "ZOMBIFIED_PIGLIN" - - "PUFFERFISH" # Automatically wipe the specified entities autowipe: @@ -168,19 +184,23 @@ entity_limit: # See https://docs.plex.us.org/docs/customization/config#worlds for documentation # These gamerules apply to all worlds on the server global_gamerules: - - "doWeatherCycle;true" - - "doDaylightCycle;true" - - "doMobSpawning;false" - - "keepInventory;true" - - "doFireTick;false" - - "doMobLoot;false" - - "mobGriefing;false" - - "doTileDrops;false" - - "commandBlockOutput;false" - - "naturalRegeneration;true" - - "announceAdvancements;false" - - "showDeathMessages;false" - - "sendCommandFeedback;false" + - "advance_weather;true" + - "advance_time;true" + - "spawn_mobs;false" + - "spawn_monsters;false" + - "spawn_patrols;false" + - "spawn_phantoms;false" + - "spawn_wandering_traders;false" + - "spawn_wardens;false" + - "keep_inventory;true" + - "mob_drops;false" + - "mob_griefing;false" + - "block_drops;false" + - "command_block_output;false" + - "natural_health_regeneration;true" + - "show_advancement_messages;false" + - "show_death_messages;false" + - "send_command_feedback;false" worlds: flatlands: @@ -190,8 +210,8 @@ worlds: message: "You do not have permission to modify this world." gameRules: # The gamerules here override the global gamerules - - "doWeatherCycle;false" - - "doDaylightCycle;false" + - "advance_weather;false" + - "advance_time;false" parameters: grass_block: 1 dirt: 32 @@ -206,8 +226,8 @@ worlds: permission: "plex.world.adminworld.modify" message: "You do not have permission to modify this world." gameRules: - - "doWeatherCycle;false" - - "doDaylightCycle;false" + - "advance_weather;false" + - "advance_time;false" parameters: grass_block: 1 dirt: 32 @@ -222,8 +242,8 @@ worlds: permission: "plex.world.masterbuilderworld.modify" message: "You do not have permission to modify this world." gameRules: - - "doWeatherCycle;false" - - "doDaylightCycle;false" + - "advance_weather;false" + - "advance_time;false" parameters: grass_block: 1 dirt: 32