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