Dev/26.1

gradle/libs.versions.toml

@@ -1,8 +1,8 @@
 [versions]
 minecraft = "26.1.2"
 
-neo-moddev = "2.0.146"
-neo-version = "26.1.2.109"
+neo-moddev = "2.0.147"
+neo-version = "26.1.2.112"
 kff-version = "6.3.0"
 
 kotlin = "2.4.0"
@@ -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.37.0.100"
+jei = "29.43.0.106"
 
 [libraries]
 

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

@@ -1,15 +1,20 @@
 package hiiragi283.ragium.client
 
 import hiiragi283.lib.HTConstants
+import hiiragi283.lib.capability.HTFluidCapabilities
 import hiiragi283.lib.event.HTRegisterWidgetRendererEvent
 import hiiragi283.lib.fluid.FluidStackTintSource
 import hiiragi283.lib.fluid.HTFluidModelRegister
 import hiiragi283.lib.item.alchemy.HTPotionHelper
 import hiiragi283.lib.mod.HTClientMod
 import hiiragi283.lib.network.HTPayloadHandlers
 import hiiragi283.lib.resource.vanillaId
+import hiiragi283.lib.text.HTCommonTranslation
+import hiiragi283.lib.text.Text
+import hiiragi283.lib.transfer.fluid.HTFluidView
 import hiiragi283.ragium.api.RagiumAPI
-import hiiragi283.ragium.api.data.oreSlurry.HTOreSlurryDataHelper
+import hiiragi283.ragium.api.data.chemical.HTClientChemicalHelper
+import hiiragi283.ragium.api.tag.RagiumTags
 import hiiragi283.ragium.client.gui.screen.HTWidgetContainerScreen
 import hiiragi283.ragium.client.gui.screen.tooltip.HTMemoryDiscClientTooltipComponent
 import hiiragi283.ragium.client.gui.widget.HTEnergySlotWidgetRenderer
@@ -25,9 +30,11 @@ import hiiragi283.ragium.common.gui.widget.RagiumWidgetTypes
 import hiiragi283.ragium.common.item.tooltip.HTMemoryDiscTooltipComponent
 import hiiragi283.ragium.common.network.HTUpdateBlockEntityPacket
 import hiiragi283.ragium.common.network.HTUpdateMenuPacket
+import net.minecraft.ChatFormatting
 import net.minecraft.client.resources.model.sprite.Material
 import net.minecraft.util.ARGB
 import net.minecraft.world.item.DyeColor
+import net.minecraft.world.item.ItemStack
 import net.neoforged.api.distmarker.Dist
 import net.neoforged.bus.api.IEventBus
 import net.neoforged.fml.ModContainer
@@ -36,16 +43,22 @@ import net.neoforged.fml.event.lifecycle.FMLClientSetupEvent
 import net.neoforged.neoforge.client.event.EntityRenderersEvent
 import net.neoforged.neoforge.client.event.RegisterClientTooltipComponentFactoriesEvent
 import net.neoforged.neoforge.client.event.RegisterMenuScreensEvent
+import net.neoforged.neoforge.client.fluid.FluidTintSources
 import net.neoforged.neoforge.client.network.event.RegisterClientPayloadHandlersEvent
+import net.neoforged.neoforge.common.tooltip.TooltipLocation
+import net.neoforged.neoforge.event.RegisterTooltipAppendersEvent
 import net.neoforged.neoforge.fluids.FluidStack
+import net.neoforged.neoforge.transfer.fluid.FluidResource
 import java.awt.Color
