From 6910e387f84e94cb7a4778329111269f424d3096 Mon Sep 17 00:00:00 2001 From: coehlrich Date: Thu, 12 Sep 2024 03:49:23 +1200 Subject: [PATCH] Update patches --- .../client/net/minecraft/client/Minecraft.java.patch | 2 +- .../worldselection/WorldCreationUiState.java.patch | 2 +- .../screens/worldselection/WorldOpenFlows.java.patch | 2 +- .../joined/net/minecraft/client/Minecraft.java.patch | 2 +- .../worldselection/WorldCreationUiState.java.patch | 2 +- .../screens/worldselection/WorldOpenFlows.java.patch | 2 +- .../shared/net/minecraft/TracingExecutor.java.patch | 11 +++++++++++ .../patches/shared/net/minecraft/Util.java.patch | 2 +- .../critereon/EntitySubPredicates.java.patch | 4 ++-- .../shared/net/minecraft/commands/Commands.java.patch | 2 +- .../minecraft/network/codec/StreamCodec.java.patch | 2 +- .../net/minecraft/server/MinecraftServer.java.patch | 4 ++-- .../server/level/ServerChunkCache.java.patch | 2 +- .../net/minecraft/server/level/ServerLevel.java.patch | 2 +- .../network/ServerGamePacketListenerImpl.java.patch | 2 +- .../net/minecraft/util/datafix/DataFixers.java.patch | 4 ++-- .../net/minecraft/world/entity/Entity.java.patch | 4 ++-- .../world/entity/projectile/AbstractArrow.java.patch | 2 +- .../world/level/block/state/StateHolder.java.patch | 11 +++++++++++ 19 files changed, 43 insertions(+), 21 deletions(-) create mode 100644 versions/snapshot/1.21/24w37a/patches/shared/net/minecraft/TracingExecutor.java.patch create mode 100644 versions/snapshot/1.21/24w37a/patches/shared/net/minecraft/world/level/block/state/StateHolder.java.patch diff --git a/versions/snapshot/1.21/24w37a/patches/client/net/minecraft/client/Minecraft.java.patch b/versions/snapshot/1.21/24w37a/patches/client/net/minecraft/client/Minecraft.java.patch index 9a013fc9..a83e9223 100644 --- a/versions/snapshot/1.21/24w37a/patches/client/net/minecraft/client/Minecraft.java.patch +++ b/versions/snapshot/1.21/24w37a/patches/client/net/minecraft/client/Minecraft.java.patch @@ -1,6 +1,6 @@ --- a/net/minecraft/client/Minecraft.java +++ b/net/minecraft/client/Minecraft.java -@@ -2323,7 +2323,7 @@ +@@ -2352,7 +2352,7 @@ } public CompletableFuture delayTextureReload() { diff --git a/versions/snapshot/1.21/24w37a/patches/client/net/minecraft/client/gui/screens/worldselection/WorldCreationUiState.java.patch b/versions/snapshot/1.21/24w37a/patches/client/net/minecraft/client/gui/screens/worldselection/WorldCreationUiState.java.patch index 9ee83761..1c0c1645 100644 --- a/versions/snapshot/1.21/24w37a/patches/client/net/minecraft/client/gui/screens/worldselection/WorldCreationUiState.java.patch +++ b/versions/snapshot/1.21/24w37a/patches/client/net/minecraft/client/gui/screens/worldselection/WorldCreationUiState.java.patch @@ -1,6 +1,6 @@ --- a/net/minecraft/client/gui/screens/worldselection/WorldCreationUiState.java +++ b/net/minecraft/client/gui/screens/worldselection/WorldCreationUiState.java -@@ -298,7 +298,7 @@ +@@ -308,7 +308,7 @@ public Component describePreset() { return Optional.ofNullable(this.preset) .flatMap(Holder::unwrapKey) diff --git a/versions/snapshot/1.21/24w37a/patches/client/net/minecraft/client/gui/screens/worldselection/WorldOpenFlows.java.patch b/versions/snapshot/1.21/24w37a/patches/client/net/minecraft/client/gui/screens/worldselection/WorldOpenFlows.java.patch index 239a3d1b..b793667e 100644 --- a/versions/snapshot/1.21/24w37a/patches/client/net/minecraft/client/gui/screens/worldselection/WorldOpenFlows.java.patch +++ b/versions/snapshot/1.21/24w37a/patches/client/net/minecraft/client/gui/screens/worldselection/WorldOpenFlows.java.patch @@ -1,6 +1,6 @@ --- a/net/minecraft/client/gui/screens/worldselection/WorldOpenFlows.java +++ b/net/minecraft/client/gui/screens/worldselection/WorldOpenFlows.java -@@ -157,7 +157,7 @@ +@@ -158,7 +158,7 @@ record Data(LevelSettings levelSettings, WorldOptions options, Registry existingDimensions) { } diff --git a/versions/snapshot/1.21/24w37a/patches/joined/net/minecraft/client/Minecraft.java.patch b/versions/snapshot/1.21/24w37a/patches/joined/net/minecraft/client/Minecraft.java.patch index 4ecf12f4..95270396 100644 --- a/versions/snapshot/1.21/24w37a/patches/joined/net/minecraft/client/Minecraft.java.patch +++ b/versions/snapshot/1.21/24w37a/patches/joined/net/minecraft/client/Minecraft.java.patch @@ -1,6 +1,6 @@ --- a/net/minecraft/client/Minecraft.java +++ b/net/minecraft/client/Minecraft.java -@@ -2326,7 +2326,7 @@ +@@ -2355,7 +2355,7 @@ } public CompletableFuture delayTextureReload() { diff --git a/versions/snapshot/1.21/24w37a/patches/joined/net/minecraft/client/gui/screens/worldselection/WorldCreationUiState.java.patch b/versions/snapshot/1.21/24w37a/patches/joined/net/minecraft/client/gui/screens/worldselection/WorldCreationUiState.java.patch index 2facd110..2ba9db74 100644 --- a/versions/snapshot/1.21/24w37a/patches/joined/net/minecraft/client/gui/screens/worldselection/WorldCreationUiState.java.patch +++ b/versions/snapshot/1.21/24w37a/patches/joined/net/minecraft/client/gui/screens/worldselection/WorldCreationUiState.java.patch @@ -1,6 +1,6 @@ --- a/net/minecraft/client/gui/screens/worldselection/WorldCreationUiState.java +++ b/net/minecraft/client/gui/screens/worldselection/WorldCreationUiState.java -@@ -303,7 +303,7 @@ +@@ -313,7 +313,7 @@ public Component describePreset() { return Optional.ofNullable(this.preset) .flatMap(Holder::unwrapKey) diff --git a/versions/snapshot/1.21/24w37a/patches/joined/net/minecraft/client/gui/screens/worldselection/WorldOpenFlows.java.patch b/versions/snapshot/1.21/24w37a/patches/joined/net/minecraft/client/gui/screens/worldselection/WorldOpenFlows.java.patch index 26d6534f..63a0013a 100644 --- a/versions/snapshot/1.21/24w37a/patches/joined/net/minecraft/client/gui/screens/worldselection/WorldOpenFlows.java.patch +++ b/versions/snapshot/1.21/24w37a/patches/joined/net/minecraft/client/gui/screens/worldselection/WorldOpenFlows.java.patch @@ -1,6 +1,6 @@ --- a/net/minecraft/client/gui/screens/worldselection/WorldOpenFlows.java +++ b/net/minecraft/client/gui/screens/worldselection/WorldOpenFlows.java -@@ -161,7 +161,7 @@ +@@ -162,7 +162,7 @@ record Data(LevelSettings levelSettings, WorldOptions options, Registry existingDimensions) { } diff --git a/versions/snapshot/1.21/24w37a/patches/shared/net/minecraft/TracingExecutor.java.patch b/versions/snapshot/1.21/24w37a/patches/shared/net/minecraft/TracingExecutor.java.patch new file mode 100644 index 00000000..04cef5f2 --- /dev/null +++ b/versions/snapshot/1.21/24w37a/patches/shared/net/minecraft/TracingExecutor.java.patch @@ -0,0 +1,11 @@ +--- a/net/minecraft/TracingExecutor.java ++++ b/net/minecraft/TracingExecutor.java +@@ -21,7 +21,7 @@ + } + }); + } else { +- return (Executor)(TracyClient.isAvailable() ? p_372837_ -> this.service.execute(() -> { ++ return (Executor)(TracyClient.isAvailable() ? (Executor) p_372837_ -> this.service.execute(() -> { + try (Zone zone = TracyClient.beginZone(p_372983_, SharedConstants.IS_RUNNING_IN_IDE)) { + p_372837_.run(); + } diff --git a/versions/snapshot/1.21/24w37a/patches/shared/net/minecraft/Util.java.patch b/versions/snapshot/1.21/24w37a/patches/shared/net/minecraft/Util.java.patch index 6e03de2e..827248f1 100644 --- a/versions/snapshot/1.21/24w37a/patches/shared/net/minecraft/Util.java.patch +++ b/versions/snapshot/1.21/24w37a/patches/shared/net/minecraft/Util.java.patch @@ -1,6 +1,6 @@ --- a/net/minecraft/Util.java +++ b/net/minecraft/Util.java -@@ -576,7 +576,7 @@ +@@ -559,7 +559,7 @@ public static , V> EnumMap makeEnumMap(Class p_371641_, Function p_371671_) { EnumMap enummap = new EnumMap<>(p_371641_); diff --git a/versions/snapshot/1.21/24w37a/patches/shared/net/minecraft/advancements/critereon/EntitySubPredicates.java.patch b/versions/snapshot/1.21/24w37a/patches/shared/net/minecraft/advancements/critereon/EntitySubPredicates.java.patch index a904fbf5..8589b7a7 100644 --- a/versions/snapshot/1.21/24w37a/patches/shared/net/minecraft/advancements/critereon/EntitySubPredicates.java.patch +++ b/versions/snapshot/1.21/24w37a/patches/shared/net/minecraft/advancements/critereon/EntitySubPredicates.java.patch @@ -1,6 +1,6 @@ --- a/net/minecraft/advancements/critereon/EntitySubPredicates.java +++ b/net/minecraft/advancements/critereon/EntitySubPredicates.java -@@ -176,7 +176,7 @@ +@@ -183,7 +183,7 @@ this.getter = p_336167_; this.codec = RecordCodecBuilder.mapCodec( p_335436_ -> p_335436_.group(RegistryCodecs.homogeneousList(p_336141_).fieldOf("variant").forGetter(p_335992_ -> p_335992_.variants)) @@ -9,7 +9,7 @@ ); } -@@ -219,7 +219,7 @@ +@@ -226,7 +226,7 @@ this.getter = p_333805_; this.codec = RecordCodecBuilder.mapCodec( p_333719_ -> p_333719_.group(p_333738_.fieldOf("variant").forGetter(p_333753_ -> p_333753_.variant)) diff --git a/versions/snapshot/1.21/24w37a/patches/shared/net/minecraft/commands/Commands.java.patch b/versions/snapshot/1.21/24w37a/patches/shared/net/minecraft/commands/Commands.java.patch index 90a8129c..9407b994 100644 --- a/versions/snapshot/1.21/24w37a/patches/shared/net/minecraft/commands/Commands.java.patch +++ b/versions/snapshot/1.21/24w37a/patches/shared/net/minecraft/commands/Commands.java.patch @@ -1,6 +1,6 @@ --- a/net/minecraft/commands/Commands.java +++ b/net/minecraft/commands/Commands.java -@@ -374,7 +374,7 @@ +@@ -377,7 +377,7 @@ ) { for (CommandNode commandnode : p_82113_.getChildren()) { if (commandnode.canUse(p_82115_)) { diff --git a/versions/snapshot/1.21/24w37a/patches/shared/net/minecraft/network/codec/StreamCodec.java.patch b/versions/snapshot/1.21/24w37a/patches/shared/net/minecraft/network/codec/StreamCodec.java.patch index ec1ef099..c0161cd2 100644 --- a/versions/snapshot/1.21/24w37a/patches/shared/net/minecraft/network/codec/StreamCodec.java.patch +++ b/versions/snapshot/1.21/24w37a/patches/shared/net/minecraft/network/codec/StreamCodec.java.patch @@ -1,6 +1,6 @@ --- a/net/minecraft/network/codec/StreamCodec.java +++ b/net/minecraft/network/codec/StreamCodec.java -@@ -296,7 +296,7 @@ +@@ -340,7 +340,7 @@ } default StreamCodec cast() { diff --git a/versions/snapshot/1.21/24w37a/patches/shared/net/minecraft/server/MinecraftServer.java.patch b/versions/snapshot/1.21/24w37a/patches/shared/net/minecraft/server/MinecraftServer.java.patch index 45ba8054..fc5c1dbe 100644 --- a/versions/snapshot/1.21/24w37a/patches/shared/net/minecraft/server/MinecraftServer.java.patch +++ b/versions/snapshot/1.21/24w37a/patches/shared/net/minecraft/server/MinecraftServer.java.patch @@ -1,11 +1,11 @@ --- a/net/minecraft/server/MinecraftServer.java +++ b/net/minecraft/server/MinecraftServer.java -@@ -872,7 +872,7 @@ +@@ -883,7 +883,7 @@ } } - protected void doRunTask(TickTask p_129957_) { + public void doRunTask(TickTask p_129957_) { - this.getProfiler().incrementCounter("runTask"); + Profiler.get().incrementCounter("runTask"); super.doRunTask(p_129957_); } diff --git a/versions/snapshot/1.21/24w37a/patches/shared/net/minecraft/server/level/ServerChunkCache.java.patch b/versions/snapshot/1.21/24w37a/patches/shared/net/minecraft/server/level/ServerChunkCache.java.patch index 4550ee1a..87f4ef9c 100644 --- a/versions/snapshot/1.21/24w37a/patches/shared/net/minecraft/server/level/ServerChunkCache.java.patch +++ b/versions/snapshot/1.21/24w37a/patches/shared/net/minecraft/server/level/ServerChunkCache.java.patch @@ -1,6 +1,6 @@ --- a/net/minecraft/server/level/ServerChunkCache.java +++ b/net/minecraft/server/level/ServerChunkCache.java -@@ -592,7 +592,7 @@ +@@ -594,7 +594,7 @@ } @Override diff --git a/versions/snapshot/1.21/24w37a/patches/shared/net/minecraft/server/level/ServerLevel.java.patch b/versions/snapshot/1.21/24w37a/patches/shared/net/minecraft/server/level/ServerLevel.java.patch index 0de21023..b073591e 100644 --- a/versions/snapshot/1.21/24w37a/patches/shared/net/minecraft/server/level/ServerLevel.java.patch +++ b/versions/snapshot/1.21/24w37a/patches/shared/net/minecraft/server/level/ServerLevel.java.patch @@ -1,6 +1,6 @@ --- a/net/minecraft/server/level/ServerLevel.java +++ b/net/minecraft/server/level/ServerLevel.java -@@ -1597,7 +1597,7 @@ +@@ -1588,7 +1588,7 @@ return object2intopenhashmap.object2IntEntrySet() .stream() diff --git a/versions/snapshot/1.21/24w37a/patches/shared/net/minecraft/server/network/ServerGamePacketListenerImpl.java.patch b/versions/snapshot/1.21/24w37a/patches/shared/net/minecraft/server/network/ServerGamePacketListenerImpl.java.patch index 9da7fb3f..34c856db 100644 --- a/versions/snapshot/1.21/24w37a/patches/shared/net/minecraft/server/network/ServerGamePacketListenerImpl.java.patch +++ b/versions/snapshot/1.21/24w37a/patches/shared/net/minecraft/server/network/ServerGamePacketListenerImpl.java.patch @@ -18,7 +18,7 @@ && !this.server.isFlightAllowed() && !entity.isNoGravity() @@ -791,7 +792,7 @@ - if (itemstack.is(Items.WRITABLE_BOOK)) { + if (itemstack.has(DataComponents.WRITABLE_BOOK_CONTENT)) { ItemStack itemstack1 = itemstack.transmuteCopy(Items.WRITTEN_BOOK); itemstack1.remove(DataComponents.WRITABLE_BOOK_CONTENT); - List> list = p_215210_.stream().map(p_329965_ -> this.filterableFromOutgoing(p_329965_).map(Component::literal)).toList(); diff --git a/versions/snapshot/1.21/24w37a/patches/shared/net/minecraft/util/datafix/DataFixers.java.patch b/versions/snapshot/1.21/24w37a/patches/shared/net/minecraft/util/datafix/DataFixers.java.patch index e8979424..baf2a6d1 100644 --- a/versions/snapshot/1.21/24w37a/patches/shared/net/minecraft/util/datafix/DataFixers.java.patch +++ b/versions/snapshot/1.21/24w37a/patches/shared/net/minecraft/util/datafix/DataFixers.java.patch @@ -1,6 +1,6 @@ --- a/net/minecraft/util/datafix/DataFixers.java +++ b/net/minecraft/util/datafix/DataFixers.java -@@ -1091,7 +1091,7 @@ +@@ -1092,7 +1092,7 @@ Schema schema161 = p_14514_.addSchema(3086, SAME_NAMESPACED); p_14514_.addFixer( new EntityVariantFix( @@ -9,7 +9,7 @@ p_216528_.defaultReturnValue("minecraft:tabby"); p_216528_.put(0, "minecraft:tabby"); p_216528_.put(1, "minecraft:black"); -@@ -1131,7 +1131,7 @@ +@@ -1132,7 +1132,7 @@ Schema schema162 = p_14514_.addSchema(3087, SAME_NAMESPACED); p_14514_.addFixer( new EntityVariantFix( diff --git a/versions/snapshot/1.21/24w37a/patches/shared/net/minecraft/world/entity/Entity.java.patch b/versions/snapshot/1.21/24w37a/patches/shared/net/minecraft/world/entity/Entity.java.patch index ebc03230..d84259a3 100644 --- a/versions/snapshot/1.21/24w37a/patches/shared/net/minecraft/world/entity/Entity.java.patch +++ b/versions/snapshot/1.21/24w37a/patches/shared/net/minecraft/world/entity/Entity.java.patch @@ -1,6 +1,6 @@ --- a/net/minecraft/world/entity/Entity.java +++ b/net/minecraft/world/entity/Entity.java -@@ -477,7 +477,7 @@ +@@ -481,7 +481,7 @@ this.firstTick = false; if (!this.level().isClientSide && this instanceof Leashable) { @@ -8,4 +8,4 @@ + Leashable.tickLeash((Entity & Leashable)this); } - this.level().getProfiler().pop(); + profilerfiller.pop(); diff --git a/versions/snapshot/1.21/24w37a/patches/shared/net/minecraft/world/entity/projectile/AbstractArrow.java.patch b/versions/snapshot/1.21/24w37a/patches/shared/net/minecraft/world/entity/projectile/AbstractArrow.java.patch index 64bb0600..877d2b70 100644 --- a/versions/snapshot/1.21/24w37a/patches/shared/net/minecraft/world/entity/projectile/AbstractArrow.java.patch +++ b/versions/snapshot/1.21/24w37a/patches/shared/net/minecraft/world/entity/projectile/AbstractArrow.java.patch @@ -1,6 +1,6 @@ --- a/net/minecraft/world/entity/projectile/AbstractArrow.java +++ b/net/minecraft/world/entity/projectile/AbstractArrow.java -@@ -568,9 +568,9 @@ +@@ -577,9 +577,9 @@ super.setOwner(p_36770_); this.pickup = switch (p_36770_) { diff --git a/versions/snapshot/1.21/24w37a/patches/shared/net/minecraft/world/level/block/state/StateHolder.java.patch b/versions/snapshot/1.21/24w37a/patches/shared/net/minecraft/world/level/block/state/StateHolder.java.patch new file mode 100644 index 00000000..7764ce50 --- /dev/null +++ b/versions/snapshot/1.21/24w37a/patches/shared/net/minecraft/world/level/block/state/StateHolder.java.patch @@ -0,0 +1,11 @@ +--- a/net/minecraft/world/level/block/state/StateHolder.java ++++ b/net/minecraft/world/level/block/state/StateHolder.java +@@ -133,7 +133,7 @@ + + for (Entry, Comparable> entry : this.values.entrySet()) { + Property property = entry.getKey(); +- map.put(property, property.getPossibleValues().stream().map(p_372787_ -> p_61134_.get(this.makeNeighbourValues(property, p_372787_))).toArray()); ++ map.put(property, (S[])property.getPossibleValues().stream().map(p_372787_ -> p_61134_.get(this.makeNeighbourValues(property, p_372787_))).toArray()); + } + + this.neighbours = map;