feat: Launch on 1.21.7

4 files changed, 122 insertions, 107 deletions

diff --git a/src/compat/jade/java/moe/nea/firmament/compat/jade/DrillToolProvider.kt b/src/compat/jade/java/moe/nea/firmament/compat/jade/DrillToolProvider.kt
index 10bff1b..addfc42 100644
--- a/src/compat/jade/java/moe/nea/firmament/compat/jade/DrillToolProvider.kt
+++ b/src/compat/jade/java/moe/nea/firmament/compat/jade/DrillToolProvider.kt
@@ -1,6 +1,5 @@
 package moe.nea.firmament.compat.jade
 
-import java.util.Optional
 import java.util.function.UnaryOperator
 import snownee.jade.api.BlockAccessor
 import snownee.jade.api.IBlockComponentProvider
@@ -8,14 +7,13 @@ import snownee.jade.api.ITooltip
 import snownee.jade.api.JadeIds
 import snownee.jade.api.config.IPluginConfig
 import snownee.jade.api.theme.IThemeHelper
-import snownee.jade.api.ui.IElement
-import snownee.jade.api.ui.IElementHelper
+import snownee.jade.api.ui.Element
+import snownee.jade.api.ui.JadeUI
+import snownee.jade.gui.JadeLinearLayout
 import snownee.jade.impl.ui.ItemStackElement
-import snownee.jade.impl.ui.TextElement
-import kotlin.jvm.optionals.getOrDefault
+import snownee.jade.impl.ui.TextElementImpl
 import net.minecraft.text.Text
 import net.minecraft.util.Identifier
-import net.minecraft.util.math.Vec2f
 import moe.nea.firmament.Firmament
 import moe.nea.firmament.repo.ExpensiveItemCacheApi
 import moe.nea.firmament.repo.RepoManager
@@ -38,34 +36,31 @@ class DrillToolProvider : IBlockComponentProvider {
 				if (lastItemIndex < 0) return@map inner
 				val innerMut = inner.toMutableList()
 				val harvestIndicator = innerMut.indexOfLast {
-					it is TextElement && it.cachedSize == Vec2f.ZERO && it.text.visit {
-						if (it.isEmpty()) Optional.empty() else Optional.of(true)
-					}.getOrDefault(false)
+					it is TextElementImpl && it.width == 0 && it.string.isNotEmpty()
 				}
 				val canHarvest = SBItemStack(MC.stackInHand).breakingPower >= customBlock.breakingPower
 				val lastItem = innerMut[lastItemIndex] as ItemStackElement
 				if (harvestIndicator < 0) {
-					innerMut.add(lastItemIndex + 1, canHarvestIndicator(canHarvest, lastItem.alignment))
+					innerMut.add(lastItemIndex + 1, canHarvestIndicator(canHarvest))
 				} else {
-					innerMut.set(harvestIndicator, canHarvestIndicator(canHarvest, lastItem.alignment))
+					innerMut.set(harvestIndicator, canHarvestIndicator(canHarvest))
 				}
-				innerMut.set(lastItemIndex, IElementHelper.get()
-					.item(tool, 0.75f)
-					.translate(lastItem.translation)
-					.size(lastItem.size)
-					.message(null)
-					.align(lastItem.alignment))
+				innerMut.set(
+					lastItemIndex, JadeUI
+						.item(tool, 0.75f)
+				)
 				innerMut.subList(0, lastItemIndex - 1).removeIf { it is ItemStackElement }
 				innerMut
 			}
 		})
 	}
 
