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 15, 2024
1 parent 05da8e0 commit 9bc1531
Show file tree
Hide file tree
Showing 4 changed files with 50 additions and 50 deletions.
2 changes: 1 addition & 1 deletion versions/pre/1.21/1.21.2-pre4/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
@@ -2361,7 +2361,7 @@
@@ -2360,7 +2360,7 @@
}

public CompletableFuture<Void> delayTextureReload() {
Expand Down
48 changes: 24 additions & 24 deletions versions/pre/1.21/1.21.2-pre4/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
@@ -139,7 +139,7 @@
@@ -141,7 +141,7 @@
) {
int i = adjustColor(p_168650_);
Font.StringRenderOutput font$stringrenderoutput = new Font.StringRenderOutput(
Expand All @@ -9,7 +9,7 @@
);

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

font$stringrenderoutput.renderCharacters();
Font.StringRenderOutput font$stringrenderoutput1 = new Font.StringRenderOutput(
Expand All @@ -19,53 +19,53 @@
p_168646_.accept(font$stringrenderoutput1);
font$stringrenderoutput1.finish(p_168647_);
@@ -237,7 +237,7 @@
int p_273199_
boolean p_381721_
) {
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_
- this, p_273392_, p_272632_, p_273541_, p_273200_, p_273774_, p_273312_, p_273276_, p_272625_, p_273371_, p_381721_
+ p_273392_, p_272632_, p_273541_, p_273200_, p_273774_, p_273312_, p_273276_, p_272625_, p_273371_, p_381721_
);
StringDecomposer.iterateFormatted(p_273765_, Style.EMPTY, font$stringrenderoutput);
return font$stringrenderoutput.finish(p_273532_);
@@ -256,7 +256,7 @@
int p_273371_
StringDecomposer.iterateFormatted(p_381719_, Style.EMPTY, font$stringrenderoutput);
return font$stringrenderoutput.finish(p_272632_);
@@ -257,7 +257,7 @@
boolean p_381718_
) {
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_
- this, p_272595_, p_273532_, p_272783_, p_273217_, p_273727_, p_273583_, p_272734_, p_273610_, p_273199_, p_381718_
+ p_272595_, p_273532_, p_272783_, p_273217_, p_273727_, p_273583_, p_272734_, p_273610_, p_273199_, p_381718_
);
p_273322_.accept(font$stringrenderoutput);
return font$stringrenderoutput.finish(p_272632_);
@@ -336,7 +336,6 @@
p_381723_.accept(font$stringrenderoutput);
return font$stringrenderoutput.finish(p_273532_);
@@ -338,7 +338,6 @@
}

public StringRenderOutput(
- Font param1,
MultiBufferSource p_181365_,
float p_181366_,
float p_181367_,
@@ -346,11 +345,10 @@
@@ -348,11 +347,10 @@
Font.DisplayMode p_181371_,
int p_181372_
) {
- this(var1, p_181365_, p_181366_, p_181367_, p_181368_, 0, p_181369_, p_254510_, p_181371_, p_181372_);
+ this(p_181365_, p_181366_, p_181367_, p_181368_, 0, p_181369_, p_254510_, p_181371_, p_181372_);
- this(var1, p_181365_, p_181366_, p_181367_, p_181368_, 0, p_181369_, p_254510_, p_181371_, p_181372_, true);
+ this(p_181365_, p_181366_, p_181367_, p_181368_, 0, p_181369_, p_254510_, p_181371_, p_181372_, true);
}

