Dev/26.1

build.gradle.kts

@@ -70,10 +70,16 @@ scmVersion {
 base {
     archivesName = modId
     group = "io.github.hiiragi283"
-    version = scmVersion.version
+    version = "${scmVersion.version}-beta"
 }
 
 val libModule: SourceSet = sourceSets.register("lib").get()
+val libClientModule: SourceSet =
+    sourceSets
+        .register("libClient") {
+            compileClasspath += libModule.output + libModule.compileClasspath
+            runtimeClasspath += libModule.output + libModule.runtimeClasspath
+        }.get()
 val mainModule: SourceSet =
     sourceSets
         .named("main") {
@@ -89,7 +95,9 @@ val clientModule: SourceSet =
     sourceSets
         .register("client") {
             compileClasspath += mainModule.output + mainModule.compileClasspath
+            compileClasspath += libClientModule.output + libClientModule.compileClasspath
             runtimeClasspath += mainModule.output + mainModule.runtimeClasspath
+            runtimeClasspath += libClientModule.output + libClientModule.runtimeClasspath
         }.get()
 val dataModule: SourceSet =
     sourceSets
@@ -216,6 +224,7 @@ neoForge {
         // multi mod projects should define one per mod
         create(modId) {
             sourceSet(libModule)
+            sourceSet(libClientModule)
             sourceSet(sourceSets.main.get())
             sourceSet(clientModule)
             sourceSet(dataModule)
@@ -252,12 +261,15 @@ dependencies {
         runtimeClasspath.get().extendsFrom(create("localRuntime"))
 
         val libCompileClasspath: Configuration = named("libCompileClasspath").get()
+        val libClientCompileClasspath: Configuration = named("libClientCompileClasspath").get()
         val compileClasspath: Configuration = named("compileClasspath").get()
         val clientCompileClasspath: Configuration = named("clientCompileClasspath").get()
         val dataCompileClasspath: Configuration = named("dataCompileClasspath").get()
 
         libCompileClasspath.extendsFrom(compileClasspath)
+        libCompileClasspath.extendsFrom(libClientCompileClasspath)
         compileClasspath.extendsFrom(clientCompileClasspath)
+        libClientCompileClasspath.extendsFrom(clientCompileClasspath)
         clientCompileClasspath.extendsFrom(dataCompileClasspath)
     }
 
@@ -267,6 +279,9 @@ dependencies {
     implementation(libs.bundles.common.impl)
     compileOnly(libs.bundles.common.compile)
     "localRuntime"(libs.bundles.common.runtime)
+
+    "libClientCompileOnly"(libs.jei.api)
+    "clientRuntimeOnly"(libs.jei)
 }
 
 // Example configuration to allow publishing using the maven-publish plugin
@@ -336,7 +351,7 @@ dokka {
     dokkaSourceSets {
         configureEach {
             sourceRoots.from(
-                listOf(libModule, clientModule)
+                listOf(libModule, libClientModule)
                     .map { it.kotlin }
                     .map { it.srcDirs.filter { "lib" in it.path } }
             )
@@ -379,12 +394,12 @@ tasks {
         from("LICENSE") {
             rename { "${it}_ragium" }
         }
-        from(libModule.output, clientModule.output)
+        from(libModule.output, libClientModule.output, clientModule.output)
     }
 
     named<Jar>("sourcesJar") {
         dependsOn("libClasses", "clientClasses")
         duplicatesStrategy = DuplicatesStrategy.FAIL
-        from(libModule.allSource, clientModule.allSource)
+        from(libModule.allSource, libClientModule.allSource)
     }
 }

gradle/libs.versions.toml

@@ -2,7 +2,7 @@
 minecraft = "26.1.2"
 
 neo-moddev = "2.0.146"
-neo-version = "26.1.2.107"
+neo-version = "26.1.2.109"
 kff-version = "6.3.0"
 
 kotlin = "2.4.0"
@@ -13,10 +13,10 @@ axion-release = "1.21.2"
 maven-publish = "0.37.0"
 mod-publish = "2.1.1"
 
-ae2 = "26.1.11-beta"
+ae2 = "26.1.12-beta"
 curios = "15.0.0+26.1.2"
 jade = "26.1.10+neoforge"
-jei = "29.37.0.98"
+jei = "29.37.0.100"
 
 [libraries]
 
@@ -32,15 +32,12 @@ jei-api = { group = "mezz.jei", name = "jei-26.1.2-neoforge-api", version.ref =
 
 common-impl = []
 
-common-compile = [
-    "jei-api",
-]
+common-compile = []
 
 common-runtime = [
     "ae2",
     "curios",
     "jade",
-    "jei"
 ]
 
 [plugins]

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

@@ -9,26 +9,31 @@ import hiiragi283.lib.mod.HTClientMod
 import hiiragi283.lib.network.HTPayloadHandlers
 import hiiragi283.lib.resource.vanillaId
 import hiiragi283.ragium.api.RagiumAPI
+import hiiragi283.ragium.api.data.oreSlurry.HTOreSlurryDataHelper
 import hiiragi283.ragium.client.gui.screen.HTWidgetContainerScreen
+import hiiragi283.ragium.client.gui.screen.tooltip.HTMemoryDiscClientTooltipComponent
 import hiiragi283.ragium.client.gui.widget.HTEnergySlotWidgetRenderer
 import hiiragi283.ragium.client.gui.widget.HTFluidWidgetRenderer
 import hiiragi283.ragium.client.gui.widget.HTItemWidgetRenderer
 import hiiragi283.ragium.client.gui.widget.HTProgressWidgetRenderer
 import hiiragi283.ragium.client.gui.widget.HTWidgetRendererManager
-import hiiragi283.ragium.client.render.HTMemoryDiscClientTooltipComponent
+import hiiragi283.ragium.client.renderer.HTTankBlockEntityRenderer
+import hiiragi283.ragium.common.block.entity.RagiumBlockEntityTypes
 import hiiragi283.ragium.common.fluid.RagiumFluids
 import hiiragi283.ragium.common.gui.factory.HTBlockWidgetHolderContext
 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.client.resources.model.sprite.Material
+import net.minecraft.util.ARGB
 import net.minecraft.world.item.DyeColor
 import net.neoforged.api.distmarker.Dist
 import net.neoforged.bus.api.IEventBus
 import net.neoforged.fml.ModContainer
 import net.neoforged.fml.common.Mod
 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.network.event.RegisterClientPayloadHandlersEvent
@@ -72,13 +77,14 @@ data object RagiumClient : HTClientMod() {
         register.register(RagiumFluids.HONEY) {
             still = Material(vanillaId(HTConstants.BLOCK, "honey_block_top"), true)
         }
+        register.register(RagiumFluids.RESIN) {
+            still = Material(vanillaId(HTConstants.BLOCK, "resin_block"))
+        }
         register.register(RagiumFluids.POTION) {
             dull()
-            tintSource =
-                FluidStackTintSource { stack: FluidStack ->
-                    "ff000000".hexToInt() or
-                        HTPotionHelper.getContents(stack).color
-                }
+            tintSource = FluidStackTintSource { stack: FluidStack ->
+                ARGB.opaque(HTPotionHelper.getContents(stack).color)
+            }
         }
         register.register(RagiumFluids.OMINOUS_FLUX) {
             molten()
@@ -116,19 +122,19 @@ data object RagiumClient : HTClientMod() {
         }
 
         register.register(RagiumFluids.WOOD_TAR) {
-            dull()
+            molten()
             colorTint(Color(0x663333))
         }
         register.register(RagiumFluids.COAL_TAR) {
-            dull()
+            molten()
             colorTint(Color(0x333366))
         }
         register.register(RagiumFluids.AROMATIC_COMPOUND) {
             transparent()
             colorTint(Color(0xffcc99))
         }
         register.register(RagiumFluids.CRUDE_OIL) {
-            sticky()
+            molten()
             colorTint(Color(0x333333))
         }
         register.register(RagiumFluids.NAPHTHA) {
@@ -143,6 +149,10 @@ data object RagiumClient : HTClientMod() {
             dull()
             colorTint(Color(0xff9933))
         }
+        register.register(RagiumFluids.SYNTHETIC_RESIN) {
+            molten()
+            colorTint(Color(0xff6633))
+        }
         register.register(RagiumFluids.NITRIC_ACID) {
             dull()
             colorTint(Color(0x9999cc))
@@ -151,10 +161,23 @@ data object RagiumClient : HTClientMod() {
             dull()
             colorTint(Color(0xcc3333))
         }
+        register.register(RagiumFluids.HYDROGEN_FLUORIDE) {
+            transparent()
+            colorTint(Color(0x33cc66))
+        }
+        register.register(RagiumFluids.HYDROFLUORIC_ACID) {
+            dull()
+            colorTint(Color(0x33cc66))
+        }
+
         register.register(RagiumFluids.NAOH_SOLUTION) {
             dull()
             colorTint(Color(0x003366))
         }
+        register.register(RagiumFluids.ALUMINA_SOLUTION) {
+            transparent()
+            colorTint(Color(0xffcccc))
+        }
         register.register(RagiumFluids.SULFUR_DIOXIDE) {
             transparent()
             colorTint(Color(0x996600))
@@ -181,12 +204,19 @@ data object RagiumClient : HTClientMod() {
         }
 
         register.register(RagiumFluids.ORE_SLURRY) {
-            dull()
-            colorTint(Color(0x3399cc))
+            still = Material(vanillaId(HTConstants.BLOCK, "white_concrete_powder"))
+            tintSource = FluidStackTintSource { stack: FluidStack ->
+                ARGB.opaque(HTOreSlurryDataHelper.getData(stack)?.color ?: 0x333300)
+            }
         }
     }
 
     override fun registerScreens(event: RegisterMenuScreensEvent) {
         event.register(HTBlockWidgetHolderContext.MENU_TYPE.get(), ::HTWidgetContainerScreen)
     }
+
+    override fun registerEntityRenderer(event: EntityRenderersEvent.RegisterRenderers) {
+        event.registerBlockEntityRenderer(RagiumBlockEntityTypes.TANK.get(), ::HTTankBlockEntityRenderer)
+        event.registerBlockEntityRenderer(RagiumBlockEntityTypes.CREATIVE_TANK.get(), ::HTTankBlockEntityRenderer)
+    }
 }

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

@@ -14,7 +14,7 @@ data object RagiumClientEventHandler {
     @SubscribeEvent
     fun onFluidTooltip(event: FluidTooltipEvent) {
         val stack: FluidStack = event.fluidStack
-        if (stack.`is`(RagiumFluids.POTION.getOrThrow())) {
+        if (RagiumFluids.POTION.isOf(stack)) {
             HTPotionHelper.getContents(stack).addToTooltip(event.context, event.toolTip::add, event.flags, stack)
         }
     }

src/client/kotlin/hiiragi283/ragium/client/render/HTMemoryDiscClientTooltipComponent.kt → src/client/kotlin/hiiragi283/ragium/client/gui/screen/tooltip/HTMemoryDiscClientTooltipComponent.kt

@@ -1,4 +1,4 @@
-package hiiragi283.ragium.client.render
+package hiiragi283.ragium.client.gui.screen.tooltip
 
 import hiiragi283.lib.text.Text
 import hiiragi283.ragium.api.text.RagiumTranslation

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

@@ -2,14 +2,13 @@ package hiiragi283.ragium.client.gui.widget
 
 import hiiragi283.lib.gui.HTBounds
 import hiiragi283.lib.gui.HTGuiAccess
+import hiiragi283.lib.gui.HTGuiRenderHelper
 import hiiragi283.lib.text.Text
 import hiiragi283.lib.transfer.fluid.getFluidStack
 import hiiragi283.ragium.api.util.HTStorageHelper
 import hiiragi283.ragium.client.util.HTSpriteRenderHelper
 import hiiragi283.ragium.common.gui.widget.HTFluidWidget
-import net.minecraft.client.Minecraft
 import net.minecraft.client.gui.GuiGraphicsExtractor
-import net.minecraft.client.renderer.block.FluidModel
 import net.minecraft.client.renderer.texture.TextureAtlasSprite
 import net.minecraft.resources.Identifier
 import net.minecraft.world.item.Item
@@ -28,14 +27,9 @@ class HTFluidWidgetRenderer(gui: HTGuiAccess, widget: HTFluidWidget) :
 
     override fun shouldRender(): Boolean = !widget.isEmpty
 
-    private fun getModel(): FluidModel = Minecraft.getInstance()
-        .modelManager
-        .fluidStateModelSet
-        .get(widget.resource.fluid.defaultFluidState())
+    override fun getSprite(): TextureAtlasSprite? = HTGuiRenderHelper.getSprite(widget.resource)
 
-    override fun getSprite(): TextureAtlasSprite = getModel().stillMaterial().sprite()
-
-    override fun getColor(): Int = getModel().fluidTintSource()?.colorAsStack(widget.getFluidStack()) ?: 0
+    override fun getColor(): Int = HTGuiRenderHelper.getColor(widget.getFluidStack())
 
     override fun getLevel(): Float = when (widget) {
         is HTFluidWidget.Slot -> 1f

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

@@ -50,7 +50,7 @@ abstract class HTSpriteWidgetRenderer<WIDGET : HTWidget>(gui: HTGuiAccess, widge
 
     private fun renderSprite(bounds: HTBounds, graphics: GuiGraphicsExtractor) {
         if (!shouldRender()) return
-        val sprite: TextureAtlasSprite = getSprite()
+        val sprite: TextureAtlasSprite = getSprite() ?: return
         val color: Int = getColor()
         val fillLevel: Int = getScaledLevel().toInt()
 
@@ -62,6 +62,7 @@ abstract class HTSpriteWidgetRenderer<WIDGET : HTWidget>(gui: HTGuiAccess, widge
         y++
         width -= 2
         height -= 2
+        graphics.enableScissor(x, y, x + width, y + height)
         graphics.blitTiledSprite(
             RenderPipelines.GUI_TEXTURED,
             sprite,
@@ -77,6 +78,7 @@ abstract class HTSpriteWidgetRenderer<WIDGET : HTWidget>(gui: HTGuiAccess, widge
             tileScaling.height,
             color
         ) // TODO
+        graphics.disableScissor()
     }
 
     protected fun getTooltipFlag(): TooltipFlag = ClientTooltipFlag.of(
@@ -90,7 +92,7 @@ abstract class HTSpriteWidgetRenderer<WIDGET : HTWidget>(gui: HTGuiAccess, widge
 
     protected abstract fun shouldRender(): Boolean
 
-    protected abstract fun getSprite(): TextureAtlasSprite
+    protected abstract fun getSprite(): TextureAtlasSprite?
 
     protected fun getSprite(atlasId: Identifier, id: Identifier): TextureAtlasSprite = Minecraft
         .getInstance()