Merge branch 'n' into 1.21.2

IrisShaders · Nov 3, 2024 · 4eb3a13 · 4eb3a13
2 parents 26c9542 + 9d62442
commit 4eb3a13
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/common/src/main/java/net/irisshaders/iris/gl/texture/InternalTextureFormat.java b/common/src/main/java/net/irisshaders/iris/gl/texture/InternalTextureFormat.java
@@ -83,7 +83,7 @@ public enum InternalTextureFormat {
 	RGB5_A1(GL11C.GL_RGB5_A1, GlVersion.GL_11, PixelFormat.RGBA),
 	RGB565(GL41C.GL_RGB565, GlVersion.GL_41, PixelFormat.RGB),
 	RGB10_A2(GL11C.GL_RGB10_A2, GlVersion.GL_11, PixelFormat.RGBA),
-	RGB10_A2UI(GL33C.GL_RGB10_A2UI, GlVersion.GL_33, PixelFormat.RGBA),
+	RGB10_A2UI(GL33C.GL_RGB10_A2UI, GlVersion.GL_33, PixelFormat.RGBA_INTEGER),
 	R11F_G11F_B10F(GL30C.GL_R11F_G11F_B10F, GlVersion.GL_30, PixelFormat.RGB),
 	RGB9_E5(GL30C.GL_RGB9_E5, GlVersion.GL_30, PixelFormat.RGB);
 

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
@@ -250,7 +250,7 @@ public ShaderProperties(String contents, ShaderPackOptions shaderPackOptions, It
 				viewportScaleOverrides.put(pass, new ViewportData(scale, offsetX, offsetY));
 			});
 
-			if ("weather.enabled".equals(key)) {
+			if ("weather".equals(key)) {
 				String[] parts = value.split(" ");
 
 				weather = parts[0].equals("true") ? OptionalBoolean.TRUE : OptionalBoolean.FALSE;

diff --git a/neoforge/src/main/java/net/irisshaders/iris/platform/IrisForgeMod.java b/neoforge/src/main/java/net/irisshaders/iris/platform/IrisForgeMod.java
@@ -2,6 +2,7 @@
 
 import net.irisshaders.iris.gui.screen.ShaderPackScreen;
 import net.minecraft.client.KeyMapping;
+import net.neoforged.api.distmarker.Dist;
 import net.neoforged.bus.api.IEventBus;
 import net.neoforged.fml.ModContainer;
 import net.neoforged.fml.common.Mod;
@@ -11,7 +12,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-@Mod("iris")
+@Mod(value = "iris", dist = Dist.CLIENT)
 public class IrisForgeMod {
 	public static List<KeyMapping> KEYLIST = new ArrayList<>();