Skip to content

Commit

Permalink
Update patches
Browse files Browse the repository at this point in the history
  • Loading branch information
@coehlrich
coehlrich committed Oct 8, 2024
1 parent f162f49 commit 582db7f
Show file tree
Hide file tree
Showing 14 changed files with 71 additions and 89 deletions.
2 changes: 1 addition & 1 deletion versions/pre/1.21/1.21.2-pre1/patches/client/net/minecraft/client/Minecraft.java.patch
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- a/net/minecraft/client/Minecraft.java
+++ b/net/minecraft/client/Minecraft.java
@@ -2352,7 +2352,7 @@
@@ -2361,7 +2361,7 @@
}

public CompletableFuture<Void> delayTextureReload() {
Expand Down
61 changes: 26 additions & 35 deletions versions/pre/1.21/1.21.2-pre1/patches/client/net/minecraft/client/gui/Font.java.patch
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- a/net/minecraft/client/gui/Font.java
+++ b/net/minecraft/client/gui/Font.java
@@ -138,7 +138,7 @@
@@ -139,7 +139,7 @@
) {
int i = adjustColor(p_168650_);
Font.StringRenderOutput font$stringrenderoutput = new Font.StringRenderOutput(
Expand All @@ -9,42 +9,42 @@
);

for (int j = -1; j <= 1; j++) {
@@ -161,7 +161,7 @@
@@ -162,7 +162,7 @@
}

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();
@@ -235,7 +235,7 @@
font$stringrenderoutput1.finish(p_168647_);
@@ -236,7 +236,7 @@
int p_273199_
) {
Font.StringRenderOutput font$stringrenderoutput = new Font.StringRenderOutput(
- this, p_272595_, p_273532_, p_272783_, p_273217_, p_273727_, p_273583_, p_272734_, p_273610_, p_273199_
+ p_272595_, p_273532_, p_272783_, p_273217_, p_273727_, p_273583_, p_272734_, p_273610_, p_273199_
);
StringDecomposer.iterateFormatted(p_273765_, Style.EMPTY, font$stringrenderoutput);
return font$stringrenderoutput.finish();
@@ -254,7 +254,7 @@
return font$stringrenderoutput.finish(p_273532_);
@@ -255,7 +255,7 @@
int p_273371_
) {
Font.StringRenderOutput font$stringrenderoutput = new Font.StringRenderOutput(
- this, p_273392_, p_272632_, p_273541_, p_273200_, p_273774_, p_273312_, p_273276_, p_272625_, p_273371_
+ p_273392_, p_272632_, p_273541_, p_273200_, p_273774_, p_273312_, p_273276_, p_272625_, p_273371_
);
p_273322_.accept(font$stringrenderoutput);
return font$stringrenderoutput.finish();
@@ -351,7 +351,6 @@
return font$stringrenderoutput.finish(p_272632_);
@@ -335,7 +335,6 @@
}

