From 1b865d8c5f025aa18e605c4b8435a90147054f18 Mon Sep 17 00:00:00 2001 From: YuRaNnNzZZ Date: Mon, 10 Feb 2025 18:06:20 +0300 Subject: [PATCH 1/2] =?UTF-8?q?=D1=81=D0=B2=D0=B5=D1=82=D0=BB=D0=BE-=D1=81?= =?UTF-8?q?=D0=B5=D1=80=D1=8B=D0=BC=20=D0=BC=D0=B0=D0=BD=D0=B3=D0=B0=D0=BB?= =?UTF-8?q?-=D0=B4=D0=B8=D0=BF=D0=BB=D0=BE=D0=BC=D0=B0=D1=82=20=D0=9E?= =?UTF-8?q?=D0=BA=D1=80=D0=B0=D1=88=D0=B5=D0=BD=D0=BE=20=D0=B2=20=D1=81?= =?UTF-8?q?=D0=B2=D0=B5=D1=82=D0=BB=D0=BE-=D1=81=D0=B5=D1=80=D1=8B=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/data/kotlin/ru/dbotthepony/mc/otm/datagen/lang/Russian.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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, "Тритановая нажимная пластина") From a2c9234501e9e3eae3b1d3050d16e26bcff96922 Mon Sep 17 00:00:00 2001 From: YuRaNnNzZZ Date: Mon, 10 Feb 2025 18:38:28 +0300 Subject: [PATCH 2/2] =?UTF-8?q?=D0=B4=D0=B0=D0=B2=D0=B0=D0=B9=D1=82=D0=B5?= =?UTF-8?q?=20=D0=B8=D1=81=D1=85=D0=BE=D0=B4=D0=B8=D1=82=D1=8C=20=D0=B8?= =?UTF-8?q?=D0=B7=20=D1=82=D0=BE=D0=B3=D0=BE,=20=D1=87=D1=82=D0=BE=20?= =?UTF-8?q?=D0=B6=D0=B5=D0=BB=D0=B5=D0=B7=D0=BD=D1=8B=D1=85=20=D0=BF=D0=B0?= =?UTF-8?q?=D0=BB=D0=BE=D0=BA=20=D1=83=20=D0=BD=D0=B0=D1=81=20=D0=B2=20?= =?UTF-8?q?=D0=BC=D0=BE=D0=B4=D0=B5=20=D0=BD=D0=B5=D1=82,=20=D1=82=D0=B0?= =?UTF-8?q?=D0=BA=20=D1=87=D1=82=D0=BE=20=D0=B8=20=D1=80=D0=B5=D1=86=D0=B5?= =?UTF-8?q?=D0=BF=D1=82=D1=8B=20=D0=BF=D0=BE=D0=BA=D0=B0=D0=B7=D1=8B=D0=B2?= =?UTF-8?q?=D0=B0=D1=82=D1=8C=20=D0=9D=D0=95=20=D0=9D=D0=A3=D0=96=D0=9D?= =?UTF-8?q?=D0=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mc/otm/datagen/recipes/CraftingTableRecipes.kt | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) 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)