Skip to content

Commit 1a92936

Browse files
committed
- レシピ生成周りを改変
1 parent b1386ba commit 1a92936

File tree

138 files changed

+156
-306
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

138 files changed

+156
-306
lines changed

src/generated/resources/assets/ragium/lang/en_us.json

+1
Original file line numberDiff line numberDiff line change
@@ -271,6 +271,7 @@
271271
"tooltip.ragium.fluid.capacity": "Capacity: %s mb",
272272
"tooltip.ragium.machine.cost": "- Process Cost: %s FE/times",
273273
"tooltip.ragium.machine.name": "- Machine Name: %s",
274+
"tooltip.ragium.machine.owner": "- Owner: %s",
274275
"tooltip.ragium.machine.preview": "- Show Preview: %s",
275276
"tooltip.ragium.machine.tick_rate": "- Tick Rate: %s ticks (%s sec)",
276277
"tooltip.ragium.machine.tier": "- Tier: %s",

src/generated/resources/assets/ragium/lang/ja_jp.json

+1
Original file line numberDiff line numberDiff line change
@@ -271,6 +271,7 @@
271271
"tooltip.ragium.fluid.capacity": "容量: %s mb",
272272
"tooltip.ragium.machine.cost": "- 処理コスト: %s FE/回",
273273
"tooltip.ragium.machine.name": "- 機械: %s",
274+
"tooltip.ragium.machine.owner": "- 所有者: %s",
274275
"tooltip.ragium.machine.preview": "- プレビューの表示: %s",
275276
"tooltip.ragium.machine.tick_rate": "- 処理時間: %s ティック(%s秒)",
276277
"tooltip.ragium.machine.tier": "- ティア: %s",

src/main/kotlin/hiiragi283/ragium/api/data/recipe/HTBreweryRecipeBuilder.kt

-61
This file was deleted.

src/main/kotlin/hiiragi283/ragium/api/data/recipe/HTEnchanterRecipeBuilder.kt

-55
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
package hiiragi283.ragium.api.data.recipe
2+
3+
import hiiragi283.ragium.api.extension.commonTag
4+
import hiiragi283.ragium.api.material.HTMaterialKey
5+
import hiiragi283.ragium.api.material.HTTagPrefix
6+
import hiiragi283.ragium.common.init.RagiumVirtualFluids
7+
import net.minecraft.tags.TagKey
8+
import net.minecraft.world.item.Item
9+
import net.minecraft.world.item.crafting.Ingredient
10+
import net.minecraft.world.level.ItemLike
11+
import net.minecraft.world.level.material.Fluid
12+
import net.neoforged.neoforge.common.Tags
13+
import net.neoforged.neoforge.common.crafting.ICustomIngredient
14+
import net.neoforged.neoforge.common.crafting.SizedIngredient
15+
import net.neoforged.neoforge.fluids.FluidType
16+
import net.neoforged.neoforge.fluids.crafting.FluidIngredient
17+
import net.neoforged.neoforge.fluids.crafting.SizedFluidIngredient
18+
import net.neoforged.neoforge.registries.DeferredHolder
19+
20+
data object HTIngredientBuilder {
21+
// Item //
22+
23+
@JvmStatic
24+
fun item(item: ItemLike, count: Int = 1): SizedIngredient = item(Ingredient.of(item), count)
25+
26+
@JvmStatic
27+
fun item(prefix: HTTagPrefix, material: HTMaterialKey, count: Int = 1): SizedIngredient = item(prefix.createTag(material), count)
28+
29+
@JvmStatic
30+
fun item(tagKey: TagKey<Item>, count: Int = 1): SizedIngredient = item(Ingredient.of(tagKey), count)
31+
32+
@JvmStatic
33+
fun item(ingredient: ICustomIngredient, count: Int = 1): SizedIngredient = item(ingredient.toVanilla(), count)
34+
35+
@JvmStatic
36+
fun item(ingredient: Ingredient, count: Int = 1): SizedIngredient = SizedIngredient(ingredient, count)
37+
38+
// Fluid //
39+
40+
@JvmStatic
41+
fun fluid(content: RagiumVirtualFluids, amount: Int = FluidType.BUCKET_VOLUME): SizedFluidIngredient =
42+
fluid(content.fluidHolder, amount)
43+
44+
@JvmStatic
45+
fun fluid(fluid: DeferredHolder<Fluid, *>, amount: Int = FluidType.BUCKET_VOLUME): SizedFluidIngredient = fluid(fluid.commonTag, amount)
46+
47+
@JvmStatic
48+
fun fluid(fluid: Fluid, amount: Int = FluidType.BUCKET_VOLUME): SizedFluidIngredient = fluid(FluidIngredient.of(fluid), amount)
49+
50+
@JvmStatic
51+
fun fluid(tagKey: TagKey<Fluid>, amount: Int = FluidType.BUCKET_VOLUME): SizedFluidIngredient =
52+
fluid(FluidIngredient.tag(tagKey), amount)
53+
54+
@JvmStatic
55+
fun fluid(ingredient: FluidIngredient, amount: Int = FluidType.BUCKET_VOLUME): SizedFluidIngredient =
56+
SizedFluidIngredient(ingredient, amount)
57+
58+
@JvmStatic
59+
fun water(amount: Int = FluidType.BUCKET_VOLUME): SizedFluidIngredient = fluid(Tags.Fluids.WATER, amount)
60+
61+
@JvmStatic
62+
fun milk(amount: Int = FluidType.BUCKET_VOLUME): SizedFluidIngredient = fluid(Tags.Fluids.MILK, amount)
63+
}

