компонент экран + корректировка рецептов

GearShocky — Сегодня, в 14:35
сканер сингулярностей
его кстати переделать нужно

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

@@ -826,6 +826,7 @@ private fun items(provider: MatteryLanguageProvider) {
 		add(MItems.REINFORCED_IRON_PLATE, "desc", "A sturdier and more durable Iron Plate")
 		add(MItems.ARMOR_ASSEMBLY, "Armor assembly")
 		add(MItems.CARBON_MESH, "Carbon Mesh")
+		add(MItems.DISPLAY_SCREEN, "Display Screen")
 
 		add(MItems.GRAVITATIONAL_DISRUPTOR, "Spacetime Equalizer")
 

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

@@ -819,6 +819,7 @@ private fun items(provider: MatteryLanguageProvider) {
 		add(MItems.REINFORCED_IRON_PLATE, "desc", "Более надёжная и прочная железная пластина")
 		add(MItems.ARMOR_ASSEMBLY, "Стройка брони")
 		add(MItems.CARBON_MESH, "Углеродная сетка")
+		add(MItems.DISPLAY_SCREEN, "Экран дисплея")
 
 		add(MItems.GRAVITATIONAL_DISRUPTOR, "Маяк уравнения пространства-времени")
 

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

@@ -100,4 +100,10 @@ fun addComponentRecipes(consumer: RecipeOutput) {
 		.row(MItemTags.COPPER_WIRES, MItems.MECHANICAL_PARTS, MItemTags.COPPER_WIRES)
 		.unlockedBy(MItems.ELECTROMAGNET)
 		.build(consumer)
+
+	MatteryRecipe(MItems.DISPLAY_SCREEN, 3)
+		.row(MItemTags.IRON_PLATES, Tags.Items.DUSTS_GLOWSTONE, Tags.Items.GLASS_PANES_COLORLESS)
+		.row(MItemTags.IRON_PLATES, Tags.Items.DUSTS_REDSTONE, Tags.Items.GLASS_PANES_COLORLESS)
+		.row(MItemTags.IRON_PLATES, Tags.Items.DUSTS_GLOWSTONE, Tags.Items.GLASS_PANES_COLORLESS)
+		.build(consumer)
 }

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

@@ -52,8 +52,8 @@ fun addCraftingTableRecipes(consumer: RecipeOutput) {
 		.save(consumer, modLocation("holo_sign_reset"))
 
 	MatteryRecipe(MBlocks.DRIVE_VIEWER[null]!!, category = machinesCategory)
-		.rowAC(MItemTags.IRON_PLATES, MItemTags.IRON_PLATES)
-		.row(Tags.Items.DUSTS_GLOWSTONE, MItems.MACHINE_FRAME, Tags.Items.GLASS_BLOCKS)
+		.rowBC(MItems.DISPLAY_SCREEN, Tags.Items.GLASS_PANES)
+		.row(MItemTags.IRON_PLATES, MItems.MACHINE_FRAME, MItemTags.IRON_PLATES)
 		.row(MItemTags.BASIC_CIRCUIT, MItems.MATTER_IO_PORT, MItemTags.BASIC_CIRCUIT)
 		.unlockedBy(MItems.MATTER_IO_PORT)
 		.build(consumer)
@@ -75,9 +75,9 @@ fun addCraftingTableRecipes(consumer: RecipeOutput) {
 		.build(consumer)
 
 	MatteryRecipe(MBlocks.MATTER_PANEL[null]!!, category = machinesCategory)
-		.row(MItems.ELECTRIC_PARTS, MItemTags.TRITANIUM_PLATES, Tags.Items.GLASS_BLOCKS)
-		.row(MItems.MATTER_CABLE, Tags.Items.DUSTS_GLOWSTONE, Tags.Items.GLASS_BLOCKS)
-		.row(MItemTags.ADVANCED_CIRCUIT, MItemTags.TRITANIUM_PLATES, Tags.Items.GLASS_BLOCKS)
+		.row(MItems.ELECTRIC_PARTS, MItemTags.TRITANIUM_PLATES, Tags.Items.GLASS_PANES)
+		.row(MItems.MATTER_CABLE, MItems.DISPLAY_SCREEN, Tags.Items.GLASS_PANES)
+		.row(MItemTags.ADVANCED_CIRCUIT, MItemTags.TRITANIUM_PLATES, Tags.Items.GLASS_PANES)
 		.unlockedBy(Tags.Items.GLASS_BLOCKS)
 		.build(consumer)
 
@@ -99,7 +99,7 @@ fun addCraftingTableRecipes(consumer: RecipeOutput) {
 
 	MatteryRecipe(MBlocks.ENERGY_COUNTER[null]!!, category = machinesCategory)
 		.row(MItemTags.TRITANIUM_PLATES, MItems.ENERGY_BUS, MItemTags.TRITANIUM_PLATES)
-		.row(MItemTags.BASIC_CIRCUIT, Tags.Items.DUSTS_GLOWSTONE, MItemTags.HARDENED_GLASS_PANES_COLORLESS)
+		.row(MItemTags.BASIC_CIRCUIT, MItems.DISPLAY_SCREEN, MItemTags.HARDENED_GLASS_PANES)
 		.row(MItemTags.TRITANIUM_PLATES, MItems.ENERGY_BUS, MItemTags.TRITANIUM_PLATES)
 		.unlockedBy(MItems.ENERGY_BUS)
 		.build(consumer)
@@ -223,7 +223,7 @@ fun addCraftingTableRecipes(consumer: RecipeOutput) {
 		.build(consumer)
 
 	MatteryRecipe(MItems.BLACK_HOLE_SCANNER, category = RecipeCategory.TOOLS)
-		.row(MItemTags.IRON_PLATES, Tags.Items.GLASS_PANES_COLORLESS, MItemTags.IRON_PLATES)
+		.row(MItemTags.IRON_PLATES, MItems.DISPLAY_SCREEN, MItemTags.IRON_PLATES)
 		.row(MItemTags.GOLD_WIRES, MItems.GRAVITATION_FIELD_SENSOR, MItemTags.ADVANCED_CIRCUIT)
 		.rowAC(Tags.Items.DUSTS_GLOWSTONE, MItemTags.TRITANIUM_PLATES)
 		.unlockedBy(MItems.GRAVITATION_FIELD_SENSOR)

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

@@ -433,11 +433,11 @@ fun addDecorativesRecipes(provider: MatteryRecipeProvider, consumer: RecipeOutpu
 	for ((color, item) in MRegistry.COMPUTER_TERMINAL.allItems) {
 		val builder = MatteryRecipe(item, category = RecipeCategory.DECORATIONS)
 
-		builder.row(MItemTags.BASIC_CIRCUIT, MItemTags.TRITANIUM_PLATES, MItemTags.HARDENED_GLASS_PANES_COLORLESS)
-
 		if (color != null) {
 			builder.rowB(color.tag)
 		}
+		builder.row(MItemTags.TRITANIUM_PLATES, MItems.DISPLAY_SCREEN, MItemTags.HARDENED_GLASS_PANES_COLORLESS)
+		builder.rowB(MItemTags.BASIC_CIRCUIT)
 
 		builder.build(consumer)
 	}

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

@@ -232,6 +232,7 @@ object MNames {
 	const val MIRROR_COMPOUND = "mirror_compound"
 	const val MIRROR = "mirror"
 	const val BLANK_MACHINE_UPGRADE = "blank_machine_upgrade"
+	const val DISPLAY_SCREEN = "display_screen"
 
 	const val ENERGY_BUS = "energy_bus"
 

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

@@ -560,6 +560,7 @@ object MItems {
 	val ELECTROMOTOR: Item by registry.register(MNames.ELECTROMOTOR) { Item(DEFAULT_PROPERTIES) }
 	val MIRROR_COMPOUND: Item by registry.register(MNames.MIRROR_COMPOUND) { Item(DEFAULT_PROPERTIES) }
 	val MIRROR: Item by registry.register(MNames.MIRROR) { MatteryItem(DEFAULT_PROPERTIES).addSimpleDescription() }
+	val DISPLAY_SCREEN: Item by registry.register(MNames.DISPLAY_SCREEN) { Item(DEFAULT_PROPERTIES) }
 
 	/**
 	 * List of components for everything else
@@ -589,6 +590,7 @@ object MItems {
 		MItems::ELECTROMOTOR,
 		MItems::MIRROR_COMPOUND,
 		MItems::MIRROR,
+		MItems::DISPLAY_SCREEN,
 
 		MItems::CARBON_MESH,
 		MItems::ARMOR_ASSEMBLY,
@@ -624,6 +626,7 @@ object MItems {
 		MItems::ELECTROMOTOR,
 		MItems::MIRROR_COMPOUND,
 		MItems::MIRROR,
+		MItems::DISPLAY_SCREEN,
 
 		MItems::CARBON_MESH,
 		MItems::ARMOR_ASSEMBLY,