Update patches

neoforged · Oct 30, 2024 · 1622955 · 1622955
1 parent a7b8000
commit 1622955
Show file tree

Hide file tree

Showing 14 changed files with 109 additions and 77 deletions.
diff --git a/...hes/client/com/mojang/realmsclient/gui/screens/RealmsSelectWorldTemplateScreen.java.patch b/...hes/client/com/mojang/realmsclient/gui/screens/RealmsSelectWorldTemplateScreen.java.patch
@@ -22,7 +22,7 @@
          LinearLayout linearlayout = this.layout.addToFooter(LinearLayout.horizontal().spacing(10));
          linearlayout.defaultCellSetting().alignHorizontallyCenter();
          this.trailerButton = linearlayout.addChild(Button.builder(TRAILER_BUTTON_NAME, p_89701_ -> this.onTrailer()).width(100).build());
-@@ -367,24 +367,23 @@
+@@ -365,24 +365,23 @@
      }
 
      class WorldTemplateList extends ObjectSelectionList<RealmsSelectWorldTemplateScreen.Entry> {
@@ -54,7 +54,7 @@
                  return true;
              } else {
                  return super.mouseClicked(p_313816_, p_313908_, p_313922_);
-@@ -393,8 +392,8 @@
+@@ -391,8 +390,8 @@
 
          public void setSelected(@Nullable RealmsSelectWorldTemplateScreen.Entry p_313741_) {
              super.setSelected(p_313741_);

diff --git a/versions/snapshot/1.21/24w44a/patches/client/net/minecraft/client/Minecraft.java.patch b/versions/snapshot/1.21/24w44a/patches/client/net/minecraft/client/Minecraft.java.patch
@@ -1,6 +1,14 @@
 --- a/net/minecraft/client/Minecraft.java
 +++ b/net/minecraft/client/Minecraft.java
-@@ -2360,7 +2360,7 @@
+@@ -2210,6 +2210,7 @@
+                 case EntityHitResult entityhitresult:
+                     this.gameMode.handlePickItemFromEntity(entityhitresult.getEntity(), flag);
+                     break;
++                default:
+             }
+         }
+     }
+@@ -2304,7 +2305,7 @@
      }
 
      public CompletableFuture<Void> delayTextureReload() {

diff --git a/versions/snapshot/1.21/24w44a/patches/client/net/minecraft/client/gui/Font.java.patch b/versions/snapshot/1.21/24w44a/patches/client/net/minecraft/client/gui/Font.java.patch
@@ -18,7 +18,7 @@
          );
          p_168646_.accept(font$stringrenderoutput1);
          font$stringrenderoutput1.finish(p_168647_);
