-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #26 from C0D3-M4513R/main
Switch away from srg to mojang patches
- Loading branch information
Showing
900 changed files
with
24,529 additions
and
24,640 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
8 changes: 4 additions & 4 deletions
8
patches/minecraft/com/mojang/blaze3d/platform/GlStateManager.java.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,19 +1,19 @@ | ||
| --- a/com/mojang/blaze3d/platform/GlStateManager.java | ||
| +++ b/com/mojang/blaze3d/platform/GlStateManager.java | ||
| @@ -539,9 +_,16 @@ | ||
| f_84077_[f_84076_].f_84800_ = false; | ||
| TEXTURES[activeTexture].enable = false; | ||
| } | ||
|
|
||
| + /* Stores the last values sent into glMultiTexCoord2f */ | ||
| + public static float lastBrightnessX = 0.0f; | ||
| + public static float lastBrightnessY = 0.0f; | ||
| public static void m_84160_(int p_84161_, int p_84162_, float p_84163_) { | ||
| RenderSystem.m_187555_(); | ||
| public static void _texParameter(int p_84161_, int p_84162_, float p_84163_) { | ||
| RenderSystem.assertOnRenderThreadOrInit(); | ||
| GL11.glTexParameterf(p_84161_, p_84162_, p_84163_); | ||
| + if (p_84161_ == GL13.GL_TEXTURE1) { | ||
| + lastBrightnessX = p_84162_; | ||
| + lastBrightnessY = p_84163_; | ||
| + } | ||
| } | ||
|
|
||
| public static void m_84331_(int p_84332_, int p_84333_, int p_84334_) { | ||
| public static void _texParameter(int p_84332_, int p_84333_, int p_84334_) { |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
patches/minecraft/com/mojang/blaze3d/vertex/SheetedDecalTextureGenerator.java.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,11 @@ | ||
| --- a/com/mojang/blaze3d/vertex/SheetedDecalTextureGenerator.java | ||
| +++ b/com/mojang/blaze3d/vertex/SheetedDecalTextureGenerator.java | ||
| @@ -91,4 +_,8 @@ | ||
| this.f_85878_ = p_85902_; | ||
| this.nz = p_85902_; | ||
| return this; | ||
| } | ||
| + | ||
| + public VertexFormat getVertexFormat() { | ||
| + return this.f_85867_.getVertexFormat(); | ||
| + return this.delegate.getVertexFormat(); | ||
| + } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
patches/minecraft/com/mojang/blaze3d/vertex/VertexFormatElement.java.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
16 changes: 8 additions & 8 deletions
16
patches/minecraft/com/mojang/blaze3d/vertex/VertexMultiConsumer.java.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,26 +1,26 @@ | ||
| --- a/com/mojang/blaze3d/vertex/VertexMultiConsumer.java | ||
| +++ b/com/mojang/blaze3d/vertex/VertexMultiConsumer.java | ||
| @@ -91,6 +_,10 @@ | ||
| this.f_86171_.m_141991_(); | ||
| this.f_86172_.m_141991_(); | ||
| this.first.unsetDefaultColor(); | ||
| this.second.unsetDefaultColor(); | ||
| } | ||
| + | ||
| + public VertexFormat getVertexFormat() { | ||
| + return this.f_86171_.getVertexFormat(); | ||
| + return this.first.getVertexFormat(); | ||
| + } | ||
| } | ||
|
|
||
| @OnlyIn(Dist.CLIENT) | ||
| @@ -176,6 +_,12 @@ | ||
|
|
||
| public void m_141991_() { | ||
| this.m_167144_(VertexConsumer::m_141991_); | ||
| public void unsetDefaultColor() { | ||
| this.forEach(VertexConsumer::unsetDefaultColor); | ||
| + } | ||
| + | ||
| + public VertexFormat getVertexFormat() { | ||
| + if(f_167071_.length > 0) | ||
| + return f_167071_[0].getVertexFormat(); | ||
| + return DefaultVertexFormat.f_85811_; | ||
| + if(delegates.length > 0) | ||
| + return delegates[0].getVertexFormat(); | ||
| + return DefaultVertexFormat.BLOCK; | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,13 @@ | ||
| --- a/com/mojang/math/Matrix3f.java | ||
| +++ b/com/mojang/math/Matrix3f.java | ||
| @@ -588,4 +_,10 @@ | ||
| public Matrix3f m_8183_() { | ||
| public Matrix3f copy() { | ||
| return new Matrix3f(this); | ||
| } | ||
| + | ||
| + public void multiplyBackward(Matrix3f other) { | ||
| + Matrix3f copy = other.m_8183_(); | ||
| + copy.m_8178_(this); | ||
| + this.m_8169_(copy); | ||
| + Matrix3f copy = other.copy(); | ||
| + copy.mul(this); | ||
| + this.load(copy); | ||
| + } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,43 +1,43 @@ | ||
| --- a/com/mojang/math/Matrix4f.java | ||
| +++ b/com/mojang/math/Matrix4f.java | ||
| @@ -559,4 +_,40 @@ | ||
| matrix4f.f_27614_ = p_27656_; | ||
| matrix4f.m23 = p_27656_; | ||
| return matrix4f; | ||
| } | ||
| + | ||
| + // Forge start | ||
| + public Matrix4f(float[] values) { | ||
| + f_27603_ = values[0]; | ||
| + f_27604_ = values[1]; | ||
| + f_27605_ = values[2]; | ||
| + f_27606_ = values[3]; | ||
| + f_27607_ = values[4]; | ||
| + f_27608_ = values[5]; | ||
| + f_27609_ = values[6]; | ||
| + f_27610_ = values[7]; | ||
| + f_27611_ = values[8]; | ||
| + f_27612_ = values[9]; | ||
| + f_27613_ = values[10]; | ||
| + f_27614_ = values[11]; | ||
| + f_27615_ = values[12]; | ||
| + f_27616_ = values[13]; | ||
| + f_27617_ = values[14]; | ||
| + f_27618_ = values[15]; | ||
| + m00 = values[0]; | ||
| + m01 = values[1]; | ||
| + m02 = values[2]; | ||
| + m03 = values[3]; | ||
| + m10 = values[4]; | ||
| + m11 = values[5]; | ||
| + m12 = values[6]; | ||
| + m13 = values[7]; | ||
| + m20 = values[8]; | ||
| + m21 = values[9]; | ||
| + m22 = values[10]; | ||
| + m23 = values[11]; | ||
| + m30 = values[12]; | ||
| + m31 = values[13]; | ||
| + m32 = values[14]; | ||
| + m33 = values[15]; | ||
| + } | ||
| + | ||
| + public void multiplyBackward(Matrix4f other) { | ||
| + Matrix4f copy = other.m_27658_(); | ||
| + copy.m_27644_(this); | ||
| + this.m_162210_(copy); | ||
| + Matrix4f copy = other.copy(); | ||
| + copy.multiply(this); | ||
| + this.load(copy); | ||
| + } | ||
| + | ||
| + public void setTranslation(float x, float y, float z) { | ||
| + this.f_27603_ = 1.0F; | ||
| + this.f_27608_ = 1.0F; | ||
| + this.f_27613_ = 1.0F; | ||
| + this.f_27618_ = 1.0F; | ||
| + this.f_27606_ = x; | ||
| + this.f_27610_ = y; | ||
| + this.f_27614_ = z; | ||
| + this.m00 = 1.0F; | ||
| + this.m11 = 1.0F; | ||
| + this.m22 = 1.0F; | ||
| + this.m33 = 1.0F; | ||
| + this.m03 = x; | ||
| + this.m13 = y; | ||
| + this.m23 = z; | ||
| + } | ||
| } |
Oops, something went wrong.