aboutsummaryrefslogtreecommitdiff
path: root/src/main/kotlin/moe/nea/firmament/features
diff options
context:
space:
mode:
authornea <nea@nea.moe>2023-10-28 04:07:47 +0200
committernea <nea@nea.moe>2023-10-28 04:07:47 +0200
commitad490f2ea7967cb6bb97cb797b33aa3554de46a5 (patch)
treec45cf7f4b8a6d60399fcc46f793c75bd8387211d /src/main/kotlin/moe/nea/firmament/features
parent9e7da2829cdc949d211ef5021131b4a48ddc3054 (diff)
downloadfirmament-ad490f2ea7967cb6bb97cb797b33aa3554de46a5.tar.gz
firmament-ad490f2ea7967cb6bb97cb797b33aa3554de46a5.tar.bz2
firmament-ad490f2ea7967cb6bb97cb797b33aa3554de46a5.zip
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.
Diffstat (limited to 'src/main/kotlin/moe/nea/firmament/features')
-rw-r--r--src/main/kotlin/moe/nea/firmament/features/debug/PowerUserTools.kt4
-rw-r--r--src/main/kotlin/moe/nea/firmament/features/inventory/storageoverlay/StorageOverlay.kt4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/main/kotlin/moe/nea/firmament/features/debug/PowerUserTools.kt b/src/main/kotlin/moe/nea/firmament/features/debug/PowerUserTools.kt
index 52834f3..8c9baf7 100644
--- a/src/main/kotlin/moe/nea/firmament/features/debug/PowerUserTools.kt
+++ b/src/main/kotlin/moe/nea/firmament/features/debug/PowerUserTools.kt
@@ -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 {
diff --git a/src/main/kotlin/moe/nea/firmament/features/inventory/storageoverlay/StorageOverlay.kt b/src/main/kotlin/moe/nea/firmament/features/inventory/storageoverlay/StorageOverlay.kt
index 7d1c72e..cb8a8d8 100644
--- a/src/main/kotlin/moe/nea/firmament/features/inventory/storageoverlay/StorageOverlay.kt
+++ b/src/main/kotlin/moe/nea/firmament/features/inventory/storageoverlay/StorageOverlay.kt
@@ -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)