public StringRenderOutput(
- Font param1,
MultiBufferSource p_181365_,
float p_181366_,
float p_181367_,
@@ -361,11 +360,10 @@
@@ -345,11 +344,10 @@
Font.DisplayMode p_181371_,
int p_181372_
) {
Expand All @@ -57,15 +57,15 @@
MultiBufferSource p_379354_,
float p_380215_,
float p_380204_,
@@ -376,7 +374,6 @@
@@ -360,7 +358,6 @@
Font.DisplayMode p_380021_,
int p_379625_
) {
- this.this$0 = var1;
this.glyphInstances = new ArrayList<>();
this.bufferSource = p_379354_;
this.x = p_380215_;
this.y = p_380204_;
@@ -391,8 +388,8 @@
@@ -376,8 +373,8 @@

@Override
public boolean accept(int p_92967_, Style p_92968_, int p_92969_) {
Expand All @@ -76,30 +76,21 @@
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();
@@ -401,7 +398,7 @@
float f1 = p_92967_ == 0 ? this.x - 1.0F : this.x;
if (this.backgroundColor != 0) {
BakedGlyph.Effect bakedglyph$effect = new BakedGlyph.Effect(f1, this.y + 9.0F, this.x + f, this.y - 1.0F, -0.01F, this.backgroundColor);
- BakedGlyph bakedglyph1 = this.this$0.getFontSet(Style.DEFAULT_FONT).whiteGlyph();
+ BakedGlyph bakedglyph1 = Font.this.getFontSet(Style.DEFAULT_FONT).whiteGlyph();
VertexConsumer vertexconsumer = this.bufferSource.getBuffer(bakedglyph1.renderType(this.mode));
bakedglyph1.renderEffect(bakedglyph$effect, this.pose, vertexconsumer, this.packedLightCoords);
}
@@ -410,7 +407,7 @@
float f2 = flag ? glyphinfo.getBoldOffset() : 0.0F;
float f4 = this.dropShadow ? glyphinfo.getShadowOffset() : 0.0F;
VertexConsumer vertexconsumer1 = this.bufferSource.getBuffer(bakedglyph.renderType(this.mode));
- this.this$0
+ Font.this
.renderChar(bakedglyph, flag, p_92968_.isItalic(), f2, this.x + f4, this.y + f4, this.pose, vertexconsumer1, i, this.packedLightCoords);
@@ -409,7 +406,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
);
- bakedglyph = this.this$0.getFontSet(Style.DEFAULT_FONT).whiteGlyph();
+ bakedglyph = Font.this.getFontSet(Style.DEFAULT_FONT).whiteGlyph();
VertexConsumer vertexconsumer = this.bufferSource.getBuffer(bakedglyph.renderType(this.mode));
bakedglyph.renderEffect(bakedglyph$effect, this.pose, vertexconsumer, this.packedLightCoords);
}
@@ -422,7 +419,7 @@

@@ -429,7 +426,7 @@

public float finish() {
if (this.effects != null) {
- BakedGlyph bakedglyph = this.this$0.getFontSet(Style.DEFAULT_FONT).whiteGlyph();
+ BakedGlyph bakedglyph = Font.this.getFontSet(Style.DEFAULT_FONT).whiteGlyph();
VertexConsumer vertexconsumer = this.bufferSource.getBuffer(bakedglyph.renderType(this.mode));
if (bakedglyph == null) {
- bakedglyph = this.this$0.getFontSet(Style.DEFAULT_FONT).whiteGlyph();
+ bakedglyph = Font.this.getFontSet(Style.DEFAULT_FONT).whiteGlyph();
}

for (BakedGlyph.Effect bakedglyph$effect : this.effects) {
VertexConsumer vertexconsumer2 = this.bufferSource.getBuffer(bakedglyph.renderType(this.mode));
4 changes: 2 additions & 2 deletions ...client/net/minecraft/client/gui/screens/recipebook/CraftingRecipeBookComponent.java.patch
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- a/net/minecraft/client/gui/screens/recipebook/CraftingRecipeBookComponent.java
+++ b/net/minecraft/client/gui/screens/recipebook/CraftingRecipeBookComponent.java
@@ -74,15 +74,14 @@
@@ -75,15 +75,14 @@
);
break;
case ShapelessCraftingRecipeDisplay shapelesscraftingrecipedisplay:
Expand All @@ -9,7 +9,7 @@
int i = Math.min(shapelesscraftingrecipedisplay.ingredients().size(), list.size());

for (int j = 0; j < i; j++) {
p_379930_.setInput(list.get(j), p_379430_, shapelesscraftingrecipedisplay.ingredients().get(j));
p_379930_.setInput(list.get(j), p_380956_, shapelesscraftingrecipedisplay.ingredients().get(j));
}
- break label15;
- }
Expand Down
4 changes: 2 additions & 2 deletions ...ches/client/net/minecraft/client/gui/screens/recipebook/OverlayRecipeComponent.java.patch
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
--- a/net/minecraft/client/gui/screens/recipebook/OverlayRecipeComponent.java
+++ b/net/minecraft/client/gui/screens/recipebook/OverlayRecipeComponent.java
@@ -207,7 +207,6 @@
@@ -199,7 +199,6 @@
);
break;
case ShapelessCraftingRecipeDisplay shapelesscraftingrecipedisplay:
- label19: {
List<SlotDisplay> list1 = shapelesscraftingrecipedisplay.ingredients();

for (int i = 0; i < list1.size(); i++) {
@@ -216,8 +215,8 @@
@@ -208,8 +207,8 @@
list.add(createGridPos(i % 3, i / 3, list2));
}
}
Expand Down
2 changes: 1 addition & 1 deletion versions/pre/1.21/1.21.2-pre1/patches/joined/net/minecraft/client/Minecraft.java.patch
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- a/net/minecraft/client/Minecraft.java
+++ b/net/minecraft/client/Minecraft.java
@@ -2355,7 +2355,7 @@
@@ -2364,7 +2364,7 @@
}

