AstralTransRocketries/minosoft
1
0
Fork 0
mirror of https://gitlab.bixilon.de/bixilon/minosoft.git synced 2025-09-18 03:44:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

rename Minosoft::checkMacOS

Browse Source
This commit is contained in:
Bixilon 2022-11-01 14:49:20 +01:00
parent 56f13fbd59
commit 0b10f51d08
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/de/bixilon/minosoft/Minosoft.kt
View File

@ -81,7 +81,9 @@ object Minosoft {
MINOSOFT_ASSETS_MANAGER.load(CountUpAndDownLatch(0)) MINOSOFT_ASSETS_MANAGER.load(CountUpAndDownLatch(0))
warnMacOS() if (PlatformInfo.OS == OSTypes.MAC) {
checkMacOS()
}
MinosoftPropertiesLoader.load() MinosoftPropertiesLoader.load()
val taskWorker = TaskWorker(criticalErrorHandler = { _, exception -> exception.crash() }) val taskWorker = TaskWorker(criticalErrorHandler = { _, exception -> exception.crash() })
@ -142,9 +144,9 @@ object Minosoft {
} }
} }
private fun warnMacOS() { private fun checkMacOS() {
if (PlatformInfo.OS == OSTypes.MAC && RunConfiguration.X_START_ON_FIRST_THREAD_SET && (!RunConfiguration.DISABLE_RENDERING || !RunConfiguration.DISABLE_EROS)) { 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!" } 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) ShutdownManager.shutdown(reason = AbstractShutdownReason.CRASH)
} }
} }

1
src/main/java/de/bixilon/minosoft/modding/loader/mod/source/SplitDirectorySource.kt
View File

@ -29,6 +29,7 @@ class SplitDirectorySource(
val classes: File, val classes: File,
val resources: File, val resources: File,
) : ModSource, TextFormattable { ) : ModSource, TextFormattable {
override fun process(mod: MinosoftMod) { override fun process(mod: MinosoftMod) {
processResources(mod) processResources(mod)