diff --git a/mappings/net/minecraft/client/MinecraftClient.mapping b/mappings/net/minecraft/client/MinecraftClient.mapping
index 6ad959042e..ef1b1c4088 100644
--- a/mappings/net/minecraft/client/MinecraftClient.mapping
+++ b/mappings/net/minecraft/client/MinecraftClient.mapping
@@ -137,7 +137,7 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient
 	METHOD method_1514 run ()V
 	METHOD method_1515 getGameVersion ()Ljava/lang/String;
 	METHOD method_1516 getResourcePackDownloader ()Lnet/minecraft/class_1066;
-	METHOD method_1517 isFancyGraphicsEnabled ()Z
+	METHOD method_1517 isFancyGraphicsOrBetter ()Z
 	METHOD method_1519 cleanUpAfterCrash ()V
 	METHOD method_1520 getResourcePackManager ()Lnet/minecraft/class_3283;
 	METHOD method_1521 reloadResources ()Ljava/util/concurrent/CompletableFuture;
@@ -252,3 +252,4 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient
 		ARG 1 sender
 	METHOD method_29043 isMultiplayerEnabled ()Z
 	METHOD method_29044 isOnlineChatEnabled ()Z
+	METHOD method_29611 isFabulousGraphicsOrBetter ()Z
diff --git a/mappings/net/minecraft/client/options/GameOptions.mapping b/mappings/net/minecraft/client/options/GameOptions.mapping
index 2fb7dba639..88f17528ea 100644
--- a/mappings/net/minecraft/client/options/GameOptions.mapping
+++ b/mappings/net/minecraft/client/options/GameOptions.mapping
@@ -101,6 +101,7 @@ CLASS net/minecraft/class_315 net/minecraft/client/options/GameOptions
 	FIELD field_23932 chatLineSpacing D
 	FIELD field_23933 chatDelay D
 	FIELD field_24214 entityDistanceScaling F
+	FIELD field_25444 graphicsMode Lnet/minecraft/class_5365;
 	METHOD <init> (Lnet/minecraft/class_310;Ljava/io/File;)V
 		ARG 1 client
 		ARG 2 optionsFile
diff --git a/mappings/net/minecraft/client/options/GraphicsMode.mapping b/mappings/net/minecraft/client/options/GraphicsMode.mapping
new file mode 100644
index 0000000000..0b4d275c88
--- /dev/null
+++ b/mappings/net/minecraft/client/options/GraphicsMode.mapping
@@ -0,0 +1,13 @@
+CLASS net/minecraft/class_5365 net/minecraft/client/options/GraphicsMode
+	FIELD field_25430 VALUES [Lnet/minecraft/class_5365;
+	FIELD field_25431 id I
+	FIELD field_25432 translationKey Ljava/lang/String;
+	METHOD <init> (Ljava/lang/String;IILjava/lang/String;)V
+		ARG 3 id
+		ARG 4 translationKey
+	METHOD method_29591 getId ()I
+	METHOD method_29592 byId (I)Lnet/minecraft/class_5365;
+		ARG 0 id
+	METHOD method_29593 getTranslationKey ()Ljava/lang/String;
+	METHOD method_29595 next ()Lnet/minecraft/class_5365;
+	METHOD method_29596 previous ()Lnet/minecraft/class_5365;
diff --git a/mappings/net/minecraft/client/options/Option.mapping b/mappings/net/minecraft/client/options/Option.mapping
index 9844103e0a..ec1ef39cbf 100644
--- a/mappings/net/minecraft/client/options/Option.mapping
+++ b/mappings/net/minecraft/client/options/Option.mapping
@@ -55,3 +55,8 @@ CLASS net/minecraft/class_316 net/minecraft/client/options/Option
 		ARG 2 x
 		ARG 3 y
 		ARG 4 width
+	METHOD method_18550 (Lnet/minecraft/class_315;Lnet/minecraft/class_4064;)Lnet/minecraft/class_2561;
+		ARG 0 options
+	METHOD method_18554 (Lnet/minecraft/class_315;Ljava/lang/Integer;)V
+		ARG 0 options
+		ARG 1 count
diff --git a/mappings/net/minecraft/client/render/RenderLayers.mapping b/mappings/net/minecraft/client/render/RenderLayers.mapping
index b4a02cd948..bd72561d98 100644
--- a/mappings/net/minecraft/client/render/RenderLayers.mapping
+++ b/mappings/net/minecraft/client/render/RenderLayers.mapping
@@ -1,14 +1,14 @@
 CLASS net/minecraft/class_4696 net/minecraft/client/render/RenderLayers
 	FIELD field_21469 BLOCKS Ljava/util/Map;
 	FIELD field_21471 FLUIDS Ljava/util/Map;
-	FIELD field_21472 fancyGraphics Z
+	FIELD field_21472 fancyGraphicsOrBetter Z
 	METHOD method_23678 getItemLayer (Lnet/minecraft/class_1799;Z)Lnet/minecraft/class_1921;
 		ARG 0 stack
 	METHOD method_23679 getBlockLayer (Lnet/minecraft/class_2680;)Lnet/minecraft/class_1921;
 		ARG 0 state
 	METHOD method_23680 getFluidLayer (Lnet/minecraft/class_3610;)Lnet/minecraft/class_1921;
 		ARG 0 state
-	METHOD method_23682 setFancyGraphics (Z)V
-		ARG 0 fancyGraphics
+	METHOD method_23682 setFancyGraphicsOrBetter (Z)V
+		ARG 0 fancyGraphicsOrBetter
 	METHOD method_23683 getEntityBlockLayer (Lnet/minecraft/class_2680;Z)Lnet/minecraft/class_1921;
 		ARG 0 state