Add weather.enabled field

`weather.enabled = <disable weather geometry> <disable splash particles>`
IrisShaders · Nov 3, 2024 · 6a7223b · 6a7223b
1 parent f9c974b
commit 6a7223b
Show file tree

Hide file tree

Showing 6 changed files with 77 additions and 0 deletions.
diff --git a/common/src/main/java/net/irisshaders/iris/mixin/sky/MixinLevelRenderer_SunMoonToggle.java b/common/src/main/java/net/irisshaders/iris/mixin/sky/MixinLevelRenderer_SunMoonToggle.java
@@ -1,14 +1,18 @@
 package net.irisshaders.iris.mixin.sky;
 
+import com.llamalad7.mixinextras.injector.v2.WrapWithCondition;
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 import com.mojang.blaze3d.vertex.MeshData;
 import com.mojang.blaze3d.vertex.VertexBuffer;
 import net.irisshaders.iris.Iris;
 import net.irisshaders.iris.pipeline.WorldRenderingPipeline;
+import net.minecraft.client.OptionInstance;
+import net.minecraft.client.ParticleStatus;
 import net.minecraft.client.multiplayer.ClientLevel;
 import net.minecraft.client.renderer.DimensionSpecialEffects;
 import net.minecraft.client.renderer.LevelRenderer;
+import net.minecraft.client.renderer.LightTexture;
 import net.minecraft.client.renderer.ShaderInstance;
 import net.minecraft.world.level.LevelHeightAccessor;
 import org.joml.Matrix4f;
@@ -35,6 +39,19 @@ public class MixinLevelRenderer_SunMoonToggle {
 		}
 	}
 