-@@ -237,7 +237,7 @@
+@@ -225,7 +225,7 @@
          boolean p_381721_
      ) {
          Font.StringRenderOutput font$stringrenderoutput = new Font.StringRenderOutput(
@@ -27,7 +27,7 @@
          );
          StringDecomposer.iterateFormatted(p_381719_, Style.EMPTY, font$stringrenderoutput);
          return font$stringrenderoutput.finish(p_272632_);
-@@ -257,7 +257,7 @@
+@@ -245,7 +245,7 @@
          boolean p_381718_
      ) {
          Font.StringRenderOutput font$stringrenderoutput = new Font.StringRenderOutput(
@@ -36,15 +36,15 @@
          );
          p_381723_.accept(font$stringrenderoutput);
          return font$stringrenderoutput.finish(p_273532_);
-@@ -338,7 +338,6 @@
+@@ -325,7 +325,6 @@
          }
 
          public StringRenderOutput(
 -            Font param1,
              MultiBufferSource p_181365_,
              float p_181366_,
              float p_181367_,
-@@ -348,11 +347,10 @@
+@@ -335,11 +334,10 @@
              Font.DisplayMode p_181371_,
              int p_181372_
          ) {
@@ -57,15 +57,15 @@
              MultiBufferSource p_379354_,
              float p_380215_,
              float p_380204_,
-@@ -364,7 +362,6 @@
+@@ -351,7 +349,6 @@
              int p_379625_,
              boolean p_381720_
          ) {
 -            this.this$0 = var1;
              this.glyphInstances = new ArrayList<>();
              this.bufferSource = p_379354_;
              this.x = p_380215_;
-@@ -381,8 +378,8 @@
+@@ -367,8 +364,8 @@
 
          @Override
          public boolean accept(int p_92967_, Style p_92968_, int p_92969_) {
@@ -76,7 +76,7 @@
              BakedGlyph bakedglyph = p_92968_.isObfuscated() && p_92969_ != 32 ? fontset.getRandomGlyph(glyphinfo) : fontset.getGlyph(p_92969_);
              boolean flag = p_92968_.isBold();
              TextColor textcolor = p_92968_.getColor();
-@@ -414,7 +411,7 @@
+@@ -400,7 +397,7 @@
                  BakedGlyph.Effect bakedglyph$effect = new BakedGlyph.Effect(
                      p_381032_ - 1.0F, this.y + 9.0F, this.x, this.y - 1.0F, this.getUnderTextEffectDepth(), this.backgroundColor
                  );
@@ -85,7 +85,7 @@
                  VertexConsumer vertexconsumer = this.bufferSource.getBuffer(bakedglyph.renderType(this.mode));
                  bakedglyph.renderEffect(bakedglyph$effect, this.pose, vertexconsumer, this.packedLightCoords);
              }
-@@ -422,7 +419,7 @@
+@@ -408,7 +405,7 @@
              this.renderCharacters();
              if (this.effects != null) {
                  if (bakedglyph == null) {

diff --git a/...apshot/1.21/24w44a/patches/client/net/minecraft/client/multiplayer/ClientLevel.java.patch b/...apshot/1.21/24w44a/patches/client/net/minecraft/client/multiplayer/ClientLevel.java.patch
@@ -0,0 +1,18 @@
+--- a/net/minecraft/client/multiplayer/ClientLevel.java
++++ b/net/minecraft/client/multiplayer/ClientLevel.java
+@@ -1092,6 +1092,7 @@
+                 case EnderDragon enderdragon:
+                     ClientLevel.this.dragonParts.addAll(Arrays.asList(enderdragon.getSubEntities()));
+                     break;
++                default:
+             }
+         }
+
+@@ -1105,6 +1106,7 @@
+                 case EnderDragon enderdragon:
+                     ClientLevel.this.dragonParts.removeAll(Arrays.asList(enderdragon.getSubEntities()));
+                     break;
++                default:
+             }
+         }
+
diff --git a/...ns/snapshot/1.21/24w44a/patches/client/net/minecraft/client/renderer/PostChain.java.patch b/...ns/snapshot/1.21/24w44a/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
-@@ -74,121 +74,18 @@
+@@ -70,121 +70,18 @@
 
          for (PostChainConfig.Input postchainconfig$input : p_361826_.inputs()) {
              Objects.requireNonNull(postchainconfig$input);
@@ -21,14 +21,14 @@
 -                    PostChainConfig.TextureInput postchainconfig$textureinput2 = postchainconfig$textureinput;
 -
 -                    try {
--                        resourcelocation4 = postchainconfig$textureinput2.location();
+-                        resourcelocation3 = postchainconfig$textureinput2.location();
 -                    } catch (Throwable throwable7) {
 -                        throwable10 = throwable7;
 -                        boolean flag10 = false;
 -                        break;
 -                    }
 -
--                    ResourceLocation resourcelocation1 = resourcelocation4;
+-                    ResourceLocation resourcelocation = resourcelocation3;
 -                    PostChainConfig.TextureInput postchainconfig$textureinput3 = postchainconfig$textureinput;
 -
 -                    try {
@@ -62,13 +62,13 @@
 -                    }
 -
 -                    boolean flag = flag5;
-+                case PostChainConfig.TextureInput(String s3, ResourceLocation resourcelocation1, int i, int j, boolean flag):
-                     AbstractTexture abstracttexture = p_364641_.getTexture(resourcelocation1.withPath(p_359199_ -> "textures/effect/" + p_359199_ + ".png"));
++                case PostChainConfig.TextureInput(String s3, ResourceLocation resourcelocation, int i, int j, boolean flag):
+                     AbstractTexture abstracttexture = p_364641_.getTexture(resourcelocation.withPath(p_359199_ -> "textures/effect/" + p_359199_ + ".png"));
                      abstracttexture.setFilter(flag, false);
                      postpass.addInput(new PostPass.TextureInput(s3, abstracttexture, i, j));
                      continue;
--                case PostChainConfig.TargetInput $$15:
--                    PostChainConfig.TargetInput postchainconfig$targetinput4 = $$15;
+-                case PostChainConfig.TargetInput $$14:
+-                    PostChainConfig.TargetInput postchainconfig$targetinput4 = $$14;
 -
 -                    try {
 -                        s4 = postchainconfig$targetinput4.samplerName();
@@ -79,18 +79,18 @@
 -                    }
 -
 -                    String s1 = s4;
--                    PostChainConfig.TargetInput postchainconfig$targetinput1 = $$15;
+-                    PostChainConfig.TargetInput postchainconfig$targetinput1 = $$14;
 -
 -                    try {
--                        resourcelocation3 = postchainconfig$targetinput1.targetId();
+-                        resourcelocation2 = postchainconfig$targetinput1.targetId();
 -                    } catch (Throwable throwable2) {
 -                        throwable10 = throwable2;
 -                        boolean flag6 = false;
 -                        break;
 -                    }
 -
--                    ResourceLocation resourcelocation2 = resourcelocation3;
--                    PostChainConfig.TargetInput postchainconfig$targetinput2 = $$15;
+-                    ResourceLocation resourcelocation1 = resourcelocation2;
+-                    PostChainConfig.TargetInput postchainconfig$targetinput2 = $$14;
 -
 -                    try {
 -                        flag3 = postchainconfig$targetinput2.useDepthBuffer();
@@ -101,7 +101,7 @@
 -                    }
 -
 -                    boolean flag1 = flag3;
--                    PostChainConfig.TargetInput postchainconfig$targetinput3 = $$15;
+-                    PostChainConfig.TargetInput postchainconfig$targetinput3 = $$14;
 -
 -                    try {
 -                        flag4 = postchainconfig$targetinput3.bilinear();
@@ -112,8 +112,8 @@
 -                    }
 -
 -                    boolean flag2 = flag4;
-+                case PostChainConfig.TargetInput(String s1, ResourceLocation resourcelocation2, boolean flag1, boolean flag2):
-                     postpass.addInput(new PostPass.TargetInput(s1, resourcelocation2, flag1, flag2));
++                case PostChainConfig.TargetInput(String s1, ResourceLocation resourcelocation1, boolean flag1, boolean flag2):
+                     postpass.addInput(new PostPass.TargetInput(s1, resourcelocation1, flag1, flag2));
                      continue;
                  default:
                      throw new MatchException(null, null);
@@ -124,7 +124,7 @@
          }
 
          return postpass;