src/main/kotlin/hiiragi283/ragium/api/data/recipe/HTMachineRecipeBuilderBase.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ abstract class HTMachineRecipeBuilderBase<T : HTMachineRecipeBuilderBase<T, R>,
111111

112112
protected abstract val prefix: String
113113

114-
private fun fixId(id: ResourceLocation): ResourceLocation = RagiumAPI.wrapId(id.withPrefix("$prefix/"))
114+
private fun fixId(id: ResourceLocation): ResourceLocation = id.withPrefix("$prefix/")
115115

116116
// Export //
117117

src/main/kotlin/hiiragi283/ragium/api/data/recipe/HTMixerRecipeBuilder.kt

-59
This file was deleted.

src/main/kotlin/hiiragi283/ragium/api/recipe/HTDistilleryRecipe.kt

-56
This file was deleted.

src/main/kotlin/hiiragi283/ragium/api/recipe/HTExtractorRecipe.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ class HTExtractorRecipe(
3232
.group(
3333
HTRecipeCodecs.group(),
3434
HTRecipeCodecs.ITEM_INPUT.forGetter(HTExtractorRecipe::input),
35-
HTItemResult.CODEC.optionalFieldOf("item_output").forGetter(HTExtractorRecipe::itemOutput),
36-
FluidStack.CODEC.optionalFieldOf("fluid_output").forGetter(HTExtractorRecipe::fluidOutput),
35+
HTRecipeCodecs.ITEM_OUTPUT.forGetter(HTExtractorRecipe::itemOutput),
36+
HTRecipeCodecs.FLUID_OUTPUT.forGetter(HTExtractorRecipe::fluidOutput),
3737
).apply(instance, ::HTExtractorRecipe)
3838
}.validate(HTFluidOutputRecipe::validate)
3939

src/main/kotlin/hiiragi283/ragium/api/recipe/HTInfuserRecipe.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ class HTInfuserRecipe(
3535
HTRecipeCodecs.group(),
3636
HTRecipeCodecs.ITEM_INPUT.forGetter(HTInfuserRecipe::itemInput),
3737
HTRecipeCodecs.FLUID_INPUT.forGetter(HTInfuserRecipe::fluidInput),
38-
HTItemResult.CODEC.optionalFieldOf("item_output").forGetter(HTInfuserRecipe::itemOutput),
39-
FluidStack.CODEC.optionalFieldOf("fluid_output").forGetter(HTInfuserRecipe::fluidOutput),
38+
HTRecipeCodecs.ITEM_OUTPUT.forGetter(HTInfuserRecipe::itemOutput),
39+
HTRecipeCodecs.FLUID_OUTPUT.forGetter(HTInfuserRecipe::fluidOutput),
4040
).apply(instance, ::HTInfuserRecipe)
4141
}.validate(HTFluidOutputRecipe::validate)
4242

