From 15417e65aa8d509f5eefc6d5cd163f041c36d8d4 Mon Sep 17 00:00:00 2001 From: GearShocky Date: Tue, 21 Jan 2025 17:00:22 +0500 Subject: [PATCH] p --- .../kotlin/ru/dbotthepony/mc/otm/datagen/lang/Russian.kt | 2 +- .../mc/otm/datagen/recipes/CraftingTableRecipes.kt | 2 +- .../ru/dbotthepony/mc/otm/block/decorative/StarChairBlock.kt | 5 +++++ 3 files changed, 7 insertions(+), 2 deletions(-) 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 48a589b7a..92c311dfc 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 @@ -24,7 +24,7 @@ private fun decoratives(provider: MatteryLanguageProvider) { add(MRegistry.TRITANIUM_BLOCK.getBlock(color), "$name тритановый блок") add(MRegistry.COMPUTER_TERMINAL.getBlock(color), "$name компьютерный терминал") add(MRegistry.STAR_CHAIR.getBlock(color), "$name звезданутый стул") - add(MRegistry.STAR_CHAIR.block, "desc", "Для длительного наблюдения за звёздами.") + add(MRegistry.STAR_CHAIR.getBlock(color), "desc", "Для длительного наблюдения за звёздами.") add(MRegistry.TRITANIUM_STAIRS.getBlock(color), "$name тритановые ступеньки") add(MRegistry.TRITANIUM_SLAB.getBlock(color), "$nameF тритановая плита") add(MRegistry.TRITANIUM_WALL.getBlock(color), "$nameF тритановая ограда") 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 ca6258771..d58b93dcf 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 @@ -290,7 +290,7 @@ fun addCraftingTableRecipes(consumer: RecipeOutput) { .addUpgradeOps(UpgradeRecipe.CopyEnchantments) .addUpgradeOps(UpgradeRecipe.CopyComponent(DataComponents.CUSTOM_NAME)) .row(MItemTags.REINFORCED_TRITANIUM_PLATES, Items.LEATHER_CHESTPLATE, MItemTags.REINFORCED_TRITANIUM_PLATES) - .row(MItemTags.REINFORCED_TRITANIUM_PLATES, MItemTags.MItems.ARMOR_ASSEMBLY, MItemTags.REINFORCED_TRITANIUM_PLATES) + .row(MItemTags.REINFORCED_TRITANIUM_PLATES, MItems.ARMOR_ASSEMBLY, MItemTags.REINFORCED_TRITANIUM_PLATES) .row(MItemTags.REINFORCED_TRITANIUM_PLATES, MItemTags.REINFORCED_TRITANIUM_PLATES, MItemTags.REINFORCED_TRITANIUM_PLATES) .unlockedBy(MItemTags.REINFORCED_TRITANIUM_PLATES) .build(consumer) diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/decorative/StarChairBlock.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/decorative/StarChairBlock.kt index 81b1b94b8..d4726c9b8 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/decorative/StarChairBlock.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/decorative/StarChairBlock.kt @@ -12,6 +12,7 @@ import net.minecraft.world.phys.BlockHitResult import net.minecraft.world.phys.shapes.CollisionContext import net.minecraft.world.phys.shapes.VoxelShape import ru.dbotthepony.mc.otm.block.RotatableMatteryBlock +import ru.dbotthepony.mc.otm.block.addSimpleDescription import ru.dbotthepony.mc.otm.block.getShapeForEachState import ru.dbotthepony.mc.otm.core.AABB import ru.dbotthepony.mc.otm.core.get @@ -21,6 +22,10 @@ import ru.dbotthepony.mc.otm.entity.RideableDummy import ru.dbotthepony.mc.otm.shapes.BlockShapes class StarChairBlock(val color: DyeColor?) : RotatableMatteryBlock(DEFAULT_PROPERTIES.mapColor(color?.mapColor ?: MapColor.COLOR_LIGHT_BLUE)) { + init { + addSimpleDescription() + } + override fun rotationFreedom(): BlockRotationFreedom = BlockRotationFreedom.HORIZONTAL private val shapes = getShapeForEachState(rotationProperty) { BlockShapes.STAR_CHAIR.rotateFromNorth(it[rotationProperty]).computeShape() }