improve delegate system, fix some bugs

This commit is contained in:
Bixilon 2021-12-08 20:29:46 +01:00
parent 91b067cda9
commit 3368ae4a72
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
30 changed files with 52 additions and 57 deletions

View File

@ -14,7 +14,7 @@
package de.bixilon.minosoft
import de.bixilon.minosoft.config.profile.GlobalProfileManager
import de.bixilon.minosoft.config.profile.delegate.watcher.SimpleProfileDelegateLWatcher.Companion.profileWatch
import de.bixilon.minosoft.config.profile.delegate.watcher.SimpleProfileDelegateWatcher.Companion.profileWatch
import de.bixilon.minosoft.config.profile.profiles.eros.ErosProfileManager
import de.bixilon.minosoft.data.assets.JarAssetsManager
import de.bixilon.minosoft.data.assets.Resources

View File

@ -9,17 +9,16 @@ import de.bixilon.minosoft.util.KUtil.toSynchronizedSet
import de.bixilon.minosoft.util.KUtil.unsafeCast
import de.bixilon.minosoft.util.collections.SynchronizedMap
import java.lang.ref.WeakReference
import java.lang.reflect.Field
object ProfilesDelegateManager {
private val listeners: SynchronizedMap<Field, SynchronizedMap<Profile?, MutableSet<Pair<WeakReference<Any>, ProfileDelegateWatcher<Any>>>>> = synchronizedMapOf()
private val listeners: SynchronizedMap<String, SynchronizedMap<Profile?, MutableSet<Pair<WeakReference<Any>, ProfileDelegateWatcher<Any>>>>> = synchronizedMapOf()
fun <T> register(reference: Any, listener: ProfileDelegateWatcher<T>) {
this.listeners.getOrPut(listener.field) { synchronizedMapOf() }.getOrPut(listener.profile) { synchronizedSetOf() }.add(Pair(WeakReference(reference), listener.unsafeCast()))
this.listeners.getOrPut(listener.fieldIdentifier) { synchronizedMapOf() }.getOrPut(listener.profile) { synchronizedSetOf() }.add(Pair(WeakReference(reference), listener.unsafeCast()))
}
fun onChange(profile: Profile, field: Field, previous: Any?, value: Any?) {
val fieldListeners = listeners[field] ?: return
fun onChange(profile: Profile, fieldIdentifier: String, previous: Any?, value: Any?) {
val fieldListeners = listeners[fieldIdentifier] ?: return
fun work(queue: MutableSet<Pair<WeakReference<Any>, ProfileDelegateWatcher<Any>>>) {
val toRemove: MutableSet<Pair<WeakReference<Any>, ProfileDelegateWatcher<Any>>> = mutableSetOf()

View File

@ -4,13 +4,13 @@ import de.bixilon.minosoft.config.StaticConfiguration
import de.bixilon.minosoft.config.profile.ProfileManager
import de.bixilon.minosoft.config.profile.delegate.ProfilesDelegateManager
import de.bixilon.minosoft.config.profile.profiles.Profile
import de.bixilon.minosoft.util.delegate.DelegateManager.identifier
import de.bixilon.minosoft.util.delegate.delegate.DelegateSetter
import de.bixilon.minosoft.util.logging.Log
import de.bixilon.minosoft.util.logging.LogLevels
import de.bixilon.minosoft.util.logging.LogMessageType
import kotlin.properties.ReadWriteProperty
import kotlin.reflect.KProperty
import kotlin.reflect.jvm.javaField
abstract class BackingDelegate<V>(
private val profileManager: ProfileManager<*>,
@ -45,6 +45,6 @@ abstract class BackingDelegate<V>(
}
set(value)
ProfilesDelegateManager.onChange(profile, property.javaField ?: return, previous, value)
ProfilesDelegateManager.onChange(profile, property.identifier, previous, value)
}
}

View File

@ -3,13 +3,13 @@ package de.bixilon.minosoft.config.profile.delegate.delegate.entry
import de.bixilon.minosoft.config.StaticConfiguration
import de.bixilon.minosoft.config.profile.ProfileManager
import de.bixilon.minosoft.config.profile.delegate.ProfilesDelegateManager
import de.bixilon.minosoft.util.delegate.DelegateManager.identifier
import de.bixilon.minosoft.util.logging.Log
import de.bixilon.minosoft.util.logging.LogLevels
import de.bixilon.minosoft.util.logging.LogMessageType
import javafx.collections.FXCollections
import javafx.collections.ListChangeListener
import javafx.collections.ObservableList
import kotlin.reflect.jvm.javaField
open class ListDelegateProfile<V>(
private var value: ObservableList<V>,
@ -37,7 +37,7 @@ open class ListDelegateProfile<V>(
profileManager.profiles[profileName]?.saved = false
}
ProfilesDelegateManager.onChange(profile, property.javaField ?: return@ListChangeListener, null, it)
ProfilesDelegateManager.onChange(profile, property.identifier, null, it)
})
}

View File

@ -3,6 +3,7 @@ package de.bixilon.minosoft.config.profile.delegate.delegate.entry
import de.bixilon.minosoft.config.StaticConfiguration
import de.bixilon.minosoft.config.profile.ProfileManager
import de.bixilon.minosoft.config.profile.delegate.ProfilesDelegateManager
import de.bixilon.minosoft.util.delegate.DelegateManager.identifier
import de.bixilon.minosoft.util.logging.Log
import de.bixilon.minosoft.util.logging.LogLevels
import de.bixilon.minosoft.util.logging.LogMessageType
@ -10,7 +11,6 @@ import javafx.collections.FXCollections
import javafx.collections.MapChangeListener
import javafx.collections.ObservableMap
import kotlin.reflect.KProperty
import kotlin.reflect.jvm.javaField
open class MapDelegateProfile<K, V>(
private var value: ObservableMap<K, V>,
@ -41,7 +41,7 @@ open class MapDelegateProfile<K, V>(
profileManager.profiles[profileName]?.saved = false
}
ProfilesDelegateManager.onChange(profile, property.javaField ?: return@MapChangeListener, null, it)
ProfilesDelegateManager.onChange(profile, property.identifier, null, it)
})
}

