Properly remove gameoptions

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
This commit is contained in:
TheKodeToad
2025-09-19 09:42:13 +01:00
parent 7789ba8608
commit 49b238f384
3 changed files with 0 additions and 13 deletions
-1
View File
@@ -43,7 +43,6 @@ class InstancePageProvider : protected QObject, public BasePageProvider {
values.append(new NotesPage(onesix.get())); values.append(new NotesPage(onesix.get()));
values.append(new WorldListPage(onesix, onesix->worldList())); values.append(new WorldListPage(onesix, onesix->worldList()));
values.append(new ServersPage(onesix)); values.append(new ServersPage(onesix));
// values.append(new GameOptionsPage(onesix.get()));
values.append(new ScreenshotsPage(FS::PathCombine(onesix->gameRoot(), "screenshots"))); values.append(new ScreenshotsPage(FS::PathCombine(onesix->gameRoot(), "screenshots")));
values.append(new InstanceSettingsPage(onesix)); values.append(new InstanceSettingsPage(onesix));
values.append(new OtherLogsPage("logs", tr("Other logs"), "Other-Logs", inst)); values.append(new OtherLogsPage("logs", tr("Other logs"), "Other-Logs", inst));
-9
View File
@@ -85,7 +85,6 @@
#include "AssetsUtils.h" #include "AssetsUtils.h"
#include "MinecraftLoadAndCheck.h" #include "MinecraftLoadAndCheck.h"
#include "PackProfile.h" #include "PackProfile.h"
#include "minecraft/gameoptions/GameOptions.h"
#include "minecraft/update/FoldersTask.h" #include "minecraft/update/FoldersTask.h"
#include "tools/BaseProfiler.h" #include "tools/BaseProfiler.h"
@@ -1287,14 +1286,6 @@ std::shared_ptr<WorldList> MinecraftInstance::worldList()
return m_world_list; 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 QList<Mod*> MinecraftInstance::getJarMods() const
{ {
auto profile = m_components->getProfile(); auto profile = m_components->getProfile();
-3
View File
@@ -49,7 +49,6 @@ class ResourcePackFolderModel;
class ShaderPackFolderModel; class ShaderPackFolderModel;
class TexturePackFolderModel; class TexturePackFolderModel;
class WorldList; class WorldList;
class GameOptions;
class LaunchStep; class LaunchStep;
class PackProfile; class PackProfile;
@@ -121,7 +120,6 @@ class MinecraftInstance : public BaseInstance {
std::shared_ptr<DataPackFolderModel> dataPackList(); std::shared_ptr<DataPackFolderModel> dataPackList();
QList<std::shared_ptr<ResourceFolderModel>> resourceLists(); QList<std::shared_ptr<ResourceFolderModel>> resourceLists();
std::shared_ptr<WorldList> worldList(); std::shared_ptr<WorldList> worldList();
std::shared_ptr<GameOptions> gameOptionsModel();
////// Launch stuff ////// ////// Launch stuff //////
QList<Task::Ptr> createUpdateTask() override; 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<TexturePackFolderModel> m_texture_pack_list;
mutable std::shared_ptr<DataPackFolderModel> m_data_pack_list; mutable std::shared_ptr<DataPackFolderModel> m_data_pack_list;
mutable std::shared_ptr<WorldList> m_world_list; mutable std::shared_ptr<WorldList> m_world_list;
mutable std::shared_ptr<GameOptions> m_game_options;
}; };
using MinecraftInstancePtr = std::shared_ptr<MinecraftInstance>; using MinecraftInstancePtr = std::shared_ptr<MinecraftInstance>;