-	fun canHarvestIndicator(canHarvest: Boolean, align: IElement.Align): IElement {
+	fun canHarvestIndicator(canHarvest: Boolean): Element {
 		val t = IThemeHelper.get()
 		val text = if (canHarvest) t.success(CHECK) else t.danger(X)
-		return IElementHelper.get().text(text)
-			.scale(0.75F).zOffset(800).size(Vec2f.ZERO).translate(Vec2f(-3F, 3.25F)).align(align)
+		return JadeUI.text(text)
+			.scale(0.75F)
+			.alignSelfCenter()
 	}
 
 	private val CHECK: Text = Text.literal("✔")
diff --git a/src/compat/jade/java/moe/nea/firmament/mixins/compat/jade/ElementAccessor.java b/src/compat/jade/java/moe/nea/firmament/mixins/compat/jade/ElementAccessor.java
deleted file mode 100644
index 1b58e3c..0000000
--- a/src/compat/jade/java/moe/nea/firmament/mixins/compat/jade/ElementAccessor.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package moe.nea.firmament.mixins.compat.jade;
-
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.gen.Accessor;
-import snownee.jade.api.ui.Element;
-import snownee.jade.api.ui.IElement;
-
-@Mixin(Element.class)
-public interface ElementAccessor {
-	@Accessor("align")
-	IElement.Align getAlign_firmament();
-}
diff --git a/src/compat/rei/java/moe/nea/firmament/compat/rei/NEUItemEntryRenderer.kt b/src/compat/rei/java/moe/nea/firmament/compat/rei/NEUItemEntryRenderer.kt
index 5e4eee3..f881f77 100644
--- a/src/compat/rei/java/moe/nea/firmament/compat/rei/NEUItemEntryRenderer.kt
+++ b/src/compat/rei/java/moe/nea/firmament/compat/rei/NEUItemEntryRenderer.kt
@@ -52,9 +52,9 @@ object NEUItemEntryRenderer : EntryRenderer<SBItemStack> {
 			entry.value.asImmutableItemStack()
 		}
 
-		context.matrices.push()
-		context.matrices.translate(bounds.centerX.toFloat(), bounds.centerY.toFloat(), 0F)
-		context.matrices.scale(bounds.width.toFloat() / 16F, bounds.height.toFloat() / 16F, 1f)
+		context.matrices.pushMatrix()
+		context.matrices.translate(bounds.centerX.toFloat(), bounds.centerY.toFloat(), )
+		context.matrices.scale(bounds.width.toFloat() / 16F, bounds.height.toFloat() / 16F, )
 		context.drawItemWithoutEntity(itemToRender, -8, -8)
 		context.drawStackOverlay(
 			minecraft.textRenderer, itemToRender, -8, -8,
@@ -64,7 +64,7 @@ object NEUItemEntryRenderer : EntryRenderer<SBItemStack> {
 			)
 			else null
 		)
-		context.matrices.pop()
+		context.matrices.popMatrix()
 	}
 
 	val minecraft = MinecraftClient.getInstance()
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 cce1465..f77e9f5 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
@@ -17,7 +17,6 @@ import me.shedaniel.rei.api.client.gui.widgets.WidgetWithBounds
 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 me.shedaniel.rei.api.common.util.EntryStacks
 import kotlin.time.Duration.Companion.seconds
 import net.minecraft.client.gui.DrawContext
 import net.minecraft.client.gui.Element
