Dev/26.1

build.gradle.kts

@@ -281,6 +281,7 @@ dependencies {
     "localRuntime"(libs.bundles.common.runtime)
 
     "libClientCompileOnly"(libs.jei.api)
+    "libClientImplementation"(libs.jade)
     "clientRuntimeOnly"(libs.jei)
 }
 

gradle/libs.versions.toml

@@ -16,7 +16,7 @@ mod-publish = "2.1.1"
 ae2 = "26.1.12-beta"
 curios = "15.0.0+26.1.2"
 jade = "26.1.10+neoforge"
-jei = "29.43.0.106"
+jei = "29.47.0.109"
 
 [libraries]
 
@@ -37,7 +37,6 @@ common-compile = []
 common-runtime = [
     "ae2",
     "curios",
-    "jade",
 ]
 
 [plugins]

src/client/kotlin/hiiragi283/ragium/client/RagiumClient.kt

@@ -63,6 +63,8 @@ data object RagiumClient : HTClientMod() {
         eventBus.addListener(::registerTooltipAppenders)
 
         configScreen(container)
+
+        RagiumAPI.LOGGER.info("Ragium Client has been initialized!")
     }
 
     override fun clientSetup(event: FMLClientSetupEvent) {
@@ -301,5 +303,13 @@ data object RagiumClient : HTClientMod() {
             TooltipLocation.PRE_ITEM_INFO,
             TooltipAppender.createComponentAppender(RagiumDataComponents.ITEM_TOOLTIP)
         )
+        event.registerAppender(
+            TooltipLocation.PRE_ITEM_INFO,
+            TooltipAppender.createComponentAppender(RagiumDataComponents.UPGRADE)
+        )
+        event.registerAppender(
+            TooltipLocation.PRE_ITEM_INFO,
+            TooltipAppender.createComponentAppender(RagiumDataComponents.UPGRADES)
+        )
     }
 }

src/client/kotlin/hiiragi283/ragium/client/event/RagiumClientEventHandler.kt