+import java.util.function.Consumer
 
 @Mod(value = RagiumAPI.MOD_ID, dist = [Dist.CLIENT])
 data object RagiumClient : HTClientMod() {
     override fun initialize(eventBus: IEventBus, container: ModContainer) {
         eventBus.addListener { event: RegisterClientTooltipComponentFactoriesEvent ->
             event.register(HTMemoryDiscTooltipComponent::class.java, ::HTMemoryDiscClientTooltipComponent)
         }
+        eventBus.addListener(::registerTooltipAppenders)
 
         configScreen(container)
     }
@@ -60,10 +73,10 @@ data object RagiumClient : HTClientMod() {
     }
 
     override fun registerWidgetRenderer(event: HTRegisterWidgetRendererEvent) {
-        event.register(RagiumWidgetTypes.ENERGY, ::HTEnergySlotWidgetRenderer)
-        event.register(RagiumWidgetTypes.FLUID, ::HTFluidWidgetRenderer)
-        event.register(RagiumWidgetTypes.ITEM, ::HTItemWidgetRenderer)
-        event.register(RagiumWidgetTypes.PROGRESS, ::HTProgressWidgetRenderer)
+        event.register(RagiumWidgetTypes.ENERGY.get(), ::HTEnergySlotWidgetRenderer)
+        event.register(RagiumWidgetTypes.FLUID.get(), ::HTFluidWidgetRenderer)
+        event.register(RagiumWidgetTypes.ITEM.get(), ::HTItemWidgetRenderer)
+        event.register(RagiumWidgetTypes.PROGRESS.get(), ::HTProgressWidgetRenderer)
     }
 
     override fun registerFluidModels(register: HTFluidModelRegister) {
@@ -83,7 +96,7 @@ data object RagiumClient : HTClientMod() {
         register.register(RagiumFluids.POTION) {
             dull()
             tintSource = FluidStackTintSource { stack: FluidStack ->
-                ARGB.opaque(HTPotionHelper.getContents(stack).color)
+                ARGB.opaque(HTPotionHelper.getContentsOrEmpty(stack).color)
             }
         }
         register.register(RagiumFluids.OMINOUS_FLUX) {
@@ -112,6 +125,10 @@ data object RagiumClient : HTClientMod() {
             transparent()
             colorTint(Color(0x003399))
         }
+        register.register(RagiumFluids.NITROGEN) {
+            transparent()
+            colorTint(Color(0x009999))
+        }
         register.register(RagiumFluids.OXYGEN) {
             transparent()
             colorTint(Color(0x3399cc))
@@ -129,6 +146,14 @@ data object RagiumClient : HTClientMod() {
             molten()
             colorTint(Color(0x333366))
         }
+        register.register(RagiumFluids.ALCOHOL) {
+            transparent()
+            colorTint(Color(0xcc99ff))
+        }
+        register.register(RagiumFluids.ALDEHYDE) {
+            transparent()
+            colorTint(Color(0xcc66ff))
+        }
         register.register(RagiumFluids.AROMATIC_COMPOUND) {
             transparent()
             colorTint(Color(0xffcc99))
@@ -149,6 +174,10 @@ data object RagiumClient : HTClientMod() {
             dull()
             colorTint(Color(0xff9933))
         }
+        register.register(RagiumFluids.MOLTEN_PLASTIC) {
+            molten()
+            colorTint(Color(0xccccdd))
+        }
         register.register(RagiumFluids.SYNTHETIC_RESIN) {
             molten()
             colorTint(Color(0xff6633))
@@ -170,6 +199,10 @@ data object RagiumClient : HTClientMod() {
             colorTint(Color(0x33cc66))
         }
 
+        register.register(RagiumFluids.SALT_WATER) {
+            dull()
+            tintSource = FluidTintSources.water()
+        }
         register.register(RagiumFluids.NAOH_SOLUTION) {
             dull()
             colorTint(Color(0x003366))
@@ -202,13 +235,6 @@ data object RagiumClient : HTClientMod() {
             dull()
             colorTint(Color(0xccff99))
         }
-
-        register.register(RagiumFluids.ORE_SLURRY) {
-            still = Material(vanillaId(HTConstants.BLOCK, "white_concrete_powder"))
-            tintSource = FluidStackTintSource { stack: FluidStack ->
-                ARGB.opaque(HTOreSlurryDataHelper.getData(stack)?.color ?: 0x333300)
-            }
-        }
     }
 
     override fun registerScreens(event: RegisterMenuScreensEvent) {
@@ -217,6 +243,56 @@ data object RagiumClient : HTClientMod() {
 
     override fun registerEntityRenderer(event: EntityRenderersEvent.RegisterRenderers) {
         event.registerBlockEntityRenderer(RagiumBlockEntityTypes.TANK.get(), ::HTTankBlockEntityRenderer)
+        event.registerBlockEntityRenderer(RagiumBlockEntityTypes.POTION_TANK.get(), ::HTTankBlockEntityRenderer)
         event.registerBlockEntityRenderer(RagiumBlockEntityTypes.CREATIVE_TANK.get(), ::HTTankBlockEntityRenderer)
     }
+
+    @JvmStatic
+    private fun registerTooltipAppenders(event: RegisterTooltipAppendersEvent) {
+        event.registerAppender(
+            TooltipLocation.HEAD
+        ) { stack: ItemStack, _, _, _, _, builder: Consumer<Text> ->
+            if (!stack.`is`(RagiumTags.Items.SHOW_FLUID_TOOLTIPS)) return@registerAppender
+            val view: HTFluidView = HTFluidCapabilities.getSlot(stack, 0) ?: return@registerAppender
+            val isCreative: Boolean = stack.`is`(RagiumTags.BlockItems.STORAGES_CREATIVE.item)
+            // Fluid Name
+            val resource: FluidResource = view.resource
+            when {
+                resource.isEmpty -> HTCommonTranslation.EMPTY.translateColored(ChatFormatting.RED)
+
+                isCreative -> HTCommonTranslation.STORED.translateColored(
+                    ChatFormatting.LIGHT_PURPLE,
+                    resource.hoverName,
+                    ChatFormatting.GRAY,
+                    HTCommonTranslation.INFINITE
+                )
+
+                else -> HTCommonTranslation.STORED_MB.translateColored(
+                    ChatFormatting.LIGHT_PURPLE,
+                    resource.hoverName,
+                    ChatFormatting.GRAY,
+                    view.amount
+                )
+            }.let(builder::accept)
+            // Tank Capacity
+            when (isCreative) {
+                true -> HTCommonTranslation.CAPACITY.translateColored(
+                    ChatFormatting.BLUE,
+                    ChatFormatting.GRAY,
+                    HTCommonTranslation.INFINITE
+                )
+
+                false -> HTCommonTranslation.CAPACITY_MB.translateColored(
+                    ChatFormatting.BLUE,
+                    ChatFormatting.GRAY,
+                    view.currentCapacity
+                )
+            }.let(builder::accept)
+        }
+        event.registerAppender(
+            TooltipLocation.HEAD
+        ) { stack: ItemStack, _, _, _, _, builder: Consumer<Text> ->
+            HTClientChemicalHelper.addToTooltip(stack, builder::accept)
+        }
+    }
 }

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

@@ -1,7 +1,9 @@
 package hiiragi283.ragium.client.event
 
 import hiiragi283.lib.item.alchemy.HTPotionHelper
+import hiiragi283.lib.text.Text
 import hiiragi283.ragium.api.RagiumAPI
+import hiiragi283.ragium.api.data.chemical.HTClientChemicalHelper
 import hiiragi283.ragium.common.fluid.RagiumFluids
 import net.neoforged.api.distmarker.Dist
 import net.neoforged.bus.api.SubscribeEvent
@@ -14,8 +16,12 @@ data object RagiumClientEventHandler {
     @SubscribeEvent
     fun onFluidTooltip(event: FluidTooltipEvent) {
         val stack: FluidStack = event.fluidStack
+        val appender: (Text) -> Unit = event.toolTip::add
+        // Potion Fluid
         if (RagiumFluids.POTION.isOf(stack)) {
-            HTPotionHelper.getContents(stack).addToTooltip(event.context, event.toolTip::add, event.flags, stack)
+            HTPotionHelper.getContentsNotEmpty(stack)?.addToTooltip(event.context, appender, event.flags, stack)
         }
+        // Chemical Tooltip
+        HTClientChemicalHelper.addToTooltip(stack, appender)
     }
 }

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

@@ -32,9 +32,7 @@ class HTEnergySlotWidgetRenderer(gui: HTGuiAccess, widget: HTEnergySlotWidget) :
 
     override fun shouldRender(): Boolean = !widget.isEmpty
 
-    override fun getSprite(): TextureAtlasSprite = getSprite(AtlasIds.BLOCKS, SPRITE)
-
-    override fun getColor(): Int = -1
+    override fun getSpriteAndColor(): Pair<TextureAtlasSprite, Int> = getSprite(AtlasIds.BLOCKS, SPRITE) to -1
 
     override fun getLevel(): Float = widget.filledLevel
 

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

@@ -27,16 +27,15 @@ class HTFluidWidgetRenderer(gui: HTGuiAccess, widget: HTFluidWidget) :
 
     override fun shouldRender(): Boolean = !widget.isEmpty
 
-    override fun getSprite(): TextureAtlasSprite? = HTGuiRenderHelper.getSprite(widget.resource)
-
-    override fun getColor(): Int = HTGuiRenderHelper.getColor(widget.getFluidStack())
+    override fun getSpriteAndColor(): Pair<TextureAtlasSprite, Int>? =
+        HTGuiRenderHelper.getSpriteAndColor(widget.getFluidStack())
 
     override fun getLevel(): Float = when (widget) {
         is HTFluidWidget.Slot -> 1f
         is HTFluidWidget.Tank -> widget.currentFilledLevel
     }.coerceAtMost(1f)
 
     override fun collectTooltips(consumer: Consumer<Text>, context: Item.TooltipContext, flag: TooltipFlag) {
-        HTStorageHelper.addFluidTooltip(widget.getFluidStack(), consumer, context, null, flag, false)
+        HTStorageHelper.addFluidTooltip(widget.getFluidStack(), consumer, context, flag, false)
     }
 }

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

@@ -2,6 +2,7 @@ package hiiragi283.ragium.client.gui.widget
 
 import hiiragi283.lib.gui.HTBounds
 import hiiragi283.lib.gui.HTGuiAccess
+import hiiragi283.lib.gui.HTGuiRenderHelper
 import hiiragi283.lib.gui.widget.HTAbstractWidgetRenderer
 import hiiragi283.lib.gui.widget.HTWidget
 import hiiragi283.lib.text.Text
@@ -15,7 +16,6 @@ import net.minecraft.client.resources.metadata.gui.GuiSpriteScaling
 import net.minecraft.resources.Identifier
 import net.minecraft.world.item.Item
 import net.minecraft.world.item.TooltipFlag
-import net.neoforged.neoforge.client.ClientTooltipFlag
 import java.util.function.Consumer
 
 abstract class HTSpriteWidgetRenderer<WIDGET : HTWidget>(gui: HTGuiAccess, widget: WIDGET) :
@@ -38,9 +38,11 @@ abstract class HTSpriteWidgetRenderer<WIDGET : HTWidget>(gui: HTGuiAccess, widge
             graphics.setTooltipForNextFrame(
                 font,
                 buildList {
-                    collectTooltips({ text: Text ->
-                        this.add(text.visualOrderText)
-                    }, Item.TooltipContext.EMPTY, getTooltipFlag())
+                    collectTooltips(
+                        { text: Text -> this.add(text.visualOrderText) },
+                        HTGuiRenderHelper.getTooltipContext(),
+                        HTGuiRenderHelper.getTooltipFlag()
+                    )
                 },
                 mouseX,
                 mouseY
@@ -50,8 +52,7 @@ abstract class HTSpriteWidgetRenderer<WIDGET : HTWidget>(gui: HTGuiAccess, widge
 
     private fun renderSprite(bounds: HTBounds, graphics: GuiGraphicsExtractor) {
         if (!shouldRender()) return
-        val sprite: TextureAtlasSprite = getSprite() ?: return
-        val color: Int = getColor()
+        val (sprite: TextureAtlasSprite, color: Int) = getSpriteAndColor() ?: return
         val fillLevel: Int = getScaledLevel().toInt()
 
         val spriteContents: SpriteContents = sprite.contents()
@@ -81,27 +82,18 @@ abstract class HTSpriteWidgetRenderer<WIDGET : HTWidget>(gui: HTGuiAccess, widge
         graphics.disableScissor()
     }
 
-    protected fun getTooltipFlag(): TooltipFlag = ClientTooltipFlag.of(
-        when (Minecraft.getInstance().options.advancedItemTooltips) {
-            true -> TooltipFlag.ADVANCED
-            false -> TooltipFlag.NORMAL
-        }
-    )
-
     protected abstract fun renderBackground(bounds: HTBounds, graphics: GuiGraphicsExtractor)
 
     protected abstract fun shouldRender(): Boolean
 
-    protected abstract fun getSprite(): TextureAtlasSprite?
+    protected abstract fun getSpriteAndColor(): Pair<TextureAtlasSprite, Int>?
 
     protected fun getSprite(atlasId: Identifier, id: Identifier): TextureAtlasSprite = Minecraft
         .getInstance()
         .atlasManager
         .getAtlasOrThrow(atlasId)
         .getSprite(id)
 
-    protected abstract fun getColor(): Int
-
     protected open fun getScaledLevel(): Float = getLevel() * (widget.bounds.height - 2)
 
     protected abstract fun getLevel(): Float