DBot/overdrive_that_matters
DBot/overdrive_that_matters
3
1
Fork 0
Code Issues 63 Pull Requests Packages Releases Wiki Activity

Merge remote-tracking branch 'origin/1.21' into 1.21

Browse Source
This commit is contained in:
DBotThePony 2025-02-11 01:25:34 +07:00
commit d0d9b6ae79
Signed by: DBot
GPG Key ID: DCC23B5715498507
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/data/kotlin/ru/dbotthepony/mc/otm/datagen/lang/Russian.kt
View File

@ -58,7 +58,7 @@ private fun decoratives(provider: MatteryLanguageProvider) {
add(MBlocks.TRITANIUM_TRAPDOOR[color]!!, "description1", FEELING_SAFE_NOW) add(MBlocks.TRITANIUM_TRAPDOOR[color]!!, "description1", FEELING_SAFE_NOW)
add(MBlocks.TRITANIUM_TRAPDOOR[color]!!, "description2", "Данный вариант выкрашен в $name") add(MBlocks.TRITANIUM_TRAPDOOR[color]!!, "description2", "Данный вариант выкрашен в $name")
add(MBlocks.GRILL[color]!!, "$nameAdj мангал-дипломат") add(MBlocks.GRILL[color]!!, "$name мангал-дипломат")
} }
add(MRegistry.TRITANIUM_PRESSURE_PLATE.block, "Тритановая нажимная пластина") add(MRegistry.TRITANIUM_PRESSURE_PLATE.block, "Тритановая нажимная пластина")

7
src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/CraftingTableRecipes.kt
View File

@ -9,6 +9,8 @@ import net.minecraft.world.item.ItemStack
import net.minecraft.world.item.Items import net.minecraft.world.item.Items
import net.minecraft.world.item.crafting.Ingredient import net.minecraft.world.item.crafting.Ingredient
import net.neoforged.neoforge.common.Tags 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.block.entity.MatteryBlockEntity
import ru.dbotthepony.mc.otm.config.CablesConfig import ru.dbotthepony.mc.otm.config.CablesConfig
import ru.dbotthepony.mc.otm.core.ResourceLocation import ru.dbotthepony.mc.otm.core.ResourceLocation
@ -530,6 +532,7 @@ fun addCraftingTableRecipes(consumer: RecipeOutput) {
.build(consumer) .build(consumer)
val ironRod = ItemTags.create(ResourceLocation("c", "rods/iron")) val ironRod = ItemTags.create(ResourceLocation("c", "rods/iron"))
var condConsumer = consumer.withConditions(NotCondition(TagEmptyCondition(ironRod)))
for ((color, item) in MItems.GRILL) { for ((color, item) in MItems.GRILL) {
MatteryRecipe(item, category = RecipeCategory.DECORATIONS) MatteryRecipe(item, category = RecipeCategory.DECORATIONS)
@ -542,13 +545,13 @@ fun addCraftingTableRecipes(consumer: RecipeOutput) {
.rowB(color?.tag) .rowB(color?.tag)
.row(ironRod, ironRod, ironRod) .row(ironRod, ironRod, ironRod)
.rowAC(MItemTags.TRITANIUM_INGOTS, MItemTags.TRITANIUM_INGOTS) .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) MatteryRecipe(item, category = RecipeCategory.DECORATIONS)
.rowB(color?.tag) .rowB(color?.tag)
.row(ironRod, ironRod, ironRod) .row(ironRod, ironRod, ironRod)
.rowB(MItemTags.TRITANIUM_PLATES) .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) MatteryRecipe(item, category = RecipeCategory.DECORATIONS)
.rowB(color?.tag) .rowB(color?.tag)