diff --git a/src/main/java/de/bixilon/minosoft/data/language/placeholder/PlaceholderUtil.kt b/src/main/java/de/bixilon/minosoft/data/language/placeholder/PlaceholderUtil.kt index 87e32b541..0fc4ad267 100644 --- a/src/main/java/de/bixilon/minosoft/data/language/placeholder/PlaceholderUtil.kt +++ b/src/main/java/de/bixilon/minosoft/data/language/placeholder/PlaceholderUtil.kt @@ -85,7 +85,7 @@ object PlaceholderUtil { } push() - appendArgument(Integer.parseInt(indexBuilder.toString())) + appendArgument(Integer.parseInt(indexBuilder.toString()) - 1) } private fun PlaceholderIteratorOptions.processChar() = processChar(iterator.nextInt()) diff --git a/src/main/java/de/bixilon/minosoft/data/text/events/hover/EntityHoverEvent.kt b/src/main/java/de/bixilon/minosoft/data/text/events/hover/EntityHoverEvent.kt index 474acdd4a..dddc4a3cb 100644 --- a/src/main/java/de/bixilon/minosoft/data/text/events/hover/EntityHoverEvent.kt +++ b/src/main/java/de/bixilon/minosoft/data/text/events/hover/EntityHoverEvent.kt @@ -23,7 +23,7 @@ import de.bixilon.minosoft.util.KUtil.toResourceLocation import de.bixilon.minosoft.util.json.Jackson import java.util.* -class EntityHoverEvent( +data class EntityHoverEvent( val uuid: UUID, val type: ResourceLocation?, val name: ChatComponent, 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 b8f094ee7..b607ffcc1 100644 --- a/src/test/java/de/bixilon/minosoft/data/text/ChatComponentTest.kt +++ b/src/test/java/de/bixilon/minosoft/data/text/ChatComponentTest.kt @@ -21,6 +21,7 @@ import de.bixilon.minosoft.data.text.ChatComponent.Companion.chat import de.bixilon.minosoft.data.text.events.click.OpenFileClickEvent import de.bixilon.minosoft.data.text.events.click.OpenURLClickEvent import de.bixilon.minosoft.data.text.events.click.SendMessageClickEvent +import de.bixilon.minosoft.data.text.events.click.SuggestChatClickEvent import de.bixilon.minosoft.data.text.events.hover.EntityHoverEvent import de.bixilon.minosoft.data.text.events.hover.TextHoverEvent import de.bixilon.minosoft.data.text.formatting.color.ChatColors @@ -256,7 +257,7 @@ internal class ChatComponentTest { )) val text = ChatComponent.of("""{"translate":"death.attack.generic","with":[{"color":"light_purple","insertion":"Bixilon","clickEvent":{"action":"suggest_command","value":"/tell Bixilon "},"hoverEvent":{"action":"show_entity","contents":{"type":"minecraft:player","id":"1d410d09-750b-3200-993c-47f31b30baf0","name":{"text":"Bixilon"}}},"extra":[{"bold":true,"color":"green","text":"[Admin] "},{"text":"Bixilon"}],"text":""}]}""", translator = language) - val click = SendMessageClickEvent("/tell Bixilon") + val click = SuggestChatClickEvent("/tell Bixilon ") val hover = EntityHoverEvent("1d410d09-750b-3200-993c-47f31b30baf0".toUUID(), minecraft("player"), name = TextComponent("Bixilon")) val expected = BaseComponent(