public CompletableFuture<Void> delayTextureReload() {
Expand Down
61 changes: 26 additions & 35 deletions versions/pre/1.21/1.21.2-pre1/patches/joined/net/minecraft/client/gui/Font.java.patch
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- a/net/minecraft/client/gui/Font.java
+++ b/net/minecraft/client/gui/Font.java
@@ -141,7 +141,7 @@
@@ -142,7 +142,7 @@
) {
int i = adjustColor(p_168650_);
Font.StringRenderOutput font$stringrenderoutput = new Font.StringRenderOutput(
Expand All @@ -9,42 +9,42 @@
);

for (int j = -1; j <= 1; j++) {
@@ -164,7 +164,7 @@
@@ -165,7 +165,7 @@
}

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();
@@ -238,7 +238,7 @@
font$stringrenderoutput1.finish(p_168647_);
@@ -239,7 +239,7 @@
int p_273199_
) {
Font.StringRenderOutput font$stringrenderoutput = new Font.StringRenderOutput(
- this, p_272595_, p_273532_, p_272783_, p_273217_, p_273727_, p_273583_, p_272734_, p_273610_, p_273199_
+ p_272595_, p_273532_, p_272783_, p_273217_, p_273727_, p_273583_, p_272734_, p_273610_, p_273199_
);
StringDecomposer.iterateFormatted(p_273765_, Style.EMPTY, font$stringrenderoutput);
return font$stringrenderoutput.finish();
@@ -257,7 +257,7 @@
return font$stringrenderoutput.finish(p_273532_);
@@ -258,7 +258,7 @@
int p_273371_
) {
Font.StringRenderOutput font$stringrenderoutput = new Font.StringRenderOutput(
- this, p_273392_, p_272632_, p_273541_, p_273200_, p_273774_, p_273312_, p_273276_, p_272625_, p_273371_
+ p_273392_, p_272632_, p_273541_, p_273200_, p_273774_, p_273312_, p_273276_, p_272625_, p_273371_
);
p_273322_.accept(font$stringrenderoutput);
return font$stringrenderoutput.finish();
@@ -356,7 +356,6 @@
return font$stringrenderoutput.finish(p_272632_);
@@ -340,7 +340,6 @@
}

public StringRenderOutput(
- Font param1,
MultiBufferSource p_181365_,
float p_181366_,
float p_181367_,
@@ -366,11 +365,10 @@
@@ -350,11 +349,10 @@
Font.DisplayMode p_181371_,
int p_181372_
) {
Expand All @@ -57,15 +57,15 @@
MultiBufferSource p_379354_,
float p_380215_,
float p_380204_,
@@ -381,7 +379,6 @@
@@ -365,7 +363,6 @@
Font.DisplayMode p_380021_,
int p_379625_
) {
- this.this$0 = var1;
this.glyphInstances = new ArrayList<>();
this.bufferSource = p_379354_;
this.x = p_380215_;
this.y = p_380204_;
@@ -396,8 +393,8 @@
@@ -381,8 +378,8 @@

@Override
public boolean accept(int p_92967_, Style p_92968_, int p_92969_) {
Expand All @@ -76,30 +76,21 @@
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();
@@ -406,7 +403,7 @@
float f1 = p_92967_ == 0 ? this.x - 1.0F : this.x;
if (this.backgroundColor != 0) {
BakedGlyph.Effect bakedglyph$effect = new BakedGlyph.Effect(f1, this.y + 9.0F, this.x + f, this.y - 1.0F, -0.01F, this.backgroundColor);
- BakedGlyph bakedglyph1 = this.this$0.getFontSet(Style.DEFAULT_FONT).whiteGlyph();
+ BakedGlyph bakedglyph1 = Font.this.getFontSet(Style.DEFAULT_FONT).whiteGlyph();
VertexConsumer vertexconsumer = this.bufferSource.getBuffer(bakedglyph1.renderType(this.mode));
bakedglyph1.renderEffect(bakedglyph$effect, this.pose, vertexconsumer, this.packedLightCoords);
}
@@ -415,7 +412,7 @@
float f2 = flag ? glyphinfo.getBoldOffset() : 0.0F;
float f4 = this.dropShadow ? glyphinfo.getShadowOffset() : 0.0F;
VertexConsumer vertexconsumer1 = this.bufferSource.getBuffer(bakedglyph.renderType(this.mode));
- this.this$0
+ Font.this
.renderChar(bakedglyph, flag, p_92968_.isItalic(), f2, this.x + f4, this.y + f4, this.pose, vertexconsumer1, i, this.packedLightCoords);
@@ -414,7 +411,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
);
- bakedglyph = this.this$0.getFontSet(Style.DEFAULT_FONT).whiteGlyph();
+ bakedglyph = Font.this.getFontSet(Style.DEFAULT_FONT).whiteGlyph();
VertexConsumer vertexconsumer = this.bufferSource.getBuffer(bakedglyph.renderType(this.mode));
bakedglyph.renderEffect(bakedglyph$effect, this.pose, vertexconsumer, this.packedLightCoords);
}
@@ -427,7 +424,7 @@

