upd

Author: mdxd44

.gitignore

@@ -78,8 +78,7 @@ fabric.properties
 .LSOverride
 
 # Icon must end with two \r
-Icon
-
+Icon
 
 # Thumbnails
 ._*

api/build.gradle

@@ -62,6 +62,6 @@ publishing() {
 
   publications.create("publication", MavenPublication) {
     // TODO pom
-    artifact(jar)
+    from(components.java)
   }
 }

api/src/main/java/net/elytrium/limboapi/api/LimboFactory.java

@@ -13,6 +13,7 @@
 import java.io.InputStream;
 import java.nio.file.Path;
 import java.util.Map;
+import net.elytrium.limboapi.api.world.WorldVersion;
 import net.elytrium.limboapi.api.world.chunk.biome.BuiltInBiome;
 import net.elytrium.limboapi.api.world.chunk.Dimension;
 import net.elytrium.limboapi.api.world.chunk.biome.VirtualBiome;
@@ -222,32 +223,15 @@ default VirtualBlock createSimpleBlock(boolean solid, boolean air, boolean motio
    */
   void passLoginLimbo(Player player);
 
-  /**
-   * Creates new virtual item from Item enum
-   *
-   * @param item Item from item enum
-   *
-   * @return new virtual item
-   */
   VirtualItem getItem(Item item);
 
-  /**
-   * Creates new virtual item from Item enum
-   *
-   * @param modernId Modern item identifier
-   *
-   * @return new virtual item
-   */
   VirtualItem getItem(String modernId);
 
-  /**
-   * Creates new virtual item from Item enum
-   *
-   * @param legacyId Legacy item ID
-   *
-   * @return new virtual item
-   */
-  VirtualItem getLegacyItem(int legacyId);
+  VirtualItem getItem(ProtocolVersion version, short id);
+
+  VirtualItem getItem(WorldVersion version, short id);
+
+  VirtualItem getLegacyItem(short legacyId);
 
   /**
    * @return new data component map

api/src/main/java/net/elytrium/limboapi/api/protocol/PacketFactory.java

@@ -99,6 +99,10 @@ default Object createLightUpdatePacket(ChunkSnapshot chunkSnapshot, Dimension di
 
   Object createChunkUnloadPacket(int posX, int posZ);
 
+  /**
+   * @deprecated Use {@link PacketFactory#createDefaultSpawnPositionPacket(String, int, int, int, float, float)}
+   */
+  @Deprecated
   Object createDefaultSpawnPositionPacket(int posX, int posY, int posZ, float angle);
 
   Object createDefaultSpawnPositionPacket(String dimension, int posX, int posY, int posZ, float yaw, float pitch);

api/src/main/java/net/elytrium/limboapi/api/protocol/data/EntityData.java

@@ -9,8 +9,9 @@
 
 import com.velocitypowered.api.network.ProtocolVersion;
 import it.unimi.dsi.fastutil.objects.ObjectArrayList;
-import it.unimi.dsi.fastutil.shorts.Short2ObjectLinkedOpenHashMap;
+import it.unimi.dsi.fastutil.shorts.Short2ObjectMap;
 import it.unimi.dsi.fastutil.shorts.Short2ObjectOpenHashMap;
+import java.util.Map;
 import java.util.NoSuchElementException;
 import java.util.OptionalInt;
 import java.util.UUID;
@@ -49,7 +50,43 @@
  * @see LimboPlayer#setEntityData(int, EntityData)
  */
 @NullMarked
-public class EntityData extends Short2ObjectLinkedOpenHashMap<Object> {
+public class EntityData extends Short2ObjectOpenHashMap<Object> {
+
+  public EntityData(int expected, float f) {
+    super(expected, f);
+  }
+
+  public EntityData(int expected) {
+    super(expected);
+  }
+
+  public EntityData() {
+
+  }
+
+  public EntityData(Map<? extends Short, ?> m, float f) {
+    super(m, f);
+  }
+
+  public EntityData(Map<? extends Short, ?> m) {
+    super(m);
+  }
+
+  public EntityData(Short2ObjectMap<Object> m, float f) {
+    super(m, f);
+  }
+
+  public EntityData(Short2ObjectMap<Object> m) {
+    super(m);
+  }
+
+  public EntityData(short[] k, Object[] v, float f) {
+    super(k, v, f);
+  }
+
+  public EntityData(short[] k, Object[] v) {
+    super(k, v);
+  }
 
   public record OptionalComponentHolder(@Nullable ComponentHolder component) {
 

api/src/main/java/net/elytrium/limboapi/api/protocol/data/ItemStack.java

@@ -7,36 +7,43 @@
 
 package net.elytrium.limboapi.api.protocol.data;
 
+import com.velocitypowered.api.network.ProtocolVersion;
+import net.elytrium.limboapi.api.world.WorldVersion;
+import net.elytrium.limboapi.api.world.item.VirtualItem;
 import net.elytrium.limboapi.api.world.item.datacomponent.DataComponentMap;
 import net.elytrium.limboapi.api.world.item.datacomponent.DataComponentTypes;
 import net.kyori.adventure.nbt.CompoundBinaryTag;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
-public record ItemStack(int material/*TODO VirtualItem*/, int amount, int data, @Nullable CompoundBinaryTag nbt, @Nullable DataComponentMap map) implements EntityData.Particle.ParticleOptions {
+public record ItemStack(VirtualItem material, int amount, int data, @Nullable CompoundBinaryTag nbt, @Nullable DataComponentMap map) implements EntityData.Particle.ParticleOptions {
 
-  public static final ItemStack EMPTY = new ItemStack(-1, 0, 0, null, null);
+  public static final ItemStack EMPTY = new ItemStack(null, 0, 0, null, null);
 
-  public ItemStack(int material, int amount, @Nullable CompoundBinaryTag nbt) {
+  public ItemStack(VirtualItem material, int amount, @Nullable CompoundBinaryTag nbt) {
     this(material, amount, nbt == null ? 0 : nbt.getInt("Damage", 0), nbt, null);
   }
 
-  public ItemStack(int material, int amount, @Nullable DataComponentMap map) {
+  public ItemStack(VirtualItem material, int amount, @Nullable DataComponentMap map) {
     this(material, amount, map == null ? 0 : map.getDataOrDefault(DataComponentTypes.DAMAGE, 0), map);
   }
 
-  public ItemStack(int material, int amount, int data) {
+  public ItemStack(VirtualItem material, int amount, int data) {
     this(material, amount, data, null, null);
   }
 
-  public ItemStack(int material, int amount, int data, @Nullable CompoundBinaryTag nbt) {
+  public ItemStack(VirtualItem material, int amount, int data, @Nullable CompoundBinaryTag nbt) {
     this(material, amount, data, nbt, null);
   }
 
-  public ItemStack(int material, int amount, int data, @Nullable DataComponentMap map) {
+  public ItemStack(VirtualItem material, int amount, int data, @Nullable DataComponentMap map) {
     this(material, amount, data, null, map);
   }
 
-  public boolean isEmpty(boolean checkDamage) {
-    return this == ItemStack.EMPTY || this.material <= 0 || this.amount <= 0 || (checkDamage && (this.data < -32768 || this.data > 65535));
+  public boolean isEmpty(ProtocolVersion version, boolean checkDamage) {
+    return this.isEmpty(WorldVersion.from(version), checkDamage);
+  }
+
+  public boolean isEmpty(WorldVersion version, boolean checkDamage) {
+    return this == ItemStack.EMPTY || this.material.itemId(version) <= 0 || this.amount <= 0 || (checkDamage && (this.data < -32768 || this.data > 65535));
   }
 }

api/src/main/java/net/elytrium/limboapi/api/protocol/data/MapPalette.java

@@ -236,13 +236,13 @@ public EnumSet<ProtocolVersion> getVersions() {
     }
 
     static {
-      for (MapVersion value : MapVersion.values()) {
-        value.versions.forEach(version -> VERSIONS_MAP.put(version, value));
+      for (MapVersion version : MapVersion.values()) {
+        version.getVersions().forEach(protocolVersion -> VERSIONS_MAP.put(protocolVersion, version));
       }
     }
 
     public static MapVersion fromProtocolVersion(ProtocolVersion version) {
-      return VERSIONS_MAP.get(version);
+      return Objects.requireNonNull(VERSIONS_MAP.get(version));
     }
   }
 }

api/src/main/java/net/elytrium/limboapi/api/world/WorldVersion.java

@@ -10,11 +10,11 @@
 import com.velocitypowered.api.network.ProtocolVersion;
 import java.util.EnumMap;
 import java.util.EnumSet;
-import java.util.Set;
+import java.util.Objects;
 
 public enum WorldVersion {
 
-  LEGACY(EnumSet.range(ProtocolVersion.MINECRAFT_1_7_2, ProtocolVersion.MINECRAFT_1_12_2)),
+  LEGACY(EnumSet.range(ProtocolVersion.MINECRAFT_1_7_2, ProtocolVersion.MINECRAFT_1_12_2)), // TODO better legacy support
   MINECRAFT_1_13(EnumSet.of(ProtocolVersion.MINECRAFT_1_13)),
   MINECRAFT_1_13_2(EnumSet.of(ProtocolVersion.MINECRAFT_1_13_1, ProtocolVersion.MINECRAFT_1_13_2)),
   MINECRAFT_1_14(EnumSet.range(ProtocolVersion.MINECRAFT_1_14, ProtocolVersion.MINECRAFT_1_14_4)),
@@ -36,27 +36,25 @@ public enum WorldVersion {
   MINECRAFT_1_21_7(EnumSet.of(ProtocolVersion.MINECRAFT_1_21_7)),
   MINECRAFT_1_21_9(EnumSet.of(ProtocolVersion.MINECRAFT_1_21_9));
 
-  private static final EnumMap<ProtocolVersion, WorldVersion> MC_VERSION_TO_ITEM_VERSIONS = new EnumMap<>(ProtocolVersion.class);
+  private static final EnumMap<ProtocolVersion, WorldVersion> VERSIONS_MAP = new EnumMap<>(ProtocolVersion.class);
 
-  private final Set<ProtocolVersion> versions;
+  private final EnumSet<ProtocolVersion> versions;
 
-  WorldVersion(Set<ProtocolVersion> versions) {
+  WorldVersion(EnumSet<ProtocolVersion> versions) {
     this.versions = versions;
   }
 
-  public Set<ProtocolVersion> getVersions() {
+  public EnumSet<ProtocolVersion> getVersions() {
     return this.versions;
   }
 
   static {
     for (WorldVersion version : WorldVersion.values()) {
-      for (ProtocolVersion protocolVersion : version.getVersions()) {
-        WorldVersion.MC_VERSION_TO_ITEM_VERSIONS.put(protocolVersion, version);
-      }
+      version.getVersions().forEach(protocolVersion -> WorldVersion.VERSIONS_MAP.put(protocolVersion, version));
     }
   }
 
   public static WorldVersion from(ProtocolVersion protocolVersion) {
-    return WorldVersion.MC_VERSION_TO_ITEM_VERSIONS.get(protocolVersion);
+    return Objects.requireNonNull(WorldVersion.VERSIONS_MAP.get(protocolVersion));
   }
 }

api/src/main/java/net/elytrium/limboapi/api/world/chunk/blockentity/BlockEntityVersion.java

@@ -10,7 +10,7 @@
 import com.velocitypowered.api.network.ProtocolVersion;
 import java.util.EnumMap;
 import java.util.EnumSet;
-import java.util.Set;
+import java.util.Objects;
 
 public enum BlockEntityVersion {
 
@@ -24,35 +24,33 @@ public enum BlockEntityVersion {
   MINECRAFT_1_17(EnumSet.range(ProtocolVersion.MINECRAFT_1_17, ProtocolVersion.MINECRAFT_1_18_2)),
   MINECRAFT_1_19(EnumSet.range(ProtocolVersion.MINECRAFT_1_19, ProtocolVersion.MINECRAFT_1_19_1)),
   MINECRAFT_1_19_3(EnumSet.of(ProtocolVersion.MINECRAFT_1_19_3)),
-  MINECRAFT_1_19_4(EnumSet.range(ProtocolVersion.MINECRAFT_1_19_4, ProtocolVersion.MINECRAFT_1_20)),
+  MINECRAFT_1_19_4(EnumSet.of(ProtocolVersion.MINECRAFT_1_19_4)),
   MINECRAFT_1_20(EnumSet.range(ProtocolVersion.MINECRAFT_1_20, ProtocolVersion.MINECRAFT_1_20_2)),
   MINECRAFT_1_20_3(EnumSet.of(ProtocolVersion.MINECRAFT_1_20_3)),
   MINECRAFT_1_20_5(EnumSet.range(ProtocolVersion.MINECRAFT_1_20_5, ProtocolVersion.MINECRAFT_1_21)),
   MINECRAFT_1_21_2(EnumSet.range(ProtocolVersion.MINECRAFT_1_21_2, ProtocolVersion.MINECRAFT_1_21_4)),
   MINECRAFT_1_21_5(EnumSet.range(ProtocolVersion.MINECRAFT_1_21_5, ProtocolVersion.MINECRAFT_1_21_7)),
   MINECRAFT_1_21_9(EnumSet.range(ProtocolVersion.MINECRAFT_1_21_9, ProtocolVersion.MAXIMUM_VERSION));
 
-  private static final EnumMap<ProtocolVersion, BlockEntityVersion> MC_VERSION_TO_ITEM_VERSIONS = new EnumMap<>(ProtocolVersion.class);
+  private static final EnumMap<ProtocolVersion, BlockEntityVersion> VERSIONS_MAP = new EnumMap<>(ProtocolVersion.class);
 
-  private final Set<ProtocolVersion> versions;
+  private final EnumSet<ProtocolVersion> versions;
 
-  BlockEntityVersion(Set<ProtocolVersion> versions) {
+  BlockEntityVersion(EnumSet<ProtocolVersion> versions) {
     this.versions = versions;
   }
 
-  public Set<ProtocolVersion> getVersions() {
+  public EnumSet<ProtocolVersion> getVersions() {
     return this.versions;
   }
 
   static {
     for (BlockEntityVersion version : BlockEntityVersion.values()) {
-      for (ProtocolVersion protocolVersion : version.getVersions()) {
-        BlockEntityVersion.MC_VERSION_TO_ITEM_VERSIONS.put(protocolVersion, version);
-      }
+      version.getVersions().forEach(protocolVersion -> BlockEntityVersion.VERSIONS_MAP.put(protocolVersion, version));
     }
   }
 
   public static BlockEntityVersion from(ProtocolVersion protocolVersion) {
-    return BlockEntityVersion.MC_VERSION_TO_ITEM_VERSIONS.get(protocolVersion);
+    return Objects.requireNonNull(BlockEntityVersion.VERSIONS_MAP.get(protocolVersion));
   }
 }

api/src/main/java/net/elytrium/limboapi/api/world/item/Item.java

@@ -346,10 +346,10 @@ public enum Item {
   RECORD_11(2266),
   RECORD_WAIT(2267);
 
-  private final int id;
+  private final short id;
 
   Item(int id) {
-    this.id = id;
+    this.id = (short) id;
   }
 
   @Deprecated(forRemoval = true)
@@ -362,7 +362,7 @@ public int getLegacyID() {
     return this.id;
   }
 
-  public int getLegacyId() {
+  public short getLegacyId() {
     return this.id;
   }
 }