From 27fed92cd96b86134b728f70d35417a9728dce73 Mon Sep 17 00:00:00 2001 From: IMS212 Date: Mon, 6 Feb 2023 18:13:50 -0800 Subject: [PATCH] 1.5.2 --- .../iris/pipeline/newshader/ShaderKey.java | 16 ++++++++-------- src/main/resources/fabric.mod.json | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/main/java/net/coderbot/iris/pipeline/newshader/ShaderKey.java b/src/main/java/net/coderbot/iris/pipeline/newshader/ShaderKey.java index 0029e2f805..9e308632ef 100644 --- a/src/main/java/net/coderbot/iris/pipeline/newshader/ShaderKey.java +++ b/src/main/java/net/coderbot/iris/pipeline/newshader/ShaderKey.java @@ -36,8 +36,8 @@ public enum ShaderKey { HAND_CUTOUT (ProgramId.Hand, AlphaTests.ONE_TENTH_ALPHA, IrisVertexFormats.ENTITY, FogMode.PER_VERTEX, LightingModel.LIGHTMAP ), HAND_CUTOUT_BRIGHT (ProgramId.Hand, AlphaTests.ONE_TENTH_ALPHA, IrisVertexFormats.ENTITY, FogMode.PER_VERTEX, LightingModel.FULLBRIGHT), HAND_CUTOUT_DIFFUSE (ProgramId.Hand, AlphaTests.ONE_TENTH_ALPHA, IrisVertexFormats.ENTITY, FogMode.PER_VERTEX, LightingModel.DIFFUSE_LM), - HAND_TEXT (ProgramId.Hand, AlphaTests.NON_ZERO_ALPHA, DefaultVertexFormat.POSITION_COLOR_TEX_LIGHTMAP, FogMode.PER_VERTEX, LightingModel.LIGHTMAP ), - HAND_TEXT_INTENSITY (ProgramId.Hand, AlphaTests.NON_ZERO_ALPHA, DefaultVertexFormat.POSITION_COLOR_TEX_LIGHTMAP, FogMode.PER_VERTEX, LightingModel.LIGHTMAP ), + HAND_TEXT (ProgramId.Hand, AlphaTests.NON_ZERO_ALPHA, IrisVertexFormats.TERRAIN , FogMode.PER_VERTEX, LightingModel.LIGHTMAP ), + HAND_TEXT_INTENSITY (ProgramId.Hand, AlphaTests.NON_ZERO_ALPHA, IrisVertexFormats.TERRAIN , FogMode.PER_VERTEX, LightingModel.LIGHTMAP ), HAND_TRANSLUCENT (ProgramId.HandWater, AlphaTests.ONE_TENTH_ALPHA, IrisVertexFormats.ENTITY, FogMode.PER_VERTEX, LightingModel.LIGHTMAP ), HAND_WATER_BRIGHT (ProgramId.HandWater, AlphaTests.ONE_TENTH_ALPHA, IrisVertexFormats.ENTITY, FogMode.PER_VERTEX, LightingModel.FULLBRIGHT), HAND_WATER_DIFFUSE (ProgramId.HandWater, AlphaTests.ONE_TENTH_ALPHA, IrisVertexFormats.ENTITY, FogMode.PER_VERTEX, LightingModel.DIFFUSE_LM), @@ -46,10 +46,10 @@ public enum ShaderKey { PARTICLES (ProgramId.TexturedLit, AlphaTests.ONE_TENTH_ALPHA, DefaultVertexFormat.PARTICLE, FogMode.PER_VERTEX, LightingModel.LIGHTMAP ), WEATHER (ProgramId.Weather, AlphaTests.ONE_TENTH_ALPHA, DefaultVertexFormat.PARTICLE, FogMode.PER_VERTEX, LightingModel.LIGHTMAP ), CRUMBLING (ProgramId.DamagedBlock,AlphaTests.ONE_TENTH_ALPHA, IrisVertexFormats.TERRAIN, FogMode.OFF, LightingModel.LIGHTMAP ), - TEXT (ProgramId.Entities, AlphaTests.ONE_TENTH_ALPHA, DefaultVertexFormat.POSITION_COLOR_TEX_LIGHTMAP, FogMode.PER_VERTEX, LightingModel.LIGHTMAP ), - TEXT_INTENSITY (ProgramId.Entities, AlphaTests.ONE_TENTH_ALPHA, DefaultVertexFormat.POSITION_COLOR_TEX_LIGHTMAP, FogMode.PER_VERTEX, LightingModel.LIGHTMAP ), - TEXT_BE (ProgramId.Block, AlphaTests.ONE_TENTH_ALPHA, DefaultVertexFormat.POSITION_COLOR_TEX_LIGHTMAP, FogMode.PER_VERTEX, LightingModel.LIGHTMAP ), - TEXT_INTENSITY_BE (ProgramId.Block, AlphaTests.ONE_TENTH_ALPHA, DefaultVertexFormat.POSITION_COLOR_TEX_LIGHTMAP, FogMode.PER_VERTEX, LightingModel.LIGHTMAP ), + TEXT (ProgramId.Entities, AlphaTests.ONE_TENTH_ALPHA, IrisVertexFormats.TERRAIN , FogMode.PER_VERTEX, LightingModel.LIGHTMAP ), + TEXT_INTENSITY (ProgramId.Entities, AlphaTests.ONE_TENTH_ALPHA, IrisVertexFormats.TERRAIN , FogMode.PER_VERTEX, LightingModel.LIGHTMAP ), + TEXT_BE (ProgramId.Block, AlphaTests.ONE_TENTH_ALPHA, IrisVertexFormats.TERRAIN , FogMode.PER_VERTEX, LightingModel.LIGHTMAP ), + TEXT_INTENSITY_BE (ProgramId.Block, AlphaTests.ONE_TENTH_ALPHA, IrisVertexFormats.TERRAIN , FogMode.PER_VERTEX, LightingModel.LIGHTMAP ), BLOCK_ENTITY (ProgramId.Block, AlphaTests.ONE_TENTH_ALPHA, IrisVertexFormats.ENTITY, FogMode.PER_VERTEX, LightingModel.LIGHTMAP ), BLOCK_ENTITY_BRIGHT (ProgramId.Block, AlphaTests.ONE_TENTH_ALPHA, IrisVertexFormats.ENTITY, FogMode.PER_VERTEX, LightingModel.FULLBRIGHT), BLOCK_ENTITY_DIFFUSE (ProgramId.Block, AlphaTests.ONE_TENTH_ALPHA, IrisVertexFormats.ENTITY, FogMode.PER_VERTEX, LightingModel.DIFFUSE_LM), @@ -70,8 +70,8 @@ public enum ShaderKey { SHADOW_LEASH (ProgramId.Shadow, AlphaTests.OFF, DefaultVertexFormat.POSITION_COLOR_LIGHTMAP, FogMode.OFF, LightingModel.LIGHTMAP ), SHADOW_LIGHTNING (ProgramId.Shadow, AlphaTests.OFF, DefaultVertexFormat.POSITION_COLOR, FogMode.OFF, LightingModel.FULLBRIGHT), SHADOW_PARTICLES (ProgramId.Shadow, AlphaTests.ONE_TENTH_ALPHA, DefaultVertexFormat.PARTICLE, FogMode.OFF, LightingModel.LIGHTMAP ), - SHADOW_TEXT (ProgramId.Shadow, AlphaTests.NON_ZERO_ALPHA, DefaultVertexFormat.POSITION_COLOR_TEX_LIGHTMAP, FogMode.OFF, LightingModel.LIGHTMAP ), - SHADOW_TEXT_INTENSITY (ProgramId.Shadow, AlphaTests.NON_ZERO_ALPHA, DefaultVertexFormat.POSITION_COLOR_TEX_LIGHTMAP, FogMode.OFF, LightingModel.LIGHTMAP ); + SHADOW_TEXT (ProgramId.Shadow, AlphaTests.NON_ZERO_ALPHA, IrisVertexFormats.TERRAIN , FogMode.OFF, LightingModel.LIGHTMAP ), + SHADOW_TEXT_INTENSITY (ProgramId.Shadow, AlphaTests.NON_ZERO_ALPHA, IrisVertexFormats.TERRAIN , FogMode.OFF, LightingModel.LIGHTMAP ); private final ProgramId program; private final AlphaTest alphaTest; diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 46b8aa3c3c..fb0957fb7b 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -1,7 +1,7 @@ { "schemaVersion": 1, "id": "iris", - "version": "1.5.0-development-environment", + "version": "1.5.2-development-environment", "name": "Iris", "description": "A modern shaders mod for Minecraft intended to be compatible with existing OptiFine shader packs",