Prevent Fabulous from crashing the game

Fixes #2495
IrisShaders · Oct 25, 2024 · 2cc2552 · 2cc2552
1 parent fa3fb7f
commit 2cc2552
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/...on/src/main/java/net/irisshaders/iris/compat/sodium/mixin/MixinSodiumGameOptionPages.java b/...on/src/main/java/net/irisshaders/iris/compat/sodium/mixin/MixinSodiumGameOptionPages.java
@@ -149,7 +149,7 @@ private static OptionImpl<Options, SupportedGraphicsMode> createLimitedVideoSett
 				new Component[]{Component.translatable("options.graphics.fast"), Component.translatable("options.graphics.fancy")}))
 			.setBinding(
 				(opts, value) -> opts.graphicsMode().set(value.toVanilla()),
-				opts -> SupportedGraphicsMode.fromVanilla(opts.graphicsMode().get()))
+				opts -> SupportedGraphicsMode.fromVanilla(opts.graphicsMode()))
 			.setImpact(OptionImpact.HIGH)
 			.setFlags(OptionFlag.REQUIRES_RENDERER_RELOAD)
 			.build();

diff --git a/common/src/main/java/net/irisshaders/iris/fantastic/SupportedGraphicsMode.java b/common/src/main/java/net/irisshaders/iris/fantastic/SupportedGraphicsMode.java
@@ -1,16 +1,22 @@
 package net.irisshaders.iris.fantastic;
 
+import net.irisshaders.iris.Iris;
 import net.minecraft.client.GraphicsStatus;
+import net.minecraft.client.OptionInstance;
 
 public enum SupportedGraphicsMode {
 	FAST,
 	FANCY;
 
-	public static SupportedGraphicsMode fromVanilla(GraphicsStatus status) {
-		return switch (status) {
+	public static SupportedGraphicsMode fromVanilla(OptionInstance<GraphicsStatus> status) {
+		return switch (status.get()) {
 			case FAST -> FAST;
 			case FANCY -> FANCY;
-			case FABULOUS -> throw new IllegalStateException("Fabulous graphics mode is not supported by Iris");
+			case FABULOUS -> {
+				Iris.logger.warn("Detected Fabulous Graphics being used somehow, changing to Fancy!");
+				status.set(GraphicsStatus.FANCY);
+				yield FANCY;
+			}
 		};
 	}