Rename mixins after what they do, rather than where they do it
[no changelog] Mixins are now named after what they do, and mixins for the same class that do different things should be in two separate mixins now.
This commit is contained in:
@@ -8,6 +8,6 @@ package moe.nea.firmament.events
|
||||
|
||||
import net.minecraft.client.gui.screen.Screen
|
||||
|
||||
data class ScreenOpenEvent(val old: Screen?, val new: Screen?) : FirmamentEvent.Cancellable() {
|
||||
companion object : FirmamentEventBus<ScreenOpenEvent>()
|
||||
data class ScreenChangeEvent(val old: Screen?, val new: Screen?) : FirmamentEvent.Cancellable() {
|
||||
companion object : FirmamentEventBus<ScreenChangeEvent>()
|
||||
}
|
||||
@@ -15,7 +15,7 @@ import net.minecraft.util.hit.HitResult
|
||||
import moe.nea.firmament.events.CustomItemModelEvent
|
||||
import moe.nea.firmament.events.HandledScreenKeyPressedEvent
|
||||
import moe.nea.firmament.events.ItemTooltipEvent
|
||||
import moe.nea.firmament.events.ScreenOpenEvent
|
||||
import moe.nea.firmament.events.ScreenChangeEvent
|
||||
import moe.nea.firmament.events.TickEvent
|
||||
import moe.nea.firmament.events.WorldKeyboardEvent
|
||||
import moe.nea.firmament.features.FirmamentFeature
|
||||
@@ -91,7 +91,7 @@ object PowerUserTools : FirmamentFeature {
|
||||
lastCopiedStack = null
|
||||
lastCopiedStackViewTime = false
|
||||
}
|
||||
ScreenOpenEvent.subscribe {
|
||||
ScreenChangeEvent.subscribe {
|
||||
lastCopiedStack = null
|
||||
}
|
||||
HandledScreenKeyPressedEvent.subscribe {
|
||||
|
||||
@@ -8,7 +8,7 @@ package moe.nea.firmament.features.inventory.storageoverlay
|
||||
|
||||
import java.util.*
|
||||
import kotlinx.serialization.serializer
|
||||
import moe.nea.firmament.events.ScreenOpenEvent
|
||||
import moe.nea.firmament.events.ScreenChangeEvent
|
||||
import moe.nea.firmament.events.TickEvent
|
||||
import moe.nea.firmament.features.FirmamentFeature
|
||||
import moe.nea.firmament.gui.config.ManagedConfig
|
||||
@@ -36,7 +36,7 @@ object StorageOverlay : FirmamentFeature {
|
||||
var currentHandler: StorageBackingHandle? = StorageBackingHandle.None
|
||||
|
||||
override fun onLoad() {
|
||||
ScreenOpenEvent.subscribe { event ->
|
||||
ScreenChangeEvent.subscribe { event ->
|
||||
currentHandler = StorageBackingHandle.fromScreen(event.new)
|
||||
if (event.old is StorageOverlayScreen && !event.old.isClosing) {
|
||||
event.old.setHandler(currentHandler)
|
||||
|
||||
@@ -13,7 +13,7 @@ import net.minecraft.client.MinecraftClient
|
||||
import net.minecraft.server.command.CommandOutput
|
||||
import net.minecraft.text.Text
|
||||
import moe.nea.firmament.Firmament
|
||||
import moe.nea.firmament.events.ScreenOpenEvent
|
||||
import moe.nea.firmament.events.ScreenChangeEvent
|
||||
|
||||
interface IDataHolder<T> {
|
||||
companion object {
|
||||
@@ -60,7 +60,7 @@ interface IDataHolder<T> {
|
||||
}
|
||||
|
||||
fun registerEvents() {
|
||||
ScreenOpenEvent.subscribe { event ->
|
||||
ScreenChangeEvent.subscribe { event ->
|
||||
performSaves()
|
||||
val p = MinecraftClient.getInstance().player
|
||||
if (p != null) {
|
||||
|
||||
Reference in New Issue
Block a user