diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/lang/Russian.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/lang/Russian.kt index efd485f3d..d024f6ff0 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/lang/Russian.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/lang/Russian.kt @@ -58,7 +58,7 @@ private fun decoratives(provider: MatteryLanguageProvider) { add(MBlocks.TRITANIUM_TRAPDOOR[color]!!, "description1", FEELING_SAFE_NOW) add(MBlocks.TRITANIUM_TRAPDOOR[color]!!, "description2", "Данный вариант выкрашен в $name") - add(MBlocks.GRILL[color]!!, "$nameAdj мангал-дипломат") + add(MBlocks.GRILL[color]!!, "$name мангал-дипломат") } add(MRegistry.TRITANIUM_PRESSURE_PLATE.block, "Тритановая нажимная пластина") diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/CraftingTableRecipes.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/CraftingTableRecipes.kt index fffb48458..5ba4a2ce6 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/CraftingTableRecipes.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/CraftingTableRecipes.kt @@ -9,6 +9,8 @@ import net.minecraft.world.item.ItemStack import net.minecraft.world.item.Items import net.minecraft.world.item.crafting.Ingredient import net.neoforged.neoforge.common.Tags +import net.neoforged.neoforge.common.conditions.NotCondition +import net.neoforged.neoforge.common.conditions.TagEmptyCondition import ru.dbotthepony.mc.otm.block.entity.MatteryBlockEntity import ru.dbotthepony.mc.otm.config.CablesConfig import ru.dbotthepony.mc.otm.core.ResourceLocation @@ -530,6 +532,7 @@ fun addCraftingTableRecipes(consumer: RecipeOutput) { .build(consumer) val ironRod = ItemTags.create(ResourceLocation("c", "rods/iron")) + var condConsumer = consumer.withConditions(NotCondition(TagEmptyCondition(ironRod))) for ((color, item) in MItems.GRILL) { MatteryRecipe(item, category = RecipeCategory.DECORATIONS) @@ -542,13 +545,13 @@ fun addCraftingTableRecipes(consumer: RecipeOutput) { .rowB(color?.tag) .row(ironRod, ironRod, ironRod) .rowAC(MItemTags.TRITANIUM_INGOTS, MItemTags.TRITANIUM_INGOTS) - .build(consumer, "grill_alt_a/${color?.name?.lowercase() ?: "default"}") + .build(condConsumer, "grill_alt_a/${color?.name?.lowercase() ?: "default"}") MatteryRecipe(item, category = RecipeCategory.DECORATIONS) .rowB(color?.tag) .row(ironRod, ironRod, ironRod) .rowB(MItemTags.TRITANIUM_PLATES) - .build(consumer, "grill_alt_b/${color?.name?.lowercase() ?: "default"}") + .build(condConsumer, "grill_alt_b/${color?.name?.lowercase() ?: "default"}") MatteryRecipe(item, category = RecipeCategory.DECORATIONS) .rowB(color?.tag)