@@ -434,7 +431,7 @@

public float finish() {
if (this.effects != null) {
- BakedGlyph bakedglyph = this.this$0.getFontSet(Style.DEFAULT_FONT).whiteGlyph();
+ BakedGlyph bakedglyph = Font.this.getFontSet(Style.DEFAULT_FONT).whiteGlyph();
VertexConsumer vertexconsumer = this.bufferSource.getBuffer(bakedglyph.renderType(this.mode));
if (bakedglyph == null) {
- bakedglyph = this.this$0.getFontSet(Style.DEFAULT_FONT).whiteGlyph();
+ bakedglyph = Font.this.getFontSet(Style.DEFAULT_FONT).whiteGlyph();
}

for (BakedGlyph.Effect bakedglyph$effect : this.effects) {
VertexConsumer vertexconsumer2 = this.bufferSource.getBuffer(bakedglyph.renderType(this.mode));
4 changes: 2 additions & 2 deletions ...joined/net/minecraft/client/gui/screens/recipebook/CraftingRecipeBookComponent.java.patch
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- a/net/minecraft/client/gui/screens/recipebook/CraftingRecipeBookComponent.java
+++ b/net/minecraft/client/gui/screens/recipebook/CraftingRecipeBookComponent.java
@@ -77,15 +77,14 @@
@@ -78,15 +78,14 @@
);
break;
case ShapelessCraftingRecipeDisplay shapelesscraftingrecipedisplay:
Expand All @@ -9,7 +9,7 @@
int i = Math.min(shapelesscraftingrecipedisplay.ingredients().size(), list.size());

for (int j = 0; j < i; j++) {
p_379930_.setInput(list.get(j), p_379430_, shapelesscraftingrecipedisplay.ingredients().get(j));
p_379930_.setInput(list.get(j), p_380956_, shapelesscraftingrecipedisplay.ingredients().get(j));
}
- break label15;
- }
Expand Down
4 changes: 2 additions & 2 deletions ...ches/joined/net/minecraft/client/gui/screens/recipebook/OverlayRecipeComponent.java.patch
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
--- a/net/minecraft/client/gui/screens/recipebook/OverlayRecipeComponent.java
+++ b/net/minecraft/client/gui/screens/recipebook/OverlayRecipeComponent.java
@@ -211,7 +211,6 @@
@@ -203,7 +203,6 @@
);
break;
case ShapelessCraftingRecipeDisplay shapelesscraftingrecipedisplay:
- label19: {
List<SlotDisplay> list1 = shapelesscraftingrecipedisplay.ingredients();

for (int i = 0; i < list1.size(); i++) {
@@ -220,8 +219,8 @@
@@ -212,8 +211,8 @@
list.add(createGridPos(i % 3, i / 3, list2));
}
}
Expand Down
4 changes: 2 additions & 2 deletions ....21/1.21.2-pre1/patches/shared/net/minecraft/core/registries/BuiltInRegistries.java.patch
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
--- a/net/minecraft/core/registries/BuiltInRegistries.java
+++ b/net/minecraft/core/registries/BuiltInRegistries.java
@@ -322,7 +322,7 @@
Bootstrap.checkBootstrapCalled(() -> "registry " + p_259230_);
@@ -325,7 +325,7 @@
Bootstrap.checkBootstrapCalled(() -> "registry " + p_259230_.location());
ResourceLocation resourcelocation = p_259230_.location();
LOADERS.put(resourcelocation, () -> p_259210_.run(p_260327_));
- WRITABLE_REGISTRY.register((ResourceKey<WritableRegistry<?>>)p_259230_, p_260327_, RegistrationInfo.BUILT_IN);
Expand Down
2 changes: 1 addition & 1 deletion ...ns/pre/1.21/1.21.2-pre1/patches/shared/net/minecraft/network/codec/StreamCodec.java.patch
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- a/net/minecraft/network/codec/StreamCodec.java
+++ b/net/minecraft/network/codec/StreamCodec.java
@@ -340,7 +340,7 @@
@@ -388,7 +388,7 @@
}

