diff --git a/src/main/java/de/bixilon/minosoft/Minosoft.kt b/src/main/java/de/bixilon/minosoft/Minosoft.kt index 68e03a279..59310b38b 100644 --- a/src/main/java/de/bixilon/minosoft/Minosoft.kt +++ b/src/main/java/de/bixilon/minosoft/Minosoft.kt @@ -61,7 +61,6 @@ import de.bixilon.minosoft.util.yggdrasil.YggdrasilUtil object Minosoft { - val MAIN_THREAD: Thread = Thread.currentThread() val MINOSOFT_ASSETS_MANAGER = ResourcesAssetsUtil.create(Minosoft::class.java, canUnload = false) val OVERRIDE_ASSETS_MANAGER = ResourcesAssetsUtil.create(Minosoft::class.java, canUnload = false, prefix = "assets_override") val LANGUAGE_MANAGER = MultiLanguageManager() @@ -79,6 +78,7 @@ object Minosoft { ModLoader.initModLoading() ModLoader.load(LoadingPhases.PRE_BOOT, CountUpAndDownLatch(0)) ModLoader.await(LoadingPhases.PRE_BOOT) + MINOSOFT_ASSETS_MANAGER.load(CountUpAndDownLatch(0)) warnMacOS() diff --git a/src/main/java/de/bixilon/minosoft/data/world/chunk/light/BorderSectionLight.kt b/src/main/java/de/bixilon/minosoft/data/world/chunk/light/BorderSectionLight.kt index 55c38cd4e..b999597b2 100644 --- a/src/main/java/de/bixilon/minosoft/data/world/chunk/light/BorderSectionLight.kt +++ b/src/main/java/de/bixilon/minosoft/data/world/chunk/light/BorderSectionLight.kt @@ -13,12 +13,12 @@ package de.bixilon.minosoft.data.world.chunk.light +import de.bixilon.kutil.array.ArrayUtil.getFirst +import de.bixilon.kutil.array.ArrayUtil.getLast import de.bixilon.minosoft.data.direction.Directions import de.bixilon.minosoft.data.world.chunk.Chunk import de.bixilon.minosoft.data.world.chunk.neighbours.ChunkNeighbours import de.bixilon.minosoft.protocol.protocol.ProtocolDefinition -import de.bixilon.minosoft.util.KUtil.getFirst -import de.bixilon.minosoft.util.KUtil.getLast class BorderSectionLight( val top: Boolean, diff --git a/src/main/java/de/bixilon/minosoft/gui/eros/main/mods/ModsController.kt b/src/main/java/de/bixilon/minosoft/gui/eros/main/mods/ModsController.kt index 8c6c26ce7..431d27b00 100644 --- a/src/main/java/de/bixilon/minosoft/gui/eros/main/mods/ModsController.kt +++ b/src/main/java/de/bixilon/minosoft/gui/eros/main/mods/ModsController.kt @@ -13,6 +13,7 @@ package de.bixilon.minosoft.gui.eros.main.mods +import de.bixilon.kutil.collections.CollectionUtil.toNull import de.bixilon.minosoft.data.registries.ResourceLocation import de.bixilon.minosoft.data.text.TextComponent import de.bixilon.minosoft.data.text.TranslatableComponents @@ -22,7 +23,6 @@ import de.bixilon.minosoft.gui.eros.main.InfoPane import de.bixilon.minosoft.modding.loader.ModLoader import de.bixilon.minosoft.modding.loader.mod.MinosoftMod import de.bixilon.minosoft.util.KUtil.minosoft -import de.bixilon.minosoft.util.KUtil.toNull import javafx.fxml.FXML import javafx.scene.control.ListView import javafx.scene.layout.Pane diff --git a/src/main/java/de/bixilon/minosoft/util/KUtil.kt b/src/main/java/de/bixilon/minosoft/util/KUtil.kt index b98af19ce..674b4025b 100644 --- a/src/main/java/de/bixilon/minosoft/util/KUtil.kt +++ b/src/main/java/de/bixilon/minosoft/util/KUtil.kt @@ -318,22 +318,4 @@ object KUtil { if (this is CharSequence) return this.length return toString().length } - - @Deprecated("Kutil 1.18") - inline fun Array.getFirst(): T { - return this[0] - } - - @Deprecated("Kutil 1.18") - inline fun Array.getLast(): T { - return this[lastIndex] - } - - @Deprecated("Kutil 1.18") - fun > T.toNull(): T? { - if (isEmpty()) { - return null - } - return this - } }