-@@ -205,43 +102,8 @@
+@@ -201,43 +98,8 @@
 
          for (Entry<ResourceLocation, PostChainConfig.InternalTarget> entry : this.internalTargets.entrySet()) {
              ResourceLocation resourcelocation1 = entry.getKey();

diff --git a/...hes/joined/com/mojang/realmsclient/gui/screens/RealmsSelectWorldTemplateScreen.java.patch b/...hes/joined/com/mojang/realmsclient/gui/screens/RealmsSelectWorldTemplateScreen.java.patch
@@ -22,7 +22,7 @@
          LinearLayout linearlayout = this.layout.addToFooter(LinearLayout.horizontal().spacing(10));
          linearlayout.defaultCellSetting().alignHorizontallyCenter();
          this.trailerButton = linearlayout.addChild(Button.builder(TRAILER_BUTTON_NAME, p_89701_ -> this.onTrailer()).width(100).build());
-@@ -372,24 +372,23 @@
+@@ -370,24 +370,23 @@
 
      @OnlyIn(Dist.CLIENT)
      class WorldTemplateList extends ObjectSelectionList<RealmsSelectWorldTemplateScreen.Entry> {
@@ -54,7 +54,7 @@
                  return true;
              } else {
                  return super.mouseClicked(p_313816_, p_313908_, p_313922_);
-@@ -398,8 +397,8 @@
+@@ -396,8 +395,8 @@
 
          public void setSelected(@Nullable RealmsSelectWorldTemplateScreen.Entry p_313741_) {
              super.setSelected(p_313741_);

diff --git a/versions/snapshot/1.21/24w44a/patches/joined/net/minecraft/client/Minecraft.java.patch b/versions/snapshot/1.21/24w44a/patches/joined/net/minecraft/client/Minecraft.java.patch
@@ -1,6 +1,14 @@
 --- a/net/minecraft/client/Minecraft.java
 +++ b/net/minecraft/client/Minecraft.java
-@@ -2363,7 +2363,7 @@
+@@ -2213,6 +2213,7 @@
+                 case EntityHitResult entityhitresult:
+                     this.gameMode.handlePickItemFromEntity(entityhitresult.getEntity(), flag);
+                     break;
++                default:
+             }
+         }
+     }
+@@ -2307,7 +2308,7 @@
      }
 
      public CompletableFuture<Void> delayTextureReload() {

diff --git a/versions/snapshot/1.21/24w44a/patches/joined/net/minecraft/client/gui/Font.java.patch b/versions/snapshot/1.21/24w44a/patches/joined/net/minecraft/client/gui/Font.java.patch
@@ -18,7 +18,7 @@
          );
          p_168646_.accept(font$stringrenderoutput1);
          font$stringrenderoutput1.finish(p_168647_);
