Fixed compile errors

Author: Lenni0451

src/main/java/net/lenni0451/miniconnect/server/protocol/ProtocolConstants.java

@@ -7,7 +7,7 @@
 import lombok.SneakyThrows;
 import net.lenni0451.commons.gson.GsonParser;
 import net.lenni0451.commons.gson.elements.GsonElement;
-import net.lenni0451.mcstructs.nbt.INbtTag;
+import net.lenni0451.mcstructs.nbt.NbtTag;
 import net.lenni0451.mcstructs.nbt.io.NbtIO;
 import net.lenni0451.mcstructs.nbt.io.NbtReadTracker;
 import net.lenni0451.mcstructs.nbt.tags.CompoundTag;
@@ -36,16 +36,16 @@ public class ProtocolConstants {
     static {
         REGISTRIES = readCompound("registries.nbt", tag -> {
             Map<String, CompoundTag> registries = new HashMap<>();
-            for (Map.Entry<String, INbtTag> entry : tag) {
+            for (Map.Entry<String, NbtTag> entry : tag) {
                 registries.put(entry.getKey(), entry.getValue().asCompoundTag());
             }
             return registries;
         });
         TAGS = readCompound("tags.nbt", tag -> {
             Map<String, Map<String, int[]>> tags = new HashMap<>();
-            for (Map.Entry<String, INbtTag> entry : tag) {
+            for (Map.Entry<String, NbtTag> entry : tag) {
                 Map<String, int[]> registryTags = new HashMap<>();
-                for (Map.Entry<String, INbtTag> tagEntry : entry.getValue().asCompoundTag()) {
+                for (Map.Entry<String, NbtTag> tagEntry : entry.getValue().asCompoundTag()) {
                     registryTags.put(tagEntry.getKey(), tagEntry.getValue().asIntArrayTag().getValue());
                 }
                 tags.put(entry.getKey(), registryTags);
@@ -61,7 +61,7 @@ public class ProtocolConstants {
     private static <T> T readCompound(final String name, final Function<CompoundTag, T> mapper) {
         InputStream stream = ProtocolConstants.class.getClassLoader().getResourceAsStream(name);
         if (stream == null) throw new IllegalStateException("Missing resource: " + name);
-        return mapper.apply(NbtIO.JAVA.read(stream, true, NbtReadTracker.unlimited()).asCompoundTag());
+        return mapper.apply(NbtIO.LATEST.read(stream, true, NbtReadTracker.unlimitedDepth()).asCompoundTag());
     }
 
     @SneakyThrows

src/main/java/net/lenni0451/miniconnect/server/protocol/packets/config/S2CConfigRegistryDataPacket.java

@@ -3,7 +3,7 @@
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.NoArgsConstructor;
-import net.lenni0451.mcstructs.nbt.INbtTag;
+import net.lenni0451.mcstructs.nbt.NbtTag;
 import net.lenni0451.mcstructs.nbt.tags.CompoundTag;
 import net.raphimc.netminecraft.packet.Packet;
 import net.raphimc.netminecraft.packet.PacketTypes;
@@ -26,7 +26,7 @@ public void read(ByteBuf byteBuf, int protocolVersion) {
     public void write(ByteBuf byteBuf, int protocolVersion) {
         PacketTypes.writeString(byteBuf, this.registry);
         PacketTypes.writeVarInt(byteBuf, this.data.size());
-        for (Map.Entry<String, INbtTag> entry : this.data) {
+        for (Map.Entry<String, NbtTag> entry : this.data) {
             PacketTypes.writeString(byteBuf, entry.getKey());
             byteBuf.writeBoolean(true);
             PacketTypes.writeUnnamedTag(byteBuf, entry.getValue());

src/main/java/net/lenni0451/miniconnect/server/protocol/packets/play/s2c/S2COpenScreenPacket.java

@@ -3,7 +3,7 @@
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.NoArgsConstructor;
-import net.lenni0451.mcstructs.text.ATextComponent;
+import net.lenni0451.mcstructs.text.TextComponent;
 import net.lenni0451.miniconnect.server.protocol.ProtocolConstants;
 import net.raphimc.netminecraft.packet.Packet;
 import net.raphimc.netminecraft.packet.PacketTypes;
@@ -14,7 +14,7 @@ public class S2COpenScreenPacket implements Packet {
 
     public int id;
     public int type;
-    public ATextComponent title;
+    public TextComponent title;
 
     @Override
     public void read(ByteBuf byteBuf, int protocolVersion) {
@@ -25,7 +25,7 @@ public void read(ByteBuf byteBuf, int protocolVersion) {
     public void write(ByteBuf byteBuf, int protocolVersion) {
         PacketTypes.writeVarInt(byteBuf, this.id);
         PacketTypes.writeVarInt(byteBuf, this.type);
-        PacketTypes.writeUnnamedTag(byteBuf, ProtocolConstants.TEXT_CODEC.serializeNbt(this.title));
+        PacketTypes.writeUnnamedTag(byteBuf, ProtocolConstants.TEXT_CODEC.serializeNbtTree(this.title));
     }
 
 }

src/main/java/net/lenni0451/miniconnect/server/protocol/packets/play/s2c/S2CSystemChatPacket.java

@@ -3,7 +3,7 @@
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.NoArgsConstructor;
-import net.lenni0451.mcstructs.text.ATextComponent;
+import net.lenni0451.mcstructs.text.TextComponent;
 import net.lenni0451.miniconnect.server.protocol.ProtocolConstants;
 import net.raphimc.netminecraft.packet.Packet;
 import net.raphimc.netminecraft.packet.PacketTypes;
@@ -12,7 +12,7 @@
 @AllArgsConstructor
 public class S2CSystemChatPacket implements Packet {
 
-    public ATextComponent message;
+    public TextComponent message;
     public boolean actionbar;
 
     @Override
@@ -22,7 +22,7 @@ public void read(ByteBuf byteBuf, int protocolVersion) {
 
     @Override
     public void write(ByteBuf byteBuf, int protocolVersion) {
-        PacketTypes.writeUnnamedTag(byteBuf, ProtocolConstants.TEXT_CODEC.serializeNbt(this.message));
+        PacketTypes.writeUnnamedTag(byteBuf, ProtocolConstants.TEXT_CODEC.serializeNbtTree(this.message));
         byteBuf.writeBoolean(this.actionbar);
     }
 

src/main/java/net/lenni0451/miniconnect/server/states/play/Tutorial.java

@@ -58,7 +58,7 @@ private static FilterableComponent[] buildTutorial(final String... pages) {
                 if (i != 0) base.append("\n");
                 base.append(lines[i]);
             }
-            components.add(new FilterableComponent(ViaUtils.convertNbt(ProtocolConstants.TEXT_CODEC.serializeNbt(base)), null));
+            components.add(new FilterableComponent(ViaUtils.convertNbt(ProtocolConstants.TEXT_CODEC.serializeNbtTree(base)), null));
         }
         return components.toArray(new FilterableComponent[0]);
     }

src/main/java/net/lenni0451/miniconnect/server/states/play/screen/ItemBuilder.java

@@ -6,7 +6,7 @@
 import com.viaversion.viaversion.api.minecraft.data.StructuredDataKey;
 import com.viaversion.viaversion.api.minecraft.item.Item;
 import com.viaversion.viaversion.api.minecraft.item.StructuredItem;
-import net.lenni0451.mcstructs.text.ATextComponent;
+import net.lenni0451.mcstructs.text.TextComponent;
 import net.lenni0451.miniconnect.server.protocol.ProtocolConstants;
 import net.lenni0451.miniconnect.utils.ViaUtils;
 
@@ -21,21 +21,21 @@ public static ItemBuilder item(final String id) {
 
 
     private final String id;
-    private ATextComponent name;
-    private final List<ATextComponent> lore = new ArrayList<>();
+    private TextComponent name;
+    private final List<TextComponent> lore = new ArrayList<>();
     private Boolean glint;
     private final Map<StructuredDataKey, Object> structuredData = new HashMap<>();
 
     private ItemBuilder(final String id) {
         this.id = id;
     }
 
-    public ItemBuilder named(final ATextComponent name) {
+    public ItemBuilder named(final TextComponent name) {
         this.name = name;
         return this;
     }
 
-    public ItemBuilder lore(final ATextComponent... lore) {
+    public ItemBuilder lore(final TextComponent... lore) {
         Collections.addAll(this.lore, lore);
         return this;
     }
@@ -61,12 +61,12 @@ public Item get() {
         StructuredItem item = new StructuredItem(rawId, 1);
         item.dataContainer().setIdLookup(Via.getManager().getProtocolManager().getProtocol(Protocol1_21_4To1_21_2.class), false);
         if (this.name != null) {
-            item.dataContainer().set(StructuredDataKey.CUSTOM_NAME, ViaUtils.convertNbt(ProtocolConstants.TEXT_CODEC.serializeNbt(this.name)));
+            item.dataContainer().set(StructuredDataKey.CUSTOM_NAME, ViaUtils.convertNbt(ProtocolConstants.TEXT_CODEC.serializeNbtTree(this.name)));
         }
         if (!this.lore.isEmpty()) {
             Tag[] lore = new Tag[this.lore.size()];
             for (int i = 0; i < this.lore.size(); i++) {
-                lore[i] = ViaUtils.convertNbt(ProtocolConstants.TEXT_CODEC.serializeNbt(this.lore.get(i)));
+                lore[i] = ViaUtils.convertNbt(ProtocolConstants.TEXT_CODEC.serializeNbtTree(this.lore.get(i)));
             }
             item.dataContainer().set(StructuredDataKey.LORE, lore);
         }

src/main/java/net/lenni0451/miniconnect/server/states/play/screen/Screen.java

@@ -1,26 +1,26 @@
 package net.lenni0451.miniconnect.server.states.play.screen;
 
-import net.lenni0451.mcstructs.text.ATextComponent;
+import net.lenni0451.mcstructs.text.TextComponent;
 
 public abstract class Screen {
 
-    private final ATextComponent title;
+    private final TextComponent title;
     private final int slotCount;
     private final int inventoryType;
 
-    public Screen(final ATextComponent title, final int rows) {
+    public Screen(final TextComponent title, final int rows) {
         this.title = title;
         this.slotCount = rows * 9;
         this.inventoryType = rows - 1;
     }
 
-    public Screen(final ATextComponent title, final int inventoryType, final int slotCount) {
+    public Screen(final TextComponent title, final int inventoryType, final int slotCount) {
         this.title = title;
         this.slotCount = slotCount;
         this.inventoryType = inventoryType;
     }
 
-    public ATextComponent getTitle() {
+    public TextComponent getTitle() {
         return this.title;
     }
 

src/main/java/net/lenni0451/miniconnect/server/states/play/screen/impl/MainScreen.java

@@ -10,11 +10,10 @@
 import com.viaversion.viaversion.api.minecraft.item.data.WrittenBook;
 import com.viaversion.viaversion.api.platform.PlatformTask;
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import net.lenni0451.mcstructs.core.TextFormatting;
-import net.lenni0451.mcstructs.text.ATextComponent;
+import net.lenni0451.mcstructs.text.TextComponent;
+import net.lenni0451.mcstructs.text.TextFormatting;
 import net.lenni0451.mcstructs.text.components.StringComponent;
-import net.lenni0451.mcstructs.text.events.click.ClickEvent;
-import net.lenni0451.mcstructs.text.events.click.ClickEventAction;
+import net.lenni0451.mcstructs.text.events.click.types.OpenUrlClickEvent;
 import net.lenni0451.miniconnect.Main;
 import net.lenni0451.miniconnect.server.model.PlayerConfig;
 import net.lenni0451.miniconnect.server.protocol.ProtocolConstants;
@@ -105,8 +104,8 @@ public void init(ScreenHandler screenHandler, ItemList itemList) {
             PlatformTask<?> task = Via.getPlatform().runAsync(() -> {
                 try {
                     playerConfig.account = new MicrosoftAccount(MicrosoftAccount.DEVICE_CODE_LOGIN.getFromInput(MinecraftAuth.createHttpClient(), new StepMsaDeviceCode.MsaDeviceCodeCallback(code -> {
-                        ATextComponent component = new StringComponent("Please open your browser and visit ").modifyStyle(style -> style.setFormatting(TextFormatting.YELLOW));
-                        component.append(new StringComponent(code.getDirectVerificationUri()).modifyStyle(style -> style.setFormatting(TextFormatting.BLUE).setClickEvent(new ClickEvent(ClickEventAction.OPEN_URL, code.getDirectVerificationUri()))));
+                        TextComponent component = new StringComponent("Please open your browser and visit ").styled(style -> style.setFormatting(TextFormatting.YELLOW));
+                        component.append(new StringComponent(code.getDirectVerificationUri()).styled(style -> style.setFormatting(TextFormatting.BLUE).setClickEvent(new OpenUrlClickEvent(code.getDirectVerificationUri()))));
                         component.append(new StringComponent(" and login with your Microsoft account"));
                         screenHandler.getStateHandler().send(new S2CSystemChatPacket(component, false));
                         screenHandler.getStateHandler().send(new S2CSystemChatPacket(new StringComponent("§bIf the code is not inserted automatically, please enter the code: §a" + code.getUserCode()), false));

src/main/java/net/lenni0451/miniconnect/utils/ViaUtils.java

@@ -1,15 +1,15 @@
 package net.lenni0451.miniconnect.utils;
 
 import com.viaversion.nbt.tag.*;
-import net.lenni0451.mcstructs.nbt.INbtTag;
+import net.lenni0451.mcstructs.nbt.NbtTag;
 
 import javax.annotation.Nullable;
 import java.util.Collections;
 import java.util.Map;
 
 public class ViaUtils {
 
-    public static Tag convertNbt(@Nullable final INbtTag nbt) {
+    public static Tag convertNbt(@Nullable final NbtTag nbt) {
         if (nbt == null) return null;
         return switch (nbt.getNbtType()) {
             case END -> throw new UnsupportedOperationException();
@@ -23,14 +23,14 @@ public static Tag convertNbt(@Nullable final INbtTag nbt) {
             case STRING -> new StringTag(nbt.asStringTag().getValue());
             case LIST -> {
                 ListTag<? super Tag> listTag = new ListTag<>(Collections.emptyList());
-                for (INbtTag tag : nbt.asListTag()) {
+                for (NbtTag tag : nbt.asListTag()) {
                     listTag.add(convertNbt(tag));
                 }
                 yield listTag;
             }
             case COMPOUND -> {
                 CompoundTag compoundTag = new CompoundTag();
-                for (Map.Entry<String, INbtTag> entry : nbt.asCompoundTag()) {
+                for (Map.Entry<String, NbtTag> entry : nbt.asCompoundTag()) {
                     compoundTag.put(entry.getKey(), convertNbt(entry.getValue()));
                 }
                 yield compoundTag;