AstralTransRocketries/minosoft
1
0
Fork 0
mirror of https://gitlab.bixilon.de/bixilon/minosoft.git synced 2025-09-18 20:05:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

adapt kutil 1.17.1

Browse Source
This commit is contained in:
Bixilon 2022-10-27 22:12:42 +02:00
parent bb5bc33b4b
commit f805174f52
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
4 changed files with 4 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/de/bixilon/minosoft/Minosoft.kt
View File

@ -61,7 +61,6 @@ import de.bixilon.minosoft.util.yggdrasil.YggdrasilUtil
object Minosoft { object Minosoft {
val MAIN_THREAD: Thread = Thread.currentThread()
val MINOSOFT_ASSETS_MANAGER = ResourcesAssetsUtil.create(Minosoft::class.java, canUnload = false) 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 OVERRIDE_ASSETS_MANAGER = ResourcesAssetsUtil.create(Minosoft::class.java, canUnload = false, prefix = "assets_override")
val LANGUAGE_MANAGER = MultiLanguageManager() val LANGUAGE_MANAGER = MultiLanguageManager()
@ -79,6 +78,7 @@ object Minosoft {
ModLoader.initModLoading() ModLoader.initModLoading()
ModLoader.load(LoadingPhases.PRE_BOOT, CountUpAndDownLatch(0)) ModLoader.load(LoadingPhases.PRE_BOOT, CountUpAndDownLatch(0))
ModLoader.await(LoadingPhases.PRE_BOOT) ModLoader.await(LoadingPhases.PRE_BOOT)
MINOSOFT_ASSETS_MANAGER.load(CountUpAndDownLatch(0)) MINOSOFT_ASSETS_MANAGER.load(CountUpAndDownLatch(0))
warnMacOS() warnMacOS()

4
src/main/java/de/bixilon/minosoft/data/world/chunk/light/BorderSectionLight.kt
View File

@ -13,12 +13,12 @@
package de.bixilon.minosoft.data.world.chunk.light 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.direction.Directions
import de.bixilon.minosoft.data.world.chunk.Chunk import de.bixilon.minosoft.data.world.chunk.Chunk
import de.bixilon.minosoft.data.world.chunk.neighbours.ChunkNeighbours import de.bixilon.minosoft.data.world.chunk.neighbours.ChunkNeighbours
import de.bixilon.minosoft.protocol.protocol.ProtocolDefinition import de.bixilon.minosoft.protocol.protocol.ProtocolDefinition
import de.bixilon.minosoft.util.KUtil.getFirst
import de.bixilon.minosoft.util.KUtil.getLast
class BorderSectionLight( class BorderSectionLight(
val top: Boolean, val top: Boolean,

2
src/main/java/de/bixilon/minosoft/gui/eros/main/mods/ModsController.kt
View File

@ -13,6 +13,7 @@
package de.bixilon.minosoft.gui.eros.main.mods 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.registries.ResourceLocation
import de.bixilon.minosoft.data.text.TextComponent import de.bixilon.minosoft.data.text.TextComponent
import de.bixilon.minosoft.data.text.TranslatableComponents 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.ModLoader
import de.bixilon.minosoft.modding.loader.mod.MinosoftMod import de.bixilon.minosoft.modding.loader.mod.MinosoftMod
import de.bixilon.minosoft.util.KUtil.minosoft import de.bixilon.minosoft.util.KUtil.minosoft
import de.bixilon.minosoft.util.KUtil.toNull
import javafx.fxml.FXML import javafx.fxml.FXML
import javafx.scene.control.ListView import javafx.scene.control.ListView
import javafx.scene.layout.Pane import javafx.scene.layout.Pane

18
src/main/java/de/bixilon/minosoft/util/KUtil.kt
View File

@ -318,22 +318,4 @@ object KUtil {
if (this is CharSequence) return this.length if (this is CharSequence) return this.length
return toString().length return toString().length
} }
@Deprecated("Kutil 1.18")
inline fun <T> Array<T>.getFirst(): T {
return this[0]
}
@Deprecated("Kutil 1.18")
inline fun <T> Array<T>.getLast(): T {
return this[lastIndex]
}
@Deprecated("Kutil 1.18")
fun <T : Collection<*>> T.toNull(): T? {
if (isEmpty()) {
return null
}
return this
}
} }