From 428e0cb6d325933c28c2093dc00bf4c0a2915cd9 Mon Sep 17 00:00:00 2001 From: NONPLAYT <76615486+NONPLAYT@users.noreply.github.com> Date: Fri, 21 Jun 2024 14:56:10 +0300 Subject: [PATCH] Updated Upstream (Purpur) Upstream has released updates that appear to apply and compile correctly Purpur Changes: PurpurMC/Purpur@c0f5e78 add default silverfish movement speed & attack damage attributes PurpurMC/Purpur@b82f693 configurable mob size attribute (#1538) PurpurMC/Purpur@e05f91b [ci skip] move import to config patch PurpurMC/Purpur@2ba7bee Updated Upstream (Paper) --- gradle.properties | 2 +- .../{ => server}/0012-Remove-TickTask.patch | 0 .../0047-NoChatReports-Implementation.patch | 0 ...04-Add-missing-purpur-config-options.patch | 43 ++++++++++--------- patches/server/0008-Fix-MC-31819.patch | 4 +- patches/server/0013-Fix-MC-93018.patch | 4 +- .../0027-Make-entity-goals-public.patch | 30 ++++++------- 7 files changed, 43 insertions(+), 40 deletions(-) rename patches/removed/1.19.3/{ => server}/0012-Remove-TickTask.patch (100%) rename patches/removed/1.19.3/{ => server}/0047-NoChatReports-Implementation.patch (100%) diff --git a/gradle.properties b/gradle.properties index 13fa238..b5a6a21 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group = space.bxteam.divinemc mcVersion = 1.21 version = 1.21-R0.1-SNAPSHOT -purpurRef = b5f1c487e796a8e55f4441237d9ca830b4423573 +purpurRef = 2ba7beeab5b9b4b7f669d44549255983e922a230 org.gradle.caching = true org.gradle.parallel = true diff --git a/patches/removed/1.19.3/0012-Remove-TickTask.patch b/patches/removed/1.19.3/server/0012-Remove-TickTask.patch similarity index 100% rename from patches/removed/1.19.3/0012-Remove-TickTask.patch rename to patches/removed/1.19.3/server/0012-Remove-TickTask.patch diff --git a/patches/removed/1.19.3/0047-NoChatReports-Implementation.patch b/patches/removed/1.19.3/server/0047-NoChatReports-Implementation.patch similarity index 100% rename from patches/removed/1.19.3/0047-NoChatReports-Implementation.patch rename to patches/removed/1.19.3/server/0047-NoChatReports-Implementation.patch diff --git a/patches/server/0004-Add-missing-purpur-config-options.patch b/patches/server/0004-Add-missing-purpur-config-options.patch index cc0fc0d..9186b95 100644 --- a/patches/server/0004-Add-missing-purpur-config-options.patch +++ b/patches/server/0004-Add-missing-purpur-config-options.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add missing purpur config options diff --git a/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java b/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java -index 37bdc1bd1ce7f402418b1e8c57c6f58540571ec2..a44cd4f5ba28b8933342923fa78ea2c0ccd6bba9 100644 +index 0f9196cc26e5c670a7f3454326b762f0303f633c..fbdc854625d0b78e6c5cf113a2fc5591b15d2da0 100644 --- a/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java +++ b/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java -@@ -154,6 +154,23 @@ public class Allay extends PathfinderMob implements InventoryCarrier, VibrationS +@@ -160,6 +160,23 @@ public class Allay extends PathfinderMob implements InventoryCarrier, VibrationS } // Purpur end @@ -112,10 +112,10 @@ index 0656e03bdd71f5d81853e817e136c8f11667c76e..51f12adc5f798ffb9de4ab87dc10728e protected PathNavigation createNavigation(Level world) { return new WaterBoundPathNavigation(this, world); diff --git a/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java b/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java -index 072f6ea6ed0bb543b1d71628a1e1e43f73719a09..7725ff08b9656a5889d6763c63b2b74451ed9793 100644 +index b6f5281705ce4c7a755e3818cf6c4a2235a024f9..13d73b88e33d279ae96bf160fa25d47c88dd6a55 100644 --- a/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java +++ b/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java -@@ -121,6 +121,18 @@ public class Sniffer extends Animal { +@@ -122,6 +122,18 @@ public class Sniffer extends Animal { } // Purpur end @@ -215,28 +215,31 @@ index 73352e71d3743fc6b263d6fa5b23571785e2fc4c..87e54aa5e14a0e92df88ea775966c026 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 551508a524c56f0b4f4bc7df9862d30d77053b56..792d7740d42676afb40ad55340e2e0456067c26f 100644 +index 3336bb6bf61477be575c6f1b3a8ccfec1b009d48..ba891341c13b45233bd26ca89488752faf020ce2 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -@@ -1164,7 +1164,17 @@ public class PurpurWorldConfig { - public boolean allayRidable = false; - public boolean allayRidableInWater = true; +@@ -1167,12 +1167,20 @@ public class PurpurWorldConfig { public boolean allayControllable = true; + public double allayMaxHealth = 20.0D; + public double allayScale = 1.0D; + // DivineMC start - Add missing purpur config options -+ public double allayMaxHealth = 20.0D; + public boolean allayTakeDamageFromWater = false; + public boolean allayAlwaysDropExp = false; + // DivineMC end private void allaySettings() { -+ // DivineMC start - Add missing purpur config options -+ allayMaxHealth = getDouble("mobs.allay.max-health", allayMaxHealth); -+ allayTakeDamageFromWater = getBoolean("mobs.allay.take-damage-from-water", allayTakeDamageFromWater); -+ allayAlwaysDropExp = getBoolean("mobs.allay.always-drop-exp", allayAlwaysDropExp); -+ // DivineMC end allayRidable = getBoolean("mobs.allay.ridable", allayRidable); allayRidableInWater = getBoolean("mobs.allay.ridable-in-water", allayRidableInWater); allayControllable = getBoolean("mobs.allay.controllable", allayControllable); -@@ -1305,7 +1315,15 @@ public class PurpurWorldConfig { + allayMaxHealth = getDouble("mobs.allay.attributes.max_health", allayMaxHealth); + allayScale = Mth.clamp(getDouble("mobs.allay.attributes.scale", allayScale), 0.0625D, 16.0D); ++ // DivineMC start - Add missing purpur config options ++ allayTakeDamageFromWater = getBoolean("mobs.allay.take-damage-from-water", allayTakeDamageFromWater); ++ allayAlwaysDropExp = getBoolean("mobs.allay.always-drop-exp", allayAlwaysDropExp); ++ // DivineMC end + } + + public boolean armadilloRidable = false; +@@ -1322,7 +1330,15 @@ public class PurpurWorldConfig { public double camelMovementSpeedMin = 0.09D; public double camelMovementSpeedMax = 0.09D; public int camelBreedingTicks = 6000; @@ -252,7 +255,7 @@ index 551508a524c56f0b4f4bc7df9862d30d77053b56..792d7740d42676afb40ad55340e2e045 camelRidableInWater = getBoolean("mobs.camel.ridable-in-water", camelRidableInWater); camelMaxHealthMin = getDouble("mobs.camel.attributes.max_health.min", camelMaxHealthMin); camelMaxHealthMax = getDouble("mobs.camel.attributes.max_health.max", camelMaxHealthMax); -@@ -1733,7 +1751,17 @@ public class PurpurWorldConfig { +@@ -1776,7 +1792,17 @@ public class PurpurWorldConfig { public boolean frogControllable = true; public float frogRidableJumpHeight = 0.65F; public int frogBreedingTicks = 6000; @@ -270,9 +273,9 @@ index 551508a524c56f0b4f4bc7df9862d30d77053b56..792d7740d42676afb40ad55340e2e045 frogRidable = getBoolean("mobs.frog.ridable", frogRidable); frogRidableInWater = getBoolean("mobs.frog.ridable-in-water", frogRidableInWater); frogControllable = getBoolean("mobs.frog.controllable", frogControllable); -@@ -2686,7 +2714,15 @@ public class PurpurWorldConfig { - public boolean snifferControllable = true; +@@ -2788,7 +2814,15 @@ public class PurpurWorldConfig { public double snifferMaxHealth = 14.0D; + public double snifferScale = 1.0D; public int snifferBreedingTicks = 6000; + // DivineMC start - Add missing purpur config options + public boolean snifferTakeDamageFromWater = false; @@ -286,7 +289,7 @@ index 551508a524c56f0b4f4bc7df9862d30d77053b56..792d7740d42676afb40ad55340e2e045 snifferRidable = getBoolean("mobs.sniffer.ridable", snifferRidable); snifferRidableInWater = getBoolean("mobs.sniffer.ridable-in-water", snifferRidableInWater); snifferControllable = getBoolean("mobs.sniffer.controllable", snifferControllable); -@@ -2785,7 +2821,17 @@ public class PurpurWorldConfig { +@@ -2896,7 +2930,17 @@ public class PurpurWorldConfig { public boolean tadpoleRidable = false; public boolean tadpoleRidableInWater = true; public boolean tadpoleControllable = true; @@ -304,7 +307,7 @@ index 551508a524c56f0b4f4bc7df9862d30d77053b56..792d7740d42676afb40ad55340e2e045 tadpoleRidable = getBoolean("mobs.tadpole.ridable", tadpoleRidable); tadpoleRidableInWater = getBoolean("mobs.tadpole.ridable-in-water", tadpoleRidableInWater); tadpoleControllable = getBoolean("mobs.tadpole.controllable", tadpoleControllable); -@@ -3001,7 +3047,17 @@ public class PurpurWorldConfig { +@@ -3124,7 +3168,17 @@ public class PurpurWorldConfig { public boolean wardenRidable = false; public boolean wardenRidableInWater = true; public boolean wardenControllable = true; diff --git a/patches/server/0008-Fix-MC-31819.patch b/patches/server/0008-Fix-MC-31819.patch index 864a09a..2dc31b5 100644 --- a/patches/server/0008-Fix-MC-31819.patch +++ b/patches/server/0008-Fix-MC-31819.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Fix MC-31819 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java -index 92df67d9e1d32c8a7aaeaaa46c7641af600edc52..89e3eb5f2dd45a517ed2d6a869732b1f6b7b3bca 100644 +index b06eebbad2b20d4c59c9163388af220594ddf6b7..b8db58d25d91bc538fb310dfb801be4f05ec0b57 100644 --- a/src/main/java/net/minecraft/world/entity/player/Player.java +++ b/src/main/java/net/minecraft/world/entity/player/Player.java -@@ -1947,6 +1947,11 @@ public abstract class Player extends LivingEntity { +@@ -1946,6 +1946,11 @@ public abstract class Player extends LivingEntity { } public void causeFoodExhaustion(float f, EntityExhaustionEvent.ExhaustionReason reason) { diff --git a/patches/server/0013-Fix-MC-93018.patch b/patches/server/0013-Fix-MC-93018.patch index 01085fd..caa3e50 100644 --- a/patches/server/0013-Fix-MC-93018.patch +++ b/patches/server/0013-Fix-MC-93018.patch @@ -6,10 +6,10 @@ Subject: [PATCH] Fix MC-93018 Original post on Mojira: https://bugs.mojang.com/browse/MC-93018 diff --git a/src/main/java/net/minecraft/world/entity/animal/Wolf.java b/src/main/java/net/minecraft/world/entity/animal/Wolf.java -index 865640831c988192adc937cb0cad4c7e241b1540..5af5cffafdbe664900f82ab8f70d7eb0084c6db4 100644 +index a2df7cf565157db2f8e0f0d33778c8d8dea1cd95..4c67bfb22a154dfabbe0ac6091199151e441534a 100644 --- a/src/main/java/net/minecraft/world/entity/animal/Wolf.java +++ b/src/main/java/net/minecraft/world/entity/animal/Wolf.java -@@ -774,14 +774,17 @@ public class Wolf extends TamableAnimal implements NeutralMob, VariantHolder