AstralTransRocketries/minosoft
1
0
Fork 0
mirror of https://gitlab.bixilon.de/bixilon/minosoft.git synced 2025-09-12 00:47:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

rename ChatComponent::legacyText, ChatComponent::ansi, optimizing

Browse Source
This commit is contained in:
Moritz Zwerger 2023-11-10 07:56:35 +01:00
parent 6cf00cfff9
commit f5e3d29826
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
15 changed files with 43 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/de/bixilon/minosoft/camera/target/targets/BlockTarget.kt
View File

@ -36,7 +36,7 @@ class BlockTarget(
val cursor = position - blockPosition val cursor = position - blockPosition
override fun toString(): String { override fun toString(): String {
return toText().legacyText return toText().legacy
} }
override fun toText(): ChatComponent { override fun toText(): ChatComponent {

2
src/main/java/de/bixilon/minosoft/camera/target/targets/EntityTarget.kt
View File

@ -32,7 +32,7 @@ class EntityTarget(
) : GenericTarget(position, distance, direction), TextFormattable { ) : GenericTarget(position, distance, direction), TextFormattable {
override fun toString(): String { override fun toString(): String {
return toText().legacyText return toText().legacy
} }
override fun toText(): ChatComponent { override fun toText(): ChatComponent {

2
src/main/java/de/bixilon/minosoft/camera/target/targets/FluidTarget.kt
View File

@ -34,7 +34,7 @@ class FluidTarget(
) : GenericTarget(position, distance, direction), TextFormattable { ) : GenericTarget(position, distance, direction), TextFormattable {
override fun toString(): String { override fun toString(): String {
return toText().legacyText return toText().legacy
} }
override fun toText(): ChatComponent { override fun toText(): ChatComponent {

14
src/main/java/de/bixilon/minosoft/data/text/BaseComponent.kt
View File

@ -138,20 +138,20 @@ class BaseComponent : ChatComponent {
return BaseComponent(parts) return BaseComponent(parts)
} }
override val ansiColoredMessage: String override val ansi: String
get() { get() {
val stringBuilder = StringBuilder() val builder = StringBuilder()
for (part in parts) { for (part in parts) {
stringBuilder.append(part.ansiColoredMessage) builder.append(part.ansi)
} }
return stringBuilder.toString() return builder.toString()
} }
override val legacyText: String override val legacy: String
get() { get() {
val stringBuilder = StringBuilder() val stringBuilder = StringBuilder()
for (part in parts) { for (part in parts) {
stringBuilder.append(part.legacyText) stringBuilder.append(part.legacy)
} }
// ToDo: Remove §r suffix // ToDo: Remove §r suffix
return stringBuilder.toString() return stringBuilder.toString()
@ -198,7 +198,7 @@ class BaseComponent : ChatComponent {
} }
override fun toString(): String { override fun toString(): String {
return legacyText return legacy
} }
operator fun plusAssign(component: ChatComponent) { operator fun plusAssign(component: ChatComponent) {

4
src/main/java/de/bixilon/minosoft/data/text/ChatComponent.kt
View File

@ -33,12 +33,12 @@ interface ChatComponent {
/** /**
* @return Returns the message formatted with ANSI Formatting codes * @return Returns the message formatted with ANSI Formatting codes
*/ */
val ansiColoredMessage: String val ansi: String
/** /**
* @return Returns the message formatted with minecraft formatting codes (§) * @return Returns the message formatted with minecraft formatting codes (§)
*/ */
val legacyText: String val legacy: String
/** /**
* @return Returns the unformatted message * @return Returns the unformatted message

4
src/main/java/de/bixilon/minosoft/data/text/EmptyComponent.kt
View File

@ -17,8 +17,8 @@ import de.bixilon.minosoft.data.text.formatting.color.RGBColor
import javafx.collections.ObservableList import javafx.collections.ObservableList
import javafx.scene.Node import javafx.scene.Node
object EmptyComponent : ChatComponent { object EmptyComponent : ChatComponent {
override val ansiColoredMessage: String get() = "" override val ansi: String get() = ""
override val legacyText: String get() = "" override val legacy: String get() = ""
override val message: String get() = "" override val message: String get() = ""
override fun getJson(): Any = emptyList<Any>() override fun getJson(): Any = emptyList<Any>()

18
src/main/java/de/bixilon/minosoft/data/text/TextComponent.kt
View File

@ -80,7 +80,7 @@ open class TextComponent(
} }
override fun toString(): String { override fun toString(): String {
return legacyText return legacy
} }
override fun setFallbackColor(color: RGBColor): TextComponent { override fun setFallbackColor(color: RGBColor): TextComponent {
@ -90,22 +90,22 @@ open class TextComponent(
return this return this
} }
override val ansiColoredMessage: String override val ansi: String
get() { get() {
val stringBuilder = StringBuilder() val builder = StringBuilder()
this.color?.let { this.color?.let {
stringBuilder.append(it.ansi) builder.append(it.ansi)
} }
for (formattingCode in this.formatting) { for (formattingCode in this.formatting) {
stringBuilder.append(formattingCode.ansi) builder.append(formattingCode.ansi)
} }
stringBuilder.append(this.message) builder.append(this.message)
stringBuilder.append(FormattingCodes.RESET.ansi) builder.append(FormattingCodes.RESET.ansi)
return stringBuilder.toString() return builder.toString()
} }
override val legacyText: String override val legacy: String
get() { get() {
val builder = StringBuilder() val builder = StringBuilder()
ChatColors.getChar(color)?.let { builder.append(ProtocolDefinition.TEXT_COMPONENT_FORMATTING_PREFIX).append(it) } ChatColors.getChar(color)?.let { builder.append(ProtocolDefinition.TEXT_COMPONENT_FORMATTING_PREFIX).append(it) }

2
src/main/java/de/bixilon/minosoft/data/text/formatting/color/RGBColor.kt
View File

@ -22,7 +22,7 @@ import de.bixilon.minosoft.data.text.formatting.TextFormattable
import org.checkerframework.common.value.qual.IntRange import org.checkerframework.common.value.qual.IntRange
class RGBColor(val rgba: Int) : TextFormattable { class RGBColor(val rgba: Int) : TextFormattable {
val ansi: String = ANSI.rgb(red, green, blue) val ansi: String get() = ANSI.rgb(red, green, blue)
@JvmOverloads @JvmOverloads
constructor(red: Int, green: Int, blue: Int, alpha: Int = 0xFF) : this(alpha or (blue shl 8) or (green shl 16) or (red shl 24)) constructor(red: Int, green: Int, blue: Int, alpha: Int = 0xFF) : this(alpha or (blue shl 8) or (green shl 16) or (red shl 24))

2
src/main/java/de/bixilon/minosoft/gui/eros/dialog/ServerModifyDialog.kt
View File

@ -167,7 +167,7 @@ class ServerModifyDialog(
descriptionFX.text = EDIT_DESCRIPTION descriptionFX.text = EDIT_DESCRIPTION
modifyServerButtonFX.ctext = EDIT_UPDATE_BUTTON modifyServerButtonFX.ctext = EDIT_UPDATE_BUTTON
serverNameFX.text = server.name.legacyText.removeSuffix("§r") serverNameFX.text = server.name.legacy.removeSuffix("§r")
serverAddressFX.text = server.address serverAddressFX.text = server.address
modifyServerButtonFX.isDisable = serverAddressFX.text.isBlank() modifyServerButtonFX.isDisable = serverAddressFX.text.isBlank()

5
src/main/java/de/bixilon/minosoft/gui/rendering/camera/frustum/Frustum.kt
View File

@ -185,7 +185,10 @@ class Frustum(
fun containsAABB(aabb: AABB): Boolean { fun containsAABB(aabb: AABB): Boolean {
val offset = camera.offset.offset val offset = camera.offset.offset
return containsRegion(Vec3(aabb.min - offset), Vec3(aabb.max - offset)) return containsRegion(
(aabb.min.x - offset.x).toFloat(), (aabb.min.y - offset.x).toFloat(), (aabb.min.z - offset.x).toFloat(),
(aabb.max.x - offset.x).toFloat(), (aabb.max.x - offset.x).toFloat(), (aabb.max.x - offset.x).toFloat(),
)
} }
operator fun contains(aabb: AABB) = containsAABB(aabb) operator fun contains(aabb: AABB) = containsAABB(aabb)

17
src/main/java/de/bixilon/minosoft/gui/rendering/camera/visibility/WorldVisibilityGraph.kt
View File

@ -125,28 +125,27 @@ class WorldVisibilityGraph(
if (!RenderConstants.OCCLUSION_CULLING_ENABLED) { if (!RenderConstants.OCCLUSION_CULLING_ENABLED) {
return frustum.containsAABB(aabb) return frustum.containsAABB(aabb)
} }
val chunkPositions: MutableSet<Vec2i> = HashSet() val chunkPositions: MutableSet<Vec2i> = HashSet(4, 1.0f)
val sectionIndices = IntOpenHashSet() val sectionIndices = IntOpenHashSet()
for (position in aabb.positions()) { for (position in aabb.positions()) { // TODO: use ChunkPosition iterator
chunkPositions += position.chunkPosition chunkPositions += position.chunkPosition
sectionIndices += position.sectionHeight - minSection sectionIndices += position.sectionHeight - minSection
} }
var visible = false
chunkPositions@ for (chunkPosition in chunkPositions) { for (chunkPosition in chunkPositions) {
val visibility = getChunkVisibility(chunkPosition) ?: continue val visibility = getChunkVisibility(chunkPosition) ?: continue
for (index in sectionIndices.intIterator()) { for (index in sectionIndices.intIterator()) {
if (index < 0 || index > maxIndex) { if (index < 0 || index > maxIndex) {
visible = true // ToDo: Not 100% correct, image looking from > maxIndex to < 0 // ToDo: Not 100% correct, image looking from > maxIndex to < 0
break@chunkPositions return false
} }
if (visibility[index + 1]) { if (visibility[index + 1]) {
visible = true return false
break@chunkPositions
} }
} }
} }
return !visible return true
} }
fun isAABBVisible(aabb: AABB): Boolean { fun isAABBVisible(aabb: AABB): Boolean {

2
src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/tab/TabListEntryElement.kt
View File

@ -140,7 +140,7 @@ class TabListEntryElement(
} }
override fun toString(): String { override fun toString(): String {
return displayName.legacyText return displayName.legacy
} }
companion object { companion object {

2
src/main/java/de/bixilon/minosoft/util/json/ChatComponentColorSerializer.kt
View File

@ -41,7 +41,7 @@ object ChatComponentColorSerializer : SimpleModule() {
object Serializer : StdSerializer<ChatComponent>(ChatComponent::class.java) { object Serializer : StdSerializer<ChatComponent>(ChatComponent::class.java) {
override fun serialize(value: ChatComponent?, generator: JsonGenerator, provider: SerializerProvider?) { override fun serialize(value: ChatComponent?, generator: JsonGenerator, provider: SerializerProvider?) {
generator.writeString(value?.legacyText?.removeSuffix(ProtocolDefinition.TEXT_COMPONENT_FORMATTING_PREFIX.toString() + FormattingCodes.RESET.char.toString())) generator.writeString(value?.legacy?.removeSuffix(ProtocolDefinition.TEXT_COMPONENT_FORMATTING_PREFIX.toString() + FormattingCodes.RESET.char.toString()))
} }
} }
} }

4
src/main/java/de/bixilon/minosoft/util/logging/Log.kt
View File

@ -102,8 +102,8 @@ object Log {
SYSTEM_OUT_STREAM SYSTEM_OUT_STREAM
} }
val prefix = message.ansiColoredMessage.removeSuffix(RESET) // reset suffix val prefix = message.ansi.removeSuffix(RESET) // reset suffix
for (line in this.message.ansiColoredMessage.lineSequence()) { for (line in this.message.ansi.lineSequence()) {
stream.println(prefix + line + RESET) stream.println(prefix + line + RESET)
} }
stream.flush() stream.flush()

4
src/test/java/de/bixilon/minosoft/data/language/lang/LanguageTest.kt
View File

@ -95,7 +95,7 @@ class LanguageTest {
@Test @Test
fun formatting() { fun formatting() {
val language = create("§eHi %s, welcome!") val language = create("§eHi %s, welcome!")
assertEquals(language.translate(KEY, data = arrayOf("§aMoritz"))?.legacyText, "§eHi §r§aMoritz§r§e, welcome!§r") assertEquals(language.translate(KEY, data = arrayOf("§aMoritz"))?.legacy, "§eHi §r§aMoritz§r§e, welcome!§r")
} }
@Test @Test
@ -107,7 +107,7 @@ class LanguageTest {
@Test @Test
fun parent() { fun parent() {
val language = create("Hi %s, welcome!") val language = create("Hi %s, welcome!")
assertEquals(language.translate(KEY, parent = TextComponent("").color(ChatColors.YELLOW), data = arrayOf("§aMoritz"))?.legacyText, "§eHi §r§aMoritz§r§e, welcome!§r") assertEquals(language.translate(KEY, parent = TextComponent("").color(ChatColors.YELLOW), data = arrayOf("§aMoritz"))?.legacy, "§eHi §r§aMoritz§r§e, welcome!§r")
} }
@Test @Test