Induction furnace and powered furnace painting

src/data/kotlin/ru/dbotthepony/mc/otm/datagen/advancements/MachineAdvancementsData.kt

@@ -194,13 +194,13 @@ fun addMachineAdvancements(serializer: Consumer<AdvancementHolder>, lang: Matter
 		russianSuffix = "Смотрите, чтоб он не просыпался во все сундуки",
 		englishSuffix = "Watch for not to spill it over all your chests").make(serializer, press, translation)
 
-	CraftEntry(MItems.POWERED_FURNACE, "One Big Resistor",
+	CraftEntry(MItems.POWERED_FURNACE.values, "One Big Resistor",
 			   russianName = "Один большой резистор",
 			   russianSuffix = "Каждый элемент электрической цепи способен испускать свет и тепло, единожды.",
 			   englishSuffix = "Any electrical element can emit light and heat, once.")
 		.make(serializer, press, translation)
 	.also {
-		CraftEntry(MItems.POWERED_BLAST_FURNACE, "Big Microwave Oven",
+		CraftEntry(MItems.POWERED_BLAST_FURNACE.values, "Big Microwave Oven",
 				   russianName = "Большая микроволновая печь").make(serializer, it, translation)
 
 		CraftEntry(MItems.POWERED_SMOKER.values, "Small Microwave Oven",

src/data/kotlin/ru/dbotthepony/mc/otm/datagen/blocks/BlockModels.kt

@@ -34,5 +34,13 @@ fun addBlockModels(provider: MatteryBlockModelProvider) {
 		colored("powered_smoker", "_idle", mapOf("0" to "powered_smoker_base", "1" to "powered_smoker_interior_0", "particle" to "powered_smoker_base"))
 		colored("powered_smoker", "_error", mapOf("0" to "powered_smoker_base", "1" to "powered_smoker_interior_2", "particle" to "powered_smoker_base"))
 		colored("powered_smoker", "_working", mapOf("0" to "powered_smoker_base", "1" to "powered_smoker_interior_1", "particle" to "powered_smoker_base"))
+
+		colored("powered_furnace", "_idle", mapOf("0" to "electric_furnace_offline", "particle" to "electric_furnace_offline"))
+		colored("powered_furnace", "_error", mapOf("0" to "electric_furnace_offline", "particle" to "electric_furnace_offline"))
+		colored("powered_furnace", "_working", mapOf("0" to "electric_furnace", "particle" to "electric_furnace"))
+
+		colored("powered_blast_furnace", "_idle", mapOf("texture" to "induction_furnace_offline", "particle" to "induction_furnace_offline"))
+		colored("powered_blast_furnace", "_error", mapOf("texture" to "induction_furnace_offline", "particle" to "induction_furnace_offline"))
+		colored("powered_blast_furnace", "_working", mapOf("texture" to "induction_furnace", "particle" to "induction_furnace"))
 	}
 }

src/data/kotlin/ru/dbotthepony/mc/otm/datagen/blocks/BlockStates.kt

@@ -100,8 +100,8 @@ fun addBlockStates(provider: MatteryBlockStateProvider) {
 	provider.block(MBlocks.GRAVITATION_STABILIZER)
 	provider.block(MBlocks.GRAVITATION_STABILIZER_LENS)
 
-	provider.block(MBlocks.POWERED_BLAST_FURNACE)
-	provider.block(MBlocks.POWERED_FURNACE)
+	provider.block(MBlocks.POWERED_BLAST_FURNACE.values)
+	provider.block(MBlocks.POWERED_FURNACE.values)
 	provider.block(MBlocks.POWERED_SMOKER.values)
 
 	provider.block(MBlocks.STORAGE_POWER_SUPPLIER)

src/data/kotlin/ru/dbotthepony/mc/otm/datagen/items/ItemModels.kt

@@ -177,8 +177,8 @@ fun addItemModels(provider: MatteryItemModelProvider) {
 	provider.coloredWithBaseBlock(MItems.ESSENCE_STORAGE, "essence_storage")
 	provider.coloredWithBaseBlock(MItems.MATTER_RECONSTRUCTOR, "matter_reconstructor")
 
-	provider.block(MItems.POWERED_BLAST_FURNACE, "powered_blast_furnace_working")
-	provider.block(MItems.POWERED_FURNACE, "powered_furnace_working")
+	provider.coloredWithBaseBlock(MItems.POWERED_BLAST_FURNACE, "powered_blast_furnace", "_idle")
+	provider.coloredWithBaseBlock(MItems.POWERED_FURNACE, "powered_furnace", "_idle")
 	provider.coloredWithBaseBlock(MItems.POWERED_SMOKER, "powered_smoker", "_idle")
 
 	provider.coloredWithBaseBlock(MItems.PLATE_PRESS, "plate_press", "_idle")

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

@@ -462,9 +462,9 @@ private fun blocks(provider: MatteryLanguageProvider) {
 		addBlock(MBlocks.PLATE_PRESS.values, "Plate Press")
 		addBlock(MBlocks.TWIN_PLATE_PRESS.values, "Twin Plate Press")
 
-		add(MBlocks.POWERED_FURNACE, "Electric Furnace")
+		addBlock(MBlocks.POWERED_FURNACE.values, "Electric Furnace")
 		addBlock(MBlocks.POWERED_SMOKER.values, "Microwave Oven")
-		add(MBlocks.POWERED_BLAST_FURNACE, "Induction Furnace")
+		addBlock(MBlocks.POWERED_BLAST_FURNACE.values, "Induction Furnace")
 
 		addBlock(MBlocks.MATTER_RECYCLER.values, "Matter Recycler")
 		add(MBlocks.ENERGY_SERVO, "Energy Servo")

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

@@ -464,8 +464,8 @@ private fun blocks(provider: MatteryLanguageProvider) {
 		addBlock(MBlocks.PLATE_PRESS.values, "Пресс пластин")
 		addBlock(MBlocks.TWIN_PLATE_PRESS.values, "Двойной пресс пластин")
 
-		add(MBlocks.POWERED_FURNACE, "Электрическая печь")
-		add(MBlocks.POWERED_BLAST_FURNACE, "Индукционная печь")
+		addBlock(MBlocks.POWERED_FURNACE.values, "Электрическая печь")
+		addBlock(MBlocks.POWERED_BLAST_FURNACE.values, "Индукционная печь")
 		addBlock(MBlocks.POWERED_SMOKER.values, "Микроволновая печь")
 
 		addBlock(MBlocks.MATTER_RECYCLER.values, "Перерабатыватель материи")

src/data/kotlin/ru/dbotthepony/mc/otm/datagen/loot/LootTablesData.kt

@@ -161,9 +161,9 @@ fun addLootTables(lootTables: LootTables) {
 	lootTables.tile(MBlocks.PLATE_PRESS.values)
 	lootTables.tile(MBlocks.TWIN_PLATE_PRESS.values)
 
-	lootTables.tile(MBlocks.POWERED_FURNACE)
+	lootTables.tile(MBlocks.POWERED_FURNACE.values)
 	lootTables.tile(MBlocks.POWERED_SMOKER.values)
-	lootTables.tile(MBlocks.POWERED_BLAST_FURNACE)
+	lootTables.tile(MBlocks.POWERED_BLAST_FURNACE.values)
 
 	lootTables.tile(MBlocks.MATTER_PANEL)
 	lootTables.tile(MBlocks.PATTERN_STORAGE)

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

@@ -443,7 +443,7 @@ fun addCraftingTableRecipes(consumer: RecipeOutput) {
 		.unlockedBy(Items.FLINT_AND_STEEL)
 		.build(consumer)
 
-	MatteryRecipe(MItems.POWERED_FURNACE, category = machinesCategory)
+	MatteryRecipe(MItems.POWERED_FURNACE[null]!!, category = machinesCategory)
 		.row(Items.FURNACE, MItems.MACHINE_FRAME, Items.FURNACE)
 		.unlockedBy(MItems.MACHINE_FRAME)
 		.build(consumer)
@@ -454,7 +454,7 @@ fun addCraftingTableRecipes(consumer: RecipeOutput) {
 		.unlockedBy(MItems.MACHINE_FRAME)
 		.build(consumer)
 
-	MatteryRecipe(MItems.POWERED_BLAST_FURNACE, category = machinesCategory)
+	MatteryRecipe(MItems.POWERED_BLAST_FURNACE[null]!!, category = machinesCategory)
 		.row(MItems.ELECTROMAGNET, Items.FURNACE, MItems.ELECTROMAGNET)
 		.row(MItems.ELECTROMAGNET, MItems.MACHINE_FRAME, MItems.ELECTROMAGNET)
 		.row(MItems.ELECTROMAGNET, Items.FURNACE, MItems.ELECTROMAGNET)

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

@@ -285,6 +285,8 @@ fun addPainterRecipes(consumer: RecipeOutput) {
 		MItems.BATTERY_BANK,
 		MItems.MATTER_DECOMPOSER,
 		MItems.POWERED_SMOKER,
+		MItems.POWERED_FURNACE,
+		MItems.POWERED_BLAST_FURNACE,
 		MItems.MATTER_RECYCLER,
 	)
 

src/data/kotlin/ru/dbotthepony/mc/otm/datagen/tags/Tags.kt

@@ -196,9 +196,9 @@ fun addTags(tagsProvider: TagsProvider) {
 		*MBlocks.MATTER_RECYCLER.values.toTypedArray(),
 		MBlocks.MATTER_ENTANGLER,
 
-		MBlocks.POWERED_FURNACE,
+		*MBlocks.POWERED_FURNACE.values.toTypedArray(),
 		*MBlocks.POWERED_SMOKER.values.toTypedArray(),
-		MBlocks.POWERED_BLAST_FURNACE,
+		*MBlocks.POWERED_BLAST_FURNACE.values.toTypedArray(),
 
 		MBlocks.STORAGE_BUS,
 		MBlocks.STORAGE_IMPORTER,

src/main/kotlin/ru/dbotthepony/mc/otm/compat/jei/JEIPlugin.kt

@@ -65,9 +65,9 @@ class JEIPlugin : IModPlugin {
 
 	override fun registerRecipeCatalysts(registration: IRecipeCatalystRegistration) {
 		registration.addRecipeCatalyst(ItemStack(MItems.CHEMICAL_GENERATOR), RecipeTypes.FUELING)
-		registration.addRecipeCatalyst(ItemStack(MItems.POWERED_FURNACE), RecipeTypes.SMELTING)
+		registration.addRecipeCatalyst(ItemStack(MItems.POWERED_FURNACE[null]!!), RecipeTypes.SMELTING)
 		registration.addRecipeCatalyst(ItemStack(MItems.ExopackUpgrades.SMELTING_UPGRADE), RecipeTypes.SMELTING)
-		registration.addRecipeCatalyst(ItemStack(MItems.POWERED_BLAST_FURNACE), RecipeTypes.BLASTING)
+		registration.addRecipeCatalyst(ItemStack(MItems.POWERED_BLAST_FURNACE[null]!!), RecipeTypes.BLASTING)
 		registration.addRecipeCatalyst(ItemStack(MItems.POWERED_SMOKER[null]!!), RecipeTypes.SMOKING)
 		MItems.POWERED_SMOKER.values.forEach { registration.addRecipeCatalyst(ItemStack(it), MicrowaveRecipeCategory.recipeType) }
 		registration.addRecipeCatalyst(ItemStack(MItems.ExopackUpgrades.CRAFTING_UPGRADE), RecipeTypes.CRAFTING)

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

@@ -85,8 +85,8 @@ object MBlockEntities {
 		conf to selfFeed
 	})
 
-	val POWERED_FURNACE: BlockEntityType<PoweredFurnaceBlockEntity> by registry.register(MNames.POWERED_FURNACE) { BlockEntityType.Builder.of({ a, b -> MBlocks.POWERED_FURNACE.newBlockEntity(a, b) }, MBlocks.POWERED_FURNACE).build(null) }
-	val POWERED_BLAST_FURNACE: BlockEntityType<PoweredFurnaceBlockEntity> by registry.register(MNames.POWERED_BLAST_FURNACE) { BlockEntityType.Builder.of({ a, b -> MBlocks.POWERED_BLAST_FURNACE.newBlockEntity(a, b) }, MBlocks.POWERED_BLAST_FURNACE).build(null) }
+	val POWERED_FURNACE: BlockEntityType<PoweredFurnaceBlockEntity> by registry.register(MNames.POWERED_FURNACE) { BlockEntityType.Builder.of({ a, b -> MBlocks.POWERED_FURNACE[null]!!.newBlockEntity(a, b) }, *MBlocks.POWERED_FURNACE.values.toTypedArray()).build(null) }
+	val POWERED_BLAST_FURNACE: BlockEntityType<PoweredFurnaceBlockEntity> by registry.register(MNames.POWERED_BLAST_FURNACE) { BlockEntityType.Builder.of({ a, b -> MBlocks.POWERED_BLAST_FURNACE[null]!!.newBlockEntity(a, b) }, *MBlocks.POWERED_BLAST_FURNACE.values.toTypedArray()).build(null) }
 	val POWERED_SMOKER: BlockEntityType<PoweredFurnaceBlockEntity> by registry.register(MNames.POWERED_SMOKER) { BlockEntityType.Builder.of({ a, b -> MBlocks.POWERED_SMOKER[null]!!.newBlockEntity(a, b) }, *MBlocks.POWERED_SMOKER.values.toTypedArray()).build(null) }
 
 	val STORAGE_BUS: BlockEntityType<StorageBusBlockEntity> by registry.register(MNames.STORAGE_BUS) { BlockEntityType.Builder.of(::StorageBusBlockEntity, MBlocks.STORAGE_BUS).build(null) }

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

@@ -112,8 +112,8 @@ object MBlocks {
 	val CHEMICAL_GENERATOR: Block by registry.register(MNames.CHEMICAL_GENERATOR) { ChemicalGeneratorBlock() }
 	val PLATE_PRESS = registry.coloredWithBase(MNames.PLATE_PRESS) { color, _ -> PlatePressBlock(color) }
 	val TWIN_PLATE_PRESS = registry.coloredWithBase(MNames.TWIN_PLATE_PRESS) { color, _ -> PlatePressBlock(color, isTwin = true) }
-	val POWERED_FURNACE: PoweredFurnaceBlock by registry.register(MNames.POWERED_FURNACE) { PoweredFurnaceBlock(MBlockEntities::POWERED_FURNACE, RecipeType.SMELTING, null, MachinesConfig.POWERED_FURNACE, BlockShapes.POWERED_FURNACE) }
-	val POWERED_BLAST_FURNACE: PoweredFurnaceBlock by registry.register(MNames.POWERED_BLAST_FURNACE) { PoweredFurnaceBlock(MBlockEntities::POWERED_BLAST_FURNACE, RecipeType.BLASTING, null, MachinesConfig.POWERED_BLAST_FURNACE, BlockShapes.POWERED_BLAST_FURNACE) }
+	val POWERED_FURNACE = registry.coloredWithBase(MNames.POWERED_FURNACE) { color, _ -> PoweredFurnaceBlock(MBlockEntities::POWERED_FURNACE, RecipeType.SMELTING, null, MachinesConfig.POWERED_FURNACE, BlockShapes.POWERED_FURNACE) }
+	val POWERED_BLAST_FURNACE = registry.coloredWithBase(MNames.POWERED_BLAST_FURNACE) { color, _ -> PoweredFurnaceBlock(MBlockEntities::POWERED_BLAST_FURNACE, RecipeType.BLASTING, null, MachinesConfig.POWERED_BLAST_FURNACE, BlockShapes.POWERED_BLAST_FURNACE) }
 	val POWERED_SMOKER = registry.coloredWithBase(MNames.POWERED_SMOKER) { color, _ -> PoweredFurnaceBlock(MBlockEntities::POWERED_SMOKER, RecipeType.SMOKING, MRecipes::MICROWAVE, MachinesConfig.POWERED_SMOKER, BlockShapes.POWERED_SMOKER_IDLE) }
 	val MATTER_RECYCLER = registry.coloredWithBase(MNames.MATTER_RECYCLER) { color, _ -> MatterRecyclerBlock(color) }
 	val ENERGY_SERVO: Block by registry.register(MNames.ENERGY_SERVO) { EnergyServoBlock() }

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

@@ -76,8 +76,8 @@ object MItems {
 	val TWIN_PLATE_PRESS = registry.coloredWithBase(MNames.TWIN_PLATE_PRESS) { color, _ -> BlockItem(MBlocks.TWIN_PLATE_PRESS[color]!!, DEFAULT_PROPERTIES) }
 	val MATTER_RECYCLER = registry.coloredWithBase(MNames.MATTER_RECYCLER) { color, _ -> BlockItem(MBlocks.MATTER_RECYCLER[color]!!, DEFAULT_PROPERTIES) }
 
-	val POWERED_FURNACE: BlockItem by registry.register(MNames.POWERED_FURNACE) { BlockItem(MBlocks.POWERED_FURNACE, DEFAULT_PROPERTIES) }
-	val POWERED_BLAST_FURNACE: BlockItem by registry.register(MNames.POWERED_BLAST_FURNACE) { BlockItem(MBlocks.POWERED_BLAST_FURNACE, DEFAULT_PROPERTIES) }
+	val POWERED_FURNACE = registry.coloredWithBase(MNames.POWERED_FURNACE) { color, _ -> BlockItem(MBlocks.POWERED_FURNACE[color]!!, DEFAULT_PROPERTIES) }
+	val POWERED_BLAST_FURNACE = registry.coloredWithBase(MNames.POWERED_BLAST_FURNACE) { color, _ -> BlockItem(MBlocks.POWERED_BLAST_FURNACE[color]!!, DEFAULT_PROPERTIES) }
 	val POWERED_SMOKER = registry.coloredWithBase(MNames.POWERED_SMOKER) { color, _ -> BlockItem(MBlocks.POWERED_SMOKER[color]!!, DEFAULT_PROPERTIES) }
 
 	val STORAGE_BUS: BlockItem by registry.register(MNames.STORAGE_BUS) { BlockItem(MBlocks.STORAGE_BUS, DEFAULT_PROPERTIES) }
@@ -110,8 +110,8 @@ object MItems {
 
 		machines.addAll(PLATE_PRESS.asSupplierArray())
 		machines.addAll(TWIN_PLATE_PRESS.asSupplierArray())
-		machines.add(::POWERED_FURNACE)
-		machines.add(::POWERED_BLAST_FURNACE)
+		machines.addAll(POWERED_FURNACE.asSupplierArray())
+		machines.addAll(POWERED_BLAST_FURNACE.asSupplierArray())
 		machines.addAll(POWERED_SMOKER.asSupplierArray())
 
 		machines.add(::ANDROID_STATION)

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

@@ -284,12 +284,7 @@ object MRegistry : IBlockItemRegistryAcceptor {
 
 			event.register(Registries.POINT_OF_INTEREST_TYPE, PoiTypes.ARMORER.location()) {
 				val old = reg[PoiTypes.ARMORER] ?: throw IllegalStateException("POI with type ${PoiTypes.ARMORER} does not exist")
-
-				if (old.`is`(MBlocks.POWERED_BLAST_FURNACE.defaultBlockState())) {
-					old
-				} else {
-					PoiType(Streams.concat(old.matchingStates.stream(), MBlocks.POWERED_BLAST_FURNACE.stateDefinition.possibleStates.stream()).collect(ImmutableSet.toImmutableSet()), old.maxTickets, old.validRange)
-				}
+				PoiType(Streams.concat(old.matchingStates.stream(), MBlocks.POWERED_BLAST_FURNACE.values.stream().flatMap { it.stateDefinition.possibleStates.stream() }).collect(ImmutableSet.toImmutableSet()), old.maxTickets, old.validRange)
 			}
 		}
 	}

src/main/resources/assets/overdrive_that_matters/models/block/powered_blast_furnace_error.json

@@ -2,8 +2,8 @@
 	"render_type": "cutout",
 	"texture_size": [32, 64],
 	"textures": {
-		"particle": "overdrive_that_matters:block/induction_furnace",
-		"texture": "overdrive_that_matters:block/induction_furnace"
+		"particle": "overdrive_that_matters:block/induction_furnace_offline",
+		"texture": "overdrive_that_matters:block/induction_furnace_offline"
 	},
 	"elements": [
 		{