View File

@ -3,13 +3,13 @@ package de.bixilon.minosoft.config.profile.delegate.delegate.entry
import de.bixilon.minosoft.config.StaticConfiguration
import de.bixilon.minosoft.config.profile.ProfileManager
import de.bixilon.minosoft.config.profile.delegate.ProfilesDelegateManager
import de.bixilon.minosoft.util.delegate.DelegateManager.identifier
import de.bixilon.minosoft.util.logging.Log
import de.bixilon.minosoft.util.logging.LogLevels
import de.bixilon.minosoft.util.logging.LogMessageType
import javafx.collections.FXCollections
import javafx.collections.ObservableSet
import javafx.collections.SetChangeListener
import kotlin.reflect.jvm.javaField
open class SetDelegateProfile<V>(
private var value: ObservableSet<V>,
@ -38,7 +38,7 @@ open class SetDelegateProfile<V>(
profileManager.profiles[profileName]?.saved = false
}
ProfilesDelegateManager.onChange(profile, property.javaField ?: return@SetChangeListener, null, it)
ProfilesDelegateManager.onChange(profile, property.identifier, null, it)
})
}

View File

@ -1,12 +1,11 @@
package de.bixilon.minosoft.config.profile.delegate.watcher
import de.bixilon.minosoft.config.profile.profiles.Profile
import java.lang.reflect.Field
import kotlin.reflect.KProperty
interface ProfileDelegateWatcher<T> {
val property: KProperty<T>
val field: Field
val fieldIdentifier: String
val profile: Profile?

View File

@ -5,18 +5,17 @@ import de.bixilon.minosoft.config.profile.profiles.Profile
import de.bixilon.minosoft.gui.eros.util.JavaFXUtil
import de.bixilon.minosoft.gui.rendering.Rendering
import de.bixilon.minosoft.util.KUtil.unsafeCast
import java.lang.reflect.Field
import de.bixilon.minosoft.util.delegate.DelegateManager.identifier
import kotlin.reflect.KProperty
import kotlin.reflect.KProperty0
import kotlin.reflect.jvm.javaField
class SimpleProfileDelegateLWatcher<T>(
class SimpleProfileDelegateWatcher<T>(
override val property: KProperty<T>,
override val field: Field,
override val profile: Profile?,
instant: Boolean,
private val callback: (T) -> Unit,
) : ProfileDelegateWatcher<T> {
override val fieldIdentifier: String = property.identifier
init {
if (instant) {
@ -35,18 +34,18 @@ class SimpleProfileDelegateLWatcher<T>(
@JvmOverloads
fun <T> KProperty<T>.profileWatch(reference: Any, instant: Boolean = false, profile: Profile? = null, callback: ((T) -> Unit)) {
ProfilesDelegateManager.register(reference, SimpleProfileDelegateLWatcher(this, javaField!!, profile, instant, callback))
ProfilesDelegateManager.register(reference, SimpleProfileDelegateWatcher(this, profile, instant, callback))
}
@JvmOverloads
fun <T> KProperty<T>.profileWatchFX(reference: Any, instant: Boolean = false, profile: Profile? = null, callback: ((T) -> Unit)) {
ProfilesDelegateManager.register(reference, SimpleProfileDelegateLWatcher(this, javaField!!, profile, instant) { JavaFXUtil.runLater { callback(it) } })
ProfilesDelegateManager.register(reference, SimpleProfileDelegateWatcher(this, profile, instant) { JavaFXUtil.runLater { callback(it) } })
}
@JvmOverloads
fun <T> KProperty<T>.profileWatchRendering(reference: Any, instant: Boolean = false, profile: Profile? = null, callback: ((T) -> Unit)) {
val context = Rendering.currentContext ?: throw IllegalStateException("Can only be registered in a render context!")
ProfilesDelegateManager.register(reference, SimpleProfileDelegateLWatcher(this, javaField!!, profile, instant) {
ProfilesDelegateManager.register(reference, SimpleProfileDelegateWatcher(this, profile, instant) {
val changeContext = Rendering.currentContext
if (changeContext === context) {
callback(it)

View File

@ -5,17 +5,16 @@ import de.bixilon.minosoft.config.profile.delegate.watcher.ProfileDelegateWatche
import de.bixilon.minosoft.config.profile.profiles.Profile
import de.bixilon.minosoft.gui.eros.util.JavaFXUtil
import de.bixilon.minosoft.util.KUtil.unsafeCast
import de.bixilon.minosoft.util.delegate.DelegateManager.identifier
import javafx.collections.ListChangeListener
import java.lang.reflect.Field
import kotlin.reflect.KProperty
import kotlin.reflect.jvm.javaField
class ListProfileDelegateWatcher<V>(
override val property: KProperty<MutableList<V>>,
override val field: Field,
override val profile: Profile?,
private val callback: (ListChangeListener.Change<V>) -> Unit,
) : ProfileDelegateWatcher<MutableList<V>> {
override val fieldIdentifier = property.identifier
override fun invoke(previous: Any?, value: Any?) {
callback(value.unsafeCast())
@ -25,12 +24,12 @@ class ListProfileDelegateWatcher<V>(
@JvmOverloads
fun <V> KProperty<MutableList<V>>.profileWatchList(reference: Any, profile: Profile? = null, callback: ((ListChangeListener.Change<V>) -> Unit)) {
ProfilesDelegateManager.register(reference, ListProfileDelegateWatcher(this, javaField!!, profile, callback))
ProfilesDelegateManager.register(reference, ListProfileDelegateWatcher(this, profile, callback))
}
@JvmOverloads
fun <V> KProperty<MutableList<V>>.profileWatchListFX(reference: Any, profile: Profile? = null, callback: ((ListChangeListener.Change<V>) -> Unit)) {
ProfilesDelegateManager.register(reference, ListProfileDelegateWatcher(this, javaField!!, profile) { JavaFXUtil.runLater { callback(it) } })
ProfilesDelegateManager.register(reference, ListProfileDelegateWatcher(this, profile) { JavaFXUtil.runLater { callback(it) } })
}
}
}

View File

@ -5,17 +5,16 @@ import de.bixilon.minosoft.config.profile.delegate.watcher.ProfileDelegateWatche
import de.bixilon.minosoft.config.profile.profiles.Profile
import de.bixilon.minosoft.gui.eros.util.JavaFXUtil
import de.bixilon.minosoft.util.KUtil.unsafeCast
import de.bixilon.minosoft.util.delegate.DelegateManager.identifier
import javafx.collections.MapChangeListener
import java.lang.reflect.Field
import kotlin.reflect.KProperty
import kotlin.reflect.jvm.javaField
class MapProfileDelegateWatcher<K, V>(
override val property: KProperty<MutableMap<K, V>>,
override val field: Field,
override val profile: Profile?,
private val callback: (MapChangeListener.Change<K, V>) -> Unit,
) : ProfileDelegateWatcher<MutableMap<K, V>> {
override val fieldIdentifier = property.identifier
override fun invoke(previous: Any?, value: Any?) {
callback(value.unsafeCast())
@ -25,12 +24,12 @@ class MapProfileDelegateWatcher<K, V>(
@JvmOverloads
fun <K, V> KProperty<MutableMap<K, V>>.profileWatchMap(reference: Any, profile: Profile? = null, callback: ((MapChangeListener.Change<K, V>) -> Unit)) {
ProfilesDelegateManager.register(reference, MapProfileDelegateWatcher(this, javaField!!, profile, callback))
ProfilesDelegateManager.register(reference, MapProfileDelegateWatcher(this, profile, callback))
}
@JvmOverloads
fun <K, V> KProperty<MutableMap<K, V>>.profileWatchMapFX(reference: Any, profile: Profile? = null, callback: ((MapChangeListener.Change<K, V>) -> Unit)) {
ProfilesDelegateManager.register(reference, MapProfileDelegateWatcher(this, javaField!!, profile) { JavaFXUtil.runLater { callback(it) } })
ProfilesDelegateManager.register(reference, MapProfileDelegateWatcher(this, profile) { JavaFXUtil.runLater { callback(it) } })
}
}
}

View File

@ -5,17 +5,16 @@ import de.bixilon.minosoft.config.profile.delegate.watcher.ProfileDelegateWatche
import de.bixilon.minosoft.config.profile.profiles.Profile
import de.bixilon.minosoft.gui.eros.util.JavaFXUtil
import de.bixilon.minosoft.util.KUtil.unsafeCast
import de.bixilon.minosoft.util.delegate.DelegateManager.identifier
import javafx.collections.SetChangeListener
import java.lang.reflect.Field
import kotlin.reflect.KProperty
import kotlin.reflect.jvm.javaField
class SetProfileDelegateWatcher<V>(
override val property: KProperty<MutableSet<V>>,
override val field: Field,
override val profile: Profile?,
private val callback: (SetChangeListener.Change<V>) -> Unit,
) : ProfileDelegateWatcher<MutableSet<V>> {
override val fieldIdentifier = property.identifier
override fun invoke(previous: Any?, value: Any?) {
callback(value.unsafeCast())
@ -25,12 +24,12 @@ class SetProfileDelegateWatcher<V>(
@JvmOverloads
fun <V> KProperty<MutableSet<V>>.profileWatchSet(reference: Any, profile: Profile? = null, callback: ((SetChangeListener.Change<V>) -> Unit)) {
ProfilesDelegateManager.register(reference, SetProfileDelegateWatcher(this, javaField!!, profile, callback))
ProfilesDelegateManager.register(reference, SetProfileDelegateWatcher(this, profile, callback))
}
@JvmOverloads
fun <V> KProperty<MutableSet<V>>.profileWatchSetFX(reference: Any, profile: Profile? = null, callback: ((SetChangeListener.Change<V>) -> Unit)) {
ProfilesDelegateManager.register(reference, SetProfileDelegateWatcher(this, javaField!!, profile) { JavaFXUtil.runLater { callback(it) } })
ProfilesDelegateManager.register(reference, SetProfileDelegateWatcher(this, profile) { JavaFXUtil.runLater { callback(it) } })
}
}
}

View File

@ -13,7 +13,7 @@
package de.bixilon.minosoft.data.world.biome.accessor
import de.bixilon.minosoft.config.profile.delegate.watcher.SimpleProfileDelegateLWatcher.Companion.profileWatch
import de.bixilon.minosoft.config.profile.delegate.watcher.SimpleProfileDelegateWatcher.Companion.profileWatch
import de.bixilon.minosoft.data.registries.biomes.Biome
import de.bixilon.minosoft.data.world.Chunk
import de.bixilon.minosoft.data.world.biome.source.SpatialBiomeArray

View File

@ -14,7 +14,7 @@
package de.bixilon.minosoft.gui.eros.dialog
import de.bixilon.minosoft.Minosoft
import de.bixilon.minosoft.config.profile.delegate.watcher.SimpleProfileDelegateLWatcher.Companion.profileWatchFX
import de.bixilon.minosoft.config.profile.delegate.watcher.SimpleProfileDelegateWatcher.Companion.profileWatchFX
import de.bixilon.minosoft.config.profile.profiles.eros.ErosProfileManager
import de.bixilon.minosoft.config.profile.profiles.eros.server.entries.Server
import de.bixilon.minosoft.data.registries.ResourceLocation

View File

@ -14,7 +14,7 @@
package de.bixilon.minosoft.gui.eros.main
import de.bixilon.minosoft.ShutdownReasons
import de.bixilon.minosoft.config.profile.delegate.watcher.SimpleProfileDelegateLWatcher.Companion.profileWatchFX
import de.bixilon.minosoft.config.profile.delegate.watcher.SimpleProfileDelegateWatcher.Companion.profileWatchFX
import de.bixilon.minosoft.config.profile.profiles.eros.ErosProfileManager
import de.bixilon.minosoft.data.accounts.Account
import de.bixilon.minosoft.gui.eros.controller.EmbeddedJavaFXController

View File

@ -15,7 +15,7 @@ package de.bixilon.minosoft.gui.eros.main.play.server
import de.bixilon.minosoft.Minosoft
import de.bixilon.minosoft.config.profile.ConnectionProfiles
import de.bixilon.minosoft.config.profile.delegate.watcher.SimpleProfileDelegateLWatcher.Companion.profileWatchFX
import de.bixilon.minosoft.config.profile.delegate.watcher.SimpleProfileDelegateWatcher.Companion.profileWatchFX
import de.bixilon.minosoft.config.profile.profiles.eros.ErosProfileManager
import de.bixilon.minosoft.config.profile.profiles.eros.server.entries.Server
import de.bixilon.minosoft.data.registries.ResourceLocation

View File

@ -13,6 +13,7 @@
package de.bixilon.minosoft.gui.eros.main.profiles
import de.bixilon.minosoft.config.profile.delegate.watcher.SimpleProfileDelegateWatcher.Companion.profileWatchFX
import de.bixilon.minosoft.config.profile.profiles.Profile
import de.bixilon.minosoft.data.registries.ResourceLocation
import de.bixilon.minosoft.gui.eros.card.AbstractCardController
@ -45,7 +46,7 @@ class ProfileCardController : AbstractCardController<Profile>() {
profileNameFX.text = item.name
profileDescriptionFX.text = item.description
item::description.profileWatchFX(this, true, item) { profileDescriptionFX.text = it }
}
companion object : CardFactory<ProfileCardController> {

View File

@ -16,7 +16,7 @@ package de.bixilon.minosoft.gui.rendering
import de.bixilon.minosoft.config.key.KeyAction
import de.bixilon.minosoft.config.key.KeyBinding
import de.bixilon.minosoft.config.key.KeyCodes
import de.bixilon.minosoft.config.profile.delegate.watcher.SimpleProfileDelegateLWatcher.Companion.profileWatch
import de.bixilon.minosoft.config.profile.delegate.watcher.SimpleProfileDelegateWatcher.Companion.profileWatch
import de.bixilon.minosoft.data.registries.ResourceLocation
import de.bixilon.minosoft.data.text.BaseComponent
import de.bixilon.minosoft.data.text.ChatColors

View File

@ -16,7 +16,7 @@ package de.bixilon.minosoft.gui.rendering.entity
import de.bixilon.minosoft.config.key.KeyAction
import de.bixilon.minosoft.config.key.KeyBinding
import de.bixilon.minosoft.config.key.KeyCodes
import de.bixilon.minosoft.config.profile.delegate.watcher.SimpleProfileDelegateLWatcher.Companion.profileWatch
import de.bixilon.minosoft.config.profile.delegate.watcher.SimpleProfileDelegateWatcher.Companion.profileWatch
import de.bixilon.minosoft.data.entities.entities.Entity
import de.bixilon.minosoft.data.player.LocalPlayerEntity
import de.bixilon.minosoft.data.registries.ResourceLocation

View File

@ -16,7 +16,7 @@ package de.bixilon.minosoft.gui.rendering.gui.hud
import de.bixilon.minosoft.config.key.KeyAction
import de.bixilon.minosoft.config.key.KeyBinding
import de.bixilon.minosoft.config.key.KeyCodes
import de.bixilon.minosoft.config.profile.delegate.watcher.SimpleProfileDelegateLWatcher.Companion.profileWatchRendering
import de.bixilon.minosoft.config.profile.delegate.watcher.SimpleProfileDelegateWatcher.Companion.profileWatchRendering
import de.bixilon.minosoft.data.registries.ResourceLocation
import de.bixilon.minosoft.gui.rendering.Drawable
import de.bixilon.minosoft.gui.rendering.RenderWindow

View File

@ -13,7 +13,7 @@
package de.bixilon.minosoft.gui.rendering.gui.hud.elements.chat
import de.bixilon.minosoft.config.profile.delegate.watcher.SimpleProfileDelegateLWatcher.Companion.profileWatchRendering
import de.bixilon.minosoft.config.profile.delegate.watcher.SimpleProfileDelegateWatcher.Companion.profileWatchRendering
import de.bixilon.minosoft.data.ChatTextPositions
import de.bixilon.minosoft.data.registries.ResourceLocation
import de.bixilon.minosoft.gui.rendering.gui.elements.text.TextFlowElement

View File

@ -13,7 +13,7 @@
package de.bixilon.minosoft.gui.rendering.gui.hud.elements.chat
import de.bixilon.minosoft.config.profile.delegate.watcher.SimpleProfileDelegateLWatcher.Companion.profileWatchRendering
import de.bixilon.minosoft.config.profile.delegate.watcher.SimpleProfileDelegateWatcher.Companion.profileWatchRendering
import de.bixilon.minosoft.data.registries.ResourceLocation
import de.bixilon.minosoft.gui.rendering.gui.elements.text.TextFlowElement
import de.bixilon.minosoft.gui.rendering.gui.hud.HUDRenderer

View File

@ -13,7 +13,7 @@
package de.bixilon.minosoft.gui.rendering.gui.hud.elements.other
import de.bixilon.minosoft.config.profile.delegate.watcher.SimpleProfileDelegateLWatcher.Companion.profileWatch
import de.bixilon.minosoft.config.profile.delegate.watcher.SimpleProfileDelegateWatcher.Companion.profileWatch
import de.bixilon.minosoft.data.abilities.Gamemodes
import de.bixilon.minosoft.data.registries.ResourceLocation
import de.bixilon.minosoft.gui.rendering.gui.hud.HUDRenderer

View File

@ -13,7 +13,7 @@
package de.bixilon.minosoft.gui.rendering.particle
import de.bixilon.minosoft.config.profile.delegate.watcher.SimpleProfileDelegateLWatcher.Companion.profileWatch
import de.bixilon.minosoft.config.profile.delegate.watcher.SimpleProfileDelegateWatcher.Companion.profileWatch
import de.bixilon.minosoft.data.registries.ResourceLocation
import de.bixilon.minosoft.gui.rendering.*
import de.bixilon.minosoft.gui.rendering.modding.events.CameraMatrixChangeEvent

View File

@ -13,7 +13,7 @@
package de.bixilon.minosoft.gui.rendering.sound
import de.bixilon.minosoft.config.profile.delegate.watcher.SimpleProfileDelegateLWatcher.Companion.profileWatch
import de.bixilon.minosoft.config.profile.delegate.watcher.SimpleProfileDelegateWatcher.Companion.profileWatch
import de.bixilon.minosoft.data.registries.ResourceLocation
import de.bixilon.minosoft.data.world.AbstractAudioPlayer
import de.bixilon.minosoft.gui.rendering.Rendering

View File

@ -14,7 +14,7 @@
package de.bixilon.minosoft.gui.rendering.system.window
import de.bixilon.minosoft.config.StaticConfiguration
import de.bixilon.minosoft.config.profile.delegate.watcher.SimpleProfileDelegateLWatcher.Companion.profileWatchRendering
import de.bixilon.minosoft.config.profile.delegate.watcher.SimpleProfileDelegateWatcher.Companion.profileWatchRendering
import de.bixilon.minosoft.config.profile.profiles.rendering.RenderingProfile
import de.bixilon.minosoft.data.assets.AssetsManager
import de.bixilon.minosoft.util.KUtil.toResourceLocation

View File

@ -16,7 +16,7 @@ package de.bixilon.minosoft.gui.rendering.world
import de.bixilon.minosoft.config.key.KeyAction
import de.bixilon.minosoft.config.key.KeyBinding
import de.bixilon.minosoft.config.key.KeyCodes
import de.bixilon.minosoft.config.profile.delegate.watcher.SimpleProfileDelegateLWatcher.Companion.profileWatch
import de.bixilon.minosoft.config.profile.delegate.watcher.SimpleProfileDelegateWatcher.Companion.profileWatch
import de.bixilon.minosoft.data.assets.AssetsUtil
import de.bixilon.minosoft.data.assets.Resources
import de.bixilon.minosoft.data.direction.Directions

View File

@ -13,7 +13,7 @@
package de.bixilon.minosoft.gui.rendering.world.outline
import de.bixilon.minosoft.config.profile.delegate.watcher.SimpleProfileDelegateLWatcher.Companion.profileWatch
import de.bixilon.minosoft.config.profile.delegate.watcher.SimpleProfileDelegateWatcher.Companion.profileWatch
import de.bixilon.minosoft.data.abilities.Gamemodes
import de.bixilon.minosoft.data.registries.ResourceLocation
import de.bixilon.minosoft.data.registries.blocks.BlockState

View File

@ -1,6 +1,6 @@
package de.bixilon.minosoft.gui.rendering.world.preparer.cull
import de.bixilon.minosoft.config.profile.delegate.watcher.SimpleProfileDelegateLWatcher.Companion.profileWatch
import de.bixilon.minosoft.config.profile.delegate.watcher.SimpleProfileDelegateWatcher.Companion.profileWatch
import de.bixilon.minosoft.data.direction.Directions
import de.bixilon.minosoft.data.direction.Directions.Companion.O_DOWN
import de.bixilon.minosoft.data.direction.Directions.Companion.O_EAST

View File

@ -13,7 +13,7 @@
package de.bixilon.minosoft.protocol.network.connection.play.clientsettings
import de.bixilon.minosoft.config.profile.delegate.watcher.SimpleProfileDelegateLWatcher.Companion.profileWatch
import de.bixilon.minosoft.config.profile.delegate.watcher.SimpleProfileDelegateWatcher.Companion.profileWatch
import de.bixilon.minosoft.data.language.LanguageManager
import de.bixilon.minosoft.protocol.network.connection.play.PlayConnection
import de.bixilon.minosoft.protocol.packets.c2s.play.ClientSettingsC2SP

View File

@ -13,7 +13,7 @@
package de.bixilon.minosoft.protocol.protocol
import com.google.common.collect.HashBiMap
import de.bixilon.minosoft.config.profile.delegate.watcher.SimpleProfileDelegateLWatcher.Companion.profileWatch
import de.bixilon.minosoft.config.profile.delegate.watcher.SimpleProfileDelegateWatcher.Companion.profileWatch
import de.bixilon.minosoft.config.profile.profiles.eros.server.entries.Server
import de.bixilon.minosoft.config.profile.profiles.other.OtherProfileManager
import de.bixilon.minosoft.data.text.BaseComponent