mirror of
https://gitlab.bixilon.de/bixilon/minosoft.git
synced 2025-08-03 20:16:16 -04:00
prepare for kutil 1.26.3
This commit is contained in:
parent
3c93f7cc45
commit
5011828949
2
.gitignore
vendored
2
.gitignore
vendored
@ -8,6 +8,8 @@ hs_err_pid*.log
|
||||
.gradle
|
||||
.gradle_home
|
||||
|
||||
.kotlin/
|
||||
|
||||
# Ignore Gradle build output directory
|
||||
build
|
||||
|
||||
|
@ -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()
|
||||
}
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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()
|
||||
|
@ -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
|
||||
|
@ -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)
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user