From 5d410c8fc74427a505d8355edf78309cb7cbcfb9 Mon Sep 17 00:00:00 2001 From: coehlrich Date: Thu, 9 Jan 2025 05:57:40 +1300 Subject: [PATCH] Update patches --- .../net/minecraft/client/Minecraft.java.patch | 4 +- .../client/gui/GuiGraphics.java.patch | 63 ++++++++++++++ .../client/gui/screens/Screen.java.patch | 86 +++++++++++++++++++ .../inventory/BookViewScreen.java.patch | 20 ++++- .../client/multiplayer/ClientLevel.java.patch | 4 +- .../client/renderer/PostChain.java.patch | 8 +- .../net/minecraft/client/Minecraft.java.patch | 4 +- .../client/gui/GuiGraphics.java.patch | 63 ++++++++++++++ .../client/gui/screens/Screen.java.patch | 86 +++++++++++++++++++ .../inventory/BookViewScreen.java.patch | 20 ++++- .../client/multiplayer/ClientLevel.java.patch | 4 +- .../client/renderer/PostChain.java.patch | 8 +- .../shared/net/minecraft/Util.java.patch | 4 +- .../critereon/EntitySubPredicates.java.patch | 4 +- .../minecraft/commands/Commands.java.patch | 2 +- .../registries/BuiltInRegistries.java.patch | 2 +- .../net/minecraft/nbt/TagParser.java.patch | 2 +- .../network/chat/ComponentUtils.java.patch | 22 +++++ .../syncher/EntityDataSerializers.java.patch | 11 +++ .../resources/RegistryDataLoader.java.patch | 2 +- .../server/MinecraftServer.java.patch | 2 +- .../server/level/ServerChunkCache.java.patch | 2 +- .../server/level/ServerLevel.java.patch | 2 +- .../ServerGamePacketListenerImpl.java.patch | 2 +- .../net/minecraft/util/ExtraCodecs.java.patch | 4 +- .../util/datafix/DataFixers.java.patch | 4 +- .../minecraft/world/entity/Entity.java.patch | 2 +- .../world/entity/TamableAnimal.java.patch | 2 +- .../world/entity/animal/Sheep.java.patch | 11 --- .../entity/monster/piglin/PiglinAi.java.patch | 2 +- .../projectile/AbstractArrow.java.patch | 2 +- .../world/level/block/Block.java.patch | 11 +++ .../block/entity/SignBlockEntity.java.patch | 21 +++++ .../level/block/state/StateHolder.java.patch | 2 +- 34 files changed, 438 insertions(+), 50 deletions(-) create mode 100644 versions/snapshot/1.21/25w02a/patches/client/net/minecraft/client/gui/GuiGraphics.java.patch create mode 100644 versions/snapshot/1.21/25w02a/patches/client/net/minecraft/client/gui/screens/Screen.java.patch create mode 100644 versions/snapshot/1.21/25w02a/patches/joined/net/minecraft/client/gui/GuiGraphics.java.patch create mode 100644 versions/snapshot/1.21/25w02a/patches/joined/net/minecraft/client/gui/screens/Screen.java.patch create mode 100644 versions/snapshot/1.21/25w02a/patches/shared/net/minecraft/network/chat/ComponentUtils.java.patch create mode 100644 versions/snapshot/1.21/25w02a/patches/shared/net/minecraft/network/syncher/EntityDataSerializers.java.patch delete mode 100644 versions/snapshot/1.21/25w02a/patches/shared/net/minecraft/world/entity/animal/Sheep.java.patch create mode 100644 versions/snapshot/1.21/25w02a/patches/shared/net/minecraft/world/level/block/Block.java.patch create mode 100644 versions/snapshot/1.21/25w02a/patches/shared/net/minecraft/world/level/block/entity/SignBlockEntity.java.patch diff --git a/versions/snapshot/1.21/25w02a/patches/client/net/minecraft/client/Minecraft.java.patch b/versions/snapshot/1.21/25w02a/patches/client/net/minecraft/client/Minecraft.java.patch index 20a90d49..a1f26fd7 100644 --- a/versions/snapshot/1.21/25w02a/patches/client/net/minecraft/client/Minecraft.java.patch +++ b/versions/snapshot/1.21/25w02a/patches/client/net/minecraft/client/Minecraft.java.patch @@ -1,6 +1,6 @@ --- a/net/minecraft/client/Minecraft.java +++ b/net/minecraft/client/Minecraft.java -@@ -2205,6 +2205,7 @@ +@@ -2213,6 +2213,7 @@ case EntityHitResult entityhitresult: this.gameMode.handlePickItemFromEntity(entityhitresult.getEntity(), flag); break; @@ -8,7 +8,7 @@ } } } -@@ -2299,7 +2300,7 @@ +@@ -2307,7 +2308,7 @@ } public CompletableFuture delayTextureReload() { diff --git a/versions/snapshot/1.21/25w02a/patches/client/net/minecraft/client/gui/GuiGraphics.java.patch b/versions/snapshot/1.21/25w02a/patches/client/net/minecraft/client/gui/GuiGraphics.java.patch new file mode 100644 index 00000000..3afc65b9 --- /dev/null +++ b/versions/snapshot/1.21/25w02a/patches/client/net/minecraft/client/gui/GuiGraphics.java.patch @@ -0,0 +1,63 @@ +--- a/net/minecraft/client/gui/GuiGraphics.java ++++ b/net/minecraft/client/gui/GuiGraphics.java +@@ -1020,57 +1020,21 @@ + Object object = hoverevent; + Throwable throwable4; + switch (object) { +- case HoverEvent.ShowItem hoverevent$showitem: +- HoverEvent.ShowItem hoverevent$showitem1 = hoverevent$showitem; +- +- try { +- itemstack1 = hoverevent$showitem1.item(); +- } catch (Throwable throwable2) { +- throwable4 = throwable2; +- boolean flag1 = false; +- break; +- } +- +- ItemStack itemstack = itemstack1; ++ case HoverEvent.ShowItem(ItemStack itemstack): + this.renderTooltip(p_282584_, itemstack, p_283623_, p_282114_); + return; +- case HoverEvent.ShowEntity hoverevent$showentity: +- HoverEvent.ShowEntity hoverevent$showentity1 = hoverevent$showentity; +- +- try { +- hoverevent$entitytooltipinfo1 = hoverevent$showentity1.entity(); +- } catch (Throwable throwable1) { +- throwable4 = throwable1; +- boolean flag = false; +- break; +- } +- +- HoverEvent.EntityTooltipInfo hoverevent$entitytooltipinfo = hoverevent$entitytooltipinfo1; ++ case HoverEvent.ShowEntity(HoverEvent.EntityTooltipInfo hoverevent$entitytooltipinfo): + if (this.minecraft.options.advancedItemTooltips) { + this.renderComponentTooltip(p_282584_, hoverevent$entitytooltipinfo.getTooltipLines(), p_283623_, p_282114_); + } + + return; +- case HoverEvent.ShowText hoverevent$showtext: +- HoverEvent.ShowText hoverevent$showtext1 = hoverevent$showtext; +- +- try { +- component1 = hoverevent$showtext1.text(); +- } catch (Throwable throwable) { +- throwable4 = throwable; +- boolean flag2 = false; +- break; +- } +- +- Component component = component1; ++ case HoverEvent.ShowText(Component component): + this.renderTooltip(p_282584_, p_282584_.split(component, Math.max(this.guiWidth() / 2, 200)), p_283623_, p_282114_); + return; + default: + return; + } +- +- Throwable throwable3 = throwable4; +- throw new MatchException(throwable3.toString(), throwable3); + } + } + diff --git a/versions/snapshot/1.21/25w02a/patches/client/net/minecraft/client/gui/screens/Screen.java.patch b/versions/snapshot/1.21/25w02a/patches/client/net/minecraft/client/gui/screens/Screen.java.patch new file mode 100644 index 00000000..d56cd80e --- /dev/null +++ b/versions/snapshot/1.21/25w02a/patches/client/net/minecraft/client/gui/screens/Screen.java.patch @@ -0,0 +1,86 @@ +--- a/net/minecraft/client/gui/screens/Screen.java ++++ b/net/minecraft/client/gui/screens/Screen.java +@@ -257,18 +257,7 @@ + Objects.requireNonNull(clickevent); + Throwable throwable5; + switch (clickevent) { +- case ClickEvent.OpenUrl clickevent$openurl: +- ClickEvent.OpenUrl clickevent$openurl1 = clickevent$openurl; +- +- try { +- uri1 = clickevent$openurl1.uri(); +- } catch (Throwable throwable4) { +- throwable5 = throwable4; +- boolean flag2 = false; +- break; +- } +- +- URI uri = uri1; ++ case ClickEvent.OpenUrl(URI uri): + if (!this.minecraft.options.chatLinks().get()) { + return false; + } +@@ -289,32 +278,10 @@ + case ClickEvent.OpenFile clickevent$openfile: + Util.getPlatform().openFile(clickevent$openfile.file()); + return true; +- case ClickEvent.SuggestCommand clickevent$suggestcommand: +- ClickEvent.SuggestCommand clickevent$suggestcommand1 = clickevent$suggestcommand; +- +- try { +- s6 = clickevent$suggestcommand1.command(); +- } catch (Throwable throwable3) { +- throwable5 = throwable3; +- boolean flag1 = false; +- break; +- } +- +- String s2 = s6; ++ case ClickEvent.SuggestCommand(String s2): + this.insertText(s2, true); + return true; +- case ClickEvent.RunCommand clickevent$runcommand: +- ClickEvent.RunCommand clickevent$runcommand1 = clickevent$runcommand; +- +- try { +- s5 = clickevent$runcommand1.command(); +- } catch (Throwable throwable2) { +- throwable5 = throwable2; +- boolean flag = false; +- break; +- } +- +- String s3 = s5; ++ case ClickEvent.RunCommand(String s3): + String s = s3; + if (s3.startsWith("/")) { + s = s3.substring(1); +@@ -325,27 +292,13 @@ + } + + return true; +- case ClickEvent.CopyToClipboard clickevent$copytoclipboard: +- ClickEvent.CopyToClipboard clickevent$copytoclipboard1 = clickevent$copytoclipboard; +- +- try { +- s4 = clickevent$copytoclipboard1.value(); +- } catch (Throwable throwable1) { +- throwable5 = throwable1; +- boolean flag3 = false; +- break; +- } +- +- String s1 = s4; ++ case ClickEvent.CopyToClipboard(String s1): + this.minecraft.keyboardHandler.setClipboard(s1); + return true; + default: + LOGGER.error("Don't know how to handle {}", clickevent); + return true; + } +- +- Throwable throwable = throwable5; +- throw new MatchException(throwable.toString(), throwable); + } + + return false; diff --git a/versions/snapshot/1.21/25w02a/patches/client/net/minecraft/client/gui/screens/inventory/BookViewScreen.java.patch b/versions/snapshot/1.21/25w02a/patches/client/net/minecraft/client/gui/screens/inventory/BookViewScreen.java.patch index 4b4fb8f4..2c0669ab 100644 --- a/versions/snapshot/1.21/25w02a/patches/client/net/minecraft/client/gui/screens/inventory/BookViewScreen.java.patch +++ b/versions/snapshot/1.21/25w02a/patches/client/net/minecraft/client/gui/screens/inventory/BookViewScreen.java.patch @@ -1,6 +1,24 @@ --- a/net/minecraft/client/gui/screens/inventory/BookViewScreen.java +++ b/net/minecraft/client/gui/screens/inventory/BookViewScreen.java -@@ -257,7 +257,7 @@ +@@ -191,16 +191,7 @@ + ClickEvent clickevent = p_98293_.getClickEvent(); + if (clickevent == null) { + return false; +- } else if (clickevent instanceof ClickEvent.ChangePage clickevent$changepage) { +- ClickEvent.ChangePage clickevent$changepage1 = clickevent$changepage; +- +- try { +- j = clickevent$changepage1.page(); +- } catch (Throwable throwable) { +- throw new MatchException(throwable.toString(), throwable); +- } +- +- int i = j; ++ } else if (clickevent instanceof ClickEvent.ChangePage(int i)) { + return this.forcePage(i - 1); + } else { + boolean flag = super.handleComponentClicked(p_98293_); +@@ -259,7 +250,7 @@ return new BookViewScreen.BookAccess(writtenbookcontent.getPages(flag)); } else { WritableBookContent writablebookcontent = p_98309_.get(DataComponents.WRITABLE_BOOK_CONTENT); diff --git a/versions/snapshot/1.21/25w02a/patches/client/net/minecraft/client/multiplayer/ClientLevel.java.patch b/versions/snapshot/1.21/25w02a/patches/client/net/minecraft/client/multiplayer/ClientLevel.java.patch index 4fb6d566..f66c1225 100644 --- a/versions/snapshot/1.21/25w02a/patches/client/net/minecraft/client/multiplayer/ClientLevel.java.patch +++ b/versions/snapshot/1.21/25w02a/patches/client/net/minecraft/client/multiplayer/ClientLevel.java.patch @@ -1,6 +1,6 @@ --- a/net/minecraft/client/multiplayer/ClientLevel.java +++ b/net/minecraft/client/multiplayer/ClientLevel.java -@@ -1092,6 +1092,7 @@ +@@ -1106,6 +1106,7 @@ case EnderDragon enderdragon: ClientLevel.this.dragonParts.addAll(Arrays.asList(enderdragon.getSubEntities())); break; @@ -8,7 +8,7 @@ } } -@@ -1105,6 +1106,7 @@ +@@ -1119,6 +1120,7 @@ case EnderDragon enderdragon: ClientLevel.this.dragonParts.removeAll(Arrays.asList(enderdragon.getSubEntities())); break; diff --git a/versions/snapshot/1.21/25w02a/patches/client/net/minecraft/client/renderer/PostChain.java.patch b/versions/snapshot/1.21/25w02a/patches/client/net/minecraft/client/renderer/PostChain.java.patch index 039c8484..b43d6b43 100644 --- a/versions/snapshot/1.21/25w02a/patches/client/net/minecraft/client/renderer/PostChain.java.patch +++ b/versions/snapshot/1.21/25w02a/patches/client/net/minecraft/client/renderer/PostChain.java.patch @@ -1,6 +1,6 @@ --- a/net/minecraft/client/renderer/PostChain.java +++ b/net/minecraft/client/renderer/PostChain.java -@@ -70,121 +70,18 @@ +@@ -67,121 +67,18 @@ for (PostChainConfig.Input postchainconfig$input : p_361826_.inputs()) { Objects.requireNonNull(postchainconfig$input); @@ -124,7 +124,7 @@ } return postpass; -@@ -201,43 +98,8 @@ +@@ -198,43 +95,8 @@ for (Entry entry : this.internalTargets.entrySet()) { ResourceLocation resourcelocation1 = entry.getKey(); @@ -167,6 +167,6 @@ - int j = l; + RenderTargetDescriptor rendertargetdescriptor = switch (entry.getValue()) { + case PostChainConfig.FixedSizedTarget(int i, int j) -> { - yield new RenderTargetDescriptor(i, j, true); + yield new RenderTargetDescriptor(i, j, true, 0); } - case PostChainConfig.FullScreenTarget postchainconfig$fullscreentarget -> new RenderTargetDescriptor(p_361423_, p_362735_, true); + case PostChainConfig.FullScreenTarget postchainconfig$fullscreentarget -> new RenderTargetDescriptor(p_361423_, p_362735_, true, 0); diff --git a/versions/snapshot/1.21/25w02a/patches/joined/net/minecraft/client/Minecraft.java.patch b/versions/snapshot/1.21/25w02a/patches/joined/net/minecraft/client/Minecraft.java.patch index e08ff3b7..91d455fd 100644 --- a/versions/snapshot/1.21/25w02a/patches/joined/net/minecraft/client/Minecraft.java.patch +++ b/versions/snapshot/1.21/25w02a/patches/joined/net/minecraft/client/Minecraft.java.patch @@ -1,6 +1,6 @@ --- a/net/minecraft/client/Minecraft.java +++ b/net/minecraft/client/Minecraft.java -@@ -2208,6 +2208,7 @@ +@@ -2216,6 +2216,7 @@ case EntityHitResult entityhitresult: this.gameMode.handlePickItemFromEntity(entityhitresult.getEntity(), flag); break; @@ -8,7 +8,7 @@ } } } -@@ -2302,7 +2303,7 @@ +@@ -2310,7 +2311,7 @@ } public CompletableFuture delayTextureReload() { diff --git a/versions/snapshot/1.21/25w02a/patches/joined/net/minecraft/client/gui/GuiGraphics.java.patch b/versions/snapshot/1.21/25w02a/patches/joined/net/minecraft/client/gui/GuiGraphics.java.patch new file mode 100644 index 00000000..41da3de1 --- /dev/null +++ b/versions/snapshot/1.21/25w02a/patches/joined/net/minecraft/client/gui/GuiGraphics.java.patch @@ -0,0 +1,63 @@ +--- a/net/minecraft/client/gui/GuiGraphics.java ++++ b/net/minecraft/client/gui/GuiGraphics.java +@@ -1023,57 +1023,21 @@ + Object object = hoverevent; + Throwable throwable4; + switch (object) { +- case HoverEvent.ShowItem hoverevent$showitem: +- HoverEvent.ShowItem hoverevent$showitem1 = hoverevent$showitem; +- +- try { +- itemstack1 = hoverevent$showitem1.item(); +- } catch (Throwable throwable2) { +- throwable4 = throwable2; +- boolean flag1 = false; +- break; +- } +- +- ItemStack itemstack = itemstack1; ++ case HoverEvent.ShowItem(ItemStack itemstack): + this.renderTooltip(p_282584_, itemstack, p_283623_, p_282114_); + return; +- case HoverEvent.ShowEntity hoverevent$showentity: +- HoverEvent.ShowEntity hoverevent$showentity1 = hoverevent$showentity; +- +- try { +- hoverevent$entitytooltipinfo1 = hoverevent$showentity1.entity(); +- } catch (Throwable throwable1) { +- throwable4 = throwable1; +- boolean flag = false; +- break; +- } +- +- HoverEvent.EntityTooltipInfo hoverevent$entitytooltipinfo = hoverevent$entitytooltipinfo1; ++ case HoverEvent.ShowEntity(HoverEvent.EntityTooltipInfo hoverevent$entitytooltipinfo): + if (this.minecraft.options.advancedItemTooltips) { + this.renderComponentTooltip(p_282584_, hoverevent$entitytooltipinfo.getTooltipLines(), p_283623_, p_282114_); + } + + return; +- case HoverEvent.ShowText hoverevent$showtext: +- HoverEvent.ShowText hoverevent$showtext1 = hoverevent$showtext; +- +- try { +- component1 = hoverevent$showtext1.text(); +- } catch (Throwable throwable) { +- throwable4 = throwable; +- boolean flag2 = false; +- break; +- } +- +- Component component = component1; ++ case HoverEvent.ShowText(Component component): + this.renderTooltip(p_282584_, p_282584_.split(component, Math.max(this.guiWidth() / 2, 200)), p_283623_, p_282114_); + return; + default: + return; + } +- +- Throwable throwable3 = throwable4; +- throw new MatchException(throwable3.toString(), throwable3); + } + } + diff --git a/versions/snapshot/1.21/25w02a/patches/joined/net/minecraft/client/gui/screens/Screen.java.patch b/versions/snapshot/1.21/25w02a/patches/joined/net/minecraft/client/gui/screens/Screen.java.patch new file mode 100644 index 00000000..40c48626 --- /dev/null +++ b/versions/snapshot/1.21/25w02a/patches/joined/net/minecraft/client/gui/screens/Screen.java.patch @@ -0,0 +1,86 @@ +--- a/net/minecraft/client/gui/screens/Screen.java ++++ b/net/minecraft/client/gui/screens/Screen.java +@@ -260,18 +260,7 @@ + Objects.requireNonNull(clickevent); + Throwable throwable5; + switch (clickevent) { +- case ClickEvent.OpenUrl clickevent$openurl: +- ClickEvent.OpenUrl clickevent$openurl1 = clickevent$openurl; +- +- try { +- uri1 = clickevent$openurl1.uri(); +- } catch (Throwable throwable4) { +- throwable5 = throwable4; +- boolean flag2 = false; +- break; +- } +- +- URI uri = uri1; ++ case ClickEvent.OpenUrl(URI uri): + if (!this.minecraft.options.chatLinks().get()) { + return false; + } +@@ -292,32 +281,10 @@ + case ClickEvent.OpenFile clickevent$openfile: + Util.getPlatform().openFile(clickevent$openfile.file()); + return true; +- case ClickEvent.SuggestCommand clickevent$suggestcommand: +- ClickEvent.SuggestCommand clickevent$suggestcommand1 = clickevent$suggestcommand; +- +- try { +- s6 = clickevent$suggestcommand1.command(); +- } catch (Throwable throwable3) { +- throwable5 = throwable3; +- boolean flag1 = false; +- break; +- } +- +- String s2 = s6; ++ case ClickEvent.SuggestCommand(String s2): + this.insertText(s2, true); + return true; +- case ClickEvent.RunCommand clickevent$runcommand: +- ClickEvent.RunCommand clickevent$runcommand1 = clickevent$runcommand; +- +- try { +- s5 = clickevent$runcommand1.command(); +- } catch (Throwable throwable2) { +- throwable5 = throwable2; +- boolean flag = false; +- break; +- } +- +- String s3 = s5; ++ case ClickEvent.RunCommand(String s3): + String s = s3; + if (s3.startsWith("/")) { + s = s3.substring(1); +@@ -328,27 +295,13 @@ + } + + return true; +- case ClickEvent.CopyToClipboard clickevent$copytoclipboard: +- ClickEvent.CopyToClipboard clickevent$copytoclipboard1 = clickevent$copytoclipboard; +- +- try { +- s4 = clickevent$copytoclipboard1.value(); +- } catch (Throwable throwable1) { +- throwable5 = throwable1; +- boolean flag3 = false; +- break; +- } +- +- String s1 = s4; ++ case ClickEvent.CopyToClipboard(String s1): + this.minecraft.keyboardHandler.setClipboard(s1); + return true; + default: + LOGGER.error("Don't know how to handle {}", clickevent); + return true; + } +- +- Throwable throwable = throwable5; +- throw new MatchException(throwable.toString(), throwable); + } + + return false; diff --git a/versions/snapshot/1.21/25w02a/patches/joined/net/minecraft/client/gui/screens/inventory/BookViewScreen.java.patch b/versions/snapshot/1.21/25w02a/patches/joined/net/minecraft/client/gui/screens/inventory/BookViewScreen.java.patch index 7e08cb36..542253d2 100644 --- a/versions/snapshot/1.21/25w02a/patches/joined/net/minecraft/client/gui/screens/inventory/BookViewScreen.java.patch +++ b/versions/snapshot/1.21/25w02a/patches/joined/net/minecraft/client/gui/screens/inventory/BookViewScreen.java.patch @@ -1,6 +1,24 @@ --- a/net/minecraft/client/gui/screens/inventory/BookViewScreen.java +++ b/net/minecraft/client/gui/screens/inventory/BookViewScreen.java -@@ -261,7 +261,7 @@ +@@ -194,16 +194,7 @@ + ClickEvent clickevent = p_98293_.getClickEvent(); + if (clickevent == null) { + return false; +- } else if (clickevent instanceof ClickEvent.ChangePage clickevent$changepage) { +- ClickEvent.ChangePage clickevent$changepage1 = clickevent$changepage; +- +- try { +- j = clickevent$changepage1.page(); +- } catch (Throwable throwable) { +- throw new MatchException(throwable.toString(), throwable); +- } +- +- int i = j; ++ } else if (clickevent instanceof ClickEvent.ChangePage(int i)) { + return this.forcePage(i - 1); + } else { + boolean flag = super.handleComponentClicked(p_98293_); +@@ -263,7 +254,7 @@ return new BookViewScreen.BookAccess(writtenbookcontent.getPages(flag)); } else { WritableBookContent writablebookcontent = p_98309_.get(DataComponents.WRITABLE_BOOK_CONTENT); diff --git a/versions/snapshot/1.21/25w02a/patches/joined/net/minecraft/client/multiplayer/ClientLevel.java.patch b/versions/snapshot/1.21/25w02a/patches/joined/net/minecraft/client/multiplayer/ClientLevel.java.patch index a631893e..b4e55ddc 100644 --- a/versions/snapshot/1.21/25w02a/patches/joined/net/minecraft/client/multiplayer/ClientLevel.java.patch +++ b/versions/snapshot/1.21/25w02a/patches/joined/net/minecraft/client/multiplayer/ClientLevel.java.patch @@ -1,6 +1,6 @@ --- a/net/minecraft/client/multiplayer/ClientLevel.java +++ b/net/minecraft/client/multiplayer/ClientLevel.java -@@ -1097,6 +1097,7 @@ +@@ -1111,6 +1111,7 @@ case EnderDragon enderdragon: ClientLevel.this.dragonParts.addAll(Arrays.asList(enderdragon.getSubEntities())); break; @@ -8,7 +8,7 @@ } } -@@ -1110,6 +1111,7 @@ +@@ -1124,6 +1125,7 @@ case EnderDragon enderdragon: ClientLevel.this.dragonParts.removeAll(Arrays.asList(enderdragon.getSubEntities())); break; diff --git a/versions/snapshot/1.21/25w02a/patches/joined/net/minecraft/client/renderer/PostChain.java.patch b/versions/snapshot/1.21/25w02a/patches/joined/net/minecraft/client/renderer/PostChain.java.patch index 3fdc71cd..e2318192 100644 --- a/versions/snapshot/1.21/25w02a/patches/joined/net/minecraft/client/renderer/PostChain.java.patch +++ b/versions/snapshot/1.21/25w02a/patches/joined/net/minecraft/client/renderer/PostChain.java.patch @@ -1,6 +1,6 @@ --- a/net/minecraft/client/renderer/PostChain.java +++ b/net/minecraft/client/renderer/PostChain.java -@@ -73,121 +73,18 @@ +@@ -70,121 +70,18 @@ for (PostChainConfig.Input postchainconfig$input : p_361826_.inputs()) { Objects.requireNonNull(postchainconfig$input); @@ -124,7 +124,7 @@ } return postpass; -@@ -204,43 +101,8 @@ +@@ -201,43 +98,8 @@ for (Entry entry : this.internalTargets.entrySet()) { ResourceLocation resourcelocation1 = entry.getKey(); @@ -167,6 +167,6 @@ - int j = l; + RenderTargetDescriptor rendertargetdescriptor = switch (entry.getValue()) { + case PostChainConfig.FixedSizedTarget(int i, int j) -> { - yield new RenderTargetDescriptor(i, j, true); + yield new RenderTargetDescriptor(i, j, true, 0); } - case PostChainConfig.FullScreenTarget postchainconfig$fullscreentarget -> new RenderTargetDescriptor(p_361423_, p_362735_, true); + case PostChainConfig.FullScreenTarget postchainconfig$fullscreentarget -> new RenderTargetDescriptor(p_361423_, p_362735_, true, 0); diff --git a/versions/snapshot/1.21/25w02a/patches/shared/net/minecraft/Util.java.patch b/versions/snapshot/1.21/25w02a/patches/shared/net/minecraft/Util.java.patch index f9d15833..7e6c354a 100644 --- a/versions/snapshot/1.21/25w02a/patches/shared/net/minecraft/Util.java.patch +++ b/versions/snapshot/1.21/25w02a/patches/shared/net/minecraft/Util.java.patch @@ -1,7 +1,7 @@ --- a/net/minecraft/Util.java +++ b/net/minecraft/Util.java -@@ -563,7 +563,7 @@ - public static , V> EnumMap makeEnumMap(Class p_371641_, Function p_371671_) { +@@ -564,7 +564,7 @@ + public static , V> Map makeEnumMap(Class p_371641_, Function p_371671_) { EnumMap enummap = new EnumMap<>(p_371641_); - for (K k : (Enum[])p_371641_.getEnumConstants()) { diff --git a/versions/snapshot/1.21/25w02a/patches/shared/net/minecraft/advancements/critereon/EntitySubPredicates.java.patch b/versions/snapshot/1.21/25w02a/patches/shared/net/minecraft/advancements/critereon/EntitySubPredicates.java.patch index a904fbf5..8b16c926 100644 --- a/versions/snapshot/1.21/25w02a/patches/shared/net/minecraft/advancements/critereon/EntitySubPredicates.java.patch +++ b/versions/snapshot/1.21/25w02a/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 @@ +@@ -184,7 +184,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 @@ +@@ -227,7 +227,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/25w02a/patches/shared/net/minecraft/commands/Commands.java.patch b/versions/snapshot/1.21/25w02a/patches/shared/net/minecraft/commands/Commands.java.patch index 25abde22..175451e2 100644 --- a/versions/snapshot/1.21/25w02a/patches/shared/net/minecraft/commands/Commands.java.patch +++ b/versions/snapshot/1.21/25w02a/patches/shared/net/minecraft/commands/Commands.java.patch @@ -1,6 +1,6 @@ --- a/net/minecraft/commands/Commands.java +++ b/net/minecraft/commands/Commands.java -@@ -379,7 +379,7 @@ +@@ -378,7 +378,7 @@ ) { for (CommandNode commandnode : p_82113_.getChildren()) { if (commandnode.canUse(p_82115_)) { diff --git a/versions/snapshot/1.21/25w02a/patches/shared/net/minecraft/core/registries/BuiltInRegistries.java.patch b/versions/snapshot/1.21/25w02a/patches/shared/net/minecraft/core/registries/BuiltInRegistries.java.patch index d10657c3..f29ee66d 100644 --- a/versions/snapshot/1.21/25w02a/patches/shared/net/minecraft/core/registries/BuiltInRegistries.java.patch +++ b/versions/snapshot/1.21/25w02a/patches/shared/net/minecraft/core/registries/BuiltInRegistries.java.patch @@ -1,6 +1,6 @@ --- a/net/minecraft/core/registries/BuiltInRegistries.java +++ b/net/minecraft/core/registries/BuiltInRegistries.java -@@ -325,7 +325,7 @@ +@@ -327,7 +327,7 @@ Bootstrap.checkBootstrapCalled(() -> "registry " + p_259230_.location()); ResourceLocation resourcelocation = p_259230_.location(); LOADERS.put(resourcelocation, () -> p_259210_.run(p_260327_)); diff --git a/versions/snapshot/1.21/25w02a/patches/shared/net/minecraft/nbt/TagParser.java.patch b/versions/snapshot/1.21/25w02a/patches/shared/net/minecraft/nbt/TagParser.java.patch index ff506741..1bf6a23d 100644 --- a/versions/snapshot/1.21/25w02a/patches/shared/net/minecraft/nbt/TagParser.java.patch +++ b/versions/snapshot/1.21/25w02a/patches/shared/net/minecraft/nbt/TagParser.java.patch @@ -1,6 +1,6 @@ --- a/net/minecraft/nbt/TagParser.java +++ b/net/minecraft/nbt/TagParser.java -@@ -253,11 +253,11 @@ +@@ -259,11 +259,11 @@ } if (p_129363_ == ByteTag.TYPE) { diff --git a/versions/snapshot/1.21/25w02a/patches/shared/net/minecraft/network/chat/ComponentUtils.java.patch b/versions/snapshot/1.21/25w02a/patches/shared/net/minecraft/network/chat/ComponentUtils.java.patch new file mode 100644 index 00000000..0a985401 --- /dev/null +++ b/versions/snapshot/1.21/25w02a/patches/shared/net/minecraft/network/chat/ComponentUtils.java.patch @@ -0,0 +1,22 @@ +--- a/net/minecraft/network/chat/ComponentUtils.java ++++ b/net/minecraft/network/chat/ComponentUtils.java +@@ -54,17 +54,8 @@ + } + + private static Style resolveStyle(@Nullable CommandSourceStack p_130737_, Style p_130738_, @Nullable Entity p_130739_, int p_130740_) throws CommandSyntaxException { +- if (p_130738_.getHoverEvent() instanceof HoverEvent.ShowText hoverevent$showtext) { +- HoverEvent.ShowText hoverevent$showtext1 = hoverevent$showtext; +- +- try { +- component = hoverevent$showtext1.text(); +- } catch (Throwable throwable) { +- throw new MatchException(throwable.toString(), throwable); +- } +- +- HoverEvent hoverevent = component; +- hoverevent = new HoverEvent.ShowText(updateForEntity(p_130737_, hoverevent, p_130739_, p_130740_ + 1)); ++ if (p_130738_.getHoverEvent() instanceof HoverEvent.ShowText(Component component)) { ++ HoverEvent hoverevent = new HoverEvent.ShowText(updateForEntity(p_130737_, component, p_130739_, p_130740_ + 1)); + return p_130738_.withHoverEvent(hoverevent); + } else { + return p_130738_; diff --git a/versions/snapshot/1.21/25w02a/patches/shared/net/minecraft/network/syncher/EntityDataSerializers.java.patch b/versions/snapshot/1.21/25w02a/patches/shared/net/minecraft/network/syncher/EntityDataSerializers.java.patch new file mode 100644 index 00000000..5cffbb99 --- /dev/null +++ b/versions/snapshot/1.21/25w02a/patches/shared/net/minecraft/network/syncher/EntityDataSerializers.java.patch @@ -0,0 +1,11 @@ +--- a/net/minecraft/network/syncher/EntityDataSerializers.java ++++ b/net/minecraft/network/syncher/EntityDataSerializers.java +@@ -86,7 +86,7 @@ + ); + public static final EntityDataSerializer DIRECTION = EntityDataSerializer.forValueType(Direction.STREAM_CODEC); + public static final EntityDataSerializer>> OPTIONAL_LIVING_ENTITY_REFERENCE = EntityDataSerializer.forValueType( +- EntityReference.streamCodec().apply(ByteBufCodecs::optional) ++ EntityReference.streamCodec().apply(ByteBufCodecs::optional) + ); + public static final EntityDataSerializer> OPTIONAL_GLOBAL_POS = EntityDataSerializer.forValueType( + GlobalPos.STREAM_CODEC.apply(ByteBufCodecs::optional) diff --git a/versions/snapshot/1.21/25w02a/patches/shared/net/minecraft/resources/RegistryDataLoader.java.patch b/versions/snapshot/1.21/25w02a/patches/shared/net/minecraft/resources/RegistryDataLoader.java.patch index ab4a3be0..4e76882c 100644 --- a/versions/snapshot/1.21/25w02a/patches/shared/net/minecraft/resources/RegistryDataLoader.java.patch +++ b/versions/snapshot/1.21/25w02a/patches/shared/net/minecraft/resources/RegistryDataLoader.java.patch @@ -1,6 +1,6 @@ --- a/net/minecraft/resources/RegistryDataLoader.java +++ b/net/minecraft/resources/RegistryDataLoader.java -@@ -74,7 +74,7 @@ +@@ -75,7 +75,7 @@ public class RegistryDataLoader { private static final Logger LOGGER = LogUtils.getLogger(); diff --git a/versions/snapshot/1.21/25w02a/patches/shared/net/minecraft/server/MinecraftServer.java.patch b/versions/snapshot/1.21/25w02a/patches/shared/net/minecraft/server/MinecraftServer.java.patch index fc5c1dbe..d8a14088 100644 --- a/versions/snapshot/1.21/25w02a/patches/shared/net/minecraft/server/MinecraftServer.java.patch +++ b/versions/snapshot/1.21/25w02a/patches/shared/net/minecraft/server/MinecraftServer.java.patch @@ -1,6 +1,6 @@ --- a/net/minecraft/server/MinecraftServer.java +++ b/net/minecraft/server/MinecraftServer.java -@@ -883,7 +883,7 @@ +@@ -876,7 +876,7 @@ } } diff --git a/versions/snapshot/1.21/25w02a/patches/shared/net/minecraft/server/level/ServerChunkCache.java.patch b/versions/snapshot/1.21/25w02a/patches/shared/net/minecraft/server/level/ServerChunkCache.java.patch index 264acaad..f3e9d84d 100644 --- a/versions/snapshot/1.21/25w02a/patches/shared/net/minecraft/server/level/ServerChunkCache.java.patch +++ b/versions/snapshot/1.21/25w02a/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 -@@ -600,7 +600,7 @@ +@@ -611,7 +611,7 @@ } @Override diff --git a/versions/snapshot/1.21/25w02a/patches/shared/net/minecraft/server/level/ServerLevel.java.patch b/versions/snapshot/1.21/25w02a/patches/shared/net/minecraft/server/level/ServerLevel.java.patch index 659c1932..94233b5e 100644 --- a/versions/snapshot/1.21/25w02a/patches/shared/net/minecraft/server/level/ServerLevel.java.patch +++ b/versions/snapshot/1.21/25w02a/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 -@@ -1625,7 +1625,7 @@ +@@ -1601,7 +1601,7 @@ return object2intopenhashmap.object2IntEntrySet() .stream() diff --git a/versions/snapshot/1.21/25w02a/patches/shared/net/minecraft/server/network/ServerGamePacketListenerImpl.java.patch b/versions/snapshot/1.21/25w02a/patches/shared/net/minecraft/server/network/ServerGamePacketListenerImpl.java.patch index 99994060..1d14d944 100644 --- a/versions/snapshot/1.21/25w02a/patches/shared/net/minecraft/server/network/ServerGamePacketListenerImpl.java.patch +++ b/versions/snapshot/1.21/25w02a/patches/shared/net/minecraft/server/network/ServerGamePacketListenerImpl.java.patch @@ -17,7 +17,7 @@ && !flag1 && !this.server.isFlightAllowed() && !entity.isNoGravity() -@@ -851,7 +852,7 @@ +@@ -853,7 +854,7 @@ if (itemstack.has(DataComponents.WRITABLE_BOOK_CONTENT)) { ItemStack itemstack1 = itemstack.transmuteCopy(Items.WRITTEN_BOOK); itemstack1.remove(DataComponents.WRITABLE_BOOK_CONTENT); diff --git a/versions/snapshot/1.21/25w02a/patches/shared/net/minecraft/util/ExtraCodecs.java.patch b/versions/snapshot/1.21/25w02a/patches/shared/net/minecraft/util/ExtraCodecs.java.patch index 7debd8b0..c0fdacfa 100644 --- a/versions/snapshot/1.21/25w02a/patches/shared/net/minecraft/util/ExtraCodecs.java.patch +++ b/versions/snapshot/1.21/25w02a/patches/shared/net/minecraft/util/ExtraCodecs.java.patch @@ -1,6 +1,6 @@ --- a/net/minecraft/util/ExtraCodecs.java +++ b/net/minecraft/util/ExtraCodecs.java -@@ -234,7 +234,7 @@ +@@ -253,7 +253,7 @@ P p1 = p_184445_.get(1); return p_184365_.apply(p, p1); }), p_184459_ -> ImmutableList.of(p_184366_.apply((I)p_184459_), p_184367_.apply((I)p_184459_))); @@ -9,7 +9,7 @@ p_184360_ -> p_184360_.group(p_184362_.fieldOf(p_184363_).forGetter(Pair::getFirst), p_184362_.fieldOf(p_184364_).forGetter(Pair::getSecond)) .apply(p_184360_, Pair::of) ) -@@ -545,7 +545,7 @@ +@@ -564,7 +564,7 @@ public RecordBuilder encode(V p_312741_, DynamicOps p_312649_, RecordBuilder p_312297_) { K k = (K)p_312622_.apply(p_312741_); p_312297_.add(p_312812_, p_312848_.encodeStart(p_312649_, k)); diff --git a/versions/snapshot/1.21/25w02a/patches/shared/net/minecraft/util/datafix/DataFixers.java.patch b/versions/snapshot/1.21/25w02a/patches/shared/net/minecraft/util/datafix/DataFixers.java.patch index 28d3733a..f6716f4c 100644 --- a/versions/snapshot/1.21/25w02a/patches/shared/net/minecraft/util/datafix/DataFixers.java.patch +++ b/versions/snapshot/1.21/25w02a/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 -@@ -1105,7 +1105,7 @@ +@@ -1145,7 +1145,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"); -@@ -1145,7 +1145,7 @@ +@@ -1185,7 +1185,7 @@ Schema schema162 = p_14514_.addSchema(3087, SAME_NAMESPACED); p_14514_.addFixer( new EntityVariantFix( diff --git a/versions/snapshot/1.21/25w02a/patches/shared/net/minecraft/world/entity/Entity.java.patch b/versions/snapshot/1.21/25w02a/patches/shared/net/minecraft/world/entity/Entity.java.patch index 531bac6f..4b6a42f3 100644 --- a/versions/snapshot/1.21/25w02a/patches/shared/net/minecraft/world/entity/Entity.java.patch +++ b/versions/snapshot/1.21/25w02a/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 -@@ -492,7 +492,7 @@ +@@ -495,7 +495,7 @@ this.firstTick = false; if (this.level() instanceof ServerLevel serverlevel1 && this instanceof Leashable) { diff --git a/versions/snapshot/1.21/25w02a/patches/shared/net/minecraft/world/entity/TamableAnimal.java.patch b/versions/snapshot/1.21/25w02a/patches/shared/net/minecraft/world/entity/TamableAnimal.java.patch index 31b1b30f..3179885c 100644 --- a/versions/snapshot/1.21/25w02a/patches/shared/net/minecraft/world/entity/TamableAnimal.java.patch +++ b/versions/snapshot/1.21/25w02a/patches/shared/net/minecraft/world/entity/TamableAnimal.java.patch @@ -1,6 +1,6 @@ --- a/net/minecraft/world/entity/TamableAnimal.java +++ b/net/minecraft/world/entity/TamableAnimal.java -@@ -300,7 +300,7 @@ +@@ -296,7 +296,7 @@ } public class TamableAnimalPanicGoal extends PanicGoal { diff --git a/versions/snapshot/1.21/25w02a/patches/shared/net/minecraft/world/entity/animal/Sheep.java.patch b/versions/snapshot/1.21/25w02a/patches/shared/net/minecraft/world/entity/animal/Sheep.java.patch deleted file mode 100644 index b9a47ae7..00000000 --- a/versions/snapshot/1.21/25w02a/patches/shared/net/minecraft/world/entity/animal/Sheep.java.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/net/minecraft/world/entity/animal/Sheep.java -+++ b/net/minecraft/world/entity/animal/Sheep.java -@@ -53,7 +53,7 @@ - private static final int EAT_ANIMATION_TICKS = 40; - private static final EntityDataAccessor DATA_WOOL_ID = SynchedEntityData.defineId(Sheep.class, EntityDataSerializers.BYTE); - private static final Map COLOR_BY_DYE = Maps.newEnumMap( -- Arrays.stream(DyeColor.values()).collect(Collectors.toMap(p_29868_ -> (DyeColor)p_29868_, Sheep::createSheepColor)) -+ Arrays.stream(DyeColor.values()).collect(Collectors.toMap(java.util.function.Function.identity(), Sheep::createSheepColor)) - ); - private int eatAnimationTick; - private EatBlockGoal eatBlockGoal; diff --git a/versions/snapshot/1.21/25w02a/patches/shared/net/minecraft/world/entity/monster/piglin/PiglinAi.java.patch b/versions/snapshot/1.21/25w02a/patches/shared/net/minecraft/world/entity/monster/piglin/PiglinAi.java.patch index 6320bf18..410ee8e8 100644 --- a/versions/snapshot/1.21/25w02a/patches/shared/net/minecraft/world/entity/monster/piglin/PiglinAi.java.patch +++ b/versions/snapshot/1.21/25w02a/patches/shared/net/minecraft/world/entity/monster/piglin/PiglinAi.java.patch @@ -19,7 +19,7 @@ + ImmutableList.>of( avoidRepellent(), SetEntityLookTarget.create(PiglinAi::isPlayerHoldingLovedItem, 14.0F), - StartAttacking.create((p_390260_, p_390261_) -> p_390261_.isAdult(), PiglinAi::findNearestValidAttackTarget), + StartAttacking.create((p_393203_, p_393204_) -> p_393204_.isAdult(), PiglinAi::findNearestValidAttackTarget), - BehaviorBuilder.triggerIf(p_34804_ -> !p_34804_.isDancing(), GoToTargetLocation.create(MemoryModuleType.CELEBRATE_LOCATION, 2, 1.0F)), - BehaviorBuilder.triggerIf(Piglin::isDancing, GoToTargetLocation.create(MemoryModuleType.CELEBRATE_LOCATION, 4, 0.6F)), - new RunOne( diff --git a/versions/snapshot/1.21/25w02a/patches/shared/net/minecraft/world/entity/projectile/AbstractArrow.java.patch b/versions/snapshot/1.21/25w02a/patches/shared/net/minecraft/world/entity/projectile/AbstractArrow.java.patch index 7ea2cc94..12d3b71e 100644 --- a/versions/snapshot/1.21/25w02a/patches/shared/net/minecraft/world/entity/projectile/AbstractArrow.java.patch +++ b/versions/snapshot/1.21/25w02a/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 -@@ -617,9 +617,9 @@ +@@ -626,9 +626,9 @@ super.setOwner(p_36770_); this.pickup = switch (p_36770_) { diff --git a/versions/snapshot/1.21/25w02a/patches/shared/net/minecraft/world/level/block/Block.java.patch b/versions/snapshot/1.21/25w02a/patches/shared/net/minecraft/world/level/block/Block.java.patch new file mode 100644 index 00000000..263f01c2 --- /dev/null +++ b/versions/snapshot/1.21/25w02a/patches/shared/net/minecraft/world/level/block/Block.java.patch @@ -0,0 +1,11 @@ +--- a/net/minecraft/world/level/block/Block.java ++++ b/net/minecraft/world/level/block/Block.java +@@ -535,7 +535,7 @@ + } + + private static , T extends Comparable> S setValueHelper(S p_394311_, Property p_394352_, Object p_394525_) { +- return p_394311_.setValue(p_394352_, (Comparable)p_394525_); ++ return p_394311_.setValue(p_394352_, (T)p_394525_); + } + + @Deprecated diff --git a/versions/snapshot/1.21/25w02a/patches/shared/net/minecraft/world/level/block/entity/SignBlockEntity.java.patch b/versions/snapshot/1.21/25w02a/patches/shared/net/minecraft/world/level/block/entity/SignBlockEntity.java.patch new file mode 100644 index 00000000..55d64d54 --- /dev/null +++ b/versions/snapshot/1.21/25w02a/patches/shared/net/minecraft/world/level/block/entity/SignBlockEntity.java.patch @@ -0,0 +1,21 @@ +--- a/net/minecraft/world/level/block/entity/SignBlockEntity.java ++++ b/net/minecraft/world/level/block/entity/SignBlockEntity.java +@@ -209,17 +209,7 @@ + for (Component component : this.getText(p_278254_).getMessages(p_279304_.isTextFilteringEnabled())) { + Style style = component.getStyle(); + ClickEvent clickevent = style.getClickEvent(); +- if (clickevent instanceof ClickEvent.RunCommand) { +- ClickEvent.RunCommand clickevent$runcommand = (ClickEvent.RunCommand)clickevent; +- ClickEvent.RunCommand clickevent$runcommand1 = clickevent$runcommand; +- +- try { +- s1 = clickevent$runcommand1.command(); +- } catch (Throwable throwable) { +- throw new MatchException(throwable.toString(), throwable); +- } +- +- String s = s1; ++ if (clickevent instanceof ClickEvent.RunCommand(String s)) { + p_279304_.getServer().getCommands().performPrefixedCommand(createCommandSourceStack(p_279304_, p_279201_, p_278282_), s); + flag = true; + } diff --git a/versions/snapshot/1.21/25w02a/patches/shared/net/minecraft/world/level/block/state/StateHolder.java.patch b/versions/snapshot/1.21/25w02a/patches/shared/net/minecraft/world/level/block/state/StateHolder.java.patch index 7764ce50..6602965c 100644 --- a/versions/snapshot/1.21/25w02a/patches/shared/net/minecraft/world/level/block/state/StateHolder.java.patch +++ b/versions/snapshot/1.21/25w02a/patches/shared/net/minecraft/world/level/block/state/StateHolder.java.patch @@ -1,6 +1,6 @@ --- a/net/minecraft/world/level/block/state/StateHolder.java +++ b/net/minecraft/world/level/block/state/StateHolder.java -@@ -133,7 +133,7 @@ +@@ -143,7 +143,7 @@ for (Entry, Comparable> entry : this.values.entrySet()) { Property property = entry.getKey();