From b208ca13586b6a1af7b4b642cfd12d4d1a4b4a59 Mon Sep 17 00:00:00 2001 From: DBotThePony Date: Wed, 4 Sep 2024 15:28:32 +0700 Subject: [PATCH] Uncolored tritanium blocks all stripe variants --- .../mc/otm/datagen/DecorativeData.kt | 32 +++-- .../datagen/advancements/AdvancementData.kt | 20 +-- .../mc/otm/datagen/items/ItemModels.kt | 2 +- .../mc/otm/datagen/lang/English.kt | 30 +++-- .../datagen/lang/MatteryLanguageProvider.kt | 127 +++--------------- .../mc/otm/datagen/lang/Russian.kt | 30 +++-- .../mc/otm/datagen/loot/LootTablesData.kt | 8 +- .../otm/datagen/recipes/DecorativesRecipes.kt | 24 ++-- .../mc/otm/datagen/recipes/PainterRecipes.kt | 62 +++++---- .../dbotthepony/mc/otm/datagen/tags/Tags.kt | 20 +-- .../CondensedCreativeCompat.kt | 11 +- .../ru/dbotthepony/mc/otm/registry/MBlocks.kt | 16 +-- .../mc/otm/registry/MCreativeTabs.kt | 8 +- .../ru/dbotthepony/mc/otm/registry/MItems.kt | 8 +- .../otm/registry/objects/DecorativeBlock.kt | 1 - .../stripe/tritanium_striped_block_black.png | Bin 0 -> 439 bytes .../stripe/tritanium_striped_block_blue.png | Bin 0 -> 462 bytes .../stripe/tritanium_striped_block_brown.png | Bin 0 -> 462 bytes .../stripe/tritanium_striped_block_cyan.png | Bin 0 -> 458 bytes .../stripe/tritanium_striped_block_gray.png | Bin 0 -> 451 bytes .../stripe/tritanium_striped_block_green.png | Bin 0 -> 462 bytes .../tritanium_striped_block_light_blue.png | Bin 0 -> 466 bytes .../tritanium_striped_block_light_gray.png | Bin 0 -> 458 bytes .../stripe/tritanium_striped_block_lime.png | Bin 0 -> 460 bytes .../tritanium_striped_block_magenta.png | Bin 0 -> 460 bytes .../stripe/tritanium_striped_block_orange.png | Bin 0 -> 466 bytes .../stripe/tritanium_striped_block_pink.png | Bin 0 -> 466 bytes .../stripe/tritanium_striped_block_purple.png | Bin 0 -> 466 bytes .../stripe/tritanium_striped_block_red.png | Bin 0 -> 462 bytes .../stripe/tritanium_striped_block_white.png | Bin 0 -> 463 bytes .../stripe/tritanium_striped_block_yellow.png | Bin 0 -> 466 bytes .../decorative/tritanium_striped_block.png | Bin 207 -> 0 bytes 32 files changed, 179 insertions(+), 220 deletions(-) create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/decorative/stripe/tritanium_striped_block_black.png create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/decorative/stripe/tritanium_striped_block_blue.png create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/decorative/stripe/tritanium_striped_block_brown.png create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/decorative/stripe/tritanium_striped_block_cyan.png create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/decorative/stripe/tritanium_striped_block_gray.png create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/decorative/stripe/tritanium_striped_block_green.png create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/decorative/stripe/tritanium_striped_block_light_blue.png create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/decorative/stripe/tritanium_striped_block_light_gray.png create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/decorative/stripe/tritanium_striped_block_lime.png create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/decorative/stripe/tritanium_striped_block_magenta.png create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/decorative/stripe/tritanium_striped_block_orange.png create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/decorative/stripe/tritanium_striped_block_pink.png create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/decorative/stripe/tritanium_striped_block_purple.png create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/decorative/stripe/tritanium_striped_block_red.png create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/decorative/stripe/tritanium_striped_block_white.png create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/decorative/stripe/tritanium_striped_block_yellow.png delete mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/decorative/tritanium_striped_block.png diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DecorativeData.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DecorativeData.kt index 4a14aec70..877de3427 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DecorativeData.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DecorativeData.kt @@ -269,17 +269,31 @@ fun addDecorativeData(blockStateProvider: MatteryBlockStateProvider, itemModelPr } } - DataGen.decorativeColumn(MBlocks.TRITANIUM_STRIPED_BLOCK, "tritanium_striped_block", "tritanium_block") - DataGen.decorativeStairs(MBlocks.TRITANIUM_STRIPED_STAIRS as StairBlock, "tritanium_striped_block", "tritanium_block") - DataGen.decorativeWall(MBlocks.TRITANIUM_STRIPED_WALL as WallBlock, "tritanium_striped_block", "tritanium_block") - DataGen.decorativeSlab(MBlocks.TRITANIUM_STRIPED_SLAB as SlabBlock, MBlocks.TRITANIUM_STRIPED_BLOCK.registryName!!, "tritanium_striped_block", "tritanium_block") - itemModelProvider.block(MItems.TRITANIUM_STRIPED_STAIRS) - itemModelProvider.block(MItems.TRITANIUM_STRIPED_SLAB) + MBlocks.TRITANIUM_STRIPED_BLOCK.entries.forEach { (c, it) -> + DataGen.decorativeColumn(it, "stripe/tritanium_striped_block_${c.name.lowercase()}", "tritanium_block") + } + + MBlocks.TRITANIUM_STRIPED_STAIRS.entries.forEach { (c, it) -> + DataGen.decorativeStairs(it, "stripe/tritanium_striped_block_${c.name.lowercase()}", "tritanium_block") + } + + MBlocks.TRITANIUM_STRIPED_WALL.entries.forEach { (c, it) -> + DataGen.decorativeWall(it, "stripe/tritanium_striped_block_${c.name.lowercase()}", "tritanium_block") + } + + MBlocks.TRITANIUM_STRIPED_SLAB.entries.forEach { (c, it) -> + DataGen.decorativeSlab(it, MBlocks.TRITANIUM_STRIPED_BLOCK[c]!!.registryName!!, "stripe/tritanium_striped_block_${c.name.lowercase()}", "tritanium_block") + } + + itemModelProvider.blocks(MItems.TRITANIUM_STRIPED_STAIRS.values) + itemModelProvider.blocks(MItems.TRITANIUM_STRIPED_SLAB.values) itemModelProvider.exec { - itemModelProvider.withExistingParent(MItems.TRITANIUM_STRIPED_WALL.registryName!!.path, modLocation("block/wall_inventory")) - .texture("wall_side", modLocation("${DataGen.DECORATIVE_BLOCK_LOCATION}/tritanium_striped_block")) - .texture("wall", modLocation("${DataGen.DECORATIVE_BLOCK_LOCATION}/tritanium_block")) + MBlocks.TRITANIUM_STRIPED_WALL.entries.forEach { (c, it) -> + itemModelProvider.withExistingParent(it.registryName!!.path, modLocation("block/wall_inventory")) + .texture("wall_side", modLocation("${DataGen.DECORATIVE_BLOCK_LOCATION}/stripe/tritanium_striped_block_${c.name.lowercase()}")) + .texture("wall", modLocation("${DataGen.DECORATIVE_BLOCK_LOCATION}/tritanium_block")) + } } for ((color, glass) in MRegistry.INDUSTRIAL_GLASS_PANE.allBlocks) { diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/advancements/AdvancementData.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/advancements/AdvancementData.kt index 32ecd25a1..184fb1f66 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/advancements/AdvancementData.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/advancements/AdvancementData.kt @@ -441,15 +441,15 @@ fun addAdvancements(serializer: Consumer, lang: MatteryLangua MRegistry.TRITANIUM_STRIPED_BLOCK.flatItems.forEach { advancement.addCriterion(it.registryName!!.path, criterion(it)) } MRegistry.TRITANIUM_STAIRS.allItems.values.forEach { advancement.addCriterion(it.registryName!!.path, criterion(it)) } MRegistry.TRITANIUM_STRIPED_STAIRS.flatItems.forEach { advancement.addCriterion(it.registryName!!.path, criterion(it)) } - MItems.TRITANIUM_STRIPED_BLOCK.also { advancement.addCriterion(it.registryName!!.path, criterion(it)) } - MItems.TRITANIUM_STRIPED_STAIRS.also { advancement.addCriterion(it.registryName!!.path, criterion(it)) } + MItems.TRITANIUM_STRIPED_BLOCK.values.forEach { advancement.addCriterion(it.registryName!!.path, criterion(it)) } + MItems.TRITANIUM_STRIPED_STAIRS.values.forEach { advancement.addCriterion(it.registryName!!.path, criterion(it)) } } .save(serializer, modLocation("regular/tritanium_block")) AdvancementBuilder() .parent(tritaniumBlock) .display( - itemStack = ItemStack(MItems.TRITANIUM_STRIPED_BLOCK), + itemStack = ItemStack(MItems.TRITANIUM_STRIPED_BLOCK[DyeColor.YELLOW]!!), title = translation.add("striped_tritanium_block", "Old Fashion Color Touch") { russian("Старомодная цветовая отделка") }, @@ -458,10 +458,10 @@ fun addAdvancements(serializer: Consumer, lang: MatteryLangua } ) .requirements(Strategy.OR) - .addCriterion("has_item", criterion(MItems.TRITANIUM_STRIPED_BLOCK)) - .addCriterion("has_item1", criterion(MItems.TRITANIUM_STRIPED_STAIRS)) - .addCriterion("has_item2", criterion(MItems.TRITANIUM_STRIPED_SLAB)) - .addCriterion("has_item3", criterion(MItems.TRITANIUM_STRIPED_WALL)) + .addCriterion("has_item", criterion(MItems.TRITANIUM_STRIPED_BLOCK[DyeColor.YELLOW]!!)) + .addCriterion("has_item1", criterion(MItems.TRITANIUM_STRIPED_STAIRS[DyeColor.YELLOW]!!)) + .addCriterion("has_item2", criterion(MItems.TRITANIUM_STRIPED_SLAB[DyeColor.YELLOW]!!)) + .addCriterion("has_item3", criterion(MItems.TRITANIUM_STRIPED_WALL[DyeColor.YELLOW]!!)) .save(serializer, modLocation("regular/striped_tritanium_block")) val colorTritaniumBlock = AdvancementBuilder() @@ -481,8 +481,8 @@ fun addAdvancements(serializer: Consumer, lang: MatteryLangua MRegistry.TRITANIUM_STAIRS.items.values.forEach { advancement.addCriterion(it.registryName!!.path, criterion(it)) } MRegistry.TRITANIUM_STRIPED_BLOCK.flatItems.forEach { advancement.addCriterion(it.registryName!!.path, criterion(it)) } MRegistry.TRITANIUM_STRIPED_STAIRS.flatItems.forEach { advancement.addCriterion(it.registryName!!.path, criterion(it)) } - MItems.TRITANIUM_STRIPED_BLOCK.also { advancement.addCriterion(it.registryName!!.path, criterion(it)) } - MItems.TRITANIUM_STRIPED_STAIRS.also { advancement.addCriterion(it.registryName!!.path, criterion(it)) } + MItems.TRITANIUM_STRIPED_BLOCK.values.forEach { advancement.addCriterion(it.registryName!!.path, criterion(it)) } + MItems.TRITANIUM_STRIPED_STAIRS.values.forEach { advancement.addCriterion(it.registryName!!.path, criterion(it)) } } .save(serializer, modLocation("regular/tritanium_block2")) @@ -522,7 +522,7 @@ fun addAdvancements(serializer: Consumer, lang: MatteryLangua .also { advancement -> MRegistry.TRITANIUM_BLOCK.items.values.forEach { advancement.addCriterion(it.registryName!!.path, criterion(it)) } MRegistry.TRITANIUM_STRIPED_BLOCK.flatItems.forEach { advancement.addCriterion(it.registryName!!.path, criterion(it)) } - MItems.TRITANIUM_STRIPED_BLOCK.also { advancement.addCriterion(it.registryName!!.path, criterion(it)) } + MItems.TRITANIUM_STRIPED_BLOCK.values.forEach { advancement.addCriterion(it.registryName!!.path, criterion(it)) } } .save(serializer, modLocation("regular/tritanium_block4")) diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/items/ItemModels.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/items/ItemModels.kt index 4bb5d4dd2..021692971 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/items/ItemModels.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/items/ItemModels.kt @@ -25,7 +25,7 @@ fun addItemModels(provider: MatteryItemModelProvider) { provider.generatedTranslucent(MItems.TRITANIUM_BARS, modLocation("block/decorative/tritanium_bars")) provider.block(MItems.DEEPSLATE_TRITANIUM_ORE) provider.block(MItems.TRITANIUM_ORE) - provider.block(MItems.TRITANIUM_STRIPED_BLOCK) + provider.blocks(MItems.TRITANIUM_STRIPED_BLOCK.values) provider.block(MItems.TRITANIUM_RAW_BLOCK) provider.block(MItems.TRITANIUM_INGOT_BLOCK) provider.coloredWithBaseBlock(MItems.ITEM_MONITOR, "item_monitor") diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/lang/English.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/lang/English.kt index 972b5eb89..0c37da5c8 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/lang/English.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/lang/English.kt @@ -26,7 +26,7 @@ private fun decoratives(provider: MatteryLanguageProvider) { } with (provider.english) { - for ((color, name) in provider.englishColors.dyeClassMapped) { + for ((color, name) in provider.englishColors.mapped) { add(MItems.CARGO_CRATE_MINECARTS[color]!!, "Minecart with $name Cargo Crate") add(MEntityTypes.CARGO_CRATE_MINECARTS[color]!!, "Minecart with $name Cargo Crate") @@ -50,6 +50,13 @@ private fun decoratives(provider: MatteryLanguageProvider) { add(MRegistry.TRITANIUM_PRESSURE_PLATE.block, "description1", "High blast resistance") } + with(provider.englishColors) { + addIntermediate(MBlocks.TRITANIUM_STRIPED_BLOCK, "Tritanium %s Striped Block") + addIntermediate(MBlocks.TRITANIUM_STRIPED_STAIRS, "Tritanium %s Striped Stairs") + addIntermediate(MBlocks.TRITANIUM_STRIPED_SLAB, "Tritanium %s Striped Slab") + addIntermediate(MBlocks.TRITANIUM_STRIPED_WALL, "Tritanium %s Striped Wall") + } + with(provider.english) { add(MItems.CARGO_CRATE_MINECARTS[null]!!, "Minecart with Cargo Crate") add(MEntityTypes.CARGO_CRATE_MINECARTS[null]!!, "Minecart with Cargo Crate") @@ -70,12 +77,11 @@ private fun decoratives(provider: MatteryLanguageProvider) { add(MRegistry.VENT.block, "Vent") add(MRegistry.VENT_ALTERNATIVE.block, "Alternative Vent") - for ((block, colors) in MRegistry.TRITANIUM_STRIPED_BLOCK.blocksWithColor) { val (base, stripe) = colors - val baseName = provider.englishColors.dyeClassMapped[base]!! - val stripeName = provider.englishColors.dyeClassMapped[stripe]!! + val baseName = provider.englishColors.mapped[base]!! + val stripeName = provider.englishColors.mapped[stripe]!! add(block, "$baseName Colored $stripeName Striped Tritanium Block") } @@ -83,8 +89,8 @@ private fun decoratives(provider: MatteryLanguageProvider) { for ((block, colors) in MRegistry.TRITANIUM_STRIPED_STAIRS.blocksWithColor) { val (base, stripe) = colors - val baseName = provider.englishColors.dyeClassMapped[base]!! - val stripeName = provider.englishColors.dyeClassMapped[stripe]!! + val baseName = provider.englishColors.mapped[base]!! + val stripeName = provider.englishColors.mapped[stripe]!! add(block, "$baseName Colored $stripeName Striped Tritanium Stairs") } @@ -92,8 +98,8 @@ private fun decoratives(provider: MatteryLanguageProvider) { for ((block, colors) in MRegistry.TRITANIUM_STRIPED_SLAB.blocksWithColor) { val (base, stripe) = colors - val baseName = provider.englishColors.dyeClassMapped[base]!! - val stripeName = provider.englishColors.dyeClassMapped[stripe]!! + val baseName = provider.englishColors.mapped[base]!! + val stripeName = provider.englishColors.mapped[stripe]!! add(block, "$baseName Colored $stripeName Striped Tritanium Slab") } @@ -101,8 +107,8 @@ private fun decoratives(provider: MatteryLanguageProvider) { for ((block, colors) in MRegistry.TRITANIUM_STRIPED_WALL.blocksWithColor) { val (base, stripe) = colors - val baseName = provider.englishColors.dyeClassMapped[base]!! - val stripeName = provider.englishColors.dyeClassMapped[stripe]!! + val baseName = provider.englishColors.mapped[base]!! + val stripeName = provider.englishColors.mapped[stripe]!! add(block, "$baseName Colored $stripeName Striped Tritanium Wall") } @@ -548,10 +554,6 @@ private fun blocks(provider: MatteryLanguageProvider) { add(MBlocks.METAL_JUNK, "desc", "Useless junk, or is it?") add(MBlocks.METAL_MESH, "Metal Mesh") - add(MBlocks.TRITANIUM_STRIPED_BLOCK, "Tritanium Striped Block") - add(MBlocks.TRITANIUM_STRIPED_STAIRS, "Tritanium Striped Stairs") - add(MBlocks.TRITANIUM_STRIPED_SLAB, "Tritanium Striped Slab") - add(MBlocks.TRITANIUM_STRIPED_WALL, "Tritanium Striped Wall") add(MBlocks.TRITANIUM_ORE, "Tritanium Ore") add(MBlocks.DEEPSLATE_TRITANIUM_ORE, "Deepslate Tritanium Ore") add(MBlocks.TRITANIUM_RAW_BLOCK, "Raw Tritanium Block") diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/lang/MatteryLanguageProvider.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/lang/MatteryLanguageProvider.kt index 211b18965..37279b540 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/lang/MatteryLanguageProvider.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/lang/MatteryLanguageProvider.kt @@ -1,6 +1,5 @@ package ru.dbotthepony.mc.otm.datagen.lang -import com.google.common.collect.ImmutableList import com.google.common.collect.ImmutableMap import it.unimi.dsi.fastutil.objects.Object2ObjectArrayMap import net.minecraft.data.DataGenerator @@ -13,7 +12,6 @@ import net.minecraft.world.entity.EntityType import net.minecraft.world.item.DyeColor import net.minecraft.world.item.Item import net.minecraft.world.item.ItemStack -import net.minecraft.world.item.enchantment.Enchantment import net.minecraft.world.level.block.Block import net.neoforged.neoforge.common.data.LanguageProvider import ru.dbotthepony.mc.otm.OverdriveThatMatters @@ -123,6 +121,7 @@ class MatteryLanguageProvider(private val gen: DataGenerator) { inner class Colors( language: String, + val lowercaseIntermediate: Boolean, val white: String, val orange: String, @@ -143,86 +142,7 @@ class MatteryLanguageProvider(private val gen: DataGenerator) { ) { val slave: LanguageProvider = slaves.computeIfAbsent(language, ::Slave) - val list: List = ImmutableList.builder() - .add(white) - .add(orange) - .add(magenta) - .add(lightBlue) - .add(yellow) - .add(lime) - .add(pink) - .add(gray) - .add(lightGray) - .add(cyan) - .add(purple) - .add(blue) - .add(brown) - .add(green) - .add(red) - .add(black) - .build() - - val pairList: List> = ImmutableList.builder>() - .add("white" to white) - .add("orange" to orange) - .add("magenta" to magenta) - .add("light_blue" to lightBlue) - .add("yellow" to yellow) - .add("lime" to lime) - .add("pink" to pink) - .add("gray" to gray) - .add("light_gray" to lightGray) - .add("cyan" to cyan) - .add("purple" to purple) - .add("blue" to blue) - .add("brown" to brown) - .add("green" to green) - .add("red" to red) - .add("black" to black) - .build() - - val mapped: Map = ImmutableMap.builder() - .put("white", white) - .put("orange", orange) - .put("magenta", magenta) - .put("lightBlue", lightBlue) - .put("light_blue", lightBlue) - .put("yellow", yellow) - .put("lime", lime) - .put("pink", pink) - .put("gray", gray) - .put("lightGray", lightGray) - .put("light_gray", lightGray) - .put("cyan", cyan) - .put("purple", purple) - .put("blue", blue) - .put("brown", brown) - .put("green", green) - .put("red", red) - .put("black", black) - - .put("WHITE", white) - .put("ORANGE", orange) - .put("MAGENTA", magenta) - .put("LIGHTBLUE", lightBlue) - .put("LIGHT_BLUE", lightBlue) - .put("YELLOW", yellow) - .put("LIME", lime) - .put("PINK", pink) - .put("GRAY", gray) - .put("LIGHTGRAY", lightGray) - .put("LIGHT_GRAY", lightGray) - .put("CYAN", cyan) - .put("PURPLE", purple) - .put("BLUE", blue) - .put("BROWN", brown) - .put("GREEN", green) - .put("RED", red) - .put("BLACK", black) - - .build() - - val dyeClassMapped: Map = ImmutableMap.builder() + val mapped: Map = ImmutableMap.builder() .put(DyeColor.WHITE, white) .put(DyeColor.ORANGE, orange) .put(DyeColor.MAGENTA, magenta) @@ -241,37 +161,30 @@ class MatteryLanguageProvider(private val gen: DataGenerator) { .put(DyeColor.BLACK, black) .build() - val dyeClassPairs: List> = ImmutableList.builder>() - .add(DyeColor.WHITE to white) - .add(DyeColor.ORANGE to orange) - .add(DyeColor.MAGENTA to magenta) - .add(DyeColor.LIGHT_BLUE to lightBlue) - .add(DyeColor.YELLOW to yellow) - .add(DyeColor.LIME to lime) - .add(DyeColor.PINK to pink) - .add(DyeColor.GRAY to gray) - .add(DyeColor.LIGHT_GRAY to lightGray) - .add(DyeColor.CYAN to cyan) - .add(DyeColor.PURPLE to purple) - .add(DyeColor.BLUE to blue) - .add(DyeColor.BROWN to brown) - .add(DyeColor.GREEN to green) - .add(DyeColor.RED to red) - .add(DyeColor.BLACK to black) - .build() - fun add(list: ColoredDecorativeBlock, toFormat: String) { - for ((color, target) in dyeClassPairs) { + for ((color, target) in mapped) { slave.add(list.blocks[color]!!, toFormat.format(target)) } } fun forEach(consumer: (color: DyeColor, name: String) -> Unit) { - for ((a, b) in dyeClassPairs) { + for ((a, b) in mapped) { consumer.invoke(a, b) } } + fun add(map: Map, toFormat: String) { + for ((color, block) in map) { + slave.add(block, toFormat.format(mapped[color]!!)) + } + } + + fun addIntermediate(map: Map, toFormat: String) { + for ((color, block) in map) { + slave.add(block, toFormat.format(if (lowercaseIntermediate) mapped[color]!!.lowercase() else mapped[color]!!)) + } + } + fun add( whiteBlock: Block, orangeBlock: Block, @@ -349,7 +262,7 @@ class MatteryLanguageProvider(private val gen: DataGenerator) { } } - val englishColors = Colors("en_us", + val englishColors = Colors("en_us", lowercaseIntermediate = false, "White", "Orange", "Magenta", @@ -368,16 +281,16 @@ class MatteryLanguageProvider(private val gen: DataGenerator) { "Black", ) - val russianColors = Colors("ru_ru", + val russianColors = Colors("ru_ru", lowercaseIntermediate = true, "Белый", "Оранжевый", "Маджентовый", - "Светло Синий", + "Светло синий", "Жёлтый", "Лаймовый", "Розовый", "Серый", - "Светло Серый", + "Светло серый", "Циановый", "Пурпурный", "Синий", 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 f28ca8b7f..8844d4bd6 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 @@ -1,6 +1,5 @@ package ru.dbotthepony.mc.otm.datagen.lang -import net.minecraft.world.item.DyeColor import ru.dbotthepony.mc.otm.registry.AndroidFeatures import ru.dbotthepony.mc.otm.registry.MBlocks import ru.dbotthepony.mc.otm.registry.MEntityTypes @@ -35,8 +34,15 @@ private fun decoratives(provider: MatteryLanguageProvider) { add(MRegistry.DECORATIVE_CRATE, "%s блок контейнера") } + with (provider.russianColors) { + addIntermediate(MBlocks.TRITANIUM_STRIPED_BLOCK, "Тритановый блок с %s полоской") + addIntermediate(MBlocks.TRITANIUM_STRIPED_STAIRS, "Тритановые ступеньки с %s полоской") + addIntermediate(MBlocks.TRITANIUM_STRIPED_SLAB, "Тритановая плита с %s полоской") + addIntermediate(MBlocks.TRITANIUM_STRIPED_WALL, "Тритановая ограда с %s полоской") + } + with (provider.russian) { - for ((color, name) in provider.russianColors.dyeClassMapped) { + for ((color, name) in provider.russianColors.mapped) { add(MItems.CARGO_CRATE_MINECARTS[color]!!, "Вагонетка с $name грузовым ящиком") add(MEntityTypes.CARGO_CRATE_MINECARTS[color]!!, "Вагонетка с $name грузовым ящиком") @@ -83,8 +89,8 @@ private fun decoratives(provider: MatteryLanguageProvider) { for ((block, colors) in MRegistry.TRITANIUM_STRIPED_BLOCK.blocksWithColor) { val (base, stripe) = colors - val baseName = provider.russianColors.dyeClassMapped[base]!! - val stripeName = provider.russianColors.dyeClassMapped[stripe]!! + val baseName = provider.russianColors.mapped[base]!! + val stripeName = provider.russianColors.mapped[stripe]!! add(block, "$baseName-окрашенный $stripeName-ополосаченный тритановый блок") } @@ -92,8 +98,8 @@ private fun decoratives(provider: MatteryLanguageProvider) { for ((block, colors) in MRegistry.TRITANIUM_STRIPED_STAIRS.blocksWithColor) { val (base, stripe) = colors - val baseName = provider.russianColors.dyeClassMapped[base]!! - val stripeName = provider.russianColors.dyeClassMapped[stripe]!! + val baseName = provider.russianColors.mapped[base]!! + val stripeName = provider.russianColors.mapped[stripe]!! add(block, "$baseName-окрашенные $stripeName-ополосаченные тритановые ступеньки") } @@ -101,8 +107,8 @@ private fun decoratives(provider: MatteryLanguageProvider) { for ((block, colors) in MRegistry.TRITANIUM_STRIPED_SLAB.blocksWithColor) { val (base, stripe) = colors - val baseName = provider.russianColors.dyeClassMapped[base]!! - val stripeName = provider.russianColors.dyeClassMapped[stripe]!! + val baseName = provider.russianColors.mapped[base]!! + val stripeName = provider.russianColors.mapped[stripe]!! add(block, "$baseName-окрашенная $stripeName-ополосаченная тритановая Плита") } @@ -110,8 +116,8 @@ private fun decoratives(provider: MatteryLanguageProvider) { for ((block, colors) in MRegistry.TRITANIUM_STRIPED_WALL.blocksWithColor) { val (base, stripe) = colors - val baseName = provider.russianColors.dyeClassMapped[base]!! - val stripeName = provider.russianColors.dyeClassMapped[stripe]!! + val baseName = provider.russianColors.mapped[base]!! + val stripeName = provider.russianColors.mapped[stripe]!! add(block, "$baseName-окрашенная $stripeName-ополосаченная тритановая ограда") } @@ -553,10 +559,6 @@ private fun blocks(provider: MatteryLanguageProvider) { add(MBlocks.METAL_JUNK, "Металлический хлам") add(MBlocks.METAL_JUNK, "desc", "Бесполезный хлам, или нет?") - add(MBlocks.TRITANIUM_STRIPED_BLOCK, "Тритановый блок с полоской") - add(MBlocks.TRITANIUM_STRIPED_STAIRS, "Тритановые ступеньки с полоской") - add(MBlocks.TRITANIUM_STRIPED_SLAB, "Тритановая плита с полоской") - add(MBlocks.TRITANIUM_STRIPED_WALL, "Тритановая ограда с полоской") add(MBlocks.TRITANIUM_ORE, "Тритановая руда") add(MBlocks.DEEPSLATE_TRITANIUM_ORE, "Тританоносный глубинный сланец") add(MBlocks.TRITANIUM_RAW_BLOCK, "Блок рудного тритана") diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/loot/LootTablesData.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/loot/LootTablesData.kt index c1819cbf0..59ca7a7a4 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/loot/LootTablesData.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/loot/LootTablesData.kt @@ -72,10 +72,10 @@ fun addLootTables(lootTables: LootTables) { lootTables.dropsSelf(MBlocks.CARBON_FIBRE_BLOCK) { condition(ExplosionCondition.survivesExplosion()) } lootTables.dropsSelf(MBlocks.METAL_MESH) { condition(ExplosionCondition.survivesExplosion()) } lootTables.dropsSelf(MBlocks.TRITANIUM_RAW_BLOCK) { condition(ExplosionCondition.survivesExplosion()) } - lootTables.dropsSelf(MBlocks.TRITANIUM_STRIPED_BLOCK) { condition(ExplosionCondition.survivesExplosion()) } - lootTables.dropsSelf(MBlocks.TRITANIUM_STRIPED_WALL) { condition(ExplosionCondition.survivesExplosion()) } - lootTables.dropsSelf(MBlocks.TRITANIUM_STRIPED_STAIRS) { condition(ExplosionCondition.survivesExplosion()) } - lootTables.createSlabItemTable(MBlocks.TRITANIUM_STRIPED_SLAB) { condition(ExplosionCondition.survivesExplosion()) } + lootTables.dropsSelf(MBlocks.TRITANIUM_STRIPED_BLOCK.values) { condition(ExplosionCondition.survivesExplosion()) } + lootTables.dropsSelf(MBlocks.TRITANIUM_STRIPED_WALL.values) { condition(ExplosionCondition.survivesExplosion()) } + lootTables.dropsSelf(MBlocks.TRITANIUM_STRIPED_STAIRS.values) { condition(ExplosionCondition.survivesExplosion()) } + lootTables.createSlabItemTable(MBlocks.TRITANIUM_STRIPED_SLAB.values) { condition(ExplosionCondition.survivesExplosion()) } lootTables.dropsSelf(MBlocks.MATTER_CABLE) { condition(ExplosionCondition.survivesExplosion()) } lootTables.dropsSelf(MBlocks.GRAVITATION_STABILIZER) lootTables.dropsOther(MBlocks.GRAVITATION_STABILIZER_LENS, MBlocks.GRAVITATION_STABILIZER) diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/DecorativesRecipes.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/DecorativesRecipes.kt index 3a5b31178..ea87b8ab4 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/DecorativesRecipes.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/DecorativesRecipes.kt @@ -109,9 +109,11 @@ fun addDecorativesRecipes(provider: MatteryRecipeProvider, consumer: RecipeOutpu wallWithCut(item, MRegistry.TRITANIUM_STRIPED_WALL.getItem(a, b), consumer) } - stairsWithCut(MItems.TRITANIUM_STRIPED_BLOCK, MItems.TRITANIUM_STRIPED_STAIRS, consumer) - slabWithCut(MItems.TRITANIUM_STRIPED_BLOCK, MItems.TRITANIUM_STRIPED_SLAB, consumer) - wallWithCut(MItems.TRITANIUM_STRIPED_BLOCK, MItems.TRITANIUM_STRIPED_WALL, consumer) + for (color in DyeColor.entries) { + stairsWithCut(MItems.TRITANIUM_STRIPED_BLOCK[color]!!, MItems.TRITANIUM_STRIPED_STAIRS[color]!!, consumer) + slabWithCut(MItems.TRITANIUM_STRIPED_BLOCK[color]!!, MItems.TRITANIUM_STRIPED_SLAB[color]!!, consumer) + wallWithCut(MItems.TRITANIUM_STRIPED_BLOCK[color]!!, MItems.TRITANIUM_STRIPED_WALL[color]!!, consumer) + } for ((color, item) in MRegistry.FLOOR_TILES.items) { stairsWithCut(item, MRegistry.FLOOR_TILES_STAIRS.items[color]!!, consumer) @@ -275,13 +277,15 @@ fun addDecorativesRecipes(provider: MatteryRecipeProvider, consumer: RecipeOutpu .unlockedBy(MItems.LABORATORY_LAMP) .save(consumer, MItems.LABORATORY_LAMP_INVERTED.registryName!!.toString() + "_inv") - MatteryRecipe(MBlocks.TRITANIUM_STRIPED_BLOCK, 24, category = RecipeCategory.BUILDING_BLOCKS) - .rowB(MItemTags.TRITANIUM_INGOTS) - .row(MItemTags.TRITANIUM_INGOTS, Tags.Items.COBBLESTONES, MItemTags.TRITANIUM_INGOTS) - .rowAB(Tags.Items.DYES_YELLOW, MItemTags.TRITANIUM_INGOTS) - .unlockedBy(MItemTags.TRITANIUM_INGOTS) - .unlockedBy(Tags.Items.DYES_YELLOW) - .build(consumer, modLocation("decorative/blocks/striped_default")) + for (color in DyeColor.entries) { + MatteryRecipe(MBlocks.TRITANIUM_STRIPED_BLOCK[color]!!, 24, category = RecipeCategory.BUILDING_BLOCKS) + .rowB(MItemTags.TRITANIUM_INGOTS) + .row(MItemTags.TRITANIUM_INGOTS, Tags.Items.COBBLESTONES, MItemTags.TRITANIUM_INGOTS) + .rowAB(color.tag, MItemTags.TRITANIUM_INGOTS) + .unlockedBy(MItemTags.TRITANIUM_INGOTS) + .unlockedBy(color.tag) + .build(consumer, modLocation("decorative/blocks/striped_default_${color.name.lowercase()}")) + } MatteryRecipe(MRegistry.TRITANIUM_BLOCK.item, 24, category = RecipeCategory.BUILDING_BLOCKS) .rowB(MItemTags.TRITANIUM_INGOTS) diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/PainterRecipes.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/PainterRecipes.kt index 145e4dd3d..59a20c85b 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/PainterRecipes.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/PainterRecipes.kt @@ -44,9 +44,13 @@ private fun generate(consumer: RecipeOutput, default: Item, items: Map) { - consumer.accept(modLocation("painter/cleaning/" + to.recipeName), PainterRecipe( - Ingredient.of(from.entries.stream().filter { it.key != null }.map { ItemStack(it.value) }), +private fun cleaning(consumer: RecipeOutput, to: Item, from: Map, suffix: String = "") { + cleaning(consumer, to, from.entries.stream().filter { it.key != null }.map { it.value }.toList(), suffix) +} + +private fun cleaning(consumer: RecipeOutput, to: Item, from: Collection, suffix: String = "") { + consumer.accept(modLocation("painter/cleaning/" + to.recipeName + suffix), PainterRecipe( + Ingredient.of(from.stream().map { ItemStack(it) }), ItemStack(to), mapOf(null to 15) )) @@ -321,27 +325,39 @@ fun addPainterRecipes(consumer: RecipeOutput) { consumer.accept(modLocation("painter/armor_clear_dye"), PainterArmorDyeRecipe(mapOf(null to 15))) - consumer.accept(modLocation("painter/tritanium_yellow_stripe"), PainterRecipe( - Ingredient.of(MRegistry.TRITANIUM_BLOCK.item), - ItemStack(MItems.TRITANIUM_STRIPED_BLOCK), - mapOf(DyeColor.YELLOW to 1) - )) + generate(consumer, MItems.TRITANIUM_STRIPED_BLOCK) + generate(consumer, MItems.TRITANIUM_STRIPED_STAIRS) + generate(consumer, MItems.TRITANIUM_STRIPED_SLAB) + generate(consumer, MItems.TRITANIUM_STRIPED_WALL) - consumer.accept(modLocation("painter/tritanium_yellow_stripe_stairs"), PainterRecipe( - Ingredient.of(MRegistry.TRITANIUM_STAIRS.item), - ItemStack(MItems.TRITANIUM_STRIPED_STAIRS), - mapOf(DyeColor.YELLOW to 1) - )) + cleaning(consumer, MRegistry.TRITANIUM_BLOCK.item, MItems.TRITANIUM_STRIPED_BLOCK.values, "_from_striped") + cleaning(consumer, MRegistry.TRITANIUM_STAIRS.item, MItems.TRITANIUM_STRIPED_STAIRS.values, "_from_striped") + cleaning(consumer, MRegistry.TRITANIUM_SLAB.item, MItems.TRITANIUM_STRIPED_SLAB.values, "_from_striped") + cleaning(consumer, MRegistry.TRITANIUM_WALL.item, MItems.TRITANIUM_STRIPED_WALL.values, "_from_striped") - consumer.accept(modLocation("painter/tritanium_yellow_stripe_slab"), PainterRecipe( - Ingredient.of(MRegistry.TRITANIUM_SLAB.item), - ItemStack(MItems.TRITANIUM_STRIPED_SLAB), - mapOf(DyeColor.YELLOW to 1) - )) + for (color in DyeColor.entries) { + consumer.accept(modLocation("painter/tritanium_${color.name.lowercase()}_stripe"), PainterRecipe( + Ingredient.of(MRegistry.TRITANIUM_BLOCK.item), + ItemStack(MItems.TRITANIUM_STRIPED_BLOCK[color]!!), + mapOf(color to 1) + )) - consumer.accept(modLocation("painter/tritanium_yellow_stripe_wall"), PainterRecipe( - Ingredient.of(MRegistry.TRITANIUM_WALL.item), - ItemStack(MItems.TRITANIUM_STRIPED_WALL), - mapOf(DyeColor.YELLOW to 1) - )) + consumer.accept(modLocation("painter/tritanium_${color.name.lowercase()}_stripe_stairs"), PainterRecipe( + Ingredient.of(MRegistry.TRITANIUM_STAIRS.item), + ItemStack(MItems.TRITANIUM_STRIPED_STAIRS[color]!!), + mapOf(color to 1) + )) + + consumer.accept(modLocation("painter/tritanium_${color.name.lowercase()}_stripe_slab"), PainterRecipe( + Ingredient.of(MRegistry.TRITANIUM_SLAB.item), + ItemStack(MItems.TRITANIUM_STRIPED_SLAB[color]!!), + mapOf(color to 1) + )) + + consumer.accept(modLocation("painter/tritanium_${color.name.lowercase()}_stripe_wall"), PainterRecipe( + Ingredient.of(MRegistry.TRITANIUM_WALL.item), + ItemStack(MItems.TRITANIUM_STRIPED_WALL[color]!!), + mapOf(color to 1) + )) + } } diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/tags/Tags.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/tags/Tags.kt index cde54e66c..0d9e0cdbd 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/tags/Tags.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/tags/Tags.kt @@ -151,35 +151,35 @@ fun addTags(tagsProvider: TagsProvider) { .add(MRegistry.FLOOR_TILES_STAIRS.blocks.values) .add(MRegistry.TRITANIUM_STAIRS.allBlocks.values) .add(MRegistry.TRITANIUM_STRIPED_STAIRS.flatBlocks) - .add(MBlocks.TRITANIUM_STRIPED_STAIRS) + .add(MBlocks.TRITANIUM_STRIPED_STAIRS.values) tagsProvider.blocks.Appender(BlockTags.SLABS) .add(MRegistry.TRITANIUM_SLAB.allBlocks.values) .add(MRegistry.TRITANIUM_STRIPED_SLAB.flatBlocks) .add(MRegistry.FLOOR_TILES_SLAB.blocks.values) - .add(MBlocks.TRITANIUM_STRIPED_SLAB) + .add(MBlocks.TRITANIUM_STRIPED_SLAB.values) tagsProvider.blocks.Appender(BlockTags.WALLS) .add(MRegistry.TRITANIUM_WALL.allBlocks.values) .add(MRegistry.TRITANIUM_STRIPED_WALL.flatBlocks) - .add(MBlocks.TRITANIUM_STRIPED_WALL) + .add(MBlocks.TRITANIUM_STRIPED_WALL.values) tagsProvider.items.Appender(ItemTags.STAIRS) .add(MRegistry.FLOOR_TILES_STAIRS.items.values) .add(MRegistry.TRITANIUM_STAIRS.allItems.values) .add(MRegistry.TRITANIUM_STRIPED_STAIRS.flatItems) - .add(MItems.TRITANIUM_STRIPED_STAIRS) + .add(MItems.TRITANIUM_STRIPED_STAIRS.values) tagsProvider.items.Appender(ItemTags.SLABS) .add(MRegistry.TRITANIUM_SLAB.allItems.values) .add(MRegistry.TRITANIUM_STRIPED_SLAB.flatItems) .add(MRegistry.FLOOR_TILES_SLAB.items.values) - .add(MItems.TRITANIUM_STRIPED_SLAB) + .add(MItems.TRITANIUM_STRIPED_SLAB.values) tagsProvider.items.Appender(ItemTags.WALLS) .add(MRegistry.TRITANIUM_WALL.allItems.values) .add(MRegistry.TRITANIUM_STRIPED_WALL.flatItems) - .add(MItems.TRITANIUM_STRIPED_WALL) + .add(MItems.TRITANIUM_STRIPED_WALL.values) tagsProvider.requiresPickaxe(MBlocks.TRITANIUM_DOOR.values, Tiers.IRON) tagsProvider.requiresPickaxe(MBlocks.TRITANIUM_TRAPDOOR.values, Tiers.IRON) @@ -243,10 +243,10 @@ fun addTags(tagsProvider: TagsProvider) { tagsProvider.requiresPickaxe(MBlocks.DEEPSLATE_TRITANIUM_ORE, Tiers.IRON) tagsProvider.requiresPickaxe(MBlocks.TRITANIUM_RAW_BLOCK, Tiers.IRON) - tagsProvider.requiresPickaxe(MBlocks.TRITANIUM_STRIPED_BLOCK, Tiers.IRON) - tagsProvider.requiresPickaxe(MBlocks.TRITANIUM_STRIPED_STAIRS, Tiers.IRON) - tagsProvider.requiresPickaxe(MBlocks.TRITANIUM_STRIPED_WALL, Tiers.IRON) - tagsProvider.requiresPickaxe(MBlocks.TRITANIUM_STRIPED_SLAB, Tiers.IRON) + tagsProvider.requiresPickaxe(MBlocks.TRITANIUM_STRIPED_BLOCK.values, Tiers.IRON) + tagsProvider.requiresPickaxe(MBlocks.TRITANIUM_STRIPED_STAIRS.values, Tiers.IRON) + tagsProvider.requiresPickaxe(MBlocks.TRITANIUM_STRIPED_WALL.values, Tiers.IRON) + tagsProvider.requiresPickaxe(MBlocks.TRITANIUM_STRIPED_SLAB.values, Tiers.IRON) tagsProvider.requiresPickaxe(MBlocks.CARBON_FIBRE_BLOCK, Tiers.IRON) tagsProvider.requiresPickaxe(MBlocks.INFINITE_WATER_SOURCE, Tiers.STONE) diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/compat/condensed_creative/CondensedCreativeCompat.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/compat/condensed_creative/CondensedCreativeCompat.kt index 48c3b7bdb..71fd9d2ae 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/compat/condensed_creative/CondensedCreativeCompat.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/compat/condensed_creative/CondensedCreativeCompat.kt @@ -30,6 +30,11 @@ class CondensedCreativeCompat : CondensedCreativeInitializer { addByBase(MItems.COBBLESTONE_GENERATOR, MCreativeTabs.MAIN) addByBase(MItems.ESSENCE_STORAGE, MCreativeTabs.MAIN) + addByColor(MItems.TRITANIUM_STRIPED_BLOCK, DyeColor.YELLOW, MCreativeTabs.DECORATIVE) + addByColor(MItems.TRITANIUM_STRIPED_STAIRS, DyeColor.YELLOW, MCreativeTabs.DECORATIVE) + addByColor(MItems.TRITANIUM_STRIPED_SLAB, DyeColor.YELLOW, MCreativeTabs.DECORATIVE) + addByColor(MItems.TRITANIUM_STRIPED_WALL, DyeColor.YELLOW, MCreativeTabs.DECORATIVE) + addByBase(MItems.MATTER_DECOMPOSER, MCreativeTabs.MAIN) addByBase(MItems.MATTER_CAPACITOR_BANK, MCreativeTabs.MAIN) addByBase(MItems.MATTER_SCANNER, MCreativeTabs.MAIN) @@ -88,7 +93,11 @@ class CondensedCreativeCompat : CondensedCreativeInitializer { } private fun addByWhite(map: Map, vararg tabs: CreativeModeTab): CondensedItemEntry.Builder? { - val base = map[DyeColor.WHITE] + return addByColor(map, DyeColor.WHITE, *tabs) + } + + private fun addByColor(map: Map, color: DyeColor, vararg tabs: CreativeModeTab): CondensedItemEntry.Builder? { + val base = map[color] val builder = CondensedEntryRegistry.fromItems(base!!.registryName, base, map.values) tabs.forEach { builder.addToItemGroup(it) } diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MBlocks.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MBlocks.kt index 4b1cdc6f4..3fb3b140f 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MBlocks.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MBlocks.kt @@ -270,7 +270,7 @@ object MBlocks { val TRITANIUM_TRAPDOOR = registry.coloredWithBase(MNames.TRITANIUM_TRAPDOOR, ::TritaniumTrapdoorBlock) - val TRITANIUM_STRIPED_BLOCK: Block by registry.register(MNames.TRITANIUM_STRIPED_BLOCK, true) { Block( + val TRITANIUM_STRIPED_BLOCK = registry.colored(MNames.TRITANIUM_STRIPED_BLOCK) { Block( BlockBehaviour.Properties.of() .mapColor(MapColor.COLOR_LIGHT_BLUE) .sound(SoundType.BASALT) @@ -279,17 +279,17 @@ object MBlocks { .destroyTime(2.5f) ) } - val TRITANIUM_STRIPED_STAIRS: Block by registry.register(MNames.TRITANIUM_STRIPED_STAIRS) { StairBlock( - TRITANIUM_STRIPED_BLOCK.defaultBlockState(), - BlockBehaviour.Properties.ofLegacyCopy(TRITANIUM_STRIPED_BLOCK) + val TRITANIUM_STRIPED_STAIRS = registry.colored(MNames.TRITANIUM_STRIPED_STAIRS) { StairBlock( + TRITANIUM_STRIPED_BLOCK[it]!!.defaultBlockState(), + BlockBehaviour.Properties.ofLegacyCopy(TRITANIUM_STRIPED_BLOCK[it]!!) ) } - val TRITANIUM_STRIPED_SLAB: Block by registry.register(MNames.TRITANIUM_STRIPED_SLAB) { - SlabBlock(BlockBehaviour.Properties.ofLegacyCopy(TRITANIUM_STRIPED_BLOCK)) + val TRITANIUM_STRIPED_SLAB = registry.colored(MNames.TRITANIUM_STRIPED_SLAB) { + SlabBlock(BlockBehaviour.Properties.ofLegacyCopy(TRITANIUM_STRIPED_BLOCK[it]!!)) } - val TRITANIUM_STRIPED_WALL: Block by registry.register(MNames.TRITANIUM_STRIPED_WALL) { - WallBlock(BlockBehaviour.Properties.ofLegacyCopy(TRITANIUM_STRIPED_BLOCK)) + val TRITANIUM_STRIPED_WALL = registry.colored(MNames.TRITANIUM_STRIPED_WALL) { + WallBlock(BlockBehaviour.Properties.ofLegacyCopy(TRITANIUM_STRIPED_BLOCK[it]!!)) } val CARBON_FIBRE_BLOCK: Block by registry.register(MNames.CARBON_FIBRE_BLOCK) { Block( diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MCreativeTabs.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MCreativeTabs.kt index 578bcd500..58dc26ffc 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MCreativeTabs.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MCreativeTabs.kt @@ -225,10 +225,10 @@ private fun addDecorativeTabItems(consumer: CreativeModeTab.Output) { accept(MItems.METAL_BEAM) accept(MItems.ENGINE) - accept(MItems.TRITANIUM_STRIPED_BLOCK) - accept(MItems.TRITANIUM_STRIPED_STAIRS) - accept(MItems.TRITANIUM_STRIPED_SLAB) - accept(MItems.TRITANIUM_STRIPED_WALL) + accept(MItems.TRITANIUM_STRIPED_BLOCK.values) + accept(MItems.TRITANIUM_STRIPED_STAIRS.values) + accept(MItems.TRITANIUM_STRIPED_SLAB.values) + accept(MItems.TRITANIUM_STRIPED_WALL.values) accept(MItems.CARBON_FIBRE_BLOCK) accept(MItems.METAL_JUNK) accept(MItems.METAL_MESH) diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MItems.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MItems.kt index 6c3f12065..61dd4542a 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MItems.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MItems.kt @@ -596,10 +596,10 @@ object MItems { ExopackUpgrades } - val TRITANIUM_STRIPED_BLOCK: Item by registry.register(MNames.TRITANIUM_STRIPED_BLOCK) { BlockItem(MBlocks.TRITANIUM_STRIPED_BLOCK, DEFAULT_PROPERTIES) } - val TRITANIUM_STRIPED_STAIRS: Item by registry.register(MNames.TRITANIUM_STRIPED_STAIRS) { BlockItem(MBlocks.TRITANIUM_STRIPED_STAIRS, DEFAULT_PROPERTIES) } - val TRITANIUM_STRIPED_SLAB: Item by registry.register(MNames.TRITANIUM_STRIPED_SLAB) { BlockItem(MBlocks.TRITANIUM_STRIPED_SLAB, DEFAULT_PROPERTIES) } - val TRITANIUM_STRIPED_WALL: Item by registry.register(MNames.TRITANIUM_STRIPED_WALL) { BlockItem(MBlocks.TRITANIUM_STRIPED_WALL, DEFAULT_PROPERTIES) } + val TRITANIUM_STRIPED_BLOCK = registry.colored(MNames.TRITANIUM_STRIPED_BLOCK) { BlockItem(MBlocks.TRITANIUM_STRIPED_BLOCK[it]!!, DEFAULT_PROPERTIES) } + val TRITANIUM_STRIPED_STAIRS = registry.colored(MNames.TRITANIUM_STRIPED_STAIRS) { BlockItem(MBlocks.TRITANIUM_STRIPED_STAIRS[it]!!, DEFAULT_PROPERTIES) } + val TRITANIUM_STRIPED_SLAB = registry.colored(MNames.TRITANIUM_STRIPED_SLAB) { BlockItem(MBlocks.TRITANIUM_STRIPED_SLAB[it]!!, DEFAULT_PROPERTIES) } + val TRITANIUM_STRIPED_WALL = registry.colored(MNames.TRITANIUM_STRIPED_WALL) { BlockItem(MBlocks.TRITANIUM_STRIPED_WALL[it]!!, DEFAULT_PROPERTIES) } val CARBON_FIBRE_BLOCK: Item by registry.register(MNames.CARBON_FIBRE_BLOCK) { BlockItem(MBlocks.CARBON_FIBRE_BLOCK, DEFAULT_PROPERTIES) } val METAL_JUNK: Item by registry.register(MNames.METAL_JUNK) { BlockItem(MBlocks.METAL_JUNK, DEFAULT_PROPERTIES) } val METAL_MESH: Item by registry.register(MNames.METAL_MESH) { BlockItem(MBlocks.METAL_MESH, DEFAULT_PROPERTIES) } diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/objects/DecorativeBlock.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/objects/DecorativeBlock.kt index d9912d3d4..28fad5f05 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/objects/DecorativeBlock.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/objects/DecorativeBlock.kt @@ -78,7 +78,6 @@ class DecorativeBlock( private val shapes = getShapeForEachState(rotationProperty) { shape.rotateFromNorth(it[rotationProperty]).computeShape() } - @Suppress("override_deprecation") override fun getShape( state: BlockState, blockGetter: BlockGetter, diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/stripe/tritanium_striped_block_black.png b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/stripe/tritanium_striped_block_black.png new file mode 100644 index 0000000000000000000000000000000000000000..2c4ba00a95ed39d8b18e9ef0185bc6bf771c161d GIT binary patch literal 439 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFOaJki%Kv5n0T@z_%ZS87)|YRe*x*C7!;n z>@PT3*v!nn&Dv)U6bkcnaSY+O?%H=zu)%=CIaod871LGTs&x#~Q~ri$9tpmGU3r3a zz>JUrYghFwcCKtk=67c&$fS5nKJoLsW_0ow!}^xh8UPynHpP}nrIssSQ!}n zcYAjiMMG|WN@iLmZVi3XVTnKu8gLs*GILXlOA>Pnpn5EI4NO7|%z!q)Es^->5((79 N;OXk;vd$@?2>@wdg3|y1 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/stripe/tritanium_striped_block_blue.png b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/stripe/tritanium_striped_block_blue.png new file mode 100644 index 0000000000000000000000000000000000000000..d3f1c5f12a2fc70fe415aba3da7e9798d27569f9 GIT binary patch literal 462 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPF@P5Z92D+}Qjo_mJq^ zrha47*+wR_j7(-2nangao^EJ7?f?J(-&=mI1}bJu@^*LO%DC_)49MXu@Q5sCVBp&i z!i*NI!74yO_7YEDSN0d2ENo_G-)8MI2MQ&6x;Tb#TzBou1Du!Uqz z6{~#lw4xj(i=|!{ouW_Q%ZmFq`+F~Uas}VxNtyh0K+9B1Tq8nXZv#h=Hkf2-z$C=L3}^$~5{Zv4kw85Rp00i_>zopr021nnga7~l literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/stripe/tritanium_striped_block_brown.png b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/stripe/tritanium_striped_block_brown.png new file mode 100644 index 0000000000000000000000000000000000000000..1d784b4ccb85b67db9be1898409972cb2822c263 GIT binary patch literal 462 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPF@P5Z92D+}Qjo_mJq^ zrv4&#jY2o|0$25XSM@wswE{Qw|Ns9-aGIS4DrQXbc6Z^*xbP(m$l)yTh%9Dc;M)(v zj25iHDnLQ@5>H=O_7|KiY-VQPX6-Wv3MG2FIEHXsckS~QY%t()*{<crwi>h{pJF}MYeY#(Vo9o1a#1RfVlXl= zGSM|K(>1aTF)+0_U<>&pIulZDO9?Axq;=0KqYPZ!4!j_a;{xx5VqJTCbfH+Y$u*}26|wKb?} zC}_-Jx!|kG825iqT}+ULl-wIPRUtd3zI%!c-_=&~q!@Un_=|SmJo1Qh4v*d5rhZFr zOLIY)prsiL*QVy1>i<9c`xtAY2jAt0gYW+V?NTjqjVMV;EJ?LWE=mPb3`Pb9nO2EgL!We5B2a?{+=i0O+|=Td#M}a? g9!p&VlMn+lpbcy85}Sb4q9e0Fi};y#N3J literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/stripe/tritanium_striped_block_gray.png b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/stripe/tritanium_striped_block_gray.png new file mode 100644 index 0000000000000000000000000000000000000000..ba402950c2af5ad222b199955094d2d18a8e3d73 GIT binary patch literal 451 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPF?)FK#IZ0z{o_`z)aW3GQ_~t z%GB7()I{6Bz{nC}Q!>*kack(44od`T(16=el9`)YT#}eu0M%ouYhV&$ ZU@P5Z92D+}Qjo_mJq^ zrv8vzncy7hpls=&Ea|{3>ELYX|NsAgGuXBbsF*Ry+uemLuhKuIMZBd?>2?`Nro#M#To{sUAN#EUMZW?#y0dG~uAiMB7lEG~sUb0;3;a zxa>aZ{Jh~(;5Bto>$YiouU7udzh|zO%FfTWYNzrapk=Bht`Q|Ei6yC4$wjF^iowXh z$VAt`OxMUV#K6?b)Y!_@MBBi?%D~{i+q=6c8glbfGSez?Yv_{>O9X1rfZI@#nVVW% kl9*cn)nln^U=m_r2DAZgiNr^jNT41DPgg&ebxsLQ0FtbU@Bjb+ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/stripe/tritanium_striped_block_light_blue.png b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/stripe/tritanium_striped_block_light_blue.png new file mode 100644 index 0000000000000000000000000000000000000000..375d7d9067ba084afaaed62a87d00f5cdb6d0d37 GIT binary patch literal 466 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPF6<*y$(0OW8MctjR6 zF!1dMVMYtqU=^Ssdx@v7EBgyh7B(}pZ?pE91BH@2T^vI=t|upmurM>SIjX5D1PG)E z1SBLRh=?Sl2qYyioRnaa>}qOqN@!cSV8I5335?g+#2B;9Qv^)dm>oIfIV2t&xO(>J zUfrulTN77#cXW#j80qkSKNThQ=viX`b1@r3?oNJx*?Yx6*D$D-xJHzuB$lLFB^RXv zDF!10BNJT%GhHLg5Cc;yQ)4Sr6Kw+nD+7c7Ztw1*Xvob^$xN%nt)WjkED@+d18ze} pW^QV6Nn&mRRF9>ufk}vg8PEo}B@!Q9B7u4sJYD@<);T3K0RW&-h~5AI literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/stripe/tritanium_striped_block_light_gray.png b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/stripe/tritanium_striped_block_light_gray.png new file mode 100644 index 0000000000000000000000000000000000000000..ebac5fd826998045614bb8c8098b6504a020a9a6 GIT binary patch literal 458 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFZ-5-m0*}aI1_r+UAk1jN z8ms~oWH0gbb!C6S$--u4_HEWabD&Uyr;B3<$931fT;2u)9+!NL8@$ZS?A&6f+8R_f z6f|bAT=3OojQhW*E+)uAO74xDs*oL1-#tZ!?`kV~QVcv({6)KO9(lw$hsSPjQ@^FR zrMaL?(9(>BYg6-0_5Yv!eT+5HgYR<0!T0}wcBz)QMwFx^mZVxG7o`Fz1|tI_6I}x{ zT_ej715+zgV=Ge=Z36=<1B3r=@9v^#$jwj5OsmALp-(z25vV}}ZbM0CZfbE!Vr~Ic gkEO1GNr-_N&<40A5+7Y6fqED`UHx3vIVCg!04BkScK`qY literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/stripe/tritanium_striped_block_lime.png b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/stripe/tritanium_striped_block_lime.png new file mode 100644 index 0000000000000000000000000000000000000000..5b89ad7bb4e81205520b658351b4da592051552f GIT binary patch literal 460 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPF@P5Z92D+}Qjo_mJq^ zrvCih5_!ACb9ad6?G(@1CZ4@j{Qv*|zUMc~0u?hRdAqxCWnB0Y2IO!SctjR6F!1dM zVMYtqU=^Ssdx@v7EBgyh7B(}pZ?pE91BK!}T^vI=uDkZ-@-`Uoxa4cx;ALiJ=N9vF zJRl^(qiJzKe<@4F-_O4aJq2I5Y>@8tIl{wotbygu>?ETJCznpJ^|g5>+%H~G^y3Sg zUE0*A8A=vQyP_86?%KZUb^Ygkg^UTjeEW6lc6b4;QY~?fC`m~yNwrEYN(E93Mg~SE zx&~&tMwTH4rdFoLR;DJ}1_o9J2LIjO-9^!mo1c=IR*73fpLAFvP=f~ChLX(O)Z&uF j+ybZ`OI-t#5Cb!y4RA{&KDtB#^)Pt4`njxgN@xNAJ$Q;) literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/stripe/tritanium_striped_block_magenta.png b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/stripe/tritanium_striped_block_magenta.png new file mode 100644 index 0000000000000000000000000000000000000000..cd5eb867845fec0fac59e282a14c6b566bf2fb01 GIT binary patch literal 460 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPF@P5Z92D+}Qjo_mJq^ zrv6>_>v!6%+itgJhuzw(wyU<-uKNG~f9Yu8a#`!hjsk0*}aI1_r+U zAk1jN8ms~oWH0gbb!C6S$--u4_HEWabD&VXr;B3<$931fT;2u)9+!NL8@$ZS?A&5r zjt7K9cr+~z=r3id`1|=+p{L*rmkrXrK1X<1jy15{nVn=b;pEZ@w!Svcg!{z{ihg`y zvrC)$G(*W^X;;+3++EvOy{`YfuaGf;mv6sr-3~9HRjMVf5hW>!C8<`)MX5lF!N|bK zMAyJf*T^!&z|_jr*viyI+rYrez~H~zySpeFa`RI%(<*Um=#vgh1ZvQL+fb63n_66w jm|FnVW2tLk5@KKmv;l63#7CD%pdJQKS3j3^P6>S5uQyLfgUx3pOZBV7$gA#+YrMB4EPC?8qU{A@ShA)w4(U z>RvtCnz+ilqg!0SNQd|PsVJ#O&l&@mi`f`*ck=to-YW*WhC#K&HKHUXu_Vj>FVdQ&MBb@0C8c5JOBUy literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/stripe/tritanium_striped_block_pink.png b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/stripe/tritanium_striped_block_pink.png new file mode 100644 index 0000000000000000000000000000000000000000..55c0a14439ddb0a4dcd04d4c4929ca408e62aa11 GIT binary patch literal 466 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPF6<*y$(0OW8MctjR6 zF!1dMVMYtqU=^Ssdx@v7EBgyh7B(}pZ?pE91BH@2T^vI=t|upmurM>SIjX5D1PG)E z1SBLRh=?Sl2qYyioRnaa>}qOqN@!cSV8I5335?g+#2B;9Qv^)dm>oIfIV2t&xO(>J zUfrulTN77#cXW#j80qkSKNThQ=viX`b1@r3?oNJx*?Yx6*D$D-xJHzuB$lLFB^RXv zDF!10BNJT%GhHLg5Cc;yQ)4Sr6Kw+nD+7c7Ztw1*Xvob^$xN%nt)WjkED@+d18ze} pW^QV6Nn&mRRF9>ufk}vg8PEo}B@!Q9B7u4sJYD@<);T3K0RUSli=+Sm literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/stripe/tritanium_striped_block_purple.png b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/stripe/tritanium_striped_block_purple.png new file mode 100644 index 0000000000000000000000000000000000000000..6a0c527504806077a27381221fe074baa39fe89b GIT binary patch literal 466 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFts%K2{c6Z^HzkcKZki%Kv5n0T@ zz_%ZS87)|YRe*x*C7!;n>@PT3*v!nn&Dv)U6iV`RaSY+Oo}3`U!pz9#sHUnAAdn&u zkdTldB9f3Ikd(l1Qi4gctEtH;p>5%U1sfD5FkWL5W6U;B5int6cI1%fka%$5>e-`v zb*~<6O{O#cT|@JNf-(?-c`G!=PH?8c~vxSdwa$T$Bo= z7>o>zOmq#*bd4-S3{0&|jjc>gv<(cb3=ICey}OH|AvZrIGp!Q0hCb=AM4$!@xD6$l oxv9k^iMa((J(ju#CLso9KpWteNPKjO1nOb%boFyt=akR{0BEj-y#N3J literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/stripe/tritanium_striped_block_red.png b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/stripe/tritanium_striped_block_red.png new file mode 100644 index 0000000000000000000000000000000000000000..8a3c1b808f937fc35c1b0d21da4366a5c8f1b51b GIT binary patch literal 462 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPF@P5Z92D+}Qjo_mJq^ zrv5pqO0!iIXR0X9Qc;|tqBvby@&Et-s$D#sK*fwn-tI1385h2U0Xdun9+AZi41D`R zn9+hYSOqA^UgGKN%Kn0rh0V#lvdybT6CF8LZac$t~mxy4Sk zHK=MRXv|=hc`!YQY0tmPzdM!`nAqIt^-`%}k=g6a@Xj|#@YeY#(Vo9o1a#1RfVlXl= zGSM|K(>1aTF)+0_U@P5Z92D+}Qjo_mJq^ zrvCr`|Nr~<@AvQDfB*jd`Sa(GA3y&5`LiQr|7M_K#w2fd7nc5vn}I+MXMsm#F#`kN zeh_A~U=3CQ3bL1Y`ns~e;ACMlGy67cpE*z{$eoOCdsa*CZ~k9g$ovJP?*4YjZKU(+dM_UgpJveL!Lw8!GWu1kM7mI zdbBlhm3K$CxPXxk@Ap$tQjeZB1~3=1G34&#_m{m_40H{HYKdz^NlIc#s#S7PDv)9@ zGB7gHH89gPvJ5dWwK6rfGBwdQFt9Q(`0w`aE{cZS{FKbJO57Uyq{9+{8Z_WGlw{_n m7MCRE7C`k_>Kd4Y7?=TVfLkK*(Ipb7hr!d;&t;ucLK6VDv5s^A literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/stripe/tritanium_striped_block_yellow.png b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/stripe/tritanium_striped_block_yellow.png new file mode 100644 index 0000000000000000000000000000000000000000..5288d253357a76393aa552449b7323b111b66462 GIT binary patch literal 466 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPF6<*y$(0OW8MctjR6 zF!1dMVMYtqU=^Ssdx@v7EBgyh7B(}pZ?pE91BH@2T^vI=t|upmurM>SIjX5D1PG)E z1SBLRh=?Sl2qYyioRnaa>}qOqN@!cSV8I5335?g+#2B;9Qv^)dm>oIfIV2t&xO(>J zUfrulTN77#cXW#j80qkSKNThQ=viX`b1@r3?oNJx*?Yx6*D$D-xJHzuB$lLFB^RXv zDF!10BNJT%GhHLg5Cc;yQ)4Sr6Kw+nD+7c7Ztw1*Xvob^$xN%nt)WjkED@+d18ze} pW^QV6Nn&mRRF9>ufk}vg8PEo}B@!Q9B7u4sJYD@<);T3K0RWXLiH!gN literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/tritanium_striped_block.png b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/tritanium_striped_block.png deleted file mode 100644 index 93324432bd8790d1d04e7615bf232737d3189b7a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 207 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPF+v6lZ})WHAE+-+mBgv|tTZ0SbD0 zx;TbNT+Zz~$lGAR!yK!2Vk#?_w9A?U|BMA=u84o%bz_r=sZYmS9k#B8UW-?H=TBB; vFY!L)*O~5T<6kKGEHbP0l+XkKss2Cv