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 8755aca87..ff508b9cb 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 @@ -261,6 +261,8 @@ private fun misc(provider: MatteryLanguageProvider) { misc("suffix.exa", "%s E%s") misc("suffix.zetta", "%s Z%s") misc("suffix.yotta", "%s Y%s") + misc("suffix.ronna", "%s R%s") + misc("suffix.quetta", "%s Q%s") misc("suffix.deci", "%s d%s") misc("suffix.centi", "%s c%s") @@ -282,6 +284,8 @@ private fun misc(provider: MatteryLanguageProvider) { misc("suffix_concise.exa", "%sE") misc("suffix_concise.zetta", "%sZ") misc("suffix_concise.yotta", "%sY") + misc("suffix_concise.ronna", "%sR") + misc("suffix_concise.quetta", "%sQ") misc("suffix_concise.deci", "%sd") misc("suffix_concise.centi", "%sc") @@ -302,6 +306,9 @@ private fun misc(provider: MatteryLanguageProvider) { misc("suffix_raw.exa", "E") misc("suffix_raw.zetta", "Z") misc("suffix_raw.yotta", "Y") + misc("suffix_raw.ronna", "R") + misc("suffix_raw.quetta", "Q") + misc("suffix_raw.deci", "d") misc("suffix_raw.centi", "c") misc("suffix_raw.milli", "m") 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 d45ac6c92..4a059c766 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 @@ -269,6 +269,8 @@ private fun misc(provider: MatteryLanguageProvider) { misc("suffix.exa", "%s Э%s") misc("suffix.zetta", "%s З%s") misc("suffix.yotta", "%s И%s") + misc("suffix.ronna", "%s Рн%s") + misc("suffix.quetta", "%s Кв%s") misc("suffix.deci", "%s д%s") misc("suffix.centi", "%s с%s") @@ -290,6 +292,9 @@ private fun misc(provider: MatteryLanguageProvider) { misc("suffix_concise.exa", "%sЭ") misc("suffix_concise.zetta", "%sЗ") misc("suffix_concise.yotta", "%sИ") + misc("suffix_concise.ronna", "%sРн") + misc("suffix_concise.quetta", "%sКв") + misc("suffix_concise.deci", "%sд") misc("suffix_concise.centi", "%sс") misc("suffix_concise.milli", "%sм") @@ -309,6 +314,9 @@ private fun misc(provider: MatteryLanguageProvider) { misc("suffix_raw.exa", "Э") misc("suffix_raw.zetta", "З") misc("suffix_raw.yotta", "И") + misc("suffix_raw.ronna", "Рн") + misc("suffix_raw.quetta", "Кв") + misc("suffix_raw.deci", "д") misc("suffix_raw.centi", "с") misc("suffix_raw.milli", "м") diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/core/util/SiPrefix.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/core/util/SiPrefix.kt index 0b21620a0..7f4507279 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/core/util/SiPrefix.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/core/util/SiPrefix.kt @@ -9,14 +9,14 @@ import java.math.BigInteger import kotlin.math.absoluteValue enum class SiPrefix(val power: Int, val symbol: String) { - YOCTO(-8, "y"), - ZEPTO(-7, "z"), - ATTO (-6, "a"), - FEMTO(-5, "f"), - PICO (-4, "p"), - NANO (-3, "n"), - MICRO(-2, "μ"), - MILLI(-1, "m"), + YOCTO (-8, "y"), + ZEPTO (-7, "z"), + ATTO (-6, "a"), + FEMTO (-5, "f"), + PICO (-4, "p"), + NANO (-3, "n"), + MICRO (-2, "μ"), + MILLI (-1, "m"), NONE(0, "") { override val isEmpty: Boolean @@ -26,14 +26,16 @@ enum class SiPrefix(val power: Int, val symbol: String) { get() = 0 }, - KILO (1, "k"), - MEGA (2, "M"), - GIGA (3, "G"), - TERA (4, "T"), - PETA (5, "P"), - EXA (6, "E"), - ZETTA(7, "Z"), - YOTTA(8, "Y"); + KILO (1, "k"), + MEGA (2, "M"), + GIGA (3, "G"), + TERA (4, "T"), + PETA (5, "P"), + EXA (6, "E"), + ZETTA (7, "Z"), + YOTTA (8, "Y"), + RONNA (9, "R"), + QUETTA(10, "Q"); open val isEmpty: Boolean get() = false