Dev/26.1

.github/workflows/release.yml

@@ -3,7 +3,6 @@ on:
   push:
     tags:
       - "v*.*.*"
-  workflow_dispatch:
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}

README.md

@@ -1,4 +1,4 @@
-![NeoForged Logo](./src/main/resources/icon.png)
+![Ragium Logo](./src/main/resources/icon.png)
 
 Ragium
 =============

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

@@ -1,7 +1,6 @@
 package hiiragi283.ragium.client
 
 import hiiragi283.lib.HTConstants
-import hiiragi283.lib.color.HTDefaultColor
 import hiiragi283.lib.event.HTRegisterWidgetRendererEvent
 import hiiragi283.lib.fluid.FluidStackTintSource
 import hiiragi283.lib.fluid.HTFluidModelRegister
@@ -24,6 +23,7 @@ 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.world.item.DyeColor
 import net.neoforged.api.distmarker.Dist
 import net.neoforged.bus.api.IEventBus
 import net.neoforged.fml.ModContainer
@@ -62,10 +62,10 @@ data object RagiumClient : HTClientMod() {
     }
 
     override fun registerFluidModels(register: HTFluidModelRegister) {
-        for (color: HTDefaultColor in HTDefaultColor.entries) {
+        for (color: DyeColor in DyeColor.entries) {
             register.register(RagiumFluids.DYES[color]) {
                 dull()
-                color.color.let(::colorTint)
+                color.textureDiffuseColor.let(::colorTint)
             }
         }
 
@@ -77,7 +77,7 @@ data object RagiumClient : HTClientMod() {
             tintSource =
                 FluidStackTintSource { stack: FluidStack ->
                     "ff000000".hexToInt() or
-                        HTPotionHelper.getPotion(stack).color
+                        HTPotionHelper.getContents(stack).color
                 }
         }
         register.register(RagiumFluids.OMINOUS_FLUX) {
@@ -175,9 +175,9 @@ data object RagiumClient : HTClientMod() {
             dull()
             colorTint(Color(0x66cc33))
         }
-        register.register(RagiumFluids.MOLTEN_STEEL) {
-            molten()
-            colorTint(Color(0x999999))
+        register.register(RagiumFluids.BLEACH) {
+            dull()
+            colorTint(Color(0xccff99))
         }
 
         register.register(RagiumFluids.ORE_SLURRY) {

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

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

src/client/kotlin/hiiragi283/ragium/client/integration/jei/RagiumJeiPlugin.kt

@@ -3,32 +3,33 @@ package hiiragi283.ragium.client.integration.jei
 import hiiragi283.lib.HTPhysicalSideHelper
 import hiiragi283.lib.integration.jei.HTJeiPlugin
 import hiiragi283.lib.integration.jei.HTJeiRecipeHelper
-import hiiragi283.lib.integration.jei.category.HTDoubleItemToItemRecipeCategory
-import hiiragi283.lib.integration.jei.category.HTFluidToItemRecipeCategory
+import hiiragi283.lib.integration.jei.category.HTDoubleItemToRecipeCategory
 import hiiragi283.lib.integration.jei.category.HTItemAndFluidToFluidRecipeCategory
 import hiiragi283.lib.integration.jei.category.HTItemAndFluidToItemRecipeCategory
 import hiiragi283.lib.integration.jei.category.HTItemToDoubleItemRecipeCategory
-import hiiragi283.lib.integration.jei.category.HTItemToFluidRecipeCategory
 import hiiragi283.lib.integration.jei.category.HTItemToItemAndFluidRecipeCategory
-import hiiragi283.lib.integration.jei.category.HTItemToItemRecipeCategory
+import hiiragi283.lib.integration.jei.category.HTSingleRecipeCategory
 import hiiragi283.lib.item.HTPotionBasedItem
-import hiiragi283.lib.item.alchemy.BottledPotionContents
+import hiiragi283.lib.item.ItemStack
+import hiiragi283.lib.item.alchemy.HTBottleType
 import hiiragi283.lib.item.alchemy.HTPotionHelper
+import hiiragi283.lib.recipe.ingredient.HTPotionFluidIngredient
 import hiiragi283.lib.registry.getKeyOrThrow
 import hiiragi283.ragium.api.RagiumAPI
 import hiiragi283.ragium.api.RagiumRegistries
-import hiiragi283.ragium.api.data.RagiumDataComponents
 import hiiragi283.ragium.api.data.recipe.HTOreSlurryData
 import hiiragi283.ragium.api.data.recipe.HTOreSlurryDataHelper
-import hiiragi283.ragium.api.data.recipe.RagiumRecipeBuilders
+import hiiragi283.ragium.api.data.recipe.builder.RagiumRecipeBuilders
 import hiiragi283.ragium.api.recipe.RagiumRecipeLookups
 import hiiragi283.ragium.client.gui.screen.HTWidgetContainerScreen
 import hiiragi283.ragium.client.integration.jei.category.RTElectrolyzingRecipeCategory
+import hiiragi283.ragium.client.integration.jei.category.RTEnchantingRecipeCategory
 import hiiragi283.ragium.client.integration.jei.category.RTReactingRecipeCategory
 import hiiragi283.ragium.client.integration.jei.category.RTRefiningRecipeCategory
 import hiiragi283.ragium.common.block.RagiumBlocks
 import hiiragi283.ragium.common.fluid.RagiumFluids
 import mezz.jei.api.JeiPlugin
+import mezz.jei.api.constants.RecipeTypes
 import mezz.jei.api.helpers.IGuiHelper
 import mezz.jei.api.helpers.IPlatformFluidHelper
 import mezz.jei.api.neoforge.NeoForgeTypes
@@ -43,6 +44,8 @@ import net.minecraft.core.registries.BuiltInRegistries
 import net.minecraft.world.item.Item
 import net.minecraft.world.item.ItemStack
 import net.minecraft.world.item.ItemStackTemplate
+import net.minecraft.world.item.alchemy.Potion
+import net.minecraft.world.item.alchemy.Potions
 import net.minecraft.world.item.crafting.display.SlotDisplay
 import net.neoforged.neoforge.common.Tags
 import net.neoforged.neoforge.fluids.FluidStack
@@ -51,11 +54,23 @@ import kotlin.streams.asSequence
 
 @JeiPlugin
 class RagiumJeiPlugin : HTJeiPlugin(RagiumAPI.MOD_ID) {
-    override fun registerItemSubtypes(registration: ISubtypeRegistration) {
-        // Potion-Based Item
-        HTPhysicalSideHelper
+    companion object {
+        @JvmStatic
+        private fun listItems(): Sequence<Holder.Reference<Item>> = HTPhysicalSideHelper
             .filteredLookup(BuiltInRegistries.ITEM)
             .listElements()
+            .asSequence()
+
+        @JvmStatic
+        private fun listPotions(): Sequence<Holder.Reference<Potion>> = HTPhysicalSideHelper
+            .filteredLookup(BuiltInRegistries.POTION)
+            .listElements()
+            .asSequence()
+    }
+
+    override fun registerItemSubtypes(registration: ISubtypeRegistration) {
+        // Potion-Based Item
+        listItems()
             .map(Holder<Item>::value)
             .forEach { item: Item ->
                 if (item is HTPotionBasedItem) {
@@ -83,12 +98,9 @@ class RagiumJeiPlugin : HTJeiPlugin(RagiumAPI.MOD_ID) {
     override fun registerExtraIngredients(registration: IExtraIngredientRegistration) {
         registration.addExtraIngredients(
             NeoForgeTypes.FLUID_STACK,
-            HTPhysicalSideHelper
-                .filteredLookup(BuiltInRegistries.POTION)
-                .listElements()
-                .map(::BottledPotionContents)
-                .filter { !it.isWater }
-                .map(BottledPotionContents::toFluidStack)
+            listPotions()
+                .filter { !it.`is`(Potions.WATER) }
+                .map(HTPotionHelper::createFluid)
                 .toList()
         )
         registration.addExtraIngredients(
@@ -105,16 +117,16 @@ class RagiumJeiPlugin : HTJeiPlugin(RagiumAPI.MOD_ID) {
 
         registration.addRecipeCategories(
             // Mechanical
-            HTDoubleItemToItemRecipeCategory(guiHelper, RagiumJeiRecipeTypes.ASSEMBLING),
-            HTItemToItemRecipeCategory(guiHelper, RagiumJeiRecipeTypes.COMPRESSING),
+            HTDoubleItemToRecipeCategory.Basic(guiHelper, RagiumJeiRecipeTypes.ASSEMBLING),
+            HTSingleRecipeCategory.ItemToItem(guiHelper, RagiumJeiRecipeTypes.COMPRESSING),
             HTItemToDoubleItemRecipeCategory(guiHelper, RagiumJeiRecipeTypes.CRUSHING),
             HTItemToDoubleItemRecipeCategory(guiHelper, RagiumJeiRecipeTypes.CUTTING),
             HTItemToItemAndFluidRecipeCategory(guiHelper, RagiumJeiRecipeTypes.DRAINING),
             HTItemAndFluidToItemRecipeCategory(guiHelper, RagiumJeiRecipeTypes.FILLING),
             // Heat
-            HTDoubleItemToItemRecipeCategory(guiHelper, RagiumJeiRecipeTypes.ALLOYING),
-            HTFluidToItemRecipeCategory(guiHelper, RagiumJeiRecipeTypes.FREEZING),
-            HTItemToFluidRecipeCategory(guiHelper, RagiumJeiRecipeTypes.MELTING),
+            HTDoubleItemToRecipeCategory.Basic(guiHelper, RagiumJeiRecipeTypes.ALLOYING),
+            HTSingleRecipeCategory.FluidToItem(guiHelper, RagiumJeiRecipeTypes.FREEZING),
+            HTSingleRecipeCategory.ItemToFluid(guiHelper, RagiumJeiRecipeTypes.MELTING),
             HTItemToItemAndFluidRecipeCategory(guiHelper, RagiumJeiRecipeTypes.PYROLYZING),
             RTRefiningRecipeCategory(guiHelper),
             // Chemical
@@ -124,9 +136,10 @@ class RagiumJeiPlugin : HTJeiPlugin(RagiumAPI.MOD_ID) {
             RTReactingRecipeCategory(guiHelper),
             // Bio
             HTItemAndFluidToFluidRecipeCategory(guiHelper, RagiumJeiRecipeTypes.BREWING),
-            HTItemToDoubleItemRecipeCategory(guiHelper, RagiumJeiRecipeTypes.PLANTING)
+            HTItemToDoubleItemRecipeCategory(guiHelper, RagiumJeiRecipeTypes.PLANTING),
             // Electronics
             // Arcane
+            RTEnchantingRecipeCategory(guiHelper)
         )
     }
 
@@ -158,24 +171,63 @@ class RagiumJeiPlugin : HTJeiPlugin(RagiumAPI.MOD_ID) {
         HTJeiRecipeHelper.addRecipes(registration, RagiumJeiRecipeTypes.PLANTING, RagiumRecipeLookups.PLANTING)
         // Electronics
         // Arcane
+        HTJeiRecipeHelper.addRecipes(registration, RagiumJeiRecipeTypes.ENCHANTING, RagiumRecipeLookups.ENCHANTING)
 
         registerDynamicRecipes(registration)
     }
 
     private fun registerDynamicRecipes(registration: IRecipeRegistration) {
+        // Mechanical
+        registration.addRecipes(
+            RagiumJeiRecipeTypes.DRAINING,
+            listPotions()
+                .flatMap { potion: Holder.Reference<Potion> ->
+                    HTBottleType.entries.map { bottleType: HTBottleType ->
+                        RagiumRecipeBuilders.draining {
+                            +HTJeiRecipeHelper.fakeItem(
+                                ItemStack(bottleType.filledItem, 1, HTPotionHelper.createPotionPatch(potion))
+                            )
+                            itemResult { +bottleType.emptyItem }
+                            fluidResult { from(HTPotionHelper.createFluid(potion, HTPotionHelper.BOTTLE_AMOUNT)) }
+                            recipeId replace potion.getKeyOrThrow()
+                                .identifier()
+                                .withPrefix("potion_bottle/${bottleType.serializedName}/")
+                        }.buildSynthetic()
+                    }
+                }.toList()
+        )
+        registration.addRecipes(
+            RagiumJeiRecipeTypes.FILLING,
+            listPotions()
+                .flatMap { potion: Holder.Reference<Potion> ->
+                    HTBottleType.entries.map { bottleType: HTBottleType ->
+                        RagiumRecipeBuilders.filling {
+                            itemIngredient { items { +bottleType.emptyItem } }
+                            fluidIngredient {
+                                +HTPotionFluidIngredient(potion)
+                                amount = HTPotionHelper.BOTTLE_AMOUNT
+                            }
+                            result {
+                                from(ItemStack(bottleType.filledItem, 1, HTPotionHelper.createPotionPatch(potion)))
+                            }
+                            recipeId replace potion.getKeyOrThrow()
+                                .identifier()
+                                .withPrefix("potion_bottle/${bottleType.serializedName}/")
+                        }.buildSynthetic()
+                    }
+                }.toList()
+        )
         // Chemical
         registration.addRecipes(
             RagiumJeiRecipeTypes.MIXING,
-            HTPhysicalSideHelper.filteredLookup(BuiltInRegistries.ITEM)
-                .listElements()
-                .asSequence()
+            listItems()
                 .mapNotNull { input: Holder<Item> ->
-                    val slurryData: Holder<HTOreSlurryData> =
-                        input.components().get(RagiumDataComponents.ORE_SLURRY_DATA) ?: return@mapNotNull null
+                    val result: FluidStack =
+                        HTOreSlurryDataHelper.createFluid(input.components()) ?: return@mapNotNull null
                     RagiumRecipeBuilders.mixing {
                         itemIngredient = HTJeiRecipeHelper.fakeItem(SlotDisplay.ItemSlotDisplay(input))
                         fluidIngredient = HTJeiRecipeHelper.fakeFluid(RagiumFluids.SULFURIC_ACID)
-                        result { from(HTOreSlurryDataHelper.createFluid(slurryData)) }
+                        result { from(result) }
                         recipeId replace input.getKeyOrThrow().identifier().withPrefix("solving/")
                     }.buildSynthetic()
                 }.toList()
@@ -205,12 +257,22 @@ class RagiumJeiPlugin : HTJeiPlugin(RagiumAPI.MOD_ID) {
         registration.addCraftingStation(RagiumJeiRecipeTypes.COMPRESSING, RagiumBlocks.COMPRESSOR)
         registration.addCraftingStation(RagiumJeiRecipeTypes.CUTTING, RagiumBlocks.CUTTING_MACHINE)
         // Heat
+        registration.addCraftingStation(RagiumJeiRecipeTypes.ALLOYING, RagiumBlocks.ALLOY_SMELTER)
         registration.addCraftingStation(RagiumJeiRecipeTypes.FREEZING, RagiumBlocks.FREEZER)
         registration.addCraftingStation(RagiumJeiRecipeTypes.MELTING, RagiumBlocks.MELTER)
+        registration.addCraftingStation(RagiumJeiRecipeTypes.PYROLYZING, RagiumBlocks.PYROLYZER)
+        registration.addCraftingStation(RagiumJeiRecipeTypes.REFINING, RagiumBlocks.REFINERY)
+        registration.addCraftingStation(RecipeTypes.SMELTING, RagiumBlocks.SMELTER)
+        registration.addCraftingStation(RecipeTypes.BLASTING, RagiumBlocks.SMELTER)
+        registration.addCraftingStation(RecipeTypes.SMOKING, RagiumBlocks.SMELTER)
         // Chemical
         registration.addCraftingStation(RagiumJeiRecipeTypes.BATHING, RagiumBlocks.CHEMICAL_BATH)
+        registration.addCraftingStation(RagiumJeiRecipeTypes.REACTING, RagiumBlocks.CHEMICAL_REACTOR)
+        registration.addCraftingStation(RagiumJeiRecipeTypes.ELECTROLYZING, RagiumBlocks.ELECTROLYZER)
+        registration.addCraftingStation(RagiumJeiRecipeTypes.MIXING, RagiumBlocks.MIXER)
         // Bio
         registration.addCraftingStation(RagiumJeiRecipeTypes.BREWING, RagiumBlocks.BREWERY)
+        registration.addCraftingStation(RagiumJeiRecipeTypes.PLANTING, RagiumBlocks.PLANTER)
         // Electronics
         // Arcane
     }

src/client/kotlin/hiiragi283/ragium/client/integration/jei/RagiumJeiRecipeTypes.kt

@@ -9,13 +9,11 @@ import hiiragi283.lib.recipe.base.HTItemToDoubleItemRecipe
 import hiiragi283.lib.recipe.base.HTItemToItemAndFluidRecipe
 import hiiragi283.lib.recipe.base.HTItemToRecipe
 import hiiragi283.ragium.api.recipe.RTElectrolyzingRecipe
+import hiiragi283.ragium.api.recipe.RTEnchantingRecipe
 import hiiragi283.ragium.api.recipe.RTReactingRecipe
 import hiiragi283.ragium.api.recipe.RTRefiningRecipe
 import hiiragi283.ragium.api.recipe.RagiumRecipeTypes
 import hiiragi283.ragium.common.block.RagiumBlocks
-import hiiragi283.ragium.common.item.RagiumItems
-import net.minecraft.world.item.ItemStack
-import net.minecraft.world.item.Items
 
 data object RagiumJeiRecipeTypes {
     // Mechanical
@@ -37,16 +35,16 @@ data object RagiumJeiRecipeTypes {
 
     @JvmField
     val DRAINING: HTHolderJeiRecipeType<HTItemToItemAndFluidRecipe.Basic> =
-        HTJeiRecipeType(RagiumRecipeTypes.DRAINING, ItemStack(Items.GLASS_BOTTLE))
+        HTJeiRecipeType(RagiumRecipeTypes.DRAINING, RagiumBlocks.MACHINE_CASING)
 
     @JvmField
     val FILLING: HTHolderJeiRecipeType<HTItemAndFluidToRecipe.BasicItem> =
-        HTJeiRecipeType(RagiumRecipeTypes.FILLING, ItemStack(Items.GLASS_BOTTLE))
+        HTJeiRecipeType(RagiumRecipeTypes.FILLING, RagiumBlocks.MACHINE_CASING)
 
     // Heat
     @JvmField
     val ALLOYING: HTHolderJeiRecipeType<HTDoubleItemToItemRecipe.Basic> =
-        HTJeiRecipeType(RagiumRecipeTypes.ALLOYING, ItemStack(Items.FURNACE))
+        HTJeiRecipeType(RagiumRecipeTypes.ALLOYING, RagiumBlocks.ALLOY_SMELTER)
 
     @JvmField
     val FREEZING: HTHolderJeiRecipeType<HTFluidToRecipe.BasicItem> =
@@ -58,11 +56,11 @@ data object RagiumJeiRecipeTypes {
 
     @JvmField
     val PYROLYZING: HTHolderJeiRecipeType<HTItemToItemAndFluidRecipe.Basic> =
-        HTJeiRecipeType(RagiumRecipeTypes.PYROLYZING, RagiumItems.COAL_COKE)
+        HTJeiRecipeType(RagiumRecipeTypes.PYROLYZING, RagiumBlocks.PYROLYZER)
 
     @JvmField
     val REFINING: HTHolderJeiRecipeType<RTRefiningRecipe> =
-        HTJeiRecipeType(RagiumRecipeTypes.REFINING, RagiumItems.COAL_COKE)
+        HTJeiRecipeType(RagiumRecipeTypes.REFINING, RagiumBlocks.REFINERY)
 
     // Chemical
     @JvmField
@@ -71,15 +69,15 @@ data object RagiumJeiRecipeTypes {
 
     @JvmField
     val ELECTROLYZING: HTHolderJeiRecipeType<RTElectrolyzingRecipe> =
-        HTJeiRecipeType(RagiumRecipeTypes.ELECTROLYZING, ItemStack(Items.LIGHTNING_ROD))
+        HTJeiRecipeType(RagiumRecipeTypes.ELECTROLYZING, RagiumBlocks.ELECTROLYZER)
 
     @JvmField
     val MIXING: HTHolderJeiRecipeType<HTItemAndFluidToRecipe.BasicFluid> =
-        HTJeiRecipeType(RagiumRecipeTypes.MIXING, ItemStack(Items.BREEZE_ROD))
+        HTJeiRecipeType(RagiumRecipeTypes.MIXING, RagiumBlocks.MIXER)
 
     @JvmField
     val REACTING: HTHolderJeiRecipeType<RTReactingRecipe.Basic> =
-        HTJeiRecipeType(RagiumRecipeTypes.REACTING, ItemStack(Items.GOLDEN_APPLE))
+        HTJeiRecipeType(RagiumRecipeTypes.REACTING, RagiumBlocks.CHEMICAL_REACTOR)
 
     // Bio
     @JvmField
@@ -88,9 +86,12 @@ data object RagiumJeiRecipeTypes {
 
     @JvmField
     val PLANTING: HTHolderJeiRecipeType<HTItemToDoubleItemRecipe.Basic> =
-        HTJeiRecipeType(RagiumRecipeTypes.PLANTING, ItemStack(Items.FLOWER_POT))
+        HTJeiRecipeType(RagiumRecipeTypes.PLANTING, RagiumBlocks.PLANTER)
 
     // Electronics
 
     // Arcane
+    @JvmField
+    val ENCHANTING: HTHolderJeiRecipeType<RTEnchantingRecipe> =
+        HTJeiRecipeType(RagiumRecipeTypes.ENCHANTING, RagiumBlocks.MACHINE_CASING)
 }

src/client/kotlin/hiiragi283/ragium/client/integration/jei/category/RTElectrolyzingRecipeCategory.kt

@@ -41,7 +41,7 @@ class RTElectrolyzingRecipeCategory(guiHelper: IGuiHelper) :
             val result: HTFluidResult = recipe.results[index]
             outputSlots[index]
                 .add(result)
-                .setSlotBackground(HTBackgroundType.OUTPUT, result.amount)
+                .setFluidSlot(result.amount)
         }
     }