default <S extends B> StreamCodec<S, V> cast() {
Expand Down
2 changes: 1 addition & 1 deletion ...1.21.2-pre1/patches/shared/net/minecraft/world/entity/projectile/AbstractArrow.java.patch
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- a/net/minecraft/world/entity/projectile/AbstractArrow.java
+++ b/net/minecraft/world/entity/projectile/AbstractArrow.java
@@ -584,9 +584,9 @@
@@ -587,9 +587,9 @@
super.setOwner(p_36770_);

this.pickup = switch (p_36770_) {
Expand Down
2 changes: 1 addition & 1 deletion ...e/1.21/1.21.2-pre1/patches/shared/net/minecraft/world/item/crafting/Ingredient.java.patch
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- a/net/minecraft/world/item/crafting/Ingredient.java
+++ b/net/minecraft/world/item/crafting/Ingredient.java
@@ -30,7 +30,7 @@
@@ -29,7 +29,7 @@
public static final StreamCodec<RegistryFriendlyByteBuf, Optional<Ingredient>> OPTIONAL_CONTENTS_STREAM_CODEC = ByteBufCodecs.holderSet(Registries.ITEM)
.map(
p_360058_ -> p_360058_.size() == 0 ? Optional.empty() : Optional.of(new Ingredient((HolderSet<Item>)p_360058_)),
Expand Down
6 changes: 3 additions & 3 deletions ...1.2-pre1/patches/shared/net/minecraft/world/item/enchantment/ConditionalEffect.java.patch
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
--- a/net/minecraft/world/item/enchantment/ConditionalEffect.java
+++ b/net/minecraft/world/item/enchantment/ConditionalEffect.java
@@ -20,7 +20,7 @@
ValidationContext validationcontext = new ValidationContext(problemreporter$collector, p_345335_);
p_351949_.validate(validationcontext);
ValidationContext validationcontext = new ValidationContext(problemreporter$collector, p_381056_);
p_380866_.validate(validationcontext);
return problemreporter$collector.getReport()
- .map(p_344978_ -> DataResult.error(() -> "Validation error in enchantment effect condition: " + p_344978_))
+ .map(p_344978_ -> DataResult.<LootItemCondition>error(() -> "Validation error in enchantment effect condition: " + p_344978_))
.orElseGet(() -> DataResult.success(p_351949_));
.orElseGet(() -> DataResult.success(p_380866_));
}
);
2 changes: 1 addition & 1 deletion versions/pre/1.21/1.21.2-pre1/patches/shared/net/minecraft/world/level/GameRules.java.patch
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- a/net/minecraft/world/level/GameRules.java
+++ b/net/minecraft/world/level/GameRules.java
@@ -280,8 +280,8 @@
@@ -283,8 +283,8 @@

private <T extends GameRules.Value<T>> void callVisitorCap(GameRules.GameRuleTypeVisitor p_46167_, GameRules.Key<?> p_46168_, GameRules.Type<?> p_46169_) {
if (p_46169_.requiredFeatures.isSubsetOf(this.enabledFeatures)) {
Expand Down

0 comments on commit 582db7f

Please sign in to comment.