1.0.1: Ability to set item data value on legacy versions

Author: JNNGL

VERSION

@@ -1 +1 @@
-1.0.0
+1.0.1

build.gradle

@@ -9,7 +9,7 @@ plugins {
 }
 
 setGroup("net.elytrium")
-setVersion("1.0.1-SNAPSHOT")
+setVersion("1.0.1")
 
 compileJava {
     getOptions().setEncoding("UTF-8")

src/main/java/net/elytrium/limbohub/LimboHub.java

@@ -248,7 +248,7 @@ public void reload() {
                         .map(line -> buildResetComponent().append(getSerializer().deserialize(line)))
                         .collect(Collectors.toList());
 
-                return new ItemStack(virtualItem, fallbackItems, item.COUNT, 0, new StaticItemMeta(
+                return new ItemStack(virtualItem, fallbackItems, item.COUNT, item.DATA, new StaticItemMeta(
                     nameComponent, loreComponents, item.HAS_COLOR, item.COLOR, item.ENCHANTED, item.SKULL_OWNER));
               }
           ));
@@ -272,6 +272,10 @@ public void reload() {
         for (int column = 0; column < columns; column++) {
           String itemId = format.substring(column, column + 1);
           ItemStack item = " ".equals(itemId) ? ItemStack.EMPTY : items.get(itemId);
+          if (item == null) {
+            throw new IllegalArgumentException("Item with id '" + itemId + "' is not defined.");
+          }
+
           container.setItem(column, row, item);
         }
       }

src/main/java/net/elytrium/limbohub/Settings.java

@@ -176,10 +176,10 @@ public static class COMMAND {
             "menu",
             "Menu",
             List.of(
-                Settings.createNodeSequence(MENU.ITEM_DATA.class, ".", "minecraft:black_stained_glass_pane", List.of("minecraft:glass_pane"), 1, false, 0, false, "", "", List.of()),
-                Settings.createNodeSequence(MENU.ITEM_DATA.class, "1", "minecraft:leather_helmet", List.of(), 1, true, 12544467, false, "", "&fOpen another menu", List.of()),
-                Settings.createNodeSequence(MENU.ITEM_DATA.class, "2", "minecraft:stone", List.of(), 2, false, 0, true, "", "&fServer1", List.of("&r&7This is a server.")),
-                Settings.createNodeSequence(MENU.ITEM_DATA.class, "3", "minecraft:player_head", List.of("minecraft:experience_bottle"), 1, false, 0, false, "f051234a-8c3d-45d5-8e78-df729dd0da8c;eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvMjcwNWZkOTRhMGM0MzE5MjdmYjRlNjM5YjBmY2ZiNDk3MTdlNDEyMjg1YTAyYjQzOWUwMTEyZGEyMmIyZTJlYyJ9fX0=", "&fWhat is this?", List.of())
+                Settings.createNodeSequence(MENU.ITEM_DATA.class, ".", "minecraft:black_stained_glass_pane", List.of("minecraft:white_stained_glass_pane"), 1, 15, false, 0, false, "", "", List.of()),
+                Settings.createNodeSequence(MENU.ITEM_DATA.class, "1", "minecraft:leather_helmet", List.of(), 1, 0, true, 12544467, false, "", "&fOpen another menu", List.of()),
+                Settings.createNodeSequence(MENU.ITEM_DATA.class, "2", "minecraft:stone", List.of(), 2, 0, false, 0, true, "", "&fServer1", List.of("&r&7This is a server.")),
+                Settings.createNodeSequence(MENU.ITEM_DATA.class, "3", "minecraft:player_head", List.of("minecraft:experience_bottle"), 1, 0, false, 0, false, "f051234a-8c3d-45d5-8e78-df729dd0da8c;eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvMjcwNWZkOTRhMGM0MzE5MjdmYjRlNjM5YjBmY2ZiNDk3MTdlNDEyMjg1YTAyYjQzOWUwMTEyZGEyMmIyZTJlYyJ9fX0=", "&fWhat is this?", List.of())
             ),
             List.of(
                 ".........",
@@ -196,9 +196,9 @@ public static class COMMAND {
             "menu2",
             "Another Menu",
             List.of(
-                Settings.createNodeSequence(MENU.ITEM_DATA.class, ".", "minecraft:black_stained_glass_pane", List.of("minecraft:glass_pane"), 1, false, 0, false, "", "", List.of()),
-                Settings.createNodeSequence(MENU.ITEM_DATA.class, "1", "minecraft:barrier", List.of(), 1, false, 0, false, "", "&fClose menu", List.of()),
-                Settings.createNodeSequence(MENU.ITEM_DATA.class, "2", "minecraft:bedrock", List.of(), 1, false, 0, false, "", "&fGo back", List.of())
+                Settings.createNodeSequence(MENU.ITEM_DATA.class, ".", "minecraft:black_stained_glass_pane", List.of("minecraft:white_stained_glass_pane"), 1, 15, false, 0, false, "", "", List.of()),
+                Settings.createNodeSequence(MENU.ITEM_DATA.class, "1", "minecraft:barrier", List.of(), 1, 0, false, 0, false, "", "&fClose menu", List.of()),
+                Settings.createNodeSequence(MENU.ITEM_DATA.class, "2", "minecraft:bedrock", List.of(), 1, 0, false, 0, false, "", "&fGo back", List.of())
             ),
             List.of(
                 ".........",
@@ -230,6 +230,8 @@ public static class ITEM_DATA {
         public String ITEM = "";
         public List<String> FALLBACK_ITEMS = List.of();
         public int COUNT = 1;
+        @Comment("Only used on legacy versions (1.12.2 and lower).")
+        public int DATA = 0;
         public boolean HAS_COLOR = false;
         @Comment("You can get color value at https://notwoods.github.io/minecraft-tools/armorcolor/.")
         public int COLOR = 0;

src/main/java/net/elytrium/limbohub/protocol/item/ItemStack.java

@@ -68,7 +68,8 @@ public void encode(ByteBuf buf, ProtocolVersion protocolVersion) {
     if (this.present) {
       VirtualItem item = this.items.stream()
           .dropWhile(i -> !i.isSupportedOn(protocolVersion))
-          .findFirst().orElseThrow();
+          .findFirst().orElseThrow(() ->
+              new IllegalArgumentException("Item " + this.items.get(0).getModernID() + " is not supported on " + protocolVersion));
 
       if (protocolVersion.compareTo(ProtocolVersion.MINECRAFT_1_13_2) < 0) {
         buf.writeShort(item.getID(protocolVersion));

src/main/java/net/elytrium/limbohub/protocol/packets/SetContainerContent.java

@@ -22,6 +22,7 @@
 import com.velocitypowered.proxy.protocol.MinecraftPacket;
 import com.velocitypowered.proxy.protocol.ProtocolUtils;
 import io.netty.buffer.ByteBuf;
+import java.util.Objects;
 import net.elytrium.limbohub.protocol.container.Container;
 import net.elytrium.limbohub.protocol.item.ItemStack;
 
@@ -55,7 +56,8 @@ public void encode(ByteBuf buf, ProtocolUtils.Direction direction, ProtocolVersi
         buf.writeShort(this.container.getContents().length);
       }
       for (ItemStack item : this.container.getContents()) {
-        item.encode(buf, protocolVersion);
+        Objects.requireNonNullElse(item, ItemStack.EMPTY)
+            .encode(buf, protocolVersion);
       }
     } else {
       int slots = 45;