snapshot: full 1.21.10 build (- REI; fuck private discord builds)

4 files changed, 30 insertions, 35 deletions

diff --git a/src/compat/jade/java/moe/nea/firmament/compat/jade/CustomFakeBlockProvider.kt b/src/compat/jade/java/moe/nea/firmament/compat/jade/CustomFakeBlockProvider.kt
index 53e3255..f5b58c5 100644
--- a/src/compat/jade/java/moe/nea/firmament/compat/jade/CustomFakeBlockProvider.kt
+++ b/src/compat/jade/java/moe/nea/firmament/compat/jade/CustomFakeBlockProvider.kt
@@ -17,11 +17,10 @@ class CustomFakeBlockProvider(val registration: IWailaClientRegistration) : Jade
 	): Accessor<*>? {
 		if (!JadeIntegration.TConfig.blockDetection) return accessor
 		if (accessor !is BlockAccessor) return accessor
-		val customBlock = JadeIntegration.customBlocks[accessor.block]
-		if (customBlock == null) return accessor
+		val customBlock = JadeIntegration.customBlocks[accessor.block] ?: return accessor
 		return registration.blockAccessor()
 			.from(accessor)
-			.fakeBlock(customBlock.getDisplayItem(accessor.block))
+			.serversideRep(customBlock.getDisplayItem(accessor.block))
 			.build()
 	}
 
@@ -33,8 +32,7 @@ class CustomFakeBlockProvider(val registration: IWailaClientRegistration) : Jade
 
 		@JvmStatic
 		fun getCustomBlock(accessor: BlockAccessor): MiningRepoData.CustomMiningBlock? {
-			if (!accessor.isFakeBlock) return null
-			val item = accessor.fakeBlock
+			val item = accessor.serversideRep ?: return null
 			return item.get(FirmamentDataComponentTypes.CUSTOM_MINING_BLOCK_DATA)
 		}
 	}
diff --git a/src/compat/rei/java/moe/nea/firmament/compat/rei/recipes/SBKatRecipe.kt b/src/compat/rei/java/moe/nea/firmament/compat/rei/recipes/SBKatRecipe.kt
index cb7877d..5de315c 100644
--- a/src/compat/rei/java/moe/nea/firmament/compat/rei/recipes/SBKatRecipe.kt
+++ b/src/compat/rei/java/moe/nea/firmament/compat/rei/recipes/SBKatRecipe.kt
@@ -18,6 +18,7 @@ import me.shedaniel.rei.api.client.gui.widgets.Widgets
 import me.shedaniel.rei.api.client.registry.display.DisplayCategory
 import me.shedaniel.rei.api.common.category.CategoryIdentifier
 import kotlin.time.Duration.Companion.seconds
+import net.minecraft.client.gui.Click
 import net.minecraft.client.gui.DrawContext
 import net.minecraft.client.gui.Element
 import net.minecraft.item.Items
@@ -175,56 +176,50 @@ fun wrapWidget(bounds: Rectangle, component: GuiComponent): Widget {
 			)
 		}
 
