diff --git a/pom.xml b/pom.xml index 22cd13664..2bf2a399b 100644 --- a/pom.xml +++ b/pom.xml @@ -474,7 +474,7 @@ de.bixilon kutil - 1.10.7 + 1.11 io.netty diff --git a/src/main/java/de/bixilon/minosoft/Minosoft.kt b/src/main/java/de/bixilon/minosoft/Minosoft.kt index 23bdd6ada..4eaa5efac 100644 --- a/src/main/java/de/bixilon/minosoft/Minosoft.kt +++ b/src/main/java/de/bixilon/minosoft/Minosoft.kt @@ -19,7 +19,8 @@ import de.bixilon.kutil.concurrent.worker.TaskWorker import de.bixilon.kutil.concurrent.worker.tasks.Task import de.bixilon.kutil.file.watcher.FileWatcherService import de.bixilon.kutil.latch.CountUpAndDownLatch -import de.bixilon.kutil.os.OSUtil +import de.bixilon.kutil.os.OSTypes +import de.bixilon.kutil.os.PlatformInfo import de.bixilon.kutil.reflection.ReflectionUtil.forceInit import de.bixilon.minosoft.assets.file.ResourcesAssetsUtil import de.bixilon.minosoft.assets.properties.version.AssetsVersionProperties @@ -132,7 +133,7 @@ object Minosoft { } private fun warnMacOS() { - if (OSUtil.OS == OSUtil.OSs.MAC && !RunConfiguration.X_START_ON_FIRST_THREAD_SET && !RunConfiguration.DISABLE_RENDERING) { + if (PlatformInfo.OS == OSTypes.MAC && !RunConfiguration.X_START_ON_FIRST_THREAD_SET && !RunConfiguration.DISABLE_RENDERING) { Log.log(LogMessageType.GENERAL, LogLevels.WARN) { "You are using MacOS. To use rendering you have to add the jvm argument §9-XstartOnFirstThread§r. Please ensure it is set!" } } } diff --git a/src/main/java/de/bixilon/minosoft/gui/eros/XStartOnFirstThreadWarning.kt b/src/main/java/de/bixilon/minosoft/gui/eros/XStartOnFirstThreadWarning.kt index d4256a6c1..6eefce537 100644 --- a/src/main/java/de/bixilon/minosoft/gui/eros/XStartOnFirstThreadWarning.kt +++ b/src/main/java/de/bixilon/minosoft/gui/eros/XStartOnFirstThreadWarning.kt @@ -13,7 +13,8 @@ package de.bixilon.minosoft.gui.eros -import de.bixilon.kutil.os.OSUtil +import de.bixilon.kutil.os.OSTypes +import de.bixilon.kutil.os.PlatformInfo import de.bixilon.minosoft.config.profile.profiles.other.OtherProfileManager import de.bixilon.minosoft.gui.eros.dialog.SimpleErosWarningDialog import de.bixilon.minosoft.terminal.RunConfiguration @@ -36,7 +37,7 @@ object XStartOnFirstThreadWarning { @Synchronized fun show() { - if (OSUtil.OS != OSUtil.OSs.MAC || RunConfiguration.DISABLE_RENDERING) { + if (PlatformInfo.OS != OSTypes.MAC || RunConfiguration.DISABLE_RENDERING) { return } if (OtherProfileManager.selected.ignoreXStartOnFirstThreadWarning) { diff --git a/src/main/java/de/bixilon/minosoft/gui/eros/crash/ErosCrashReport.kt b/src/main/java/de/bixilon/minosoft/gui/eros/crash/ErosCrashReport.kt index b38cf3e9a..830120dc4 100644 --- a/src/main/java/de/bixilon/minosoft/gui/eros/crash/ErosCrashReport.kt +++ b/src/main/java/de/bixilon/minosoft/gui/eros/crash/ErosCrashReport.kt @@ -19,7 +19,7 @@ import de.bixilon.kutil.exception.ExceptionUtil.toStackTrace import de.bixilon.kutil.exception.ExceptionUtil.tryCatch import de.bixilon.kutil.file.FileUtil.slashPath import de.bixilon.kutil.file.watcher.FileWatcherService -import de.bixilon.kutil.os.OSUtil +import de.bixilon.kutil.os.PlatformInfo import de.bixilon.kutil.time.TimeUtil import de.bixilon.kutil.unit.UnitFormatter.formatBytes import de.bixilon.kutil.unsafe.UnsafeUtil @@ -262,7 +262,8 @@ $connections -- System Details -- Operating system: ${SystemInformation.OS_TEXT} - Detected operating system: ${OSUtil.OS} + Detected operating system: ${PlatformInfo.OS} + Detected architecture: ${PlatformInfo.ARCHITECTURE} Java version: ${Runtime.version()} ${System.getProperty("sun.arch.data.model")}bit Memory: ${SystemInformation.SYSTEM_MEMORY.formatBytes()} CPU: ${SystemInformation.PROCESSOR_TEXT} diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/system/window/GLFWWindow.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/system/window/GLFWWindow.kt index 2e751f6cf..de30cac5f 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/system/window/GLFWWindow.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/system/window/GLFWWindow.kt @@ -15,7 +15,8 @@ package de.bixilon.minosoft.gui.rendering.system.window import de.bixilon.kotlinglm.vec2.Vec2d import de.bixilon.kotlinglm.vec2.Vec2i -import de.bixilon.kutil.os.OSUtil +import de.bixilon.kutil.os.OSTypes +import de.bixilon.kutil.os.PlatformInfo import de.bixilon.minosoft.config.key.KeyCodes import de.bixilon.minosoft.config.profile.profiles.rendering.RenderingProfile import de.bixilon.minosoft.gui.rendering.RenderWindow @@ -228,7 +229,7 @@ class GLFWWindow( override fun setOpenGLVersion(major: Int, minor: Int, coreProfile: Boolean) { glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, major) glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, minor) - if (OSUtil.OS == OSUtil.OSs.MAC) { + if (PlatformInfo.OS == OSTypes.MAC) { glfwWindowHint(GLFW_OPENGL_FORWARD_COMPAT, true.glfw) } glfwWindowHint(GLFW_OPENGL_PROFILE, if (coreProfile) GLFW_OPENGL_CORE_PROFILE else GLFW_OPENGL_ANY_PROFILE) @@ -327,7 +328,7 @@ class GLFWWindow( } override fun setIcon(size: Vec2i, buffer: ByteBuffer) { - if (OSUtil.OS == OSUtil.OSs.MAC) { + if (PlatformInfo.OS == OSTypes.MAC) { Log.log(LogMessageType.RENDERING_GENERAL, LogLevels.WARN) { "Can not set window icon on mac os!" } // ToDo return } diff --git a/src/main/java/de/bixilon/minosoft/terminal/RunConfiguration.kt b/src/main/java/de/bixilon/minosoft/terminal/RunConfiguration.kt index d93839940..900a2da94 100644 --- a/src/main/java/de/bixilon/minosoft/terminal/RunConfiguration.kt +++ b/src/main/java/de/bixilon/minosoft/terminal/RunConfiguration.kt @@ -15,7 +15,8 @@ package de.bixilon.minosoft.terminal import com.google.common.base.StandardSystemProperty import de.bixilon.kutil.file.FileUtil.slashPath -import de.bixilon.kutil.os.OSUtil +import de.bixilon.kutil.os.OSTypes +import de.bixilon.kutil.os.PlatformInfo import de.bixilon.minosoft.config.StaticConfiguration import de.bixilon.minosoft.data.registries.ResourceLocation import java.io.File @@ -43,11 +44,11 @@ object RunConfiguration { if (!homeDir.endsWith(File.separator)) { homeDir += "/" } - homeDir += when (OSUtil.OS) { - OSUtil.OSs.LINUX -> ".local/share/minosoft/" - OSUtil.OSs.WINDOWS -> "AppData/Roaming/Minosoft/" - OSUtil.OSs.MAC -> "Library/Application Support/Minosoft/" - OSUtil.OSs.OTHER -> ".minosoft/" + homeDir += when (PlatformInfo.OS) { + OSTypes.LINUX -> ".local/share/minosoft/" + OSTypes.WINDOWS -> "AppData/Roaming/Minosoft/" + OSTypes.MAC -> "Library/Application Support/Minosoft/" + else -> ".minosoft/" } val folder = File(homeDir) if (!folder.exists() && !folder.mkdirs()) { @@ -65,7 +66,7 @@ object RunConfiguration { var VERSION_STRING = "Minosoft ${StaticConfiguration.VERSION}" var SKIP_RENDERERS: List = listOf() - var OPEN_Gl_ON_FIRST_THREAD = OSUtil.OS == OSUtil.OSs.MAC + var OPEN_Gl_ON_FIRST_THREAD = PlatformInfo.OS == OSTypes.MAC var VERBOSE_LOGGING = false }