38 lines
2.1 KiB
Diff
38 lines
2.1 KiB
Diff
--- a/com/mojang/blaze3d/vertex/VertexConsumer.java
|
|
+++ b/com/mojang/blaze3d/vertex/VertexConsumer.java
|
|
@@ -14,7 +_,7 @@
|
|
import org.lwjgl.system.MemoryStack;
|
|
|
|
@OnlyIn(Dist.CLIENT)
|
|
-public interface VertexConsumer {
|
|
+public interface VertexConsumer extends net.minecraftforge.client.extensions.IForgeVertexConsumer {
|
|
VertexConsumer m_5483_(double p_85945_, double p_85946_, double p_85947_);
|
|
|
|
VertexConsumer m_6122_(int p_85973_, int p_85974_, int p_85975_, int p_85976_);
|
|
@@ -64,6 +_,10 @@
|
|
}
|
|
|
|
default void m_85995_(PoseStack.Pose p_85996_, BakedQuad p_85997_, float[] p_85998_, float p_85999_, float p_86000_, float p_86001_, int[] p_86002_, int p_86003_, boolean p_86004_) {
|
|
+ putBulkData(p_85996_, p_85997_, p_85998_, p_85999_, p_86000_, p_86001_, 1, p_86002_, p_86003_, p_86004_);
|
|
+ }
|
|
+
|
|
+ default void putBulkData(PoseStack.Pose p_85996_, BakedQuad p_85997_, float[] p_85998_, float p_85999_, float p_86000_, float p_86001_, float alpha, int[] p_86002_, int p_86003_, boolean p_86004_) {
|
|
float[] afloat = new float[]{p_85998_[0], p_85998_[1], p_85998_[2], p_85998_[3]};
|
|
int[] aint = new int[]{p_86002_[0], p_86002_[1], p_86002_[2], p_86002_[3]};
|
|
int[] aint1 = p_85997_.m_111303_();
|
|
@@ -99,11 +_,13 @@
|
|
f5 = afloat[k] * p_86001_;
|
|
}
|
|
|
|
- int l = aint[k];
|
|
+ int l = applyBakedLighting(p_86002_[k], bytebuffer);
|
|
float f9 = bytebuffer.getFloat(16);
|
|
float f10 = bytebuffer.getFloat(20);
|
|
Vector4f vector4f = matrix4f.transform(new Vector4f(f, f1, f2, 1.0F));
|
|
- this.m_5954_(vector4f.x(), vector4f.y(), vector4f.z(), f3, f4, f5, 1.0F, f9, f10, p_86003_, l, vector3f.x(), vector3f.y(), vector3f.z());
|
|
+ applyBakedNormals(vector3f, bytebuffer, p_85996_.m_252943_());
|
|
+ float vertexAlpha = p_86004_ ? alpha * (float) (bytebuffer.get(15) & 255) / 255.0F : alpha;
|
|
+ this.m_5954_(vector4f.x(), vector4f.y(), vector4f.z(), f3, f4, f5, vertexAlpha, f9, f10, p_86003_, l, vector3f.x(), vector3f.y(), vector3f.z());
|
|
}
|
|
}
|
|
|