From 0b10f51d085400b479a4b11896ea8edcff956333 Mon Sep 17 00:00:00 2001 From: Bixilon Date: Tue, 1 Nov 2022 14:49:20 +0100 Subject: [PATCH] rename Minosoft::checkMacOS --- src/main/java/de/bixilon/minosoft/Minosoft.kt | 10 ++++++---- .../modding/loader/mod/source/SplitDirectorySource.kt | 1 + 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/main/java/de/bixilon/minosoft/Minosoft.kt b/src/main/java/de/bixilon/minosoft/Minosoft.kt index 16f65b103..985289cc3 100644 --- a/src/main/java/de/bixilon/minosoft/Minosoft.kt +++ b/src/main/java/de/bixilon/minosoft/Minosoft.kt @@ -81,7 +81,9 @@ object Minosoft { MINOSOFT_ASSETS_MANAGER.load(CountUpAndDownLatch(0)) - warnMacOS() + if (PlatformInfo.OS == OSTypes.MAC) { + checkMacOS() + } MinosoftPropertiesLoader.load() val taskWorker = TaskWorker(criticalErrorHandler = { _, exception -> exception.crash() }) @@ -142,9 +144,9 @@ object Minosoft { } } - private fun warnMacOS() { - if (PlatformInfo.OS == OSTypes.MAC && RunConfiguration.X_START_ON_FIRST_THREAD_SET && (!RunConfiguration.DISABLE_RENDERING || !RunConfiguration.DISABLE_EROS)) { - Log.log(LogMessageType.GENERAL, LogLevels.WARN) { "You are using MacOS. To use rendering you must not set the jvm argument §9-XstartOnFirstThread§r. Please remove it!" } + private fun checkMacOS() { + if (RunConfiguration.X_START_ON_FIRST_THREAD_SET && (!RunConfiguration.DISABLE_RENDERING || !RunConfiguration.DISABLE_EROS)) { + Log.log(LogMessageType.GENERAL, LogLevels.WARN) { "You are using macOS. To use rendering you must not set the jvm argument §9-XstartOnFirstThread§r. Please remove it!" } ShutdownManager.shutdown(reason = AbstractShutdownReason.CRASH) } } diff --git a/src/main/java/de/bixilon/minosoft/modding/loader/mod/source/SplitDirectorySource.kt b/src/main/java/de/bixilon/minosoft/modding/loader/mod/source/SplitDirectorySource.kt index faef2432b..521605c9c 100644 --- a/src/main/java/de/bixilon/minosoft/modding/loader/mod/source/SplitDirectorySource.kt +++ b/src/main/java/de/bixilon/minosoft/modding/loader/mod/source/SplitDirectorySource.kt @@ -29,6 +29,7 @@ class SplitDirectorySource( val classes: File, val resources: File, ) : ModSource, TextFormattable { + override fun process(mod: MinosoftMod) { processResources(mod)