diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DataGen.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DataGen.kt index d3c639478..55848246b 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DataGen.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DataGen.kt @@ -507,7 +507,7 @@ object DataGen { .unlockedBy("has_tritanium_glass", has(MItems.INDUSTRIAL_GLASS)) .save(consumer) - val mapping = listOf( + val mapping = arrayOf( Tags.Items.DYES_WHITE, Tags.Items.DYES_ORANGE, Tags.Items.DYES_MAGENTA, @@ -526,16 +526,45 @@ object DataGen { Tags.Items.DYES_BLACK, ) + val mappingUpgradeVanilla = arrayOf( + net.minecraft.world.item.Items.WHITE_STAINED_GLASS, + net.minecraft.world.item.Items.ORANGE_STAINED_GLASS, + net.minecraft.world.item.Items.MAGENTA_STAINED_GLASS, + net.minecraft.world.item.Items.LIGHT_BLUE_STAINED_GLASS, + net.minecraft.world.item.Items.YELLOW_STAINED_GLASS, + net.minecraft.world.item.Items.LIME_STAINED_GLASS, + net.minecraft.world.item.Items.PINK_STAINED_GLASS, + net.minecraft.world.item.Items.GRAY_STAINED_GLASS, + net.minecraft.world.item.Items.LIGHT_GRAY_STAINED_GLASS, + net.minecraft.world.item.Items.CYAN_STAINED_GLASS, + net.minecraft.world.item.Items.PURPLE_STAINED_GLASS, + net.minecraft.world.item.Items.BLUE_STAINED_GLASS, + net.minecraft.world.item.Items.BROWN_STAINED_GLASS, + net.minecraft.world.item.Items.GREEN_STAINED_GLASS, + net.minecraft.world.item.Items.RED_STAINED_GLASS, + net.minecraft.world.item.Items.BLACK_STAINED_GLASS, + ) + for ((i, tag) in mapping.withIndex()) { val item = MItems.INDUSTRIAL_GLASS_LIST[i + 1] val paneItem = MItems.INDUSTRIAL_GLASS_PANE_LIST[i + 1] + val mappedVanilla = mappingUpgradeVanilla[i] + // обычная покраска ShapelessRecipeBuilder(item, 8) .requires(MItems.INDUSTRIAL_GLASS, 8) .requires(tag) .unlockedBy("has_tritanium_glass", has(MItems.INDUSTRIAL_GLASS)) .save(consumer) + // апгрейд ванильного крашенного стекла + ShapelessRecipeBuilder(item, 8) + .requires(mappedVanilla, 8) + .requires(MItemTags.PLATE_TRITANIUM) + .unlockedBy("has_plate", has(MItemTags.PLATE_TRITANIUM)) + .unlockedBy("has_colored_glass", has(mappedVanilla)) + .save(consumer, ResourceLocation(MOD_ID, "${item.registryName!!.path}_upgrade")) + ShapelessRecipeBuilder(paneItem, 8) .requires(MItems.INDUSTRIAL_GLASS_PANE, 8) .requires(tag)