Added missing white/stripe tritanium block variant, added locale for striped blocks

colomposer.js

@@ -6,6 +6,7 @@ const root_main = './src/main/resources/assets/overdrive_that_matters/textures/'
 const child_process = require('child_process')
 
 const colors = [
+	['white', [255, 255, 255]],
 	['orange', [245, 116, 16]],
 	['magenta', [186, 63, 175]],
 	['light_blue', [59, 180, 219]],

src/data/kotlin/ru/dbotthepony/mc/otm/datagen/MatteryLanguageProvider.kt

@@ -1,5 +1,7 @@
 package ru.dbotthepony.mc.otm.datagen
 
+import com.google.common.collect.ImmutableList
+import com.google.common.collect.ImmutableMap
 import it.unimi.dsi.fastutil.objects.Object2ObjectArrayMap
 import net.minecraft.data.DataGenerator
 import net.minecraft.world.effect.MobEffect
@@ -73,6 +75,85 @@ class MatteryLanguageProvider(private val gen: DataGenerator) {
 	) {
 		val slave: LanguageProvider = slaves.computeIfAbsent(language, ::Slave)
 
+		val list: List<String> = ImmutableList.builder<String>()
+			.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<Pair<String, String>> = ImmutableList.builder<Pair<String, String>>()
+			.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<String, String> = ImmutableMap.builder<String, String>()
+			.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()
+
 		fun add(list: ColoredDecorativeBlock, toFormat: String) {
 			slave.add(list.whiteBlock, toFormat.format(white))
 			slave.add(list.orangeBlock, toFormat.format(orange))
@@ -215,7 +296,7 @@ class MatteryLanguageProvider(private val gen: DataGenerator) {
 		}
 	}
 
-	val decorativeEnglish = Colors("en_us",
+	val englishColors = Colors("en_us",
 		"White",
 		"Orange",
 		"Magenta",

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

@@ -4,16 +4,16 @@ import ru.dbotthepony.mc.otm.datagen.MatteryLanguageProvider
 import ru.dbotthepony.mc.otm.registry.*
 
 private fun decoratives(provider: MatteryLanguageProvider) {
-	provider.decorativeEnglish.add(MRegistry.VENT, "%s Vent")
+	provider.englishColors.add(MRegistry.VENT, "%s Vent")
-	provider.decorativeEnglish.add(MRegistry.VENT_ALTERNATIVE, "%s Alternative Vent")
+	provider.englishColors.add(MRegistry.VENT_ALTERNATIVE, "%s Alternative Vent")
 
-	provider.decorativeEnglish.add(MRegistry.TRITANIUM_BLOCK, "%s Tritanium Block")
+	provider.englishColors.add(MRegistry.TRITANIUM_BLOCK, "%s Tritanium Block")
-	provider.decorativeEnglish.add(MRegistry.FLOOR_TILES, "%s Floor Tiles")
+	provider.englishColors.add(MRegistry.FLOOR_TILES, "%s Floor Tiles")
 
-	provider.decorativeEnglish.add(MRegistry.INDUSTRIAL_GLASS, "%s Stained Industrial Glass")
+	provider.englishColors.add(MRegistry.INDUSTRIAL_GLASS, "%s Stained Industrial Glass")
-	provider.decorativeEnglish.add(MRegistry.INDUSTRIAL_GLASS_PANE, "%s Stained Industrial Glass Pane")
+	provider.englishColors.add(MRegistry.INDUSTRIAL_GLASS_PANE, "%s Stained Industrial Glass Pane")
 
-	provider.decorativeEnglish.add(MRegistry.CARGO_CRATES, "%s Cargo Crate")
+	provider.englishColors.add(MRegistry.CARGO_CRATES, "%s Cargo Crate")
 
 	with(provider.english) {
 		add(MRegistry.CARGO_CRATES.block, "Cargo Crate")
@@ -24,6 +24,19 @@ private fun decoratives(provider: MatteryLanguageProvider) {
 
 		add(MRegistry.VENT.block, "Vent")
 		add(MRegistry.VENT_ALTERNATIVE.block, "Alternative Vent")
+
+		var i = 0
+
+		for ((colorBase, baseName) in provider.englishColors.pairList) {
+			for ((colorStrip, stripName) in provider.englishColors.pairList) {
+				if (colorBase == colorStrip) {
+					continue
+				}
+
+				val block = MBlocks.TRITANIUM_STRIPED_BLOCKS[i++]
+				add(block, "$baseName Colored $stripName Striped Tritanium Block")
+			}
+		}
 	}
 }
 
@@ -394,6 +407,9 @@ fun AddEnglishLanguage(provider: MatteryLanguageProvider) {
 	items(provider)
 	stats(provider)
 
+	androidFeatures(provider)
+	research(provider)
+
 	with(provider.english) {
 		add("itemGroup.otm", "Overdrive That Matters")
 		add("itemGroup.otm_decorative", "Overdrive That Matters Decorative")

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

@@ -103,12 +103,12 @@ object MBlocks {
 			.strength(4f)
 	) }
 
-	val TRITANIUM_STRIPED_BLOCKS: LazyList<Block>
+	val TRITANIUM_STRIPED_BLOCKS: List<Block>
-	// слишком лень было разбираться дальше ибо деление индекса на 15 не работало
 	val TRITANIUM_STRIPED_BLOCKS_COLORS: List<String>
 
 	init {
 		val colors = arrayOf(
+			"white" to DyeColor.WHITE,
 			"orange" to DyeColor.ORANGE,
 			"magenta" to DyeColor.MAGENTA,
 			"light_blue" to DyeColor.LIGHT_BLUE,

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

@@ -249,6 +249,7 @@ object MItems {
 
 	init {
 		val colors = arrayOf(
+			"white",
 			"orange",
 			"magenta",
 			"light_blue",