@@ -19,7 +19,7 @@ data object RagiumClientEventHandler {
         val appender: (Text) -> Unit = event.toolTip::add
         // Potion Fluid
         if (RagiumFluids.POTION.isOf(stack)) {
-            HTPotionHelper.getContentsNotEmpty(stack)?.addToTooltip(event.context, appender, event.flags, stack)
+            HTPotionHelper.getContentsOrEmpty(stack).addToTooltip(event.context, appender, event.flags, stack)
         }
         // Chemical Tooltip
         HTClientChemicalHelper.addToTooltip(stack, appender)

src/client/kotlin/hiiragi283/ragium/client/gui/widget/HTEnergySlotWidgetRenderer.kt

@@ -34,7 +34,7 @@ class HTEnergySlotWidgetRenderer(gui: HTGuiAccess, widget: HTEnergySlotWidget) :
 
     override fun getSpriteAndColor(): Pair<TextureAtlasSprite, Int> = getSprite(AtlasIds.BLOCKS, SPRITE) to -1
 
-    override fun getLevel(): Float = widget.filledLevel
+    override fun getLevel(): Float = widget.filledLevelAsFloat
 
     override fun collectTooltips(consumer: Consumer<Text>, context: Item.TooltipContext, flag: TooltipFlag) {
         HTStorageHelper.addEnergyTooltip(widget, consumer, flag.isCreative)

src/client/kotlin/hiiragi283/ragium/client/gui/widget/HTGuiWidget.kt

@@ -13,7 +13,7 @@ import net.minecraft.client.input.MouseButtonEvent
 import net.minecraft.world.item.ItemStack
 
 /**
- * 参照 : [Mekanism - GuiElement](https://github.com/mekanism/Mekanism/blob/1.21.x/src/main/java/mekanism/client/gui/element/GuiElement.java)
+ * 参照 : [Mekanism - GuiElement](https://github.com/mekanism/Mekanism/blob/26.3/src/main/java/mekanism/client/gui/element/GuiElement.java)
  */
 class HTGuiWidget<WIDGET : HTWidget>(private val gui: HTGuiAccess, val widget: WIDGET) :
     AbstractWidget(

src/client/kotlin/hiiragi283/ragium/client/integration/jade/HTMachineOwnerProvider.kt

@@ -0,0 +1,39 @@
+package hiiragi283.ragium.client.integration.jade
+
+import hiiragi283.lib.block.entity.HTOwnedBlockEntity
+import hiiragi283.lib.text.HTTextUtil
+import hiiragi283.ragium.api.RagiumAPI
+import net.minecraft.ChatFormatting
+import net.minecraft.network.RegistryFriendlyByteBuf
+import net.minecraft.network.codec.ByteBufCodecs
+import net.minecraft.network.codec.StreamCodec
+import net.minecraft.resources.Identifier
+import snownee.jade.api.BlockAccessor
+import snownee.jade.api.IBlockComponentProvider
+import snownee.jade.api.ITooltip
+import snownee.jade.api.StreamServerDataProvider
+import snownee.jade.api.config.IPluginConfig
+
+data object HTMachineOwnerProvider {
+    @JvmField
+    val ID: Identifier = RagiumAPI.id("machine_owner")
+
+    data object Server : StreamServerDataProvider<BlockAccessor, String> {
+        override fun streamData(accessor: BlockAccessor): String? =
+            (accessor.blockEntity as? HTOwnedBlockEntity)?.getOwnerName()
+
+        override fun streamCodec(): StreamCodec<RegistryFriendlyByteBuf, String> = ByteBufCodecs.STRING_UTF8.cast()
+
+        override fun getUid(): Identifier = ID
+    }
+
+    data object Client : IBlockComponentProvider {
+        override fun appendTooltip(tooltip: ITooltip, accessor: BlockAccessor, config: IPluginConfig) {
+            Server.decodeFromData(accessor).ifPresent {
+                tooltip.add(HTTextUtil.smartTranslate("jade.owner", ChatFormatting.WHITE, it))
+            }
+        }
+
+        override fun getUid(): Identifier = ID
+    }
+}

src/client/kotlin/hiiragi283/ragium/client/integration/jade/HTMachineUpgradeProvider.kt

@@ -0,0 +1,36 @@
+package hiiragi283.ragium.client.integration.jade
+
+import hiiragi283.ragium.api.RagiumAPI
+import hiiragi283.ragium.api.data.RagiumDataComponents
+import hiiragi283.ragium.api.machine.HTMachineUpgradeList
+import net.minecraft.network.RegistryFriendlyByteBuf
+import net.minecraft.network.codec.StreamCodec
+import net.minecraft.resources.Identifier
+import snownee.jade.api.BlockAccessor
+import snownee.jade.api.IBlockComponentProvider
+import snownee.jade.api.ITooltip
+import snownee.jade.api.StreamServerDataProvider
+import snownee.jade.api.config.IPluginConfig
+
+data object HTMachineUpgradeProvider {
+    @JvmField
+    val ID: Identifier = RagiumAPI.id("machine_upgrade")
+
+    data object Server : StreamServerDataProvider<BlockAccessor, HTMachineUpgradeList> {
+        override fun streamData(accessor: BlockAccessor): HTMachineUpgradeList? =
+            accessor.blockEntity?.components()?.get(RagiumDataComponents.UPGRADES)
+
+        override fun streamCodec(): StreamCodec<RegistryFriendlyByteBuf, HTMachineUpgradeList> =
+            HTMachineUpgradeList.STREAM_CODEC
+
+        override fun getUid(): Identifier = ID
+    }
+
+    data object Client : IBlockComponentProvider {
+        override fun appendTooltip(tooltip: ITooltip, accessor: BlockAccessor, config: IPluginConfig) {
+            Server.decodeFromData(accessor).ifPresent { it.addToTooltip(tooltip::add) }
+        }
+
+        override fun getUid(): Identifier = ID
+    }
+}

src/client/kotlin/hiiragi283/ragium/client/integration/jade/RagiumJadePlugin.kt

@@ -0,0 +1,21 @@
+package hiiragi283.ragium.client.integration.jade
+
+import hiiragi283.ragium.common.block.HTBasicEntityBlock
+import hiiragi283.ragium.common.block.entity.HTBlockEntity
+import snownee.jade.api.IWailaClientRegistration
+import snownee.jade.api.IWailaCommonRegistration
+import snownee.jade.api.IWailaPlugin
+import snownee.jade.api.WailaPlugin
+
+@WailaPlugin
+class RagiumJadePlugin : IWailaPlugin {
+    override fun register(registration: IWailaCommonRegistration) {
+        registration.registerBlockDataProvider(HTMachineOwnerProvider.Server, HTBlockEntity::class.java)
+        registration.registerBlockDataProvider(HTMachineUpgradeProvider.Server, HTBlockEntity::class.java)
+    }
+
+    override fun registerClient(registration: IWailaClientRegistration) {
+        registration.registerBlockComponent(HTMachineOwnerProvider.Client, HTBasicEntityBlock::class.java)
+        registration.registerBlockComponent(HTMachineUpgradeProvider.Client, HTBasicEntityBlock::class.java)
+    }
+}