Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-22 00:47:38 +01:00
Code Issues Projects Releases Wiki Activity

update configurate (#9230)

Browse Source
This commit is contained in:
Jake Potrebic 2023-10-03 18:06:23 -07:00 committed by GitHub
parent 9d21a88218
commit 6573d9555d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
18 changed files with 592 additions and 487 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

997
patches/server/0005-Paper-config-files.patch
View File

File diff suppressed because it is too large Load Diff

4
patches/server/0013-Paper-Plugins.patch
View File

@ -5147,7 +5147,7 @@ index 0000000000000000000000000000000000000000..7757d7df70e39a6fe4d92d02b6f905a2
+}
diff --git a/src/main/java/io/papermc/paper/plugin/provider/configuration/serializer/PermissionConfigurationSerializer.java b/src/main/java/io/papermc/paper/plugin/provider/configuration/serializer/PermissionConfigurationSerializer.java
new file mode 100644
index 0000000000000000000000000000000000000000..d1088e4b7fa5f8e689f23b150b83645ce1ae5a0e
index 0000000000000000000000000000000000000000..f951f4024745503e9cdfa7ff17b9313ac6d7b4c4
--- /dev/null
+++ b/src/main/java/io/papermc/paper/plugin/provider/configuration/serializer/PermissionConfigurationSerializer.java
@@ -0,0 +1,56 @@
@ -5192,7 +5192,7 @@ index 0000000000000000000000000000000000000000..d1088e4b7fa5f8e689f23b150b83645c
+ try {
+ result.add(Permission.loadPermission(entry.getKey().toString(), (Map<?, ?>) entry.getValue(), permissionDefault, result));
+ } catch (Throwable ex) {
+ throw new SerializationException(null, "Error loading permission %s".formatted(entry.getKey()), ex);
+ throw new SerializationException((Type) null, "Error loading permission %s".formatted(entry.getKey()), ex);
+ }
+ }
+ }

6
patches/server/0018-Rewrite-chunk-system.patch
View File

