From fe9052182c69c2c04ca5fa74b7ed9656bd9d21c5 Mon Sep 17 00:00:00 2001 From: Hiiragi Russell Tsubasa <97942736+Hiiragi283@users.noreply.github.com> Date: Fri, 18 Sep 2026 21:35:43 +0900 Subject: [PATCH 1/3] =?UTF-8?q?feat:=20=E6=96=B0=E3=81=97=E3=81=84?= =?UTF-8?q?=E3=82=A2=E3=82=A4=E3=83=86=E3=83=A0=E3=80=8CCrude=20Silicon=20?= =?UTF-8?q?/=20=E7=B2=97=E8=A3=BD=E3=82=B7=E3=83=AA=E3=82=B3=E3=83=B3?= =?UTF-8?q?=E3=80=8D=E3=80=8CSilicon=20Dust=20/=20=E3=82=B7=E3=83=AA?= =?UTF-8?q?=E3=82=B3=E3=83=B3=E3=81=AE=E7=B2=89=E3=80=8D=E3=80=8CCarbon=20?= =?UTF-8?q?Dust=20/=20=E7=82=AD=E7=B4=A0=E3=81=AE=E7=B2=89=E3=80=8D?= =?UTF-8?q?=E3=82=92=E8=BF=BD=E5=8A=A0=20feat!:=20=E3=82=A2=E3=82=A4?= =?UTF-8?q?=E3=83=86=E3=83=A0=E3=80=8CCoal=20Coke=20Dust=E3=80=8D=E3=82=92?= =?UTF-8?q?=E3=80=8CCarbon=20Dust=E3=80=8D=E3=81=AB=E3=83=AA=E3=83=80?= =?UTF-8?q?=E3=82=A4=E3=83=AC=E3=82=AF=E3=83=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/lang/RagiumEnglishLangProvider.kt | 1 + .../data/lang/RagiumJapaneseLangProvider.kt | 1 + .../data/recipe/RagiumCommonRecipeProvider.kt | 59 ++++++- .../data/recipe/RagiumHeatRecipeProvider.kt | 26 +++ .../recipe/RagiumMechanicalRecipeProvider.kt | 19 ++- .../recipe/RagiumVanillaRecipeProvider.kt | 158 +++++++----------- .../ragium/data/tag/RagiumItemTagsProvider.kt | 7 + .../{coal_coke_dust.json => carbon_dust.json} | 2 +- .../assets/ragium/items/crude_silicon.json | 6 + .../assets/ragium/items/silicon_dust.json | 6 + .../resources/assets/ragium/lang/en_us.json | 4 +- .../resources/assets/ragium/lang/ja_jp.json | 4 +- .../{coal_coke_dust.json => carbon_dust.json} | 2 +- .../ragium/models/item/crude_silicon.json | 6 + .../ragium/models/item/silicon_dust.json | 6 + .../resources/data/c/tags/item/coal_coke.json | 5 + .../resources/data/c/tags/item/dusts.json | 3 +- .../data/c/tags/item/dusts/carbon.json | 5 + .../data/c/tags/item/dusts/coal_coke.json | 5 - .../data/c/tags/item/dusts/silicon.json | 5 + .../data/c/tags/item/pitch_coke.json | 5 + .../resources/data/c/tags/item/silicon.json | 5 + .../misc/sooty_iron_ingot_by_coke_dust.json | 32 ---- .../misc/sooty_iron_ingot_by_dust.json | 43 ----- .../alloying/crude_silicon_from_amethyst.json | 22 +++ .../crude_silicon_from_amethyst_block.json | 16 ++ .../alloying/crude_silicon_from_quartz.json | 22 +++ .../crude_silicon_from_quartz_block.json | 16 ++ .../alloying/sooty_iron_ingot_by_coals.json | 25 +++ .../alloying/sooty_iron_ingot_by_cokes.json | 22 +++ .../ragium/recipe/bathing/silicon_dust.json | 16 ++ .../{coal_coke_dust.json => carbon_dust.json} | 4 +- .../{coal_coke_dust.json => carbon_dust.json} | 2 +- .../recipe/sooty_iron_ingot_by_coke_dust.json | 14 -- .../recipe/sooty_iron_ingot_by_dust.json | 18 -- .../data/ragium/tags/item/cokes.json | 6 + .../kotlin/hiiragi283/lib/tag/HTCommonTags.kt | 12 ++ .../ragium/api/material/RagiumMaterial.kt | 1 + .../hiiragi283/ragium/api/tag/RagiumTags.kt | 6 + .../ragium/common/item/RagiumItems.kt | 7 +- 40 files changed, 396 insertions(+), 228 deletions(-) rename src/generated/resources/assets/ragium/items/{coal_coke_dust.json => carbon_dust.json} (54%) create mode 100644 src/generated/resources/assets/ragium/items/crude_silicon.json create mode 100644 src/generated/resources/assets/ragium/items/silicon_dust.json rename src/generated/resources/assets/ragium/models/item/{coal_coke_dust.json => carbon_dust.json} (59%) create mode 100644 src/generated/resources/assets/ragium/models/item/crude_silicon.json create mode 100644 src/generated/resources/assets/ragium/models/item/silicon_dust.json create mode 100644 src/generated/resources/data/c/tags/item/coal_coke.json create mode 100644 src/generated/resources/data/c/tags/item/dusts/carbon.json delete mode 100644 src/generated/resources/data/c/tags/item/dusts/coal_coke.json create mode 100644 src/generated/resources/data/c/tags/item/dusts/silicon.json create mode 100644 src/generated/resources/data/c/tags/item/pitch_coke.json create mode 100644 src/generated/resources/data/c/tags/item/silicon.json delete mode 100644 src/generated/resources/data/ragium/advancement/recipes/misc/sooty_iron_ingot_by_coke_dust.json delete mode 100644 src/generated/resources/data/ragium/advancement/recipes/misc/sooty_iron_ingot_by_dust.json create mode 100644 src/generated/resources/data/ragium/recipe/alloying/crude_silicon_from_amethyst.json create mode 100644 src/generated/resources/data/ragium/recipe/alloying/crude_silicon_from_amethyst_block.json create mode 100644 src/generated/resources/data/ragium/recipe/alloying/crude_silicon_from_quartz.json create mode 100644 src/generated/resources/data/ragium/recipe/alloying/crude_silicon_from_quartz_block.json create mode 100644 src/generated/resources/data/ragium/recipe/alloying/sooty_iron_ingot_by_coals.json create mode 100644 src/generated/resources/data/ragium/recipe/alloying/sooty_iron_ingot_by_cokes.json create mode 100644 src/generated/resources/data/ragium/recipe/bathing/silicon_dust.json rename src/generated/resources/data/ragium/recipe/crushing/{coal_coke_dust.json => carbon_dust.json} (64%) rename src/generated/resources/data/ragium/recipe/pyrolyzing/{coal_coke_dust.json => carbon_dust.json} (87%) delete mode 100644 src/generated/resources/data/ragium/recipe/sooty_iron_ingot_by_coke_dust.json delete mode 100644 src/generated/resources/data/ragium/recipe/sooty_iron_ingot_by_dust.json create mode 100644 src/generated/resources/data/ragium/tags/item/cokes.json diff --git a/src/data/kotlin/hiiragi283/ragium/data/lang/RagiumEnglishLangProvider.kt b/src/data/kotlin/hiiragi283/ragium/data/lang/RagiumEnglishLangProvider.kt index b0b649060a..0646cb1db1 100644 --- a/src/data/kotlin/hiiragi283/ragium/data/lang/RagiumEnglishLangProvider.kt +++ b/src/data/kotlin/hiiragi283/ragium/data/lang/RagiumEnglishLangProvider.kt @@ -108,6 +108,7 @@ class RagiumEnglishLangProvider(output: PackOutput) : add(RagiumItems.BEESWAX, "Beeswax") add(RagiumItems.SPLASH_BOTTLE, "Splash Bottle") add(RagiumItems.LINGERING_BOTTLE, "Lingering Bottle") + add(RagiumItems.CRUDE_SILICON, "Crude Silicon") add(RagiumItems.ELDER_HEART, "Elder Heart") add(RagiumItems.WITHER_DOLL, "Wither Doll") add(RagiumItems.WITHER_STAR, "Wither Star") diff --git a/src/data/kotlin/hiiragi283/ragium/data/lang/RagiumJapaneseLangProvider.kt b/src/data/kotlin/hiiragi283/ragium/data/lang/RagiumJapaneseLangProvider.kt index b8f40fc081..bc473526b0 100644 --- a/src/data/kotlin/hiiragi283/ragium/data/lang/RagiumJapaneseLangProvider.kt +++ b/src/data/kotlin/hiiragi283/ragium/data/lang/RagiumJapaneseLangProvider.kt @@ -104,6 +104,7 @@ class RagiumJapaneseLangProvider(output: PackOutput) : add(RagiumItems.BEESWAX, "密猟") add(RagiumItems.SPLASH_BOTTLE, "スプラッシュ瓶") add(RagiumItems.LINGERING_BOTTLE, "残留瓶") + add(RagiumItems.CRUDE_SILICON, "粗製シリコン") add(RagiumItems.ELDER_HEART, "エルダーの心臓") add(RagiumItems.WITHER_DOLL, "ウィザー人形") add(RagiumItems.WITHER_STAR, "ウィザースター") diff --git a/src/data/kotlin/hiiragi283/ragium/data/recipe/RagiumCommonRecipeProvider.kt b/src/data/kotlin/hiiragi283/ragium/data/recipe/RagiumCommonRecipeProvider.kt index d5a1b94e7b..e388741e1f 100644 --- a/src/data/kotlin/hiiragi283/ragium/data/recipe/RagiumCommonRecipeProvider.kt +++ b/src/data/kotlin/hiiragi283/ragium/data/recipe/RagiumCommonRecipeProvider.kt @@ -2,10 +2,12 @@ package hiiragi283.ragium.data.recipe import hiiragi283.lib.data.recipe.HTRecipeProvider import hiiragi283.lib.tag.CommonTagPrefixes +import hiiragi283.lib.tag.HTCommonTags import hiiragi283.ragium.api.RagiumAPI import hiiragi283.ragium.api.data.recipe.builder.RagiumRecipeBuilders import hiiragi283.ragium.api.material.HTItemPart import hiiragi283.ragium.api.material.RagiumMaterial +import hiiragi283.ragium.api.tag.RagiumTags import hiiragi283.ragium.common.block.RagiumBlocks import hiiragi283.ragium.common.fluid.RagiumFluids import hiiragi283.ragium.common.item.RagiumItems @@ -25,6 +27,7 @@ class RagiumCommonRecipeProvider(packOutput: PackOutput, future: CompletableFutu override fun exportValues() { heat() chemical() + electronics() } override fun getName(): String = "Common Recipes" @@ -78,7 +81,7 @@ class RagiumCommonRecipeProvider(packOutput: PackOutput, future: CompletableFutu }.save(exporter) RagiumRecipeBuilders.pyrolyzing { ingredient { +holderSet(CommonTagPrefixes.DUST, RagiumMaterial.Fuel.COAL) } - itemResult { +RagiumItems.getOrThrow(HTItemPart.DUST, RagiumMaterial.Fuel.COAL_COKE) } + itemResult { +RagiumItems.getOrThrow(HTItemPart.DUST, RagiumMaterial.Other.CARBON) } fluidResult { +RagiumFluids.COAL_TAR amount = 500 @@ -306,4 +309,58 @@ class RagiumCommonRecipeProvider(packOutput: PackOutput, future: CompletableFutu }.save(exporter) // Clay + Liquid Explosive -> Plastic Explosive TODO } + + // Electronics // + + private fun electronics() { + silicon() + } + + private fun silicon() { + // Quartz + Coal Coke -> Crude Si + RagiumRecipeBuilders.alloying { + primary { +dustOrGem(RagiumMaterial.Gem.QUARTZ) } + secondary { +holderSet(RagiumTags.Items.COKES) } + result { +RagiumItems.CRUDE_SILICON } + recipeId suffix "_from_quartz" + }.save(exporter) + RagiumRecipeBuilders.alloying { + primary { +holderSet(RagiumTags.BlockItem.QUARTZ_BLOCKS.item) } + secondary { + +holderSet(RagiumTags.Items.COKES) + count = 4 + } + result { + +RagiumItems.CRUDE_SILICON + count = 4 + } + time *= 4 + recipeId suffix "_from_quartz_block" + }.save(exporter) + // Amethyst + Coal Coke -> Crude Si + RagiumRecipeBuilders.alloying { + primary { + +dustOrGem(RagiumMaterial.Gem.AMETHYST) + count = 4 + } + secondary { +holderSet(RagiumTags.Items.COKES) } + result { +RagiumItems.CRUDE_SILICON } + recipeId suffix "_from_amethyst" + }.save(exporter) + RagiumRecipeBuilders.alloying { + primary { items { +Items.AMETHYST_BLOCK } } + secondary { +holderSet(RagiumTags.Items.COKES) } + result { +RagiumItems.CRUDE_SILICON } + recipeId suffix "_from_amethyst_block" + }.save(exporter) + // Crude Si + HCl -> Si Dust + RagiumRecipeBuilders.bathing { + itemIngredient { +holderSet(HTCommonTags.Items.SILICON) } + fluidIngredient { + +holderSet(RagiumFluids.HYDROCHLORIC_ACID) + amount = 125 + } + result { +RagiumItems.getOrThrow(HTItemPart.DUST, RagiumMaterial.Other.SILICON) } + }.save(exporter) + } } diff --git a/src/data/kotlin/hiiragi283/ragium/data/recipe/RagiumHeatRecipeProvider.kt b/src/data/kotlin/hiiragi283/ragium/data/recipe/RagiumHeatRecipeProvider.kt index 49d6f66779..963092e748 100644 --- a/src/data/kotlin/hiiragi283/ragium/data/recipe/RagiumHeatRecipeProvider.kt +++ b/src/data/kotlin/hiiragi283/ragium/data/recipe/RagiumHeatRecipeProvider.kt @@ -7,6 +7,7 @@ import hiiragi283.ragium.api.data.recipe.builder.RagiumRecipeBuilders import hiiragi283.ragium.api.material.HTItemPart import hiiragi283.ragium.api.material.RagiumMaterial import hiiragi283.ragium.api.tag.HTMachineType +import hiiragi283.ragium.api.tag.RagiumTags import hiiragi283.ragium.common.fluid.RagiumFluids import hiiragi283.ragium.common.item.RagiumItems import net.minecraft.core.HolderLookup @@ -49,6 +50,31 @@ class RagiumHeatRecipeProvider(packOutput: PackOutput, future: CompletableFuture secondary { +dustOrIngot(RagiumMaterial.Metal.GOLD) } result { +RagiumItems.getParts(HTMachineType.CHEMICAL) } }.save(exporter) + // Iron + Coal -> Sooty Iron + RagiumRecipeBuilders.alloying { + primary { +dustOrIngot(RagiumMaterial.Metal.IRON) } + secondary { + items { + +Items.COAL + +Items.CHARCOAL + } + } + result { +RagiumItems.getOrThrow(HTItemPart.INGOT, RagiumMaterial.Metal.SOOTY_IRON) } + recipeId suffix "_by_coals" + }.save(exporter) + // 2x Iron + Cokes -> 2x Sooty Iron + RagiumRecipeBuilders.alloying { + primary { + +dustOrIngot(RagiumMaterial.Metal.IRON) + count = 2 + } + secondary { +holderSet(RagiumTags.Items.COKES) } + result { + +RagiumItems.getOrThrow(HTItemPart.INGOT, RagiumMaterial.Metal.SOOTY_IRON) + count = 2 + } + recipeId suffix "_by_cokes" + }.save(exporter) // Sooty Iron + Obsidian Dust -> Black Steel RagiumRecipeBuilders.alloying { primary { +holderSet(CommonTagPrefixes.INGOT, RagiumMaterial.Metal.SOOTY_IRON) } diff --git a/src/data/kotlin/hiiragi283/ragium/data/recipe/RagiumMechanicalRecipeProvider.kt b/src/data/kotlin/hiiragi283/ragium/data/recipe/RagiumMechanicalRecipeProvider.kt index d9d37f3749..3d2d80035a 100644 --- a/src/data/kotlin/hiiragi283/ragium/data/recipe/RagiumMechanicalRecipeProvider.kt +++ b/src/data/kotlin/hiiragi283/ragium/data/recipe/RagiumMechanicalRecipeProvider.kt @@ -397,13 +397,18 @@ class RagiumMechanicalRecipeProvider(packOutput: PackOutput, future: Completable private fun crushMaterial() { // XX Dust - for (fuel: RagiumMaterial.Fuel in RagiumMaterial.Fuel.entries) { - val baseItem: HTSimpleDeferredItem = RagiumMaterialHelper.getFuelBase(fuel) - RagiumRecipeBuilders.crushing { - ingredient { items { +baseItem } } - result { +RagiumItems.getOrThrow(HTItemPart.DUST, fuel) } - }.save(exporter) - } + RagiumRecipeBuilders.crushing { + ingredient { items { +Items.COAL } } + result { +RagiumItems.getOrThrow(HTItemPart.DUST, RagiumMaterial.Fuel.COAL) } + }.save(exporter) + RagiumRecipeBuilders.crushing { + ingredient { items { +Items.CHARCOAL } } + result { +RagiumItems.getOrThrow(HTItemPart.DUST, RagiumMaterial.Fuel.CHARCOAL) } + }.save(exporter) + RagiumRecipeBuilders.crushing { + ingredient { +holderSet(RagiumTags.Items.COKES) } + result { +RagiumItems.getOrThrow(HTItemPart.DUST, RagiumMaterial.Other.CARBON) } + }.save(exporter) for (gem: RagiumMaterial.Gem in RagiumMaterial.Gem.entries) { RagiumRecipeBuilders.crushing { diff --git a/src/data/kotlin/hiiragi283/ragium/data/recipe/RagiumVanillaRecipeProvider.kt b/src/data/kotlin/hiiragi283/ragium/data/recipe/RagiumVanillaRecipeProvider.kt index 7e6595096a..f9eee58daa 100644 --- a/src/data/kotlin/hiiragi283/ragium/data/recipe/RagiumVanillaRecipeProvider.kt +++ b/src/data/kotlin/hiiragi283/ragium/data/recipe/RagiumVanillaRecipeProvider.kt @@ -39,6 +39,7 @@ import net.minecraft.data.recipes.SmithingTransformRecipeBuilder import net.minecraft.tags.ItemTags import net.minecraft.tags.TagKey import net.minecraft.world.item.DyeColor +import net.minecraft.world.item.Item import net.minecraft.world.item.Items import net.minecraft.world.item.ToolMaterial import net.minecraft.world.item.crafting.CookingBookCategory @@ -91,7 +92,7 @@ class RagiumVanillaRecipeProvider(registries: HolderLookup.Provider, output: Rec shapeless(RecipeCategory.BUILDING_BLOCKS, Items.PRISMARINE_SHARD, 9) .requires(Items.PRISMARINE_BRICKS) .group(getItemName(Items.PRISMARINE_SHARD)) - .unlockedBy(getHasName(Items.PRISMARINE_BRICKS), has(Items.PRISMARINE_BRICKS)) + .unlockedBy(Items.PRISMARINE_BRICKS) .saveSuffixed(output, "_from_bricks") // Gunpowder shapeless(RecipeCategory.MISC, Items.GUNPOWDER, 3) @@ -99,13 +100,8 @@ class RagiumVanillaRecipeProvider(registries: HolderLookup.Provider, output: Rec .requires(CommonTagPrefixes.DUST, RagiumMaterial.Mineral.SULFUR) .requires(CommonTagPrefixes.DUST, RagiumMaterial.Mineral.NITER) .group(getItemName(Items.GUNPOWDER)) - .unlockedBy( - getHasName(CommonTagPrefixes.DUST, RagiumMaterial.Mineral.SULFUR), - has(CommonTagPrefixes.DUST, RagiumMaterial.Mineral.SULFUR) - ).unlockedBy( - getHasName(CommonTagPrefixes.DUST, RagiumMaterial.Mineral.NITER), - has(CommonTagPrefixes.DUST, RagiumMaterial.Mineral.NITER) - ) + .unlockedBy(CommonTagPrefixes.DUST, RagiumMaterial.Mineral.SULFUR) + .unlockedBy(CommonTagPrefixes.DUST, RagiumMaterial.Mineral.NITER) .save(output) // Blaze Rod shaped(RecipeCategory.MISC, Items.BLAZE_ROD) @@ -116,17 +112,9 @@ class RagiumVanillaRecipeProvider(registries: HolderLookup.Provider, output: Rec .define('B', Items.MAGMA_BLOCK) .define('C', CommonTagPrefixes.DUST, RagiumMaterial.Mineral.SULFUR) .group(getItemName(Items.BLAZE_ROD)) - .unlockedBy( - getHasName(CommonTagPrefixes.DUST, RagiumMaterial.Gem.AMETHYST), - has(CommonTagPrefixes.DUST, RagiumMaterial.Gem.AMETHYST) - ).unlockedBy( - getHasName(Items.MAGMA_BLOCK), - has(Items.MAGMA_BLOCK) - ) - .unlockedBy( - getHasName(CommonTagPrefixes.DUST, RagiumMaterial.Mineral.SULFUR), - has(CommonTagPrefixes.DUST, RagiumMaterial.Mineral.SULFUR) - ) + .unlockedBy(CommonTagPrefixes.DUST, RagiumMaterial.Gem.AMETHYST) + .unlockedBy(Items.MAGMA_BLOCK) + .unlockedBy(CommonTagPrefixes.DUST, RagiumMaterial.Mineral.SULFUR) .save(output) // Breeze Rod shaped(RecipeCategory.MISC, Items.BREEZE_ROD) @@ -137,17 +125,9 @@ class RagiumVanillaRecipeProvider(registries: HolderLookup.Provider, output: Rec .define('B', Items.ICE) .define('C', CommonTagPrefixes.DUST, RagiumMaterial.Mineral.NITER) .group(getItemName(Items.BREEZE_ROD)) - .unlockedBy( - getHasName(CommonTagPrefixes.DUST, RagiumMaterial.Gem.AMETHYST), - has(CommonTagPrefixes.DUST, RagiumMaterial.Gem.AMETHYST) - ).unlockedBy( - getHasName(Items.ICE), - has(Items.ICE) - ) - .unlockedBy( - getHasName(CommonTagPrefixes.DUST, RagiumMaterial.Mineral.NITER), - has(CommonTagPrefixes.DUST, RagiumMaterial.Mineral.NITER) - ) + .unlockedBy(CommonTagPrefixes.DUST, RagiumMaterial.Gem.AMETHYST) + .unlockedBy(Items.ICE) + .unlockedBy(CommonTagPrefixes.DUST, RagiumMaterial.Mineral.NITER) .save(output) // Candle shaped(RecipeCategory.DECORATIONS, Items.CANDLE) @@ -155,8 +135,8 @@ class RagiumVanillaRecipeProvider(registries: HolderLookup.Provider, output: Rec .pattern("B") .define('A', Tags.Items.STRINGS) .define('B', RagiumItems.BEESWAX) - .unlockedBy(getHasName(Tags.Items.STRINGS), has(Tags.Items.STRINGS)) - .unlockedBy(getHasName(RagiumItems.BEESWAX), has(RagiumItems.BEESWAX)) + .unlockedBy(Tags.Items.STRINGS) + .unlockedBy(RagiumItems.BEESWAX) .save(output) // Bamboo Charcoal @@ -176,7 +156,7 @@ class RagiumVanillaRecipeProvider(registries: HolderLookup.Provider, output: Rec .pattern("AAA") .define('A', CommonTagPrefixes.DUST, RagiumMaterial.Other.WOOD) .define('B', HTCommonTags.Items.STICKY_BALLS) - .unlockedBy(getHasName(HTCommonTags.Items.STICKY_BALLS), has(HTCommonTags.Items.STICKY_BALLS)) + .unlockedBy(HTCommonTags.Items.STICKY_BALLS) .save(output) // Synthetic for (item: HTSimpleDeferredItem in listOf( @@ -199,7 +179,7 @@ class RagiumVanillaRecipeProvider(registries: HolderLookup.Provider, output: Rec .requires(Items.GLASS_BOTTLE) .requires(Items.GLASS_BOTTLE) .requires(Items.GLASS_BOTTLE) - .unlockedBy(getHasName(Tags.Items.GUNPOWDERS), has(Tags.Items.GUNPOWDERS)) + .unlockedBy(Tags.Items.GUNPOWDERS) .save(output) // Lingering Bottle shapeless(RecipeCategory.BREWING, RagiumItems.LINGERING_BOTTLE, 4) @@ -208,7 +188,7 @@ class RagiumVanillaRecipeProvider(registries: HolderLookup.Provider, output: Rec .requires(Items.GLASS_BOTTLE) .requires(Items.GLASS_BOTTLE) .requires(Items.GLASS_BOTTLE) - .unlockedBy(getHasName(Items.DRAGON_BREATH), has(Items.DRAGON_BREATH)) + .unlockedBy(Items.DRAGON_BREATH) .save(output) // XX Tools @@ -222,7 +202,7 @@ class RagiumVanillaRecipeProvider(registries: HolderLookup.Provider, output: Rec .requires(color.tag) .requires(color.tag) .requires(color.tag) - .unlockedBy(getHasName(color.tag), has(color.tag)) + .unlockedBy(color.tag) .save(output) } } @@ -233,7 +213,7 @@ class RagiumVanillaRecipeProvider(registries: HolderLookup.Provider, output: Rec .apply { patterns.forEach(::pattern) } .define('A', material.repairItems) .define('B', Tags.Items.RODS_WOODEN) - .unlockedBy(getHasName(material.repairItems), has(material.repairItems)) + .unlockedBy(material.repairItems) .save(output) } @@ -254,55 +234,52 @@ class RagiumVanillaRecipeProvider(registries: HolderLookup.Provider, output: Rec .pattern("AAA") .define('A', CommonTagPrefixes.INGOT, RagiumMaterial.Metal.SOOTY_IRON) .define('B', CommonTagPrefixes.DUST, RagiumMaterial.Mineral.REDSTONE) - .unlockedBy( - getHasName(CommonTagPrefixes.INGOT, RagiumMaterial.Metal.SOOTY_IRON), - has(CommonTagPrefixes.INGOT, RagiumMaterial.Metal.SOOTY_IRON) - ) + .unlockedBy(CommonTagPrefixes.INGOT, RagiumMaterial.Metal.SOOTY_IRON) .save(output) mechanical(RagiumBlocks.ASSEMBLER) { define('D', Items.CRAFTER) - unlockedBy(getHasName(Items.CRAFTER), has(Items.CRAFTER)) + unlockedBy(Items.CRAFTER) } mechanical(RagiumBlocks.CRUSHER) { define('D', Items.GRINDSTONE) - unlockedBy(getHasName(Items.GRINDSTONE), has(Items.GRINDSTONE)) + unlockedBy(Items.GRINDSTONE) } mechanical(RagiumBlocks.COMPRESSOR) { define('D', ItemTags.ANVIL) - unlockedBy(getHasName(ItemTags.ANVIL), has(ItemTags.ANVIL)) + unlockedBy(ItemTags.ANVIL) } mechanical(RagiumBlocks.CUTTING_MACHINE) { define('D', Items.STONECUTTER) - unlockedBy(getHasName(Items.STONECUTTER), has(Items.STONECUTTER)) + unlockedBy(Items.STONECUTTER) } // Heat heat(RagiumBlocks.ALLOY_SMELTER) { define('D', Items.BLAST_FURNACE) - unlockedBy(getHasName(Items.BLAST_FURNACE), has(Items.BLAST_FURNACE)) + unlockedBy(Items.BLAST_FURNACE) } heat(RagiumBlocks.FREEZER) { define('D', Tags.Items.BUCKETS_WATER) - unlockedBy(getHasName(Tags.Items.BUCKETS_WATER), has(Tags.Items.BUCKETS_WATER)) + unlockedBy(Tags.Items.BUCKETS_WATER) } heat(RagiumBlocks.MELTER) { define('D', Tags.Items.BUCKETS_LAVA) - unlockedBy(getHasName(Tags.Items.BUCKETS_LAVA), has(Tags.Items.BUCKETS_LAVA)) + unlockedBy(Tags.Items.BUCKETS_LAVA) } heat(RagiumBlocks.SMELTER) { define('D', Items.FURNACE) - unlockedBy(getHasName(Items.FURNACE), has(Items.FURNACE)) + unlockedBy(Items.FURNACE) } // Chemical chemical(RagiumBlocks.CHEMICAL_BATH) { define('D', Items.CAULDRON) - unlockedBy(getHasName(Items.CAULDRON), has(Items.CAULDRON)) + unlockedBy(Items.CAULDRON) } // Bio bio(RagiumBlocks.BREWERY) { define('D', Items.BREWING_STAND) - unlockedBy(getHasName(Items.BREWING_STAND), has(Items.BREWING_STAND)) + unlockedBy(Items.BREWING_STAND) } // Electronics // Arcane @@ -314,10 +291,7 @@ class RagiumVanillaRecipeProvider(registries: HolderLookup.Provider, output: Rec .pattern("ABA") .define('A', CommonTagPrefixes.NUGGET, RagiumMaterial.Metal.SOOTY_IRON) .define('B', CommonTagPrefixes.INGOT, RagiumMaterial.Metal.SOOTY_IRON) - .unlockedBy( - getHasName(CommonTagPrefixes.INGOT, RagiumMaterial.Metal.SOOTY_IRON), - has(CommonTagPrefixes.INGOT, RagiumMaterial.Metal.SOOTY_IRON) - ) + .unlockedBy(CommonTagPrefixes.INGOT, RagiumMaterial.Metal.SOOTY_IRON) .save(output) for (block: HTSimpleDeferredBlockAndItem in RagiumBlocks.MACHINE_CASINGS.values) { @@ -434,7 +408,7 @@ class RagiumVanillaRecipeProvider(registries: HolderLookup.Provider, output: Rec .define('A', ItemTags.PLANKS) .define('B', ItemTags.WOODEN_BUTTONS) .group(gear.idOrThrow.path) - .unlockedBy(getHasName(ItemTags.PLANKS), has(ItemTags.PLANKS)) + .unlockedBy(ItemTags.PLANKS) .save(output) } gear(CommonTagPrefixes.GEM, RagiumMaterial.Gem.DIAMOND) @@ -505,7 +479,7 @@ class RagiumVanillaRecipeProvider(registries: HolderLookup.Provider, output: Rec .pattern("AAA") .define('A', CommonTagPrefixes.TINY, fuel) .group(getItemName(base)) - .unlockedBy(getHasName(CommonTagPrefixes.TINY, fuel), has(CommonTagPrefixes.TINY, fuel)) + .unlockedBy(CommonTagPrefixes.TINY, fuel) .saveSuffixed(output, "_from_tiny") } // Sooty Iron @@ -521,14 +495,8 @@ class RagiumVanillaRecipeProvider(registries: HolderLookup.Provider, output: Rec .define('A', CommonTagPrefixes.TINY, RagiumMaterial.Fuel.COAL, RagiumMaterial.Fuel.CHARCOAL) .define('B', ironIngot) .group(sootyIronIngot.idOrThrow.path) - .unlockedBy( - getHasName(CommonTagPrefixes.TINY, RagiumMaterial.Fuel.COAL), - has(CommonTagPrefixes.TINY, RagiumMaterial.Fuel.COAL) - ) - .unlockedBy( - getHasName(CommonTagPrefixes.TINY, RagiumMaterial.Fuel.CHARCOAL), - has(CommonTagPrefixes.TINY, RagiumMaterial.Fuel.CHARCOAL) - ) + .unlockedBy(CommonTagPrefixes.TINY, RagiumMaterial.Fuel.COAL) + .unlockedBy(CommonTagPrefixes.TINY, RagiumMaterial.Fuel.CHARCOAL) .save(output) shaped(RecipeCategory.MISC, sootyIronIngot) .pattern(" A ") @@ -537,34 +505,8 @@ class RagiumVanillaRecipeProvider(registries: HolderLookup.Provider, output: Rec .define('A', CommonTagPrefixes.TINY, RagiumMaterial.Fuel.COAL_COKE) .define('B', ironIngot) .group(sootyIronIngot.idOrThrow.path) - .unlockedBy( - getHasName(CommonTagPrefixes.TINY, RagiumMaterial.Fuel.COAL_COKE), - has(CommonTagPrefixes.TINY, RagiumMaterial.Fuel.COAL_COKE) - ) + .unlockedBy(CommonTagPrefixes.TINY, RagiumMaterial.Fuel.COAL_COKE) .saveSuffixed(output, "_from_coke") - shapeless(RecipeCategory.MISC, sootyIronIngot) - .requires(ironIngot) - .requires(CommonTagPrefixes.DUST, RagiumMaterial.Fuel.COAL, RagiumMaterial.Fuel.CHARCOAL) - .group(sootyIronIngot.idOrThrow.path) - .unlockedBy( - getHasName(CommonTagPrefixes.DUST, RagiumMaterial.Fuel.COAL), - has(CommonTagPrefixes.DUST, RagiumMaterial.Fuel.COAL) - ) - .unlockedBy( - getHasName(CommonTagPrefixes.DUST, RagiumMaterial.Fuel.CHARCOAL), - has(CommonTagPrefixes.DUST, RagiumMaterial.Fuel.CHARCOAL) - ) - .saveSuffixed(output, "_by_dust") - shapeless(RecipeCategory.MISC, sootyIronIngot, 2) - .requires(ironIngot) - .requires(ironIngot) - .requires(CommonTagPrefixes.DUST, RagiumMaterial.Fuel.COAL_COKE) - .group(sootyIronIngot.idOrThrow.path) - .unlockedBy( - getHasName(CommonTagPrefixes.DUST, RagiumMaterial.Fuel.COAL_COKE), - has(CommonTagPrefixes.DUST, RagiumMaterial.Fuel.COAL_COKE) - ) - .saveSuffixed(output, "_by_coke_dust") } private fun baseToBlock( @@ -606,10 +548,8 @@ class RagiumVanillaRecipeProvider(registries: HolderLookup.Provider, output: Rec shapeless(RecipeCategory.MISC, base, size.count) .requires(CommonTagPrefixes.STORAGE_BLOCK, material) .group(getItemName(base)) - .unlockedBy( - getHasName(CommonTagPrefixes.STORAGE_BLOCK, material), - has(CommonTagPrefixes.STORAGE_BLOCK, material) - ).saveSuffixed(output, "_from_block") + .unlockedBy(CommonTagPrefixes.STORAGE_BLOCK, material) + .saveSuffixed(output, "_from_block") shaped(RecipeCategory.BUILDING_BLOCKS, block) .apply { size.pattern.forEach(::pattern) } .define('A', baseInput) @@ -633,7 +573,7 @@ class RagiumVanillaRecipeProvider(registries: HolderLookup.Provider, output: Rec shapeless(RecipeCategory.MISC, nugget, 9) .requires(CommonTagPrefixes.INGOT, material) .group(getItemName(nugget)) - .unlockedBy(getHasName(CommonTagPrefixes.INGOT, material), has(CommonTagPrefixes.INGOT, material)) + .unlockedBy(CommonTagPrefixes.INGOT, material) .saveSuffixed(output, "_from_ingot") shaped(RecipeCategory.MISC, ingot) .pattern("AAA") @@ -642,7 +582,7 @@ class RagiumVanillaRecipeProvider(registries: HolderLookup.Provider, output: Rec .define('A', CommonTagPrefixes.NUGGET, material) .define('B', nugget) .group(getItemName(ingot)) - .unlockedBy(getHasName(CommonTagPrefixes.NUGGET, material), has(CommonTagPrefixes.NUGGET, material)) + .unlockedBy(CommonTagPrefixes.NUGGET, material) .saveSuffixed(output, "_from_nugget") } @@ -655,7 +595,7 @@ class RagiumVanillaRecipeProvider(registries: HolderLookup.Provider, output: Rec .define('A', basePrefix, material) .define('B', CommonTagPrefixes.GEAR, RagiumMaterial.Other.WOOD) .group(getItemName(gear)) - .unlockedBy(getHasName(basePrefix, material), has(basePrefix, material)) + .unlockedBy(basePrefix, material) .save(output) } @@ -674,6 +614,7 @@ class RagiumVanillaRecipeProvider(registries: HolderLookup.Provider, output: Rec this.save(output, RecipeKey(this.defaultId().identifier().withSuffix(suffix))) } + // ShapedRecipeBuilder fun ShapedRecipeBuilder.define(symbol: Char, prefix: HTTagPrefix, material: HTMaterialLike): ShapedRecipeBuilder = this.define(symbol, prefix.itemTagKey(material)) @@ -688,6 +629,16 @@ class RagiumVanillaRecipeProvider(registries: HolderLookup.Provider, output: Rec .toVanilla() .let { this.define(symbol, it) } + fun ShapedRecipeBuilder.unlockedBy(item: ItemLike): ShapedRecipeBuilder = + this.unlockedBy(getHasName(item), has(item)) + + fun ShapedRecipeBuilder.unlockedBy(tagKey: TagKey): ShapedRecipeBuilder = + this.unlockedBy(getHasName(tagKey), has(tagKey)) + + fun ShapedRecipeBuilder.unlockedBy(prefix: HTTagPrefix, material: HTMaterialLike): ShapedRecipeBuilder = + this.unlockedBy(getHasName(prefix, material), has(prefix, material)) + + // ShapelessRecipeBuilder fun ShapelessRecipeBuilder.requires(prefix: HTTagPrefix, material: HTMaterialLike): ShapelessRecipeBuilder = this.requires(prefix.itemTagKey(material)) @@ -698,4 +649,13 @@ class RagiumVanillaRecipeProvider(registries: HolderLookup.Provider, output: Rec .let(::CompoundIngredient) .toVanilla() .let(this::requires) + + fun ShapelessRecipeBuilder.unlockedBy(item: ItemLike): ShapelessRecipeBuilder = + this.unlockedBy(getHasName(item), has(item)) + + fun ShapelessRecipeBuilder.unlockedBy(tagKey: TagKey): ShapelessRecipeBuilder = + this.unlockedBy(getHasName(tagKey), has(tagKey)) + + fun ShapelessRecipeBuilder.unlockedBy(prefix: HTTagPrefix, material: HTMaterialLike): ShapelessRecipeBuilder = + this.unlockedBy(getHasName(prefix, material), has(prefix, material)) } diff --git a/src/data/kotlin/hiiragi283/ragium/data/tag/RagiumItemTagsProvider.kt b/src/data/kotlin/hiiragi283/ragium/data/tag/RagiumItemTagsProvider.kt index 4b7fc5efa7..511d536919 100644 --- a/src/data/kotlin/hiiragi283/ragium/data/tag/RagiumItemTagsProvider.kt +++ b/src/data/kotlin/hiiragi283/ragium/data/tag/RagiumItemTagsProvider.kt @@ -56,8 +56,15 @@ class RagiumItemTagsProvider(output: PackOutput, lookupProvider: CompletableFutu builder(Tags.Items.LEATHERS).add(RagiumItems.SYNTHETIC_LEATHER) builder(Tags.Items.STRINGS).add(RagiumItems.SYNTHETIC_FIBER) + builder(HTCommonTags.Items.COAL_COKE).add(RagiumItems.COAL_COKE) builder(HTCommonTags.Items.PAPER).addItem(Items.PAPER) + builder(HTCommonTags.Items.PITCH_COKE).add(RagiumItems.PITCH_COKE) builder(HTCommonTags.Items.PLASTICS).add(RagiumItems.PLASTIC_PLATE) + builder(HTCommonTags.Items.SILICON).add(RagiumItems.CRUDE_SILICON) builder(HTCommonTags.Items.STICKY_BALLS).addTag(Tags.Items.SLIME_BALLS) + + builder(RagiumTags.Items.COKES) + .addTag(HTCommonTags.Items.COAL_COKE) + .addTag(HTCommonTags.Items.PITCH_COKE) } } diff --git a/src/generated/resources/assets/ragium/items/coal_coke_dust.json b/src/generated/resources/assets/ragium/items/carbon_dust.json similarity index 54% rename from src/generated/resources/assets/ragium/items/coal_coke_dust.json rename to src/generated/resources/assets/ragium/items/carbon_dust.json index 760ebefae5..62ae472dbf 100644 --- a/src/generated/resources/assets/ragium/items/coal_coke_dust.json +++ b/src/generated/resources/assets/ragium/items/carbon_dust.json @@ -1,6 +1,6 @@ { "model": { "type": "minecraft:model", - "model": "ragium:item/coal_coke_dust" + "model": "ragium:item/carbon_dust" } } \ No newline at end of file diff --git a/src/generated/resources/assets/ragium/items/crude_silicon.json b/src/generated/resources/assets/ragium/items/crude_silicon.json new file mode 100644 index 0000000000..fd25aeadac --- /dev/null +++ b/src/generated/resources/assets/ragium/items/crude_silicon.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "ragium:item/crude_silicon" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/ragium/items/silicon_dust.json b/src/generated/resources/assets/ragium/items/silicon_dust.json new file mode 100644 index 0000000000..94cec53dd6 --- /dev/null +++ b/src/generated/resources/assets/ragium/items/silicon_dust.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "ragium:item/silicon_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/ragium/lang/en_us.json b/src/generated/resources/assets/ragium/lang/en_us.json index 3115df6f99..1275125a84 100644 --- a/src/generated/resources/assets/ragium/lang/en_us.json +++ b/src/generated/resources/assets/ragium/lang/en_us.json @@ -161,16 +161,17 @@ "item.ragium.blue_dye_bucket": "Blue Dye Bucket", "item.ragium.borax_dust": "Borax Dust", "item.ragium.brown_dye_bucket": "Brown Dye Bucket", + "item.ragium.carbon_dust": "Carbon Dust", "item.ragium.charcoal_dust": "Charcoal Dust", "item.ragium.chemical_machine_parts": "Machine Parts (Chemical)", "item.ragium.chloride_bucket": "Chlorine Bucket", "item.ragium.coal_coke": "Coal Coke", - "item.ragium.coal_coke_dust": "Coal Coke Dust", "item.ragium.coal_dust": "Coal Dust", "item.ragium.coal_tar_bucket": "Coal Tar Bucket", "item.ragium.copper_dust": "Copper Dust", "item.ragium.copper_gear": "Copper Gear", "item.ragium.crude_oil_bucket": "Crude Oil Bucket", + "item.ragium.crude_silicon": "Crude Silicon", "item.ragium.cyan_dye_bucket": "Cyan Dye Bucket", "item.ragium.diamond_dust": "Diamond Dust", "item.ragium.diamond_gear": "Diamond Gear", @@ -228,6 +229,7 @@ "item.ragium.raginite_dust": "Raginite Dust", "item.ragium.red_dye_bucket": "Red Dye Bucket", "item.ragium.salt_dust": "Salt Dust", + "item.ragium.silicon_dust": "Silicon Dust", "item.ragium.sodium_hydroxide_solution_bucket": "Sodium Hydroxide Solution Bucket", "item.ragium.sooty_iron_axe": "Sooty Iron Axe", "item.ragium.sooty_iron_hoe": "Sooty Iron Hoe", diff --git a/src/generated/resources/assets/ragium/lang/ja_jp.json b/src/generated/resources/assets/ragium/lang/ja_jp.json index 5a3d699f30..08908b4de9 100644 --- a/src/generated/resources/assets/ragium/lang/ja_jp.json +++ b/src/generated/resources/assets/ragium/lang/ja_jp.json @@ -161,16 +161,17 @@ "item.ragium.blue_dye_bucket": "青色の染料入りバケツ", "item.ragium.borax_dust": "ホウ砂の粉", "item.ragium.brown_dye_bucket": "茶色の染料入りバケツ", + "item.ragium.carbon_dust": "炭素の粉", "item.ragium.charcoal_dust": "木炭の粉", "item.ragium.chemical_machine_parts": "機械部品 (化学)", "item.ragium.chloride_bucket": "塩素入りバケツ", "item.ragium.coal_coke": "石炭コークス", - "item.ragium.coal_coke_dust": "石炭コークスの粉", "item.ragium.coal_dust": "石炭の粉", "item.ragium.coal_tar_bucket": "石炭タール入りバケツ", "item.ragium.copper_dust": "銅の粉", "item.ragium.copper_gear": "銅の歯車", "item.ragium.crude_oil_bucket": "原油入りバケツ", + "item.ragium.crude_silicon": "粗製シリコン", "item.ragium.cyan_dye_bucket": "青緑色の染料入りバケツ", "item.ragium.diamond_dust": "ダイヤモンドの粉", "item.ragium.diamond_gear": "ダイヤモンドの歯車", @@ -228,6 +229,7 @@ "item.ragium.raginite_dust": "ラギナイトの粉", "item.ragium.red_dye_bucket": "赤色の染料入りバケツ", "item.ragium.salt_dust": "食塩の粉", + "item.ragium.silicon_dust": "シリコンの粉", "item.ragium.sodium_hydroxide_solution_bucket": "水酸化ナトリウム水溶液入りバケツ", "item.ragium.sooty_iron_axe": "煤鉄の斧", "item.ragium.sooty_iron_hoe": "煤鉄のクワ", diff --git a/src/generated/resources/assets/ragium/models/item/coal_coke_dust.json b/src/generated/resources/assets/ragium/models/item/carbon_dust.json similarity index 59% rename from src/generated/resources/assets/ragium/models/item/coal_coke_dust.json rename to src/generated/resources/assets/ragium/models/item/carbon_dust.json index b69784e443..4f8b0ab027 100644 --- a/src/generated/resources/assets/ragium/models/item/coal_coke_dust.json +++ b/src/generated/resources/assets/ragium/models/item/carbon_dust.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "ragium:item/coal_coke_dust" + "layer0": "ragium:item/carbon_dust" } } \ No newline at end of file diff --git a/src/generated/resources/assets/ragium/models/item/crude_silicon.json b/src/generated/resources/assets/ragium/models/item/crude_silicon.json new file mode 100644 index 0000000000..68eee0e9a0 --- /dev/null +++ b/src/generated/resources/assets/ragium/models/item/crude_silicon.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "ragium:item/crude_silicon" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/ragium/models/item/silicon_dust.json b/src/generated/resources/assets/ragium/models/item/silicon_dust.json new file mode 100644 index 0000000000..92f2484d5e --- /dev/null +++ b/src/generated/resources/assets/ragium/models/item/silicon_dust.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "ragium:item/silicon_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/coal_coke.json b/src/generated/resources/data/c/tags/item/coal_coke.json new file mode 100644 index 0000000000..b395aa7ed5 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/coal_coke.json @@ -0,0 +1,5 @@ +{ + "values": [ + "ragium:coal_coke" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/dusts.json b/src/generated/resources/data/c/tags/item/dusts.json index 131924c9fb..0e728bb4b4 100644 --- a/src/generated/resources/data/c/tags/item/dusts.json +++ b/src/generated/resources/data/c/tags/item/dusts.json @@ -2,9 +2,9 @@ "values": [ "#c:dusts/amethyst", "#c:dusts/borax", + "#c:dusts/carbon", "#c:dusts/charcoal", "#c:dusts/coal", - "#c:dusts/coal_coke", "#c:dusts/copper", "#c:dusts/diamond", "#c:dusts/echo", @@ -21,6 +21,7 @@ "#c:dusts/quartz", "#c:dusts/raginite", "#c:dusts/salt", + "#c:dusts/silicon", "#c:dusts/sulfur", "#c:dusts/wood" ] diff --git a/src/generated/resources/data/c/tags/item/dusts/carbon.json b/src/generated/resources/data/c/tags/item/dusts/carbon.json new file mode 100644 index 0000000000..4ce2a13d60 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/dusts/carbon.json @@ -0,0 +1,5 @@ +{ + "values": [ + "ragium:carbon_dust" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/dusts/coal_coke.json b/src/generated/resources/data/c/tags/item/dusts/coal_coke.json deleted file mode 100644 index 7ca4845376..0000000000 --- a/src/generated/resources/data/c/tags/item/dusts/coal_coke.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "ragium:coal_coke_dust" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/dusts/silicon.json b/src/generated/resources/data/c/tags/item/dusts/silicon.json new file mode 100644 index 0000000000..d29c84e800 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/dusts/silicon.json @@ -0,0 +1,5 @@ +{ + "values": [ + "ragium:silicon_dust" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/pitch_coke.json b/src/generated/resources/data/c/tags/item/pitch_coke.json new file mode 100644 index 0000000000..8f0f3aba79 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/pitch_coke.json @@ -0,0 +1,5 @@ +{ + "values": [ + "ragium:pitch_coke" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/silicon.json b/src/generated/resources/data/c/tags/item/silicon.json new file mode 100644 index 0000000000..fe84be0f59 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/silicon.json @@ -0,0 +1,5 @@ +{ + "values": [ + "ragium:crude_silicon" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/ragium/advancement/recipes/misc/sooty_iron_ingot_by_coke_dust.json b/src/generated/resources/data/ragium/advancement/recipes/misc/sooty_iron_ingot_by_coke_dust.json deleted file mode 100644 index 3b766346f9..0000000000 --- a/src/generated/resources/data/ragium/advancement/recipes/misc/sooty_iron_ingot_by_coke_dust.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_dusts_coal_coke": { - "conditions": { - "items": [ - { - "items": "#c:dusts/coal_coke" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "ragium:sooty_iron_ingot_by_coke_dust" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_dusts_coal_coke" - ] - ], - "rewards": { - "recipes": [ - "ragium:sooty_iron_ingot_by_coke_dust" - ] - } -} \ No newline at end of file diff --git a/src/generated/resources/data/ragium/advancement/recipes/misc/sooty_iron_ingot_by_dust.json b/src/generated/resources/data/ragium/advancement/recipes/misc/sooty_iron_ingot_by_dust.json deleted file mode 100644 index 49a27d08e1..0000000000 --- a/src/generated/resources/data/ragium/advancement/recipes/misc/sooty_iron_ingot_by_dust.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_dusts_charcoal": { - "conditions": { - "items": [ - { - "items": "#c:dusts/charcoal" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_dusts_coal": { - "conditions": { - "items": [ - { - "items": "#c:dusts/coal" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "ragium:sooty_iron_ingot_by_dust" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_dusts_coal", - "has_dusts_charcoal" - ] - ], - "rewards": { - "recipes": [ - "ragium:sooty_iron_ingot_by_dust" - ] - } -} \ No newline at end of file diff --git a/src/generated/resources/data/ragium/recipe/alloying/crude_silicon_from_amethyst.json b/src/generated/resources/data/ragium/recipe/alloying/crude_silicon_from_amethyst.json new file mode 100644 index 0000000000..11bc68f887 --- /dev/null +++ b/src/generated/resources/data/ragium/recipe/alloying/crude_silicon_from_amethyst.json @@ -0,0 +1,22 @@ +{ + "type": "ragium:alloying", + "primary_ingredient": { + "count": 4, + "items": { + "type": "neoforge:or", + "values": [ + "#c:dusts/amethyst", + "#c:gems/amethyst" + ] + } + }, + "result": { + "count": 1, + "id": "ragium:crude_silicon" + }, + "secondary_ingredient": { + "count": 1, + "items": "#ragium:cokes" + }, + "time": 200 +} \ No newline at end of file diff --git a/src/generated/resources/data/ragium/recipe/alloying/crude_silicon_from_amethyst_block.json b/src/generated/resources/data/ragium/recipe/alloying/crude_silicon_from_amethyst_block.json new file mode 100644 index 0000000000..a127a0ed40 --- /dev/null +++ b/src/generated/resources/data/ragium/recipe/alloying/crude_silicon_from_amethyst_block.json @@ -0,0 +1,16 @@ +{ + "type": "ragium:alloying", + "primary_ingredient": { + "count": 1, + "items": "minecraft:amethyst_block" + }, + "result": { + "count": 1, + "id": "ragium:crude_silicon" + }, + "secondary_ingredient": { + "count": 1, + "items": "#ragium:cokes" + }, + "time": 200 +} \ No newline at end of file diff --git a/src/generated/resources/data/ragium/recipe/alloying/crude_silicon_from_quartz.json b/src/generated/resources/data/ragium/recipe/alloying/crude_silicon_from_quartz.json new file mode 100644 index 0000000000..df307a238b --- /dev/null +++ b/src/generated/resources/data/ragium/recipe/alloying/crude_silicon_from_quartz.json @@ -0,0 +1,22 @@ +{ + "type": "ragium:alloying", + "primary_ingredient": { + "count": 1, + "items": { + "type": "neoforge:or", + "values": [ + "#c:dusts/quartz", + "#c:gems/quartz" + ] + } + }, + "result": { + "count": 1, + "id": "ragium:crude_silicon" + }, + "secondary_ingredient": { + "count": 1, + "items": "#ragium:cokes" + }, + "time": 200 +} \ No newline at end of file diff --git a/src/generated/resources/data/ragium/recipe/alloying/crude_silicon_from_quartz_block.json b/src/generated/resources/data/ragium/recipe/alloying/crude_silicon_from_quartz_block.json new file mode 100644 index 0000000000..667b661467 --- /dev/null +++ b/src/generated/resources/data/ragium/recipe/alloying/crude_silicon_from_quartz_block.json @@ -0,0 +1,16 @@ +{ + "type": "ragium:alloying", + "primary_ingredient": { + "count": 1, + "items": "#ragium:quartz_blocks" + }, + "result": { + "count": 4, + "id": "ragium:crude_silicon" + }, + "secondary_ingredient": { + "count": 4, + "items": "#ragium:cokes" + }, + "time": 800 +} \ No newline at end of file diff --git a/src/generated/resources/data/ragium/recipe/alloying/sooty_iron_ingot_by_coals.json b/src/generated/resources/data/ragium/recipe/alloying/sooty_iron_ingot_by_coals.json new file mode 100644 index 0000000000..af0a2b3939 --- /dev/null +++ b/src/generated/resources/data/ragium/recipe/alloying/sooty_iron_ingot_by_coals.json @@ -0,0 +1,25 @@ +{ + "type": "ragium:alloying", + "primary_ingredient": { + "count": 1, + "items": { + "type": "neoforge:or", + "values": [ + "#c:dusts/iron", + "#c:ingots/iron" + ] + } + }, + "result": { + "count": 1, + "id": "ragium:sooty_iron_ingot" + }, + "secondary_ingredient": { + "count": 1, + "items": [ + "minecraft:coal", + "minecraft:charcoal" + ] + }, + "time": 200 +} \ No newline at end of file diff --git a/src/generated/resources/data/ragium/recipe/alloying/sooty_iron_ingot_by_cokes.json b/src/generated/resources/data/ragium/recipe/alloying/sooty_iron_ingot_by_cokes.json new file mode 100644 index 0000000000..2a9a77e91f --- /dev/null +++ b/src/generated/resources/data/ragium/recipe/alloying/sooty_iron_ingot_by_cokes.json @@ -0,0 +1,22 @@ +{ + "type": "ragium:alloying", + "primary_ingredient": { + "count": 2, + "items": { + "type": "neoforge:or", + "values": [ + "#c:dusts/iron", + "#c:ingots/iron" + ] + } + }, + "result": { + "count": 2, + "id": "ragium:sooty_iron_ingot" + }, + "secondary_ingredient": { + "count": 1, + "items": "#ragium:cokes" + }, + "time": 200 +} \ No newline at end of file diff --git a/src/generated/resources/data/ragium/recipe/bathing/silicon_dust.json b/src/generated/resources/data/ragium/recipe/bathing/silicon_dust.json new file mode 100644 index 0000000000..f11b25a586 --- /dev/null +++ b/src/generated/resources/data/ragium/recipe/bathing/silicon_dust.json @@ -0,0 +1,16 @@ +{ + "type": "ragium:bathing", + "fluid_ingredient": { + "amount": 125, + "fluids": "#c:hydrochloric_acid" + }, + "item_ingredient": { + "count": 1, + "items": "#c:silicon" + }, + "result": { + "count": 1, + "id": "ragium:silicon_dust" + }, + "time": 200 +} \ No newline at end of file diff --git a/src/generated/resources/data/ragium/recipe/crushing/coal_coke_dust.json b/src/generated/resources/data/ragium/recipe/crushing/carbon_dust.json similarity index 64% rename from src/generated/resources/data/ragium/recipe/crushing/coal_coke_dust.json rename to src/generated/resources/data/ragium/recipe/crushing/carbon_dust.json index d70d5b0b51..113c643d0b 100644 --- a/src/generated/resources/data/ragium/recipe/crushing/coal_coke_dust.json +++ b/src/generated/resources/data/ragium/recipe/crushing/carbon_dust.json @@ -2,11 +2,11 @@ "type": "ragium:crushing", "ingredient": { "count": 1, - "items": "ragium:coal_coke" + "items": "#ragium:cokes" }, "results": { "count": 1, - "id": "ragium:coal_coke_dust" + "id": "ragium:carbon_dust" }, "time": 200 } \ No newline at end of file diff --git a/src/generated/resources/data/ragium/recipe/pyrolyzing/coal_coke_dust.json b/src/generated/resources/data/ragium/recipe/pyrolyzing/carbon_dust.json similarity index 87% rename from src/generated/resources/data/ragium/recipe/pyrolyzing/coal_coke_dust.json rename to src/generated/resources/data/ragium/recipe/pyrolyzing/carbon_dust.json index 10a60bab99..27f9b0c3d3 100644 --- a/src/generated/resources/data/ragium/recipe/pyrolyzing/coal_coke_dust.json +++ b/src/generated/resources/data/ragium/recipe/pyrolyzing/carbon_dust.json @@ -10,7 +10,7 @@ }, "item_result": { "count": 1, - "id": "ragium:coal_coke_dust" + "id": "ragium:carbon_dust" }, "time": 100 } \ No newline at end of file diff --git a/src/generated/resources/data/ragium/recipe/sooty_iron_ingot_by_coke_dust.json b/src/generated/resources/data/ragium/recipe/sooty_iron_ingot_by_coke_dust.json deleted file mode 100644 index 6b6441ddd1..0000000000 --- a/src/generated/resources/data/ragium/recipe/sooty_iron_ingot_by_coke_dust.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "group": "sooty_iron_ingot", - "ingredients": [ - "#c:ingots/iron", - "#c:ingots/iron", - "#c:dusts/coal_coke" - ], - "result": { - "count": 2, - "id": "ragium:sooty_iron_ingot" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/ragium/recipe/sooty_iron_ingot_by_dust.json b/src/generated/resources/data/ragium/recipe/sooty_iron_ingot_by_dust.json deleted file mode 100644 index 21f342ad70..0000000000 --- a/src/generated/resources/data/ragium/recipe/sooty_iron_ingot_by_dust.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "group": "sooty_iron_ingot", - "ingredients": [ - "#c:ingots/iron", - { - "neoforge:ingredient_type": "neoforge:compound", - "children": [ - "#c:dusts/charcoal", - "#c:dusts/coal" - ] - } - ], - "result": { - "id": "ragium:sooty_iron_ingot" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/ragium/tags/item/cokes.json b/src/generated/resources/data/ragium/tags/item/cokes.json new file mode 100644 index 0000000000..c8c25df6dd --- /dev/null +++ b/src/generated/resources/data/ragium/tags/item/cokes.json @@ -0,0 +1,6 @@ +{ + "values": [ + "#c:coal_coke", + "#c:pitch_coke" + ] +} \ No newline at end of file diff --git a/src/lib/kotlin/hiiragi283/lib/tag/HTCommonTags.kt b/src/lib/kotlin/hiiragi283/lib/tag/HTCommonTags.kt index 01d9f5e80a..c265ff06e1 100644 --- a/src/lib/kotlin/hiiragi283/lib/tag/HTCommonTags.kt +++ b/src/lib/kotlin/hiiragi283/lib/tag/HTCommonTags.kt @@ -27,6 +27,12 @@ data object HTCommonTags { } data object Items { + /** + * @since 26.1.7 + */ + @JvmField + val COAL_COKE: TagKey = create("coal_coke") + @JvmField val FOODS_DOUGH_WHEAT: TagKey = create("foods", "dough", "wheat") @@ -39,6 +45,12 @@ data object HTCommonTags { @JvmField val PAPER: TagKey = create("paper") + /** + * @since 26.1.7 + */ + @JvmField + val PITCH_COKE: TagKey = create("pitch_coke") + @JvmField val PLASTICS: TagKey = create("plastics") diff --git a/src/lib/kotlin/hiiragi283/ragium/api/material/RagiumMaterial.kt b/src/lib/kotlin/hiiragi283/ragium/api/material/RagiumMaterial.kt index 0c55b00511..d5e077b574 100644 --- a/src/lib/kotlin/hiiragi283/ragium/api/material/RagiumMaterial.kt +++ b/src/lib/kotlin/hiiragi283/ragium/api/material/RagiumMaterial.kt @@ -134,6 +134,7 @@ sealed interface RagiumMaterial : PAPER(true, "Paper", "紙"), // Common + CARBON(false, "Carbon", "炭素"), SILICON(false, "Silicon", "シリコン") ; diff --git a/src/lib/kotlin/hiiragi283/ragium/api/tag/RagiumTags.kt b/src/lib/kotlin/hiiragi283/ragium/api/tag/RagiumTags.kt index 7ee33ac438..e424387313 100644 --- a/src/lib/kotlin/hiiragi283/ragium/api/tag/RagiumTags.kt +++ b/src/lib/kotlin/hiiragi283/ragium/api/tag/RagiumTags.kt @@ -40,6 +40,12 @@ data object RagiumTags { * @since 26.1.0 */ data object Items { + /** + * @since 26.1.7 + */ + @JvmField + val COKES: TagKey = create("cokes") + @JvmField val SOOTY_IRON_TOOL_MATERIALS: TagKey = create("sooty_iron_tool_materials") diff --git a/src/main/kotlin/hiiragi283/ragium/common/item/RagiumItems.kt b/src/main/kotlin/hiiragi283/ragium/common/item/RagiumItems.kt index 418d13a24d..62cdb859fd 100644 --- a/src/main/kotlin/hiiragi283/ragium/common/item/RagiumItems.kt +++ b/src/main/kotlin/hiiragi283/ragium/common/item/RagiumItems.kt @@ -27,6 +27,7 @@ data object RagiumItems { REGISTER.addAlias("steel_dust", "sooty_iron_dust") REGISTER.addAlias("steel_ingot", "sooty_iron_ingot") REGISTER.addAlias("steel_nugget", "sooty_iron_nugget") + REGISTER.addAlias("coal_coke_dust", "carbon_dust") REGISTER.register(eventBus) } @@ -39,7 +40,7 @@ data object RagiumItems { // Fuel putAll(RagiumMaterial.Fuel.COAL, HTItemPart.DUST, HTItemPart.TINY) putAll(RagiumMaterial.Fuel.CHARCOAL, HTItemPart.DUST, HTItemPart.TINY) - putAll(RagiumMaterial.Fuel.COAL_COKE, HTItemPart.DUST, HTItemPart.TINY) + putAll(RagiumMaterial.Fuel.COAL_COKE, HTItemPart.TINY) // Mineral for (mineral: RagiumMaterial.Mineral in RagiumMaterial.Mineral.entries) { if (!mineral.isVanilla) { @@ -67,6 +68,8 @@ data object RagiumItems { putAll(RagiumMaterial.Other.GLASS, HTItemPart.DUST) putAll(RagiumMaterial.Other.OBSIDIAN, HTItemPart.DUST) putAll(RagiumMaterial.Other.PAPER, HTItemPart.DUST) + putAll(RagiumMaterial.Other.CARBON, HTItemPart.DUST) + putAll(RagiumMaterial.Other.SILICON, HTItemPart.DUST) }.flatMapTable { (material: RagiumMaterial, parts: Collection) -> parts.map { part: HTItemPart -> Triple( @@ -133,6 +136,8 @@ data object RagiumItems { val LINGERING_BOTTLE: HTSimpleDeferredItem = REGISTER.registerSimpleItem("lingering_bottle") // Electronics + @JvmField + val CRUDE_SILICON: HTSimpleDeferredItem = REGISTER.registerSimpleItem("crude_silicon") // Arcane @JvmField From ac2fd83fba29a04f2270d07b5e8152fcc1921fc7 Mon Sep 17 00:00:00 2001 From: Hiiragi Russell Tsubasa <97942736+Hiiragi283@users.noreply.github.com> Date: Fri, 18 Sep 2026 21:51:37 +0900 Subject: [PATCH 2/3] =?UTF-8?q?feat:=20=E6=96=B0=E3=81=97=E3=81=84?= =?UTF-8?q?=E3=82=A2=E3=82=A4=E3=83=86=E3=83=A0=E3=82=BF=E3=82=B0=20#ragiu?= =?UTF-8?q?m:coals=20=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ragium/data/recipe/RagiumHeatRecipeProvider.kt | 9 ++------- .../data/recipe/RagiumMechanicalRecipeProvider.kt | 1 + .../ragium/data/tag/RagiumItemTagsProvider.kt | 4 ++++ .../recipe/alloying/sooty_iron_ingot_by_coals.json | 5 +---- .../ragium/recipe/compressing/charcoal_from_dust.json | 9 +++++++++ .../ragium/recipe/compressing/coal_coke_from_dust.json | 9 +++++++++ .../data/ragium/recipe/compressing/coal_from_dust.json | 9 +++++++++ .../resources/data/ragium/tags/item/coals.json | 7 +++++++ src/lib/kotlin/hiiragi283/lib/data/ConditionBuilder.kt | 10 ++++++++++ src/lib/kotlin/hiiragi283/ragium/api/tag/RagiumTags.kt | 6 ++++++ 10 files changed, 58 insertions(+), 11 deletions(-) create mode 100644 src/generated/resources/data/ragium/tags/item/coals.json diff --git a/src/data/kotlin/hiiragi283/ragium/data/recipe/RagiumHeatRecipeProvider.kt b/src/data/kotlin/hiiragi283/ragium/data/recipe/RagiumHeatRecipeProvider.kt index 963092e748..20e482a2e0 100644 --- a/src/data/kotlin/hiiragi283/ragium/data/recipe/RagiumHeatRecipeProvider.kt +++ b/src/data/kotlin/hiiragi283/ragium/data/recipe/RagiumHeatRecipeProvider.kt @@ -50,15 +50,10 @@ class RagiumHeatRecipeProvider(packOutput: PackOutput, future: CompletableFuture secondary { +dustOrIngot(RagiumMaterial.Metal.GOLD) } result { +RagiumItems.getParts(HTMachineType.CHEMICAL) } }.save(exporter) - // Iron + Coal -> Sooty Iron + // Iron + Coals -> Sooty Iron RagiumRecipeBuilders.alloying { primary { +dustOrIngot(RagiumMaterial.Metal.IRON) } - secondary { - items { - +Items.COAL - +Items.CHARCOAL - } - } + secondary { +holderSet(RagiumTags.Items.COALS) } result { +RagiumItems.getOrThrow(HTItemPart.INGOT, RagiumMaterial.Metal.SOOTY_IRON) } recipeId suffix "_by_coals" }.save(exporter) diff --git a/src/data/kotlin/hiiragi283/ragium/data/recipe/RagiumMechanicalRecipeProvider.kt b/src/data/kotlin/hiiragi283/ragium/data/recipe/RagiumMechanicalRecipeProvider.kt index 3d2d80035a..1391b637e6 100644 --- a/src/data/kotlin/hiiragi283/ragium/data/recipe/RagiumMechanicalRecipeProvider.kt +++ b/src/data/kotlin/hiiragi283/ragium/data/recipe/RagiumMechanicalRecipeProvider.kt @@ -293,6 +293,7 @@ class RagiumMechanicalRecipeProvider(packOutput: PackOutput, future: Completable ingredient { +holderSet(CommonTagPrefixes.DUST, fuel) } result { +baseItem } recipeId suffix "_from_dust" + condition { itemTagPresent(CommonTagPrefixes.DUST, fuel) } }.save(exporter) } setOf( diff --git a/src/data/kotlin/hiiragi283/ragium/data/tag/RagiumItemTagsProvider.kt b/src/data/kotlin/hiiragi283/ragium/data/tag/RagiumItemTagsProvider.kt index 511d536919..5fa69c01fb 100644 --- a/src/data/kotlin/hiiragi283/ragium/data/tag/RagiumItemTagsProvider.kt +++ b/src/data/kotlin/hiiragi283/ragium/data/tag/RagiumItemTagsProvider.kt @@ -63,6 +63,10 @@ class RagiumItemTagsProvider(output: PackOutput, lookupProvider: CompletableFutu builder(HTCommonTags.Items.SILICON).add(RagiumItems.CRUDE_SILICON) builder(HTCommonTags.Items.STICKY_BALLS).addTag(Tags.Items.SLIME_BALLS) + builder(RagiumTags.Items.COALS) + .add(RagiumItems.BAMBOO_CHARCOAL) + .addItem(Items.CHARCOAL) + .addItem(Items.COAL) builder(RagiumTags.Items.COKES) .addTag(HTCommonTags.Items.COAL_COKE) .addTag(HTCommonTags.Items.PITCH_COKE) diff --git a/src/generated/resources/data/ragium/recipe/alloying/sooty_iron_ingot_by_coals.json b/src/generated/resources/data/ragium/recipe/alloying/sooty_iron_ingot_by_coals.json index af0a2b3939..8b728bc6ca 100644 --- a/src/generated/resources/data/ragium/recipe/alloying/sooty_iron_ingot_by_coals.json +++ b/src/generated/resources/data/ragium/recipe/alloying/sooty_iron_ingot_by_coals.json @@ -16,10 +16,7 @@ }, "secondary_ingredient": { "count": 1, - "items": [ - "minecraft:coal", - "minecraft:charcoal" - ] + "items": "#ragium:coals" }, "time": 200 } \ No newline at end of file diff --git a/src/generated/resources/data/ragium/recipe/compressing/charcoal_from_dust.json b/src/generated/resources/data/ragium/recipe/compressing/charcoal_from_dust.json index 431aa34133..4f975104f9 100644 --- a/src/generated/resources/data/ragium/recipe/compressing/charcoal_from_dust.json +++ b/src/generated/resources/data/ragium/recipe/compressing/charcoal_from_dust.json @@ -1,4 +1,13 @@ { + "neoforge:conditions": [ + { + "type": "neoforge:not", + "value": { + "type": "neoforge:tag_empty", + "tag": "c:dusts/charcoal" + } + } + ], "type": "ragium:compressing", "ingredient": { "count": 1, diff --git a/src/generated/resources/data/ragium/recipe/compressing/coal_coke_from_dust.json b/src/generated/resources/data/ragium/recipe/compressing/coal_coke_from_dust.json index 20518d5f1b..81188f583b 100644 --- a/src/generated/resources/data/ragium/recipe/compressing/coal_coke_from_dust.json +++ b/src/generated/resources/data/ragium/recipe/compressing/coal_coke_from_dust.json @@ -1,4 +1,13 @@ { + "neoforge:conditions": [ + { + "type": "neoforge:not", + "value": { + "type": "neoforge:tag_empty", + "tag": "c:dusts/coal_coke" + } + } + ], "type": "ragium:compressing", "ingredient": { "count": 1, diff --git a/src/generated/resources/data/ragium/recipe/compressing/coal_from_dust.json b/src/generated/resources/data/ragium/recipe/compressing/coal_from_dust.json index f2b1af738e..f075a444e2 100644 --- a/src/generated/resources/data/ragium/recipe/compressing/coal_from_dust.json +++ b/src/generated/resources/data/ragium/recipe/compressing/coal_from_dust.json @@ -1,4 +1,13 @@ { + "neoforge:conditions": [ + { + "type": "neoforge:not", + "value": { + "type": "neoforge:tag_empty", + "tag": "c:dusts/coal" + } + } + ], "type": "ragium:compressing", "ingredient": { "count": 1, diff --git a/src/generated/resources/data/ragium/tags/item/coals.json b/src/generated/resources/data/ragium/tags/item/coals.json new file mode 100644 index 0000000000..1a177d588f --- /dev/null +++ b/src/generated/resources/data/ragium/tags/item/coals.json @@ -0,0 +1,7 @@ +{ + "values": [ + "ragium:bamboo_charcoal", + "minecraft:charcoal", + "minecraft:coal" + ] +} \ No newline at end of file diff --git a/src/lib/kotlin/hiiragi283/lib/data/ConditionBuilder.kt b/src/lib/kotlin/hiiragi283/lib/data/ConditionBuilder.kt index fff24ee568..e9cb6bc0fb 100644 --- a/src/lib/kotlin/hiiragi283/lib/data/ConditionBuilder.kt +++ b/src/lib/kotlin/hiiragi283/lib/data/ConditionBuilder.kt @@ -1,5 +1,7 @@ package hiiragi283.lib.data +import hiiragi283.lib.tag.HTMaterialLike +import hiiragi283.lib.tag.HTTagPrefix import hiiragi283.lib.util.HTBuilderMarker import net.minecraft.resources.ResourceKey import net.minecraft.tags.TagKey @@ -64,4 +66,12 @@ value class ConditionBuilder(private val conditions: MutableList) { operator fun FeatureFlagSet.unaryPlus() { +NeoForgeConditions.featureFlagsEnabled(this) } + + /** + * [TagKey]が登録されているか判定する[ICondition]を追加します。 + * @since 26.1.7 + */ + fun itemTagPresent(prefix: HTTagPrefix, material: HTMaterialLike) { + +prefix.itemTagKey(material) + } } diff --git a/src/lib/kotlin/hiiragi283/ragium/api/tag/RagiumTags.kt b/src/lib/kotlin/hiiragi283/ragium/api/tag/RagiumTags.kt index e424387313..b45b1ee92d 100644 --- a/src/lib/kotlin/hiiragi283/ragium/api/tag/RagiumTags.kt +++ b/src/lib/kotlin/hiiragi283/ragium/api/tag/RagiumTags.kt @@ -40,6 +40,12 @@ data object RagiumTags { * @since 26.1.0 */ data object Items { + /** + * @since 26.1.7 + */ + @JvmField + val COALS: TagKey = create("coals") + /** * @since 26.1.7 */ From 6ffed6612b7dc51433678370034bd896eaacb568 Mon Sep 17 00:00:00 2001 From: Hiiragi Russell Tsubasa <97942736+Hiiragi283@users.noreply.github.com> Date: Fri, 18 Sep 2026 22:07:51 +0900 Subject: [PATCH 3/3] =?UTF-8?q?feat:=20=E6=96=B0=E3=81=97=E3=81=84?= =?UTF-8?q?=E3=82=A2=E3=82=A4=E3=83=86=E3=83=A0=E3=82=92=E8=BF=BD=E5=8A=A0?= =?UTF-8?q?=20-=20Silicon=20Wafer=20/=20=E3=82=B7=E3=83=AA=E3=82=B3?= =?UTF-8?q?=E3=83=B3=E3=82=A6=E3=82=A7=E3=83=8F=20-=20Circuit=20Chip=20/?= =?UTF-8?q?=20=E5=9B=9E=E8=B7=AF=E3=83=81=E3=83=83=E3=83=97=20-=20Circuit?= =?UTF-8?q?=20Board=20/=20=E5=9B=9E=E8=B7=AF=E5=9F=BA=E6=9D=BF=20-=20Elect?= =?UTF-8?q?ric=20Circuit=20/=20=E9=9B=BB=E5=AD=90=E5=9B=9E=E8=B7=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/lang/RagiumEnglishLangProvider.kt | 4 + .../data/lang/RagiumJapaneseLangProvider.kt | 4 + .../data/recipe/RagiumCommonRecipeProvider.kt | 73 ++++++++++++++++++- .../assets/ragium/items/circuit_board.json | 6 ++ .../assets/ragium/items/circuit_chip.json | 6 ++ .../assets/ragium/items/electric_circuit.json | 6 ++ .../assets/ragium/items/silicon_wafer.json | 6 ++ .../resources/assets/ragium/lang/en_us.json | 4 + .../resources/assets/ragium/lang/ja_jp.json | 4 + .../ragium/models/item/circuit_board.json | 6 ++ .../ragium/models/item/circuit_chip.json | 6 ++ .../ragium/models/item/electric_circuit.json | 6 ++ .../ragium/models/item/silicon_wafer.json | 6 ++ .../ragium/recipe/alloying/circuit_board.json | 22 ++++++ .../ragium/recipe/alloying/silicon_wafer.json | 16 ++++ .../recipe/assembling/electric_circuit.json | 16 ++++ .../assembling/electronics_machine_parts.json | 16 ++++ ...ctronics_machine_parts_by_black_metal.json | 16 ++++ .../ragium/recipe/cutting/circuit_chip.json | 12 +++ .../ragium/recipe/freezing/plastic_plate.json | 12 +++ .../ragium/recipe/reacting/plastic_plate.json | 16 ++++ .../ragium/common/item/RagiumItems.kt | 12 +++ 22 files changed, 274 insertions(+), 1 deletion(-) create mode 100644 src/generated/resources/assets/ragium/items/circuit_board.json create mode 100644 src/generated/resources/assets/ragium/items/circuit_chip.json create mode 100644 src/generated/resources/assets/ragium/items/electric_circuit.json create mode 100644 src/generated/resources/assets/ragium/items/silicon_wafer.json create mode 100644 src/generated/resources/assets/ragium/models/item/circuit_board.json create mode 100644 src/generated/resources/assets/ragium/models/item/circuit_chip.json create mode 100644 src/generated/resources/assets/ragium/models/item/electric_circuit.json create mode 100644 src/generated/resources/assets/ragium/models/item/silicon_wafer.json create mode 100644 src/generated/resources/data/ragium/recipe/alloying/circuit_board.json create mode 100644 src/generated/resources/data/ragium/recipe/alloying/silicon_wafer.json create mode 100644 src/generated/resources/data/ragium/recipe/assembling/electric_circuit.json create mode 100644 src/generated/resources/data/ragium/recipe/assembling/electronics_machine_parts.json create mode 100644 src/generated/resources/data/ragium/recipe/assembling/electronics_machine_parts_by_black_metal.json create mode 100644 src/generated/resources/data/ragium/recipe/cutting/circuit_chip.json create mode 100644 src/generated/resources/data/ragium/recipe/freezing/plastic_plate.json create mode 100644 src/generated/resources/data/ragium/recipe/reacting/plastic_plate.json diff --git a/src/data/kotlin/hiiragi283/ragium/data/lang/RagiumEnglishLangProvider.kt b/src/data/kotlin/hiiragi283/ragium/data/lang/RagiumEnglishLangProvider.kt index 0646cb1db1..71e9c2276a 100644 --- a/src/data/kotlin/hiiragi283/ragium/data/lang/RagiumEnglishLangProvider.kt +++ b/src/data/kotlin/hiiragi283/ragium/data/lang/RagiumEnglishLangProvider.kt @@ -109,6 +109,10 @@ class RagiumEnglishLangProvider(output: PackOutput) : add(RagiumItems.SPLASH_BOTTLE, "Splash Bottle") add(RagiumItems.LINGERING_BOTTLE, "Lingering Bottle") add(RagiumItems.CRUDE_SILICON, "Crude Silicon") + add(RagiumItems.SILICON_WAFER, "Silicon Wafer") + add(RagiumItems.CIRCUIT_CHIP, "Circuit Chip") + add(RagiumItems.CIRCUIT_BOARD, "Circuit Board") + add(RagiumItems.ELECTRIC_CIRCUIT, "Electric Circuit") add(RagiumItems.ELDER_HEART, "Elder Heart") add(RagiumItems.WITHER_DOLL, "Wither Doll") add(RagiumItems.WITHER_STAR, "Wither Star") diff --git a/src/data/kotlin/hiiragi283/ragium/data/lang/RagiumJapaneseLangProvider.kt b/src/data/kotlin/hiiragi283/ragium/data/lang/RagiumJapaneseLangProvider.kt index bc473526b0..8ebb7ec016 100644 --- a/src/data/kotlin/hiiragi283/ragium/data/lang/RagiumJapaneseLangProvider.kt +++ b/src/data/kotlin/hiiragi283/ragium/data/lang/RagiumJapaneseLangProvider.kt @@ -105,6 +105,10 @@ class RagiumJapaneseLangProvider(output: PackOutput) : add(RagiumItems.SPLASH_BOTTLE, "スプラッシュ瓶") add(RagiumItems.LINGERING_BOTTLE, "残留瓶") add(RagiumItems.CRUDE_SILICON, "粗製シリコン") + add(RagiumItems.SILICON_WAFER, "シリコンウェハ") + add(RagiumItems.CIRCUIT_CHIP, "回路チップ") + add(RagiumItems.CIRCUIT_BOARD, "回路基板") + add(RagiumItems.ELECTRIC_CIRCUIT, "電子回路") add(RagiumItems.ELDER_HEART, "エルダーの心臓") add(RagiumItems.WITHER_DOLL, "ウィザー人形") add(RagiumItems.WITHER_STAR, "ウィザースター") diff --git a/src/data/kotlin/hiiragi283/ragium/data/recipe/RagiumCommonRecipeProvider.kt b/src/data/kotlin/hiiragi283/ragium/data/recipe/RagiumCommonRecipeProvider.kt index e388741e1f..ba60c0f74d 100644 --- a/src/data/kotlin/hiiragi283/ragium/data/recipe/RagiumCommonRecipeProvider.kt +++ b/src/data/kotlin/hiiragi283/ragium/data/recipe/RagiumCommonRecipeProvider.kt @@ -7,6 +7,7 @@ import hiiragi283.ragium.api.RagiumAPI import hiiragi283.ragium.api.data.recipe.builder.RagiumRecipeBuilders import hiiragi283.ragium.api.material.HTItemPart import hiiragi283.ragium.api.material.RagiumMaterial +import hiiragi283.ragium.api.tag.HTMachineType import hiiragi283.ragium.api.tag.RagiumTags import hiiragi283.ragium.common.block.RagiumBlocks import hiiragi283.ragium.common.fluid.RagiumFluids @@ -152,7 +153,25 @@ class RagiumCommonRecipeProvider(packOutput: PackOutput, future: CompletableFutu } recipeId suffix "_from_naphtha" }.save(exporter) - // Naphtha + O2 -> Plastic TODO + // Naphtha -> Plastic + RagiumRecipeBuilders.freezing { + ingredient { + +holderSet(RagiumFluids.NAPHTHA) + amount /= 2 + } + result { +RagiumItems.PLASTIC_PLATE } + }.save(exporter) + RagiumRecipeBuilders.reacting { + primaryIngredient { + +holderSet(RagiumFluids.NAPHTHA) + amount /= 2 + } + secondaryIngredient { + +holderSet(RagiumFluids.OXYGEN) + amount /= 4 + } + itemResult { +RagiumItems.PLASTIC_PLATE } + }.save(exporter) // Naphtha + Redstone -> Anti-rust Oil RagiumRecipeBuilders.mixing { itemIngredient { +holderSet(CommonTagPrefixes.DUST, RagiumMaterial.Mineral.REDSTONE) } @@ -353,6 +372,7 @@ class RagiumCommonRecipeProvider(packOutput: PackOutput, future: CompletableFutu result { +RagiumItems.CRUDE_SILICON } recipeId suffix "_from_amethyst_block" }.save(exporter) + // Crude Si + HCl -> Si Dust RagiumRecipeBuilders.bathing { itemIngredient { +holderSet(HTCommonTags.Items.SILICON) } @@ -362,5 +382,56 @@ class RagiumCommonRecipeProvider(packOutput: PackOutput, future: CompletableFutu } result { +RagiumItems.getOrThrow(HTItemPart.DUST, RagiumMaterial.Other.SILICON) } }.save(exporter) + // Si Dust + Redstone -> Silicon Wafer + RagiumRecipeBuilders.alloying { + primary { + +holderSet(CommonTagPrefixes.DUST, RagiumMaterial.Other.SILICON) + count = 8 + } + secondary { +holderSet(CommonTagPrefixes.DUST, RagiumMaterial.Mineral.RAGINITE) } + result { +RagiumItems.SILICON_WAFER } + }.save(exporter) + // Silicon Wafer -> Circuit Chip + RagiumRecipeBuilders.cutting { + ingredient { items { +RagiumItems.SILICON_WAFER } } + result { + +RagiumItems.CIRCUIT_CHIP + count = 8 + } + }.save(exporter) + + // Plastic + Gold Dust -> Circuit Board + RagiumRecipeBuilders.alloying { + primary { +holderSet(HTCommonTags.Items.PLASTICS) } + secondary { +dustOrIngot(RagiumMaterial.Metal.GOLD) } + result { +RagiumItems.CIRCUIT_BOARD } + }.save(exporter) + // Circuit Chip + Circuit Board -> Electric Circuit + RagiumRecipeBuilders.assembling { + primary { + items { +RagiumItems.CIRCUIT_CHIP } + count = 2 + } + secondary { items { +RagiumItems.CIRCUIT_BOARD } } + result { +RagiumItems.ELECTRIC_CIRCUIT } + }.save(exporter) + // Machine Parts + RagiumRecipeBuilders.assembling { + primary { + +holderSet(CommonTagPrefixes.INGOT, RagiumMaterial.Metal.BLACK_STEEL) + count = 4 + } + secondary { items { +RagiumItems.ELECTRIC_CIRCUIT } } + result { +RagiumItems.getParts(HTMachineType.ELECTRONICS) } + recipeId suffix "_by_black_metal" + }.save(exporter) + RagiumRecipeBuilders.assembling { + primary { + +holderSet(CommonTagPrefixes.INGOT, RagiumMaterial.Metal.VOID_METAL) + count = 2 + } + secondary { items { +RagiumItems.ELECTRIC_CIRCUIT } } + result { +RagiumItems.getParts(HTMachineType.ELECTRONICS) } + }.save(exporter) } } diff --git a/src/generated/resources/assets/ragium/items/circuit_board.json b/src/generated/resources/assets/ragium/items/circuit_board.json new file mode 100644 index 0000000000..8ee04d3701 --- /dev/null +++ b/src/generated/resources/assets/ragium/items/circuit_board.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "ragium:item/circuit_board" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/ragium/items/circuit_chip.json b/src/generated/resources/assets/ragium/items/circuit_chip.json new file mode 100644 index 0000000000..2557a36f8a --- /dev/null +++ b/src/generated/resources/assets/ragium/items/circuit_chip.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "ragium:item/circuit_chip" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/ragium/items/electric_circuit.json b/src/generated/resources/assets/ragium/items/electric_circuit.json new file mode 100644 index 0000000000..0b3682edb2 --- /dev/null +++ b/src/generated/resources/assets/ragium/items/electric_circuit.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "ragium:item/electric_circuit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/ragium/items/silicon_wafer.json b/src/generated/resources/assets/ragium/items/silicon_wafer.json new file mode 100644 index 0000000000..48940be386 --- /dev/null +++ b/src/generated/resources/assets/ragium/items/silicon_wafer.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "ragium:item/silicon_wafer" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/ragium/lang/en_us.json b/src/generated/resources/assets/ragium/lang/en_us.json index 1275125a84..658f41d7a4 100644 --- a/src/generated/resources/assets/ragium/lang/en_us.json +++ b/src/generated/resources/assets/ragium/lang/en_us.json @@ -165,6 +165,8 @@ "item.ragium.charcoal_dust": "Charcoal Dust", "item.ragium.chemical_machine_parts": "Machine Parts (Chemical)", "item.ragium.chloride_bucket": "Chlorine Bucket", + "item.ragium.circuit_board": "Circuit Board", + "item.ragium.circuit_chip": "Circuit Chip", "item.ragium.coal_coke": "Coal Coke", "item.ragium.coal_dust": "Coal Dust", "item.ragium.coal_tar_bucket": "Coal Tar Bucket", @@ -177,6 +179,7 @@ "item.ragium.diamond_gear": "Diamond Gear", "item.ragium.echo_dust": "Echo Dust", "item.ragium.elder_heart": "Elder Heart", + "item.ragium.electric_circuit": "Electric Circuit", "item.ragium.electronics_machine_parts": "Machine Parts (Electronics)", "item.ragium.emerald_dust": "Emerald Dust", "item.ragium.emerald_gear": "Emerald Gear", @@ -230,6 +233,7 @@ "item.ragium.red_dye_bucket": "Red Dye Bucket", "item.ragium.salt_dust": "Salt Dust", "item.ragium.silicon_dust": "Silicon Dust", + "item.ragium.silicon_wafer": "Silicon Wafer", "item.ragium.sodium_hydroxide_solution_bucket": "Sodium Hydroxide Solution Bucket", "item.ragium.sooty_iron_axe": "Sooty Iron Axe", "item.ragium.sooty_iron_hoe": "Sooty Iron Hoe", diff --git a/src/generated/resources/assets/ragium/lang/ja_jp.json b/src/generated/resources/assets/ragium/lang/ja_jp.json index 08908b4de9..d9f4e3274e 100644 --- a/src/generated/resources/assets/ragium/lang/ja_jp.json +++ b/src/generated/resources/assets/ragium/lang/ja_jp.json @@ -165,6 +165,8 @@ "item.ragium.charcoal_dust": "木炭の粉", "item.ragium.chemical_machine_parts": "機械部品 (化学)", "item.ragium.chloride_bucket": "塩素入りバケツ", + "item.ragium.circuit_board": "回路基板", + "item.ragium.circuit_chip": "回路チップ", "item.ragium.coal_coke": "石炭コークス", "item.ragium.coal_dust": "石炭の粉", "item.ragium.coal_tar_bucket": "石炭タール入りバケツ", @@ -177,6 +179,7 @@ "item.ragium.diamond_gear": "ダイヤモンドの歯車", "item.ragium.echo_dust": "残響の粉", "item.ragium.elder_heart": "エルダーの心臓", + "item.ragium.electric_circuit": "電子回路", "item.ragium.electronics_machine_parts": "機械部品 (電子)", "item.ragium.emerald_dust": "エメラルドの粉", "item.ragium.emerald_gear": "エメラルドの歯車", @@ -230,6 +233,7 @@ "item.ragium.red_dye_bucket": "赤色の染料入りバケツ", "item.ragium.salt_dust": "食塩の粉", "item.ragium.silicon_dust": "シリコンの粉", + "item.ragium.silicon_wafer": "シリコンウェハ", "item.ragium.sodium_hydroxide_solution_bucket": "水酸化ナトリウム水溶液入りバケツ", "item.ragium.sooty_iron_axe": "煤鉄の斧", "item.ragium.sooty_iron_hoe": "煤鉄のクワ", diff --git a/src/generated/resources/assets/ragium/models/item/circuit_board.json b/src/generated/resources/assets/ragium/models/item/circuit_board.json new file mode 100644 index 0000000000..7ab696f845 --- /dev/null +++ b/src/generated/resources/assets/ragium/models/item/circuit_board.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "ragium:item/circuit_board" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/ragium/models/item/circuit_chip.json b/src/generated/resources/assets/ragium/models/item/circuit_chip.json new file mode 100644 index 0000000000..8dc75a31d3 --- /dev/null +++ b/src/generated/resources/assets/ragium/models/item/circuit_chip.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "ragium:item/circuit_chip" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/ragium/models/item/electric_circuit.json b/src/generated/resources/assets/ragium/models/item/electric_circuit.json new file mode 100644 index 0000000000..86ffd021d6 --- /dev/null +++ b/src/generated/resources/assets/ragium/models/item/electric_circuit.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "ragium:item/electric_circuit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/ragium/models/item/silicon_wafer.json b/src/generated/resources/assets/ragium/models/item/silicon_wafer.json new file mode 100644 index 0000000000..92239745f0 --- /dev/null +++ b/src/generated/resources/assets/ragium/models/item/silicon_wafer.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "ragium:item/silicon_wafer" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/ragium/recipe/alloying/circuit_board.json b/src/generated/resources/data/ragium/recipe/alloying/circuit_board.json new file mode 100644 index 0000000000..d43471fe39 --- /dev/null +++ b/src/generated/resources/data/ragium/recipe/alloying/circuit_board.json @@ -0,0 +1,22 @@ +{ + "type": "ragium:alloying", + "primary_ingredient": { + "count": 1, + "items": "#c:plastics" + }, + "result": { + "count": 1, + "id": "ragium:circuit_board" + }, + "secondary_ingredient": { + "count": 1, + "items": { + "type": "neoforge:or", + "values": [ + "#c:dusts/gold", + "#c:ingots/gold" + ] + } + }, + "time": 200 +} \ No newline at end of file diff --git a/src/generated/resources/data/ragium/recipe/alloying/silicon_wafer.json b/src/generated/resources/data/ragium/recipe/alloying/silicon_wafer.json new file mode 100644 index 0000000000..ab9f028eef --- /dev/null +++ b/src/generated/resources/data/ragium/recipe/alloying/silicon_wafer.json @@ -0,0 +1,16 @@ +{ + "type": "ragium:alloying", + "primary_ingredient": { + "count": 8, + "items": "#c:dusts/silicon" + }, + "result": { + "count": 1, + "id": "ragium:silicon_wafer" + }, + "secondary_ingredient": { + "count": 1, + "items": "#c:dusts/raginite" + }, + "time": 200 +} \ No newline at end of file diff --git a/src/generated/resources/data/ragium/recipe/assembling/electric_circuit.json b/src/generated/resources/data/ragium/recipe/assembling/electric_circuit.json new file mode 100644 index 0000000000..177e5a8d5a --- /dev/null +++ b/src/generated/resources/data/ragium/recipe/assembling/electric_circuit.json @@ -0,0 +1,16 @@ +{ + "type": "ragium:assembling", + "primary_ingredient": { + "count": 2, + "items": "ragium:circuit_chip" + }, + "result": { + "count": 1, + "id": "ragium:electric_circuit" + }, + "secondary_ingredient": { + "count": 1, + "items": "ragium:circuit_board" + }, + "time": 200 +} \ No newline at end of file diff --git a/src/generated/resources/data/ragium/recipe/assembling/electronics_machine_parts.json b/src/generated/resources/data/ragium/recipe/assembling/electronics_machine_parts.json new file mode 100644 index 0000000000..d2d5622e41 --- /dev/null +++ b/src/generated/resources/data/ragium/recipe/assembling/electronics_machine_parts.json @@ -0,0 +1,16 @@ +{ + "type": "ragium:assembling", + "primary_ingredient": { + "count": 2, + "items": "#c:ingots/void_metal" + }, + "result": { + "count": 1, + "id": "ragium:electronics_machine_parts" + }, + "secondary_ingredient": { + "count": 1, + "items": "ragium:electric_circuit" + }, + "time": 200 +} \ No newline at end of file diff --git a/src/generated/resources/data/ragium/recipe/assembling/electronics_machine_parts_by_black_metal.json b/src/generated/resources/data/ragium/recipe/assembling/electronics_machine_parts_by_black_metal.json new file mode 100644 index 0000000000..dde74d8df4 --- /dev/null +++ b/src/generated/resources/data/ragium/recipe/assembling/electronics_machine_parts_by_black_metal.json @@ -0,0 +1,16 @@ +{ + "type": "ragium:assembling", + "primary_ingredient": { + "count": 4, + "items": "#c:ingots/black_steel" + }, + "result": { + "count": 1, + "id": "ragium:electronics_machine_parts" + }, + "secondary_ingredient": { + "count": 1, + "items": "ragium:electric_circuit" + }, + "time": 200 +} \ No newline at end of file diff --git a/src/generated/resources/data/ragium/recipe/cutting/circuit_chip.json b/src/generated/resources/data/ragium/recipe/cutting/circuit_chip.json new file mode 100644 index 0000000000..41ce7c8548 --- /dev/null +++ b/src/generated/resources/data/ragium/recipe/cutting/circuit_chip.json @@ -0,0 +1,12 @@ +{ + "type": "ragium:cutting", + "ingredient": { + "count": 1, + "items": "ragium:silicon_wafer" + }, + "results": { + "count": 8, + "id": "ragium:circuit_chip" + }, + "time": 200 +} \ No newline at end of file diff --git a/src/generated/resources/data/ragium/recipe/freezing/plastic_plate.json b/src/generated/resources/data/ragium/recipe/freezing/plastic_plate.json new file mode 100644 index 0000000000..b3b05987fd --- /dev/null +++ b/src/generated/resources/data/ragium/recipe/freezing/plastic_plate.json @@ -0,0 +1,12 @@ +{ + "type": "ragium:freezing", + "ingredient": { + "amount": 500, + "fluids": "#c:naphtha" + }, + "result": { + "count": 1, + "id": "ragium:plastic_plate" + }, + "time": 200 +} \ No newline at end of file diff --git a/src/generated/resources/data/ragium/recipe/reacting/plastic_plate.json b/src/generated/resources/data/ragium/recipe/reacting/plastic_plate.json new file mode 100644 index 0000000000..901e54265e --- /dev/null +++ b/src/generated/resources/data/ragium/recipe/reacting/plastic_plate.json @@ -0,0 +1,16 @@ +{ + "type": "ragium:reacting", + "item_result": { + "count": 1, + "id": "ragium:plastic_plate" + }, + "primary_ingredient": { + "amount": 500, + "fluids": "#c:naphtha" + }, + "secondary_ingredient": { + "amount": 250, + "fluids": "#c:oxygen" + }, + "time": 200 +} \ No newline at end of file diff --git a/src/main/kotlin/hiiragi283/ragium/common/item/RagiumItems.kt b/src/main/kotlin/hiiragi283/ragium/common/item/RagiumItems.kt index 62cdb859fd..94937f8957 100644 --- a/src/main/kotlin/hiiragi283/ragium/common/item/RagiumItems.kt +++ b/src/main/kotlin/hiiragi283/ragium/common/item/RagiumItems.kt @@ -139,6 +139,18 @@ data object RagiumItems { @JvmField val CRUDE_SILICON: HTSimpleDeferredItem = REGISTER.registerSimpleItem("crude_silicon") + @JvmField + val SILICON_WAFER: HTSimpleDeferredItem = REGISTER.registerSimpleItem("silicon_wafer") + + @JvmField + val CIRCUIT_CHIP: HTSimpleDeferredItem = REGISTER.registerSimpleItem("circuit_chip") + + @JvmField + val CIRCUIT_BOARD: HTSimpleDeferredItem = REGISTER.registerSimpleItem("circuit_board") + + @JvmField + val ELECTRIC_CIRCUIT: HTSimpleDeferredItem = REGISTER.registerSimpleItem("electric_circuit") + // Arcane @JvmField val ELDER_HEART: HTSimpleDeferredItem = REGISTER.registerSimpleItem("elder_heart") { it.rarity(Rarity.UNCOMMON) }