@@ -55,11 +54,13 @@ class SBKatRecipe(override val neuRecipe: NEUKatUpgradeRecipe) : SBRecipe() {
 				val inputLevelLabelCenter = Point(bounds.minX + 30 - 18 + 5 + 8, bounds.minY + 25)
 				val inputLevelLabel = Widgets.createLabel(
 					inputLevelLabelCenter,
-					Text.literal("")).centered()
+					Text.literal("")
+				).centered()
 				val outputLevelLabelCenter = Point(bounds.maxX - 30 + 8, bounds.minY + 25)
 				val outputLevelLabel = Widgets.createLabel(
 					outputLevelLabelCenter,
-					Text.literal("")).centered()
+					Text.literal("")
+				).centered()
 				val coinStack = SBItemStack(SkyblockId.COINS, recipe.coins.toInt())
 				levelValue.whenChanged { oldValue, newValue ->
 					if (oldValue.toInt() == newValue.toInt()) return@whenChanged
@@ -72,40 +73,60 @@ class SBKatRecipe(override val neuRecipe: NEUKatUpgradeRecipe) : SBRecipe() {
 					inputLevelLabel.message = Text.literal(newInput.levelData.currentLevel.toString())
 					inputLevelLabel.bounds.location = Point(
 						inputLevelLabelCenter.x - MC.font.getWidth(inputLevelLabel.message) / 2,
-						inputLevelLabelCenter.y)
+						inputLevelLabelCenter.y
+					)
 					outputLevelLabel.message = Text.literal(newOutput.levelData.currentLevel.toString())
 					outputLevelLabel.bounds.location = Point(
 						outputLevelLabelCenter.x - MC.font.getWidth(outputLevelLabel.message) / 2,
-						outputLevelLabelCenter.y)
+						outputLevelLabelCenter.y
+					)
 					coinStack.setStackSize((recipe.coins * (1 - 0.3 * newValue / 100)).toInt())
 				}
 				levelValue.set(1F)
 				add(Widgets.createRecipeBase(bounds))
-				add(wrapWidget(Rectangle(bounds.centerX - slider.width / 2,
-				                         bounds.maxY - 30,
-				                         slider.width,
-				                         slider.height),
-				               slider))
-				add(Widgets.withTooltip(
-					Widgets.createArrow(Point(bounds.centerX - arrowWidth / 2, bounds.minY + 40)),
-					Text.literal("Upgrade time: " + FirmFormatters.formatTimespan(recipe.seconds.seconds))))
+				add(
+					wrapWidget(
+						Rectangle(
+							bounds.centerX - slider.width / 2,
+							bounds.maxY - 30,
+							slider.width,
+							slider.height
+						),
+						slider
+					)
+				)
+				add(
+					Widgets.withTooltip(
+						Widgets.createArrow(Point(bounds.centerX - arrowWidth / 2, bounds.minY + 40)),
+						Text.literal("Upgrade time: " + FirmFormatters.formatTimespan(recipe.seconds.seconds))
+					)
+				)
 
 				add(Widgets.createResultSlotBackground(Point(bounds.maxX - 30, bounds.minY + 40)))
 				add(inputLevelLabel)
 				add(outputLevelLabel)
-				add(Widgets.createSlot(Point(bounds.maxX - 30, bounds.minY + 40)).markOutput().disableBackground()
-					    .entry(SBItemEntryDefinition.getEntry(outputStack)))
-				add(Widgets.createSlot(Point(bounds.minX + 30 - 18 + 5, bounds.minY + 40)).markInput()
-					    .entry(SBItemEntryDefinition.getEntry(inputStack)))
+				add(
+					Widgets.createSlot(Point(bounds.maxX - 30, bounds.minY + 40)).markOutput().disableBackground()
+						.entry(SBItemEntryDefinition.getEntry(outputStack))
+				)
+				add(
+					Widgets.createSlot(Point(bounds.minX + 30 - 18 + 5, bounds.minY + 40)).markInput()
+						.entry(SBItemEntryDefinition.getEntry(inputStack))
+				)
 
 				val allInputs = recipe.items.map { SBItemEntryDefinition.getEntry(it) } +
 					listOf(SBItemEntryDefinition.getEntry(coinStack))
 				for ((index, item) in allInputs.withIndex()) {
-					add(Widgets.createSlot(
-						Point(bounds.centerX + index * 20 - allInputs.size * 18 / 2 - (allInputs.size - 1) * 2 / 2,
-						      bounds.minY + 20))
-						    .markInput()
-						    .entry(item))
+					add(
+						Widgets.createSlot(
+							Point(
+								bounds.centerX + index * 20 - allInputs.size * 18 / 2 - (allInputs.size - 1) * 2 / 2,
+								bounds.minY + 20
+							)
+						)
+							.markInput()
+							.entry(item)
+					)
 				}
 			}
 		}
