Skip to content

Commit

Permalink
Update patches
Browse files Browse the repository at this point in the history
  • Loading branch information
coehlrich committed Aug 21, 2024
1 parent e2d87fc commit f430856
Show file tree
Hide file tree
Showing 8 changed files with 242 additions and 235 deletions.
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
@@ -2295,7 +2295,7 @@
@@ -2299,7 +2299,7 @@
}

public CompletableFuture<Void> delayTextureReload() {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,132 +1,130 @@
--- a/net/minecraft/client/renderer/PostChain.java
+++ b/net/minecraft/client/renderer/PostChain.java
@@ -94,63 +94,7 @@
Objects.requireNonNull(postchainconfig$input);
Throwable throwable10;
switch (postchainconfig$input) {
- case PostChainConfig.TextureInput postchainconfig$textureinput:
- PostChainConfig.TextureInput postchainconfig$textureinput1 = postchainconfig$textureinput;
-
- try {
- s4 = postchainconfig$textureinput1.samplerName();
- } catch (Throwable throwable8) {
- throwable10 = throwable8;
- boolean flag9 = false;
- break;
- }
@@ -76,121 +76,18 @@

for (PostChainConfig.Input postchainconfig$input : p_361826_.inputs()) {
Objects.requireNonNull(postchainconfig$input);
- Throwable throwable10;
switch (postchainconfig$input) {
- case PostChainConfig.TextureInput postchainconfig$textureinput:
- PostChainConfig.TextureInput postchainconfig$textureinput1 = postchainconfig$textureinput;
-
- try {
- s5 = postchainconfig$textureinput1.samplerName();
- } catch (Throwable throwable8) {
- throwable10 = throwable8;
- boolean flag9 = false;
- break;
- }
-
- String s2 = s4;
- PostChainConfig.TextureInput postchainconfig$textureinput2 = postchainconfig$textureinput;
- String s3 = s5;
- PostChainConfig.TextureInput postchainconfig$textureinput2 = postchainconfig$textureinput;
-
- try {
- resourcelocation5 = postchainconfig$textureinput2.location();
- } catch (Throwable throwable7) {
- throwable10 = throwable7;
- boolean flag10 = false;
- break;
- }
- try {
- resourcelocation4 = postchainconfig$textureinput2.location();
- } catch (Throwable throwable7) {
- throwable10 = throwable7;
- boolean flag10 = false;
- break;
- }
-
- ResourceLocation resourcelocation1 = resourcelocation5;
- ResourceLocation resourcelocation = resourcelocation1;
- PostChainConfig.TextureInput postchainconfig$textureinput3 = postchainconfig$textureinput;
- ResourceLocation resourcelocation1 = resourcelocation4;
- PostChainConfig.TextureInput postchainconfig$textureinput3 = postchainconfig$textureinput;
-
- try {
- k = postchainconfig$textureinput3.width();
- } catch (Throwable throwable6) {
- throwable10 = throwable6;
- boolean flag11 = false;
- break;
- }
- try {
- k = postchainconfig$textureinput3.width();
- } catch (Throwable throwable6) {
- throwable10 = throwable6;
- boolean flag11 = false;
- break;
- }
-
- int i = k;
- PostChainConfig.TextureInput postchainconfig$textureinput4 = postchainconfig$textureinput;
- int i = k;
- PostChainConfig.TextureInput postchainconfig$textureinput4 = postchainconfig$textureinput;
-
- try {
- l = postchainconfig$textureinput4.height();
- } catch (Throwable throwable5) {
- throwable10 = throwable5;
- boolean flag12 = false;
- break;
- }
- try {
- l = postchainconfig$textureinput4.height();
- } catch (Throwable throwable5) {
- throwable10 = throwable5;
- boolean flag12 = false;
- break;
- }
-
- int j = l;
- PostChainConfig.TextureInput postchainconfig$textureinput5 = postchainconfig$textureinput;
-
- try {
- flag5 = postchainconfig$textureinput5.bilinear();
- } catch (Throwable throwable4) {
- throwable10 = throwable4;
- boolean flag13 = false;
- break;
- }
- int j = l;
- PostChainConfig.TextureInput postchainconfig$textureinput5 = postchainconfig$textureinput;
-
- boolean flag = flag5;
+ case PostChainConfig.TextureInput(String s2, ResourceLocation resourcelocation, int i, int j, boolean flag):
ResourceLocation resourcelocation2 = resourcelocation.withPath(p_359199_ -> "textures/effect/" + p_359199_ + ".png");
p_363908_.getResource(resourcelocation2).orElseThrow(() -> new ChainedJsonException("Texture '" + resourcelocation + "' does not exist"));
RenderSystem.setShaderTexture(0, resourcelocation2);
@@ -166,59 +110,12 @@

postpass.addInput(new PostPass.TextureInput(s2, abstracttexture, i, j));
continue;
- case PostChainConfig.TargetInput $$10:
- PostChainConfig.TargetInput postchainconfig$targetinput4 = $$10;
-
- try {
- s3 = postchainconfig$targetinput4.samplerName();
- } catch (Throwable throwable3) {
- throwable10 = throwable3;
- boolean flag14 = false;
- break;
- }
- try {
- flag5 = postchainconfig$textureinput5.bilinear();
- } catch (Throwable throwable4) {
- throwable10 = throwable4;
- boolean flag13 = false;
- break;
- }
-
- String s1 = s3;
- PostChainConfig.TargetInput postchainconfig$targetinput1 = $$10;
- 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"));
abstracttexture.setFilter(flag, false);
postpass.addInput(new PostPass.TextureInput(s3, abstracttexture, i, j));
continue;
- case PostChainConfig.TargetInput $$15:
- PostChainConfig.TargetInput postchainconfig$targetinput4 = $$15;
-
- try {
- s4 = postchainconfig$targetinput4.samplerName();
- } catch (Throwable throwable3) {
- throwable10 = throwable3;
- boolean flag14 = false;
- break;
- }
-
- try {
- resourcelocation4 = postchainconfig$targetinput1.targetId();
- } catch (Throwable throwable2) {
- throwable10 = throwable2;
- boolean flag6 = false;
- break;
- }
- String s1 = s4;
- PostChainConfig.TargetInput postchainconfig$targetinput1 = $$15;
-
- ResourceLocation resourcelocation3 = resourcelocation4;
- PostChainConfig.TargetInput postchainconfig$targetinput2 = $$10;
- try {
- resourcelocation3 = postchainconfig$targetinput1.targetId();
- } catch (Throwable throwable2) {
- throwable10 = throwable2;
- boolean flag6 = false;
- break;
- }
-
- try {
- flag3 = postchainconfig$targetinput2.useDepthBuffer();
- } catch (Throwable throwable1) {
- throwable10 = throwable1;
- boolean flag7 = false;
- break;
- }
- ResourceLocation resourcelocation2 = resourcelocation3;
- PostChainConfig.TargetInput postchainconfig$targetinput2 = $$15;
-
- try {
- flag3 = postchainconfig$targetinput2.useDepthBuffer();
- } catch (Throwable throwable1) {
- throwable10 = throwable1;
- boolean flag7 = false;
- break;
- }
-
- boolean flag1 = flag3;
- PostChainConfig.TargetInput postchainconfig$targetinput3 = $$10;
- boolean flag1 = flag3;
- PostChainConfig.TargetInput postchainconfig$targetinput3 = $$15;
-
- try {
- flag4 = postchainconfig$targetinput3.bilinear();
- } catch (Throwable throwable) {
- throwable10 = throwable;
- boolean flag8 = false;
- break;
- }
- try {
- flag4 = postchainconfig$targetinput3.bilinear();
- } catch (Throwable throwable) {
- throwable10 = throwable;
- boolean flag8 = false;
- break;
- }
-
- boolean flag2 = flag4;
+ case PostChainConfig.TargetInput(String s1, ResourceLocation resourcelocation3, boolean flag1, boolean flag2):
postpass.addInput(new PostPass.TargetInput(s1, resourcelocation3, flag1, flag2));
continue;
default:
throw new MatchException(null, null);
}
- boolean flag2 = flag4;
+ case PostChainConfig.TargetInput(String s1, ResourceLocation resourcelocation2, boolean flag1, boolean flag2):
postpass.addInput(new PostPass.TargetInput(s1, resourcelocation2, flag1, flag2));
continue;
default:
throw new MatchException(null, null);
}
-
- Throwable throwable9 = throwable10;
- throw new MatchException(throwable9.toString(), throwable9);
}
- Throwable throwable9 = throwable10;
- throw new MatchException(throwable9.toString(), throwable9);
}

