From 49b238f384bdfdccf23f7b3fa3b072ef517a572e Mon Sep 17 00:00:00 2001
From: TheKodeToad <TheKodeToad@proton.me>
Date: Fri, 19 Sep 2025 09:42:13 +0100
Subject: [PATCH] Properly remove gameoptions

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
---
 launcher/InstancePageProvider.h          | 1 -
 launcher/minecraft/MinecraftInstance.cpp | 9 ---------
 launcher/minecraft/MinecraftInstance.h   | 3 ---
 3 files changed, 13 deletions(-)

diff --git a/launcher/InstancePageProvider.h b/launcher/InstancePageProvider.h
index 258ed5aa5..ebbab0f3a 100644
--- a/launcher/InstancePageProvider.h
+++ b/launcher/InstancePageProvider.h
@@ -43,7 +43,6 @@ class InstancePageProvider : protected QObject, public BasePageProvider {
         values.append(new NotesPage(onesix.get()));
         values.append(new WorldListPage(onesix, onesix->worldList()));
         values.append(new ServersPage(onesix));
-        // values.append(new GameOptionsPage(onesix.get()));
         values.append(new ScreenshotsPage(FS::PathCombine(onesix->gameRoot(), "screenshots")));
         values.append(new InstanceSettingsPage(onesix));
         values.append(new OtherLogsPage("logs", tr("Other logs"), "Other-Logs", inst));
diff --git a/launcher/minecraft/MinecraftInstance.cpp b/launcher/minecraft/MinecraftInstance.cpp
index 7749d0f6b..403aeb4bb 100644
--- a/launcher/minecraft/MinecraftInstance.cpp
+++ b/launcher/minecraft/MinecraftInstance.cpp
@@ -85,7 +85,6 @@
 #include "AssetsUtils.h"
 #include "MinecraftLoadAndCheck.h"
 #include "PackProfile.h"
-#include "minecraft/gameoptions/GameOptions.h"
 #include "minecraft/update/FoldersTask.h"
 
 #include "tools/BaseProfiler.h"
@@ -1287,14 +1286,6 @@ std::shared_ptr<WorldList> MinecraftInstance::worldList()
     return m_world_list;
 }
 
-std::shared_ptr<GameOptions> MinecraftInstance::gameOptionsModel()
-{
-    if (!m_game_options) {
-        m_game_options.reset(new GameOptions(FS::PathCombine(gameRoot(), "options.txt")));
-    }
-    return m_game_options;
-}
-
 QList<Mod*> MinecraftInstance::getJarMods() const
 {
     auto profile = m_components->getProfile();
diff --git a/launcher/minecraft/MinecraftInstance.h b/launcher/minecraft/MinecraftInstance.h
index a37164169..d4e0a8626 100644
--- a/launcher/minecraft/MinecraftInstance.h
+++ b/launcher/minecraft/MinecraftInstance.h
@@ -49,7 +49,6 @@ class ResourcePackFolderModel;
 class ShaderPackFolderModel;
 class TexturePackFolderModel;
 class WorldList;
-class GameOptions;
 class LaunchStep;
 class PackProfile;
 
@@ -121,7 +120,6 @@ class MinecraftInstance : public BaseInstance {
     std::shared_ptr<DataPackFolderModel> dataPackList();
     QList<std::shared_ptr<ResourceFolderModel>> resourceLists();
     std::shared_ptr<WorldList> worldList();
-    std::shared_ptr<GameOptions> gameOptionsModel();
 
     //////  Launch stuff //////
     QList<Task::Ptr> createUpdateTask() override;
@@ -171,7 +169,6 @@ class MinecraftInstance : public BaseInstance {
     mutable std::shared_ptr<TexturePackFolderModel> m_texture_pack_list;
     mutable std::shared_ptr<DataPackFolderModel> m_data_pack_list;
     mutable std::shared_ptr<WorldList> m_world_list;
-    mutable std::shared_ptr<GameOptions> m_game_options;
 };
 
 using MinecraftInstancePtr = std::shared_ptr<MinecraftInstance>;