From d35f48c05c42ae365b9b4339d09de286d12db530 Mon Sep 17 00:00:00 2001 From: NONPLAYT Date: Fri, 2 Jun 2023 21:35:38 +0300 Subject: [PATCH] Update Upstream --- gradle.properties | 6 +++--- patches/api/0001-Divine-Configuration.patch | 4 ++-- ...4-Optimize-default-values-for-configs.patch | 18 +++++++++--------- ...005-Add-missing-purpur-config-options.patch | 16 ++++++++-------- .../0012-Remove-Spigot-tick-limiter.patch | 6 +++--- .../server/0014-Paper-PR-BoneMeal-API.patch | 4 ++-- ...ch => 0033-Paper-PR-Optimize-Varints.patch} | 2 +- 7 files changed, 28 insertions(+), 28 deletions(-) rename patches/server/{0033-Optimize-Varints.patch => 0033-Paper-PR-Optimize-Varints.patch} (98%) diff --git a/gradle.properties b/gradle.properties index 3785a78..59473c5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ -group=gq.bxteam.divinemc +group = gq.bxteam.divinemc -version=1.19.4-R0.1-SNAPSHOT -purpurRef=b84222981c11a522e56db80b5005ba2108fa0ee0 +version = 1.19.4-R0.1-SNAPSHOT +purpurRef = d6cfa8f939efaa1e8d91b0193ee6f0495a94bd5b org.gradle.caching = true org.gradle.parallel = true diff --git a/patches/api/0001-Divine-Configuration.patch b/patches/api/0001-Divine-Configuration.patch index f78d649..f334bc1 100644 --- a/patches/api/0001-Divine-Configuration.patch +++ b/patches/api/0001-Divine-Configuration.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Divine Configuration diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 730caafaf9629664ba125f3884559da76616f655..060a14fdbb25faa671ada919344c086f7ec43c20 100644 +index d87e4d177b60957eee198c3f1791dbf26dbdddd6..08b912fe3452e9f8ffe3c0c97148d6f4fc8ba8bc 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -1980,6 +1980,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -1979,6 +1979,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi } // Purpur end diff --git a/patches/server/0004-Optimize-default-values-for-configs.patch b/patches/server/0004-Optimize-default-values-for-configs.patch index 567ec16..091ac94 100644 --- a/patches/server/0004-Optimize-default-values-for-configs.patch +++ b/patches/server/0004-Optimize-default-values-for-configs.patch @@ -219,10 +219,10 @@ index a33de97340f14219291c4175e9194914cdf441db..aab773b96b274e2c0dd83ec08f90baf1 public float maxLeashDistance = 10f; public boolean disableSprintInterruptionOnAttack = false; diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java -index 39a823c03c9542a193b6c9555a01a1562be7d339..2db47bcdfffbbea7de011016367df4b9684df75b 100644 +index bbfafb1400721251dfd2cac4dd8a31be2d682d4b..e863d524dd1f47332a294ebea604752b33cf2a16 100644 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java -@@ -146,14 +146,14 @@ public class SpigotWorldConfig +@@ -148,14 +148,14 @@ public class SpigotWorldConfig public double itemMerge; private void itemMerge() { @@ -239,7 +239,7 @@ index 39a823c03c9542a193b6c9555a01a1562be7d339..2db47bcdfffbbea7de011016367df4b9 this.log( "Experience Merge Radius: " + this.expMerge ); } -@@ -192,7 +192,7 @@ public class SpigotWorldConfig +@@ -194,7 +194,7 @@ public class SpigotWorldConfig public byte mobSpawnRange; private void mobSpawnRange() { @@ -248,7 +248,7 @@ index 39a823c03c9542a193b6c9555a01a1562be7d339..2db47bcdfffbbea7de011016367df4b9 this.log( "Mob Spawn Range: " + this.mobSpawnRange ); } -@@ -203,14 +203,14 @@ public class SpigotWorldConfig +@@ -205,14 +205,14 @@ public class SpigotWorldConfig this.log( "Item Despawn Rate: " + this.itemDespawnRate ); } @@ -268,7 +268,7 @@ index 39a823c03c9542a193b6c9555a01a1562be7d339..2db47bcdfffbbea7de011016367df4b9 public int wakeUpInactiveAnimals = 4; public int wakeUpInactiveAnimalsEvery = 60*20; public int wakeUpInactiveAnimalsFor = 5*20; -@@ -227,7 +227,7 @@ public class SpigotWorldConfig +@@ -229,7 +229,7 @@ public class SpigotWorldConfig public int villagersWorkImmunityFor = 20; public boolean villagersActiveForPanic = true; // Paper end @@ -277,7 +277,7 @@ index 39a823c03c9542a193b6c9555a01a1562be7d339..2db47bcdfffbbea7de011016367df4b9 public boolean ignoreSpectatorActivation = false; private void activationRange() { -@@ -295,7 +295,7 @@ public class SpigotWorldConfig +@@ -297,7 +297,7 @@ public class SpigotWorldConfig { this.set( "ticks-per.hopper-check", 1 ); } @@ -286,7 +286,7 @@ index 39a823c03c9542a193b6c9555a01a1562be7d339..2db47bcdfffbbea7de011016367df4b9 this.hopperAmount = this.getInt( "hopper-amount", 1 ); this.hopperCanLoadChunks = this.getBoolean( "hopper-can-load-chunks", false ); this.log( "Hopper Transfer: " + this.hopperTransfer + " Hopper Check: " + this.hopperCheck + " Hopper Amount: " + this.hopperAmount + " Hopper Can Load Chunks: " + this.hopperCanLoadChunks ); -@@ -305,7 +305,7 @@ public class SpigotWorldConfig +@@ -307,7 +307,7 @@ public class SpigotWorldConfig public int tridentDespawnRate; private void arrowDespawnRate() { @@ -295,7 +295,7 @@ index 39a823c03c9542a193b6c9555a01a1562be7d339..2db47bcdfffbbea7de011016367df4b9 this.tridentDespawnRate = this.getInt( "trident-despawn-rate", this.arrowDespawnRate ); this.log( "Arrow Despawn Rate: " + this.arrowDespawnRate + " Trident Respawn Rate:" + this.tridentDespawnRate ); } -@@ -320,14 +320,14 @@ public class SpigotWorldConfig +@@ -322,14 +322,14 @@ public class SpigotWorldConfig public boolean nerfSpawnerMobs; private void nerfSpawnerMobs() { @@ -312,7 +312,7 @@ index 39a823c03c9542a193b6c9555a01a1562be7d339..2db47bcdfffbbea7de011016367df4b9 this.log( "Allow Zombie Pigmen to spawn from portal blocks: " + this.enableZombiePigmenPortalSpawns ); } -@@ -441,7 +441,7 @@ public class SpigotWorldConfig +@@ -443,7 +443,7 @@ public class SpigotWorldConfig public int hangingTickFrequency; private void hangingTickFrequency() { diff --git a/patches/server/0005-Add-missing-purpur-config-options.patch b/patches/server/0005-Add-missing-purpur-config-options.patch index 91742e8..cbb6b73 100644 --- a/patches/server/0005-Add-missing-purpur-config-options.patch +++ b/patches/server/0005-Add-missing-purpur-config-options.patch @@ -199,7 +199,7 @@ index 3a720375c3daa961a34363f78c2c51d301c3fa06..cf5203fb60b7cc27da3a7607abe571b7 @Override diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java -index 780e817ea27f519d6c7de61699d59bf422e8c1ae..09d77ea62ca14a847eb3651fef82f34f5d26a709 100644 +index 0dfd997fea4154896f5a3a04cdfd2d9ab706004f..22249e4dc391d1c7a3d124ec07f39f149fb7de0f 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java @@ -324,6 +324,7 @@ public class PurpurConfig { @@ -219,10 +219,10 @@ index 780e817ea27f519d6c7de61699d59bf422e8c1ae..09d77ea62ca14a847eb3651fef82f34f org.bukkit.event.inventory.InventoryType.ENDER_CHEST.setDefaultSize(enderChestSixRows ? 54 : 27); enderChestPermissionRows = getBoolean("settings.blocks.ender_chest.use-permissions-for-rows", enderChestPermissionRows); diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 157c5ce26015cabd5a007cf7444c8255db1a0b0f..dd29e6e2eb1e13fec739681418b6e660e28f1bab 100644 +index 0db8a1a51c857a3930d0b20028964fb355d8e5b4..42f256bb6682d794f650e0acdee3c8b190827a1f 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -@@ -1092,7 +1092,17 @@ public class PurpurWorldConfig { +@@ -1096,7 +1096,17 @@ public class PurpurWorldConfig { public boolean allayRidableInWater = true; public boolean allayControllable = true; public List allayRespectNBT = new ArrayList<>(); @@ -240,7 +240,7 @@ index 157c5ce26015cabd5a007cf7444c8255db1a0b0f..dd29e6e2eb1e13fec739681418b6e660 allayRidable = getBoolean("mobs.allay.ridable", allayRidable); allayRidableInWater = getBoolean("mobs.allay.ridable-in-water", allayRidableInWater); allayControllable = getBoolean("mobs.allay.controllable", allayControllable); -@@ -1203,7 +1213,18 @@ public class PurpurWorldConfig { +@@ -1207,7 +1217,18 @@ public class PurpurWorldConfig { public double camelJumpStrengthMax = 0.42D; public double camelMovementSpeedMin = 0.09D; public double camelMovementSpeedMax = 0.09D; @@ -259,7 +259,7 @@ index 157c5ce26015cabd5a007cf7444c8255db1a0b0f..dd29e6e2eb1e13fec739681418b6e660 camelMaxHealthMin = getDouble("mobs.camel.attributes.max_health.min", camelMaxHealthMin); camelMaxHealthMax = getDouble("mobs.camel.attributes.max_health.max", camelMaxHealthMax); camelJumpStrengthMin = getDouble("mobs.camel.attributes.jump_strength.min", camelJumpStrengthMin); -@@ -1630,7 +1651,18 @@ public class PurpurWorldConfig { +@@ -1634,7 +1655,18 @@ public class PurpurWorldConfig { public boolean frogControllable = true; public float frogRidableJumpHeight = 0.65F; public int frogBreedingTicks = 6000; @@ -278,7 +278,7 @@ index 157c5ce26015cabd5a007cf7444c8255db1a0b0f..dd29e6e2eb1e13fec739681418b6e660 frogRidable = getBoolean("mobs.frog.ridable", frogRidable); frogRidableInWater = getBoolean("mobs.frog.ridable-in-water", frogRidableInWater); frogControllable = getBoolean("mobs.frog.controllable", frogControllable); -@@ -2581,7 +2613,16 @@ public class PurpurWorldConfig { +@@ -2585,7 +2617,16 @@ public class PurpurWorldConfig { public boolean snifferControllable = true; public double snifferMaxHealth = 14.0D; public int snifferBreedingTicks = 6000; @@ -295,7 +295,7 @@ index 157c5ce26015cabd5a007cf7444c8255db1a0b0f..dd29e6e2eb1e13fec739681418b6e660 snifferRidable = getBoolean("mobs.sniffer.ridable", snifferRidable); snifferRidableInWater = getBoolean("mobs.sniffer.ridable-in-water", snifferRidableInWater); snifferControllable = getBoolean("mobs.sniffer.controllable", snifferControllable); -@@ -2680,7 +2721,18 @@ public class PurpurWorldConfig { +@@ -2684,7 +2725,18 @@ public class PurpurWorldConfig { public boolean tadpoleRidable = false; public boolean tadpoleRidableInWater = true; public boolean tadpoleControllable = true; @@ -314,7 +314,7 @@ index 157c5ce26015cabd5a007cf7444c8255db1a0b0f..dd29e6e2eb1e13fec739681418b6e660 tadpoleRidable = getBoolean("mobs.tadpole.ridable", tadpoleRidable); tadpoleRidableInWater = getBoolean("mobs.tadpole.ridable-in-water", tadpoleRidableInWater); tadpoleControllable = getBoolean("mobs.tadpole.controllable", tadpoleControllable); -@@ -2890,7 +2942,18 @@ public class PurpurWorldConfig { +@@ -2894,7 +2946,18 @@ public class PurpurWorldConfig { public boolean wardenRidable = false; public boolean wardenRidableInWater = true; public boolean wardenControllable = true; diff --git a/patches/server/0012-Remove-Spigot-tick-limiter.patch b/patches/server/0012-Remove-Spigot-tick-limiter.patch index a40f69f..b6ad103 100644 --- a/patches/server/0012-Remove-Spigot-tick-limiter.patch +++ b/patches/server/0012-Remove-Spigot-tick-limiter.patch @@ -29,10 +29,10 @@ index e39b3c7a67de82dd5165f9276f374cd89ecf96c9..4bacba49a3e462e21b25f388293f2554 } diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java -index 2db47bcdfffbbea7de011016367df4b9684df75b..ec4d974c66ce966d31a377092697e85c8a3331e6 100644 +index e863d524dd1f47332a294ebea604752b33cf2a16..65b10200844952c07296a16da2a8202c9d1d1e9c 100644 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java -@@ -444,6 +444,7 @@ public class SpigotWorldConfig +@@ -446,6 +446,7 @@ public class SpigotWorldConfig this.hangingTickFrequency = this.getInt( "hanging-tick-frequency", 200 ); // DivineMC - optimize default values for configs } @@ -40,7 +40,7 @@ index 2db47bcdfffbbea7de011016367df4b9684df75b..ec4d974c66ce966d31a377092697e85c public int tileMaxTickTime; public int entityMaxTickTime; private void maxTickTimes() -@@ -452,6 +453,7 @@ public class SpigotWorldConfig +@@ -454,6 +455,7 @@ public class SpigotWorldConfig this.entityMaxTickTime = this.getInt("max-tick-time.entity", 50); this.log("Tile Max Tick Time: " + this.tileMaxTickTime + "ms Entity max Tick Time: " + this.entityMaxTickTime + "ms"); } diff --git a/patches/server/0014-Paper-PR-BoneMeal-API.patch b/patches/server/0014-Paper-PR-BoneMeal-API.patch index 66bb1b7..f894808 100644 --- a/patches/server/0014-Paper-PR-BoneMeal-API.patch +++ b/patches/server/0014-Paper-PR-BoneMeal-API.patch @@ -38,10 +38,10 @@ index c26665bc59c18c4da467fb6ae33e51a65ecf1de6..bf65490f0239fc6d9d9c101ebce5845d } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 3013aeb442799aba5b2ae45edcb3c2c72a18a740..6cf521d0d400c3b66530b79bf8bda3f94353c474 100644 +index 39a2ff8c34f995ab860aadc24d24136d602af646..361d21078557dab4edee17e519852d8952f320ee 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -2432,5 +2432,43 @@ public class CraftWorld extends CraftRegionAccessor implements World { +@@ -2465,5 +2465,43 @@ public class CraftWorld extends CraftRegionAccessor implements World { return this.adventure$pointers; } diff --git a/patches/server/0033-Optimize-Varints.patch b/patches/server/0033-Paper-PR-Optimize-Varints.patch similarity index 98% rename from patches/server/0033-Optimize-Varints.patch rename to patches/server/0033-Paper-PR-Optimize-Varints.patch index 71891c7..3b45b9b 100644 --- a/patches/server/0033-Optimize-Varints.patch +++ b/patches/server/0033-Paper-PR-Optimize-Varints.patch @@ -1,7 +1,7 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: NONPLAYT <76615486+NONPLAYT@users.noreply.github.com> Date: Tue, 16 May 2023 18:45:29 +0300 -Subject: [PATCH] Optimize Varints +Subject: [PATCH] Paper PR - Optimize Varints Original license: GPLv3 Original project: https://github.com/PaperMC/Velocity