m

# Conflicts:
#	src/main/kotlin/ru/dbotthepony/mc/otm/registry/game/MItems.kt

src/data/kotlin/ru/dbotthepony/mc/otm/datagen/lang/English.kt

@@ -78,6 +78,7 @@ private fun decoratives(provider: MatteryLanguageProvider) {
 		add(MRegistry.CARGO_CRATES.block, "Cargo Crate")
 		add(MRegistry.COMPUTER_TERMINAL.block, "Computer Terminal")
 		add(MRegistry.STAR_CHAIR.block, "Star Chair")
+		add(MRegistry.STAR_CHAIR.block, "desc", "For extensive stargazing.")
 		add(MRegistry.TRITANIUM_BLOCK.block, "Tritanium Block")
 		add(MRegistry.TRITANIUM_STAIRS.block, "Tritanium Stairs")
 		add(MRegistry.TRITANIUM_SLAB.block, "Tritanium Slab")
@@ -760,6 +761,7 @@ private fun items(provider: MatteryLanguageProvider) {
 		add(MItems.MIRROR, "desc", "I can clearly see my own reflection in this mirror")
 		add(MItems.REINFORCED_TRITANIUM_PLATE, "Reinforced Tritanium Plate")
 		add(MItems.REINFORCED_TRITANIUM_PLATE, "desc", "An armor plate, reinforced to withstand great kinetic forces")
+		add(MItems.ARMOR_ASSEMBLY, "Armor assembly")
 		add(MItems.CARBON_MESH, "Carbon Mesh")
 
 		add(MItems.GRAVITATIONAL_DISRUPTOR, "Spacetime Equalizer")

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

@@ -24,6 +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.getBlock(color), "desc", "Для длительного наблюдения за звёздами.")
 			add(MRegistry.TRITANIUM_STAIRS.getBlock(color), "$name тритановые ступеньки")
 			add(MRegistry.TRITANIUM_SLAB.getBlock(color), "$nameF тритановая плита")
 			add(MRegistry.TRITANIUM_WALL.getBlock(color), "$nameF тритановая ограда")
@@ -756,6 +757,7 @@ private fun items(provider: MatteryLanguageProvider) {
 		add(MItems.MIRROR, "desc", "Я могу очень отчётливо видеть своё отражение в этом зеркале")
 		add(MItems.REINFORCED_TRITANIUM_PLATE, "Укреплённая тритановая пластина")
 		add(MItems.REINFORCED_TRITANIUM_PLATE, "desc", "Бронированная пластина, усиленная чтобы выдержать большие кинетические силы")
+		add(MItems.ARMOR_ASSEMBLY, "Стройка брони")
 		add(MItems.CARBON_MESH, "Углеродная сетка")
 
 		add(MItems.GRAVITATIONAL_DISRUPTOR, "Маяк уравнения пространства-времени")

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

@@ -270,6 +270,13 @@ fun addCraftingTableRecipes(consumer: RecipeOutput) {
 			.rowB(MItemTags.CARBON_PLATES)
 			.unlockedBy(MItemTags.TRITANIUM_PLATES)
 			.build(consumer)
+	MatteryRecipe(MItems.ARMOR_ASSEMBLY, category = RecipeCategory.MISC)
+		.row(MItemTags.CARBON_PLATES, MItemTags.IRON_PLATES, MItemTags.CARBON_PLATES)
+		.row(MItemTags.IRON_PLATES, Items.DIAMOND, MItemTags.IRON_PLATES)
+		.row(MItemTags.CARBON_PLATES, MItemTags.IRON_PLATES, MItemTags.CARBON_PLATES)
+		.unlockedBy(MItemTags.IRON_PLATES)
+		.unlockedBy(MItemTags.CARBON_PLATES)
+		.build(consumer)
 
 	MatteryRecipe(MItems.CARBON_FIBRE_BLOCK, category = RecipeCategory.BUILDING_BLOCKS)
 		.rowAB(MItemTags.CARBON_PLATES, MItemTags.CARBON_PLATES)
@@ -288,7 +295,7 @@ fun addCraftingTableRecipes(consumer: RecipeOutput) {
 		.setUpgradeSource(Items.LEATHER_HELMET)
 		.addUpgradeOps(UpgradeRecipe.CopyEnchantments)
 		.addUpgradeOps(UpgradeRecipe.CopyComponent(DataComponents.CUSTOM_NAME))
-		.row(MItemTags.REINFORCED_TRITANIUM_PLATES, MItemTags.REINFORCED_TRITANIUM_PLATES, MItemTags.REINFORCED_TRITANIUM_PLATES)
+		.row(MItemTags.REINFORCED_TRITANIUM_PLATES, MItems.ARMOR_ASSEMBLY, MItemTags.REINFORCED_TRITANIUM_PLATES)
 		.row(MItemTags.REINFORCED_TRITANIUM_PLATES, Items.LEATHER_HELMET, MItemTags.REINFORCED_TRITANIUM_PLATES)
 		.unlockedBy(MItemTags.REINFORCED_TRITANIUM_PLATES)
 		.build(consumer)
@@ -297,7 +304,7 @@ fun addCraftingTableRecipes(consumer: RecipeOutput) {
 		.setUpgradeSource(Items.LEATHER_LEGGINGS)
 		.addUpgradeOps(UpgradeRecipe.CopyEnchantments)
 		.addUpgradeOps(UpgradeRecipe.CopyComponent(DataComponents.CUSTOM_NAME))
-		.row(MItemTags.REINFORCED_TRITANIUM_PLATES, MItemTags.REINFORCED_TRITANIUM_PLATES, MItemTags.REINFORCED_TRITANIUM_PLATES)
+		.row(MItemTags.REINFORCED_TRITANIUM_PLATES, MItems.ARMOR_ASSEMBLY, MItemTags.REINFORCED_TRITANIUM_PLATES)
 		.row(MItemTags.REINFORCED_TRITANIUM_PLATES, Items.LEATHER_LEGGINGS, MItemTags.REINFORCED_TRITANIUM_PLATES)
 		.rowAC(MItemTags.REINFORCED_TRITANIUM_PLATES, MItemTags.REINFORCED_TRITANIUM_PLATES)
 		.unlockedBy(MItemTags.REINFORCED_TRITANIUM_PLATES)
@@ -308,7 +315,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.REINFORCED_TRITANIUM_PLATES, 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)
@@ -318,7 +325,7 @@ fun addCraftingTableRecipes(consumer: RecipeOutput) {
 		.addUpgradeOps(UpgradeRecipe.CopyEnchantments)
 		.addUpgradeOps(UpgradeRecipe.CopyComponent(DataComponents.CUSTOM_NAME))
 		.row(MItemTags.REINFORCED_TRITANIUM_PLATES, Items.LEATHER_BOOTS, MItemTags.REINFORCED_TRITANIUM_PLATES)
-		.rowAC(MItemTags.REINFORCED_TRITANIUM_PLATES, MItemTags.REINFORCED_TRITANIUM_PLATES)
+		.row(MItemTags.REINFORCED_TRITANIUM_PLATES, MItems.ARMOR_ASSEMBLY, MItemTags.REINFORCED_TRITANIUM_PLATES)
 		.unlockedBy(MItemTags.REINFORCED_TRITANIUM_PLATES)
 		.build(consumer)
 

src/main/kotlin/ru/dbotthepony/mc/otm/block/decorative/StarChairBlock.kt

@@ -22,6 +22,7 @@ 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)) {
+
 	override fun rotationFreedom(): BlockRotationFreedom = BlockRotationFreedom.HORIZONTAL
 
 	init {

src/main/kotlin/ru/dbotthepony/mc/otm/registry/MNames.kt

@@ -188,6 +188,7 @@ object MNames {
 	const val MATTER_TRANSFORM_MATRIX = "matter_transform_matrix"
 
 	const val CARBON_MESH = "carbon_mesh"
+	const val ARMOR_ASSEMBLY = "armor_assembly"
 	const val REINFORCED_TRITANIUM_PLATE = "reinforced_tritanium_plate"
 
 	const val QUANTUM_TRANSCEIVER = "quantum_transceiver"

src/main/kotlin/ru/dbotthepony/mc/otm/registry/game/MItems.kt

@@ -556,6 +556,7 @@ object MItems {
 	val ADVANCED_CONTROL_CIRCUIT: Item by registry.register(MNames.ADVANCED_CONTROL_CIRCUIT) { Item(DEFAULT_PROPERTIES) }
 	val MATTER_CAPACITOR_PARTS: Item by registry.register(MNames.MATTER_CAPACITOR_PARTS) { Item(DEFAULT_PROPERTIES) }
 	val CARBON_MESH: Item by registry.register(MNames.CARBON_MESH) { Item(DEFAULT_PROPERTIES) }
+	val ARMOR_ASSEMBLY: Item by registry.register(MNames.ARMOR_ASSEMBLY) { Item(DEFAULT_PROPERTIES) }
 	val REINFORCED_TRITANIUM_PLATE: Item by registry.register(MNames.REINFORCED_TRITANIUM_PLATE) { MatteryItem(
 		DEFAULT_PROPERTIES
 	).addSimpleDescription() }
@@ -594,6 +595,7 @@ object MItems {
 		MItems::MIRROR,
 
 		MItems::CARBON_MESH,
+		MItems::ARMOR_ASSEMBLY,
 		MItems::REINFORCED_TRITANIUM_PLATE,
 
 		MachineUpgrades.Basic::BLANK,
@@ -625,6 +627,7 @@ object MItems {
 		MItems::MIRROR,
 
 		MItems::CARBON_MESH,
+		MItems::ARMOR_ASSEMBLY,
 		MItems::REINFORCED_TRITANIUM_PLATE,
 	)