diff --git a/.gitignore b/.gitignore index 1f6c60749..0230ce28f 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,8 @@ hs_err_pid*.log .gradle .gradle_home +.kotlin/ + # Ignore Gradle build output directory build diff --git a/src/main/java/de/bixilon/minosoft/assets/util/FileUtil.kt b/src/main/java/de/bixilon/minosoft/assets/util/FileUtil.kt index f5e41c28e..efea1418c 100644 --- a/src/main/java/de/bixilon/minosoft/assets/util/FileUtil.kt +++ b/src/main/java/de/bixilon/minosoft/assets/util/FileUtil.kt @@ -16,7 +16,10 @@ package de.bixilon.minosoft.assets.util import com.github.luben.zstd.ZstdInputStream import de.bixilon.minosoft.terminal.RunConfiguration import javafx.scene.image.Image -import java.io.* +import java.io.BufferedInputStream +import java.io.File +import java.io.FileInputStream +import java.io.InputStream import java.nio.file.Files import java.nio.file.Path @@ -46,18 +49,6 @@ object FileUtil { return readFile(path.toFile(), compressed) } - @Deprecated("kutil 1.26.3") - fun File.mkdirParent() { - val parent = this.parentFile - if (parent.exists()) { - return - } - if (!parent.mkdirs()) { - throw IOException("Can not create parent of $this") - } - } - - fun createTempFile(): File { return Files.createTempFile(RunConfiguration.TEMPORARY_FOLDER, "", "").toFile() } diff --git a/src/main/java/de/bixilon/minosoft/config/profile/manager/ProfileManagers.kt b/src/main/java/de/bixilon/minosoft/config/profile/manager/ProfileManagers.kt index e51513f21..2771273a9 100644 --- a/src/main/java/de/bixilon/minosoft/config/profile/manager/ProfileManagers.kt +++ b/src/main/java/de/bixilon/minosoft/config/profile/manager/ProfileManagers.kt @@ -16,9 +16,9 @@ package de.bixilon.minosoft.config.profile.manager import de.bixilon.kutil.concurrent.pool.DefaultThreadPool import de.bixilon.kutil.concurrent.worker.unconditional.UnconditionalWorker import de.bixilon.kutil.exception.ExceptionUtil.ignoreAll +import de.bixilon.kutil.file.FileUtil.mkdirParent import de.bixilon.kutil.file.watcher.FileWatcherService import de.bixilon.kutil.latch.AbstractLatch -import de.bixilon.minosoft.assets.util.FileUtil.mkdirParent import de.bixilon.minosoft.config.profile.profiles.account.AccountProfileManager import de.bixilon.minosoft.config.profile.profiles.audio.AudioProfileManager import de.bixilon.minosoft.config.profile.profiles.block.BlockProfileManager diff --git a/src/main/java/de/bixilon/minosoft/config/profile/storage/StorageProfileManager.kt b/src/main/java/de/bixilon/minosoft/config/profile/storage/StorageProfileManager.kt index 7e6ec20d9..97239124f 100644 --- a/src/main/java/de/bixilon/minosoft/config/profile/storage/StorageProfileManager.kt +++ b/src/main/java/de/bixilon/minosoft/config/profile/storage/StorageProfileManager.kt @@ -22,12 +22,12 @@ import de.bixilon.kutil.collections.CollectionUtil.mutableBiMapOf import de.bixilon.kutil.collections.map.bi.AbstractMutableBiMap import de.bixilon.kutil.concurrent.lock.simple.SimpleLock import de.bixilon.kutil.exception.Broken +import de.bixilon.kutil.file.FileUtil.mkdirParent import de.bixilon.kutil.file.watcher.FileWatcherService import de.bixilon.kutil.observer.DataObserver.Companion.observe import de.bixilon.kutil.observer.DataObserver.Companion.observed import de.bixilon.kutil.observer.map.bi.BiMapObserver.Companion.observedBiMap import de.bixilon.kutil.stream.InputStreamUtil.readAsString -import de.bixilon.minosoft.assets.util.FileUtil.mkdirParent import de.bixilon.minosoft.config.profile.ProfileType import de.bixilon.minosoft.config.profile.ProfileUtil.isValidName import de.bixilon.minosoft.config.profile.profiles.Profile diff --git a/src/main/java/de/bixilon/minosoft/gui/RenderLoop.kt b/src/main/java/de/bixilon/minosoft/gui/RenderLoop.kt index 2804baa0a..99fa9118d 100644 --- a/src/main/java/de/bixilon/minosoft/gui/RenderLoop.kt +++ b/src/main/java/de/bixilon/minosoft/gui/RenderLoop.kt @@ -100,7 +100,7 @@ class RenderLoop( context.camera.draw() // handle opengl context tasks, but limit it per frame - context.queue.timeWork(RenderConstants.MAXIMUM_QUEUE_TIME_PER_FRAME) + context.queue.workTimeLimited(RenderConstants.MAXIMUM_QUEUE_TIME_PER_FRAME) if (context.state == RenderingStates.STOPPED) { context.window.close() diff --git a/src/main/java/de/bixilon/minosoft/gui/eros/main/play/server/card/FaviconManager.kt b/src/main/java/de/bixilon/minosoft/gui/eros/main/play/server/card/FaviconManager.kt index f7779578f..45533a1a8 100644 --- a/src/main/java/de/bixilon/minosoft/gui/eros/main/play/server/card/FaviconManager.kt +++ b/src/main/java/de/bixilon/minosoft/gui/eros/main/play/server/card/FaviconManager.kt @@ -14,10 +14,10 @@ package de.bixilon.minosoft.gui.eros.main.play.server.card import com.github.luben.zstd.ZstdOutputStream +import de.bixilon.kutil.file.FileUtil.mkdirParent import de.bixilon.kutil.hash.HashUtil.sha256 import de.bixilon.minosoft.assets.util.FileAssetsTypes import de.bixilon.minosoft.assets.util.FileUtil -import de.bixilon.minosoft.assets.util.FileUtil.mkdirParent import de.bixilon.minosoft.assets.util.FileUtil.readImage import de.bixilon.minosoft.assets.util.PathUtil import de.bixilon.minosoft.config.profile.profiles.eros.server.entries.AbstractServer diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/sound/AudioPlayer.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/sound/AudioPlayer.kt index 2dd633f5f..22f7de31e 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/sound/AudioPlayer.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/sound/AudioPlayer.kt @@ -234,7 +234,7 @@ class AudioPlayer( if (session.established || session.error != null) { break } - queue.work() + queue.workBlocking(500L) calculateAvailableSources() while (!enabled) { Thread.sleep(1L) @@ -242,7 +242,6 @@ class AudioPlayer( break } } - Thread.sleep(1L) } }