+	@WrapWithCondition(method = "renderLevel", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/LevelRenderer;renderSnowAndRain(Lnet/minecraft/client/renderer/LightTexture;FDDD)V"))
+	private boolean iris$disableWeather(LevelRenderer instance, LightTexture lightTexture, float f, double d, double e, double g) {
+		return Iris.getPipelineManager().getPipeline().map(WorldRenderingPipeline::shouldRenderWeather).orElse(true);
+	}
+
+	@WrapOperation(method = "tickRain", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/OptionInstance;get()Ljava/lang/Object;", ordinal = 1))
+	private Object disableRainParticles(OptionInstance<?> instance, Operation<ParticleStatus> original) {
+		if (!Iris.getPipelineManager().getPipeline().map(WorldRenderingPipeline::shouldRenderWeatherParticles).orElse(true)) {
+			return ParticleStatus.MINIMAL;
+		}
+		return original.call(instance);
+	}
+
 	@WrapOperation(method = "renderSky",
 		at = @At(value = "INVOKE", target = "Lcom/mojang/blaze3d/vertex/BufferUploader;drawWithShader(Lcom/mojang/blaze3d/vertex/MeshData;)V"),
 		slice = @Slice(

diff --git a/common/src/main/java/net/irisshaders/iris/pipeline/IrisRenderingPipeline.java b/common/src/main/java/net/irisshaders/iris/pipeline/IrisRenderingPipeline.java
@@ -153,6 +153,8 @@ public class IrisRenderingPipeline implements WorldRenderingPipeline, ShaderRend
 	private final boolean occlusionCulling;
 	private final CloudSetting cloudSetting;
 	private final boolean shouldRenderSun;
+	private final boolean shouldRenderWeather;
+	private final boolean shouldRenderWeatherParticles;
 	private final boolean shouldRenderMoon;
 	private final boolean shouldRenderStars;
 	private final boolean shouldRenderSkyDisc;
@@ -204,6 +206,8 @@ public IrisRenderingPipeline(ProgramSet programSet) {
 		this.cloudSetting = programSet.getPackDirectives().getCloudSetting();
 		this.dhCloudSetting = programSet.getPackDirectives().getDHCloudSetting();
 		this.shouldRenderSun = programSet.getPackDirectives().shouldRenderSun();
+		this.shouldRenderWeather = programSet.getPackDirectives().shouldRenderWeather();
+		this.shouldRenderWeatherParticles = programSet.getPackDirectives().shouldRenderWeatherParticles();
 		this.shouldRenderMoon = programSet.getPackDirectives().shouldRenderMoon();
 		this.shouldRenderStars = programSet.getPackDirectives().shouldRenderStars();
 		this.shouldRenderSkyDisc = programSet.getPackDirectives().shouldRenderSkyDisc();
@@ -1101,6 +1105,16 @@ public boolean shouldRenderSun() {
 		return shouldRenderSun;
 	}
 
+	@Override
+	public boolean shouldRenderWeather() {
+		return shouldRenderWeather;
+	}
+
+	@Override
+	public boolean shouldRenderWeatherParticles() {
+		return shouldRenderWeatherParticles;
+	}
+
 	@Override
 	public boolean shouldRenderMoon() {
 		return shouldRenderMoon;

diff --git a/common/src/main/java/net/irisshaders/iris/pipeline/VanillaRenderingPipeline.java b/common/src/main/java/net/irisshaders/iris/pipeline/VanillaRenderingPipeline.java
@@ -166,6 +166,16 @@ public boolean shouldRenderSun() {
 		return true;
 	}
 
+	@Override
+	public boolean shouldRenderWeather() {
+		return true;
+	}
+
+	@Override
+	public boolean shouldRenderWeatherParticles() {
+		return true;
+	}
+
 	@Override
 	public boolean shouldRenderMoon() {
 		return true;

diff --git a/common/src/main/java/net/irisshaders/iris/pipeline/WorldRenderingPipeline.java b/common/src/main/java/net/irisshaders/iris/pipeline/WorldRenderingPipeline.java
@@ -69,6 +69,10 @@ public interface WorldRenderingPipeline {
 
 	boolean shouldRenderSun();
 
+	boolean shouldRenderWeather();
+
+	boolean shouldRenderWeatherParticles();
+
 	boolean shouldRenderMoon();
 
 	boolean shouldRenderStars();

diff --git a/common/src/main/java/net/irisshaders/iris/shaderpack/properties/PackDirectives.java b/common/src/main/java/net/irisshaders/iris/shaderpack/properties/PackDirectives.java
@@ -31,6 +31,8 @@ public class PackDirectives {
 	private boolean underwaterOverlay;
 	private boolean vignette;
 	private boolean sun;
+	private boolean weather;
+	private boolean weatherParticles;
 	private boolean moon;
 	private boolean stars;
 	private boolean sky;
@@ -70,6 +72,8 @@ public PackDirectives(Set<Integer> supportedRenderTargets, ShaderProperties prop
 		underwaterOverlay = properties.getUnderwaterOverlay().orElse(false);
 		vignette = properties.getVignette().orElse(false);
 		sun = properties.getSun().orElse(true);
+		weather = properties.getWeather().orElse(true);
+		weatherParticles = properties.getWeatherParticles().orElse(true);
 		moon = properties.getMoon().orElse(true);
 		stars = properties.getStars().orElse(true);
 		sky = properties.getSky().orElse(true);
@@ -160,6 +164,14 @@ public boolean shouldRenderSun() {
 		return sun;
 	}
 
+	public boolean shouldRenderWeather() {
+		return weather;
+	}
+
+	public boolean shouldRenderWeatherParticles() {
+		return weatherParticles;
+	}
+
 	public boolean shouldRenderMoon() {
 		return moon;
 	}

diff --git a/common/src/main/java/net/irisshaders/iris/shaderpack/properties/ShaderProperties.java b/common/src/main/java/net/irisshaders/iris/shaderpack/properties/ShaderProperties.java
@@ -77,6 +77,8 @@ public class ShaderProperties {
 	private int customTexAmount;
 	private CloudSetting cloudSetting = CloudSetting.DEFAULT;
 	private CloudSetting dhCloudSetting = CloudSetting.DEFAULT;
+	private OptionalBoolean weather = OptionalBoolean.DEFAULT;
+	private OptionalBoolean weatherParticles = OptionalBoolean.DEFAULT;
 	private OptionalBoolean oldHandLight = OptionalBoolean.DEFAULT;
 	private OptionalBoolean dynamicHandLight = OptionalBoolean.DEFAULT;
 	private OptionalBoolean supportsColorCorrection = OptionalBoolean.DEFAULT;
@@ -248,6 +250,16 @@ public ShaderProperties(String contents, ShaderPackOptions shaderPackOptions, It
 				viewportScaleOverrides.put(pass, new ViewportData(scale, offsetX, offsetY));
 			});
 
+			if ("weather.enabled".equals(key)) {
+				String[] parts = value.split(" ");
+
+				weather = parts[0].equals("true") ? OptionalBoolean.TRUE : OptionalBoolean.FALSE;
+
+				if (parts.length > 1) {
+					weatherParticles = parts[1].equals("true") ? OptionalBoolean.TRUE : OptionalBoolean.FALSE;
+				}
+			}
+
 			handlePassDirective("size.buffer.", key, value, pass -> {
 				String[] parts = value.split(" ");
 
@@ -775,6 +787,14 @@ public OptionalBoolean getSun() {
 		return sun;
 	}
 
+	public OptionalBoolean getWeather() {
+		return weather;
+	}
+
+	public OptionalBoolean getWeatherParticles() {
+		return weatherParticles;
+	}
+
 	public OptionalBoolean getMoon() {
 		return moon;
 	}