Release v0.13

build.gradle.kts

@@ -63,7 +63,7 @@ repositories {
     }
     maven(url = "https://cursemaven.com")
     maven(url = "https://maven.parchmentmc.org")
-    maven(url = "https://modmaven.dev/") // AU, Mekanism, PnC
+    maven(url = "https://modmaven.dev/") // AU, Mekanism, PnC, Oritech
 
     maven(url = "https://maven4.bai.lol/") // WTHIT
     maven(url = "https://maven.architectury.dev/") // Arch
@@ -72,6 +72,7 @@ repositories {
     maven(url = "https://maven.k-4u.nl/") // TOP
     maven(url = "https://maven.rover656.dev/releases") // EIO
     maven(url = "https://maven.saps.dev/releases") // AA
+    maven(url = "https://maven.shadowsoffire.dev/releases") // HNN
     maven(url = "https://maven.su5ed.dev/releases") // FFAPI
     maven(url = "https://maven.tamaized.com/releases") // Twilight
     maven(url = "https://maven.teamresourceful.com/repository/maven-public/") // Athena

gradle/libs.versions.toml

@@ -1,6 +1,6 @@
 [versions]
 minecraft = "1.21.1"
-ragium = "0.12.1"
+ragium = "0.12.2"
 
 parchment-mc = "1.21.1"
 parchment-map = "2024.11.17"
@@ -21,23 +21,27 @@ delight = "1.21.1-1.2.9"
 emi = "1.1.22+1.21.1"
 ender-io = "8.0.6-alpha"
 fusion = "1.2.11b-neoforge-mc1.21"
+hostile = "1.21.1-6.3.0"
 immersive = "1.21.1-12.4.2-194"
 jade = "15.10.3+neoforge"
-kc = "1.1.0-neoforge+mc1.21.1"
+kc = "1.1.1-neoforge+mc1.21.1"
 #magitech = "0.12.1"
 mek = "1.21.1-10.7.17.83"
-oritech = "0.19.3"
+oritech = "0.19.6"
 pneuma = "8.2.13+mc1.21.1"
 replica = "1.21-1.2.3"
 
 arch = "13.0.8"
 #ars = "5.10.5.1219"
+create-ench = "2.2.5b"
+create-dragon = "1.8.5"
 #dire = "6369120"
 enchdesc = "21.1.9"
 flywheel = "1.0.6-beta-37"
 guide = "21.1.15"
 owo = "0.12.15.1-beta.6+1.21"
 #patchouli-gen = "1.21.1-1.0.11-Snapshot.5"
+placebo = "1.21.1-9.9.0"
 registrate = "MC1.21-1.3.0+67"
 #rs2 = "2.0.0-beta.10"
 
@@ -54,6 +58,7 @@ curious = { group = "top.theillusivec4.curios", name = "curios-neoforge", versio
 delight = { group = "maven.modrinth", name = "farmers-delight", version.ref = "delight" }
 emi = { group = "dev.emi", name = "emi-neoforge", version.ref = "emi" }
 fusion = { group = "maven.modrinth", name = "fusion-connected-textures", version.ref = "fusion" }
+hostile = { group = "dev.shadowsoffire", name = "HostileNeuralNetworks", version.ref = "hostile" }
 immersive = { group = "blusunrize.immersiveengineering", name = "ImmersiveEngineering", version.ref = "immersive" }
 jade = { group = "maven.modrinth", name = "jade", version.ref = "jade" }
 kc = { group = "maven.modrinth", name = "kaleidoscope-cookery", version.ref = "kc" }
@@ -65,12 +70,15 @@ replica = { group = "maven.modrinth", name = "replication", version.ref = "repli
 
 arch = { group = "dev.architectury", name = "architectury-neoforge", version.ref = "arch" }
 #ars = { group = "com.hollingsworth.ars_nouveau", name = "ars_nouveau-1.21.1", version.ref = "ars" }
+create-ench = { group = "maven.modrinth", name = "create-enchantment-industry", version.ref = "create-ench" }
+create-dragon = { group = "maven.modrinth", name = "create-dragons-plus", version.ref = "create-dragon" }
 #dire = { group = "curse.maven", name = "just-dire-things-1002348", version.ref = "dire" }
 enchdesc = { group = "net.darkhax.enchdesc", name = "enchdesc-neoforge-1.21.1", version.ref = "enchdesc" }
 flywheel = { group = "dev.engine-room.flywheel", name = "flywheel-neoforge-1.21.1", version.ref = "flywheel" }
 guide = { group = "org.appliedenergistics", name = "guideme", version.ref = "guide" }
 owo = { group = "io.wispforest", name = "owo-lib-neoforge", version.ref = "owo" }
 #patchouli-gen = { group = "xyz.brassgoggledcoders", name = "PatchouliProvider", version.ref = "patchouli-gen" }
+placebo = { group = "dev.shadowsoffire", name = "Placebo", version.ref = "placebo" }
 registrate = { group = "com.tterrag.registrate", name = "Registrate", version.ref = "registrate" }
 #rs2 = { group = "com.refinedmods.refinedstorage", name = "refinedstorage-neoforge", version.ref = "rs2" }
 
@@ -81,6 +89,7 @@ mods-impl = [
     "almost",
     "delight",
     "emi",
+    "hostile",
     "immersive",
     "jade",
     "kc",
@@ -90,6 +99,7 @@ mods-impl = [
     "arch",
     "guide",
     "owo",
+    "placebo",
     # create dependencies
     "flywheel",
     "registrate",
@@ -98,7 +108,9 @@ mods-impl = [
 mods-transitive = [
     "aa",
     "accessories",
-    "create"
+    "create",
+    "create-ench",
+    "create-dragon",
 ]
 
 mods-compile = []

src/api/kotlin/hiiragi283/ragium/api/RagiumAPI.kt

@@ -3,16 +3,15 @@ package hiiragi283.ragium.api
 import com.mojang.logging.LogUtils
 import com.mojang.serialization.MapCodec
 import hiiragi283.ragium.api.data.map.HTEquipAction
-import hiiragi283.ragium.api.data.map.HTMaterialRecipeData
-import hiiragi283.ragium.api.data.map.HTSubEntityTypeIngredient
-import hiiragi283.ragium.api.data.registry.HTSolarPower
 import hiiragi283.ragium.api.inventory.slot.payload.HTSyncablePayload
 import hiiragi283.ragium.api.registry.toId
 import net.minecraft.core.Registry
 import net.minecraft.network.RegistryFriendlyByteBuf
 import net.minecraft.network.codec.StreamCodec
 import net.minecraft.resources.ResourceKey
 import net.minecraft.resources.ResourceLocation
+import net.minecraft.world.flag.FeatureFlag
+import net.minecraft.world.flag.FeatureFlags
 import net.neoforged.neoforge.registries.RegistryBuilder
 import org.slf4j.Logger
 import java.util.ServiceLoader
@@ -41,7 +40,7 @@ object RagiumAPI {
      * 名前空間が`ragium`となる[ResourceLocation]を返します。
      */
     @JvmStatic
-    fun id(prefix: String, suffix: String): ResourceLocation = id("$prefix/$suffix")
+    fun id(vararg path: String): ResourceLocation = MOD_ID.toId(*path)
 
     /**
      * 名前空間が`ragium`となる[ResourceLocation]を返します。
@@ -69,29 +68,15 @@ object RagiumAPI {
     @JvmField
     val EQUIP_ACTION_TYPE_REGISTRY: Registry<MapCodec<out HTEquipAction>> = createRegistry(EQUIP_ACTION_TYPE_KEY)
 
-    @JvmField
-    val MATERIAL_RECIPE_TYPE_KEY: ResourceKey<Registry<MapCodec<out HTMaterialRecipeData>>> = createKey("material_recipe_type")
-
-    @JvmField
-    val MATERIAL_RECIPE_TYPE_REGISTRY: Registry<MapCodec<out HTMaterialRecipeData>> = createRegistry(MATERIAL_RECIPE_TYPE_KEY)
-
     @JvmField
     val SLOT_TYPE_KEY: ResourceKey<Registry<StreamCodec<RegistryFriendlyByteBuf, out HTSyncablePayload>>> = createKey("syncable_slot_type")
 
     @JvmField
     val SLOT_TYPE_REGISTRY: Registry<StreamCodec<RegistryFriendlyByteBuf, out HTSyncablePayload>> = createRegistry(SLOT_TYPE_KEY)
 
+    // Feature Flag
     @JvmField
-    val SUB_ENTITY_INGREDIENT_TYPE_KEY: ResourceKey<Registry<MapCodec<out HTSubEntityTypeIngredient>>> = createKey("entity_ingredient_type")
-
-    @JvmField
-    val SUB_ENTITY_INGREDIENT_TYPE_REGISTRY: Registry<MapCodec<out HTSubEntityTypeIngredient>> = createRegistry(
-        SUB_ENTITY_INGREDIENT_TYPE_KEY,
-    )
-
-    // Dynamic
-    @JvmField
-    val SOLAR_POWER_KEY: ResourceKey<Registry<HTSolarPower>> = createKey("solar_power")
+    val WORK_IN_PROGRESS: FeatureFlag = FeatureFlags.REGISTRY.getFlag(RagiumAPI.id("work_in_progress"))
 
     //    Service    //
 

src/api/kotlin/hiiragi283/ragium/api/RagiumConst.kt

@@ -1,5 +1,8 @@
 package hiiragi283.ragium.api
 
+import hiiragi283.ragium.api.registry.vanillaId
+import net.minecraft.client.renderer.LightTexture
+import net.minecraft.resources.ResourceLocation
 import net.minecraft.world.item.Item
 import net.neoforged.neoforge.internal.versions.neoforge.NeoForgeVersion
 
@@ -13,6 +16,16 @@ object RagiumConst {
     const val SAP_TO_MOLTEN = 250
     const val MOLTEN_TO_GEM = 1000
 
+    //    GUI    //
+
+    @JvmField
+    val BLOCK_ATLAS: ResourceLocation = vanillaId("textures/atlas/blocks.png")
+
+    @JvmField
+    val GUI_ATLAS: ResourceLocation = vanillaId("textures/atlas/gui.png")
+
+    const val FULL_BRIGHT: Int = LightTexture.FULL_BRIGHT
+
     //    Item    //
 
     const val ABSOLUTE_MAX_STACK_SIZE: Int = Item.ABSOLUTE_MAX_STACK_SIZE
@@ -34,6 +47,7 @@ object RagiumConst {
     const val EIO_MACHINES = "enderio_machines"
     const val FARMERS_DELIGHT = "farmersdelight"
     const val FOREGOING = "industrialforegoing"
+    const val HOSTILE_NETWORKS = "hostilenetworks"
     const val IMMERSIVE = "immersiveengineering"
     const val KALEIDO_COOKERY = "kaleidoscope_cookery"
     const val MAGITECH = "magitech"
@@ -48,7 +62,7 @@ object RagiumConst {
     @JvmField
     val BUILTIN_IDS: Set<String> = setOf(MINECRAFT, NEOFORGE, COMMON, RagiumAPI.MOD_ID)
 
-    //    Nbt    //
+    //    Serialization    //
 
     const val ACCESS_CONFIG = "access_config"
     const val ENCHANTMENT = "enchantment"
@@ -66,6 +80,12 @@ object RagiumConst {
     const val CAPACITY = "capacity"
     const val BATTERIES = "batteries"
 
+    const val ID = "id"
+    const val TAG = "tag"
+    const val COUNT = "count"
+    const val COMPONENTS = "components"
+    const val CHANCE = "chance"
+
     const val PREVENT_ITEM_MAGNET = "PreventRemoteMovement"
 
     //    Recipes    //
@@ -77,12 +97,21 @@ object RagiumConst {
     const val CUTTING = "cutting"
     const val ENCHANTING = "enchanting"
     const val EXTRACTING = "extracting"
-    const val FLUID_TRANSFORM = "fluid_transform"
     const val MELTING = "melting"
     const val MIXING = "mixing"
     const val PLANTING = "planting"
     const val REFINING = "refining"
+    const val ROCK_GENERATING = "rock_generating"
     const val SIMULATING = "simulating"
     const val SOLIDIFYING = "solidifying"
     const val WASHING = "washing"
+
+    const val INGREDIENT = "ingredient"
+
+    const val RESULT = "result"
+    const val RESULTS = "results"
+    const val ITEM_RESULT = "item_result"
+    const val FLUID_RESULT = "fluid_result"
+
+    const val LUBRICANT_CONSUME = 25
 }

src/api/kotlin/hiiragi283/ragium/api/RagiumPlatform.kt

@@ -3,32 +3,33 @@ package hiiragi283.ragium.api
 import com.google.gson.JsonObject
 import hiiragi283.ragium.api.data.recipe.ingredient.HTFluidIngredientCreator
 import hiiragi283.ragium.api.data.recipe.ingredient.HTItemIngredientCreator
+import hiiragi283.ragium.api.item.HTDynamicUpgradeItem
+import hiiragi283.ragium.api.item.component.HTMachineUpgrade
 import hiiragi283.ragium.api.material.HTMaterialDefinition
 import hiiragi283.ragium.api.material.HTMaterialKey
 import hiiragi283.ragium.api.material.prefix.HTMaterialPrefix
-import hiiragi283.ragium.api.recipe.HTMaterialRecipeManager
+import hiiragi283.ragium.api.recipe.extra.HTPlantingRecipe
+import hiiragi283.ragium.api.recipe.multi.HTRockGeneratingRecipe
 import hiiragi283.ragium.api.registry.RegistryKey
 import hiiragi283.ragium.api.serialization.value.HTValueInput
 import hiiragi283.ragium.api.serialization.value.HTValueOutput
 import hiiragi283.ragium.api.storage.energy.HTEnergyBattery
 import hiiragi283.ragium.api.storage.item.HTItemHandler
 import net.minecraft.client.Minecraft
 import net.minecraft.core.Holder
-import net.minecraft.core.HolderGetter
 import net.minecraft.core.HolderLookup
 import net.minecraft.core.RegistryAccess
-import net.minecraft.core.registries.Registries
+import net.minecraft.core.component.DataComponentType
 import net.minecraft.nbt.CompoundTag
 import net.minecraft.resources.ResourceKey
 import net.minecraft.server.MinecraftServer
 import net.minecraft.server.level.ServerLevel
-import net.minecraft.server.level.ServerPlayer
 import net.minecraft.world.item.DyeColor
 import net.minecraft.world.item.Item
+import net.minecraft.world.item.ItemStack
+import net.minecraft.world.item.crafting.RecipeSerializer
 import net.minecraft.world.level.Level
-import net.minecraft.world.level.material.Fluid
 import net.neoforged.fml.loading.FMLEnvironment
-import java.util.UUID
 import kotlin.jvm.optionals.getOrNull
 
 interface RagiumPlatform {
@@ -37,6 +38,20 @@ interface RagiumPlatform {
         val INSTANCE: RagiumPlatform = RagiumAPI.getService()
     }
 
+    /**
+     * [HTMachineUpgrade]の[DataComponentType]を返します。
+     */
+    fun getUpgradeDataType(): DataComponentType<HTMachineUpgrade>
+
+    fun getMachineUpgrade(provider: HolderLookup.Provider?, stack: ItemStack): HTMachineUpgrade? {
+        val item: Item = stack.item
+        if (item is HTDynamicUpgradeItem) {
+            val upgrade: HTMachineUpgrade? = item.getUpgrade(provider, stack)
+            if (upgrade != null) return upgrade
+        }
+        return stack.get(getUpgradeDataType())
+    }
+
     //    Material    //
 
     fun getMaterialDefinitions(): Map<HTMaterialKey, HTMaterialDefinition>
@@ -45,21 +60,19 @@ interface RagiumPlatform {
 
     fun getMaterialDefinition(key: HTMaterialKey): HTMaterialDefinition = getMaterialDefinitions()[key] ?: HTMaterialDefinition.Empty
 
-    fun getPrefix(name: String): HTMaterialPrefix?
+    fun getPrefixMap(): Map<String, HTMaterialPrefix>
 
-    //    Recipe    //
+    fun getPrefix(name: String): HTMaterialPrefix? = getPrefixMap()[name]
 
-    fun getMaterialRecipeManager(): HTMaterialRecipeManager
+    //    Recipe    //
 
-    fun createItemCreator(provider: HolderLookup.Provider): HTItemIngredientCreator =
-        createItemCreator(provider.lookupOrThrow(Registries.ITEM))
+    fun itemCreator(): HTItemIngredientCreator
 
-    fun createItemCreator(getter: HolderGetter<Item>): HTItemIngredientCreator
+    fun fluidCreator(): HTFluidIngredientCreator
 
-    fun createFluidCreator(provider: HolderLookup.Provider): HTFluidIngredientCreator =
-        createFluidCreator(provider.lookupOrThrow(Registries.FLUID))
+    fun getPlantingRecipeSerializer(): RecipeSerializer<HTPlantingRecipe>
 
-    fun createFluidCreator(getter: HolderGetter<Fluid>): HTFluidIngredientCreator
+    fun getRockGeneratingRecipeSerializer(): RecipeSerializer<HTRockGeneratingRecipe>
 
     //    Server    //
 
@@ -80,11 +93,6 @@ interface RagiumPlatform {
     fun <T : Any> getHolder(provider: HolderLookup.Provider?, key: ResourceKey<T>): Holder<T>? =
         (provider ?: getRegistryAccess())?.holder(key)?.getOrNull()
 
-    fun getPlayer(uuid: UUID?): ServerPlayer? {
-        if (uuid == null) return null
-        return getCurrentServer()?.playerList?.getPlayer(uuid)
-    }
-
     fun getUniversalBundle(server: MinecraftServer, color: DyeColor): HTItemHandler
 
     /**

src/api/kotlin/hiiragi283/ragium/api/block/attribute/HTBlockAttributes.kt

@@ -37,6 +37,9 @@ fun Block.getAllAttributes(): Collection<HTBlockAttribute> = (this as? HTBlockWi
 // direction
 fun BlockState.getAttributeFront(): Direction? = this.getAttribute<HTDirectionalBlockAttribute>()?.getDirection(this)
 
+// fluid
+fun Holder<Block>.getFluidAttribute(): HTFluidBlockAttribute = getAttributeOrThrow<HTFluidBlockAttribute>()
+
 // tier
 inline fun <reified TIER : HTTierProvider> Block.getAttributeTier(): TIER? = getAttribute<HTTierBlockAttribute<TIER>>()?.provider
 

src/api/kotlin/hiiragi283/ragium/api/block/attribute/HTFluidBlockAttribute.kt

@@ -0,0 +1,35 @@
+package hiiragi283.ragium.api.block.attribute
+
+import hiiragi283.ragium.api.RagiumAPI
+import hiiragi283.ragium.api.text.HTHasTranslationKey
+import net.minecraft.Util
+import net.minecraft.util.StringRepresentable
+import java.util.function.IntSupplier
+
+@JvmRecord
+data class HTFluidBlockAttribute(private val tankMap: Map<TankType, IntSupplier>) : HTBlockAttribute {
+    private fun getTankCapacity(type: TankType): IntSupplier = tankMap[type] ?: error("Undefined tank capacity for ${type.serializedName}")
+
+    fun getInputTank(): IntSupplier = getTankCapacity(TankType.INPUT)
+
+    fun getOutputTank(): IntSupplier = getTankCapacity(TankType.OUTPUT)
+
+    fun getFirstInputTank(): IntSupplier = getTankCapacity(TankType.FIRST_INPUT)
+
+    fun getSecondInputTank(): IntSupplier = getTankCapacity(TankType.SECOND_INPUT)
+
+    enum class TankType :
+        StringRepresentable,
+        HTHasTranslationKey {
+        INPUT,
+        OUTPUT,
+        FIRST_INPUT,
+        SECOND_INPUT,
+        ;
+
+        override val translationKey: String =
+            Util.makeDescriptionId("config", RagiumAPI.id("${serializedName}_tank_capacity"))
+
+        override fun getSerializedName(): String = name.lowercase()
+    }
+}