@@ -123,8 +144,8 @@ fun wrapWidget(bounds: Rectangle, component: GuiComponent): Widget {
 		}
 
 		override fun render(context: DrawContext, mouseX: Int, mouseY: Int, delta: Float) {
-			context.matrices.push()
-			context.matrices.translate(bounds.minX.toFloat(), bounds.minY.toFloat(), 0F)
+			context.matrices.pushMatrix()
+			context.matrices.translate(bounds.minX.toFloat(), bounds.minY.toFloat())
 			component.render(
 				GuiImmediateContext(
 					ModernRenderContext(context),
@@ -133,50 +154,57 @@ fun wrapWidget(bounds: Rectangle, component: GuiComponent): Widget {
 					mouseX - bounds.minX, mouseY - bounds.minY,
 					mouseX, mouseY,
 					mouseX.toFloat(), mouseY.toFloat()
-				))
-			context.matrices.pop()
+				)
+			)
+			context.matrices.popMatrix()
 		}
 
 		override fun mouseMoved(mouseX: Double, mouseY: Double) {
 			val mouseXInt = mouseX.toInt()
 			val mouseYInt = mouseY.toInt()
-			component.mouseEvent(MouseEvent.Move(0F, 0F),
-			                     GuiImmediateContext(
-				                     IMinecraft.instance.provideTopLevelRenderContext(),
-				                     bounds.minX, bounds.minY,
-				                     bounds.width, bounds.height,
-				                     mouseXInt - bounds.minX, mouseYInt - bounds.minY,
-				                     mouseXInt, mouseYInt,
-				                     mouseX.toFloat(), mouseY.toFloat()
-			                     ))
+			component.mouseEvent(
+				MouseEvent.Move(0F, 0F),
+				GuiImmediateContext(
+					IMinecraft.instance.provideTopLevelRenderContext(),
+					bounds.minX, bounds.minY,
+					bounds.width, bounds.height,
+					mouseXInt - bounds.minX, mouseYInt - bounds.minY,
+					mouseXInt, mouseYInt,
+					mouseX.toFloat(), mouseY.toFloat()
+				)
+			)
 		}
 
 		override fun mouseClicked(mouseX: Double, mouseY: Double, button: Int): Boolean {
 			val mouseXInt = mouseX.toInt()
 			val mouseYInt = mouseY.toInt()
-			return component.mouseEvent(MouseEvent.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()
-			                            ))
+			return component.mouseEvent(
+				MouseEvent.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()
+				)
+			)
 		}
 
 		override fun mouseReleased(mouseX: Double, mouseY: Double, button: Int): Boolean {
 			val mouseXInt = mouseX.toInt()
 			val mouseYInt = mouseY.toInt()
-			return component.mouseEvent(MouseEvent.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()
-			                            ))
+			return component.mouseEvent(
+				MouseEvent.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()
+				)
+			)
 		}
 
 		override fun mouseDragged(
@@ -188,15 +216,17 @@ fun wrapWidget(bounds: Rectangle, component: GuiComponent): Widget {
 		): Boolean {
 			val mouseXInt = mouseX.toInt()
 			val mouseYInt = mouseY.toInt()
-			return component.mouseEvent(MouseEvent.Move(deltaX.toFloat(), deltaY.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()
-			                            ))
+			return component.mouseEvent(
+				MouseEvent.Move(deltaX.toFloat(), deltaY.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()
+				)
+			)
 
 		}
 
@@ -208,15 +238,17 @@ fun wrapWidget(bounds: Rectangle, component: GuiComponent): Widget {
 		): Boolean {
 			val mouseXInt = mouseX.toInt()
 			val mouseYInt = mouseY.toInt()
-			return component.mouseEvent(MouseEvent.Scroll(verticalAmount.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()
-			                            ))
+			return component.mouseEvent(
+				MouseEvent.Scroll(verticalAmount.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()
+				)
+			)
 		}
 	}
 }