From 9e61c5f0011b38b5e6d98021ff460b5237184a91 Mon Sep 17 00:00:00 2001 From: Simon Date: Mon, 11 Dec 2023 20:09:04 +0100 Subject: [PATCH] Moving Quirks to unit files: adapt MHQ to MM changes --- MekHQ/src/mekhq/GameThread.java | 7 ------- MekHQ/src/mekhq/gui/dialog/DataLoadingDialog.java | 3 --- 2 files changed, 10 deletions(-) diff --git a/MekHQ/src/mekhq/GameThread.java b/MekHQ/src/mekhq/GameThread.java index 573410a559..fcd5adbaee 100644 --- a/MekHQ/src/mekhq/GameThread.java +++ b/MekHQ/src/mekhq/GameThread.java @@ -310,13 +310,6 @@ public void requestStop() { } catch (IOException e) { LogManager.getLogger().error("Error saving custom weapon orders!", e); } - - try { - QuirksHandler.saveCustomQuirksList(); - } catch (Exception e) { - LogManager.getLogger().error("Error saving quirks override!", e); - } - stop = true; } diff --git a/MekHQ/src/mekhq/gui/dialog/DataLoadingDialog.java b/MekHQ/src/mekhq/gui/dialog/DataLoadingDialog.java index 4fae5dd08e..e7c2e774d7 100644 --- a/MekHQ/src/mekhq/gui/dialog/DataLoadingDialog.java +++ b/MekHQ/src/mekhq/gui/dialog/DataLoadingDialog.java @@ -22,7 +22,6 @@ import megamek.client.generator.RandomNameGenerator; import megamek.client.ui.swing.util.UIUtil; import megamek.common.MechSummaryCache; -import megamek.common.QuirksHandler; import megamek.common.annotations.Nullable; import megamek.common.options.OptionsConstants; import mekhq.MHQStaticDirectoryManager; @@ -242,8 +241,6 @@ public Campaign doInBackground() throws Exception { //region Progress 5 setProgress(5); - QuirksHandler.initQuirksList(); - while (!MechSummaryCache.getInstance().isInitialized()) { try { Thread.sleep(50);