diff --git a/versions/pre/1.21/1.21.2-pre2/patches/client/net/minecraft/client/gui/Font.java.patch b/versions/pre/1.21/1.21.2-pre2/patches/client/net/minecraft/client/gui/Font.java.patch index 77a78102..d2019801 100644 --- a/versions/pre/1.21/1.21.2-pre2/patches/client/net/minecraft/client/gui/Font.java.patch +++ b/versions/pre/1.21/1.21.2-pre2/patches/client/net/minecraft/client/gui/Font.java.patch @@ -9,16 +9,16 @@ ); for (int j = -1; j <= 1; j++) { -@@ -162,7 +162,7 @@ - } +@@ -163,7 +163,7 @@ + font$stringrenderoutput.renderCharacters(); Font.StringRenderOutput font$stringrenderoutput1 = new Font.StringRenderOutput( - this, p_168652_, p_168647_, p_168648_, adjustColor(p_168649_), false, p_254170_, Font.DisplayMode.POLYGON_OFFSET, p_168653_ + p_168652_, p_168647_, p_168648_, adjustColor(p_168649_), false, p_254170_, Font.DisplayMode.POLYGON_OFFSET, p_168653_ ); p_168646_.accept(font$stringrenderoutput1); font$stringrenderoutput1.finish(p_168647_); -@@ -236,7 +236,7 @@ +@@ -237,7 +237,7 @@ int p_273199_ ) { Font.StringRenderOutput font$stringrenderoutput = new Font.StringRenderOutput( @@ -27,7 +27,7 @@ ); StringDecomposer.iterateFormatted(p_273765_, Style.EMPTY, font$stringrenderoutput); return font$stringrenderoutput.finish(p_273532_); -@@ -255,7 +255,7 @@ +@@ -256,7 +256,7 @@ int p_273371_ ) { Font.StringRenderOutput font$stringrenderoutput = new Font.StringRenderOutput( @@ -36,7 +36,7 @@ ); p_273322_.accept(font$stringrenderoutput); return font$stringrenderoutput.finish(p_272632_); -@@ -335,7 +335,6 @@ +@@ -336,7 +336,6 @@ } public StringRenderOutput( @@ -44,7 +44,7 @@ MultiBufferSource p_181365_, float p_181366_, float p_181367_, -@@ -345,11 +344,10 @@ +@@ -346,11 +345,10 @@ Font.DisplayMode p_181371_, int p_181372_ ) { @@ -57,7 +57,7 @@ MultiBufferSource p_379354_, float p_380215_, float p_380204_, -@@ -360,7 +358,6 @@ +@@ -361,7 +359,6 @@ Font.DisplayMode p_380021_, int p_379625_ ) { @@ -65,7 +65,7 @@ this.glyphInstances = new ArrayList<>(); this.bufferSource = p_379354_; this.x = p_380215_; -@@ -376,8 +373,8 @@ +@@ -377,8 +374,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(); -@@ -409,7 +406,7 @@ +@@ -410,7 +407,7 @@ BakedGlyph.Effect bakedglyph$effect = new BakedGlyph.Effect( p_381032_ - 1.0F, this.y + 9.0F, this.x, this.y - 1.0F, -0.01F, this.backgroundColor ); @@ -85,12 +85,12 @@ VertexConsumer vertexconsumer = this.bufferSource.getBuffer(bakedglyph.renderType(this.mode)); bakedglyph.renderEffect(bakedglyph$effect, this.pose, vertexconsumer, this.packedLightCoords); } -@@ -422,7 +419,7 @@ - +@@ -418,7 +415,7 @@ + this.renderCharacters(); if (this.effects != null) { if (bakedglyph == null) { - bakedglyph = this.this$0.getFontSet(Style.DEFAULT_FONT).whiteGlyph(); + bakedglyph = Font.this.getFontSet(Style.DEFAULT_FONT).whiteGlyph(); } - VertexConsumer vertexconsumer2 = this.bufferSource.getBuffer(bakedglyph.renderType(this.mode)); + VertexConsumer vertexconsumer1 = this.bufferSource.getBuffer(bakedglyph.renderType(this.mode)); diff --git a/versions/pre/1.21/1.21.2-pre2/patches/joined/net/minecraft/client/gui/Font.java.patch b/versions/pre/1.21/1.21.2-pre2/patches/joined/net/minecraft/client/gui/Font.java.patch index 7eb18470..76767bf3 100644 --- a/versions/pre/1.21/1.21.2-pre2/patches/joined/net/minecraft/client/gui/Font.java.patch +++ b/versions/pre/1.21/1.21.2-pre2/patches/joined/net/minecraft/client/gui/Font.java.patch @@ -9,16 +9,16 @@ ); for (int j = -1; j <= 1; j++) { -@@ -165,7 +165,7 @@ - } +@@ -166,7 +166,7 @@ + font$stringrenderoutput.renderCharacters(); Font.StringRenderOutput font$stringrenderoutput1 = new Font.StringRenderOutput( - this, p_168652_, p_168647_, p_168648_, adjustColor(p_168649_), false, p_254170_, Font.DisplayMode.POLYGON_OFFSET, p_168653_ + p_168652_, p_168647_, p_168648_, adjustColor(p_168649_), false, p_254170_, Font.DisplayMode.POLYGON_OFFSET, p_168653_ ); p_168646_.accept(font$stringrenderoutput1); font$stringrenderoutput1.finish(p_168647_); -@@ -239,7 +239,7 @@ +@@ -240,7 +240,7 @@ int p_273199_ ) { Font.StringRenderOutput font$stringrenderoutput = new Font.StringRenderOutput( @@ -27,7 +27,7 @@ ); StringDecomposer.iterateFormatted(p_273765_, Style.EMPTY, font$stringrenderoutput); return font$stringrenderoutput.finish(p_273532_); -@@ -258,7 +258,7 @@ +@@ -259,7 +259,7 @@ int p_273371_ ) { Font.StringRenderOutput font$stringrenderoutput = new Font.StringRenderOutput( @@ -36,7 +36,7 @@ ); p_273322_.accept(font$stringrenderoutput); return font$stringrenderoutput.finish(p_272632_); -@@ -340,7 +340,6 @@ +@@ -341,7 +341,6 @@ } public StringRenderOutput( @@ -44,7 +44,7 @@ MultiBufferSource p_181365_, float p_181366_, float p_181367_, -@@ -350,11 +349,10 @@ +@@ -351,11 +350,10 @@ Font.DisplayMode p_181371_, int p_181372_ ) { @@ -57,7 +57,7 @@ MultiBufferSource p_379354_, float p_380215_, float p_380204_, -@@ -365,7 +363,6 @@ +@@ -366,7 +364,6 @@ Font.DisplayMode p_380021_, int p_379625_ ) { @@ -65,7 +65,7 @@ this.glyphInstances = new ArrayList<>(); this.bufferSource = p_379354_; this.x = p_380215_; -@@ -381,8 +378,8 @@ +@@ -382,8 +379,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 @@ +@@ -415,7 +412,7 @@ BakedGlyph.Effect bakedglyph$effect = new BakedGlyph.Effect( p_381032_ - 1.0F, this.y + 9.0F, this.x, this.y - 1.0F, -0.01F, this.backgroundColor ); @@ -85,12 +85,12 @@ VertexConsumer vertexconsumer = this.bufferSource.getBuffer(bakedglyph.renderType(this.mode)); bakedglyph.renderEffect(bakedglyph$effect, this.pose, vertexconsumer, this.packedLightCoords); } -@@ -427,7 +424,7 @@ - +@@ -423,7 +420,7 @@ + this.renderCharacters(); if (this.effects != null) { if (bakedglyph == null) { - bakedglyph = this.this$0.getFontSet(Style.DEFAULT_FONT).whiteGlyph(); + bakedglyph = Font.this.getFontSet(Style.DEFAULT_FONT).whiteGlyph(); } - VertexConsumer vertexconsumer2 = this.bufferSource.getBuffer(bakedglyph.renderType(this.mode)); + VertexConsumer vertexconsumer1 = this.bufferSource.getBuffer(bakedglyph.renderType(this.mode)); diff --git a/versions/pre/1.21/1.21.2-pre2/patches/shared/net/minecraft/server/network/ServerGamePacketListenerImpl.java.patch b/versions/pre/1.21/1.21.2-pre2/patches/shared/net/minecraft/server/network/ServerGamePacketListenerImpl.java.patch index fd7936d0..753e91d2 100644 --- a/versions/pre/1.21/1.21.2-pre2/patches/shared/net/minecraft/server/network/ServerGamePacketListenerImpl.java.patch +++ b/versions/pre/1.21/1.21.2-pre2/patches/shared/net/minecraft/server/network/ServerGamePacketListenerImpl.java.patch @@ -8,7 +8,7 @@ d6 = d3 - entity.getX(); d7 = d4 - entity.getY(); if (d7 > -0.5 || d7 < 0.5) { -@@ -449,7 +450,7 @@ +@@ -450,7 +451,7 @@ Vec3 vec3 = new Vec3(entity.getX() - d0, entity.getY() - d1, entity.getZ() - d2); this.handlePlayerKnownMovement(vec3); this.player.checkMovementStatistics(vec3.x, vec3.y, vec3.z); @@ -17,7 +17,7 @@ && !flag1 && !this.server.isFlightAllowed() && !entity.isNoGravity() -@@ -790,7 +791,7 @@ +@@ -791,7 +792,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/pre/1.21/1.21.2-pre2/patches/shared/net/minecraft/world/entity/Entity.java.patch b/versions/pre/1.21/1.21.2-pre2/patches/shared/net/minecraft/world/entity/Entity.java.patch index ce9e63d9..931116fe 100644 --- a/versions/pre/1.21/1.21.2-pre2/patches/shared/net/minecraft/world/entity/Entity.java.patch +++ b/versions/pre/1.21/1.21.2-pre2/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 -@@ -484,7 +484,7 @@ +@@ -488,7 +488,7 @@ this.firstTick = false; if (this.level() instanceof ServerLevel serverlevel1 && this instanceof Leashable) { diff --git a/versions/pre/1.21/1.21.2-pre2/patches/shared/net/minecraft/world/entity/monster/piglin/PiglinAi.java.patch b/versions/pre/1.21/1.21.2-pre2/patches/shared/net/minecraft/world/entity/monster/piglin/PiglinAi.java.patch index 67c37e58..caae3618 100644 --- a/versions/pre/1.21/1.21.2-pre2/patches/shared/net/minecraft/world/entity/monster/piglin/PiglinAi.java.patch +++ b/versions/pre/1.21/1.21.2-pre2/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_379182_, p_379183_) -> p_379183_.isAdult(), PiglinAi::findNearestValidAttackTarget), + StartAttacking.create((p_381526_, p_381527_) -> p_381527_.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/pre/1.21/1.21.2-pre2/patches/shared/net/minecraft/world/item/AdventureModePredicate.java.patch b/versions/pre/1.21/1.21.2-pre2/patches/shared/net/minecraft/world/item/AdventureModePredicate.java.patch index dc6585a8..692d91e9 100644 --- a/versions/pre/1.21/1.21.2-pre2/patches/shared/net/minecraft/world/item/AdventureModePredicate.java.patch +++ b/versions/pre/1.21/1.21.2-pre2/patches/shared/net/minecraft/world/item/AdventureModePredicate.java.patch @@ -1,6 +1,6 @@ --- a/net/minecraft/world/item/AdventureModePredicate.java +++ b/net/minecraft/world/item/AdventureModePredicate.java -@@ -113,7 +113,7 @@ +@@ -115,7 +115,7 @@ return p_332164_.stream() .flatMap(p_330395_ -> p_330395_.blocks().orElseThrow().stream()) .distinct() diff --git a/versions/pre/1.21/1.21.2-pre2/patches/shared/net/minecraft/world/item/crafting/Ingredient.java.patch b/versions/pre/1.21/1.21.2-pre2/patches/shared/net/minecraft/world/item/crafting/Ingredient.java.patch index fff31ae9..b0f4cff9 100644 --- a/versions/pre/1.21/1.21.2-pre2/patches/shared/net/minecraft/world/item/crafting/Ingredient.java.patch +++ b/versions/pre/1.21/1.21.2-pre2/patches/shared/net/minecraft/world/item/crafting/Ingredient.java.patch @@ -7,5 +7,5 @@ - p_360056_ -> p_360056_.>map(p_360062_ -> p_360062_.values).orElse(HolderSet.direct()) + p_360056_ -> p_360056_.map(p_360062_ -> p_360062_.values).orElse(HolderSet.direct()) ); - public static final Codec> NON_AIR_HOLDER_SET_CODEC = HolderSetCodec.create(Registries.ITEM, ItemStack.ITEM_NON_AIR_CODEC, false); + public static final Codec> NON_AIR_HOLDER_SET_CODEC = HolderSetCodec.create(Registries.ITEM, Item.CODEC, false); public static final Codec CODEC = ExtraCodecs.nonEmptyHolderSet(NON_AIR_HOLDER_SET_CODEC).xmap(Ingredient::new, p_360061_ -> p_360061_.values);