bump kutil

This fixes the wrongly prioritized thread pool, thus it makes the nether far more playable
This commit is contained in:
Bixilon 2022-05-10 22:44:06 +02:00
parent e2a88a7aa9
commit 38e5f54319
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
6 changed files with 22 additions and 17 deletions

View File

@ -474,7 +474,7 @@
<dependency> <dependency>
<groupId>de.bixilon</groupId> <groupId>de.bixilon</groupId>
<artifactId>kutil</artifactId> <artifactId>kutil</artifactId>
<version>1.10.7</version> <version>1.11</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.netty</groupId> <groupId>io.netty</groupId>

View File

@ -19,7 +19,8 @@ import de.bixilon.kutil.concurrent.worker.TaskWorker
import de.bixilon.kutil.concurrent.worker.tasks.Task import de.bixilon.kutil.concurrent.worker.tasks.Task
import de.bixilon.kutil.file.watcher.FileWatcherService import de.bixilon.kutil.file.watcher.FileWatcherService
import de.bixilon.kutil.latch.CountUpAndDownLatch 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.kutil.reflection.ReflectionUtil.forceInit
import de.bixilon.minosoft.assets.file.ResourcesAssetsUtil import de.bixilon.minosoft.assets.file.ResourcesAssetsUtil
import de.bixilon.minosoft.assets.properties.version.AssetsVersionProperties import de.bixilon.minosoft.assets.properties.version.AssetsVersionProperties
@ -132,7 +133,7 @@ object Minosoft {
} }
private fun warnMacOS() { 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!" } 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!" }
} }
} }

View File

@ -13,7 +13,8 @@
package de.bixilon.minosoft.gui.eros 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.config.profile.profiles.other.OtherProfileManager
import de.bixilon.minosoft.gui.eros.dialog.SimpleErosWarningDialog import de.bixilon.minosoft.gui.eros.dialog.SimpleErosWarningDialog
import de.bixilon.minosoft.terminal.RunConfiguration import de.bixilon.minosoft.terminal.RunConfiguration
@ -36,7 +37,7 @@ object XStartOnFirstThreadWarning {
@Synchronized @Synchronized
fun show() { fun show() {
if (OSUtil.OS != OSUtil.OSs.MAC || RunConfiguration.DISABLE_RENDERING) { if (PlatformInfo.OS != OSTypes.MAC || RunConfiguration.DISABLE_RENDERING) {
return return
} }
if (OtherProfileManager.selected.ignoreXStartOnFirstThreadWarning) { if (OtherProfileManager.selected.ignoreXStartOnFirstThreadWarning) {

View File

@ -19,7 +19,7 @@ import de.bixilon.kutil.exception.ExceptionUtil.toStackTrace
import de.bixilon.kutil.exception.ExceptionUtil.tryCatch import de.bixilon.kutil.exception.ExceptionUtil.tryCatch
import de.bixilon.kutil.file.FileUtil.slashPath import de.bixilon.kutil.file.FileUtil.slashPath
import de.bixilon.kutil.file.watcher.FileWatcherService 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.time.TimeUtil
import de.bixilon.kutil.unit.UnitFormatter.formatBytes import de.bixilon.kutil.unit.UnitFormatter.formatBytes
import de.bixilon.kutil.unsafe.UnsafeUtil import de.bixilon.kutil.unsafe.UnsafeUtil
@ -262,7 +262,8 @@ $connections
-- System Details -- -- System Details --
Operating system: ${SystemInformation.OS_TEXT} 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 Java version: ${Runtime.version()} ${System.getProperty("sun.arch.data.model")}bit
Memory: ${SystemInformation.SYSTEM_MEMORY.formatBytes()} Memory: ${SystemInformation.SYSTEM_MEMORY.formatBytes()}
CPU: ${SystemInformation.PROCESSOR_TEXT} CPU: ${SystemInformation.PROCESSOR_TEXT}

View File

@ -15,7 +15,8 @@ package de.bixilon.minosoft.gui.rendering.system.window
import de.bixilon.kotlinglm.vec2.Vec2d import de.bixilon.kotlinglm.vec2.Vec2d
import de.bixilon.kotlinglm.vec2.Vec2i 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.key.KeyCodes
import de.bixilon.minosoft.config.profile.profiles.rendering.RenderingProfile import de.bixilon.minosoft.config.profile.profiles.rendering.RenderingProfile
import de.bixilon.minosoft.gui.rendering.RenderWindow import de.bixilon.minosoft.gui.rendering.RenderWindow
@ -228,7 +229,7 @@ class GLFWWindow(
override fun setOpenGLVersion(major: Int, minor: Int, coreProfile: Boolean) { override fun setOpenGLVersion(major: Int, minor: Int, coreProfile: Boolean) {
glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, major) glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, major)
glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, minor) 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_FORWARD_COMPAT, true.glfw)
} }
glfwWindowHint(GLFW_OPENGL_PROFILE, if (coreProfile) GLFW_OPENGL_CORE_PROFILE else GLFW_OPENGL_ANY_PROFILE) 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) { 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 Log.log(LogMessageType.RENDERING_GENERAL, LogLevels.WARN) { "Can not set window icon on mac os!" } // ToDo
return return
} }

View File

@ -15,7 +15,8 @@ package de.bixilon.minosoft.terminal
import com.google.common.base.StandardSystemProperty import com.google.common.base.StandardSystemProperty
import de.bixilon.kutil.file.FileUtil.slashPath 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.config.StaticConfiguration
import de.bixilon.minosoft.data.registries.ResourceLocation import de.bixilon.minosoft.data.registries.ResourceLocation
import java.io.File import java.io.File
@ -43,11 +44,11 @@ object RunConfiguration {
if (!homeDir.endsWith(File.separator)) { if (!homeDir.endsWith(File.separator)) {
homeDir += "/" homeDir += "/"
} }
homeDir += when (OSUtil.OS) { homeDir += when (PlatformInfo.OS) {
OSUtil.OSs.LINUX -> ".local/share/minosoft/" OSTypes.LINUX -> ".local/share/minosoft/"
OSUtil.OSs.WINDOWS -> "AppData/Roaming/Minosoft/" OSTypes.WINDOWS -> "AppData/Roaming/Minosoft/"
OSUtil.OSs.MAC -> "Library/Application Support/Minosoft/" OSTypes.MAC -> "Library/Application Support/Minosoft/"
OSUtil.OSs.OTHER -> ".minosoft/" else -> ".minosoft/"
} }
val folder = File(homeDir) val folder = File(homeDir)
if (!folder.exists() && !folder.mkdirs()) { if (!folder.exists() && !folder.mkdirs()) {
@ -65,7 +66,7 @@ object RunConfiguration {
var VERSION_STRING = "Minosoft ${StaticConfiguration.VERSION}" var VERSION_STRING = "Minosoft ${StaticConfiguration.VERSION}"
var SKIP_RENDERERS: List<ResourceLocation> = listOf() var SKIP_RENDERERS: List<ResourceLocation> = 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 var VERBOSE_LOGGING = false
} }