public StringRenderOutput(
- Font param1,
MultiBufferSource p_379354_,
float p_380215_,
float p_380204_,
@@ -361,7 +359,6 @@
Font.DisplayMode p_380021_,
int p_379625_
@@ -364,7 +362,6 @@
int p_379625_,
boolean p_381720_
) {
- this.this$0 = var1;
this.glyphInstances = new ArrayList<>();
this.bufferSource = p_379354_;
this.x = p_380215_;
@@ -377,8 +374,8 @@
@@ -381,8 +378,8 @@

@Override
public boolean accept(int p_92967_, Style p_92968_, int p_92969_) {
Expand All @@ -76,16 +76,16 @@
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();
@@ -410,7 +407,7 @@
@@ -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
p_381032_ - 1.0F, this.y + 9.0F, this.x, this.y - 1.0F, this.getUnderTextEffectDepth(), 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);
}
@@ -418,7 +415,7 @@
@@ -422,7 +419,7 @@
this.renderCharacters();
if (this.effects != null) {
if (bakedglyph == null) {
Expand Down
2 changes: 1 addition & 1 deletion versions/pre/1.21/1.21.2-pre4/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
@@ -2364,7 +2364,7 @@
@@ -2363,7 +2363,7 @@
}

public CompletableFuture<Void> delayTextureReload() {
Expand Down
48 changes: 24 additions & 24 deletions versions/pre/1.21/1.21.2-pre4/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
@@ -142,7 +142,7 @@
@@ -144,7 +144,7 @@
) {
int i = adjustColor(p_168650_);
Font.StringRenderOutput font$stringrenderoutput = new Font.StringRenderOutput(
Expand All @@ -9,7 +9,7 @@
);

for (int j = -1; j <= 1; j++) {
@@ -166,7 +166,7 @@
@@ -168,7 +168,7 @@

font$stringrenderoutput.renderCharacters();
Font.StringRenderOutput font$stringrenderoutput1 = new Font.StringRenderOutput(
Expand All @@ -19,53 +19,53 @@
p_168646_.accept(font$stringrenderoutput1);
font$stringrenderoutput1.finish(p_168647_);
@@ -240,7 +240,7 @@
int p_273199_
boolean p_381721_
) {
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_
- this, p_273392_, p_272632_, p_273541_, p_273200_, p_273774_, p_273312_, p_273276_, p_272625_, p_273371_, p_381721_
+ p_273392_, p_272632_, p_273541_, p_273200_, p_273774_, p_273312_, p_273276_, p_272625_, p_273371_, p_381721_
);
StringDecomposer.iterateFormatted(p_273765_, Style.EMPTY, font$stringrenderoutput);
return font$stringrenderoutput.finish(p_273532_);
@@ -259,7 +259,7 @@
int p_273371_
StringDecomposer.iterateFormatted(p_381719_, Style.EMPTY, font$stringrenderoutput);
return font$stringrenderoutput.finish(p_272632_);
@@ -260,7 +260,7 @@
boolean p_381718_
) {
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_
- this, p_272595_, p_273532_, p_272783_, p_273217_, p_273727_, p_273583_, p_272734_, p_273610_, p_273199_, p_381718_
+ p_272595_, p_273532_, p_272783_, p_273217_, p_273727_, p_273583_, p_272734_, p_273610_, p_273199_, p_381718_
);
p_273322_.accept(font$stringrenderoutput);
return font$stringrenderoutput.finish(p_272632_);
@@ -341,7 +341,6 @@
p_381723_.accept(font$stringrenderoutput);
return font$stringrenderoutput.finish(p_273532_);
@@ -343,7 +343,6 @@
}

public StringRenderOutput(
- Font param1,
MultiBufferSource p_181365_,
float p_181366_,
float p_181367_,
@@ -351,11 +350,10 @@
@@ -353,11 +352,10 @@
Font.DisplayMode p_181371_,
int p_181372_
) {
- this(var1, p_181365_, p_181366_, p_181367_, p_181368_, 0, p_181369_, p_254510_, p_181371_, p_181372_);
+ this(p_181365_, p_181366_, p_181367_, p_181368_, 0, p_181369_, p_254510_, p_181371_, p_181372_);
- this(var1, p_181365_, p_181366_, p_181367_, p_181368_, 0, p_181369_, p_254510_, p_181371_, p_181372_, true);
+ this(p_181365_, p_181366_, p_181367_, p_181368_, 0, p_181369_, p_254510_, p_181371_, p_181372_, true);
}

public StringRenderOutput(
- Font param1,
MultiBufferSource p_379354_,
float p_380215_,
float p_380204_,
@@ -366,7 +364,6 @@
Font.DisplayMode p_380021_,
int p_379625_
@@ -369,7 +367,6 @@
int p_379625_,
boolean p_381720_
) {
- this.this$0 = var1;
this.glyphInstances = new ArrayList<>();
this.bufferSource = p_379354_;
this.x = p_380215_;
@@ -382,8 +379,8 @@
@@ -386,8 +383,8 @@

@Override
public boolean accept(int p_92967_, Style p_92968_, int p_92969_) {
Expand All @@ -76,16 +76,16 @@
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();
@@ -415,7 +412,7 @@
@@ -419,7 +416,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
p_381032_ - 1.0F, this.y + 9.0F, this.x, this.y - 1.0F, this.getUnderTextEffectDepth(), 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);
}
@@ -423,7 +420,7 @@
@@ -427,7 +424,7 @@
this.renderCharacters();
if (this.effects != null) {
if (bakedglyph == null) {
Expand Down

0 comments on commit 9bc1531

Please sign in to comment.