./gradlew :1.15.2:setCoreVersion
Also `./gradlew :jGui:1.15.2:setCoreVersion`.
This commit is contained in:
@@ -5,13 +5,13 @@ varying vec4 vertColor;
|
||||
varying vec4 textureCoord;
|
||||
varying vec4 lightMapCoord;
|
||||
//#if MC>=11500
|
||||
//$$ varying vec4 overlayCoords;
|
||||
varying vec4 overlayCoords;
|
||||
//#endif
|
||||
|
||||
uniform sampler2D texture;
|
||||
uniform sampler2D lightMap;
|
||||
//#if MC>=11500
|
||||
//$$ uniform sampler2D overlay;
|
||||
uniform sampler2D overlay;
|
||||
//#endif
|
||||
|
||||
uniform bool textureEnabled;
|
||||
@@ -26,10 +26,10 @@ void main() {
|
||||
}
|
||||
if (overlayEnabled) {
|
||||
//#if MC>=11500
|
||||
//$$ vec4 c = texture2D(overlay, overlayCoords.st);
|
||||
//$$ color = vec4(mix(c.rgb, color.rgb, c.a), color.a);
|
||||
vec4 c = texture2D(overlay, overlayCoords.st);
|
||||
color = vec4(mix(c.rgb, color.rgb, c.a), color.a);
|
||||
//#else
|
||||
color = vec4(mix(color.rgb, vec3(1, 0, 0), 0.3), color.a);
|
||||
//$$ color = vec4(mix(color.rgb, vec3(1, 0, 0), 0.3), color.a);
|
||||
//#endif
|
||||
}
|
||||
if (lightMapEnabled) {
|
||||
|
||||
@@ -6,7 +6,7 @@ varying float vertId;
|
||||
varying vec4 textureCoord;
|
||||
varying vec4 lightMapCoord;
|
||||
//#if MC>=11500
|
||||
//$$ varying vec4 overlayCoords;
|
||||
varying vec4 overlayCoords;
|
||||
//#endif
|
||||
|
||||
uniform bool leftEye;
|
||||
@@ -70,10 +70,10 @@ void main() {
|
||||
// Misc.
|
||||
textureCoord = gl_TextureMatrix[0] * gl_MultiTexCoord0;
|
||||
//#if MC>=11500
|
||||
//$$ overlayCoords = gl_TextureMatrix[1] * gl_MultiTexCoord1;
|
||||
//$$ lightMapCoord = gl_TextureMatrix[2] * gl_MultiTexCoord2;
|
||||
overlayCoords = gl_TextureMatrix[1] * gl_MultiTexCoord1;
|
||||
lightMapCoord = gl_TextureMatrix[2] * gl_MultiTexCoord2;
|
||||
//#else
|
||||
lightMapCoord = gl_TextureMatrix[1] * gl_MultiTexCoord1;
|
||||
//$$ lightMapCoord = gl_TextureMatrix[1] * gl_MultiTexCoord1;
|
||||
//#endif
|
||||
vertColor = gl_Color;
|
||||
gl_FogFragCoord = sqrt(position.x * position.x + position.y * position.y + position.z * position.z);
|
||||
|
||||
@@ -6,12 +6,12 @@
|
||||
"client": [
|
||||
//#if MC>=10800
|
||||
//#if MC<11500
|
||||
"WorldRendererAccessor",
|
||||
"MixinChunkRenderWorker",
|
||||
"MixinEffectRenderer",
|
||||
"MixinModelRenderer",
|
||||
"MixinTileEntityRendererDispatcher",
|
||||
"ContainerLocalRenderInformationAccessor",
|
||||
//$$ "WorldRendererAccessor",
|
||||
//$$ "MixinChunkRenderWorker",
|
||||
//$$ "MixinEffectRenderer",
|
||||
//$$ "MixinModelRenderer",
|
||||
//$$ "MixinTileEntityRendererDispatcher",
|
||||
//$$ "ContainerLocalRenderInformationAccessor",
|
||||
//#endif
|
||||
//#if MC<10904
|
||||
//$$ "EntityAccessor",
|
||||
|
||||
@@ -10,9 +10,9 @@
|
||||
"Mixin_SkipBlockOutlinesDuringRender",
|
||||
//#if MC>=10800
|
||||
//#if MC>=11500
|
||||
//$$ "Mixin_BlockOnChunkRebuilds",
|
||||
"Mixin_BlockOnChunkRebuilds",
|
||||
//#else
|
||||
"ChunkRenderDispatcherAccessor",
|
||||
//$$ "ChunkRenderDispatcherAccessor",
|
||||
//#endif
|
||||
"Mixin_ForceChunkLoading",
|
||||
//#endif
|
||||
@@ -38,7 +38,7 @@
|
||||
"MixinRender",
|
||||
//#if MC>=10800
|
||||
//#if MC<11500
|
||||
"MixinRenderGlobal",
|
||||
//$$ "MixinRenderGlobal",
|
||||
//#endif
|
||||
//#else
|
||||
//$$ "MixinOpenGlHelper",
|
||||
|
||||
Reference in New Issue
Block a user