From fb2421ff0ac0b1a7f56c337e8acb22472c19d340 Mon Sep 17 00:00:00 2001 From: Bixilon Date: Fri, 19 Aug 2022 21:52:42 +0200 Subject: [PATCH] text: move color to subpackage --- .../parser/minecraft/color/ColorParseError.kt | 2 +- .../parser/minecraft/color/ColorParser.kt | 6 ++-- .../profiles/block/outline/OutlineC.kt | 4 +-- .../profiles/gui/hud/crosshair/CrosshairC.kt | 4 +-- .../java/de/bixilon/minosoft/data/Rarities.kt | 6 ++-- .../stack/property/DisplayProperty.kt | 6 ++-- .../minosoft/data/direction/Directions.kt | 2 +- .../data/entities/block/SignBlockEntity.kt | 4 +-- .../minosoft/data/entities/entities/Entity.kt | 4 +-- .../data/entities/entities/LivingEntity.kt | 6 ++-- .../data/entities/entities/animal/Cat.kt | 4 +-- .../data/entities/entities/animal/Sheep.kt | 4 +-- .../data/entities/entities/animal/Wolf.kt | 8 ++--- .../data/entities/entities/monster/Shulker.kt | 4 +-- .../entities/entities/player/PlayerEntity.kt | 4 +-- .../minosoft/data/registries/biomes/Biome.kt | 4 +-- .../blocks/types/RedstoneTorchBlock.kt | 2 +- .../blocks/types/wall/LeverBlock.kt | 2 +- .../data/registries/effects/StatusEffect.kt | 4 +-- .../data/registries/items/SpawnEggItem.kt | 4 +-- .../data/registries/materials/Material.kt | 2 +- .../particle/data/DustParticleData.kt | 4 +-- .../bixilon/minosoft/data/scoreboard/Team.kt | 4 +-- .../minosoft/data/text/BaseComponent.kt | 8 ++++- .../minosoft/data/text/ChatComponent.kt | 1 + .../minosoft/data/text/EmptyComponent.kt | 1 + .../minosoft/data/text/TextComponent.kt | 3 ++ .../data/text/{ => formatting}/ChatCode.kt | 6 ++-- .../{ => formatting}/ChatFormattingCode.kt | 4 +-- .../{ => formatting}/ChatFormattingCodes.kt | 4 +-- .../PostChatFormattingCodes.kt | 4 +-- .../PreChatFormattingCodes.kt | 2 +- .../text/{ => formatting}/TextFormattable.kt | 4 +-- .../data/text/{ => formatting}/TextStyle.kt | 6 ++-- .../text/{ => formatting/color}/ChatColors.kt | 6 ++-- .../text/{ => formatting/color}/ColorUtil.kt | 2 +- .../text/{ => formatting/color}/Colors.kt | 4 +-- .../text/{ => formatting/color}/RGBColor.kt | 6 +++- .../minosoft/gui/rendering/RenderConstants.kt | 4 +-- .../gui/rendering/camera/FogManager.kt | 4 +-- .../camera/target/targets/BlockTarget.kt | 2 +- .../camera/target/targets/EntityTarget.kt | 2 +- .../camera/target/targets/FluidTarget.kt | 2 +- .../gui/rendering/entity/EntityHitbox.kt | 2 +- .../minosoft/gui/rendering/font/CharData.kt | 2 +- .../gui/rendering/font/WorldGUIConsumer.kt | 2 +- .../font/renderer/TextComponentRenderer.kt | 4 +-- .../framebuffer/world/fun/effects/Tint.kt | 2 +- .../world/overlay/overlays/FireOverlay.kt | 2 +- .../overlays/simple/PowderSnowOverlay.kt | 2 +- .../overlay/overlays/simple/SimpleOverlay.kt | 2 +- .../overlay/overlays/simple/WallOverlay.kt | 2 +- .../overlay/overlays/simple/WaterOverlay.kt | 2 +- .../overlays/simple/WorldBorderOverlay.kt | 2 +- .../gui/elements/items/ItemElement.kt | 2 +- .../gui/elements/items/RawItemElement.kt | 2 +- .../elements/primitive/AtlasImageElement.kt | 4 +-- .../gui/elements/primitive/ColorElement.kt | 4 +-- .../elements/primitive/DynamicImageElement.kt | 4 +-- .../gui/elements/primitive/ImageElement.kt | 4 +-- .../gui/elements/text/FadingTextElement.kt | 2 +- .../gui/elements/text/TextElement.kt | 2 +- .../gui/elements/text/mark/MarkTextElement.kt | 4 +-- .../elements/input/node/NodeErrorElement.kt | 2 +- .../input/node/NodeSuggestionsElement.kt | 2 +- .../gui/rendering/gui/gui/popper/Popper.kt | 2 +- .../gui/gui/popper/item/ItemInfoPopper.kt | 2 +- .../gui/rendering/gui/gui/screen/Screen.kt | 2 +- .../enchanting/EnchantmentButtonElement.kt | 2 +- .../screen/container/text/ContainerText.kt | 2 +- .../confirmation/AbstractConfirmationMenu.kt | 2 +- .../gui/gui/screen/menu/pause/RespawnMenu.kt | 2 +- .../hotbar/AbstractHotbarHealthElement.kt | 2 +- .../elements/hotbar/HotbarHealthElement.kt | 2 +- .../hotbar/HotbarVehicleHealthElement.kt | 2 +- .../elements/other/BreakProgressHUDElement.kt | 2 +- .../gui/hud/elements/other/DebugHUDElement.kt | 2 +- .../scoreboard/ScoreboardScoreElement.kt | 2 +- .../gui/hud/elements/tab/TabListElement.kt | 2 +- .../hud/elements/tab/TabListEntryElement.kt | 2 +- .../gui/rendering/gui/mesh/GUIMesh.kt | 2 +- .../gui/rendering/gui/mesh/GUIMeshCache.kt | 2 +- .../rendering/gui/mesh/GUIVertexConsumer.kt | 2 +- .../rendering/gui/mesh/GUIVertexOptions.kt | 4 +-- .../rendering/models/baked/block/BakedFace.kt | 2 +- .../models/baked/item/BakedItemModel.kt | 4 +-- .../gui/rendering/particle/ParticleMesh.kt | 2 +- .../particle/types/render/RenderParticle.kt | 4 +-- .../advanced/block/BlockDustParticle.kt | 6 ++-- .../texture/simple/AscendingParticle.kt | 2 +- .../render/texture/simple/NoteParticle.kt | 2 +- .../render/texture/simple/PortalParticle.kt | 2 +- .../simple/animated/AnimatedParticle.kt | 2 +- .../texture/simple/animated/EndRodParticle.kt | 2 +- .../texture/simple/cloud/CloudParticle.kt | 2 +- .../texture/simple/cloud/SneezeParticle.kt | 2 +- .../texture/simple/damage/DamageParticle.kt | 2 +- .../simple/dust/AbstractDustParticle.kt | 2 +- .../texture/simple/dust/DustParticle.kt | 2 +- .../simple/emotion/AngryVillagerParticle.kt | 2 +- .../simple/enchant/EnchantedGlyphParticle.kt | 2 +- .../simple/explosion/ExplosionParticle.kt | 2 +- .../texture/simple/explosion/PoofParticle.kt | 2 +- .../spell/AmbientEntityEffectParticle.kt | 2 +- .../simple/spell/EntityEffectParticle.kt | 2 +- .../texture/simple/spell/WitchParticle.kt | 2 +- .../simple/suspend/ComposterParticle.kt | 2 +- .../texture/simple/suspend/DolphinParticle.kt | 2 +- .../simple/suspend/HappyVillagerParticle.kt | 2 +- .../texture/simple/suspend/SuspendParticle.kt | 2 +- .../simple/water/CrimsonSporeParticle.kt | 2 +- .../simple/water/UnderwaterParticle.kt | 2 +- .../simple/water/WarpedSporeParticle.kt | 2 +- .../minosoft/gui/rendering/sky/SkyRenderer.kt | 4 +-- .../gui/rendering/system/base/RenderSystem.kt | 4 +-- .../rendering/system/base/shader/Shader.kt | 2 +- .../base/texture/texture/MemoryTexture.kt | 2 +- .../system/opengl/OpenGLRenderSystem.kt | 4 +-- .../rendering/system/opengl/OpenGLShader.kt | 2 +- .../tint/RedstoneWireTintCalculator.kt | 2 +- .../gui/rendering/tint/TintManager.kt | 4 +-- .../gui/rendering/util/ScreenshotTaker.kt | 2 +- .../rendering/util/mesh/GenericColorMesh.kt | 4 +-- .../gui/rendering/util/mesh/LineMesh.kt | 2 +- .../gui/rendering/util/mesh/MeshStruct.kt | 2 +- .../rendering/util/mesh/SimpleTextureMesh.kt | 2 +- .../gui/rendering/util/vec/vec3/Vec3Util.kt | 2 +- .../world/border/WorldBorderRenderer.kt | 2 +- .../world/chunk/ChunkBorderRenderer.kt | 2 +- .../network/connection/play/ConnectionUtil.kt | 2 +- .../play/scoreboard/teams/CreateTeamS2CP.kt | 7 ++-- .../play/scoreboard/teams/UpdateTeamS2CP.kt | 2 +- .../protocol/protocol/ProtocolDefinition.java | 4 +-- .../java/de/bixilon/minosoft/util/KUtil.kt | 4 +-- .../util/json/ChatComponentColorSerializer.kt | 2 +- .../minosoft/util/json/RGBColorSerializer.kt | 4 +-- .../minosoft/util/logging/LogLevels.kt | 8 ++--- .../minosoft/util/logging/LogMessageType.kt | 36 +++++++++++-------- .../parser/minecraft/color/ColorParserTest.kt | 2 +- .../minosoft/data/text/ChatComponentTest.kt | 3 +- 140 files changed, 237 insertions(+), 210 deletions(-) rename src/main/java/de/bixilon/minosoft/data/text/{ => formatting}/ChatCode.kt (91%) rename src/main/java/de/bixilon/minosoft/data/text/{ => formatting}/ChatFormattingCode.kt (90%) rename src/main/java/de/bixilon/minosoft/data/text/{ => formatting}/ChatFormattingCodes.kt (93%) rename src/main/java/de/bixilon/minosoft/data/text/{ => formatting}/PostChatFormattingCodes.kt (91%) rename src/main/java/de/bixilon/minosoft/data/text/{ => formatting}/PreChatFormattingCodes.kt (95%) rename src/main/java/de/bixilon/minosoft/data/text/{ => formatting}/TextFormattable.kt (89%) rename src/main/java/de/bixilon/minosoft/data/text/{ => formatting}/TextStyle.kt (84%) rename src/main/java/de/bixilon/minosoft/data/text/{ => formatting/color}/ChatColors.kt (95%) rename src/main/java/de/bixilon/minosoft/data/text/{ => formatting/color}/ColorUtil.kt (96%) rename src/main/java/de/bixilon/minosoft/data/text/{ => formatting/color}/Colors.kt (91%) rename src/main/java/de/bixilon/minosoft/data/text/{ => formatting/color}/RGBColor.kt (95%) diff --git 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 index 0e2c76135..eb9783cc9 100644 --- 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, diff --git 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 index f03def9f9..c14d5b9d8 100644 --- 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 diff --git 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 index 21d5d63cf..9e57f169b 100644 --- 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 { diff --git 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 index e381e2c12..6daf0786f 100644 --- 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 { /** diff --git a/src/main/java/de/bixilon/minosoft/data/Rarities.kt b/src/main/java/de/bixilon/minosoft/data/Rarities.kt index 5a3f35916..086ee5feb 100644 --- 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), diff --git 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 index 2b546eae6..b6f7e038e 100644 --- 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( diff --git a/src/main/java/de/bixilon/minosoft/data/direction/Directions.kt b/src/main/java/de/bixilon/minosoft/data/direction/Directions.kt index dbd1a8f51..58fd7e942 100644 --- 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 diff --git a/src/main/java/de/bixilon/minosoft/data/entities/block/SignBlockEntity.kt b/src/main/java/de/bixilon/minosoft/data/entities/block/SignBlockEntity.kt index 773414cae..df7d61ef6 100644 --- 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 diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/Entity.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/Entity.kt index 7c500d98b..f8b317c74 100644 --- 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 diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/LivingEntity.kt b/src/main/java/de/bixilon/minosoft/data/entities/entities/LivingEntity.kt index 11132243a..84beea118 100644 --- 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 diff --git 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 index ceee99461..112bfb1f2 100644 --- 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) { diff --git 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 index cde6330e3..1c6ee90b5 100644 --- 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) { diff --git 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 index ce4e7799d..0c795f9f0 100644 --- 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(HEALTH_DATA, 0.0f).toDouble() diff --git 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 index ee1ffeeed..e40ec4a73 100644 --- 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) { diff --git 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 index 9faaf17d2..7d01df8e4 100644 --- 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 diff --git a/src/main/java/de/bixilon/minosoft/data/registries/biomes/Biome.kt b/src/main/java/de/bixilon/minosoft/data/registries/biomes/Biome.kt index f530d9448..c19b5be00 100644 --- 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 diff --git 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 index d4b8c8250..b516913dc 100644 --- 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 diff --git 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 index 183d96329..d5cfbb59d 100644 --- 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 diff --git a/src/main/java/de/bixilon/minosoft/data/registries/effects/StatusEffect.kt b/src/main/java/de/bixilon/minosoft/data/registries/effects/StatusEffect.kt index c295e4b99..322ea330a 100644 --- 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.* diff --git a/src/main/java/de/bixilon/minosoft/data/registries/items/SpawnEggItem.kt b/src/main/java/de/bixilon/minosoft/data/registries/items/SpawnEggItem.kt index 43062570e..519a6d205 100644 --- 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, diff --git a/src/main/java/de/bixilon/minosoft/data/registries/materials/Material.kt b/src/main/java/de/bixilon/minosoft/data/registries/materials/Material.kt index b4fc480ab..73be0fe70 100644 --- 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.* diff --git 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 index 5e7922137..67cc828a5 100644 --- 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) { diff --git a/src/main/java/de/bixilon/minosoft/data/scoreboard/Team.kt b/src/main/java/de/bixilon/minosoft/data/scoreboard/Team.kt index 5de9188b8..de7d88198 100644 --- 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, diff --git a/src/main/java/de/bixilon/minosoft/data/text/BaseComponent.kt b/src/main/java/de/bixilon/minosoft/data/text/BaseComponent.kt index 3025d23f6..547152b27 100644 --- 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 diff --git a/src/main/java/de/bixilon/minosoft/data/text/ChatComponent.kt b/src/main/java/de/bixilon/minosoft/data/text/ChatComponent.kt index 3063058b4..1c46f62cf 100644 --- 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 diff --git a/src/main/java/de/bixilon/minosoft/data/text/EmptyComponent.kt b/src/main/java/de/bixilon/minosoft/data/text/EmptyComponent.kt index 917094ad4..e76b2bcb6 100644 --- 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 { diff --git a/src/main/java/de/bixilon/minosoft/data/text/TextComponent.kt b/src/main/java/de/bixilon/minosoft/data/text/TextComponent.kt index cb6aee039..d948d63ef 100644 --- 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 diff --git a/src/main/java/de/bixilon/minosoft/data/text/ChatCode.kt b/src/main/java/de/bixilon/minosoft/data/text/formatting/ChatCode.kt similarity index 91% rename from src/main/java/de/bixilon/minosoft/data/text/ChatCode.kt rename to src/main/java/de/bixilon/minosoft/data/text/formatting/ChatCode.kt index deb13514b..dc4bcd273 100644 --- a/src/main/java/de/bixilon/minosoft/data/text/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 { diff --git a/src/main/java/de/bixilon/minosoft/data/text/ChatFormattingCode.kt b/src/main/java/de/bixilon/minosoft/data/text/formatting/ChatFormattingCode.kt similarity index 90% rename from src/main/java/de/bixilon/minosoft/data/text/ChatFormattingCode.kt rename to src/main/java/de/bixilon/minosoft/data/text/formatting/ChatFormattingCode.kt index 7e681f8a5..12a506f5a 100644 --- a/src/main/java/de/bixilon/minosoft/data/text/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 diff --git a/src/main/java/de/bixilon/minosoft/data/text/ChatFormattingCodes.kt b/src/main/java/de/bixilon/minosoft/data/text/formatting/ChatFormattingCodes.kt similarity index 93% rename from src/main/java/de/bixilon/minosoft/data/text/ChatFormattingCodes.kt rename to src/main/java/de/bixilon/minosoft/data/text/formatting/ChatFormattingCodes.kt index 2ad04d643..b6c243a34 100644 --- a/src/main/java/de/bixilon/minosoft/data/text/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 diff --git a/src/main/java/de/bixilon/minosoft/data/text/PostChatFormattingCodes.kt b/src/main/java/de/bixilon/minosoft/data/text/formatting/PostChatFormattingCodes.kt similarity index 91% rename from src/main/java/de/bixilon/minosoft/data/text/PostChatFormattingCodes.kt rename to src/main/java/de/bixilon/minosoft/data/text/formatting/PostChatFormattingCodes.kt index 42e78aaea..5d046442d 100644 --- a/src/main/java/de/bixilon/minosoft/data/text/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, diff --git a/src/main/java/de/bixilon/minosoft/data/text/PreChatFormattingCodes.kt b/src/main/java/de/bixilon/minosoft/data/text/formatting/PreChatFormattingCodes.kt similarity index 95% rename from src/main/java/de/bixilon/minosoft/data/text/PreChatFormattingCodes.kt rename to src/main/java/de/bixilon/minosoft/data/text/formatting/PreChatFormattingCodes.kt index 612c9e198..069a08d93 100644 --- a/src/main/java/de/bixilon/minosoft/data/text/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, diff --git a/src/main/java/de/bixilon/minosoft/data/text/TextFormattable.kt b/src/main/java/de/bixilon/minosoft/data/text/formatting/TextFormattable.kt similarity index 89% rename from src/main/java/de/bixilon/minosoft/data/text/TextFormattable.kt rename to src/main/java/de/bixilon/minosoft/data/text/formatting/TextFormattable.kt index 525103000..63f7656f5 100644 --- a/src/main/java/de/bixilon/minosoft/data/text/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 { diff --git a/src/main/java/de/bixilon/minosoft/data/text/TextStyle.kt b/src/main/java/de/bixilon/minosoft/data/text/formatting/TextStyle.kt similarity index 84% rename from src/main/java/de/bixilon/minosoft/data/text/TextStyle.kt rename to src/main/java/de/bixilon/minosoft/data/text/formatting/TextStyle.kt index 57931de8d..10ae2478b 100644 --- a/src/main/java/de/bixilon/minosoft/data/text/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? diff --git a/src/main/java/de/bixilon/minosoft/data/text/ChatColors.kt b/src/main/java/de/bixilon/minosoft/data/text/formatting/color/ChatColors.kt similarity index 95% rename from src/main/java/de/bixilon/minosoft/data/text/ChatColors.kt rename to src/main/java/de/bixilon/minosoft/data/text/formatting/color/ChatColors.kt index 4a29ba34a..c2c78754d 100644 --- a/src/main/java/de/bixilon/minosoft/data/text/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 { diff --git a/src/main/java/de/bixilon/minosoft/data/text/ColorUtil.kt b/src/main/java/de/bixilon/minosoft/data/text/formatting/color/ColorUtil.kt similarity index 96% rename from src/main/java/de/bixilon/minosoft/data/text/ColorUtil.kt rename to src/main/java/de/bixilon/minosoft/data/text/formatting/color/ColorUtil.kt index 9837378dd..111fba22d 100644 --- a/src/main/java/de/bixilon/minosoft/data/text/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 { diff --git a/src/main/java/de/bixilon/minosoft/data/text/Colors.kt b/src/main/java/de/bixilon/minosoft/data/text/formatting/color/Colors.kt similarity index 91% rename from src/main/java/de/bixilon/minosoft/data/text/Colors.kt rename to src/main/java/de/bixilon/minosoft/data/text/formatting/color/Colors.kt index bd2b6490e..a685f83d2 100644 --- a/src/main/java/de/bixilon/minosoft/data/text/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) diff --git a/src/main/java/de/bixilon/minosoft/data/text/RGBColor.kt b/src/main/java/de/bixilon/minosoft/data/text/formatting/color/RGBColor.kt similarity index 95% rename from src/main/java/de/bixilon/minosoft/data/text/RGBColor.kt rename to src/main/java/de/bixilon/minosoft/data/text/formatting/color/RGBColor.kt index a34cb9a43..a57531473 100644 --- a/src/main/java/de/bixilon/minosoft/data/text/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 { diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/RenderConstants.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/RenderConstants.kt index 4902082e2..a9e4b21f3 100644 --- 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() diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/camera/FogManager.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/camera/FogManager.kt index c74f94ebc..9a5a23183 100644 --- 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 diff --git 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 index 7042c8377..2505e3dcc 100644 --- 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( diff --git 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 index 0a831f826..cb1bac950 100644 --- 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( diff --git 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 index ffbab2c95..c96e52524 100644 --- 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( diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/entity/EntityHitbox.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/entity/EntityHitbox.kt index 0ee11f689..2b3ede23d 100644 --- 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 diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/font/CharData.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/font/CharData.kt index db4e88829..2dfa0b780 100644 --- 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 diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/font/WorldGUIConsumer.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/font/WorldGUIConsumer.kt index 83cbf59ec..09c4c1a65 100644 --- 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 diff --git 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 index 6a1090fee..e8ea207b1 100644 --- 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 diff --git 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 index 63afef999..a37b95225 100644 --- 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 diff --git 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 index ddfca4db6..3353677a2 100644 --- 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 diff --git 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 index 704a5194d..c297baa9b 100644 --- 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 diff --git 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 index 2c6a46527..e2861ae93 100644 --- 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 diff --git 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 index 878a4ed62..4cb92708f 100644 --- 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 diff --git 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 index b9c1a9049..c33858c35 100644 --- 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 diff --git 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 index 610bf7dbe..5ad63c160 100644 --- 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 diff --git 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 index dffbb59c3..dbe7a71e1 100644 --- 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 diff --git 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 index d530c899a..859a87fcb 100644 --- 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 diff --git 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 index c21b56e5e..c30c965e1 100644 --- 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 diff --git 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 index e2a293147..e2975cff6 100644 --- 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( diff --git 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 index 0b9234d79..14a34467b 100644 --- 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 diff --git 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 index f00a70a66..23045ab38 100644 --- 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 diff --git 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 index 19b41e3b6..262890c22 100644 --- 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 diff --git 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 index ff24cdc0d..096f5a2dc 100644 --- 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 diff --git 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 index 7c6913813..2a53e9e24 100644 --- 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 diff --git 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 index 3e1c63e1c..fa9d4b35c 100644 --- 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 diff --git 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 index 5a94b7401..e9694cbce 100644 --- 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 diff --git 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 index e866e5249..109c792bf 100644 --- 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 diff --git 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 index 56b9cb7e0..f7343fd25 100644 --- 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 diff --git 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 index 7ddd29f0d..e662fd10e 100644 --- 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 diff --git 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 index dd3608471..9dc020493 100644 --- 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 diff --git 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 index 05f65bcbe..5c83ba54d 100644 --- 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 diff --git 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 index 485e1273e..e22c4d381 100644 --- 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 diff --git 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 index f87a89bd1..6a4caae2b 100644 --- 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 diff --git 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 index f4d8017cf..532bff0c6 100644 --- 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 diff --git 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 index 16bf3049f..f66038f8e 100644 --- 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 diff --git 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 index f0c810095..d62504936 100644 --- 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 diff --git 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 index ed68399ea..a2d432044 100644 --- 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 diff --git 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 index 329f3139f..367609299 100644 --- 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 diff --git 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 index d8a6dd17c..d1786791c 100644 --- 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 diff --git 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 index 40e7b1319..6a76d573b 100644 --- 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 diff --git 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 index ebf5d07f9..263da48e2 100644 --- 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 diff --git 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 index f2c1f1ef3..5f035be6d 100644 --- 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 diff --git 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 index b1360aa78..76ecda6b3 100644 --- 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 diff --git 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 index 85ed8ef26..d7adfb0d8 100644 --- 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 diff --git 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 index 58c78cbe3..ce2cd4404 100644 --- 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, diff --git 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 index 0a1188b3e..272aec7ca 100644 --- 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 diff --git 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 index 46984b36b..08327c2c5 100644 --- 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 diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/ParticleMesh.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/ParticleMesh.kt index 4ee0c1246..5feaa999a 100644 --- 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 diff --git 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 index 0c835b07f..0efe6c1de 100644 --- 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 diff --git 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 index e15fd4528..33d396769 100644 --- 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 diff --git 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 index 13d0b3c50..e0b8de683 100644 --- 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 diff --git 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 index 6bb8a78ef..39a001342 100644 --- 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 diff --git 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 index 978c89778..90af7b283 100644 --- 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 diff --git 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 index 65c1a4f25..9a58c9fef 100644 --- 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 diff --git 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 index 0cdecfd14..b5877f4e0 100644 --- 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 diff --git 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 index 92c67553e..f92b81868 100644 --- 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 diff --git 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 index 4ea59042b..93239d1a8 100644 --- 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 diff --git 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 index ec38d61ad..585365a5d 100644 --- 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 diff --git 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 index 1de1a2124..d3267cdf9 100644 --- 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 diff --git 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 index 2b631aa8f..91d9e8f59 100644 --- 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 diff --git 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 index 77834e0f9..0b16c7d37 100644 --- 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 diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/enchant/EnchantedGlyphParticle.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/enchant/EnchantedGlyphParticle.kt index 3080ad120..cb8c25c3a 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/enchant/EnchantedGlyphParticle.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/enchant/EnchantedGlyphParticle.kt @@ -15,7 +15,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.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.VecUtil.assign import de.bixilon.minosoft.gui.rendering.util.vec.vec3.Vec3dUtil.EMPTY diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/explosion/ExplosionParticle.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/explosion/ExplosionParticle.kt index 812f3c603..94634dc3d 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/explosion/ExplosionParticle.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/explosion/ExplosionParticle.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.RGBColor.Companion.asGray +import de.bixilon.minosoft.data.text.formatting.color.RGBColor.Companion.asGray import de.bixilon.minosoft.gui.rendering.particle.ParticleFactory import de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.SimpleTextureParticle import de.bixilon.minosoft.gui.rendering.util.vec.vec3.Vec3dUtil.EMPTY diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/explosion/PoofParticle.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/explosion/PoofParticle.kt index 1f8962ea0..26aba098e 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/explosion/PoofParticle.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/explosion/PoofParticle.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.RGBColor.Companion.asGray +import de.bixilon.minosoft.data.text.formatting.color.RGBColor.Companion.asGray import de.bixilon.minosoft.gui.rendering.particle.ParticleFactory import de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.SimpleTextureParticle import de.bixilon.minosoft.gui.rendering.util.VecUtil.plus diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/spell/AmbientEntityEffectParticle.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/spell/AmbientEntityEffectParticle.kt index fbc8beda7..2736ff1d8 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/spell/AmbientEntityEffectParticle.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/spell/AmbientEntityEffectParticle.kt @@ -16,7 +16,7 @@ package de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.s 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 diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/spell/EntityEffectParticle.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/spell/EntityEffectParticle.kt index 0d27f0085..fa9462ff9 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/spell/EntityEffectParticle.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/spell/EntityEffectParticle.kt @@ -16,7 +16,7 @@ package de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.s 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 diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/spell/WitchParticle.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/spell/WitchParticle.kt index 09bcdf594..64ec3ca54 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/spell/WitchParticle.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/spell/WitchParticle.kt @@ -16,7 +16,7 @@ package de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.s 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 diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/suspend/ComposterParticle.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/suspend/ComposterParticle.kt index 04a0ce891..315608b72 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/suspend/ComposterParticle.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/suspend/ComposterParticle.kt @@ -16,7 +16,7 @@ package de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.s 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 diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/suspend/DolphinParticle.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/suspend/DolphinParticle.kt index 6b217f123..045e73814 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/suspend/DolphinParticle.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/suspend/DolphinParticle.kt @@ -16,7 +16,7 @@ package de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.s 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 diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/suspend/HappyVillagerParticle.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/suspend/HappyVillagerParticle.kt index 6e315dc65..472cd696d 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/suspend/HappyVillagerParticle.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/suspend/HappyVillagerParticle.kt @@ -16,7 +16,7 @@ package de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.s 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 diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/suspend/SuspendParticle.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/suspend/SuspendParticle.kt index b272a7d9e..55a426347 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/suspend/SuspendParticle.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/suspend/SuspendParticle.kt @@ -16,7 +16,7 @@ package de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.s import de.bixilon.kotlinglm.vec3.Vec3 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.protocol.network.connection.play.PlayConnection diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/water/CrimsonSporeParticle.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/water/CrimsonSporeParticle.kt index e2a1ad66d..cca46f7e7 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/water/CrimsonSporeParticle.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/water/CrimsonSporeParticle.kt @@ -16,7 +16,7 @@ package de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.w 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.times import de.bixilon.minosoft.protocol.network.connection.play.PlayConnection diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/water/UnderwaterParticle.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/water/UnderwaterParticle.kt index 5cd766624..fa93a3aa0 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/water/UnderwaterParticle.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/water/UnderwaterParticle.kt @@ -16,7 +16,7 @@ package de.bixilon.minosoft.gui.rendering.particle.types.render.texture.simple.w 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 diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/water/WarpedSporeParticle.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/water/WarpedSporeParticle.kt index 8fcaf6bd6..b6e6e4c80 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/water/WarpedSporeParticle.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/water/WarpedSporeParticle.kt @@ -17,7 +17,7 @@ import de.bixilon.kotlinglm.vec3.Vec3 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 diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/sky/SkyRenderer.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/sky/SkyRenderer.kt index 764441bcd..2bf662b5f 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/sky/SkyRenderer.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/sky/SkyRenderer.kt @@ -19,8 +19,8 @@ import de.bixilon.kotlinglm.vec2.Vec2 import de.bixilon.kotlinglm.vec3.Vec3 import de.bixilon.kutil.latch.CountUpAndDownLatch import de.bixilon.minosoft.data.registries.ResourceLocation -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.RenderConstants import de.bixilon.minosoft.gui.rendering.RenderWindow import de.bixilon.minosoft.gui.rendering.modding.events.CameraMatrixChangeEvent diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/RenderSystem.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/RenderSystem.kt index 2dd2846b9..dbb96939a 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/RenderSystem.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/RenderSystem.kt @@ -15,8 +15,8 @@ package de.bixilon.minosoft.gui.rendering.system.base import de.bixilon.kotlinglm.vec2.Vec2i import de.bixilon.minosoft.data.registries.ResourceLocation -import de.bixilon.minosoft.data.text.Colors -import de.bixilon.minosoft.data.text.RGBColor +import de.bixilon.minosoft.data.text.formatting.color.Colors +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.frame.Framebuffer import de.bixilon.minosoft.gui.rendering.system.base.buffer.uniform.FloatUniformBuffer diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/shader/Shader.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/shader/Shader.kt index f42f646f0..52d748055 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/shader/Shader.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/shader/Shader.kt @@ -19,7 +19,7 @@ import de.bixilon.kotlinglm.vec3.Vec3 import de.bixilon.kotlinglm.vec3.Vec3d import de.bixilon.kotlinglm.vec4.Vec4 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.system.base.buffer.uniform.UniformBuffer import de.bixilon.minosoft.util.Previous diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/texture/texture/MemoryTexture.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/texture/texture/MemoryTexture.kt index cc3086f8f..aa40783f3 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/texture/texture/MemoryTexture.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/texture/texture/MemoryTexture.kt @@ -17,7 +17,7 @@ import de.bixilon.kotlinglm.vec2.Vec2 import de.bixilon.kotlinglm.vec2.Vec2i import de.bixilon.minosoft.assets.AssetsManager 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.system.base.texture.TextureStates import de.bixilon.minosoft.gui.rendering.system.base.texture.TextureTransparencies import de.bixilon.minosoft.gui.rendering.textures.properties.ImageProperties diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/OpenGLRenderSystem.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/OpenGLRenderSystem.kt index b4eef28a7..8336b68ab 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/OpenGLRenderSystem.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/OpenGLRenderSystem.kt @@ -17,8 +17,8 @@ import de.bixilon.kotlinglm.vec2.Vec2i import de.bixilon.kutil.collections.CollectionUtil.synchronizedSetOf import de.bixilon.kutil.concurrent.lock.thread.ThreadMissmatchException import de.bixilon.minosoft.data.registries.ResourceLocation -import de.bixilon.minosoft.data.text.Colors -import de.bixilon.minosoft.data.text.RGBColor +import de.bixilon.minosoft.data.text.formatting.color.Colors +import de.bixilon.minosoft.data.text.formatting.color.RGBColor import de.bixilon.minosoft.gui.rendering.RenderConstants import de.bixilon.minosoft.gui.rendering.RenderWindow import de.bixilon.minosoft.gui.rendering.modding.events.ResizeWindowEvent diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/OpenGLShader.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/OpenGLShader.kt index f2504139d..7455dec4b 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/OpenGLShader.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/OpenGLShader.kt @@ -19,7 +19,7 @@ import de.bixilon.kotlinglm.vec3.Vec3 import de.bixilon.kotlinglm.vec4.Vec4 import de.bixilon.minosoft.assets.util.FileUtil.readAsString 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.exceptions.ShaderLoadingException import de.bixilon.minosoft.gui.rendering.system.base.buffer.uniform.UniformBuffer diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/tint/RedstoneWireTintCalculator.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/tint/RedstoneWireTintCalculator.kt index c94e788aa..7613480ee 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/tint/RedstoneWireTintCalculator.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/tint/RedstoneWireTintCalculator.kt @@ -18,7 +18,7 @@ import de.bixilon.kutil.primitive.IntUtil.toInt import de.bixilon.minosoft.data.registries.biomes.Biome import de.bixilon.minosoft.data.registries.blocks.BlockState import de.bixilon.minosoft.data.registries.blocks.properties.BlockProperties -import de.bixilon.minosoft.data.text.RGBColor +import de.bixilon.minosoft.data.text.formatting.color.RGBColor object RedstoneWireTintCalculator : TintProvider { private val COLORS = IntArray(16) { diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/tint/TintManager.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/tint/TintManager.kt index f18f93aea..2186a54fe 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/tint/TintManager.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/tint/TintManager.kt @@ -22,8 +22,8 @@ import de.bixilon.minosoft.data.registries.blocks.MinecraftBlocks import de.bixilon.minosoft.data.registries.blocks.properties.BlockProperties import de.bixilon.minosoft.data.registries.blocks.properties.Halves import de.bixilon.minosoft.data.registries.fluid.Fluid -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.data.world.chunk.Chunk import de.bixilon.minosoft.protocol.network.connection.play.PlayConnection diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/util/ScreenshotTaker.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/util/ScreenshotTaker.kt index 24b97ed41..6575f4bf4 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/util/ScreenshotTaker.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/util/ScreenshotTaker.kt @@ -21,11 +21,11 @@ import de.bixilon.kutil.file.FileUtil.createParent import de.bixilon.kutil.file.FileUtil.slashPath import de.bixilon.kutil.time.TimeUtil 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.events.click.ClickCallbackClickEvent import de.bixilon.minosoft.data.text.events.click.OpenFileClickEvent import de.bixilon.minosoft.data.text.events.hover.TextHoverEvent +import de.bixilon.minosoft.data.text.formatting.color.ChatColors import de.bixilon.minosoft.gui.rendering.RenderWindow import de.bixilon.minosoft.gui.rendering.gui.GUIRenderer import de.bixilon.minosoft.gui.rendering.gui.gui.screen.menu.confirmation.DeleteScreenshotDialog diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/util/mesh/GenericColorMesh.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/util/mesh/GenericColorMesh.kt index 11ed2fd17..9ba8a16f0 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/util/mesh/GenericColorMesh.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/util/mesh/GenericColorMesh.kt @@ -14,8 +14,8 @@ package de.bixilon.minosoft.gui.rendering.util.mesh import de.bixilon.kotlinglm.vec3.Vec3 -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.gui.rendering.system.base.buffer.vertex.PrimitiveTypes diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/util/mesh/LineMesh.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/util/mesh/LineMesh.kt index 58d58e65f..4d5a697b6 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/util/mesh/LineMesh.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/util/mesh/LineMesh.kt @@ -19,7 +19,7 @@ import de.bixilon.kutil.primitive.BooleanUtil.one import de.bixilon.minosoft.data.direction.Directions import de.bixilon.minosoft.data.registries.AABB import de.bixilon.minosoft.data.registries.VoxelShape -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.RenderWindow import de.bixilon.minosoft.gui.rendering.util.vec.vec3.Vec3Util.EMPTY diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/util/mesh/MeshStruct.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/util/mesh/MeshStruct.kt index e4de52b7e..e265bd217 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/util/mesh/MeshStruct.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/util/mesh/MeshStruct.kt @@ -20,7 +20,7 @@ import de.bixilon.kotlinglm.vec2.Vec2i import de.bixilon.kotlinglm.vec3.Vec3 import de.bixilon.kotlinglm.vec3.Vec3d import de.bixilon.kotlinglm.vec3.Vec3i -import de.bixilon.minosoft.data.text.RGBColor +import de.bixilon.minosoft.data.text.formatting.color.RGBColor import kotlin.reflect.KClass import kotlin.reflect.KParameter import kotlin.reflect.full.primaryConstructor diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/util/mesh/SimpleTextureMesh.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/util/mesh/SimpleTextureMesh.kt index 32e6a188f..26930b8db 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/util/mesh/SimpleTextureMesh.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/util/mesh/SimpleTextureMesh.kt @@ -15,7 +15,7 @@ package de.bixilon.minosoft.gui.rendering.util.mesh import de.bixilon.kotlinglm.vec2.Vec2 import de.bixilon.kotlinglm.vec3.Vec3 -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 diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/util/vec/vec3/Vec3Util.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/util/vec/vec3/Vec3Util.kt index 810ff033b..d83199a88 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/util/vec/vec3/Vec3Util.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/util/vec/vec3/Vec3Util.kt @@ -26,7 +26,7 @@ import de.bixilon.kutil.math.interpolation.FloatInterpolation.interpolateLinear import de.bixilon.kutil.math.simple.FloatMath.floor import de.bixilon.kutil.primitive.FloatUtil.toFloat import de.bixilon.minosoft.data.Axes -import de.bixilon.minosoft.data.text.RGBColor +import de.bixilon.minosoft.data.text.formatting.color.RGBColor import kotlin.math.PI import kotlin.math.sin diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/world/border/WorldBorderRenderer.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/world/border/WorldBorderRenderer.kt index 9b38dc42b..fabb4208e 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/world/border/WorldBorderRenderer.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/world/border/WorldBorderRenderer.kt @@ -18,7 +18,7 @@ import de.bixilon.kotlinglm.vec2.Vec2 import de.bixilon.kutil.latch.CountUpAndDownLatch import de.bixilon.kutil.time.TimeUtil import de.bixilon.minosoft.data.registries.ResourceLocation -import de.bixilon.minosoft.data.text.RGBColor.Companion.asColor +import de.bixilon.minosoft.data.text.formatting.color.RGBColor.Companion.asColor import de.bixilon.minosoft.data.world.border.WorldBorderState import de.bixilon.minosoft.gui.rendering.RenderWindow import de.bixilon.minosoft.gui.rendering.renderer.Renderer diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/world/chunk/ChunkBorderRenderer.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/world/chunk/ChunkBorderRenderer.kt index 8a33dbf16..823b130e2 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/world/chunk/ChunkBorderRenderer.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/world/chunk/ChunkBorderRenderer.kt @@ -20,7 +20,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.ChatColors +import de.bixilon.minosoft.data.text.formatting.color.ChatColors import de.bixilon.minosoft.gui.rendering.RenderConstants import de.bixilon.minosoft.gui.rendering.RenderWindow import de.bixilon.minosoft.gui.rendering.renderer.MeshSwapper diff --git a/src/main/java/de/bixilon/minosoft/protocol/network/connection/play/ConnectionUtil.kt b/src/main/java/de/bixilon/minosoft/protocol/network/connection/play/ConnectionUtil.kt index f6e93a3c8..67699a44f 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/network/connection/play/ConnectionUtil.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/network/connection/play/ConnectionUtil.kt @@ -19,8 +19,8 @@ import de.bixilon.kotlinglm.vec3.Vec3d import de.bixilon.kutil.string.WhitespaceUtil.removeTrailingWhitespaces import de.bixilon.minosoft.commands.stack.CommandStack 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.formatting.color.ChatColors import de.bixilon.minosoft.gui.rendering.RenderConstants import de.bixilon.minosoft.gui.rendering.util.vec.vec3.Vec3dUtil.EMPTY import de.bixilon.minosoft.modding.event.events.ChatMessageSendEvent diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/scoreboard/teams/CreateTeamS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/scoreboard/teams/CreateTeamS2CP.kt index 5e79a0fda..1bc36d5cb 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/scoreboard/teams/CreateTeamS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/scoreboard/teams/CreateTeamS2CP.kt @@ -17,8 +17,8 @@ import de.bixilon.kutil.collections.CollectionUtil.toSynchronizedSet import de.bixilon.minosoft.data.scoreboard.NameTagVisibilities import de.bixilon.minosoft.data.scoreboard.Team import de.bixilon.minosoft.data.scoreboard.TeamCollisionRules -import de.bixilon.minosoft.data.text.ChatCode import de.bixilon.minosoft.data.text.ChatComponent +import de.bixilon.minosoft.data.text.formatting.ChatCode import de.bixilon.minosoft.modding.event.events.scoreboard.team.TeamCreateEvent import de.bixilon.minosoft.protocol.network.connection.play.PlayConnection import de.bixilon.minosoft.protocol.protocol.PlayInByteBuffer @@ -82,12 +82,13 @@ class CreateTeamS2CP( suffix = buffer.readChatComponent() } - members = buffer.readStringArray( + members = buffer.readArray( if (buffer.versionId < ProtocolVersions.V_14W04A) { buffer.readUnsignedShort() } else { buffer.readVarInt() - }).toSet() + } + ) { buffer.readString() }.toSet() } private fun setLegacyFriendlyFire(data: Int) { diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/scoreboard/teams/UpdateTeamS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/scoreboard/teams/UpdateTeamS2CP.kt index 4d7520d53..4aac8254c 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/scoreboard/teams/UpdateTeamS2CP.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/scoreboard/teams/UpdateTeamS2CP.kt @@ -15,8 +15,8 @@ package de.bixilon.minosoft.protocol.packets.s2c.play.scoreboard.teams import de.bixilon.minosoft.data.scoreboard.NameTagVisibilities import de.bixilon.minosoft.data.scoreboard.TeamCollisionRules -import de.bixilon.minosoft.data.text.ChatCode import de.bixilon.minosoft.data.text.ChatComponent +import de.bixilon.minosoft.data.text.formatting.ChatCode import de.bixilon.minosoft.modding.event.events.scoreboard.team.TeamUpdateEvent import de.bixilon.minosoft.protocol.network.connection.play.PlayConnection import de.bixilon.minosoft.protocol.protocol.PlayInByteBuffer diff --git a/src/main/java/de/bixilon/minosoft/protocol/protocol/ProtocolDefinition.java b/src/main/java/de/bixilon/minosoft/protocol/protocol/ProtocolDefinition.java index d17fb7b4a..7e7bae318 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/protocol/ProtocolDefinition.java +++ b/src/main/java/de/bixilon/minosoft/protocol/protocol/ProtocolDefinition.java @@ -14,8 +14,8 @@ package de.bixilon.minosoft.protocol.protocol; import de.bixilon.kotlinglm.vec3.Vec3i; -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 java.net.InetAddress; import java.util.regex.Pattern; diff --git a/src/main/java/de/bixilon/minosoft/util/KUtil.kt b/src/main/java/de/bixilon/minosoft/util/KUtil.kt index 8adb39f0e..df40205d0 100644 --- a/src/main/java/de/bixilon/minosoft/util/KUtil.kt +++ b/src/main/java/de/bixilon/minosoft/util/KUtil.kt @@ -36,10 +36,10 @@ import de.bixilon.minosoft.data.container.stack.ItemStack import de.bixilon.minosoft.data.entities.entities.Entity import de.bixilon.minosoft.data.registries.ResourceLocation import de.bixilon.minosoft.data.registries.ResourceLocationAble -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.TextFormattable +import de.bixilon.minosoft.data.text.formatting.TextFormattable +import de.bixilon.minosoft.data.text.formatting.color.ChatColors import de.bixilon.minosoft.modding.event.master.GlobalEventMaster import de.bixilon.minosoft.protocol.network.connection.play.PlayConnection import de.bixilon.minosoft.protocol.network.connection.status.StatusConnection diff --git a/src/main/java/de/bixilon/minosoft/util/json/ChatComponentColorSerializer.kt b/src/main/java/de/bixilon/minosoft/util/json/ChatComponentColorSerializer.kt index 48350fdac..46dca2443 100644 --- a/src/main/java/de/bixilon/minosoft/util/json/ChatComponentColorSerializer.kt +++ b/src/main/java/de/bixilon/minosoft/util/json/ChatComponentColorSerializer.kt @@ -21,7 +21,7 @@ import com.fasterxml.jackson.databind.deser.std.StdDeserializer import com.fasterxml.jackson.databind.module.SimpleModule import com.fasterxml.jackson.databind.ser.std.StdSerializer import de.bixilon.minosoft.data.text.ChatComponent -import de.bixilon.minosoft.data.text.PostChatFormattingCodes +import de.bixilon.minosoft.data.text.formatting.PostChatFormattingCodes import de.bixilon.minosoft.protocol.protocol.ProtocolDefinition object ChatComponentColorSerializer : SimpleModule() { diff --git a/src/main/java/de/bixilon/minosoft/util/json/RGBColorSerializer.kt b/src/main/java/de/bixilon/minosoft/util/json/RGBColorSerializer.kt index ac3ba3639..aacc93c95 100644 --- a/src/main/java/de/bixilon/minosoft/util/json/RGBColorSerializer.kt +++ b/src/main/java/de/bixilon/minosoft/util/json/RGBColorSerializer.kt @@ -21,8 +21,8 @@ import com.fasterxml.jackson.databind.SerializerProvider import com.fasterxml.jackson.databind.deser.std.StdDeserializer import com.fasterxml.jackson.databind.module.SimpleModule import com.fasterxml.jackson.databind.ser.std.StdSerializer -import de.bixilon.minosoft.data.text.ChatCode.Companion.toColor -import de.bixilon.minosoft.data.text.RGBColor +import de.bixilon.minosoft.data.text.formatting.ChatCode.Companion.toColor +import de.bixilon.minosoft.data.text.formatting.color.RGBColor object RGBColorSerializer : SimpleModule() { diff --git a/src/main/java/de/bixilon/minosoft/util/logging/LogLevels.kt b/src/main/java/de/bixilon/minosoft/util/logging/LogLevels.kt index 0be154f93..c3462ec1e 100644 --- a/src/main/java/de/bixilon/minosoft/util/logging/LogLevels.kt +++ b/src/main/java/de/bixilon/minosoft/util/logging/LogLevels.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,9 +13,9 @@ package de.bixilon.minosoft.util.logging -import de.bixilon.minosoft.data.text.ChatColors -import de.bixilon.minosoft.data.text.Colors -import de.bixilon.minosoft.data.text.RGBColor +import de.bixilon.minosoft.data.text.formatting.color.ChatColors +import de.bixilon.minosoft.data.text.formatting.color.Colors +import de.bixilon.minosoft.data.text.formatting.color.RGBColor enum class LogLevels(val levelColors: RGBColor) { FATAL(Colors.DARK_RED), diff --git a/src/main/java/de/bixilon/minosoft/util/logging/LogMessageType.kt b/src/main/java/de/bixilon/minosoft/util/logging/LogMessageType.kt index 8b0970179..038dd2609 100644 --- a/src/main/java/de/bixilon/minosoft/util/logging/LogMessageType.kt +++ b/src/main/java/de/bixilon/minosoft/util/logging/LogMessageType.kt @@ -14,8 +14,8 @@ package de.bixilon.minosoft.util.logging 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 LogMessageType( val defaultColor: RGBColor, @@ -35,14 +35,18 @@ enum class LogMessageType( NETWORK_RESOLVING(ChatColors.DARK_GREEN), NETWORK_STATUS(ChatColors.DARK_GREEN), - NETWORK_PACKETS_IN(ChatColors.BLUE, mapOf( - LogLevels.FATAL to ChatColors.DARK_RED, - LogLevels.WARN to ChatColors.RED, - ), defaultLevel = LogLevels.WARN), - NETWORK_PACKETS_OUT(ChatColors.DARK_AQUA, mapOf( - LogLevels.FATAL to ChatColors.DARK_RED, - LogLevels.WARN to ChatColors.RED, - ), defaultLevel = LogLevels.WARN), + NETWORK_PACKETS_IN( + ChatColors.BLUE, mapOf( + LogLevels.FATAL to ChatColors.DARK_RED, + LogLevels.WARN to ChatColors.RED, + ), defaultLevel = LogLevels.WARN + ), + NETWORK_PACKETS_OUT( + ChatColors.DARK_AQUA, mapOf( + LogLevels.FATAL to ChatColors.DARK_RED, + LogLevels.WARN to ChatColors.RED, + ), defaultLevel = LogLevels.WARN + ), RENDERING_GENERAL(ChatColors.GREEN), RENDERING_LOADING(ChatColors.GREEN), @@ -51,11 +55,13 @@ enum class LogMessageType( CHAT_IN(ChatColors.LIGHT_PURPLE), CHAT_OUT(ChatColors.LIGHT_PURPLE), - OTHER(ChatColors.WHITE, mapOf( - LogLevels.FATAL to ChatColors.DARK_RED, - LogLevels.WARN to ChatColors.RED, - LogLevels.VERBOSE to ChatColors.YELLOW, - )), + OTHER( + ChatColors.WHITE, mapOf( + LogLevels.FATAL to ChatColors.DARK_RED, + LogLevels.WARN to ChatColors.RED, + LogLevels.VERBOSE to ChatColors.YELLOW, + ) + ), PROFILES(ChatColors.AQUA), ; diff --git a/src/test/java/de/bixilon/minosoft/commands/parser/minecraft/color/ColorParserTest.kt b/src/test/java/de/bixilon/minosoft/commands/parser/minecraft/color/ColorParserTest.kt index b31b3d7d2..7b904e1d8 100644 --- a/src/test/java/de/bixilon/minosoft/commands/parser/minecraft/color/ColorParserTest.kt +++ b/src/test/java/de/bixilon/minosoft/commands/parser/minecraft/color/ColorParserTest.kt @@ -14,7 +14,7 @@ package de.bixilon.minosoft.commands.parser.minecraft.color import de.bixilon.minosoft.commands.util.CommandReader -import de.bixilon.minosoft.data.text.ChatColors +import de.bixilon.minosoft.data.text.formatting.color.ChatColors import org.junit.jupiter.api.Test import org.junit.jupiter.api.assertThrows import kotlin.test.assertEquals diff --git a/src/test/java/de/bixilon/minosoft/data/text/ChatComponentTest.kt b/src/test/java/de/bixilon/minosoft/data/text/ChatComponentTest.kt index 138363a9e..686773228 100644 --- a/src/test/java/de/bixilon/minosoft/data/text/ChatComponentTest.kt +++ b/src/test/java/de/bixilon/minosoft/data/text/ChatComponentTest.kt @@ -14,7 +14,8 @@ package de.bixilon.minosoft.data.text import de.bixilon.minosoft.data.text.ChatComponent.Companion.chat -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.Companion.asColor import org.junit.jupiter.api.Test import kotlin.test.assertEquals import kotlin.test.assertSame