feat: update to new moulconfig version

2 files changed, 7 insertions, 7 deletions

diff --git a/src/main/kotlin/features/inventory/buttons/InventoryButtonEditor.kt b/src/main/kotlin/features/inventory/buttons/InventoryButtonEditor.kt
index 1e4f6a3..7334c82 100644
--- a/src/main/kotlin/features/inventory/buttons/InventoryButtonEditor.kt
+++ b/src/main/kotlin/features/inventory/buttons/InventoryButtonEditor.kt
@@ -2,8 +2,8 @@ package moe.nea.firmament.features.inventory.buttons
 
 import io.github.notenoughupdates.moulconfig.common.IItemStack
 import io.github.notenoughupdates.moulconfig.gui.component.PanelComponent
-import io.github.notenoughupdates.moulconfig.platform.ModernItemStack
-import io.github.notenoughupdates.moulconfig.platform.ModernRenderContext
+import io.github.notenoughupdates.moulconfig.platform.MoulConfigPlatform
+import io.github.notenoughupdates.moulconfig.platform.MoulConfigRenderContext
 import io.github.notenoughupdates.moulconfig.xml.Bind
 import me.shedaniel.math.Point
 import me.shedaniel.math.Rectangle
@@ -35,7 +35,7 @@ class InventoryButtonEditor(
 		@Bind
 		fun getItemIcon(): IItemStack {
 			save()
-			return ModernItemStack.of(InventoryButton.getItemForName(icon))
+			return MoulConfigPlatform.wrap(InventoryButton.getItemForName(icon))
 		}
 
 		@Bind
@@ -197,7 +197,7 @@ class InventoryButtonEditor(
 		context.matrices.pushMatrix()
 		PanelComponent.DefaultBackgroundRenderer.VANILLA
 			.render(
-				ModernRenderContext(context),
+				MoulConfigRenderContext(context),
 				lastGuiRect.minX, lastGuiRect.minY,
 				lastGuiRect.width, lastGuiRect.height,
 			)
diff --git a/src/main/kotlin/features/inventory/storageoverlay/StorageOverlayScreen.kt b/src/main/kotlin/features/inventory/storageoverlay/StorageOverlayScreen.kt
index 0baa099..a023ce6 100644
--- a/src/main/kotlin/features/inventory/storageoverlay/StorageOverlayScreen.kt
+++ b/src/main/kotlin/features/inventory/storageoverlay/StorageOverlayScreen.kt
@@ -181,7 +181,7 @@ class StorageOverlayScreen : Screen(Text.literal("")) {
 	val searchField = TextFieldComponent(
 		searchText, 100, GetSetter.constant(true),
 		tr("firmament.storage-overlay.search.suggestion", "Search...").string,
-		IMinecraft.instance.defaultFontRenderer
+		IMinecraft.INSTANCE.defaultFontRenderer
 	)
 	val controlComponent = PanelComponent(
 		ColumnComponent(
@@ -383,7 +383,7 @@ class StorageOverlayScreen : Screen(Text.literal("")) {
 				controlComponent,
 				measurements.controlX, measurements.controlY,
 				CONTROL_WIDTH, CONTROL_HEIGHT,
-				KeyboardEvent.KeyPressed(keyCode, false)
+				KeyboardEvent.KeyPressed(keyCode, scanCode, false)
 			)
 		) {
 			return true
@@ -400,7 +400,7 @@ class StorageOverlayScreen : Screen(Text.literal("")) {
 				controlComponent,
 				measurements.controlX, measurements.controlY,
 				CONTROL_WIDTH, CONTROL_HEIGHT,
-				KeyboardEvent.KeyPressed(keyCode, true)
+				KeyboardEvent.KeyPressed(keyCode, scanCode, true)
 			)
 		) {
 			return true