-		override fun mouseClicked(mouseX: Double, mouseY: Double, button: Int): Boolean {
-			val mouseXInt = mouseX.toInt()
-			val mouseYInt = mouseY.toInt()
+		override fun mouseClicked(click: Click, doubled: Boolean): Boolean {
+			val mouseXInt = click.x.toInt()
+			val mouseYInt = click.y.toInt()
 			return component.mouseEvent(
-				MouseEvent.Click(button, true),
+				MouseEvent.Click(click.button(), true),
 				GuiImmediateContext(
 					IMinecraft.INSTANCE.provideTopLevelRenderContext(),
 					bounds.minX, bounds.minY,
 					bounds.width, bounds.height,
 					mouseXInt - bounds.minX, mouseYInt - bounds.minY,
 					mouseXInt, mouseYInt,
-					mouseX.toFloat(), mouseY.toFloat()
+					click.x.toFloat(), click.y.toFloat()
 				)
 			)
 		}
 
-		override fun mouseReleased(mouseX: Double, mouseY: Double, button: Int): Boolean {
-			val mouseXInt = mouseX.toInt()
-			val mouseYInt = mouseY.toInt()
+		override fun mouseReleased(click: Click): Boolean {
+			val mouseXInt = click.x.toInt()
+			val mouseYInt = click.y.toInt()
 			return component.mouseEvent(
-				MouseEvent.Click(button, false),
+				MouseEvent.Click(click.button(), false),
 				GuiImmediateContext(
 					IMinecraft.INSTANCE.provideTopLevelRenderContext(),
 					bounds.minX, bounds.minY,
 					bounds.width, bounds.height,
 					mouseXInt - bounds.minX, mouseYInt - bounds.minY,
 					mouseXInt, mouseYInt,
-					mouseX.toFloat(), mouseY.toFloat()
+					click.x.toFloat(), click.y.toFloat()
 				)
 			)
 		}
 
-		override fun mouseDragged(
-			mouseX: Double,
-			mouseY: Double,
-			button: Int,
-			deltaX: Double,
-			deltaY: Double
-		): Boolean {
-			val mouseXInt = mouseX.toInt()
-			val mouseYInt = mouseY.toInt()
+		override fun mouseDragged(click: Click, offsetX: Double, offsetY: Double): Boolean {
+			val mouseXInt = click.x.toInt()
+			val mouseYInt = click.y.toInt()
 			return component.mouseEvent(
-				MouseEvent.Move(deltaX.toFloat(), deltaY.toFloat()),
+				MouseEvent.Move(offsetX.toFloat(), offsetY.toFloat()),
 				GuiImmediateContext(
 					IMinecraft.INSTANCE.provideTopLevelRenderContext(),
 					bounds.minX, bounds.minY,
 					bounds.width, bounds.height,
 					mouseXInt - bounds.minX, mouseYInt - bounds.minY,
 					mouseXInt, mouseYInt,
-					mouseX.toFloat(), mouseY.toFloat()
+					click.x.toFloat(), click.y.toFloat()
 				)
 			)
 
diff --git a/src/compat/yacl/java/KeybindingController.kt b/src/compat/yacl/java/KeybindingController.kt
index c303da2..6ceef5d 100644
--- a/src/compat/yacl/java/KeybindingController.kt
+++ b/src/compat/yacl/java/KeybindingController.kt
@@ -6,6 +6,8 @@ import dev.isxander.yacl3.api.utils.Dimension
 import dev.isxander.yacl3.gui.AbstractWidget
 import dev.isxander.yacl3.gui.YACLScreen
 import dev.isxander.yacl3.gui.controllers.ControllerWidget
+import net.minecraft.client.gui.Click
+import net.minecraft.client.input.KeyInput
 import net.minecraft.text.Text
 import moe.nea.firmament.gui.config.KeyBindingHandler
 import moe.nea.firmament.gui.config.KeyBindingStateManager
@@ -57,12 +59,12 @@ class KeybindingWidget(
 		return sm.label
 	}
 
-	override fun keyPressed(keyCode: Int, scanCode: Int, modifiers: Int): Boolean {
-		return sm.keyboardEvent(GenericInputButton.ofKeyAndScan(keyCode, scanCode), true)
+	override fun keyPressed(keyEvent: KeyInput): Boolean {
+		return sm.keyboardEvent(GenericInputButton.of(keyEvent), true)
 	}
 
-	override fun keyReleased(keyCode: Int, scanCode: Int, modifiers: Int): Boolean {
-		return sm.keyboardEvent(GenericInputButton.ofKeyAndScan(keyCode, scanCode), false)
+	override fun keyReleased(keyEvent: KeyInput): Boolean {
+		return sm.keyboardEvent(GenericInputButton.of(keyEvent), false)
 	}
 
 	override fun unfocus() {
@@ -74,11 +76,11 @@ class KeybindingWidget(
 		if (!focused) sm.onLostFocus()
 	}
 
-	override fun mouseClicked(mouseX: Double, mouseY: Double, button: Int): Boolean {
+	override fun mouseClicked(mouseButtonEvent: Click, doubleClick: Boolean): Boolean {
 		if (isHovered) {
-			sm.onClick(button)
+			sm.onClick(mouseButtonEvent.button())
 			return true
 		}
-		return super.mouseClicked(mouseX, mouseY, button)
+		return super.mouseClicked(mouseButtonEvent, doubleClick)
 	}
 }
diff --git a/src/compat/yacl/java/YaclIntegration.kt b/src/compat/yacl/java/YaclIntegration.kt
index 79ab528..d94e96f 100644
--- a/src/compat/yacl/java/YaclIntegration.kt
+++ b/src/compat/yacl/java/YaclIntegration.kt
@@ -18,7 +18,6 @@ import dev.isxander.yacl3.api.controller.StringControllerBuilder
 import dev.isxander.yacl3.api.controller.TickBoxControllerBuilder
 import dev.isxander.yacl3.api.controller.ValueFormatter
 import dev.isxander.yacl3.gui.YACLScreen
-import dev.isxander.yacl3.gui.tab.ListHolderWidget
 import io.github.notenoughupdates.moulconfig.ChromaColour
 import java.awt.Color
 import kotlin.time.Duration
@@ -26,6 +25,7 @@ import kotlin.time.Duration.Companion.seconds
 import kotlin.time.DurationUnit
 import net.minecraft.client.gui.Element
 import net.minecraft.client.gui.screen.Screen
+import net.minecraft.client.gui.widget.ContainerWidget
 import net.minecraft.text.Text
 import moe.nea.firmament.gui.config.BooleanHandler
 import moe.nea.firmament.gui.config.ChoiceHandler
@@ -208,7 +208,7 @@ class YaclIntegration : FirmamentConfigScreenProvider {
 		return object : YACLScreen(buildConfig(), parent) {
 			override fun setFocused(focused: Element?) {
 				if (this.focused is KeybindingWidget &&
-					focused is ListHolderWidget<*>
+					focused is ContainerWidget
 				) {
 					return
 				}