@ -15554,10 +15554,10 @@ index 0000000000000000000000000000000000000000..962d3cae6340fc11607b59355e291629
+
+}
diff --git a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
index dcfc085d355410723dbeef369579e1875a7a997b..8f82d5e1e263035eb23d878ffdc70c445933a207 100644
index 73a34b4e378e6012a01c8ac8b092248298be6648..276961a11fc2bd747d2dacdc581cecec498d7593 100644
--- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
+++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
@@ -25,6 +25,45 @@ public class GlobalConfiguration extends ConfigurationPart {
@@ -28,6 +28,45 @@ public class GlobalConfiguration extends ConfigurationPart {
public static GlobalConfiguration get() {
return instance;
}
@ -15603,7 +15603,7 @@ index dcfc085d355410723dbeef369579e1875a7a997b..8f82d5e1e263035eb23d878ffdc70c44
static void set(GlobalConfiguration instance) {
GlobalConfiguration.instance = instance;
}
@@ -117,21 +156,6 @@ public class GlobalConfiguration extends ConfigurationPart {
@@ -129,21 +168,6 @@ public class GlobalConfiguration extends ConfigurationPart {
public int incomingPacketThreshold = 300;
}

2
patches/server/0134-Use-TerminalConsoleAppender-for-console-improvements.patch
View File

@ -25,7 +25,7 @@ Other changes:
Co-Authored-By: Emilia Kond <emilia@rymiel.space>
diff --git a/build.gradle.kts b/build.gradle.kts
index 7c0b13c12f8f8ab43cc4128dc90101f527482a0d..619d1ff6a5305bf1567d244b1459a8ac5ffdbe3d 100644
index ded8824a43c99754ea12544930b416c610bd2ead..f2285f5e5669ba5c13dc8a6eb61823b0bf213161 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -6,9 +6,30 @@ plugins {

2
patches/server/0155-Handle-plugin-prefixes-using-Log4J-configuration.patch
View File

@ -15,7 +15,7 @@ This may cause additional prefixes to be disabled for plugins bypassing
the plugin logger.
diff --git a/build.gradle.kts b/build.gradle.kts
index 619d1ff6a5305bf1567d244b1459a8ac5ffdbe3d..4f6b8060cb180b48ab9e3ec349b4f46a5a1b6363 100644
index f2285f5e5669ba5c13dc8a6eb61823b0bf213161..3e07bc8be9b1406b8ecbb9a4b3c6ed05f48cdbde 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -25,7 +25,7 @@ dependencies {

2
patches/server/0219-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Use AsyncAppender to keep logging IO off main thread
diff --git a/build.gradle.kts b/build.gradle.kts
index 4f6b8060cb180b48ab9e3ec349b4f46a5a1b6363..d0f15081ed6ce6c633c46423fd666d74f50fdf8b 100644
index 3e07bc8be9b1406b8ecbb9a4b3c6ed05f48cdbde..85c3b070da9dcde26b8f947e52ba390c535feae2 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -38,6 +38,7 @@ dependencies {

2
patches/server/0295-Implement-Brigadier-Mojang-API.patch
View File

@ -10,7 +10,7 @@ Adds CommandRegisteredEvent
- Allows manipulating the CommandNode to add more children/metadata for the client
diff --git a/build.gradle.kts b/build.gradle.kts
index d0f15081ed6ce6c633c46423fd666d74f50fdf8b..ae99ecbf9055314764d32819dcdcb304caefb5ca 100644
index 85c3b070da9dcde26b8f947e52ba390c535feae2..2f32a91bea8c27eb1f768e8a2a876a081cd68de8 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -14,6 +14,7 @@ val alsoShade: Configuration by configurations.creating

18
patches/server/0355-Configurable-chance-of-villager-zombie-infection.patch
View File

@ -8,10 +8,10 @@ This allows you to solve an issue in vanilla behavior where:
* On normal difficulty they will have a 50% of getting infected or dying.
diff --git a/src/main/java/net/minecraft/world/entity/monster/Zombie.java b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
index 2be074ecbc131b68574cf77ba9cab96424715522..55e4416a7988690ecfc8da6e83b43cbf9adda33b 100644
index 2be074ecbc131b68574cf77ba9cab96424715522..4215c45aa1073b3c70eb58a06eb3dce26f389c90 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
@@ -452,12 +452,16 @@ public class Zombie extends Monster {
@@ -452,12 +452,8 @@ public class Zombie extends Monster {
public boolean killedEntity(ServerLevel world, LivingEntity other) {
boolean flag = super.killedEntity(world, other);
@ -19,16 +19,10 @@ index 2be074ecbc131b68574cf77ba9cab96424715522..55e4416a7988690ecfc8da6e83b43cbf
- Villager entityvillager = (Villager) other;
-
- if (world.getDifficulty() != Difficulty.HARD && this.random.nextBoolean()) {
+ // Paper start
+ if (this.level().paperConfig().entities.behavior.zombieVillagerInfectionChance != 0.0 && (this.level().paperConfig().entities.behavior.zombieVillagerInfectionChance != -1.0 || world.getDifficulty() == Difficulty.NORMAL || world.getDifficulty() == Difficulty.HARD) && other instanceof Villager) {
+ if (this.level().paperConfig().entities.behavior.zombieVillagerInfectionChance == -1.0 && world.getDifficulty() != Difficulty.HARD && this.random.nextBoolean()) {
return flag;
}
+ if (this.level().paperConfig().entities.behavior.zombieVillagerInfectionChance != -1.0 && (this.random.nextDouble() * 100.0) > this.level().paperConfig().entities.behavior.zombieVillagerInfectionChance) {
+ return flag;
+ } // Paper end
+
+ Villager entityvillager = (Villager) other;
- return flag;
- }
+ final double fallbackChance = world.getDifficulty() == Difficulty.HARD ? 1d : world.getDifficulty() == Difficulty.NORMAL ? 0.5d : 0d; // Paper
+ if (this.random.nextDouble() < world.paperConfig().entities.behavior.zombieVillagerInfectionChance.or(fallbackChance) && other instanceof Villager entityvillager) { // Paper
// CraftBukkit start
flag = Zombie.zombifyVillager(world, entityvillager, this.blockPosition(), this.isSilent(), CreatureSpawnEvent.SpawnReason.INFECTION) == null;
}

4
patches/server/0391-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
View File

@ -6,12 +6,12 @@ Subject: [PATCH] Deobfuscate stacktraces in log messages, crash reports, and
diff --git a/build.gradle.kts b/build.gradle.kts
index ae99ecbf9055314764d32819dcdcb304caefb5ca..09e387db084b2bcff2b55d3eca23124e8d384283 100644
index 2f32a91bea8c27eb1f768e8a2a876a081cd68de8..8d40814519e777182e95d8f48c02fa0e606a551f 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -37,6 +37,7 @@ dependencies {
testImplementation("org.mockito:mockito-core:4.9.0") // Paper - switch to mockito
implementation("org.spongepowered:configurate-yaml:4.1.2") // Paper - config files
implementation("org.spongepowered:configurate-yaml:4.2.0-SNAPSHOT") // Paper - config files
implementation("commons-lang:commons-lang:2.6")
+ implementation("net.fabricmc:mapping-io:0.3.0") // Paper - needed to read mappings for stacktrace deobfuscation
runtimeOnly("org.xerial:sqlite-jdbc:3.42.0.1")

2
patches/server/0392-Implement-Mob-Goal-API.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Implement Mob Goal API
diff --git a/build.gradle.kts b/build.gradle.kts
index 09e387db084b2bcff2b55d3eca23124e8d384283..56b1eb0136777931b99524edc6077d138f41e023 100644
index 8d40814519e777182e95d8f48c02fa0e606a551f..5a89e789d44fcf42838643c9023bc5ffc9b98606 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -46,6 +46,7 @@ dependencies {

2
patches/server/0452-Add-zombie-targets-turtle-egg-config.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Add zombie targets turtle egg config
diff --git a/src/main/java/net/minecraft/world/entity/monster/Zombie.java b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
index 55e4416a7988690ecfc8da6e83b43cbf9adda33b..6b8315ab1bdd963c04e56f214f6bdfd6b5eb8f48 100644
index 4215c45aa1073b3c70eb58a06eb3dce26f389c90..760b880a11e8ece98b41f934f9a2441fd020ecd6 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
@@ -109,7 +109,7 @@ public class Zombie extends Monster {

4
patches/server/0523-Added-world-settings-for-mobs-picking-up-loot.patch
View File

@ -18,10 +18,10 @@ index dadb419a04b343d6ba59353c6caa1a50aa07b67f..6be9e8d693bbb084791d7b30a1891ddb
LocalDate localdate = LocalDate.now();
int i = localdate.get(ChronoField.DAY_OF_MONTH);
diff --git a/src/main/java/net/minecraft/world/entity/monster/Zombie.java b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
index 6b8315ab1bdd963c04e56f214f6bdfd6b5eb8f48..e28718fb76d6c53c31ed358779e28133de49cd7f 100644
index 760b880a11e8ece98b41f934f9a2441fd020ecd6..99918974b1b763610425fc3d44d8453bd5d0725a 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
@@ -515,7 +515,7 @@ public class Zombie extends Monster {
@@ -507,7 +507,7 @@ public class Zombie extends Monster {
Object object = super.finalizeSpawn(world, difficulty, spawnReason, entityData, entityNbt);
float f = difficulty.getSpecialMultiplier();

2
patches/server/0527-Configurable-door-breaking-difficulty.patch
View File

@ -23,7 +23,7 @@ index 9fec5823d99d1ae8e41d9e21f7ddb8b8e94bf887..ad41bbbf5395ed18c2c9e1e692c7661a
}
diff --git a/src/main/java/net/minecraft/world/entity/monster/Zombie.java b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
index e28718fb76d6c53c31ed358779e28133de49cd7f..b13365fe65507ad2935797a31baa8474b018f516 100644
index 99918974b1b763610425fc3d44d8453bd5d0725a..87d909c2a34543ebdfc5d76aff7611d2d51144fb 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
@@ -100,7 +100,7 @@ public class Zombie extends Monster {

2
patches/server/0693-Use-Velocity-compression-and-cipher-natives.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Use Velocity compression and cipher natives
diff --git a/build.gradle.kts b/build.gradle.kts
index 56b1eb0136777931b99524edc6077d138f41e023..6528532d9e0f3d892fe81dc899f37d7cf611fecb 100644
index 5a89e789d44fcf42838643c9023bc5ffc9b98606..c70fd0daeb312e339301c3a72e53a2e9b96759c3 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -41,6 +41,11 @@ dependencies {

4
patches/server/0738-Configurable-max-block-light-for-monster-spawning.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Configurable max block light for monster spawning
diff --git a/src/main/java/net/minecraft/world/entity/monster/Monster.java b/src/main/java/net/minecraft/world/entity/monster/Monster.java
index 6e0bd0eab0b06a4ac3042496bbb91292544e9f3c..55c245d0dfa369dc6de2197ae37335fba4fae4ae 100644
index 6e0bd0eab0b06a4ac3042496bbb91292544e9f3c..e4218acaaf7d3aef0fb31f5597fb1af32aa2c8b5 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Monster.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Monster.java
@@ -93,7 +93,7 @@ public abstract class Monster extends PathfinderMob implements Enemy {
@ -13,7 +13,7 @@ index 6e0bd0eab0b06a4ac3042496bbb91292544e9f3c..55c245d0dfa369dc6de2197ae37335fb
} else {
DimensionType dimensionType = world.dimensionType();
- int i = dimensionType.monsterSpawnBlockLightLimit();
+ int i = world.getLevel().paperConfig().entities.spawning.monsterSpawnMaxLightLevel >= 0 ? world.getLevel().paperConfig().entities.spawning.monsterSpawnMaxLightLevel : dimensionType.monsterSpawnBlockLightLimit(); // Paper
+ int i = world.getLevel().paperConfig().entities.spawning.monsterSpawnMaxLightLevel.or(dimensionType.monsterSpawnBlockLightLimit()); // Paper
if (i < 15 && world.getBrightness(LightLayer.BLOCK, pos) > i) {
return false;
} else {

2
patches/server/0753-Fix-xp-reward-for-baby-zombies.patch
View File

@ -9,7 +9,7 @@ so this resets it after each call to
Zombie#getExperienceReward
diff --git a/src/main/java/net/minecraft/world/entity/monster/Zombie.java b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
index b13365fe65507ad2935797a31baa8474b018f516..1ddbba72a5fd3d225b651815a38d178941fba289 100644
index 87d909c2a34543ebdfc5d76aff7611d2d51144fb..3d44f8e9f8056d7d899e90e61240b2d1d109354b 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
@@ -175,11 +175,16 @@ public class Zombie extends Monster {

2
patches/server/0811-Add-support-for-Proxy-Protocol.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Add support for Proxy Protocol
diff --git a/build.gradle.kts b/build.gradle.kts
index 6528532d9e0f3d892fe81dc899f37d7cf611fecb..7afd8302e8407548c21e919f929125213635b21d 100644
index c70fd0daeb312e339301c3a72e53a2e9b96759c3..c187641f0ec6444a10e0e1583e1697d07e8f0267 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -30,6 +30,7 @@ dependencies {

22
patches/server/0854-Configurable-chat-thread-limit.patch
View File

@ -22,26 +22,18 @@ is actually processed, this is honestly really just exposed for the misnomers or
who just wanna ensure that this won't grow over a specific size if chat gets stupidly active
diff --git a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
index 8f82d5e1e263035eb23d878ffdc70c445933a207..97a9ce438afc9094dca4a44cb25b37d5f88dcf43 100644
index 276961a11fc2bd747d2dacdc581cecec498d7593..a6f58b3457b7477015c5c6d969e7d83017dd3fa1 100644
--- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
+++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
@@ -285,13 +285,26 @@ public class GlobalConfiguration extends ConfigurationPart {
public Misc misc;
@@ -307,7 +307,18 @@ public class GlobalConfiguration extends ConfigurationPart {
public class Misc extends ConfigurationPart {
+
+ public ChatThreads chatThreads;
public class ChatThreads extends ConfigurationPart.Post {
private int chatExecutorCoreSize = -1;
private int chatExecutorMaxSize = -1;
@Override
public void postProcess() {
- // TODO: FILL
@PostProcess
private void postProcess() {
- // TODO: fill in separate patch
+ //noinspection ConstantConditions
+ if (net.minecraft.server.MinecraftServer.getServer() == null) return; // In testing env, this will be null here
+ int _chatExecutorMaxSize = (chatExecutorMaxSize <= 0) ? Integer.MAX_VALUE : chatExecutorMaxSize; // This is somewhat dumb, but, this is the default, do we cap this?;
+ int _chatExecutorCoreSize = Math.max(chatExecutorCoreSize, 0);
+ int _chatExecutorMaxSize = (this.chatExecutorMaxSize <= 0) ? Integer.MAX_VALUE : this.chatExecutorMaxSize; // This is somewhat dumb, but, this is the default, do we cap this?;
+ int _chatExecutorCoreSize = Math.max(this.chatExecutorCoreSize, 0);
+
+ if (_chatExecutorMaxSize < _chatExecutorCoreSize) {
+ _chatExecutorMaxSize = _chatExecutorCoreSize;