for (PostChainConfig.Uniform postchainconfig$uniform : p_361826_.uniforms()) {
@@ -277,43 +174,8 @@
return postpass;
@@ -208,43 +105,8 @@

for (Entry<ResourceLocation, PostChainConfig.InternalTarget> entry : this.internalTargets.entrySet()) {
ResourceLocation resourcelocation1 = entry.getKey();
Expand All @@ -140,22 +138,22 @@
- PostChainConfig.FixedSizedTarget postchainconfig$fixedsizedtarget1 = postchainconfig$fixedsizedtarget;
-
- int i;
- label59: {
- label85: {
- label56: {
- label76: {
- try {
- k = postchainconfig$fixedsizedtarget1.width();
- } catch (Throwable throwable1) {
- throwable3 = throwable1;
- boolean flag1 = false;
- break label85;
- break label76;
- }
-
- i = k;
- PostChainConfig.FixedSizedTarget postchainconfig$fixedsizedtarget2 = postchainconfig$fixedsizedtarget;
-
- try {
- l = postchainconfig$fixedsizedtarget2.height();
- break label59;
- break label56;
- } catch (Throwable throwable) {
- throwable3 = throwable;
- boolean flag = false;
Expand Down
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
@@ -2298,7 +2298,7 @@
@@ -2302,7 +2302,7 @@
}

public CompletableFuture<Void> delayTextureReload() {
Expand Down
Loading

0 comments on commit f430856

Please sign in to comment.