From f550943cf89cb07187a2d53650e1dbe4a7b70af8 Mon Sep 17 00:00:00 2001 From: NONPLAYT <76615486+NONPLAYT@users.noreply.github.com> Date: Mon, 20 Nov 2023 03:00:02 +0300 Subject: [PATCH] Updated Upstream (Purpur) Upstream has released updates that appear to apply and compile correctly Purpur Changes: PurpurMC/Purpur@2a38801 adds ridable option to zombie horse and skeleton horse, fixes #1458 PurpurMC/Purpur@4b1a082 Updated Upstream (Paper) --- gradle.properties | 2 +- ...-Optimize-default-values-for-configs.patch | 26 +++++++++---------- ...05-Add-missing-purpur-config-options.patch | 12 ++++----- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/gradle.properties b/gradle.properties index d22dd8f..17ddf65 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ group = gq.bxteam.divinemc version = 1.20.2-R0.1-SNAPSHOT -purpurRef = 1adf78b91a73559e49715dc97fb128d5d073791c +purpurRef = 4b1a082c94ebc090bbc74b9230e4f43075090a29 org.gradle.caching = true org.gradle.parallel = true diff --git a/patches/server/0004-Optimize-default-values-for-configs.patch b/patches/server/0004-Optimize-default-values-for-configs.patch index d532233..a63da3f 100644 --- a/patches/server/0004-Optimize-default-values-for-configs.patch +++ b/patches/server/0004-Optimize-default-values-for-configs.patch @@ -36,10 +36,10 @@ index a6f58b3457b7477015c5c6d969e7d83017dd3fa1..e51f427eadc0c3b60754d0a67bea3892 public boolean strictAdvancementDimensionCheck = false; public IntOr.Default compressionLevel = IntOr.Default.USE_DEFAULT; diff --git a/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java b/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java -index ed79d30f33b2674863b2d73b1abdb48433c33412..2c7138d2a2d1ece540806c0ffb486bbd2e5485a6 100644 +index 84e6fc5bac43ee0499b391827726bc02f6d3e46f..90e30ad72b0947b66e65f85bb75112ee78f84bab 100644 --- a/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java +++ b/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java -@@ -127,9 +127,9 @@ public class WorldConfiguration extends ConfigurationPart { +@@ -151,9 +151,9 @@ public class WorldConfiguration extends ConfigurationPart { public ArmorStands armorStands; @@ -52,7 +52,7 @@ index ed79d30f33b2674863b2d73b1abdb48433c33412..2c7138d2a2d1ece540806c0ffb486bbd } public Markers markers; -@@ -227,8 +227,8 @@ public class WorldConfiguration extends ConfigurationPart { +@@ -251,8 +251,8 @@ public class WorldConfiguration extends ConfigurationPart { public Behavior behavior; public class Behavior extends ConfigurationPart { @@ -63,7 +63,7 @@ index ed79d30f33b2674863b2d73b1abdb48433c33412..2c7138d2a2d1ece540806c0ffb486bbd public int experienceMergeMaxValue = -1; public boolean shouldRemoveDragon = false; public boolean zombiesTargetTurtleEggs = true; -@@ -275,7 +275,7 @@ public class WorldConfiguration extends ConfigurationPart { +@@ -276,7 +276,7 @@ public class WorldConfiguration extends ConfigurationPart { public int playerInsomniaStartTicks = 72000; public int phantomsSpawnAttemptMinSeconds = 60; public int phantomsSpawnAttemptMaxSeconds = 119; @@ -72,7 +72,7 @@ index ed79d30f33b2674863b2d73b1abdb48433c33412..2c7138d2a2d1ece540806c0ffb486bbd @BelowZeroToEmpty public DoubleOr.Default zombieVillagerInfectionChance = DoubleOr.Default.USE_DEFAULT; public MobsCanAlwaysPickUpLoot mobsCanAlwaysPickUpLoot; -@@ -286,7 +286,7 @@ public class WorldConfiguration extends ConfigurationPart { +@@ -287,7 +287,7 @@ public class WorldConfiguration extends ConfigurationPart { } public boolean disablePlayerCrits = false; @@ -81,7 +81,7 @@ index ed79d30f33b2674863b2d73b1abdb48433c33412..2c7138d2a2d1ece540806c0ffb486bbd public PillagerPatrols pillagerPatrols; public class PillagerPatrols extends ConfigurationPart { -@@ -380,7 +380,7 @@ public class WorldConfiguration extends ConfigurationPart { +@@ -381,7 +381,7 @@ public class WorldConfiguration extends ConfigurationPart { public class Environment extends ConfigurationPart { public boolean disableThunder = false; public boolean disableIceAndSnow = false; @@ -90,7 +90,7 @@ index ed79d30f33b2674863b2d73b1abdb48433c33412..2c7138d2a2d1ece540806c0ffb486bbd public boolean disableExplosionKnockback = false; public boolean generateFlatBedrock = false; public FrostedIce frostedIce; -@@ -426,7 +426,7 @@ public class WorldConfiguration extends ConfigurationPart { +@@ -427,7 +427,7 @@ public class WorldConfiguration extends ConfigurationPart { public class Maps extends ConfigurationPart { public int itemFrameCursorLimit = 128; @@ -99,7 +99,7 @@ index ed79d30f33b2674863b2d73b1abdb48433c33412..2c7138d2a2d1ece540806c0ffb486bbd } public Fixes fixes; -@@ -451,7 +451,7 @@ public class WorldConfiguration extends ConfigurationPart { +@@ -452,7 +452,7 @@ public class WorldConfiguration extends ConfigurationPart { public class Hopper extends ConfigurationPart { public boolean cooldownWhenFull = true; public boolean disableMoveEvent = false; @@ -108,7 +108,7 @@ index ed79d30f33b2674863b2d73b1abdb48433c33412..2c7138d2a2d1ece540806c0ffb486bbd } public Collisions collisions; -@@ -459,9 +459,9 @@ public class WorldConfiguration extends ConfigurationPart { +@@ -460,9 +460,9 @@ public class WorldConfiguration extends ConfigurationPart { public class Collisions extends ConfigurationPart { public boolean onlyPlayersCollide = false; public boolean allowVehicleCollisions = true; @@ -120,7 +120,7 @@ index ed79d30f33b2674863b2d73b1abdb48433c33412..2c7138d2a2d1ece540806c0ffb486bbd public boolean allowPlayerCrammingDamage = false; } -@@ -469,18 +469,31 @@ public class WorldConfiguration extends ConfigurationPart { +@@ -470,18 +470,31 @@ public class WorldConfiguration extends ConfigurationPart { public class Chunks extends ConfigurationPart { public AutosavePeriod autoSaveInterval = AutosavePeriod.def(); @@ -162,7 +162,7 @@ index ed79d30f33b2674863b2d73b1abdb48433c33412..2c7138d2a2d1ece540806c0ffb486bbd }); public boolean flushRegionsOnSave = false; } -@@ -495,11 +508,22 @@ public class WorldConfiguration extends ConfigurationPart { +@@ -496,11 +509,22 @@ public class WorldConfiguration extends ConfigurationPart { public TickRates tickRates; public class TickRates extends ConfigurationPart { @@ -190,7 +190,7 @@ index ed79d30f33b2674863b2d73b1abdb48433c33412..2c7138d2a2d1ece540806c0ffb486bbd } @Setting(FeatureSeedsGeneration.FEATURE_SEEDS_KEY) -@@ -508,7 +532,7 @@ public class WorldConfiguration extends ConfigurationPart { +@@ -509,7 +533,7 @@ public class WorldConfiguration extends ConfigurationPart { public class FeatureSeeds extends ConfigurationPart { @SuppressWarnings("unused") // Is used in FeatureSeedsGeneration @Setting(FeatureSeedsGeneration.GENERATE_KEY) @@ -199,7 +199,7 @@ index ed79d30f33b2674863b2d73b1abdb48433c33412..2c7138d2a2d1ece540806c0ffb486bbd @Setting(FeatureSeedsGeneration.FEATURES_KEY) public Reference2LongMap>> features = new Reference2LongOpenHashMap<>(); -@@ -522,9 +546,9 @@ public class WorldConfiguration extends ConfigurationPart { +@@ -523,9 +547,9 @@ public class WorldConfiguration extends ConfigurationPart { public class Misc extends ConfigurationPart { public int lightQueueSize = 20; diff --git a/patches/server/0005-Add-missing-purpur-config-options.patch b/patches/server/0005-Add-missing-purpur-config-options.patch index 64c7aa3..c59c3ce 100644 --- a/patches/server/0005-Add-missing-purpur-config-options.patch +++ b/patches/server/0005-Add-missing-purpur-config-options.patch @@ -33,7 +33,7 @@ index c783ce59ea766e6c46a3313628b961f27e01ee8b..4f6b6967f7f632752fcc4faac47dca51 protected Brain.Provider brainProvider() { return Brain.provider(Allay.MEMORY_TYPES, Allay.SENSOR_TYPES); diff --git a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java -index 1d84135c709a90843b1ee34fb47508e78a7ce95d..9b2522872d428d41dd61f934e3c70b6247e3f285 100644 +index cd9129bb5049c13f08c58b8581d511b59a5bb1b5..e681d81d257a797b1663bec895b7f487d10d4603 100644 --- a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java +++ b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java @@ -97,6 +97,18 @@ public class Camel extends AbstractHorse implements PlayerRideableJumping, Saddl @@ -163,7 +163,7 @@ index 5e66c2bd3807619cadee5b7081d93d21886e2806..ff098fc029a2a8bedbf5d08670fda78f public Packet getAddEntityPacket() { return new ClientboundAddEntityPacket(this, this.hasPose(Pose.EMERGING) ? 1 : 0); diff --git a/src/main/java/net/minecraft/world/entity/vehicle/ChestBoat.java b/src/main/java/net/minecraft/world/entity/vehicle/ChestBoat.java -index e88c39d405fc7068db64ad34a03dec8d559e749e..35f0677a31be938a87314c534d63bc24faec7416 100644 +index d70c1206df96b03c031399049a65e6a765d80347..427d74eb9d6e643a1461214b96b1377f7a52b347 100644 --- a/src/main/java/net/minecraft/world/entity/vehicle/ChestBoat.java +++ b/src/main/java/net/minecraft/world/entity/vehicle/ChestBoat.java @@ -30,6 +30,9 @@ import org.bukkit.craftbukkit.entity.CraftHumanEntity; @@ -215,7 +215,7 @@ index d8d19567cf49b41d730a936d46c8e37e5aec2f07..64459e4adb50304070b6c9c100ef9227 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 64e172e6cbfb8134c2b36bce8279e1ef44085257..20d3b1a0892053544c9f338f88297a72d3580962 100644 +index b9d1117885a8dd15f207e55ce5e402d8cefe0226..6cf6fc55ac33dadf98c779f16a6c3277d9783108 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -1115,7 +1115,17 @@ public class PurpurWorldConfig { @@ -270,7 +270,7 @@ index 64e172e6cbfb8134c2b36bce8279e1ef44085257..20d3b1a0892053544c9f338f88297a72 frogRidable = getBoolean("mobs.frog.ridable", frogRidable); frogRidableInWater = getBoolean("mobs.frog.ridable-in-water", frogRidableInWater); frogControllable = getBoolean("mobs.frog.controllable", frogControllable); -@@ -2615,7 +2643,15 @@ public class PurpurWorldConfig { +@@ -2617,7 +2645,15 @@ public class PurpurWorldConfig { public boolean snifferControllable = true; public double snifferMaxHealth = 14.0D; public int snifferBreedingTicks = 6000; @@ -286,7 +286,7 @@ index 64e172e6cbfb8134c2b36bce8279e1ef44085257..20d3b1a0892053544c9f338f88297a72 snifferRidable = getBoolean("mobs.sniffer.ridable", snifferRidable); snifferRidableInWater = getBoolean("mobs.sniffer.ridable-in-water", snifferRidableInWater); snifferControllable = getBoolean("mobs.sniffer.controllable", snifferControllable); -@@ -2714,7 +2750,17 @@ public class PurpurWorldConfig { +@@ -2716,7 +2752,17 @@ public class PurpurWorldConfig { public boolean tadpoleRidable = false; public boolean tadpoleRidableInWater = true; public boolean tadpoleControllable = true; @@ -304,7 +304,7 @@ index 64e172e6cbfb8134c2b36bce8279e1ef44085257..20d3b1a0892053544c9f338f88297a72 tadpoleRidable = getBoolean("mobs.tadpole.ridable", tadpoleRidable); tadpoleRidableInWater = getBoolean("mobs.tadpole.ridable-in-water", tadpoleRidableInWater); tadpoleControllable = getBoolean("mobs.tadpole.controllable", tadpoleControllable); -@@ -2924,7 +2970,17 @@ public class PurpurWorldConfig { +@@ -2926,7 +2972,17 @@ public class PurpurWorldConfig { public boolean wardenRidable = false; public boolean wardenRidableInWater = true; public boolean wardenControllable = true;