text: move color to subpackage

2025-09-18 20:05:02 -04:00 · 2022-08-19 21:52:42 +02:00 · 2022-08-19 21:52:42 +02:00 · fb2421ff0a
commit fb2421ff0a
parent fbde9061e9
140 changed files with 237 additions and 210 deletions
--- a/src/main/java/de/bixilon/minosoft/commands/parser/minecraft/color/ColorParseError.kt
+++ b/src/main/java/de/bixilon/minosoft/commands/parser/minecraft/color/ColorParseError.kt
@ -16,7 +16,7 @@ package de.bixilon.minosoft.commands.parser.minecraft.color
 import de.bixilon.minosoft.commands.errors.parser.ParserError
 import de.bixilon.minosoft.commands.util.ReadResult
 import de.bixilon.minosoft.commands.util.StringReader
-import de.bixilon.minosoft.data.text.RGBColor
+import de.bixilon.minosoft.data.text.formatting.color.RGBColor

 class ColorParseError(
    reader: StringReader,
--- a/src/main/java/de/bixilon/minosoft/commands/parser/minecraft/color/ColorParser.kt
+++ b/src/main/java/de/bixilon/minosoft/commands/parser/minecraft/color/ColorParser.kt
@ -19,10 +19,10 @@ import de.bixilon.minosoft.commands.suggestion.ArraySuggestion
 import de.bixilon.minosoft.commands.util.CommandReader
 import de.bixilon.minosoft.commands.util.ReadResult
 import de.bixilon.minosoft.data.registries.ResourceLocation
-import de.bixilon.minosoft.data.text.ChatColors
 import de.bixilon.minosoft.data.text.ChatComponent
-import de.bixilon.minosoft.data.text.RGBColor
-import de.bixilon.minosoft.data.text.RGBColor.Companion.asColor
+import de.bixilon.minosoft.data.text.formatting.color.ChatColors
+import de.bixilon.minosoft.data.text.formatting.color.RGBColor
+import de.bixilon.minosoft.data.text.formatting.color.RGBColor.Companion.asColor
 import de.bixilon.minosoft.protocol.protocol.PlayInByteBuffer
 import de.bixilon.minosoft.util.KUtil.toResourceLocation

--- a/src/main/java/de/bixilon/minosoft/config/profile/profiles/block/outline/OutlineC.kt
+++ b/src/main/java/de/bixilon/minosoft/config/profile/profiles/block/outline/OutlineC.kt
@ -1,6 +1,6 @@
 /*
 * Minosoft
- * Copyright (C) 2021 Moritz Zwerger
+ * Copyright (C) 2020-2022 Moritz Zwerger
 *
 * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
 *
@ -14,7 +14,7 @@
 package de.bixilon.minosoft.config.profile.profiles.block.outline

 import de.bixilon.minosoft.config.profile.profiles.block.BlockProfileManager.delegate
-import de.bixilon.minosoft.data.text.ChatColors
+import de.bixilon.minosoft.data.text.formatting.color.ChatColors

 class OutlineC {

--- a/src/main/java/de/bixilon/minosoft/config/profile/profiles/gui/hud/crosshair/CrosshairC.kt
+++ b/src/main/java/de/bixilon/minosoft/config/profile/profiles/gui/hud/crosshair/CrosshairC.kt
@ -1,6 +1,6 @@
 /*
 * Minosoft
- * Copyright (C) 2021 Moritz Zwerger
+ * Copyright (C) 2020-2022 Moritz Zwerger
 *
 * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
 *
@ -14,7 +14,7 @@
 package de.bixilon.minosoft.config.profile.profiles.gui.hud.crosshair

 import de.bixilon.minosoft.config.profile.profiles.gui.GUIProfileManager.delegate
-import de.bixilon.minosoft.data.text.ChatColors
+import de.bixilon.minosoft.data.text.formatting.color.ChatColors

 class CrosshairC {
    /**
--- a/src/main/java/de/bixilon/minosoft/data/Rarities.kt
+++ b/src/main/java/de/bixilon/minosoft/data/Rarities.kt
@ -1,6 +1,6 @@
 /*
 * Minosoft
- * Copyright (C) 2021 Moritz Zwerger
+ * Copyright (C) 2020-2022 Moritz Zwerger
 *
 * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
 *
@ -15,8 +15,8 @@ package de.bixilon.minosoft.data

 import de.bixilon.kutil.enums.EnumUtil
 import de.bixilon.kutil.enums.ValuesEnum
-import de.bixilon.minosoft.data.text.ChatColors
-import de.bixilon.minosoft.data.text.RGBColor
+import de.bixilon.minosoft.data.text.formatting.color.ChatColors
+import de.bixilon.minosoft.data.text.formatting.color.RGBColor

 enum class Rarities(val color: RGBColor) {
    COMMON(ChatColors.WHITE),
--- a/src/main/java/de/bixilon/minosoft/data/container/stack/property/DisplayProperty.kt
+++ b/src/main/java/de/bixilon/minosoft/data/container/stack/property/DisplayProperty.kt
@ -1,6 +1,6 @@
 /*
 * Minosoft
- * Copyright (C) 2022 Moritz Zwerger
+ * Copyright (C) 2020-2022 Moritz Zwerger
 *
 * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
 *
@ -23,8 +23,8 @@ import de.bixilon.kutil.watcher.list.ListDataWatcher.Companion.watchedList
 import de.bixilon.minosoft.data.container.InventoryDelegate
 import de.bixilon.minosoft.data.container.stack.ItemStack
 import de.bixilon.minosoft.data.text.ChatComponent
-import de.bixilon.minosoft.data.text.RGBColor
-import de.bixilon.minosoft.data.text.RGBColor.Companion.asRGBColor
+import de.bixilon.minosoft.data.text.formatting.color.RGBColor
+import de.bixilon.minosoft.data.text.formatting.color.RGBColor.Companion.asRGBColor
 import de.bixilon.minosoft.util.nbt.tag.NBTUtil.listCast

 class DisplayProperty(
--- a/src/main/java/de/bixilon/minosoft/data/direction/Directions.kt
+++ b/src/main/java/de/bixilon/minosoft/data/direction/Directions.kt
@ -25,7 +25,7 @@ import de.bixilon.kutil.exception.Broken
 import de.bixilon.minosoft.data.Axes
 import de.bixilon.minosoft.data.registries.blocks.BlockState
 import de.bixilon.minosoft.data.registries.blocks.properties.serializer.BlockPropertiesSerializer
-import de.bixilon.minosoft.data.text.ChatColors
+import de.bixilon.minosoft.data.text.formatting.color.ChatColors
 import de.bixilon.minosoft.data.world.chunk.ChunkSection
 import de.bixilon.minosoft.gui.rendering.util.vec.vec3.Vec3Util.get
 import de.bixilon.minosoft.protocol.protocol.ProtocolDefinition
--- a/src/main/java/de/bixilon/minosoft/data/entities/block/SignBlockEntity.kt
+++ b/src/main/java/de/bixilon/minosoft/data/entities/block/SignBlockEntity.kt
@ -17,9 +17,9 @@ import de.bixilon.kotlinglm.vec3.Vec3i
 import de.bixilon.kutil.primitive.BooleanUtil.toBoolean
 import de.bixilon.minosoft.data.registries.ResourceLocation
 import de.bixilon.minosoft.data.registries.blocks.BlockState
-import de.bixilon.minosoft.data.text.ChatColors
 import de.bixilon.minosoft.data.text.ChatComponent
-import de.bixilon.minosoft.data.text.RGBColor
+import de.bixilon.minosoft.data.text.formatting.color.ChatColors
+import de.bixilon.minosoft.data.text.formatting.color.RGBColor
 import de.bixilon.minosoft.gui.rendering.RenderWindow
 import de.bixilon.minosoft.gui.rendering.world.entities.renderer.sign.SignBlockEntityRenderer
 import de.bixilon.minosoft.protocol.network.connection.play.PlayConnection
--- a/src/main/java/de/bixilon/minosoft/data/entities/entities/Entity.kt
+++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/Entity.kt
@ -46,9 +46,9 @@ import de.bixilon.minosoft.data.registries.fluid.FlowableFluid
 import de.bixilon.minosoft.data.registries.fluid.Fluid
 import de.bixilon.minosoft.data.registries.items.armor.ArmorItem
 import de.bixilon.minosoft.data.registries.particle.data.BlockParticleData
-import de.bixilon.minosoft.data.text.ChatColors
 import de.bixilon.minosoft.data.text.ChatComponent
-import de.bixilon.minosoft.data.text.RGBColor
+import de.bixilon.minosoft.data.text.formatting.color.ChatColors
+import de.bixilon.minosoft.data.text.formatting.color.RGBColor
 import de.bixilon.minosoft.gui.rendering.entity.EntityRenderer
 import de.bixilon.minosoft.gui.rendering.entity.models.DummyModel
 import de.bixilon.minosoft.gui.rendering.entity.models.EntityModel
--- a/src/main/java/de/bixilon/minosoft/data/entities/entities/LivingEntity.kt
+++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/LivingEntity.kt
@ -22,9 +22,9 @@ import de.bixilon.minosoft.data.entities.data.EntityDataField
 import de.bixilon.minosoft.data.entities.entities.player.Hands
 import de.bixilon.minosoft.data.registries.effects.attributes.DefaultStatusEffectAttributeNames
 import de.bixilon.minosoft.data.registries.entities.EntityType
-import de.bixilon.minosoft.data.text.ChatColors
-import de.bixilon.minosoft.data.text.RGBColor
-import de.bixilon.minosoft.data.text.RGBColor.Companion.asRGBColor
+import de.bixilon.minosoft.data.text.formatting.color.ChatColors
+import de.bixilon.minosoft.data.text.formatting.color.RGBColor
+import de.bixilon.minosoft.data.text.formatting.color.RGBColor.Companion.asRGBColor
 import de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.spell.AmbientEntityEffectParticle
 import de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.spell.EntityEffectParticle
 import de.bixilon.minosoft.gui.rendering.util.VecUtil.horizontal
--- a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Cat.kt
+++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Cat.kt
@ -22,8 +22,8 @@ import de.bixilon.minosoft.data.registries.ResourceLocation
 import de.bixilon.minosoft.data.registries.entities.EntityFactory
 import de.bixilon.minosoft.data.registries.entities.EntityType
 import de.bixilon.minosoft.data.registries.entities.variants.CatVariant
-import de.bixilon.minosoft.data.text.ChatColors
-import de.bixilon.minosoft.data.text.RGBColor
+import de.bixilon.minosoft.data.text.formatting.color.ChatColors
+import de.bixilon.minosoft.data.text.formatting.color.RGBColor
 import de.bixilon.minosoft.protocol.network.connection.play.PlayConnection

 class Cat(connection: PlayConnection, entityType: EntityType, data: EntityData, position: Vec3d, rotation: EntityRotation) : TamableAnimal(connection, entityType, data, position, rotation) {
--- a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Sheep.kt
+++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Sheep.kt
@ -20,8 +20,8 @@ import de.bixilon.minosoft.data.entities.entities.SynchronizedEntityData
 import de.bixilon.minosoft.data.registries.ResourceLocation
 import de.bixilon.minosoft.data.registries.entities.EntityFactory
 import de.bixilon.minosoft.data.registries.entities.EntityType
-import de.bixilon.minosoft.data.text.ChatColors
-import de.bixilon.minosoft.data.text.RGBColor
+import de.bixilon.minosoft.data.text.formatting.color.ChatColors
+import de.bixilon.minosoft.data.text.formatting.color.RGBColor
 import de.bixilon.minosoft.protocol.network.connection.play.PlayConnection

 class Sheep(connection: PlayConnection, entityType: EntityType, data: EntityData, position: Vec3d, rotation: EntityRotation) : Animal(connection, entityType, data, position, rotation) {
--- a/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Wolf.kt
+++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Wolf.kt
@ -21,8 +21,8 @@ import de.bixilon.minosoft.data.entities.entities.TamableAnimal
 import de.bixilon.minosoft.data.registries.ResourceLocation
 import de.bixilon.minosoft.data.registries.entities.EntityFactory
 import de.bixilon.minosoft.data.registries.entities.EntityType
-import de.bixilon.minosoft.data.text.ChatColors
-import de.bixilon.minosoft.data.text.RGBColor
+import de.bixilon.minosoft.data.text.formatting.color.ChatColors
+import de.bixilon.minosoft.data.text.formatting.color.RGBColor
 import de.bixilon.minosoft.protocol.network.connection.play.PlayConnection
 import de.bixilon.minosoft.protocol.protocol.ProtocolVersions

@ -39,7 +39,7 @@ class Wolf(connection: PlayConnection, entityType: EntityType, data: EntityData,
    // ToDo
    @get:SynchronizedEntityData
    val angerTime: Int
-        get() = if (versionId <= ProtocolVersions.V_1_8_9) { // ToDo
+        get() = if (connection.version.versionId <= ProtocolVersions.V_1_8_9) { // ToDo
            // ToDo if (data.sets.getBitMask(EntityDataFields.TAMABLE_ENTITY_FLAGS, 0x02)) 1 else 0
            0
        } else {
@ -48,7 +48,7 @@ class Wolf(connection: PlayConnection, entityType: EntityType, data: EntityData,

    @get:SynchronizedEntityData
    override val health: Double
-        get() = if (versionId > ProtocolVersions.V_19W45B) {
+        get() = if (connection.version.versionId > ProtocolVersions.V_19W45B) {
            super.health
        } else {
            data.get<Number>(HEALTH_DATA, 0.0f).toDouble()
--- a/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Shulker.kt
+++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Shulker.kt
@ -23,8 +23,8 @@ import de.bixilon.minosoft.data.entities.entities.animal.AbstractGolem
 import de.bixilon.minosoft.data.registries.ResourceLocation
 import de.bixilon.minosoft.data.registries.entities.EntityFactory
 import de.bixilon.minosoft.data.registries.entities.EntityType
-import de.bixilon.minosoft.data.text.ChatColors
-import de.bixilon.minosoft.data.text.RGBColor
+import de.bixilon.minosoft.data.text.formatting.color.ChatColors
+import de.bixilon.minosoft.data.text.formatting.color.RGBColor
 import de.bixilon.minosoft.protocol.network.connection.play.PlayConnection

 class Shulker(connection: PlayConnection, entityType: EntityType, data: EntityData, position: Vec3d, rotation: EntityRotation) : AbstractGolem(connection, entityType, data, position, rotation) {
--- a/src/main/java/de/bixilon/minosoft/data/entities/entities/player/PlayerEntity.kt
+++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/player/PlayerEntity.kt
@ -32,8 +32,8 @@ import de.bixilon.minosoft.data.entities.entities.player.properties.PlayerProper
 import de.bixilon.minosoft.data.entities.entities.player.tab.TabListItem
 import de.bixilon.minosoft.data.registries.entities.EntityType
 import de.bixilon.minosoft.data.registries.items.armor.DyeableArmorItem
-import de.bixilon.minosoft.data.text.ChatColors
-import de.bixilon.minosoft.data.text.RGBColor
+import de.bixilon.minosoft.data.text.formatting.color.ChatColors
+import de.bixilon.minosoft.data.text.formatting.color.RGBColor
 import de.bixilon.minosoft.data.world.World
 import de.bixilon.minosoft.gui.rendering.entity.EntityRenderer
 import de.bixilon.minosoft.gui.rendering.entity.models.EntityModel
--- a/src/main/java/de/bixilon/minosoft/data/registries/biomes/Biome.kt
+++ b/src/main/java/de/bixilon/minosoft/data/registries/biomes/Biome.kt
@ -20,8 +20,8 @@ import de.bixilon.minosoft.data.registries.ResourceLocation
 import de.bixilon.minosoft.data.registries.registries.Registries
 import de.bixilon.minosoft.data.registries.registries.registry.RegistryItem
 import de.bixilon.minosoft.data.registries.registries.registry.codec.ResourceLocationCodec
-import de.bixilon.minosoft.data.text.RGBColor
-import de.bixilon.minosoft.data.text.RGBColor.Companion.asRGBColor
+import de.bixilon.minosoft.data.text.formatting.color.RGBColor
+import de.bixilon.minosoft.data.text.formatting.color.RGBColor.Companion.asRGBColor
 import de.bixilon.minosoft.gui.rendering.RenderConstants
 import de.bixilon.minosoft.gui.rendering.tint.TintManager
 import de.bixilon.minosoft.protocol.protocol.ProtocolDefinition
--- a/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/RedstoneTorchBlock.kt
+++ b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/RedstoneTorchBlock.kt
@ -21,7 +21,7 @@ import de.bixilon.minosoft.data.registries.blocks.BlockState
 import de.bixilon.minosoft.data.registries.blocks.properties.BlockProperties
 import de.bixilon.minosoft.data.registries.particle.data.DustParticleData
 import de.bixilon.minosoft.data.registries.registries.Registries
-import de.bixilon.minosoft.data.text.Colors
+import de.bixilon.minosoft.data.text.formatting.color.Colors
 import de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.dust.DustParticle
 import de.bixilon.minosoft.gui.rendering.util.VecUtil.of
 import de.bixilon.minosoft.gui.rendering.util.vec.vec3.Vec3dUtil.EMPTY
--- a/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/wall/LeverBlock.kt
+++ b/src/main/java/de/bixilon/minosoft/data/registries/blocks/types/wall/LeverBlock.kt
@ -25,7 +25,7 @@ import de.bixilon.minosoft.data.registries.blocks.BlockState
 import de.bixilon.minosoft.data.registries.blocks.properties.BlockProperties
 import de.bixilon.minosoft.data.registries.particle.data.DustParticleData
 import de.bixilon.minosoft.data.registries.registries.Registries
-import de.bixilon.minosoft.data.text.Colors
+import de.bixilon.minosoft.data.text.formatting.color.Colors
 import de.bixilon.minosoft.gui.rendering.camera.target.targets.BlockTarget
 import de.bixilon.minosoft.gui.rendering.input.interaction.InteractionResults
 import de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.dust.DustParticle
--- a/src/main/java/de/bixilon/minosoft/data/registries/effects/StatusEffect.kt
+++ b/src/main/java/de/bixilon/minosoft/data/registries/effects/StatusEffect.kt
@ -21,8 +21,8 @@ import de.bixilon.minosoft.data.registries.effects.attributes.EntityAttributeMod
 import de.bixilon.minosoft.data.registries.registries.Registries
 import de.bixilon.minosoft.data.registries.registries.registry.RegistryItem
 import de.bixilon.minosoft.data.registries.registries.registry.codec.ResourceLocationCodec
-import de.bixilon.minosoft.data.text.RGBColor
-import de.bixilon.minosoft.data.text.RGBColor.Companion.asRGBColor
+import de.bixilon.minosoft.data.text.formatting.color.RGBColor
+import de.bixilon.minosoft.data.text.formatting.color.RGBColor.Companion.asRGBColor
 import de.bixilon.minosoft.datafixer.EntityAttributeFixer.fix
 import de.bixilon.minosoft.util.KUtil.toResourceLocation
 import java.util.*
--- a/src/main/java/de/bixilon/minosoft/data/registries/items/SpawnEggItem.kt
+++ b/src/main/java/de/bixilon/minosoft/data/registries/items/SpawnEggItem.kt
@ -1,6 +1,6 @@
 /*
 * Minosoft
- * Copyright (C) 2021 Moritz Zwerger
+ * Copyright (C) 2020-2022 Moritz Zwerger
 *
 * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
 *
@ -18,7 +18,7 @@ import de.bixilon.kutil.primitive.IntUtil.toInt
 import de.bixilon.minosoft.data.registries.ResourceLocation
 import de.bixilon.minosoft.data.registries.entities.EntityType
 import de.bixilon.minosoft.data.registries.registries.Registries
-import de.bixilon.minosoft.data.text.RGBColor.Companion.asRGBColor
+import de.bixilon.minosoft.data.text.formatting.color.RGBColor.Companion.asRGBColor

 open class SpawnEggItem(
    resourceLocation: ResourceLocation,
--- a/src/main/java/de/bixilon/minosoft/data/registries/materials/Material.kt
+++ b/src/main/java/de/bixilon/minosoft/data/registries/materials/Material.kt
@ -19,7 +19,7 @@ import de.bixilon.minosoft.data.registries.ResourceLocation
 import de.bixilon.minosoft.data.registries.registries.Registries
 import de.bixilon.minosoft.data.registries.registries.registry.RegistryItem
 import de.bixilon.minosoft.data.registries.registries.registry.codec.ResourceLocationCodec
-import de.bixilon.minosoft.data.text.RGBColor
+import de.bixilon.minosoft.data.text.formatting.color.RGBColor
 import de.bixilon.minosoft.gui.rendering.tint.TintManager
 import java.util.*

--- a/src/main/java/de/bixilon/minosoft/data/registries/particle/data/DustParticleData.kt
+++ b/src/main/java/de/bixilon/minosoft/data/registries/particle/data/DustParticleData.kt
@ -1,6 +1,6 @@
 /*
 * Minosoft
- * Copyright (C) 2020 Moritz Zwerger
+ * Copyright (C) 2020-2022 Moritz Zwerger
 *
 * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
 *
@ -13,7 +13,7 @@
 package de.bixilon.minosoft.data.registries.particle.data

 import de.bixilon.minosoft.data.registries.particle.ParticleType
-import de.bixilon.minosoft.data.text.RGBColor
+import de.bixilon.minosoft.data.text.formatting.color.RGBColor
 import de.bixilon.minosoft.protocol.protocol.PlayInByteBuffer

 class DustParticleData(val color: RGBColor, val scale: Float, type: ParticleType) : ParticleData(type) {
--- a/src/main/java/de/bixilon/minosoft/data/scoreboard/Team.kt
+++ b/src/main/java/de/bixilon/minosoft/data/scoreboard/Team.kt
@ -13,9 +13,9 @@
 package de.bixilon.minosoft.data.scoreboard

 import de.bixilon.minosoft.data.text.BaseComponent
-import de.bixilon.minosoft.data.text.ChatCode
 import de.bixilon.minosoft.data.text.ChatComponent
-import de.bixilon.minosoft.data.text.RGBColor
+import de.bixilon.minosoft.data.text.formatting.ChatCode
+import de.bixilon.minosoft.data.text.formatting.color.RGBColor

 data class Team(
    val name: String,
--- a/src/main/java/de/bixilon/minosoft/data/text/BaseComponent.kt
+++ b/src/main/java/de/bixilon/minosoft/data/text/BaseComponent.kt
@ -19,11 +19,17 @@ import de.bixilon.kutil.json.JsonUtil.toJsonObject
 import de.bixilon.kutil.primitive.BooleanUtil.toBoolean
 import de.bixilon.kutil.url.URLUtil.toURL
 import de.bixilon.minosoft.data.language.Translator
-import de.bixilon.minosoft.data.text.ChatCode.Companion.toColor
 import de.bixilon.minosoft.data.text.events.click.ClickEvent
 import de.bixilon.minosoft.data.text.events.click.ClickEvents
 import de.bixilon.minosoft.data.text.events.click.OpenURLClickEvent
 import de.bixilon.minosoft.data.text.events.hover.HoverEvents
+import de.bixilon.minosoft.data.text.formatting.ChatCode.Companion.toColor
+import de.bixilon.minosoft.data.text.formatting.ChatFormattingCode
+import de.bixilon.minosoft.data.text.formatting.ChatFormattingCodes
+import de.bixilon.minosoft.data.text.formatting.PostChatFormattingCodes
+import de.bixilon.minosoft.data.text.formatting.PreChatFormattingCodes
+import de.bixilon.minosoft.data.text.formatting.color.ChatColors
+import de.bixilon.minosoft.data.text.formatting.color.RGBColor
 import de.bixilon.minosoft.protocol.protocol.ProtocolDefinition
 import de.bixilon.minosoft.util.KUtil.format
 import de.bixilon.minosoft.util.KUtil.toResourceLocation
--- a/src/main/java/de/bixilon/minosoft/data/text/ChatComponent.kt
+++ b/src/main/java/de/bixilon/minosoft/data/text/ChatComponent.kt
@ -19,6 +19,7 @@ import de.bixilon.minosoft.Minosoft
 import de.bixilon.minosoft.data.language.Translatable
 import de.bixilon.minosoft.data.language.Translator
 import de.bixilon.minosoft.data.registries.ResourceLocation
+import de.bixilon.minosoft.data.text.formatting.color.RGBColor
 import de.bixilon.minosoft.gui.eros.util.JavaFXUtil.text
 import de.bixilon.minosoft.util.json.Jackson
 import javafx.collections.FXCollections
--- a/src/main/java/de/bixilon/minosoft/data/text/EmptyComponent.kt
+++ b/src/main/java/de/bixilon/minosoft/data/text/EmptyComponent.kt
@ -13,6 +13,7 @@

 package de.bixilon.minosoft.data.text

+import de.bixilon.minosoft.data.text.formatting.color.RGBColor
 import javafx.collections.ObservableList
 import javafx.scene.Node
 object EmptyComponent : ChatComponent {
--- a/src/main/java/de/bixilon/minosoft/data/text/TextComponent.kt
+++ b/src/main/java/de/bixilon/minosoft/data/text/TextComponent.kt
@ -16,6 +16,9 @@ import de.bixilon.kutil.json.MutableJsonObject
 import de.bixilon.minosoft.config.profile.profiles.eros.ErosProfileManager
 import de.bixilon.minosoft.data.text.events.click.ClickEvent
 import de.bixilon.minosoft.data.text.events.hover.HoverEvent
+import de.bixilon.minosoft.data.text.formatting.*
+import de.bixilon.minosoft.data.text.formatting.color.ChatColors
+import de.bixilon.minosoft.data.text.formatting.color.RGBColor
 import de.bixilon.minosoft.protocol.protocol.ProtocolDefinition
 import javafx.animation.Animation
 import javafx.animation.KeyFrame
--- a/src/main/java/de/bixilon/minosoft/data/text/formatting/ChatCode.kt
+++ b/src/main/java/de/bixilon/minosoft/data/text/formatting/ChatCode.kt
@ -10,11 +10,13 @@
 *
 * This software is not affiliated with Mojang AB, the original developer of Minecraft.
 */
-package de.bixilon.minosoft.data.text
+package de.bixilon.minosoft.data.text.formatting

 import de.bixilon.kutil.cast.CastUtil.nullCast
 import de.bixilon.kutil.collections.CollectionUtil.extend
-import de.bixilon.minosoft.data.text.RGBColor.Companion.asColor
+import de.bixilon.minosoft.data.text.formatting.color.ChatColors
+import de.bixilon.minosoft.data.text.formatting.color.RGBColor
+import de.bixilon.minosoft.data.text.formatting.color.RGBColor.Companion.asColor

 interface ChatCode {
    companion object {
--- a/src/main/java/de/bixilon/minosoft/data/text/formatting/ChatFormattingCode.kt
+++ b/src/main/java/de/bixilon/minosoft/data/text/formatting/ChatFormattingCode.kt
@ -1,6 +1,6 @@
 /*
 * Minosoft
- * Copyright (C) 2020 Moritz Zwerger
+ * Copyright (C) 2020-2022 Moritz Zwerger
 *
 * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
 *
@ -10,7 +10,7 @@
 *
 * This software is not affiliated with Mojang AB, the original developer of Minecraft.
 */
-package de.bixilon.minosoft.data.text
+package de.bixilon.minosoft.data.text.formatting

 interface ChatFormattingCode : ChatCode {
    val char: Char
--- a/src/main/java/de/bixilon/minosoft/data/text/formatting/ChatFormattingCodes.kt
+++ b/src/main/java/de/bixilon/minosoft/data/text/formatting/ChatFormattingCodes.kt
@ -1,6 +1,6 @@
 /*
 * Minosoft
- * Copyright (C) 2020 Moritz Zwerger
+ * Copyright (C) 2020-2022 Moritz Zwerger
 *
 * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
 *
@ -10,7 +10,7 @@
 *
 * This software is not affiliated with Mojang AB, the original developer of Minecraft.
 */
-package de.bixilon.minosoft.data.text
+package de.bixilon.minosoft.data.text.formatting

 import com.google.common.collect.HashBiMap

--- a/src/main/java/de/bixilon/minosoft/data/text/formatting/PostChatFormattingCodes.kt
+++ b/src/main/java/de/bixilon/minosoft/data/text/formatting/PostChatFormattingCodes.kt
@ -1,6 +1,6 @@
 /*
 * Minosoft
- * Copyright (C) 2020 Moritz Zwerger
+ * Copyright (C) 2020-2022 Moritz Zwerger
 *
 * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
 *
@ -10,7 +10,7 @@
 *
 * This software is not affiliated with Mojang AB, the original developer of Minecraft.
 */
-package de.bixilon.minosoft.data.text
+package de.bixilon.minosoft.data.text.formatting

 enum class PostChatFormattingCodes(
    override val char: Char,
--- a/src/main/java/de/bixilon/minosoft/data/text/formatting/PreChatFormattingCodes.kt
+++ b/src/main/java/de/bixilon/minosoft/data/text/formatting/PreChatFormattingCodes.kt
@ -10,7 +10,7 @@
 *
 * This software is not affiliated with Mojang AB, the original developer of Minecraft.
 */
-package de.bixilon.minosoft.data.text
+package de.bixilon.minosoft.data.text.formatting

 enum class PreChatFormattingCodes(
    override val char: Char,
--- a/src/main/java/de/bixilon/minosoft/data/text/formatting/TextFormattable.kt
+++ b/src/main/java/de/bixilon/minosoft/data/text/formatting/TextFormattable.kt
@ -1,6 +1,6 @@
 /*
 * Minosoft
- * Copyright (C) 2021 Moritz Zwerger
+ * Copyright (C) 2020-2022 Moritz Zwerger
 *
 * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
 *
@ -11,7 +11,7 @@
 * This software is not affiliated with Mojang AB, the original developer of Minecraft.
 */

-package de.bixilon.minosoft.data.text
+package de.bixilon.minosoft.data.text.formatting

 interface TextFormattable {

--- a/src/main/java/de/bixilon/minosoft/data/text/formatting/TextStyle.kt
+++ b/src/main/java/de/bixilon/minosoft/data/text/formatting/TextStyle.kt
@ -1,6 +1,6 @@
 /*
 * Minosoft
- * Copyright (C) 2021 Moritz Zwerger
+ * Copyright (C) 2020-2022 Moritz Zwerger
 *
 * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
 *
@ -11,7 +11,9 @@
 * This software is not affiliated with Mojang AB, the original developer of Minecraft.
 */

-package de.bixilon.minosoft.data.text
+package de.bixilon.minosoft.data.text.formatting
+
+import de.bixilon.minosoft.data.text.formatting.color.RGBColor

 interface TextStyle {
    var color: RGBColor?
--- a/src/main/java/de/bixilon/minosoft/data/text/formatting/color/ChatColors.kt
+++ b/src/main/java/de/bixilon/minosoft/data/text/formatting/color/ChatColors.kt
@ -11,7 +11,7 @@
 * This software is not affiliated with Mojang AB, the original developer of Minecraft.
 */

-package de.bixilon.minosoft.data.text
+package de.bixilon.minosoft.data.text.formatting.color

 import de.bixilon.kutil.collections.CollectionUtil.mutableBiMapOf
 import de.bixilon.kutil.collections.map.bi.AbstractBiMap
@ -85,8 +85,8 @@ object ChatColors {
            nameMap[field.name.lowercase()] = color
        }

-        this.VALUES = values.toTypedArray()
-        this.NAME_MAP = nameMap
+        VALUES = values.toTypedArray()
+        NAME_MAP = nameMap
    }

    operator fun get(id: Int): RGBColor {
--- a/src/main/java/de/bixilon/minosoft/data/text/formatting/color/ColorUtil.kt
+++ b/src/main/java/de/bixilon/minosoft/data/text/formatting/color/ColorUtil.kt
@ -11,7 +11,7 @@
 * This software is not affiliated with Mojang AB, the original developer of Minecraft.
 */

-package de.bixilon.minosoft.data.text
+package de.bixilon.minosoft.data.text.formatting.color

 object ColorUtil {

--- a/src/main/java/de/bixilon/minosoft/data/text/formatting/color/Colors.kt
+++ b/src/main/java/de/bixilon/minosoft/data/text/formatting/color/Colors.kt
@ -1,6 +1,6 @@
 /*
 * Minosoft
- * Copyright (C) 2021 Moritz Zwerger
+ * Copyright (C) 2020-2022 Moritz Zwerger
 *
 * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
 *
@ -11,7 +11,7 @@
 * This software is not affiliated with Mojang AB, the original developer of Minecraft.
 */

-package de.bixilon.minosoft.data.text
+package de.bixilon.minosoft.data.text.formatting.color

 object Colors {
    val TRUE_BLACK = RGBColor(0, 0, 0)
--- a/src/main/java/de/bixilon/minosoft/data/text/formatting/color/RGBColor.kt
+++ b/src/main/java/de/bixilon/minosoft/data/text/formatting/color/RGBColor.kt
@ -10,11 +10,15 @@
 *
 * This software is not affiliated with Mojang AB, the original developer of Minecraft.
 */
-package de.bixilon.minosoft.data.text
+package de.bixilon.minosoft.data.text.formatting.color

 import de.bixilon.kotlinglm.func.common.clamp
 import de.bixilon.kotlinglm.vec3.Vec3
 import de.bixilon.kotlinglm.vec4.Vec4
+import de.bixilon.minosoft.data.text.ChatComponent
+import de.bixilon.minosoft.data.text.TextComponent
+import de.bixilon.minosoft.data.text.formatting.ChatCode
+import de.bixilon.minosoft.data.text.formatting.TextFormattable
 import org.checkerframework.common.value.qual.IntRange

 class RGBColor(val rgba: Int) : ChatCode, TextFormattable {
--- a/src/main/java/de/bixilon/minosoft/gui/rendering/RenderConstants.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/rendering/RenderConstants.kt
@ -14,8 +14,8 @@
 package de.bixilon.minosoft.gui.rendering

 import de.bixilon.minosoft.data.registries.ResourceLocation
-import de.bixilon.minosoft.data.text.RGBColor
-import de.bixilon.minosoft.data.text.RGBColor.Companion.asColor
+import de.bixilon.minosoft.data.text.formatting.color.RGBColor
+import de.bixilon.minosoft.data.text.formatting.color.RGBColor.Companion.asColor

 object RenderConstants {
    val DEFAULT_SKY_COLOR = "#ecff89".asColor()
--- a/src/main/java/de/bixilon/minosoft/gui/rendering/camera/FogManager.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/rendering/camera/FogManager.kt
@ -16,8 +16,8 @@ package de.bixilon.minosoft.gui.rendering.camera
 import de.bixilon.minosoft.data.registries.effects.DefaultStatusEffects
 import de.bixilon.minosoft.data.registries.fluid.lava.LavaFluid
 import de.bixilon.minosoft.data.registries.fluid.water.WaterFluid
-import de.bixilon.minosoft.data.text.ChatColors
-import de.bixilon.minosoft.data.text.RGBColor
+import de.bixilon.minosoft.data.text.formatting.color.ChatColors
+import de.bixilon.minosoft.data.text.formatting.color.RGBColor
 import de.bixilon.minosoft.gui.rendering.RenderWindow
 import de.bixilon.minosoft.protocol.protocol.ProtocolDefinition

--- a/src/main/java/de/bixilon/minosoft/gui/rendering/camera/target/targets/BlockTarget.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/rendering/camera/target/targets/BlockTarget.kt
@ -19,7 +19,7 @@ import de.bixilon.minosoft.data.direction.Directions
 import de.bixilon.minosoft.data.registries.blocks.BlockState
 import de.bixilon.minosoft.data.text.BaseComponent
 import de.bixilon.minosoft.data.text.ChatComponent
-import de.bixilon.minosoft.data.text.TextFormattable
+import de.bixilon.minosoft.data.text.formatting.TextFormattable
 import java.util.*

 open class BlockTarget(
--- a/src/main/java/de/bixilon/minosoft/gui/rendering/camera/target/targets/EntityTarget.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/rendering/camera/target/targets/EntityTarget.kt
@ -20,7 +20,7 @@ import de.bixilon.minosoft.data.entities.entities.Entity
 import de.bixilon.minosoft.data.entities.entities.SynchronizedEntityData
 import de.bixilon.minosoft.data.text.BaseComponent
 import de.bixilon.minosoft.data.text.ChatComponent
-import de.bixilon.minosoft.data.text.TextFormattable
+import de.bixilon.minosoft.data.text.formatting.TextFormattable
 import java.util.*

 class EntityTarget(
--- a/src/main/java/de/bixilon/minosoft/gui/rendering/camera/target/targets/FluidTarget.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/rendering/camera/target/targets/FluidTarget.kt
@ -20,7 +20,7 @@ import de.bixilon.minosoft.data.registries.blocks.BlockState
 import de.bixilon.minosoft.data.registries.fluid.Fluid
 import de.bixilon.minosoft.data.text.BaseComponent
 import de.bixilon.minosoft.data.text.ChatComponent
-import de.bixilon.minosoft.data.text.TextFormattable
+import de.bixilon.minosoft.data.text.formatting.TextFormattable
 import java.util.*

 class FluidTarget(
--- a/src/main/java/de/bixilon/minosoft/gui/rendering/entity/EntityHitbox.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/rendering/entity/EntityHitbox.kt
@ -17,7 +17,7 @@ import de.bixilon.kotlinglm.vec3.Vec3
 import de.bixilon.kotlinglm.vec3.Vec3d
 import de.bixilon.minosoft.data.entities.EntityRotation
 import de.bixilon.minosoft.data.registries.AABB
-import de.bixilon.minosoft.data.text.ChatColors
+import de.bixilon.minosoft.data.text.formatting.color.ChatColors
 import de.bixilon.minosoft.gui.rendering.RenderConstants
 import de.bixilon.minosoft.gui.rendering.entity.models.EntityModel
 import de.bixilon.minosoft.gui.rendering.util.VecUtil.empty
--- a/src/main/java/de/bixilon/minosoft/gui/rendering/font/CharData.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/rendering/font/CharData.kt
@ -17,7 +17,7 @@ import de.bixilon.kotlinglm.vec2.Vec2
 import de.bixilon.kotlinglm.vec2.Vec2i
 import de.bixilon.kotlinglm.vec2.Vec2t
 import de.bixilon.kutil.math.simple.FloatMath.ceil
-import de.bixilon.minosoft.data.text.RGBColor
+import de.bixilon.minosoft.data.text.formatting.color.RGBColor
 import de.bixilon.minosoft.gui.rendering.RenderWindow
 import de.bixilon.minosoft.gui.rendering.gui.mesh.GUIVertexConsumer
 import de.bixilon.minosoft.gui.rendering.gui.mesh.GUIVertexOptions
--- a/src/main/java/de/bixilon/minosoft/gui/rendering/font/WorldGUIConsumer.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/rendering/font/WorldGUIConsumer.kt
@ -16,7 +16,7 @@ package de.bixilon.minosoft.gui.rendering.font
 import de.bixilon.kotlinglm.mat4x4.Mat4
 import de.bixilon.kotlinglm.vec2.Vec2
 import de.bixilon.kotlinglm.vec2.Vec2t
-import de.bixilon.minosoft.data.text.RGBColor
+import de.bixilon.minosoft.data.text.formatting.color.RGBColor
 import de.bixilon.minosoft.gui.rendering.font.renderer.ChatComponentRenderer
 import de.bixilon.minosoft.gui.rendering.gui.mesh.GUIMeshCache
 import de.bixilon.minosoft.gui.rendering.gui.mesh.GUIVertexConsumer
--- a/src/main/java/de/bixilon/minosoft/gui/rendering/font/renderer/TextComponentRenderer.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/rendering/font/renderer/TextComponentRenderer.kt
@ -14,9 +14,9 @@
 package de.bixilon.minosoft.gui.rendering.font.renderer

 import de.bixilon.kotlinglm.vec2.Vec2i
-import de.bixilon.minosoft.data.text.ChatColors
-import de.bixilon.minosoft.data.text.PreChatFormattingCodes
 import de.bixilon.minosoft.data.text.TextComponent
+import de.bixilon.minosoft.data.text.formatting.PreChatFormattingCodes
+import de.bixilon.minosoft.data.text.formatting.color.ChatColors
 import de.bixilon.minosoft.gui.rendering.RenderWindow
 import de.bixilon.minosoft.gui.rendering.font.Font
 import de.bixilon.minosoft.gui.rendering.font.WorldGUIConsumer
--- a/src/main/java/de/bixilon/minosoft/gui/rendering/framebuffer/world/fun/effects/Tint.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/rendering/framebuffer/world/fun/effects/Tint.kt
@ -14,7 +14,7 @@
 package de.bixilon.minosoft.gui.rendering.framebuffer.world.`fun`.effects

 import de.bixilon.minosoft.data.registries.ResourceLocation
-import de.bixilon.minosoft.data.text.RGBColor
+import de.bixilon.minosoft.data.text.formatting.color.RGBColor
 import de.bixilon.minosoft.gui.rendering.RenderWindow
 import de.bixilon.minosoft.gui.rendering.framebuffer.world.`fun`.FunEffect
 import de.bixilon.minosoft.gui.rendering.framebuffer.world.`fun`.FunEffectFactory
--- a/src/main/java/de/bixilon/minosoft/gui/rendering/framebuffer/world/overlay/overlays/FireOverlay.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/rendering/framebuffer/world/overlay/overlays/FireOverlay.kt
@ -16,7 +16,7 @@ package de.bixilon.minosoft.gui.rendering.framebuffer.world.overlay.overlays
 import de.bixilon.kotlinglm.vec3.Vec3
 import de.bixilon.minosoft.data.abilities.Gamemodes
 import de.bixilon.minosoft.data.registries.fluid.DefaultFluids
-import de.bixilon.minosoft.data.text.RGBColor
+import de.bixilon.minosoft.data.text.formatting.color.RGBColor
 import de.bixilon.minosoft.gui.rendering.RenderWindow
 import de.bixilon.minosoft.gui.rendering.framebuffer.world.overlay.Overlay
 import de.bixilon.minosoft.gui.rendering.framebuffer.world.overlay.OverlayFactory
--- a/src/main/java/de/bixilon/minosoft/gui/rendering/framebuffer/world/overlay/overlays/simple/PowderSnowOverlay.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/rendering/framebuffer/world/overlay/overlays/simple/PowderSnowOverlay.kt
@ -13,7 +13,7 @@

 package de.bixilon.minosoft.gui.rendering.framebuffer.world.overlay.overlays.simple

-import de.bixilon.minosoft.data.text.RGBColor
+import de.bixilon.minosoft.data.text.formatting.color.RGBColor
 import de.bixilon.minosoft.gui.rendering.RenderWindow
 import de.bixilon.minosoft.gui.rendering.framebuffer.world.overlay.OverlayFactory
 import de.bixilon.minosoft.gui.rendering.system.base.texture.texture.AbstractTexture
--- a/src/main/java/de/bixilon/minosoft/gui/rendering/framebuffer/world/overlay/overlays/simple/SimpleOverlay.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/rendering/framebuffer/world/overlay/overlays/simple/SimpleOverlay.kt
@ -14,7 +14,7 @@
 package de.bixilon.minosoft.gui.rendering.framebuffer.world.overlay.overlays.simple

 import de.bixilon.kotlinglm.vec2.Vec2
-import de.bixilon.minosoft.data.text.RGBColor
+import de.bixilon.minosoft.data.text.formatting.color.RGBColor
 import de.bixilon.minosoft.gui.rendering.RenderWindow
 import de.bixilon.minosoft.gui.rendering.framebuffer.world.overlay.Overlay
 import de.bixilon.minosoft.gui.rendering.system.base.shader.Shader
--- a/src/main/java/de/bixilon/minosoft/gui/rendering/framebuffer/world/overlay/overlays/simple/WallOverlay.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/rendering/framebuffer/world/overlay/overlays/simple/WallOverlay.kt
@ -19,7 +19,7 @@ import de.bixilon.kutil.cast.CastUtil.unsafeNull
 import de.bixilon.minosoft.data.abilities.Gamemodes
 import de.bixilon.minosoft.data.registries.blocks.BlockState
 import de.bixilon.minosoft.data.registries.blocks.types.FluidBlock
-import de.bixilon.minosoft.data.text.RGBColor
+import de.bixilon.minosoft.data.text.formatting.color.RGBColor
 import de.bixilon.minosoft.gui.rendering.RenderWindow
 import de.bixilon.minosoft.gui.rendering.framebuffer.world.overlay.OverlayFactory
 import de.bixilon.minosoft.gui.rendering.system.base.texture.texture.AbstractTexture
--- a/src/main/java/de/bixilon/minosoft/gui/rendering/framebuffer/world/overlay/overlays/simple/WaterOverlay.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/rendering/framebuffer/world/overlay/overlays/simple/WaterOverlay.kt
@ -15,7 +15,7 @@ package de.bixilon.minosoft.gui.rendering.framebuffer.world.overlay.overlays.sim

 import de.bixilon.minosoft.data.abilities.Gamemodes
 import de.bixilon.minosoft.data.registries.fluid.water.WaterFluid
-import de.bixilon.minosoft.data.text.RGBColor
+import de.bixilon.minosoft.data.text.formatting.color.RGBColor
 import de.bixilon.minosoft.gui.rendering.RenderWindow
 import de.bixilon.minosoft.gui.rendering.framebuffer.world.overlay.OverlayFactory
 import de.bixilon.minosoft.gui.rendering.system.base.texture.texture.AbstractTexture
--- a/src/main/java/de/bixilon/minosoft/gui/rendering/framebuffer/world/overlay/overlays/simple/WorldBorderOverlay.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/rendering/framebuffer/world/overlay/overlays/simple/WorldBorderOverlay.kt
@ -13,7 +13,7 @@

 package de.bixilon.minosoft.gui.rendering.framebuffer.world.overlay.overlays.simple

-import de.bixilon.minosoft.data.text.RGBColor
+import de.bixilon.minosoft.data.text.formatting.color.RGBColor
 import de.bixilon.minosoft.gui.rendering.RenderWindow
 import de.bixilon.minosoft.gui.rendering.framebuffer.world.overlay.OverlayFactory
 import de.bixilon.minosoft.gui.rendering.system.base.texture.texture.AbstractTexture
--- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/items/ItemElement.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/items/ItemElement.kt
@ -18,7 +18,7 @@ import de.bixilon.minosoft.config.key.KeyCodes
 import de.bixilon.minosoft.data.abilities.Gamemodes
 import de.bixilon.minosoft.data.container.click.*
 import de.bixilon.minosoft.data.container.stack.ItemStack
-import de.bixilon.minosoft.data.text.RGBColor
+import de.bixilon.minosoft.data.text.formatting.color.RGBColor
 import de.bixilon.minosoft.gui.rendering.gui.GUIRenderer
 import de.bixilon.minosoft.gui.rendering.gui.elements.Element
 import de.bixilon.minosoft.gui.rendering.gui.elements.primitive.ImageElement
--- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/items/RawItemElement.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/items/RawItemElement.kt
@ -18,9 +18,9 @@ import de.bixilon.kotlinglm.vec3.Vec3i
 import de.bixilon.kutil.watcher.DataWatcher.Companion.observe
 import de.bixilon.minosoft.data.container.stack.ItemStack
 import de.bixilon.minosoft.data.registries.items.block.BlockItem
-import de.bixilon.minosoft.data.text.ChatColors
 import de.bixilon.minosoft.data.text.ChatComponent
 import de.bixilon.minosoft.data.text.TextComponent
+import de.bixilon.minosoft.data.text.formatting.color.ChatColors
 import de.bixilon.minosoft.gui.rendering.gui.GUIRenderer
 import de.bixilon.minosoft.gui.rendering.gui.elements.Element
 import de.bixilon.minosoft.gui.rendering.gui.elements.HorizontalAlignments
--- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/primitive/AtlasImageElement.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/primitive/AtlasImageElement.kt
@ -15,8 +15,8 @@ package de.bixilon.minosoft.gui.rendering.gui.elements.primitive

 import de.bixilon.kotlinglm.vec2.Vec2
 import de.bixilon.kotlinglm.vec2.Vec2i
-import de.bixilon.minosoft.data.text.ChatColors
-import de.bixilon.minosoft.data.text.RGBColor
+import de.bixilon.minosoft.data.text.formatting.color.ChatColors
+import de.bixilon.minosoft.data.text.formatting.color.RGBColor
 import de.bixilon.minosoft.gui.rendering.gui.GUIRenderer
 import de.bixilon.minosoft.gui.rendering.gui.atlas.TextureLike
 import de.bixilon.minosoft.gui.rendering.gui.elements.Element
--- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/primitive/ColorElement.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/primitive/ColorElement.kt
@ -14,8 +14,8 @@
 package de.bixilon.minosoft.gui.rendering.gui.elements.primitive

 import de.bixilon.kotlinglm.vec2.Vec2i
-import de.bixilon.minosoft.data.text.ChatColors
-import de.bixilon.minosoft.data.text.RGBColor
+import de.bixilon.minosoft.data.text.formatting.color.ChatColors
+import de.bixilon.minosoft.data.text.formatting.color.RGBColor
 import de.bixilon.minosoft.gui.rendering.gui.GUIRenderer

 class ColorElement(
--- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/primitive/DynamicImageElement.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/primitive/DynamicImageElement.kt
@ -15,8 +15,8 @@ package de.bixilon.minosoft.gui.rendering.gui.elements.primitive

 import de.bixilon.kotlinglm.vec2.Vec2
 import de.bixilon.kotlinglm.vec2.Vec2i
-import de.bixilon.minosoft.data.text.ChatColors
-import de.bixilon.minosoft.data.text.RGBColor
+import de.bixilon.minosoft.data.text.formatting.color.ChatColors
+import de.bixilon.minosoft.data.text.formatting.color.RGBColor
 import de.bixilon.minosoft.gui.rendering.gui.GUIRenderer
 import de.bixilon.minosoft.gui.rendering.gui.elements.Element
 import de.bixilon.minosoft.gui.rendering.gui.mesh.GUIMesh
--- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/primitive/ImageElement.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/primitive/ImageElement.kt
@ -15,8 +15,8 @@ package de.bixilon.minosoft.gui.rendering.gui.elements.primitive

 import de.bixilon.kotlinglm.vec2.Vec2
 import de.bixilon.kotlinglm.vec2.Vec2i
-import de.bixilon.minosoft.data.text.ChatColors
-import de.bixilon.minosoft.data.text.RGBColor
+import de.bixilon.minosoft.data.text.formatting.color.ChatColors
+import de.bixilon.minosoft.data.text.formatting.color.RGBColor
 import de.bixilon.minosoft.gui.rendering.gui.GUIRenderer
 import de.bixilon.minosoft.gui.rendering.gui.elements.Element
 import de.bixilon.minosoft.gui.rendering.gui.mesh.GUIMesh
--- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/text/FadingTextElement.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/text/FadingTextElement.kt
@ -16,7 +16,7 @@ package de.bixilon.minosoft.gui.rendering.gui.elements.text
 import de.bixilon.kotlinglm.vec2.Vec2i
 import de.bixilon.kutil.primitive.BooleanUtil.decide
 import de.bixilon.kutil.time.TimeUtil
-import de.bixilon.minosoft.data.text.RGBColor
+import de.bixilon.minosoft.data.text.formatting.color.RGBColor
 import de.bixilon.minosoft.gui.rendering.RenderConstants
 import de.bixilon.minosoft.gui.rendering.gui.GUIRenderer
 import de.bixilon.minosoft.gui.rendering.gui.elements.Element
--- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/text/TextElement.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/text/TextElement.kt
@ -19,8 +19,8 @@ import de.bixilon.kutil.primitive.BooleanUtil.decide
 import de.bixilon.minosoft.Minosoft
 import de.bixilon.minosoft.data.text.ChatComponent
 import de.bixilon.minosoft.data.text.EmptyComponent
-import de.bixilon.minosoft.data.text.RGBColor
 import de.bixilon.minosoft.data.text.TextComponent
+import de.bixilon.minosoft.data.text.formatting.color.RGBColor
 import de.bixilon.minosoft.gui.rendering.RenderConstants
 import de.bixilon.minosoft.gui.rendering.font.Font
 import de.bixilon.minosoft.gui.rendering.font.renderer.ChatComponentRenderer
--- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/text/mark/MarkTextElement.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/text/mark/MarkTextElement.kt
@ -15,9 +15,9 @@ package de.bixilon.minosoft.gui.rendering.gui.elements.text.mark

 import de.bixilon.kotlinglm.vec2.Vec2i
 import de.bixilon.minosoft.config.key.KeyCodes
-import de.bixilon.minosoft.data.text.ChatColors
 import de.bixilon.minosoft.data.text.ChatComponent
-import de.bixilon.minosoft.data.text.RGBColor
+import de.bixilon.minosoft.data.text.formatting.color.ChatColors
+import de.bixilon.minosoft.data.text.formatting.color.RGBColor
 import de.bixilon.minosoft.gui.rendering.RenderConstants
 import de.bixilon.minosoft.gui.rendering.font.Font
 import de.bixilon.minosoft.gui.rendering.gui.GUIRenderer
--- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/elements/input/node/NodeErrorElement.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/elements/input/node/NodeErrorElement.kt
@ -14,9 +14,9 @@
 package de.bixilon.minosoft.gui.rendering.gui.gui.elements.input.node

 import de.bixilon.kotlinglm.vec2.Vec2i
-import de.bixilon.minosoft.data.text.ChatColors
 import de.bixilon.minosoft.data.text.ChatComponent
 import de.bixilon.minosoft.data.text.TextComponent
+import de.bixilon.minosoft.data.text.formatting.color.ChatColors
 import de.bixilon.minosoft.gui.rendering.gui.GUIRenderer
 import de.bixilon.minosoft.gui.rendering.gui.gui.popper.text.TextPopper

--- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/elements/input/node/NodeSuggestionsElement.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/elements/input/node/NodeSuggestionsElement.kt
@ -16,9 +16,9 @@ package de.bixilon.minosoft.gui.rendering.gui.gui.elements.input.node
 import de.bixilon.kotlinglm.vec2.Vec2i
 import de.bixilon.kutil.array.ArrayUtil
 import de.bixilon.minosoft.config.key.KeyCodes
-import de.bixilon.minosoft.data.text.ChatColors
 import de.bixilon.minosoft.data.text.ChatComponent
 import de.bixilon.minosoft.data.text.TextComponent
+import de.bixilon.minosoft.data.text.formatting.color.ChatColors
 import de.bixilon.minosoft.gui.rendering.font.Font
 import de.bixilon.minosoft.gui.rendering.gui.GUIRenderer
 import de.bixilon.minosoft.gui.rendering.gui.elements.text.TextElement
--- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/popper/Popper.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/popper/Popper.kt
@ -14,7 +14,7 @@
 package de.bixilon.minosoft.gui.rendering.gui.gui.popper

 import de.bixilon.kotlinglm.vec2.Vec2i
-import de.bixilon.minosoft.data.text.RGBColor
+import de.bixilon.minosoft.data.text.formatting.color.RGBColor
 import de.bixilon.minosoft.gui.rendering.gui.GUIRenderer
 import de.bixilon.minosoft.gui.rendering.gui.elements.Element
 import de.bixilon.minosoft.gui.rendering.gui.elements.LayoutedElement
--- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/popper/item/ItemInfoPopper.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/popper/item/ItemInfoPopper.kt
@ -16,9 +16,9 @@ package de.bixilon.minosoft.gui.rendering.gui.gui.popper.item
 import de.bixilon.kotlinglm.vec2.Vec2i
 import de.bixilon.minosoft.data.container.stack.ItemStack
 import de.bixilon.minosoft.data.text.BaseComponent
-import de.bixilon.minosoft.data.text.ChatColors
 import de.bixilon.minosoft.data.text.ChatComponent
 import de.bixilon.minosoft.data.text.TextComponent
+import de.bixilon.minosoft.data.text.formatting.color.ChatColors
 import de.bixilon.minosoft.gui.rendering.gui.GUIRenderer
 import de.bixilon.minosoft.gui.rendering.gui.elements.Element
 import de.bixilon.minosoft.gui.rendering.gui.elements.text.TextElement
--- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/screen/Screen.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/screen/Screen.kt
@ -14,7 +14,7 @@
 package de.bixilon.minosoft.gui.rendering.gui.gui.screen

 import de.bixilon.kotlinglm.vec2.Vec2i
-import de.bixilon.minosoft.data.text.RGBColor
+import de.bixilon.minosoft.data.text.formatting.color.RGBColor
 import de.bixilon.minosoft.gui.rendering.gui.GUIRenderer
 import de.bixilon.minosoft.gui.rendering.gui.elements.Element
 import de.bixilon.minosoft.gui.rendering.gui.elements.LayoutedElement
--- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/screen/container/enchanting/EnchantmentButtonElement.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/screen/container/enchanting/EnchantmentButtonElement.kt
@ -15,9 +15,9 @@ package de.bixilon.minosoft.gui.rendering.gui.gui.screen.container.enchanting

 import de.bixilon.kotlinglm.vec2.Vec2i
 import de.bixilon.minosoft.data.registries.enchantment.Enchantment
-import de.bixilon.minosoft.data.text.ChatColors
 import de.bixilon.minosoft.data.text.ChatComponent
 import de.bixilon.minosoft.data.text.TextComponent
+import de.bixilon.minosoft.data.text.formatting.color.ChatColors
 import de.bixilon.minosoft.gui.rendering.RenderConstants
 import de.bixilon.minosoft.gui.rendering.gui.GUIRenderer
 import de.bixilon.minosoft.gui.rendering.gui.atlas.AtlasElement
--- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/screen/container/text/ContainerText.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/screen/container/text/ContainerText.kt
@ -14,9 +14,9 @@
 package de.bixilon.minosoft.gui.rendering.gui.gui.screen.container.text

 import de.bixilon.kotlinglm.vec2.Vec2i
-import de.bixilon.minosoft.data.text.ChatColors
 import de.bixilon.minosoft.data.text.ChatComponent
 import de.bixilon.minosoft.data.text.TextComponent
+import de.bixilon.minosoft.data.text.formatting.color.ChatColors
 import de.bixilon.minosoft.gui.rendering.gui.GUIRenderer
 import de.bixilon.minosoft.gui.rendering.gui.atlas.AtlasArea
 import de.bixilon.minosoft.gui.rendering.gui.elements.text.TextElement
--- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/screen/menu/confirmation/AbstractConfirmationMenu.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/screen/menu/confirmation/AbstractConfirmationMenu.kt
@ -14,7 +14,7 @@
 package de.bixilon.minosoft.gui.rendering.gui.gui.screen.menu.confirmation

 import de.bixilon.kotlinglm.vec2.Vec2i
-import de.bixilon.minosoft.data.text.ChatColors
+import de.bixilon.minosoft.data.text.formatting.color.ChatColors
 import de.bixilon.minosoft.gui.rendering.gui.GUIRenderer
 import de.bixilon.minosoft.gui.rendering.gui.elements.HorizontalAlignments
 import de.bixilon.minosoft.gui.rendering.gui.elements.input.button.ButtonElement
--- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/screen/menu/pause/RespawnMenu.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/screen/menu/pause/RespawnMenu.kt
@ -15,7 +15,7 @@ package de.bixilon.minosoft.gui.rendering.gui.gui.screen.menu.pause

 import de.bixilon.kotlinglm.vec2.Vec2i
 import de.bixilon.kutil.watcher.DataWatcher.Companion.observe
-import de.bixilon.minosoft.data.text.RGBColor
+import de.bixilon.minosoft.data.text.formatting.color.RGBColor
 import de.bixilon.minosoft.gui.rendering.gui.GUIRenderer
 import de.bixilon.minosoft.gui.rendering.gui.elements.HorizontalAlignments
 import de.bixilon.minosoft.gui.rendering.gui.elements.input.button.ButtonElement
--- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/hotbar/AbstractHotbarHealthElement.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/hotbar/AbstractHotbarHealthElement.kt
@ -16,7 +16,7 @@ package de.bixilon.minosoft.gui.rendering.gui.hud.elements.hotbar
 import de.bixilon.kotlinglm.vec2.Vec2i
 import de.bixilon.kutil.math.simple.FloatMath.ceil
 import de.bixilon.minosoft.data.text.ChatComponent
-import de.bixilon.minosoft.data.text.RGBColor.Companion.asColor
+import de.bixilon.minosoft.data.text.formatting.color.RGBColor.Companion.asColor
 import de.bixilon.minosoft.gui.rendering.gui.GUIRenderer
 import de.bixilon.minosoft.gui.rendering.gui.atlas.AtlasElement
 import de.bixilon.minosoft.gui.rendering.gui.elements.Element
--- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/hotbar/HotbarHealthElement.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/hotbar/HotbarHealthElement.kt
@ -21,8 +21,8 @@ import de.bixilon.minosoft.data.registries.effects.DefaultStatusEffects
 import de.bixilon.minosoft.data.registries.effects.attributes.DefaultStatusEffectAttributeNames
 import de.bixilon.minosoft.data.text.BaseComponent
 import de.bixilon.minosoft.data.text.ChatComponent
-import de.bixilon.minosoft.data.text.RGBColor.Companion.asColor
 import de.bixilon.minosoft.data.text.TextComponent
+import de.bixilon.minosoft.data.text.formatting.color.RGBColor.Companion.asColor
 import de.bixilon.minosoft.gui.rendering.gui.GUIRenderer
 import de.bixilon.minosoft.gui.rendering.gui.atlas.AtlasElement
 import de.bixilon.minosoft.gui.rendering.gui.elements.Pollable
--- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/hotbar/HotbarVehicleHealthElement.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/hotbar/HotbarVehicleHealthElement.kt
@ -19,8 +19,8 @@ import de.bixilon.kutil.primitive.BooleanUtil.decide
 import de.bixilon.minosoft.data.entities.entities.LivingEntity
 import de.bixilon.minosoft.data.registries.effects.attributes.DefaultStatusEffectAttributeNames
 import de.bixilon.minosoft.data.text.ChatComponent
-import de.bixilon.minosoft.data.text.RGBColor.Companion.asColor
 import de.bixilon.minosoft.data.text.TextComponent
+import de.bixilon.minosoft.data.text.formatting.color.RGBColor.Companion.asColor
 import de.bixilon.minosoft.gui.rendering.gui.GUIRenderer
 import de.bixilon.minosoft.gui.rendering.gui.elements.Pollable
 import de.bixilon.minosoft.gui.rendering.gui.elements.primitive.AtlasImageElement
--- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/other/BreakProgressHUDElement.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/other/BreakProgressHUDElement.kt
@ -15,9 +15,9 @@ package de.bixilon.minosoft.gui.rendering.gui.hud.elements.other

 import de.bixilon.kotlinglm.vec2.Vec2i
 import de.bixilon.minosoft.data.registries.ResourceLocation
-import de.bixilon.minosoft.data.text.ChatColors
 import de.bixilon.minosoft.data.text.ChatComponent
 import de.bixilon.minosoft.data.text.TextComponent
+import de.bixilon.minosoft.data.text.formatting.color.ChatColors
 import de.bixilon.minosoft.gui.rendering.gui.GUIRenderer
 import de.bixilon.minosoft.gui.rendering.gui.elements.Element
 import de.bixilon.minosoft.gui.rendering.gui.elements.LayoutedElement
--- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/other/DebugHUDElement.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/other/DebugHUDElement.kt
@ -26,8 +26,8 @@ import de.bixilon.minosoft.data.direction.Directions
 import de.bixilon.minosoft.data.registries.ResourceLocation
 import de.bixilon.minosoft.data.registries.other.game.event.handlers.gamemode.GamemodeChangeEvent
 import de.bixilon.minosoft.data.text.BaseComponent
-import de.bixilon.minosoft.data.text.ChatColors
 import de.bixilon.minosoft.data.text.TextComponent
+import de.bixilon.minosoft.data.text.formatting.color.ChatColors
 import de.bixilon.minosoft.data.world.chunk.Chunk
 import de.bixilon.minosoft.gui.rendering.gui.GUIRenderer
 import de.bixilon.minosoft.gui.rendering.gui.elements.Element
--- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/scoreboard/ScoreboardScoreElement.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/scoreboard/ScoreboardScoreElement.kt
@ -15,9 +15,9 @@ package de.bixilon.minosoft.gui.rendering.gui.hud.elements.scoreboard

 import de.bixilon.kotlinglm.vec2.Vec2i
 import de.bixilon.minosoft.data.scoreboard.ScoreboardScore
-import de.bixilon.minosoft.data.text.ChatColors
 import de.bixilon.minosoft.data.text.ChatComponent
 import de.bixilon.minosoft.data.text.TextComponent
+import de.bixilon.minosoft.data.text.formatting.color.ChatColors
 import de.bixilon.minosoft.gui.rendering.gui.GUIRenderer
 import de.bixilon.minosoft.gui.rendering.gui.elements.Element
 import de.bixilon.minosoft.gui.rendering.gui.elements.HorizontalAlignments
--- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/tab/TabListElement.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/tab/TabListElement.kt
@ -21,7 +21,7 @@ import de.bixilon.minosoft.config.key.KeyActions
 import de.bixilon.minosoft.config.key.KeyBinding
 import de.bixilon.minosoft.config.key.KeyCodes
 import de.bixilon.minosoft.data.registries.ResourceLocation
-import de.bixilon.minosoft.data.text.RGBColor
+import de.bixilon.minosoft.data.text.formatting.color.RGBColor
 import de.bixilon.minosoft.gui.rendering.gui.GUIRenderer
 import de.bixilon.minosoft.gui.rendering.gui.atlas.AtlasElement
 import de.bixilon.minosoft.gui.rendering.gui.elements.Element
--- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/tab/TabListEntryElement.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/tab/TabListEntryElement.kt
@ -19,7 +19,7 @@ import de.bixilon.kutil.concurrent.pool.DefaultThreadPool
 import de.bixilon.minosoft.data.abilities.Gamemodes
 import de.bixilon.minosoft.data.entities.entities.player.tab.TabListItem
 import de.bixilon.minosoft.data.text.ChatComponent
-import de.bixilon.minosoft.data.text.RGBColor
+import de.bixilon.minosoft.data.text.formatting.color.RGBColor
 import de.bixilon.minosoft.gui.rendering.gui.GUIRenderer
 import de.bixilon.minosoft.gui.rendering.gui.elements.Element
 import de.bixilon.minosoft.gui.rendering.gui.elements.HorizontalAlignments
--- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/mesh/GUIMesh.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/mesh/GUIMesh.kt
@ -16,7 +16,7 @@ package de.bixilon.minosoft.gui.rendering.gui.mesh
 import de.bixilon.kotlinglm.mat4x4.Mat4
 import de.bixilon.kotlinglm.vec2.Vec2
 import de.bixilon.kotlinglm.vec2.Vec2t
-import de.bixilon.minosoft.data.text.RGBColor
+import de.bixilon.minosoft.data.text.formatting.color.RGBColor
 import de.bixilon.minosoft.gui.rendering.RenderWindow
 import de.bixilon.minosoft.gui.rendering.system.base.texture.ShaderIdentifiable
 import de.bixilon.minosoft.gui.rendering.util.mesh.Mesh
--- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/mesh/GUIMeshCache.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/mesh/GUIMeshCache.kt
@ -17,7 +17,7 @@ import de.bixilon.kotlinglm.mat4x4.Mat4
 import de.bixilon.kotlinglm.vec2.Vec2
 import de.bixilon.kotlinglm.vec2.Vec2i
 import de.bixilon.kotlinglm.vec2.Vec2t
-import de.bixilon.minosoft.data.text.RGBColor
+import de.bixilon.minosoft.data.text.formatting.color.RGBColor
 import de.bixilon.minosoft.gui.rendering.system.base.texture.ShaderIdentifiable
 import de.bixilon.minosoft.gui.rendering.util.vec.vec2.Vec2iUtil.EMPTY
 import de.bixilon.minosoft.util.collections.floats.AbstractFloatList
--- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/mesh/GUIVertexConsumer.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/mesh/GUIVertexConsumer.kt
@ -15,7 +15,7 @@ package de.bixilon.minosoft.gui.rendering.gui.mesh

 import de.bixilon.kotlinglm.vec2.Vec2
 import de.bixilon.kotlinglm.vec2.Vec2t
-import de.bixilon.minosoft.data.text.RGBColor
+import de.bixilon.minosoft.data.text.formatting.color.RGBColor
 import de.bixilon.minosoft.gui.rendering.gui.atlas.TextureLike
 import de.bixilon.minosoft.gui.rendering.system.base.texture.ShaderIdentifiable

--- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/mesh/GUIVertexOptions.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/mesh/GUIVertexOptions.kt
@ -1,6 +1,6 @@
 /*
 * Minosoft
- * Copyright (C) 2021 Moritz Zwerger
+ * Copyright (C) 2020-2022 Moritz Zwerger
 *
 * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
 *
@ -13,7 +13,7 @@

 package de.bixilon.minosoft.gui.rendering.gui.mesh

-import de.bixilon.minosoft.data.text.RGBColor
+import de.bixilon.minosoft.data.text.formatting.color.RGBColor

 class GUIVertexOptions(
    val tintColor: RGBColor? = null,
--- a/src/main/java/de/bixilon/minosoft/gui/rendering/models/baked/block/BakedFace.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/rendering/models/baked/block/BakedFace.kt
@ -16,7 +16,7 @@ package de.bixilon.minosoft.gui.rendering.models.baked.block
 import de.bixilon.kotlinglm.vec2.Vec2
 import de.bixilon.kotlinglm.vec3.Vec3
 import de.bixilon.minosoft.data.direction.Directions
-import de.bixilon.minosoft.data.text.RGBColor
+import de.bixilon.minosoft.data.text.formatting.color.RGBColor
 import de.bixilon.minosoft.gui.rendering.models.properties.AbstractFaceProperties
 import de.bixilon.minosoft.gui.rendering.system.base.texture.TextureTransparencies
 import de.bixilon.minosoft.gui.rendering.system.base.texture.texture.AbstractTexture
--- a/src/main/java/de/bixilon/minosoft/gui/rendering/models/baked/item/BakedItemModel.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/rendering/models/baked/item/BakedItemModel.kt
@ -15,8 +15,8 @@ package de.bixilon.minosoft.gui.rendering.models.baked.item

 import de.bixilon.kotlinglm.vec2.Vec2i
 import de.bixilon.minosoft.data.container.stack.ItemStack
-import de.bixilon.minosoft.data.text.ChatColors
-import de.bixilon.minosoft.data.text.RGBColor
+import de.bixilon.minosoft.data.text.formatting.color.ChatColors
+import de.bixilon.minosoft.data.text.formatting.color.RGBColor
 import de.bixilon.minosoft.gui.rendering.gui.GUIRenderer
 import de.bixilon.minosoft.gui.rendering.gui.mesh.GUIVertexConsumer
 import de.bixilon.minosoft.gui.rendering.gui.mesh.GUIVertexOptions
--- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/ParticleMesh.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/ParticleMesh.kt
@ -16,7 +16,7 @@ package de.bixilon.minosoft.gui.rendering.particle
 import de.bixilon.kotlinglm.vec2.Vec2
 import de.bixilon.kotlinglm.vec3.Vec3
 import de.bixilon.kotlinglm.vec3.Vec3d
-import de.bixilon.minosoft.data.text.RGBColor
+import de.bixilon.minosoft.data.text.formatting.color.RGBColor
 import de.bixilon.minosoft.gui.rendering.RenderWindow
 import de.bixilon.minosoft.gui.rendering.system.base.buffer.vertex.PrimitiveTypes
 import de.bixilon.minosoft.gui.rendering.system.base.texture.texture.AbstractTexture
--- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/RenderParticle.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/RenderParticle.kt
@ -15,8 +15,8 @@ package de.bixilon.minosoft.gui.rendering.particle.types.render

 import de.bixilon.kotlinglm.vec3.Vec3d
 import de.bixilon.minosoft.data.registries.particle.data.ParticleData
-import de.bixilon.minosoft.data.text.ChatColors
-import de.bixilon.minosoft.data.text.RGBColor
+import de.bixilon.minosoft.data.text.formatting.color.ChatColors
+import de.bixilon.minosoft.data.text.formatting.color.RGBColor
 import de.bixilon.minosoft.gui.rendering.particle.types.Particle
 import de.bixilon.minosoft.protocol.network.connection.play.PlayConnection

--- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/advanced/block/BlockDustParticle.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/advanced/block/BlockDustParticle.kt
@ -19,9 +19,9 @@ import de.bixilon.minosoft.data.registries.ResourceLocation
 import de.bixilon.minosoft.data.registries.blocks.MinecraftBlocks
 import de.bixilon.minosoft.data.registries.particle.data.BlockParticleData
 import de.bixilon.minosoft.data.registries.particle.data.ParticleData
-import de.bixilon.minosoft.data.text.RGBColor
-import de.bixilon.minosoft.data.text.RGBColor.Companion.asGray
-import de.bixilon.minosoft.data.text.RGBColor.Companion.asRGBColor
+import de.bixilon.minosoft.data.text.formatting.color.RGBColor
+import de.bixilon.minosoft.data.text.formatting.color.RGBColor.Companion.asGray
+import de.bixilon.minosoft.data.text.formatting.color.RGBColor.Companion.asRGBColor
 import de.bixilon.minosoft.gui.rendering.particle.ParticleFactory
 import de.bixilon.minosoft.gui.rendering.particle.types.render.texture.advanced.AdvancedTextureParticle
 import de.bixilon.minosoft.gui.rendering.util.vec.vec3.Vec3dUtil.blockPosition
--- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/AscendingParticle.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/AscendingParticle.kt
@ -16,7 +16,7 @@ package de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple
 import de.bixilon.kotlinglm.func.common.clamp
 import de.bixilon.kotlinglm.vec3.Vec3d
 import de.bixilon.minosoft.data.registries.particle.data.ParticleData
-import de.bixilon.minosoft.data.text.RGBColor.Companion.asGray
+import de.bixilon.minosoft.data.text.formatting.color.RGBColor.Companion.asGray
 import de.bixilon.minosoft.gui.rendering.util.vec.vec3.Vec3dUtil.EMPTY
 import de.bixilon.minosoft.protocol.network.connection.play.PlayConnection

--- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/NoteParticle.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/NoteParticle.kt
@ -17,7 +17,7 @@ import de.bixilon.kotlinglm.GLM
 import de.bixilon.kotlinglm.vec3.Vec3d
 import de.bixilon.minosoft.data.registries.ResourceLocation
 import de.bixilon.minosoft.data.registries.particle.data.ParticleData
-import de.bixilon.minosoft.data.text.RGBColor
+import de.bixilon.minosoft.data.text.formatting.color.RGBColor
 import de.bixilon.minosoft.gui.rendering.particle.ParticleFactory
 import de.bixilon.minosoft.gui.rendering.util.vec.vec3.Vec3dUtil.EMPTY
 import de.bixilon.minosoft.protocol.network.connection.play.PlayConnection
--- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/PortalParticle.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/PortalParticle.kt
@ -17,7 +17,7 @@ import de.bixilon.kotlinglm.pow
 import de.bixilon.kotlinglm.vec3.Vec3d
 import de.bixilon.minosoft.data.registries.ResourceLocation
 import de.bixilon.minosoft.data.registries.particle.data.ParticleData
-import de.bixilon.minosoft.data.text.RGBColor
+import de.bixilon.minosoft.data.text.formatting.color.RGBColor
 import de.bixilon.minosoft.gui.rendering.particle.ParticleFactory
 import de.bixilon.minosoft.gui.rendering.util.VecUtil.assign
 import de.bixilon.minosoft.gui.rendering.util.vec.vec3.Vec3dUtil.EMPTY
--- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/animated/AnimatedParticle.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/animated/AnimatedParticle.kt
@ -15,7 +15,7 @@ package de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.a

 import de.bixilon.kotlinglm.vec3.Vec3d
 import de.bixilon.minosoft.data.registries.particle.data.ParticleData
-import de.bixilon.minosoft.data.text.RGBColor
+import de.bixilon.minosoft.data.text.formatting.color.RGBColor
 import de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.SimpleTextureParticle
 import de.bixilon.minosoft.gui.rendering.util.vec.vec3.Vec3dUtil.EMPTY
 import de.bixilon.minosoft.protocol.network.connection.play.PlayConnection
--- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/animated/EndRodParticle.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/animated/EndRodParticle.kt
@ -16,7 +16,7 @@ package de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.a
 import de.bixilon.kotlinglm.vec3.Vec3d
 import de.bixilon.minosoft.data.registries.ResourceLocation
 import de.bixilon.minosoft.data.registries.particle.data.ParticleData
-import de.bixilon.minosoft.data.text.RGBColor.Companion.asRGBColor
+import de.bixilon.minosoft.data.text.formatting.color.RGBColor.Companion.asRGBColor
 import de.bixilon.minosoft.gui.rendering.particle.ParticleFactory
 import de.bixilon.minosoft.gui.rendering.util.VecUtil.assign
 import de.bixilon.minosoft.protocol.network.connection.play.PlayConnection
--- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/cloud/CloudParticle.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/cloud/CloudParticle.kt
@ -16,7 +16,7 @@ package de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.c
 import de.bixilon.kotlinglm.vec3.Vec3d
 import de.bixilon.minosoft.data.registries.ResourceLocation
 import de.bixilon.minosoft.data.registries.particle.data.ParticleData
-import de.bixilon.minosoft.data.text.RGBColor.Companion.asGray
+import de.bixilon.minosoft.data.text.formatting.color.RGBColor.Companion.asGray
 import de.bixilon.minosoft.data.world.WorldEntities
 import de.bixilon.minosoft.gui.rendering.particle.ParticleFactory
 import de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.SimpleTextureParticle
--- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/cloud/SneezeParticle.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/cloud/SneezeParticle.kt
@ -16,7 +16,7 @@ package de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.c
 import de.bixilon.kotlinglm.vec3.Vec3d
 import de.bixilon.minosoft.data.registries.ResourceLocation
 import de.bixilon.minosoft.data.registries.particle.data.ParticleData
-import de.bixilon.minosoft.data.text.RGBColor
+import de.bixilon.minosoft.data.text.formatting.color.RGBColor
 import de.bixilon.minosoft.gui.rendering.particle.ParticleFactory
 import de.bixilon.minosoft.protocol.network.connection.play.PlayConnection
 import de.bixilon.minosoft.util.KUtil.toResourceLocation
--- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/damage/DamageParticle.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/damage/DamageParticle.kt
@ -16,7 +16,7 @@ package de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.d
 import de.bixilon.kotlinglm.func.common.clamp
 import de.bixilon.kotlinglm.vec3.Vec3d
 import de.bixilon.minosoft.data.registries.particle.data.ParticleData
-import de.bixilon.minosoft.data.text.RGBColor.Companion.asGray
+import de.bixilon.minosoft.data.text.formatting.color.RGBColor.Companion.asGray
 import de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.SimpleTextureParticle
 import de.bixilon.minosoft.gui.rendering.util.vec.vec3.Vec3dUtil.EMPTY
 import de.bixilon.minosoft.protocol.network.connection.play.PlayConnection
--- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/dust/AbstractDustParticle.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/dust/AbstractDustParticle.kt
@ -16,7 +16,7 @@ package de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.d
 import de.bixilon.kotlinglm.func.common.clamp
 import de.bixilon.kotlinglm.vec3.Vec3d
 import de.bixilon.minosoft.data.registries.particle.data.DustParticleData
-import de.bixilon.minosoft.data.text.RGBColor
+import de.bixilon.minosoft.data.text.formatting.color.RGBColor
 import de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.SimpleTextureParticle
 import de.bixilon.minosoft.protocol.network.connection.play.PlayConnection

--- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/dust/DustParticle.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/dust/DustParticle.kt
@ -18,7 +18,7 @@ import de.bixilon.kutil.cast.CastUtil.nullCast
 import de.bixilon.minosoft.data.registries.ResourceLocation
 import de.bixilon.minosoft.data.registries.particle.data.DustParticleData
 import de.bixilon.minosoft.data.registries.particle.data.ParticleData
-import de.bixilon.minosoft.data.text.ChatColors
+import de.bixilon.minosoft.data.text.formatting.color.ChatColors
 import de.bixilon.minosoft.gui.rendering.particle.ParticleFactory
 import de.bixilon.minosoft.protocol.network.connection.play.PlayConnection
 import de.bixilon.minosoft.util.KUtil.toResourceLocation
--- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/emotion/AngryVillagerParticle.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/emotion/AngryVillagerParticle.kt
@ -16,7 +16,7 @@ package de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.e
 import de.bixilon.kotlinglm.vec3.Vec3d
 import de.bixilon.minosoft.data.registries.ResourceLocation
 import de.bixilon.minosoft.data.registries.particle.data.ParticleData
-import de.bixilon.minosoft.data.text.ChatColors
+import de.bixilon.minosoft.data.text.formatting.color.ChatColors
 import de.bixilon.minosoft.gui.rendering.particle.ParticleFactory
 import de.bixilon.minosoft.protocol.network.connection.play.PlayConnection
 import de.bixilon.minosoft.util.KUtil.toResourceLocation
--- a/Show More
+++ b/Show More