From abc8cb63093f6bc2172621e8003a7ecd71f5e8a7 Mon Sep 17 00:00:00 2001 From: Merlin1809 <88194861+Merlin1809@users.noreply.github.com> Date: Thu, 9 Jul 2026 20:29:54 +0200 Subject: [PATCH] Add warnings for shader grass when my iris extension mod is installed with create aeronautics or 26.2 --- README.md | 4 ++-- shaders/dimensions/final.fsh | 24 ++++++++++++++++++++++-- shaders/lang/en_us.lang | 2 +- shaders/lang/zh_cn.lang | 2 +- shaders/lib/settings.glsl | 4 ++++ shaders/shaders.properties | 2 +- 6 files changed, 31 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 96c1907..89e2903 100644 --- a/README.md +++ b/README.md @@ -72,10 +72,10 @@ Note: With default settings there is at least one guaranteed eclipse per ingame - once the zip file finishes downloading, install it like a normal shader. you do NOT need to unzip/extract/decompress. # Incompatible Mods / Mods with issues -- Iris (on MC 26.2) +- Iris (on MC 26.2, requires "[Iris Extension](https://modrinth.com/mod/iris-extension)" for fix) - Chunks Fade In mod - Puddles and Floods -- Create Aeronautics +- Create Aeronautics (requires "[Iris Extension](https://modrinth.com/mod/iris-extension)" for fix) - BBS (disable shader curves setting in BBS settings) - Iris Uniforms - Epic Fight Mod (disable the compute shader setting in the Epic Fight Mod settings) diff --git a/shaders/dimensions/final.fsh b/shaders/dimensions/final.fsh index 886c0b8..61ba49f 100644 --- a/shaders/dimensions/final.fsh +++ b/shaders/dimensions/final.fsh @@ -15,9 +15,9 @@ uniform sampler2D depthtex2; uniform sampler2D noisetex; uniform sampler2D shadowcolor1; -#if !defined IS_IRIS || (defined SHADER_GRASS_SETTING && MC_VERSION < 12101 && !defined SHADER_GRASS_UNSUPPORTED_FIX) || defined EXPLODE_THE_SHADER +// #if !defined IS_IRIS || (defined SHADER_GRASS_SETTING && MC_VERSION < 12101 && !defined SHADER_GRASS_UNSUPPORTED_FIX) || defined EXPLODE_THE_SHADER #include "/lib/text_rendering.glsl" -#endif +// #endif #if DEBUG_VIEW == debug_CLOUDDEPTHTEX && defined CUMULONIMBUS_LIGHTNING && CUMULONIMBUS > 0 #extension GL_NV_gpu_shader5 : enable @@ -316,4 +316,24 @@ void main() { printString((_D, _i, _s, _a, _b, _l, _e, _space, _o, _n, _e, _space, _o, _f, _space, _t, _h, _e, _m, _exclm)); endText(gl_FragColor.rgb); #endif + + #if defined SHADER_GRASS_SETTING && MC_VERSION >= 260200 + const float textSize2 = 4.0; + beginText(ivec2(gl_FragCoord.xy/textSize2), ivec2(0.05*viewWidth/textSize2, 0.75*viewHeight/textSize2)); + text.fgCol = vec4(1.0, 0.0, 0.0, 1.0); + printString((_S, _h, _a, _d, _e, _r, _space, _G, _r, _a, _s, _s, _space, _i, _s, _space, _b, _r, _o, _k, _e, _n, _space, _o, _n, _space, _2, _6, _dot, _2, _space, _o, _r, _space, _h, _i, _g, _h, _e, _r, _exclm)); + printLine(); + printString((_D, _i, _s, _a, _b, _l, _e, _space, _i, _t, _exclm)); + endText(gl_FragColor.rgb); +#endif + +#if defined SHADER_GRASS_SETTING && defined CREATE_AERONAUTICS + const float textSize3 = 4.0; + beginText(ivec2(gl_FragCoord.xy/textSize3), ivec2(0.05*viewWidth/textSize3, 0.75*viewHeight/textSize3)); + text.fgCol = vec4(1.0, 0.0, 0.0, 1.0); + printString((_S, _h, _a, _d, _e, _r, _space, _G, _r, _a, _s, _s, _space, _i, _s, _space, _b, _r, _o, _k, _e, _n, _space, _b, _y, _space, _C, _r, _e, _a, _t, _e, _space, _A, _e, _r, _o, _n, _a, _u, _t, _i, _c, _s, _exclm)); + printLine(); + printString((_D, _i, _s, _a, _b, _l, _e, _space, _i, _t, _exclm)); + endText(gl_FragColor.rgb); +#endif } diff --git a/shaders/lang/en_us.lang b/shaders/lang/en_us.lang index 3956c8f..bd64ca4 100644 --- a/shaders/lang/en_us.lang +++ b/shaders/lang/en_us.lang @@ -1,6 +1,6 @@ option.SHADER_VERSION_LABEL = §d§lECLIPSE§r - A Bliss Edit prefix.SHADER_VERSION_LABEL = V - value.SHADER_VERSION_LABEL.482 = 8.2.3 + value.SHADER_VERSION_LABEL.482 = 8.2.4 iris_extension.keybind.key0.name=Flashlight diff --git a/shaders/lang/zh_cn.lang b/shaders/lang/zh_cn.lang index 2d889e6..744d932 100644 --- a/shaders/lang/zh_cn.lang +++ b/shaders/lang/zh_cn.lang @@ -1,6 +1,6 @@ option.SHADER_VERSION_LABEL = §d§lECLIPSE§r - Bliss 编辑版 prefix.SHADER_VERSION_LABEL = 版本 - value.SHADER_VERSION_LABEL.482 = 8.2.3 + value.SHADER_VERSION_LABEL.482 = 8.2.4 # 如果你是来翻译的，这不是玩笑，这些选项的功能正如其名 profile.POTATO=§4土豆 (极低配置) diff --git a/shaders/lib/settings.glsl b/shaders/lib/settings.glsl index a320ac9..84eecf7 100644 --- a/shaders/lib/settings.glsl +++ b/shaders/lib/settings.glsl @@ -1370,6 +1370,10 @@ const vec3 aerochrome_color = mix(vec3(1.0, 0.0, 0.0), vec3(0.715, 0.303, 0.631) #undef SHADER_GRASS #endif +#if defined CREATE_AERONAUTICS || MC_VERSION >= 260200 + #undef SHADER_GRASS +#endif + #if CUMULONIMBUS == 0 && !defined CloudLayer0 && !defined CloudLayer1 && !defined CloudLayer2 && !defined CloudLayer3 #undef VOLUMETRIC_CLOUDS #undef CLOUDS_SHADOWS diff --git a/shaders/shaders.properties b/shaders/shaders.properties index c64d5b9..e4cfbb6 100644 --- a/shaders/shaders.properties +++ b/shaders/shaders.properties @@ -36,7 +36,7 @@ iris.features.optional = SEPARATE_HARDWARE_SAMPLERS ENTITY_TRANSLUCENT REVERSED_ iext_key.0 = TOGGLE #endif -#ifndef SHADER_GRASS_SETTING +#if !defined SHADER_GRASS_SETTING || defined CREATE_AERONAUTICS || MC_VERSION >= 260200 iext.tessellation.gbuffers_terrain=false iext.geometry.gbuffers_terrain=false #endif