-@@ -240,7 +240,7 @@
+@@ -228,7 +228,7 @@
          boolean p_381721_
      ) {
          Font.StringRenderOutput font$stringrenderoutput = new Font.StringRenderOutput(
@@ -27,7 +27,7 @@
          );
          StringDecomposer.iterateFormatted(p_381719_, Style.EMPTY, font$stringrenderoutput);
          return font$stringrenderoutput.finish(p_272632_);
-@@ -260,7 +260,7 @@
+@@ -248,7 +248,7 @@
          boolean p_381718_
      ) {
          Font.StringRenderOutput font$stringrenderoutput = new Font.StringRenderOutput(
@@ -36,15 +36,15 @@
          );
          p_381723_.accept(font$stringrenderoutput);
          return font$stringrenderoutput.finish(p_273532_);
-@@ -343,7 +343,6 @@
+@@ -330,7 +330,6 @@
          }
 
          public StringRenderOutput(
 -            Font param1,
              MultiBufferSource p_181365_,
              float p_181366_,
              float p_181367_,
-@@ -353,11 +352,10 @@
+@@ -340,11 +339,10 @@
              Font.DisplayMode p_181371_,
              int p_181372_
          ) {
@@ -57,15 +57,15 @@
              MultiBufferSource p_379354_,
              float p_380215_,
              float p_380204_,
-@@ -369,7 +367,6 @@
+@@ -356,7 +354,6 @@
              int p_379625_,
              boolean p_381720_
          ) {
 -            this.this$0 = var1;
              this.glyphInstances = new ArrayList<>();
              this.bufferSource = p_379354_;
              this.x = p_380215_;
-@@ -386,8 +383,8 @@
+@@ -372,8 +369,8 @@
 
          @Override
          public boolean accept(int p_92967_, Style p_92968_, int p_92969_) {
@@ -76,7 +76,7 @@
              BakedGlyph bakedglyph = p_92968_.isObfuscated() && p_92969_ != 32 ? fontset.getRandomGlyph(glyphinfo) : fontset.getGlyph(p_92969_);
              boolean flag = p_92968_.isBold();
              TextColor textcolor = p_92968_.getColor();
-@@ -419,7 +416,7 @@
+@@ -405,7 +402,7 @@
                  BakedGlyph.Effect bakedglyph$effect = new BakedGlyph.Effect(
                      p_381032_ - 1.0F, this.y + 9.0F, this.x, this.y - 1.0F, this.getUnderTextEffectDepth(), this.backgroundColor
                  );
@@ -85,7 +85,7 @@
                  VertexConsumer vertexconsumer = this.bufferSource.getBuffer(bakedglyph.renderType(this.mode));
                  bakedglyph.renderEffect(bakedglyph$effect, this.pose, vertexconsumer, this.packedLightCoords);
              }
-@@ -427,7 +424,7 @@
+@@ -413,7 +410,7 @@
              this.renderCharacters();
              if (this.effects != null) {
                  if (bakedglyph == null) {

diff --git a/...apshot/1.21/24w44a/patches/joined/net/minecraft/client/multiplayer/ClientLevel.java.patch b/...apshot/1.21/24w44a/patches/joined/net/minecraft/client/multiplayer/ClientLevel.java.patch
@@ -0,0 +1,18 @@
+--- a/net/minecraft/client/multiplayer/ClientLevel.java
++++ b/net/minecraft/client/multiplayer/ClientLevel.java
+@@ -1097,6 +1097,7 @@
+                 case EnderDragon enderdragon:
+                     ClientLevel.this.dragonParts.addAll(Arrays.asList(enderdragon.getSubEntities()));
+                     break;
++                default:
+             }
+         }
+
+@@ -1110,6 +1111,7 @@
+                 case EnderDragon enderdragon:
+                     ClientLevel.this.dragonParts.removeAll(Arrays.asList(enderdragon.getSubEntities()));
+                     break;
++                default:
+             }
+         }
+