From 820e9ca70bbf4b60f77d670aa3ad98f4f485c2c4 Mon Sep 17 00:00:00 2001 From: Jason Penilla <11360596+jpenilla@users.noreply.github.com> Date: Tue, 5 Apr 2022 10:36:14 -0700 Subject: [PATCH] Update decompiler & param mappings --- build.gradle.kts | 4 +- patches/server/0005-MC-Dev-fixes.patch | 67 +------------------ patches/server/0355-Anti-Xray.patch | 4 +- .../0763-Optimise-random-block-ticking.patch | 4 +- 4 files changed, 8 insertions(+), 71 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index bd947ed2a4..15206e8d13 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -56,9 +56,9 @@ repositories { } dependencies { - paramMappings("net.fabricmc:yarn:1.18.2+build.1:mergedv2") + paramMappings("net.fabricmc:yarn:1.18.2+build.2:mergedv2") remapper("net.fabricmc:tiny-remapper:0.8.1:fat") - decompiler("net.minecraftforge:forgeflower:1.5.498.22") + decompiler("net.minecraftforge:forgeflower:1.5.498.29") paperclip("io.papermc:paperclip:3.0.2") } diff --git a/patches/server/0005-MC-Dev-fixes.patch b/patches/server/0005-MC-Dev-fixes.patch index ee563f2c59..656217763c 100644 --- a/patches/server/0005-MC-Dev-fixes.patch +++ b/patches/server/0005-MC-Dev-fixes.patch @@ -152,38 +152,8 @@ index f10ea89e64aac2c11ed442ac7f2ffd15b793ac76..5df72f16e6b954ecee23a6f8daa29de0 private static final int MIN_PROTOCOL_ID = -1; private static final int MAX_PROTOCOL_ID = 2; -diff --git a/src/main/java/net/minecraft/network/protocol/game/ClientboundLoginPacket.java b/src/main/java/net/minecraft/network/protocol/game/ClientboundLoginPacket.java -index 2a6969baca7c07c52223672de58886dd05c032eb..a620e53021e02da1663b8d8b68d429b22814567f 100644 ---- a/src/main/java/net/minecraft/network/protocol/game/ClientboundLoginPacket.java -+++ b/src/main/java/net/minecraft/network/protocol/game/ClientboundLoginPacket.java -@@ -20,25 +20,6 @@ public record ClientboundLoginPacket(int playerId, boolean hardcore, GameType ga - }), buf.readWithCodec(RegistryAccess.NETWORK_CODEC).freeze(), buf.readWithCodec(DimensionType.CODEC), ResourceKey.create(Registry.DIMENSION_REGISTRY, buf.readResourceLocation()), buf.readLong(), buf.readVarInt(), buf.readVarInt(), buf.readVarInt(), buf.readBoolean(), buf.readBoolean(), buf.readBoolean(), buf.readBoolean()); - } - -- public ClientboundLoginPacket(int playerEntityId, boolean bl, GameType previousGameMode, @Nullable GameType gameType, Set> set, RegistryAccess.Frozen frozen, Holder holder, ResourceKey resourceKey, long l, int maxPlayers, int chunkLoadDistance, int i, boolean bl2, boolean bl3, boolean bl4, boolean bl5) { -- this.playerId = playerEntityId; -- this.hardcore = bl; -- this.gameType = previousGameMode; -- this.previousGameType = gameType; -- this.levels = set; -- this.registryHolder = frozen; -- this.dimensionType = holder; -- this.dimension = resourceKey; -- this.seed = l; -- this.maxPlayers = maxPlayers; -- this.chunkRadius = chunkLoadDistance; -- this.simulationDistance = i; -- this.reducedDebugInfo = bl2; -- this.showDeathScreen = bl3; -- this.isDebug = bl4; -- this.isFlat = bl5; -- } -- - @Override - public void write(FriendlyByteBuf buf) { - buf.writeInt(this.playerId); diff --git a/src/main/java/net/minecraft/resources/RegistryLoader.java b/src/main/java/net/minecraft/resources/RegistryLoader.java -index 858037070db0b0fed07bf542294b76028f0018f9..75f72b568ee2b27c5042da688b62d4e3c5732e09 100644 +index bb2f21e10bad59186f6408b5d6f49ee8375e6870..0d28a3a7f52174e70e044957b37361043b153e42 100644 --- a/src/main/java/net/minecraft/resources/RegistryLoader.java +++ b/src/main/java/net/minecraft/resources/RegistryLoader.java @@ -73,7 +73,7 @@ public class RegistryLoader { @@ -195,17 +165,6 @@ index 858037070db0b0fed07bf542294b76028f0018f9..75f72b568ee2b27c5042da688b62d4e3 return new RegistryLoader.ReadCache(); }); } -@@ -83,10 +83,6 @@ public class RegistryLoader { - } - - public static record Bound(RegistryAccess.Writable access, RegistryLoader loader) { -- public Bound(RegistryAccess.Writable writable, RegistryLoader registryLoader) { -- this.access = writable; -- this.loader = registryLoader; -- } - - public DataResult> overrideRegistryFromResources(ResourceKey> registryRef, Codec codec, DynamicOps ops) { - WritableRegistry writableRegistry = this.access.ownedWritableRegistryOrThrow(registryRef); diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java index ef128de5fe17231b39edb12a7014291d03cf79ec..868f6799a0e406401eecf18bc939fbdf88f534a2 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java @@ -285,7 +244,7 @@ index 92650d816113a0f1c2b589691895ebba3424d661..7ef0075cc16613709e145714204a728d this.byName = Maps.newHashMap(builder.build()); // CraftBukkit RecipeManager.LOGGER.info("Loaded {} recipes", map1.size()); diff --git a/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java b/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java -index 57bc78e1a189386443abb02744e88b2fdf803a95..ef093604f001d3e899679f6d308780856f076193 100644 +index 675625a5dda3ededa398da5e25c2c850ba4ef59a..438647aa32e91e35b5a6430961d1ce4d5558d3d4 100644 --- a/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java +++ b/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java @@ -42,7 +42,7 @@ public class PalettedContainer implements PaletteResize { @@ -297,28 +256,6 @@ index 57bc78e1a189386443abb02744e88b2fdf803a95..ef093604f001d3e899679f6d30878085 return instance.group(entryCodec.mapResult(ExtraCodecs.orElsePartial(object)).listOf().fieldOf("palette").forGetter(PalettedContainer.DiscData::paletteEntries), Codec.LONG_STREAM.optionalFieldOf("data").forGetter(PalettedContainer.DiscData::storage)).apply(instance, PalettedContainer.DiscData::new); }).comapFlatMap((serialized) -> { return read(idList, provider, serialized); -@@ -278,10 +278,6 @@ public class PalettedContainer implements PaletteResize { - } - - static record Configuration(Palette.Factory factory, int bits) { -- Configuration(Palette.Factory factory, int i) { -- this.factory = factory; -- this.bits = i; -- } - - public PalettedContainer.Data createData(IdMap idList, PaletteResize listener, int size) { - BitStorage bitStorage = (BitStorage)(this.bits == 0 ? new ZeroBitStorage(size) : new SimpleBitStorage(this.bits, size)); -@@ -316,10 +312,6 @@ public class PalettedContainer implements PaletteResize { - } - - static record DiscData(List paletteEntries, Optional storage) { -- DiscData(List list, Optional optional) { -- this.paletteEntries = list; -- this.storage = optional; -- } - } - - public abstract static class Strategy { diff --git a/src/main/java/net/minecraft/world/level/entity/EntityLookup.java b/src/main/java/net/minecraft/world/level/entity/EntityLookup.java index 3864da01056970ae05cc3ca094f923178b4ffc97..e6b9f812e521abd552e0c7dc0429d5a62f2bfc35 100644 --- a/src/main/java/net/minecraft/world/level/entity/EntityLookup.java diff --git a/patches/server/0355-Anti-Xray.patch b/patches/server/0355-Anti-Xray.patch index 97d0c4146e..7d35624bd0 100644 --- a/patches/server/0355-Anti-Xray.patch +++ b/patches/server/0355-Anti-Xray.patch @@ -1316,7 +1316,7 @@ index c696358102086257033b55adbef84b1a259cb46e..67b06640358e04752bf149e9380f5f83 public int getSerializedSize() { diff --git a/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java b/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java -index ef093604f001d3e899679f6d308780856f076193..45a969f97b26e328e34f3d576557999c32b954a2 100644 +index 438647aa32e91e35b5a6430961d1ce4d5558d3d4..fea05645c782969c1e949fe4d56d18c0c2159cc6 100644 --- a/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java +++ b/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java @@ -29,6 +29,7 @@ public class PalettedContainer implements PaletteResize { @@ -1489,7 +1489,7 @@ index ef093604f001d3e899679f6d308780856f076193..45a969f97b26e328e34f3d576557999c } public void count(PalettedContainer.CountConsumer counter) { -@@ -304,9 +373,20 @@ public class PalettedContainer implements PaletteResize { +@@ -303,9 +372,20 @@ public class PalettedContainer implements PaletteResize { return 1 + this.palette.getSerializedSize() + FriendlyByteBuf.getVarIntSize(this.storage.getSize()) + this.storage.getRaw().length * 8; } diff --git a/patches/server/0763-Optimise-random-block-ticking.patch b/patches/server/0763-Optimise-random-block-ticking.patch index 5fab891845..dc1d3bcac7 100644 --- a/patches/server/0763-Optimise-random-block-ticking.patch +++ b/patches/server/0763-Optimise-random-block-ticking.patch @@ -410,10 +410,10 @@ index cdd17e501c678a4f4bebbaaccdaec1682351e2f2..6afad987f6dd1fd7243dfa6c50549c2a public PalettedContainer getStates() { diff --git a/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java b/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java -index 277b75940d0424051919889b2d0045f313027234..8bdc3f393282c510f1e99636275c61849d6a810c 100644 +index d6e56bd606aca4aef7442c759d5567924032b775..ac0ccaf11eb414d0c2b843f458753fb37aac3f67 100644 --- a/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java +++ b/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java -@@ -355,6 +355,14 @@ public class PalettedContainer implements PaletteResize { +@@ -354,6 +354,14 @@ public class PalettedContainer implements PaletteResize { } }