diff --git a/src/main/java/de/bixilon/minosoft/data/entities/EntityMetaDataFields.java b/src/main/java/de/bixilon/minosoft/data/entities/EntityMetaDataFields.java index 7b2042dd7..64851bb44 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/EntityMetaDataFields.java +++ b/src/main/java/de/bixilon/minosoft/data/entities/EntityMetaDataFields.java @@ -262,7 +262,7 @@ public enum EntityMetaDataFields { MINECART_FURNACE_HAS_FUEL(false), MINECART_COMMAND_BLOCK_COMMAND(""), - MINECART_COMMAND_BLOCK_LAST_OUTPUT(ChatComponent.Companion.valueOf(null, null, "")), + MINECART_COMMAND_BLOCK_LAST_OUTPUT(ChatComponent.Companion.valueOf("")), PRIMED_TNT_FUSE_TIME(80), 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 2d8410b55..675cc3305 100644 --- a/src/main/java/de/bixilon/minosoft/data/text/ChatComponent.kt +++ b/src/main/java/de/bixilon/minosoft/data/text/ChatComponent.kt @@ -64,6 +64,7 @@ interface ChatComponent { companion object { + @JvmOverloads fun valueOf(translator: Translator? = null, parent: TextComponent? = null, raw: Any?): ChatComponent { if (raw == null) { return BaseComponent() diff --git a/src/main/java/de/bixilon/minosoft/data/text/HoverEvent.java b/src/main/java/de/bixilon/minosoft/data/text/HoverEvent.java index 8094b243f..db2ea015a 100644 --- a/src/main/java/de/bixilon/minosoft/data/text/HoverEvent.java +++ b/src/main/java/de/bixilon/minosoft/data/text/HoverEvent.java @@ -37,7 +37,7 @@ public class HoverEvent { } json.get("value"); this.value = switch (this.action) { // ToDo - case SHOW_TEXT -> ChatComponent.Companion.valueOf(null, null, data); + case SHOW_TEXT -> ChatComponent.Companion.valueOf(data); case SHOW_ENTITY -> EntityHoverData.deserialize(data); default -> null; }; @@ -79,7 +79,7 @@ public class HoverEvent { if (json.has("type")) { type = new ResourceLocation(json.get("type").getAsString()); } - return new EntityHoverData(Util.getUUIDFromString(json.get("id").getAsString()), type, ChatComponent.Companion.valueOf(null, null, json.get("name"))); + return new EntityHoverData(Util.getUUIDFromString(json.get("id").getAsString()), type, ChatComponent.Companion.valueOf(json.get("name"))); } } } diff --git a/src/main/java/de/bixilon/minosoft/gui/main/MainWindow.java b/src/main/java/de/bixilon/minosoft/gui/main/MainWindow.java index 5a5058ad4..73d3bb499 100644 --- a/src/main/java/de/bixilon/minosoft/gui/main/MainWindow.java +++ b/src/main/java/de/bixilon/minosoft/gui/main/MainWindow.java @@ -182,7 +182,7 @@ public class MainWindow implements Initializable { submitButton.setOnAction(actionEvent -> { Server server1 = server; - ChatComponent serverName = ChatComponent.Companion.valueOf(null, null, serverNameField.getText()); + ChatComponent serverName = ChatComponent.Companion.valueOf(serverNameField.getText()); String serverAddress = DNSUtil.correctHostName(serverAddressField.getText()); int desiredVersionId = GUITools.VERSION_COMBO_BOX.getSelectionModel().getSelectedItem().getVersionId(); diff --git a/src/main/java/de/bixilon/minosoft/gui/main/Server.java b/src/main/java/de/bixilon/minosoft/gui/main/Server.java index d6a331f1f..8acc420be 100644 --- a/src/main/java/de/bixilon/minosoft/gui/main/Server.java +++ b/src/main/java/de/bixilon/minosoft/gui/main/Server.java @@ -54,7 +54,7 @@ public class Server { } this.name = name; this.address = address; - this.addressName = ChatComponent.Companion.valueOf(null, null, address); + this.addressName = ChatComponent.Companion.valueOf(address); this.desiredVersion = desiredVersion; } @@ -64,7 +64,7 @@ public class Server { public Server(ServerAddress address) { this.id = getNextServerId(); - this.name = ChatComponent.Companion.valueOf(null, null, String.format("LAN Server #%d", LANServerListener.getServerMap().size())); + this.name = ChatComponent.Companion.valueOf(String.format("LAN Server #%d", LANServerListener.getServerMap().size())); this.address = address.toString(); this.desiredVersion = -1; // Automatic this.readOnly = true; @@ -75,7 +75,7 @@ public class Server { } public static Server deserialize(Map json) { - Server server = new Server((int) (double) json.get("id"), ChatComponent.Companion.valueOf(null, null, json.get("name")), (String) json.get("address"), (int) (double) json.get("version")); + Server server = new Server((int) (double) json.get("id"), ChatComponent.Companion.valueOf(json.get("name")), (String) json.get("address"), (int) (double) json.get("version")); if (json.containsKey("favicon")) { server.setFavicon(Base64.getDecoder().decode((String) json.get("favicon"))); } @@ -142,7 +142,7 @@ public class Server { public void setAddress(String address) { this.address = address; - this.addressName = ChatComponent.Companion.valueOf(null, null, address); + this.addressName = ChatComponent.Companion.valueOf(address); } public void ping() { diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/login/PacketLoginSuccess.java b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/login/PacketLoginSuccess.java index e8f95a28e..e21b518a0 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/login/PacketLoginSuccess.java +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/login/PacketLoginSuccess.java @@ -44,7 +44,7 @@ public class PacketLoginSuccess extends PlayS2CPacket { var playerEntity = connection.getPlayer().getEntity(); playerEntity.getTabListItem().setName(this.playerName); - playerEntity.getTabListItem().setDisplayName(ChatComponent.Companion.valueOf(null, null, this.playerName)); + playerEntity.getTabListItem().setDisplayName(ChatComponent.Companion.valueOf(this.playerName)); connection.getWorld().addEntity(null, this.uuid, playerEntity); } diff --git a/src/main/java/de/bixilon/minosoft/protocol/ping/ServerListPing.java b/src/main/java/de/bixilon/minosoft/protocol/ping/ServerListPing.java index 5eb1bb9c7..51fe28120 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/ping/ServerListPing.java +++ b/src/main/java/de/bixilon/minosoft/protocol/ping/ServerListPing.java @@ -45,7 +45,7 @@ public class ServerListPing { this.favicon = Base64.getDecoder().decode(json.get("favicon").getAsString().replace("data:image/png;base64,", "").replace("\n", "")); } - this.motd = ChatComponent.Companion.valueOf(localeManager, null, json.get("description")); + this.motd = ChatComponent.Companion.valueOf(localeManager, json.get("description")); this.serverBrand = json.getAsJsonObject("version").get("name").getAsString(); if (json.has("modinfo") && json.getAsJsonObject("modinfo").has("type") && json.getAsJsonObject("modinfo").get("type").getAsString().equals("FML")) { diff --git a/src/main/java/de/bixilon/minosoft/protocol/protocol/PacketSender.java b/src/main/java/de/bixilon/minosoft/protocol/protocol/PacketSender.java index 11e8b7e15..08486eb35 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/protocol/PacketSender.java +++ b/src/main/java/de/bixilon/minosoft/protocol/protocol/PacketSender.java @@ -130,7 +130,7 @@ public class PacketSender { } public void sendFakeChatMessage(String message) { - sendFakeChatMessage(ChatComponent.Companion.valueOf(null, null, message), ChatTextPositions.CHAT_BOX); + sendFakeChatMessage(ChatComponent.Companion.valueOf(message), ChatTextPositions.CHAT_BOX); } public void selectSlot(@IntRange(from = 0, to = 8) int slot) { diff --git a/src/main/java/de/bixilon/minosoft/protocol/protocol/PlayInByteBuffer.kt b/src/main/java/de/bixilon/minosoft/protocol/protocol/PlayInByteBuffer.kt index ef7fbb743..dac5c8378 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/protocol/PlayInByteBuffer.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/protocol/PlayInByteBuffer.kt @@ -186,11 +186,7 @@ class PlayInByteBuffer : InByteBuffer { return Ingredient(readItemStackArray()) } - @Deprecated(message = "Legacy only", replaceWith = ReplaceWith("readIngredientArray(readVarInt())")) - fun readIngredientArray(): Array { - return readIngredientArray(readVarInt()) - } - + @JvmOverloads fun readIngredientArray(length: Int = readVarInt()): Array { return readArray(length) { readIngredient() } } diff --git a/src/main/java/de/bixilon/minosoft/terminal/commands/commands/CommandServer.java b/src/main/java/de/bixilon/minosoft/terminal/commands/commands/CommandServer.java index d0f4b0615..a7053e375 100644 --- a/src/main/java/de/bixilon/minosoft/terminal/commands/commands/CommandServer.java +++ b/src/main/java/de/bixilon/minosoft/terminal/commands/commands/CommandServer.java @@ -70,7 +70,7 @@ public class CommandServer extends Command { if (version == null) { version = Versions.AUTOMATIC_VERSION; } - Server server = new Server(ChatComponent.Companion.valueOf(null, null, name), address, version); + Server server = new Server(ChatComponent.Companion.valueOf(name), address, version); server.saveToConfig(); print("Added server %s (address=%s, version=%d)", server.getName(), server.getAddress(), server.getDesiredVersionId()); diff --git a/src/main/java/de/bixilon/minosoft/util/logging/Log.java b/src/main/java/de/bixilon/minosoft/util/logging/Log.java index 73c64c8e7..f5f9f1bd5 100644 --- a/src/main/java/de/bixilon/minosoft/util/logging/Log.java +++ b/src/main/java/de/bixilon/minosoft/util/logging/Log.java @@ -109,8 +109,8 @@ public class Log { builder.append(level.name()); builder.append("] "); builder.append(prefix); - var component = (BaseComponent) ChatComponent.Companion.valueOf(null, null, builder.toString()); - var messageComponent = (BaseComponent) ChatComponent.Companion.valueOf(null, null, message); + var component = (BaseComponent) ChatComponent.Companion.valueOf(builder.toString()); + var messageComponent = (BaseComponent) ChatComponent.Companion.valueOf(message); if (color != null && StaticConfiguration.COLORED_LOG) { messageComponent.applyDefaultColor(color); } diff --git a/src/main/java/de/bixilon/minosoft/util/nbt/tag/NBTTagTypes.kt b/src/main/java/de/bixilon/minosoft/util/nbt/tag/NBTTagTypes.kt index 36ee627d5..1a3ff7dd9 100644 --- a/src/main/java/de/bixilon/minosoft/util/nbt/tag/NBTTagTypes.kt +++ b/src/main/java/de/bixilon/minosoft/util/nbt/tag/NBTTagTypes.kt @@ -28,7 +28,8 @@ enum class NBTTagTypes { LIST, COMPOUND, INT_ARRAY, - LONG_ARRAY; + LONG_ARRAY, + ; companion object : ValuesEnum { override val VALUES: Array = values()