Fretux/MindMotion
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix issues with the shader

Browse Source
This commit is contained in:
fretuks
2026-07-22 22:15:27 +02:00
parent d222cafe84
commit 84966a381d
2 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gradle.properties
+1 -1
View File
@@ -52,7 +52,7 @@ mod_name=Mind & Motion
# The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default. # The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default.
mod_license=All Rights Reserved mod_license=All Rights Reserved
# The mod version. See https://semver.org/ # The mod version. See https://semver.org/
mod_version=1.4.2 mod_version=1.4.3
# The group ID for the mod. It is only important when publishing as an artifact to a Maven repository. # The group ID for the mod. It is only important when publishing as an artifact to a Maven repository.
# This should match the base package used for the mod sources. # This should match the base package used for the mod sources.
# See https://maven.apache.org/guides/mini/guide-naming-conventions.html # See https://maven.apache.org/guides/mini/guide-naming-conventions.html
src/main/java/net/fretux/mindmotion/client/effects/SanityShaderHandler.java
+16 -6
View File
@@ -45,15 +45,17 @@ public class SanityShaderHandler {
@SubscribeEvent @SubscribeEvent
public static void onRenderWorld(RenderLevelStageEvent event) { public static void onRenderWorld(RenderLevelStageEvent event) {
if (event.getStage() != RenderLevelStageEvent.Stage.AFTER_LEVEL) return;
Minecraft mc = Minecraft.getInstance(); Minecraft mc = Minecraft.getInstance();
if (ConfigMM.CLIENT.DISABLE_SHADERS.get() || !ConfigMM.COMMON.ENABLE_SANITY.get() || !ClientData.SANITY_ENABLED) { if (ConfigMM.CLIENT.DISABLE_SHADERS.get() || !ConfigMM.COMMON.ENABLE_SANITY.get() || !ClientData.SANITY_ENABLED) {
if (mc.gameRenderer.currentEffect() != null) PostChain current = mc.gameRenderer.currentEffect();
boolean oursLoaded = current != null && DESAT_EFFECT.toString().equals(current.getName());
if (oursLoaded)
mc.gameRenderer.shutdownEffect(); mc.gameRenderer.shutdownEffect();
return; return;
} }
float flashMultiplier = ConfigMM.CLIENT.FLASH_STRENGTH_MULTIPLIER.get().floatValue(); float flashMultiplier = ConfigMM.CLIENT.FLASH_STRENGTH_MULTIPLIER.get().floatValue();
float desatMultiplier = ConfigMM.CLIENT.SANITY_DESAT_MULTIPLIER.get().floatValue(); float desatMultiplier = ConfigMM.CLIENT.SANITY_DESAT_MULTIPLIER.get().floatValue();
if (event.getStage() != RenderLevelStageEvent.Stage.AFTER_LEVEL) return;
if (mc.player == null || mc.level == null) return; if (mc.player == null || mc.level == null) return;
float sanity = ClientData.SANITY; float sanity = ClientData.SANITY;
float insanity = ClientData.INSANITY; float insanity = ClientData.INSANITY;
@@ -69,13 +71,18 @@ public class SanityShaderHandler {
if (sanity <= 0f) target = 1f; if (sanity <= 0f) target = 1f;
currentStrength += (target - currentStrength) * 0.08f; currentStrength += (target - currentStrength) * 0.08f;
if (currentStrength < 0.005f) { if (currentStrength < 0.005f) {
if (mc.gameRenderer.currentEffect() != null) { PostChain current = mc.gameRenderer.currentEffect();
boolean oursLoaded = current != null && DESAT_EFFECT.toString().equals(current.getName());
if (oursLoaded) {
mc.gameRenderer.shutdownEffect(); mc.gameRenderer.shutdownEffect();
} }
currentStrength = 0f; currentStrength = 0f;
return; return;
} }
if (mc.gameRenderer.currentEffect() == null) { PostChain current = mc.gameRenderer.currentEffect();
boolean oursLoaded = current != null && DESAT_EFFECT.toString().equals(current.getName());
if (current != null && !oursLoaded) return;
if (current == null) {
try { try {
mc.gameRenderer.loadEffect(DESAT_EFFECT); mc.gameRenderer.loadEffect(DESAT_EFFECT);
PostChain chain = mc.gameRenderer.currentEffect(); PostChain chain = mc.gameRenderer.currentEffect();
@@ -99,7 +106,8 @@ public class SanityShaderHandler {
} }
} }
PostChain chain = mc.gameRenderer.currentEffect(); PostChain chain = mc.gameRenderer.currentEffect();
if (chain == null) return; boolean oursLoadedAfterLoad = chain != null && DESAT_EFFECT.toString().equals(chain.getName());
if (!oursLoadedAfterLoad) return;
try { try {
for (PostPass pass : safeGetPasses(chain)) { for (PostPass pass : safeGetPasses(chain)) {
EffectInstance effect = pass.getEffect(); EffectInstance effect = pass.getEffect();
@@ -176,7 +184,9 @@ public class SanityShaderHandler {
Minecraft mc = Minecraft.getInstance(); Minecraft mc = Minecraft.getInstance();
currentStrength = 0f; currentStrength = 0f;
mc.execute(() -> { mc.execute(() -> {
if (mc.gameRenderer.currentEffect() != null) { PostChain current = mc.gameRenderer.currentEffect();
boolean oursLoaded = current != null && DESAT_EFFECT.toString().equals(current.getName());
if (oursLoaded) {
mc.gameRenderer.shutdownEffect(); mc.gameRenderer.shutdownEffect();
} }
}); });