src/main/kotlin/hiiragi283/ragium/api/recipe/HTMixerRecipe.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ class HTMixerRecipe(
3838
SizedFluidIngredient.FLAT_CODEC
3939
.fieldOf("second_fluidInput")
4040
.forGetter(HTMixerRecipe::secondFluid),
41-
HTItemResult.CODEC.optionalFieldOf("item_output").forGetter(HTMixerRecipe::itemOutput),
42-
FluidStack.CODEC.optionalFieldOf("fluid_output").forGetter(HTMixerRecipe::fluidOutput),
41+
HTRecipeCodecs.ITEM_OUTPUT.forGetter(HTMixerRecipe::itemOutput),
42+
HTRecipeCodecs.FLUID_OUTPUT.forGetter(HTMixerRecipe::fluidOutput),
4343
).apply(instance, ::HTMixerRecipe)
4444
}.validate(HTFluidOutputRecipe::validate)
4545

src/main/kotlin/hiiragi283/ragium/api/recipe/HTRefineryRecipe.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ class HTRefineryRecipe(
3232
.group(
3333
HTRecipeCodecs.group(),
3434
HTRecipeCodecs.FLUID_INPUT.forGetter(HTRefineryRecipe::input),
35-
HTItemResult.CODEC.optionalFieldOf("item_output").forGetter(HTRefineryRecipe::itemOutput),
36-
FluidStack.CODEC.optionalFieldOf("fluid_output").forGetter(HTRefineryRecipe::fluidOutput),
35+
HTRecipeCodecs.ITEM_OUTPUT.forGetter(HTRefineryRecipe::itemOutput),
36+
HTRecipeCodecs.FLUID_OUTPUT.forGetter(HTRefineryRecipe::fluidOutput),
3737
).apply(instance, ::HTRefineryRecipe)
3838
}.validate(HTFluidOutputRecipe::validate)
3939

src/main/kotlin/hiiragi283/ragium/api/recipe/base/HTRecipeCodecs.kt

+2-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package hiiragi283.ragium.api.recipe.base
33
import com.mojang.serialization.Codec
44
import com.mojang.serialization.MapCodec
55
import com.mojang.serialization.codecs.RecordCodecBuilder
6-
import net.minecraft.world.item.ItemStack
76
import net.minecraft.world.item.crafting.Ingredient
87
import net.neoforged.neoforge.common.crafting.SizedIngredient
98
import net.neoforged.neoforge.fluids.FluidStack
@@ -32,8 +31,8 @@ object HTRecipeCodecs {
3231
val CATALYST: MapCodec<Optional<Ingredient>> = Ingredient.CODEC_NONEMPTY.optionalFieldOf("catalyst")
3332

3433
@JvmField
35-
val ITEM_OUTPUT: MapCodec<ItemStack> = ItemStack.CODEC.fieldOf("item_output")
34+
val ITEM_OUTPUT: MapCodec<Optional<HTItemResult>> = HTItemResult.CODEC.optionalFieldOf("item_output")
3635

3736
@JvmField
38-
val FLUID_OUTPUT: MapCodec<FluidStack> = FluidStack.CODEC.fieldOf("fluid_output")
37+
val FLUID_OUTPUT: MapCodec<Optional<FluidStack>> = FluidStack.CODEC.optionalFieldOf("fluid_output")
3938
}

src/main/kotlin/hiiragi283/ragium/common/init/RagiumRecipeSerializers.kt

-4
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,6 @@ object RagiumRecipeSerializers {
4848
val COMPRESSOR: DeferredHolder<RecipeSerializer<*>, HTSingleItemRecipe.Serializer<HTCompressorRecipe>> =
4949
REGISTER.register("compressor") { _: ResourceLocation -> HTSingleItemRecipe.Serializer(::HTCompressorRecipe) }
5050

51-
@JvmField
52-
val DISTILLERY: DeferredHolder<RecipeSerializer<*>, RecipeSerializer<HTDistilleryRecipe>> =
53-
register("distillery", HTDistilleryRecipe.CODEC, HTDistilleryRecipe.STREAM_CODEC)
54-
5551
@JvmField
5652
val ENCHANTER: DeferredHolder<RecipeSerializer<*>, RecipeSerializer<HTEnchanterRecipe>> =
5753
register("enchanter", HTEnchanterRecipe.CODEC, HTEnchanterRecipe.STREAM_CODEC)

0 commit comments

Comments
 (0)