diff --git a/src/main/java/de/bixilon/minosoft/commands/parser/ArgumentParser.kt b/src/main/java/de/bixilon/minosoft/commands/parser/ArgumentParser.kt index 902918f47..945c19d5c 100644 --- a/src/main/java/de/bixilon/minosoft/commands/parser/ArgumentParser.kt +++ b/src/main/java/de/bixilon/minosoft/commands/parser/ArgumentParser.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2022 Moritz Zwerger + * Copyright (C) 2020-2023 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,11 +14,9 @@ package de.bixilon.minosoft.commands.parser import de.bixilon.minosoft.commands.util.CommandReader -import de.bixilon.minosoft.data.text.ChatComponent interface ArgumentParser { val examples: List - val placeholder: ChatComponent fun parse(reader: CommandReader): T fun getSuggestions(reader: CommandReader): Collection diff --git a/src/main/java/de/bixilon/minosoft/commands/parser/brigadier/_double/DoubleParser.kt b/src/main/java/de/bixilon/minosoft/commands/parser/brigadier/_double/DoubleParser.kt index e81515f2a..a93529bec 100644 --- a/src/main/java/de/bixilon/minosoft/commands/parser/brigadier/_double/DoubleParser.kt +++ b/src/main/java/de/bixilon/minosoft/commands/parser/brigadier/_double/DoubleParser.kt @@ -19,7 +19,6 @@ import de.bixilon.minosoft.commands.parser.factory.ArgumentParserFactory import de.bixilon.minosoft.commands.util.CommandReader import de.bixilon.minosoft.commands.util.StringReader import de.bixilon.minosoft.data.registries.identified.ResourceLocation -import de.bixilon.minosoft.data.text.ChatComponent import de.bixilon.minosoft.protocol.protocol.PlayInByteBuffer import de.bixilon.minosoft.util.KUtil.toResourceLocation @@ -28,7 +27,6 @@ class DoubleParser( val max: Double = Double.MAX_VALUE, ) : BrigadierParser { override val examples: List = listOf(1.0, -1.0, 1000.0) - override val placeholder = ChatComponent.of("") override fun parse(reader: CommandReader): Double { val result = reader.readResult { reader.readDouble() } diff --git a/src/main/java/de/bixilon/minosoft/commands/parser/brigadier/_float/FloatParser.kt b/src/main/java/de/bixilon/minosoft/commands/parser/brigadier/_float/FloatParser.kt index 15896792a..d28f40401 100644 --- a/src/main/java/de/bixilon/minosoft/commands/parser/brigadier/_float/FloatParser.kt +++ b/src/main/java/de/bixilon/minosoft/commands/parser/brigadier/_float/FloatParser.kt @@ -19,7 +19,6 @@ import de.bixilon.minosoft.commands.parser.factory.ArgumentParserFactory import de.bixilon.minosoft.commands.util.CommandReader import de.bixilon.minosoft.commands.util.StringReader import de.bixilon.minosoft.data.registries.identified.ResourceLocation -import de.bixilon.minosoft.data.text.ChatComponent import de.bixilon.minosoft.protocol.protocol.PlayInByteBuffer import de.bixilon.minosoft.util.KUtil.toResourceLocation @@ -28,7 +27,6 @@ class FloatParser( val max: Float = Float.MAX_VALUE, ) : BrigadierParser { override val examples: List = listOf(1.0f, -1.0f, 1000.0f) - override val placeholder = ChatComponent.of("") override fun parse(reader: CommandReader): Float { val result = reader.readResult { reader.readFloat() } diff --git a/src/main/java/de/bixilon/minosoft/commands/parser/brigadier/_int/IntParser.kt b/src/main/java/de/bixilon/minosoft/commands/parser/brigadier/_int/IntParser.kt index ec9821a77..cecd465cc 100644 --- a/src/main/java/de/bixilon/minosoft/commands/parser/brigadier/_int/IntParser.kt +++ b/src/main/java/de/bixilon/minosoft/commands/parser/brigadier/_int/IntParser.kt @@ -19,7 +19,6 @@ import de.bixilon.minosoft.commands.parser.factory.ArgumentParserFactory import de.bixilon.minosoft.commands.util.CommandReader import de.bixilon.minosoft.commands.util.StringReader import de.bixilon.minosoft.data.registries.identified.ResourceLocation -import de.bixilon.minosoft.data.text.ChatComponent import de.bixilon.minosoft.protocol.protocol.PlayInByteBuffer import de.bixilon.minosoft.util.KUtil.toResourceLocation @@ -28,7 +27,6 @@ class IntParser( val max: Int = Int.MAX_VALUE, ) : BrigadierParser { override val examples: List = listOf(1, -1, 1000) - override val placeholder = ChatComponent.of("") override fun parse(reader: CommandReader): Int { val result = reader.readResult { reader.readInt() } diff --git a/src/main/java/de/bixilon/minosoft/commands/parser/brigadier/_long/LongParser.kt b/src/main/java/de/bixilon/minosoft/commands/parser/brigadier/_long/LongParser.kt index d4fee5e87..48323f7c4 100644 --- a/src/main/java/de/bixilon/minosoft/commands/parser/brigadier/_long/LongParser.kt +++ b/src/main/java/de/bixilon/minosoft/commands/parser/brigadier/_long/LongParser.kt @@ -19,7 +19,6 @@ import de.bixilon.minosoft.commands.parser.factory.ArgumentParserFactory import de.bixilon.minosoft.commands.util.CommandReader import de.bixilon.minosoft.commands.util.StringReader import de.bixilon.minosoft.data.registries.identified.ResourceLocation -import de.bixilon.minosoft.data.text.ChatComponent import de.bixilon.minosoft.protocol.protocol.PlayInByteBuffer import de.bixilon.minosoft.util.KUtil.toResourceLocation @@ -28,7 +27,6 @@ class LongParser( val max: Long = Long.MAX_VALUE, ) : BrigadierParser { override val examples: List = listOf(1L, -1L, 1000L) - override val placeholder = ChatComponent.of("") override fun parse(reader: CommandReader): Long { val result = reader.readResult { reader.readLong() } diff --git a/src/main/java/de/bixilon/minosoft/commands/parser/brigadier/bool/BooleanParser.kt b/src/main/java/de/bixilon/minosoft/commands/parser/brigadier/bool/BooleanParser.kt index 4a8685bf9..e79d90c65 100644 --- a/src/main/java/de/bixilon/minosoft/commands/parser/brigadier/bool/BooleanParser.kt +++ b/src/main/java/de/bixilon/minosoft/commands/parser/brigadier/bool/BooleanParser.kt @@ -20,7 +20,6 @@ import de.bixilon.minosoft.commands.suggestion.ArraySuggestion import de.bixilon.minosoft.commands.util.CommandReader import de.bixilon.minosoft.commands.util.StringReader import de.bixilon.minosoft.data.registries.identified.ResourceLocation -import de.bixilon.minosoft.data.text.ChatComponent import de.bixilon.minosoft.protocol.protocol.PlayInByteBuffer import de.bixilon.minosoft.util.KUtil.toResourceLocation @@ -28,7 +27,6 @@ object BooleanParser : BrigadierParser, ArgumentParserFactory = listOf(true, false) private val suggestion = ArraySuggestion(examples) - override val placeholder = ChatComponent.of("") override fun parse(reader: CommandReader): Boolean { return reader.readRequiredBoolean() diff --git a/src/main/java/de/bixilon/minosoft/commands/parser/brigadier/string/StringParser.kt b/src/main/java/de/bixilon/minosoft/commands/parser/brigadier/string/StringParser.kt index abcd24756..12d4d8fef 100644 --- a/src/main/java/de/bixilon/minosoft/commands/parser/brigadier/string/StringParser.kt +++ b/src/main/java/de/bixilon/minosoft/commands/parser/brigadier/string/StringParser.kt @@ -20,7 +20,6 @@ import de.bixilon.minosoft.commands.parser.factory.ArgumentParserFactory import de.bixilon.minosoft.commands.util.CommandReader import de.bixilon.minosoft.commands.util.StringReader import de.bixilon.minosoft.data.registries.identified.ResourceLocation -import de.bixilon.minosoft.data.text.ChatComponent import de.bixilon.minosoft.protocol.protocol.PlayInByteBuffer import de.bixilon.minosoft.util.KUtil.toResourceLocation @@ -28,7 +27,6 @@ class StringParser( val mode: StringModes = StringModes.SINGLE, ) : BrigadierParser { override val examples: List = emptyList() - override val placeholder = ChatComponent.of("") override fun parse(reader: CommandReader): String { reader.readResult { reader.readString(mode) }.let { return it.result ?: throw StringParseError(reader, it) } 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 b9b23ef77..b9f6cb457 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,7 +19,6 @@ 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.identified.ResourceLocation -import de.bixilon.minosoft.data.text.ChatComponent 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 @@ -30,7 +29,6 @@ class ColorParser( val supportsRGB: Boolean = true, ) : ArgumentParser { override val examples: List = listOf("red", "yellow") - override val placeholder = ChatComponent.of("") private val suggestions = ArraySuggestion(ChatColors.NAME_MAP.keys, true) override fun parse(reader: CommandReader): RGBColor { diff --git a/src/main/java/de/bixilon/minosoft/commands/parser/minecraft/component/ChatComponentParser.kt b/src/main/java/de/bixilon/minosoft/commands/parser/minecraft/component/ChatComponentParser.kt index 0b9c343bf..32c468fe4 100644 --- a/src/main/java/de/bixilon/minosoft/commands/parser/minecraft/component/ChatComponentParser.kt +++ b/src/main/java/de/bixilon/minosoft/commands/parser/minecraft/component/ChatComponentParser.kt @@ -26,7 +26,6 @@ object ChatComponentParser : ArgumentParser, ArgumentParserFactor override val identifier: ResourceLocation = "minecraft:component".toResourceLocation() override val examples: List = listOf("", "hello", """{"text":"hello world"}""") private val parser = StringParser(StringParser.StringModes.GREEDY) - override val placeholder = ChatComponent.of("") override fun parse(reader: CommandReader): ChatComponent { if (!reader.canPeek()) { diff --git a/src/main/java/de/bixilon/minosoft/commands/parser/minecraft/coordinate/angle/AngleParser.kt b/src/main/java/de/bixilon/minosoft/commands/parser/minecraft/coordinate/angle/AngleParser.kt index 5bb8ea4ca..940523c68 100644 --- a/src/main/java/de/bixilon/minosoft/commands/parser/minecraft/coordinate/angle/AngleParser.kt +++ b/src/main/java/de/bixilon/minosoft/commands/parser/minecraft/coordinate/angle/AngleParser.kt @@ -19,14 +19,12 @@ import de.bixilon.minosoft.commands.parser.minecraft.coordinate.Coordinate import de.bixilon.minosoft.commands.parser.minecraft.coordinate.CoordinateParserUtil.readCoordinate import de.bixilon.minosoft.commands.util.CommandReader import de.bixilon.minosoft.data.registries.identified.ResourceLocation -import de.bixilon.minosoft.data.text.ChatComponent import de.bixilon.minosoft.protocol.protocol.PlayInByteBuffer import de.bixilon.minosoft.util.KUtil.toResourceLocation object AngleParser : ArgumentParser, ArgumentParserFactory { override val identifier: ResourceLocation = "minecraft:angle".toResourceLocation() override val examples: List = listOf("~", "5", "~10.8") - override val placeholder = ChatComponent.of("") override fun parse(reader: CommandReader): Coordinate { return reader.readCoordinate(caret = false) // ToDo: Check min/max? diff --git a/src/main/java/de/bixilon/minosoft/commands/parser/minecraft/coordinate/block/BlockPositionParser.kt b/src/main/java/de/bixilon/minosoft/commands/parser/minecraft/coordinate/block/BlockPositionParser.kt index a19dc7610..d331231c2 100644 --- a/src/main/java/de/bixilon/minosoft/commands/parser/minecraft/coordinate/block/BlockPositionParser.kt +++ b/src/main/java/de/bixilon/minosoft/commands/parser/minecraft/coordinate/block/BlockPositionParser.kt @@ -18,14 +18,12 @@ import de.bixilon.minosoft.commands.parser.factory.ArgumentParserFactory import de.bixilon.minosoft.commands.parser.minecraft.coordinate.CoordinateParserUtil.readCoordinate import de.bixilon.minosoft.commands.util.CommandReader import de.bixilon.minosoft.data.registries.identified.ResourceLocation -import de.bixilon.minosoft.data.text.ChatComponent import de.bixilon.minosoft.protocol.protocol.PlayInByteBuffer import de.bixilon.minosoft.util.KUtil.toResourceLocation object BlockPositionParser : ArgumentParser, ArgumentParserFactory { override val identifier: ResourceLocation = "minecraft:block_pos".toResourceLocation() override val examples: List = listOf("~ ~ ~", "^ ^ ^", "5 5 5") - override val placeholder = ChatComponent.of("") override fun parse(reader: CommandReader): BlockCoordinate { return BlockCoordinate(reader.readCoordinate(decimal = false), reader.readCoordinate(decimal = false), reader.readCoordinate(decimal = false)) diff --git a/src/main/java/de/bixilon/minosoft/commands/parser/minecraft/coordinate/rotation/RotationParser.kt b/src/main/java/de/bixilon/minosoft/commands/parser/minecraft/coordinate/rotation/RotationParser.kt index 8713ee690..6477695e7 100644 --- a/src/main/java/de/bixilon/minosoft/commands/parser/minecraft/coordinate/rotation/RotationParser.kt +++ b/src/main/java/de/bixilon/minosoft/commands/parser/minecraft/coordinate/rotation/RotationParser.kt @@ -18,14 +18,12 @@ import de.bixilon.minosoft.commands.parser.factory.ArgumentParserFactory import de.bixilon.minosoft.commands.parser.minecraft.coordinate.CoordinateParserUtil.readCoordinate import de.bixilon.minosoft.commands.util.CommandReader import de.bixilon.minosoft.data.registries.identified.ResourceLocation -import de.bixilon.minosoft.data.text.ChatComponent import de.bixilon.minosoft.protocol.protocol.PlayInByteBuffer import de.bixilon.minosoft.util.KUtil.toResourceLocation object RotationParser : ArgumentParser, ArgumentParserFactory { override val identifier: ResourceLocation = "minecraft:rotation".toResourceLocation() override val examples: List = listOf("~ ~", "5 5", "~10.8 ~12") - override val placeholder = ChatComponent.of("") override fun parse(reader: CommandReader): Rotation { return Rotation(reader.readCoordinate(caret = false), reader.readCoordinate(caret = false)) // ToDo: Check min/max? diff --git a/src/main/java/de/bixilon/minosoft/commands/parser/minecraft/coordinate/vec2/Vec2Parser.kt b/src/main/java/de/bixilon/minosoft/commands/parser/minecraft/coordinate/vec2/Vec2Parser.kt index 54a234a47..c0bad899c 100644 --- a/src/main/java/de/bixilon/minosoft/commands/parser/minecraft/coordinate/vec2/Vec2Parser.kt +++ b/src/main/java/de/bixilon/minosoft/commands/parser/minecraft/coordinate/vec2/Vec2Parser.kt @@ -18,14 +18,12 @@ import de.bixilon.minosoft.commands.parser.factory.ArgumentParserFactory import de.bixilon.minosoft.commands.parser.minecraft.coordinate.CoordinateParserUtil.readCoordinate import de.bixilon.minosoft.commands.util.CommandReader import de.bixilon.minosoft.data.registries.identified.ResourceLocation -import de.bixilon.minosoft.data.text.ChatComponent import de.bixilon.minosoft.protocol.protocol.PlayInByteBuffer import de.bixilon.minosoft.util.KUtil.toResourceLocation object Vec2Parser : ArgumentParser, ArgumentParserFactory { override val identifier: ResourceLocation = "minecraft:vec2".toResourceLocation() override val examples: List = listOf("~ ~ ", "^ ^", "5 5") - override val placeholder = ChatComponent.of("") override fun parse(reader: CommandReader): Vec2Coordinate { return Vec2Coordinate(reader.readCoordinate(), reader.readCoordinate()) diff --git a/src/main/java/de/bixilon/minosoft/commands/parser/minecraft/coordinate/vec3/Vec3Parser.kt b/src/main/java/de/bixilon/minosoft/commands/parser/minecraft/coordinate/vec3/Vec3Parser.kt index d25d7af8a..4da2e52b1 100644 --- a/src/main/java/de/bixilon/minosoft/commands/parser/minecraft/coordinate/vec3/Vec3Parser.kt +++ b/src/main/java/de/bixilon/minosoft/commands/parser/minecraft/coordinate/vec3/Vec3Parser.kt @@ -18,14 +18,12 @@ import de.bixilon.minosoft.commands.parser.factory.ArgumentParserFactory import de.bixilon.minosoft.commands.parser.minecraft.coordinate.CoordinateParserUtil.readCoordinate import de.bixilon.minosoft.commands.util.CommandReader import de.bixilon.minosoft.data.registries.identified.ResourceLocation -import de.bixilon.minosoft.data.text.ChatComponent import de.bixilon.minosoft.protocol.protocol.PlayInByteBuffer import de.bixilon.minosoft.util.KUtil.toResourceLocation object Vec3Parser : ArgumentParser, ArgumentParserFactory { override val identifier: ResourceLocation = "minecraft:vec3".toResourceLocation() override val examples: List = listOf("~ ~ ~", "^ ^ ^", "5 5 5") - override val placeholder = ChatComponent.of("") override fun parse(reader: CommandReader): Vec3Coordinate { return Vec3Coordinate(reader.readCoordinate(), reader.readCoordinate(), reader.readCoordinate()) diff --git a/src/main/java/de/bixilon/minosoft/commands/parser/minecraft/range/_float/FloatRangeParser.kt b/src/main/java/de/bixilon/minosoft/commands/parser/minecraft/range/_float/FloatRangeParser.kt index 13393012a..ad009f516 100644 --- a/src/main/java/de/bixilon/minosoft/commands/parser/minecraft/range/_float/FloatRangeParser.kt +++ b/src/main/java/de/bixilon/minosoft/commands/parser/minecraft/range/_float/FloatRangeParser.kt @@ -19,7 +19,6 @@ import de.bixilon.minosoft.commands.parser.factory.ArgumentParserFactory import de.bixilon.minosoft.commands.parser.minecraft.range.RangeParserFactory.readRange import de.bixilon.minosoft.commands.util.CommandReader import de.bixilon.minosoft.data.registries.identified.ResourceLocation -import de.bixilon.minosoft.data.text.ChatComponent import de.bixilon.minosoft.protocol.protocol.PlayInByteBuffer import de.bixilon.minosoft.util.KUtil.toResourceLocation @@ -27,7 +26,6 @@ class FloatRangeParser( val defaultMin: Float? = -Float.MAX_VALUE, ) : ArgumentParser { override val examples: List = listOf(1.0f, "1.0..10") - override val placeholder = ChatComponent.of("") override fun parse(reader: CommandReader): FloatRange { return reader.readResult { reader.readFloatRange(defaultMin) }.let { return@let it.result ?: throw FloatRangeParseError(reader, it) } diff --git a/src/main/java/de/bixilon/minosoft/commands/parser/minecraft/range/_int/IntRangeParser.kt b/src/main/java/de/bixilon/minosoft/commands/parser/minecraft/range/_int/IntRangeParser.kt index de7b27333..af89db969 100644 --- a/src/main/java/de/bixilon/minosoft/commands/parser/minecraft/range/_int/IntRangeParser.kt +++ b/src/main/java/de/bixilon/minosoft/commands/parser/minecraft/range/_int/IntRangeParser.kt @@ -19,7 +19,6 @@ import de.bixilon.minosoft.commands.parser.factory.ArgumentParserFactory import de.bixilon.minosoft.commands.parser.minecraft.range.RangeParserFactory.readRange import de.bixilon.minosoft.commands.util.CommandReader import de.bixilon.minosoft.data.registries.identified.ResourceLocation -import de.bixilon.minosoft.data.text.ChatComponent import de.bixilon.minosoft.protocol.protocol.PlayInByteBuffer import de.bixilon.minosoft.util.KUtil.toResourceLocation @@ -27,7 +26,6 @@ class IntRangeParser( val defaultMin: Int? = Int.MIN_VALUE, ) : ArgumentParser { override val examples: List = listOf(1, "1..10") - override val placeholder = ChatComponent.of("") override fun parse(reader: CommandReader): IntRange { return reader.readResult { reader.readIntRange(defaultMin) }.let { return@let it.result ?: throw IntRangeParseError(reader, it) } diff --git a/src/main/java/de/bixilon/minosoft/commands/parser/minecraft/resource/ResourceKeyParser.kt b/src/main/java/de/bixilon/minosoft/commands/parser/minecraft/resource/ResourceKeyParser.kt index e96dc254a..cdd714fdc 100644 --- a/src/main/java/de/bixilon/minosoft/commands/parser/minecraft/resource/ResourceKeyParser.kt +++ b/src/main/java/de/bixilon/minosoft/commands/parser/minecraft/resource/ResourceKeyParser.kt @@ -18,7 +18,6 @@ import de.bixilon.minosoft.commands.parser.factory.ArgumentParserFactory import de.bixilon.minosoft.commands.util.CommandReader import de.bixilon.minosoft.data.registries.identified.ResourceLocation import de.bixilon.minosoft.data.registries.registries.registry.AbstractRegistry -import de.bixilon.minosoft.data.text.ChatComponent import de.bixilon.minosoft.protocol.protocol.PlayInByteBuffer import de.bixilon.minosoft.util.KUtil.toResourceLocation @@ -27,7 +26,6 @@ class ResourceKeyParser( val registry: AbstractRegistry<*>?, ) : ArgumentParser { override val examples: List = listOf("TODO") - override val placeholder = ChatComponent.of("") override fun parse(reader: CommandReader): Any { TODO() diff --git a/src/main/java/de/bixilon/minosoft/commands/parser/minecraft/resource/ResourceParser.kt b/src/main/java/de/bixilon/minosoft/commands/parser/minecraft/resource/ResourceParser.kt index a21490271..4ca4956d2 100644 --- a/src/main/java/de/bixilon/minosoft/commands/parser/minecraft/resource/ResourceParser.kt +++ b/src/main/java/de/bixilon/minosoft/commands/parser/minecraft/resource/ResourceParser.kt @@ -18,7 +18,6 @@ import de.bixilon.minosoft.commands.parser.factory.ArgumentParserFactory import de.bixilon.minosoft.commands.util.CommandReader import de.bixilon.minosoft.data.registries.identified.ResourceLocation import de.bixilon.minosoft.data.registries.registries.registry.AbstractRegistry -import de.bixilon.minosoft.data.text.ChatComponent import de.bixilon.minosoft.protocol.protocol.PlayInByteBuffer import de.bixilon.minosoft.util.KUtil.toResourceLocation @@ -27,7 +26,6 @@ class ResourceParser( val registry: AbstractRegistry<*>?, ) : ArgumentParser { override val examples: List = listOf("TODO") - override val placeholder = ChatComponent.of("") override fun parse(reader: CommandReader): Any { TODO() diff --git a/src/main/java/de/bixilon/minosoft/commands/parser/minecraft/resource/location/ResourceLocationParser.kt b/src/main/java/de/bixilon/minosoft/commands/parser/minecraft/resource/location/ResourceLocationParser.kt index 06e9571bf..5787e4f6a 100644 --- a/src/main/java/de/bixilon/minosoft/commands/parser/minecraft/resource/location/ResourceLocationParser.kt +++ b/src/main/java/de/bixilon/minosoft/commands/parser/minecraft/resource/location/ResourceLocationParser.kt @@ -17,14 +17,12 @@ import de.bixilon.minosoft.commands.parser.ArgumentParser import de.bixilon.minosoft.commands.parser.factory.ArgumentParserFactory import de.bixilon.minosoft.commands.util.CommandReader import de.bixilon.minosoft.data.registries.identified.ResourceLocation -import de.bixilon.minosoft.data.text.ChatComponent import de.bixilon.minosoft.protocol.protocol.PlayInByteBuffer import de.bixilon.minosoft.util.KUtil.toResourceLocation object ResourceLocationParser : ArgumentParser, ArgumentParserFactory { override val identifier: ResourceLocation = "minecraft:resource_location".toResourceLocation() override val examples: List = listOf("dirt", "minecraft:dirt") - override val placeholder = ChatComponent.of("") override fun parse(reader: CommandReader): ResourceLocation { reader.readResult { readResourceLocation() }.let { return it.result ?: throw InvalidResourceLocationError(reader, it) } diff --git a/src/main/java/de/bixilon/minosoft/commands/parser/minecraft/resource/tag/ResourceOrTagKeyParser.kt b/src/main/java/de/bixilon/minosoft/commands/parser/minecraft/resource/tag/ResourceOrTagKeyParser.kt index 91d7a084a..2fafc8474 100644 --- a/src/main/java/de/bixilon/minosoft/commands/parser/minecraft/resource/tag/ResourceOrTagKeyParser.kt +++ b/src/main/java/de/bixilon/minosoft/commands/parser/minecraft/resource/tag/ResourceOrTagKeyParser.kt @@ -18,7 +18,6 @@ import de.bixilon.minosoft.commands.parser.factory.ArgumentParserFactory import de.bixilon.minosoft.commands.util.CommandReader import de.bixilon.minosoft.data.registries.identified.ResourceLocation import de.bixilon.minosoft.data.registries.registries.registry.AbstractRegistry -import de.bixilon.minosoft.data.text.ChatComponent import de.bixilon.minosoft.protocol.protocol.PlayInByteBuffer import de.bixilon.minosoft.util.KUtil.toResourceLocation @@ -27,7 +26,6 @@ class ResourceOrTagKeyParser( val registry: AbstractRegistry<*>?, ) : ArgumentParser { override val examples: List = listOf("TODO") - override val placeholder = ChatComponent.of("") override fun parse(reader: CommandReader): Any { TODO() diff --git a/src/main/java/de/bixilon/minosoft/commands/parser/minecraft/resource/tag/ResourceOrTagParser.kt b/src/main/java/de/bixilon/minosoft/commands/parser/minecraft/resource/tag/ResourceOrTagParser.kt index 3a25c717e..eb8a9204e 100644 --- a/src/main/java/de/bixilon/minosoft/commands/parser/minecraft/resource/tag/ResourceOrTagParser.kt +++ b/src/main/java/de/bixilon/minosoft/commands/parser/minecraft/resource/tag/ResourceOrTagParser.kt @@ -18,7 +18,6 @@ import de.bixilon.minosoft.commands.parser.factory.ArgumentParserFactory import de.bixilon.minosoft.commands.util.CommandReader import de.bixilon.minosoft.data.registries.identified.ResourceLocation import de.bixilon.minosoft.data.registries.registries.registry.AbstractRegistry -import de.bixilon.minosoft.data.text.ChatComponent import de.bixilon.minosoft.protocol.protocol.PlayInByteBuffer import de.bixilon.minosoft.util.KUtil.toResourceLocation @@ -27,7 +26,6 @@ class ResourceOrTagParser( val registry: AbstractRegistry<*>?, ) : ArgumentParser { override val examples: List = listOf("TODO") - override val placeholder = ChatComponent.of("") override fun parse(reader: CommandReader): Any { TODO() diff --git a/src/main/java/de/bixilon/minosoft/commands/parser/minecraft/score/holder/ScoreHolderParser.kt b/src/main/java/de/bixilon/minosoft/commands/parser/minecraft/score/holder/ScoreHolderParser.kt index 08519d7de..a93f47329 100644 --- a/src/main/java/de/bixilon/minosoft/commands/parser/minecraft/score/holder/ScoreHolderParser.kt +++ b/src/main/java/de/bixilon/minosoft/commands/parser/minecraft/score/holder/ScoreHolderParser.kt @@ -18,7 +18,6 @@ import de.bixilon.minosoft.commands.parser.ArgumentParser import de.bixilon.minosoft.commands.parser.factory.ArgumentParserFactory import de.bixilon.minosoft.commands.util.CommandReader import de.bixilon.minosoft.data.registries.identified.ResourceLocation -import de.bixilon.minosoft.data.text.ChatComponent import de.bixilon.minosoft.protocol.protocol.PlayInByteBuffer import de.bixilon.minosoft.util.KUtil.toResourceLocation @@ -27,7 +26,6 @@ class ScoreHolderParser( val allowMultiple: Boolean = false, ) : ArgumentParser { override val examples: List = listOf("TODO") - override val placeholder = ChatComponent.of("") override fun parse(reader: CommandReader): IntRange { TODO() diff --git a/src/main/java/de/bixilon/minosoft/commands/parser/minecraft/target/TargetParser.kt b/src/main/java/de/bixilon/minosoft/commands/parser/minecraft/target/TargetParser.kt index c7140359e..dacdca270 100644 --- a/src/main/java/de/bixilon/minosoft/commands/parser/minecraft/target/TargetParser.kt +++ b/src/main/java/de/bixilon/minosoft/commands/parser/minecraft/target/TargetParser.kt @@ -31,7 +31,6 @@ import de.bixilon.minosoft.commands.parser.minecraft.uuid.InvalidUUIDError import de.bixilon.minosoft.commands.util.CommandReader import de.bixilon.minosoft.commands.util.ReadResult import de.bixilon.minosoft.data.registries.identified.ResourceLocation -import de.bixilon.minosoft.data.text.ChatComponent import de.bixilon.minosoft.protocol.protocol.PlayInByteBuffer import de.bixilon.minosoft.protocol.protocol.ProtocolDefinition import de.bixilon.minosoft.util.KUtil.toResourceLocation @@ -42,7 +41,6 @@ class TargetParser( val playerName: String = DEFAULT_PLAYER_NAME, ) : ArgumentParser { override val examples: List = listOf(playerName, "@a", "@p") - override val placeholder = ChatComponent.of("") override fun parse(reader: CommandReader): EntityTarget { if (!reader.canPeek()) { diff --git a/src/main/java/de/bixilon/minosoft/commands/parser/minecraft/time/TimeParser.kt b/src/main/java/de/bixilon/minosoft/commands/parser/minecraft/time/TimeParser.kt index ab81196c0..2c8dd7722 100644 --- a/src/main/java/de/bixilon/minosoft/commands/parser/minecraft/time/TimeParser.kt +++ b/src/main/java/de/bixilon/minosoft/commands/parser/minecraft/time/TimeParser.kt @@ -19,14 +19,12 @@ import de.bixilon.minosoft.commands.parser.brigadier._float.FloatParser.Companio import de.bixilon.minosoft.commands.parser.factory.ArgumentParserFactory import de.bixilon.minosoft.commands.util.CommandReader import de.bixilon.minosoft.data.registries.identified.ResourceLocation -import de.bixilon.minosoft.data.text.ChatComponent import de.bixilon.minosoft.protocol.protocol.PlayInByteBuffer import de.bixilon.minosoft.util.KUtil.toResourceLocation object TimeParser : ArgumentParser, ArgumentParserFactory { override val identifier: ResourceLocation = "minecraft:time".toResourceLocation() override val examples: List = listOf(2400, "3d", "10s") - override val placeholder = ChatComponent.of("