From 816236f5544fccfa4bc70e494ce817090a117c1c Mon Sep 17 00:00:00 2001 From: NONPLAYT <76615486+NONPLAYT@users.noreply.github.com> Date: Tue, 23 Apr 2024 00:58:19 +0300 Subject: [PATCH] update patches --- build.gradle.kts | 6 ++++-- ...004-Optimize-default-values-for-configs.patch | 16 ++++++++-------- ...23-Configurable-Chat-message-signatures.patch | 4 ++-- .../0026-Carpet-Fixes-getBiome-Optimize.patch | 14 +++++++------- patches/server/0027-lithium-ai.raid.patch | 12 ++++++------ .../0042-lithium-precompute-shape-arrays.patch | 8 ++++---- 6 files changed, 31 insertions(+), 29 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index da8dde4..3216751 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -7,6 +7,8 @@ plugins { id("io.papermc.paperweight.patcher") version "1.5.15" } +val paperMavenPublicUrl = "https://repo.papermc.io/repository/maven-public/" + repositories { mavenCentral() maven("https://papermc.io/repo/repository/maven-public/") { @@ -18,7 +20,7 @@ repositories { dependencies { remapper("net.fabricmc:tiny-remapper:0.10.1:fat") - decompiler("net.minecraftforge:forgeflower:2.0.627.2") + decompiler("org.vineflower:vineflower:1.10.1") paperclip("io.papermc:paperclip:3.0.3") } @@ -68,7 +70,7 @@ paperweight { serverProject.set(project(":divinemc-server")) remapRepo.set("https://maven.fabricmc.net/") - decompileRepo.set("https://files.minecraftforge.net/maven/") + decompileRepo.set(paperMavenPublicUrl) useStandardUpstream("purpur") { url.set(github("PurpurMC", "Purpur")) diff --git a/patches/server/0004-Optimize-default-values-for-configs.patch b/patches/server/0004-Optimize-default-values-for-configs.patch index b17c488..97c30bc 100644 --- a/patches/server/0004-Optimize-default-values-for-configs.patch +++ b/patches/server/0004-Optimize-default-values-for-configs.patch @@ -36,7 +36,7 @@ index 30fe1c0645a07d663b08c0f988a1ab3a750bf7c4..f8ceb440d402044f3b5e7925981029c8 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 dc7950f9a52a718317e5f41de9d396cd7b846bf3..1308d05aa1e840e53e9af87aa0f7c2966b6e13b8 100644 +index d3fdf62912d190f8b468b77230a927023c361074..6117022d293c16b3794cc8c828f76be6094dedb4 100644 --- a/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java +++ b/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java @@ -151,9 +151,9 @@ public class WorldConfiguration extends ConfigurationPart { @@ -90,7 +90,7 @@ index dc7950f9a52a718317e5f41de9d396cd7b846bf3..1308d05aa1e840e53e9af87aa0f7c296 public boolean disableExplosionKnockback = false; public boolean generateFlatBedrock = false; public FrostedIce frostedIce; -@@ -431,7 +431,7 @@ public class WorldConfiguration extends ConfigurationPart { +@@ -432,7 +432,7 @@ public class WorldConfiguration extends ConfigurationPart { public class Maps extends ConfigurationPart { public int itemFrameCursorLimit = 128; @@ -99,7 +99,7 @@ index dc7950f9a52a718317e5f41de9d396cd7b846bf3..1308d05aa1e840e53e9af87aa0f7c296 } public Fixes fixes; -@@ -457,7 +457,7 @@ public class WorldConfiguration extends ConfigurationPart { +@@ -458,7 +458,7 @@ public class WorldConfiguration extends ConfigurationPart { public class Hopper extends ConfigurationPart { public boolean cooldownWhenFull = true; public boolean disableMoveEvent = false; @@ -108,7 +108,7 @@ index dc7950f9a52a718317e5f41de9d396cd7b846bf3..1308d05aa1e840e53e9af87aa0f7c296 } public Collisions collisions; -@@ -465,9 +465,9 @@ public class WorldConfiguration extends ConfigurationPart { +@@ -466,9 +466,9 @@ public class WorldConfiguration extends ConfigurationPart { public class Collisions extends ConfigurationPart { public boolean onlyPlayersCollide = false; public boolean allowVehicleCollisions = true; @@ -120,7 +120,7 @@ index dc7950f9a52a718317e5f41de9d396cd7b846bf3..1308d05aa1e840e53e9af87aa0f7c296 public boolean allowPlayerCrammingDamage = false; } -@@ -475,18 +475,31 @@ public class WorldConfiguration extends ConfigurationPart { +@@ -476,18 +476,31 @@ public class WorldConfiguration extends ConfigurationPart { public class Chunks extends ConfigurationPart { public AutosavePeriod autoSaveInterval = AutosavePeriod.def(); @@ -162,7 +162,7 @@ index dc7950f9a52a718317e5f41de9d396cd7b846bf3..1308d05aa1e840e53e9af87aa0f7c296 }); public boolean flushRegionsOnSave = false; } -@@ -501,13 +514,15 @@ public class WorldConfiguration extends ConfigurationPart { +@@ -502,13 +515,15 @@ public class WorldConfiguration extends ConfigurationPart { public TickRates tickRates; public class TickRates extends ConfigurationPart { @@ -183,7 +183,7 @@ index dc7950f9a52a718317e5f41de9d396cd7b846bf3..1308d05aa1e840e53e9af87aa0f7c296 } @Setting(FeatureSeedsGeneration.FEATURE_SEEDS_KEY) -@@ -516,7 +531,7 @@ public class WorldConfiguration extends ConfigurationPart { +@@ -517,7 +532,7 @@ public class WorldConfiguration extends ConfigurationPart { public class FeatureSeeds extends ConfigurationPart { @SuppressWarnings("unused") // Is used in FeatureSeedsGeneration @Setting(FeatureSeedsGeneration.GENERATE_KEY) @@ -192,7 +192,7 @@ index dc7950f9a52a718317e5f41de9d396cd7b846bf3..1308d05aa1e840e53e9af87aa0f7c296 @Setting(FeatureSeedsGeneration.FEATURES_KEY) public Reference2LongMap>> features = new Reference2LongOpenHashMap<>(); -@@ -537,9 +552,9 @@ public class WorldConfiguration extends ConfigurationPart { +@@ -538,9 +553,9 @@ public class WorldConfiguration extends ConfigurationPart { public class Misc extends ConfigurationPart { public int lightQueueSize = 20; diff --git a/patches/server/0023-Configurable-Chat-message-signatures.patch b/patches/server/0023-Configurable-Chat-message-signatures.patch index 405bb90..5c9e3fc 100644 --- a/patches/server/0023-Configurable-Chat-message-signatures.patch +++ b/patches/server/0023-Configurable-Chat-message-signatures.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Configurable Chat message signatures diff --git a/src/main/java/io/papermc/paper/adventure/ChatProcessor.java b/src/main/java/io/papermc/paper/adventure/ChatProcessor.java -index e4fd372a1d585887287253a02531cd192929377b..b7eb830ae6ae0d7d8c79dc4ccde9ac73177b7c12 100644 +index 1d78e8beacbc93ef2cd6beb418edca843f8a5429..9d389c5a09c090750b1c17b0d162e06e6899a063 100644 --- a/src/main/java/io/papermc/paper/adventure/ChatProcessor.java +++ b/src/main/java/io/papermc/paper/adventure/ChatProcessor.java -@@ -355,7 +355,7 @@ public final class ChatProcessor { +@@ -317,7 +317,7 @@ public final class ChatProcessor { private void sendToServer(final ChatType.Bound chatType, final @Nullable Function msgFunction) { final PlayerChatMessage toConsoleMessage = msgFunction == null ? ChatProcessor.this.message : ChatProcessor.this.message.withUnsignedContent(msgFunction.apply(ChatProcessor.this.server.console)); diff --git a/patches/server/0026-Carpet-Fixes-getBiome-Optimize.patch b/patches/server/0026-Carpet-Fixes-getBiome-Optimize.patch index 95a8b8f..46033c1 100644 --- a/patches/server/0026-Carpet-Fixes-getBiome-Optimize.patch +++ b/patches/server/0026-Carpet-Fixes-getBiome-Optimize.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Carpet-Fixes: getBiome Optimize diff --git a/src/main/java/net/minecraft/world/level/biome/BiomeManager.java b/src/main/java/net/minecraft/world/level/biome/BiomeManager.java -index 48ee643643e1548fa9c23484bf2f88f4ee3f380d..77ba51d9a220fb8faecb733cbd885bb2343c4343 100644 +index 01352cc83b25eb0e30b7e0ff521fc7c1b3d5155b..c042287e12b5ce814afe8557e4dfa8e8b16b0f5a 100644 --- a/src/main/java/net/minecraft/world/level/biome/BiomeManager.java +++ b/src/main/java/net/minecraft/world/level/biome/BiomeManager.java @@ -14,6 +14,7 @@ public class BiomeManager { @@ -26,9 +26,9 @@ index 48ee643643e1548fa9c23484bf2f88f4ee3f380d..77ba51d9a220fb8faecb733cbd885bb2 - int l = i >> 2; - int m = j >> 2; - int n = k >> 2; -- double d = (i & 3) / 4.0; -- double e = (j & 3) / 4.0; -- double f = (k & 3) / 4.0; +- double d = (double)(i & 3) / 4.0; +- double e = (double)(j & 3) / 4.0; +- double f = (double)(k & 3) / 4.0; - int o = 0; - double g = Double.POSITIVE_INFINITY; - @@ -114,9 +114,9 @@ index 48ee643643e1548fa9c23484bf2f88f4ee3f380d..77ba51d9a220fb8faecb733cbd885bb2 + int l = i >> 2; + int m = j >> 2; + int n = k >> 2; -+ double d = (i & 3) / 4.0; -+ double e = (j & 3) / 4.0; -+ double f = (k & 3) / 4.0; ++ double d = (double)(i & 3) / 4.0; ++ double e = (double)(j & 3) / 4.0; ++ double f = (double)(k & 3) / 4.0; + int o = 0; + double g = Double.POSITIVE_INFINITY; + diff --git a/patches/server/0027-lithium-ai.raid.patch b/patches/server/0027-lithium-ai.raid.patch index 8bfff74..1678481 100644 --- a/patches/server/0027-lithium-ai.raid.patch +++ b/patches/server/0027-lithium-ai.raid.patch @@ -10,7 +10,7 @@ As part of: Lithium (https://github.com/CaffeineMC/lithium-fabric) Licensed under: LGPL-3.0 (https://www.gnu.org/licenses/lgpl-3.0.html) diff --git a/src/main/java/net/minecraft/world/entity/raid/Raid.java b/src/main/java/net/minecraft/world/entity/raid/Raid.java -index eaa2943b667967f93f28d9d794d702fdaeb670ec..0e780da8dc230b27eddb01d1fa8bf2d8b5994158 100644 +index bf2c23fad919820512ce031cf28a000b249b2876..85f56c79d60fa5b5a269b044c5b3710ef30a827d 100644 --- a/src/main/java/net/minecraft/world/entity/raid/Raid.java +++ b/src/main/java/net/minecraft/world/entity/raid/Raid.java @@ -106,6 +106,7 @@ public class Raid { @@ -18,10 +18,10 @@ index eaa2943b667967f93f28d9d794d702fdaeb670ec..0e780da8dc230b27eddb01d1fa8bf2d8 private int celebrationTicks; private Optional waveSpawnPos; + private boolean isBarDirty; // DivineMC - lithium: ai.raid - - public Raid(int id, ServerLevel world, BlockPos pos) { - this.raidEvent = new ServerBossEvent(Raid.RAID_NAME_COMPONENT, BossEvent.BossBarColor.RED, BossEvent.BossBarOverlay.NOTCHED_10); -@@ -273,6 +274,12 @@ public class Raid { + // Paper start + private static final String PDC_NBT_KEY = "BukkitValues"; + private static final org.bukkit.craftbukkit.persistence.CraftPersistentDataTypeRegistry PDC_TYPE_REGISTRY = new org.bukkit.craftbukkit.persistence.CraftPersistentDataTypeRegistry(); +@@ -283,6 +284,12 @@ public class Raid { public void tick() { if (!this.isStopped()) { @@ -34,7 +34,7 @@ index eaa2943b667967f93f28d9d794d702fdaeb670ec..0e780da8dc230b27eddb01d1fa8bf2d8 if (this.status == Raid.RaidStatus.ONGOING) { boolean flag = this.active; -@@ -641,9 +648,15 @@ public class Raid { +@@ -651,9 +658,15 @@ public class Raid { } diff --git a/patches/server/0042-lithium-precompute-shape-arrays.patch b/patches/server/0042-lithium-precompute-shape-arrays.patch index e55c2f6..423e83c 100644 --- a/patches/server/0042-lithium-precompute-shape-arrays.patch +++ b/patches/server/0042-lithium-precompute-shape-arrays.patch @@ -7,7 +7,7 @@ Original code by CaffeineMC, licensed under LGPL v3 You can find the original code on https://github.com/CaffeineMC/lithium-fabric (Yarn mappings) diff --git a/src/main/java/net/minecraft/core/Direction.java b/src/main/java/net/minecraft/core/Direction.java -index f0fe2acadac0f57eb06b6aee1940e2c4985e4ca1..d169744ec6708248c79956c144986ecb70157b7c 100644 +index 84a760fdc50bdafc9150f977e9c5d557a30ee220..8bfe5c8c559d5e68f5b95bea37f63363b343e9b1 100644 --- a/src/main/java/net/minecraft/core/Direction.java +++ b/src/main/java/net/minecraft/core/Direction.java @@ -39,7 +39,7 @@ public enum Direction implements StringRepresentable { @@ -20,7 +20,7 @@ index f0fe2acadac0f57eb06b6aee1940e2c4985e4ca1..d169744ec6708248c79956c144986ecb .sorted(Comparator.comparingInt(direction -> direction.data3d)) .toArray(Direction[]::new); diff --git a/src/main/java/net/minecraft/world/phys/shapes/CubePointRange.java b/src/main/java/net/minecraft/world/phys/shapes/CubePointRange.java -index f20ca2074f627ebd2cc15de2b41a6010f3f6b68c..fc6a8b1cf33427320a60e3f2d9894ed2f0177bf7 100644 +index a544db042c8d2ecec8d323770552c4f10ca758a6..fc6a8b1cf33427320a60e3f2d9894ed2f0177bf7 100644 --- a/src/main/java/net/minecraft/world/phys/shapes/CubePointRange.java +++ b/src/main/java/net/minecraft/world/phys/shapes/CubePointRange.java @@ -4,6 +4,7 @@ import it.unimi.dsi.fastutil.doubles.AbstractDoubleList; @@ -39,13 +39,13 @@ index f20ca2074f627ebd2cc15de2b41a6010f3f6b68c..fc6a8b1cf33427320a60e3f2d9894ed2 } public double getDouble(int i) { -- return (double)i / this.parts; +- return (double)i / (double)this.parts; + return i * this.scale; // DivineMC - lithium: precompute shape arrays } public int size() { diff --git a/src/main/java/net/minecraft/world/phys/shapes/CubeVoxelShape.java b/src/main/java/net/minecraft/world/phys/shapes/CubeVoxelShape.java -index fc751564e02306006cffd90ef29acb27cc77cd0b..4535c8858d028d3941d966b0701bf22363d12991 100644 +index b9af1d14c7815c99273bce8165cf384d669c1a75..16bf73856465c10e1ab84c17e7b317ef9081704d 100644 --- a/src/main/java/net/minecraft/world/phys/shapes/CubeVoxelShape.java +++ b/src/main/java/net/minecraft/world/phys/shapes/CubeVoxelShape.java @@ -5,6 +5,8 @@ import net.minecraft.core.Direction;