Move nms implementation to dedicated package

nms/all/pom.xml

@@ -5,12 +5,12 @@
     <parent>
         <artifactId>shopchest-nms</artifactId>
         <groupId>de.epiceric</groupId>
-        <version>1.1.0</version>
+        <version>1.1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>shopchest-nms-all</artifactId>
-    <version>1.1.0</version>
+    <version>1.1.1-SNAPSHOT</version>
 
     <packaging>pom</packaging>
 

nms/interface/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>shopchest-nms</artifactId>
         <groupId>de.epiceric</groupId>
-        <version>1.1.0</version>
+        <version>1.1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

nms/interface/src/main/java/de/epiceric/shopchest/nms/Platform.java

@@ -1,6 +1,9 @@
 package de.epiceric.shopchest.nms;
 
-import de.epiceric.shopchest.nms.metadata.MetadataProperties;
+import de.epiceric.shopchest.nms.network.entity.FakeArmorStand;
+import de.epiceric.shopchest.nms.network.entity.FakeItem;
+import de.epiceric.shopchest.nms.network.entity.metadata.MetadataProperties;
+import de.epiceric.shopchest.nms.network.PacketQueue;
 
 /**
  * The platform that create all nms objects
@@ -32,7 +35,7 @@ public interface Platform {
     TextComponentHelper getTextComponentHelper();
 
     /**
-     * Get a list of {@link de.epiceric.shopchest.nms.metadata.MetadataProperty}
+     * Get a list of {@link de.epiceric.shopchest.nms.network.entity.metadata.MetadataProperty}
      *
      * @return The {@link MetadataProperties} instance
      */

nms/interface/src/main/java/de/epiceric/shopchest/nms/metadata/MetadataValue.java

@@ -1,5 +0,0 @@
-package de.epiceric.shopchest.nms.metadata;
-
-public interface MetadataValue {
-
-}

nms/interface/src/main/java/de/epiceric/shopchest/nms/network/PacketQueue.java

@@ -1,4 +1,4 @@
-package de.epiceric.shopchest.nms;
+package de.epiceric.shopchest.nms.network;
 
 import org.bukkit.entity.Player;
 

nms/interface/src/main/java/de/epiceric/shopchest/nms/network/entity/FakeArmorStand.java

@@ -1,4 +1,4 @@
-package de.epiceric.shopchest.nms;
+package de.epiceric.shopchest.nms.network.entity;
 
 /**
  * Represent an ArmorStand that only exists clientside

nms/interface/src/main/java/de/epiceric/shopchest/nms/network/entity/FakeEntity.java

@@ -1,6 +1,7 @@
-package de.epiceric.shopchest.nms;
+package de.epiceric.shopchest.nms.network.entity;
 
-import de.epiceric.shopchest.nms.metadata.MetadataValue;
+import de.epiceric.shopchest.nms.network.entity.metadata.MetadataValue;
+import de.epiceric.shopchest.nms.network.PacketQueue;
 import org.bukkit.Location;
 import org.bukkit.util.Vector;
 

nms/interface/src/main/java/de/epiceric/shopchest/nms/network/entity/FakeItem.java

@@ -1,4 +1,4 @@
-package de.epiceric.shopchest.nms;
+package de.epiceric.shopchest.nms.network.entity;
 
 /**
  * Represent an Item entity that only exists clientside

nms/interface/src/main/java/de/epiceric/shopchest/nms/network/entity/metadata/MetadataProperties.java

@@ -1,4 +1,4 @@
-package de.epiceric.shopchest.nms.metadata;
+package de.epiceric.shopchest.nms.network.entity.metadata;
 
 import de.epiceric.shopchest.nms.NMSComponent;
 import org.bukkit.inventory.ItemStack;

nms/interface/src/main/java/de/epiceric/shopchest/nms/network/entity/metadata/MetadataProperty.java

@@ -1,4 +1,4 @@
-package de.epiceric.shopchest.nms.metadata;
+package de.epiceric.shopchest.nms.network.entity.metadata;
 
 public interface MetadataProperty<T> {
 

nms/interface/src/main/java/de/epiceric/shopchest/nms/network/entity/metadata/MetadataValue.java

@@ -0,0 +1,5 @@
+package de.epiceric.shopchest.nms.network.entity.metadata;
+
+public interface MetadataValue {
+
+}

nms/pom.xml

@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>shopchest-nms</artifactId>
-    <version>1.1.0</version>
+    <version>1.1.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <modules>

nms/reflection/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>shopchest-nms</artifactId>
         <groupId>de.epiceric</groupId>
-        <version>1.1.0</version>
+        <version>1.1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

nms/reflection/src/main/java/de/epiceric/shopchest/nms/reflection/FakeArmorStandImpl.java

@@ -1,7 +1,7 @@
 package de.epiceric.shopchest.nms.reflection;
 
 import de.epiceric.shopchest.debug.DebugLogger;
-import de.epiceric.shopchest.nms.FakeArmorStand;
+import de.epiceric.shopchest.nms.network.entity.FakeArmorStand;
 
 public class FakeArmorStandImpl extends FakeEntityImpl implements FakeArmorStand {
 

nms/reflection/src/main/java/de/epiceric/shopchest/nms/reflection/FakeEntityImpl.java

@@ -1,13 +1,11 @@
 package de.epiceric.shopchest.nms.reflection;
 
 import de.epiceric.shopchest.debug.DebugLogger;
-import de.epiceric.shopchest.nms.FakeEntity;
+import de.epiceric.shopchest.nms.network.entity.FakeEntity;
-import de.epiceric.shopchest.nms.PacketQueue;
+import de.epiceric.shopchest.nms.network.PacketQueue;
-import de.epiceric.shopchest.nms.metadata.MetadataValue;
+import de.epiceric.shopchest.nms.network.entity.metadata.MetadataValue;
 import org.bukkit.Location;
-import org.bukkit.entity.Player;
 import org.bukkit.util.Vector;
-import org.inventivetalent.reflection.resolver.minecraft.NMSClassResolver;
 
 import java.util.UUID;
 

nms/reflection/src/main/java/de/epiceric/shopchest/nms/reflection/FakeItemImpl.java

@@ -1,14 +1,7 @@
 package de.epiceric.shopchest.nms.reflection;
 
 import de.epiceric.shopchest.debug.DebugLogger;
-import de.epiceric.shopchest.nms.FakeItem;
+import de.epiceric.shopchest.nms.network.entity.FakeItem;
-import org.bukkit.Location;
-import org.bukkit.entity.EntityType;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.ItemStack;
-import org.inventivetalent.reflection.resolver.minecraft.OBCClassResolver;
-
-import java.util.UUID;
 
 public class FakeItemImpl extends FakeEntityImpl implements FakeItem {
 

nms/reflection/src/main/java/de/epiceric/shopchest/nms/reflection/PacketQueueImpl.java

@@ -1,6 +1,6 @@
 package de.epiceric.shopchest.nms.reflection;
 
-import de.epiceric.shopchest.nms.PacketQueue;
+import de.epiceric.shopchest.nms.network.PacketQueue;
 import org.bukkit.entity.Player;
 
 import java.util.LinkedList;

nms/reflection/src/main/java/de/epiceric/shopchest/nms/reflection/PlatformImpl.java

@@ -2,7 +2,10 @@ package de.epiceric.shopchest.nms.reflection;
 
 import de.epiceric.shopchest.debug.DebugLogger;
 import de.epiceric.shopchest.nms.*;
-import de.epiceric.shopchest.nms.metadata.MetadataProperties;
+import de.epiceric.shopchest.nms.network.entity.FakeArmorStand;
+import de.epiceric.shopchest.nms.network.entity.FakeItem;
+import de.epiceric.shopchest.nms.network.entity.metadata.MetadataProperties;
+import de.epiceric.shopchest.nms.network.PacketQueue;
 
 public class PlatformImpl implements Platform {
 

nms/v1_17_R1/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>shopchest-nms</artifactId>
         <groupId>de.epiceric</groupId>
-        <version>1.1.0</version>
+        <version>1.1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

nms/v1_17_R1/src/main/java/de/epiceric/shopchest/nms/v1_17_R1/PlatformImpl.java

@@ -1,8 +1,14 @@
 package de.epiceric.shopchest.nms.v1_17_R1;
 
 import de.epiceric.shopchest.nms.*;
-import de.epiceric.shopchest.nms.metadata.MetadataProperties;
+import de.epiceric.shopchest.nms.network.entity.FakeArmorStand;
-import de.epiceric.shopchest.nms.v1_17_R1.metadata.MetadataPropertiesImpl;
+import de.epiceric.shopchest.nms.network.entity.FakeItem;
+import de.epiceric.shopchest.nms.network.entity.metadata.MetadataProperties;
+import de.epiceric.shopchest.nms.network.PacketQueue;
+import de.epiceric.shopchest.nms.v1_17_R1.network.entity.FakeArmorStandImpl;
+import de.epiceric.shopchest.nms.v1_17_R1.network.entity.FakeItemImpl;
+import de.epiceric.shopchest.nms.v1_17_R1.network.entity.metadata.MetadataPropertiesImpl;
+import de.epiceric.shopchest.nms.v1_17_R1.network.PacketQueueImpl;
 
 public class PlatformImpl implements Platform {
 

nms/v1_17_R1/src/main/java/de/epiceric/shopchest/nms/v1_17_R1/network/PacketQueueImpl.java

@@ -1,6 +1,6 @@
-package de.epiceric.shopchest.nms.v1_17_R1;
+package de.epiceric.shopchest.nms.v1_17_R1.network;
 
-import de.epiceric.shopchest.nms.PacketQueue;
+import de.epiceric.shopchest.nms.network.PacketQueue;
 import net.minecraft.network.protocol.Packet;
 import net.minecraft.server.network.ServerPlayerConnection;
 import org.bukkit.craftbukkit.v1_17_R1.entity.CraftPlayer;

nms/v1_17_R1/src/main/java/de/epiceric/shopchest/nms/v1_17_R1/network/entity/FakeArmorStandImpl.java

@@ -1,6 +1,6 @@
-package de.epiceric.shopchest.nms.v1_18_R1;
+package de.epiceric.shopchest.nms.v1_17_R1.network.entity;
 
-import de.epiceric.shopchest.nms.FakeArmorStand;
+import de.epiceric.shopchest.nms.network.entity.FakeArmorStand;
 import net.minecraft.world.entity.EntityType;
 
 public class FakeArmorStandImpl extends FakeEntityImpl implements FakeArmorStand {

nms/v1_17_R1/src/main/java/de/epiceric/shopchest/nms/v1_17_R1/network/entity/FakeEntityImpl.java

@@ -1,10 +1,11 @@
-package de.epiceric.shopchest.nms.v1_17_R1;
+package de.epiceric.shopchest.nms.v1_17_R1.network.entity;
 
-import de.epiceric.shopchest.nms.FakeEntity;
+import de.epiceric.shopchest.nms.network.entity.FakeEntity;
-import de.epiceric.shopchest.nms.PacketQueue;
+import de.epiceric.shopchest.nms.network.PacketQueue;
 import de.epiceric.shopchest.nms.ReflectionUtils;
-import de.epiceric.shopchest.nms.metadata.MetadataValue;
+import de.epiceric.shopchest.nms.network.entity.metadata.MetadataValue;
-import de.epiceric.shopchest.nms.v1_17_R1.metadata.ExplicitMetadataValue;
+import de.epiceric.shopchest.nms.v1_17_R1.network.entity.metadata.ExplicitMetadataValue;
+import de.epiceric.shopchest.nms.v1_17_R1.network.PacketQueueImpl;
 import io.netty.buffer.Unpooled;
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.network.protocol.game.*;

nms/v1_17_R1/src/main/java/de/epiceric/shopchest/nms/v1_17_R1/network/entity/FakeItemImpl.java

@@ -1,6 +1,6 @@
-package de.epiceric.shopchest.nms.v1_17_R1;
+package de.epiceric.shopchest.nms.v1_17_R1.network.entity;
 
-import de.epiceric.shopchest.nms.FakeItem;
+import de.epiceric.shopchest.nms.network.entity.FakeItem;
 import net.minecraft.world.entity.EntityType;
 
 public class FakeItemImpl extends FakeEntityImpl implements FakeItem {

nms/v1_17_R1/src/main/java/de/epiceric/shopchest/nms/v1_17_R1/network/entity/metadata/ArmorStandMetadataProperties.java

@@ -1,7 +1,7 @@
-package de.epiceric.shopchest.nms.v1_18_R1.metadata;
+package de.epiceric.shopchest.nms.v1_17_R1.network.entity.metadata;
 
-import de.epiceric.shopchest.nms.metadata.MetadataProperties;
+import de.epiceric.shopchest.nms.network.entity.metadata.MetadataProperties;
-import de.epiceric.shopchest.nms.metadata.MetadataProperty;
+import de.epiceric.shopchest.nms.network.entity.metadata.MetadataProperty;
 import net.minecraft.network.syncher.SynchedEntityData;
 import net.minecraft.world.entity.decoration.ArmorStand;
 

nms/v1_17_R1/src/main/java/de/epiceric/shopchest/nms/v1_17_R1/network/entity/metadata/EntityMetadataProperties.java

@@ -1,9 +1,9 @@
-package de.epiceric.shopchest.nms.v1_17_R1.metadata;
+package de.epiceric.shopchest.nms.v1_17_R1.network.entity.metadata;
 
 import de.epiceric.shopchest.nms.NMSComponent;
 import de.epiceric.shopchest.nms.ReflectionUtils;
-import de.epiceric.shopchest.nms.metadata.MetadataProperties;
+import de.epiceric.shopchest.nms.network.entity.metadata.MetadataProperties;
-import de.epiceric.shopchest.nms.metadata.MetadataProperty;
+import de.epiceric.shopchest.nms.network.entity.metadata.MetadataProperty;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.syncher.EntityDataAccessor;
 import net.minecraft.network.syncher.SynchedEntityData;

nms/v1_17_R1/src/main/java/de/epiceric/shopchest/nms/v1_17_R1/network/entity/metadata/ExplicitMetadataValue.java

@@ -1,6 +1,6 @@
-package de.epiceric.shopchest.nms.v1_18_R1.metadata;
+package de.epiceric.shopchest.nms.v1_17_R1.network.entity.metadata;
 
-import de.epiceric.shopchest.nms.metadata.MetadataValue;
+import de.epiceric.shopchest.nms.network.entity.metadata.MetadataValue;
 import net.minecraft.network.syncher.SynchedEntityData;
 
 public interface ExplicitMetadataValue extends MetadataValue {

nms/v1_17_R1/src/main/java/de/epiceric/shopchest/nms/v1_17_R1/network/entity/metadata/ItemMetadataProperties.java

@@ -1,8 +1,8 @@
-package de.epiceric.shopchest.nms.v1_17_R1.metadata;
+package de.epiceric.shopchest.nms.v1_17_R1.network.entity.metadata;
 
 import de.epiceric.shopchest.nms.ReflectionUtils;
-import de.epiceric.shopchest.nms.metadata.MetadataProperties;
+import de.epiceric.shopchest.nms.network.entity.metadata.MetadataProperties;
-import de.epiceric.shopchest.nms.metadata.MetadataProperty;
+import de.epiceric.shopchest.nms.network.entity.metadata.MetadataProperty;
 import net.minecraft.network.syncher.EntityDataAccessor;
 import net.minecraft.network.syncher.SynchedEntityData;
 import net.minecraft.world.entity.item.ItemEntity;

nms/v1_17_R1/src/main/java/de/epiceric/shopchest/nms/v1_17_R1/network/entity/metadata/MetadataPropertiesImpl.java

@@ -1,6 +1,6 @@
-package de.epiceric.shopchest.nms.v1_17_R2.metadata;
+package de.epiceric.shopchest.nms.v1_17_R1.network.entity.metadata;
 
-import de.epiceric.shopchest.nms.metadata.MetadataProperties;
+import de.epiceric.shopchest.nms.network.entity.metadata.MetadataProperties;
 
 public class MetadataPropertiesImpl implements MetadataProperties {
 

nms/v1_17_R2/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>shopchest-nms</artifactId>
         <groupId>de.epiceric</groupId>
-        <version>1.1.0</version>
+        <version>1.1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

nms/v1_17_R2/src/main/java/de/epiceric/shopchest/nms/v1_17_R2/PlatformImpl.java

@@ -1,8 +1,14 @@
 package de.epiceric.shopchest.nms.v1_17_R2;
 
 import de.epiceric.shopchest.nms.*;
-import de.epiceric.shopchest.nms.metadata.MetadataProperties;
+import de.epiceric.shopchest.nms.network.entity.FakeArmorStand;
-import de.epiceric.shopchest.nms.v1_17_R2.metadata.MetadataPropertiesImpl;
+import de.epiceric.shopchest.nms.network.entity.FakeItem;
+import de.epiceric.shopchest.nms.network.entity.metadata.MetadataProperties;
+import de.epiceric.shopchest.nms.network.PacketQueue;
+import de.epiceric.shopchest.nms.v1_17_R2.network.entity.FakeArmorStandImpl;
+import de.epiceric.shopchest.nms.v1_17_R2.network.entity.FakeItemImpl;
+import de.epiceric.shopchest.nms.v1_17_R2.network.entity.metadata.MetadataPropertiesImpl;
+import de.epiceric.shopchest.nms.v1_17_R2.network.PacketQueueImpl;
 
 public class PlatformImpl implements Platform {
 

nms/v1_17_R2/src/main/java/de/epiceric/shopchest/nms/v1_17_R2/network/PacketQueueImpl.java

@@ -1,6 +1,6 @@
-package de.epiceric.shopchest.nms.v1_17_R2;
+package de.epiceric.shopchest.nms.v1_17_R2.network;
 
-import de.epiceric.shopchest.nms.PacketQueue;
+import de.epiceric.shopchest.nms.network.PacketQueue;
 import net.minecraft.network.protocol.Packet;
 import net.minecraft.server.network.ServerPlayerConnection;
 import org.bukkit.craftbukkit.v1_17_R1.entity.CraftPlayer;

nms/v1_17_R2/src/main/java/de/epiceric/shopchest/nms/v1_17_R2/network/entity/FakeArmorStandImpl.java

@@ -1,6 +1,6 @@
-package de.epiceric.shopchest.nms.v1_17_R2;
+package de.epiceric.shopchest.nms.v1_17_R2.network.entity;
 
-import de.epiceric.shopchest.nms.FakeArmorStand;
+import de.epiceric.shopchest.nms.network.entity.FakeArmorStand;
 import net.minecraft.world.entity.EntityType;
 
 public class FakeArmorStandImpl extends FakeEntityImpl implements FakeArmorStand {

nms/v1_17_R2/src/main/java/de/epiceric/shopchest/nms/v1_17_R2/network/entity/FakeEntityImpl.java

@@ -1,10 +1,11 @@
-package de.epiceric.shopchest.nms.v1_18_R1;
+package de.epiceric.shopchest.nms.v1_17_R2.network.entity;
 
-import de.epiceric.shopchest.nms.FakeEntity;
+import de.epiceric.shopchest.nms.network.entity.FakeEntity;
-import de.epiceric.shopchest.nms.PacketQueue;
+import de.epiceric.shopchest.nms.network.PacketQueue;
 import de.epiceric.shopchest.nms.ReflectionUtils;
-import de.epiceric.shopchest.nms.metadata.MetadataValue;
+import de.epiceric.shopchest.nms.network.entity.metadata.MetadataValue;
-import de.epiceric.shopchest.nms.v1_18_R1.metadata.ExplicitMetadataValue;
+import de.epiceric.shopchest.nms.v1_17_R2.network.entity.metadata.ExplicitMetadataValue;
+import de.epiceric.shopchest.nms.v1_17_R2.network.PacketQueueImpl;
 import io.netty.buffer.Unpooled;
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.network.protocol.game.*;

nms/v1_17_R2/src/main/java/de/epiceric/shopchest/nms/v1_17_R2/network/entity/FakeItemImpl.java

@@ -1,6 +1,6 @@
-package de.epiceric.shopchest.nms.v1_18_R1;
+package de.epiceric.shopchest.nms.v1_17_R2.network.entity;
 
-import de.epiceric.shopchest.nms.FakeItem;
+import de.epiceric.shopchest.nms.network.entity.FakeItem;
 import net.minecraft.world.entity.EntityType;
 
 public class FakeItemImpl extends FakeEntityImpl implements FakeItem {

nms/v1_17_R2/src/main/java/de/epiceric/shopchest/nms/v1_17_R2/network/entity/metadata/ArmorStandMetadataProperties.java

@@ -1,7 +1,7 @@
-package de.epiceric.shopchest.nms.v1_18_R2.metadata;
+package de.epiceric.shopchest.nms.v1_17_R2.network.entity.metadata;
 
-import de.epiceric.shopchest.nms.metadata.MetadataProperties;
+import de.epiceric.shopchest.nms.network.entity.metadata.MetadataProperties;
-import de.epiceric.shopchest.nms.metadata.MetadataProperty;
+import de.epiceric.shopchest.nms.network.entity.metadata.MetadataProperty;
 import net.minecraft.network.syncher.SynchedEntityData;
 import net.minecraft.world.entity.decoration.ArmorStand;
 

nms/v1_17_R2/src/main/java/de/epiceric/shopchest/nms/v1_17_R2/network/entity/metadata/EntityMetadataProperties.java

@@ -1,9 +1,9 @@
-package de.epiceric.shopchest.nms.v1_17_R2.metadata;
+package de.epiceric.shopchest.nms.v1_17_R2.network.entity.metadata;
 
 import de.epiceric.shopchest.nms.NMSComponent;
 import de.epiceric.shopchest.nms.ReflectionUtils;
-import de.epiceric.shopchest.nms.metadata.MetadataProperties;
+import de.epiceric.shopchest.nms.network.entity.metadata.MetadataProperties;
-import de.epiceric.shopchest.nms.metadata.MetadataProperty;
+import de.epiceric.shopchest.nms.network.entity.metadata.MetadataProperty;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.syncher.EntityDataAccessor;
 import net.minecraft.network.syncher.SynchedEntityData;

nms/v1_17_R2/src/main/java/de/epiceric/shopchest/nms/v1_17_R2/network/entity/metadata/ExplicitMetadataValue.java

@@ -1,6 +1,6 @@
-package de.epiceric.shopchest.nms.v1_18_R2.metadata;
+package de.epiceric.shopchest.nms.v1_17_R2.network.entity.metadata;
 
-import de.epiceric.shopchest.nms.metadata.MetadataValue;
+import de.epiceric.shopchest.nms.network.entity.metadata.MetadataValue;
 import net.minecraft.network.syncher.SynchedEntityData;
 
 public interface ExplicitMetadataValue extends MetadataValue {

nms/v1_17_R2/src/main/java/de/epiceric/shopchest/nms/v1_17_R2/network/entity/metadata/ItemMetadataProperties.java

@@ -1,8 +1,8 @@
-package de.epiceric.shopchest.nms.v1_17_R2.metadata;
+package de.epiceric.shopchest.nms.v1_17_R2.network.entity.metadata;
 
 import de.epiceric.shopchest.nms.ReflectionUtils;
-import de.epiceric.shopchest.nms.metadata.MetadataProperties;
+import de.epiceric.shopchest.nms.network.entity.metadata.MetadataProperties;
-import de.epiceric.shopchest.nms.metadata.MetadataProperty;
+import de.epiceric.shopchest.nms.network.entity.metadata.MetadataProperty;
 import net.minecraft.network.syncher.EntityDataAccessor;
 import net.minecraft.network.syncher.SynchedEntityData;
 import net.minecraft.world.entity.item.ItemEntity;

nms/v1_17_R2/src/main/java/de/epiceric/shopchest/nms/v1_17_R2/network/entity/metadata/MetadataPropertiesImpl.java

@@ -1,6 +1,6 @@
-package de.epiceric.shopchest.nms.v1_18_R1.metadata;
+package de.epiceric.shopchest.nms.v1_17_R2.network.entity.metadata;
 
-import de.epiceric.shopchest.nms.metadata.MetadataProperties;
+import de.epiceric.shopchest.nms.network.entity.metadata.MetadataProperties;
 
 public class MetadataPropertiesImpl implements MetadataProperties {
 

nms/v1_18_R1/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>shopchest-nms</artifactId>
         <groupId>de.epiceric</groupId>
-        <version>1.1.0</version>
+        <version>1.1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

nms/v1_18_R1/src/main/java/de/epiceric/shopchest/nms/v1_18_R1/PlatformImpl.java

@@ -1,8 +1,14 @@
 package de.epiceric.shopchest.nms.v1_18_R1;
 
 import de.epiceric.shopchest.nms.*;
-import de.epiceric.shopchest.nms.metadata.MetadataProperties;
+import de.epiceric.shopchest.nms.network.entity.FakeArmorStand;
-import de.epiceric.shopchest.nms.v1_18_R1.metadata.MetadataPropertiesImpl;
+import de.epiceric.shopchest.nms.network.entity.FakeItem;
+import de.epiceric.shopchest.nms.network.entity.metadata.MetadataProperties;
+import de.epiceric.shopchest.nms.network.PacketQueue;
+import de.epiceric.shopchest.nms.v1_18_R1.network.entity.FakeArmorStandImpl;
+import de.epiceric.shopchest.nms.v1_18_R1.network.entity.FakeItemImpl;
+import de.epiceric.shopchest.nms.v1_18_R1.network.entity.metadata.MetadataPropertiesImpl;
+import de.epiceric.shopchest.nms.v1_18_R1.network.PacketQueueImpl;
 
 public class PlatformImpl implements Platform {
 

nms/v1_18_R1/src/main/java/de/epiceric/shopchest/nms/v1_18_R1/network/PacketQueueImpl.java

@@ -1,6 +1,6 @@
-package de.epiceric.shopchest.nms.v1_18_R1;
+package de.epiceric.shopchest.nms.v1_18_R1.network;
 
-import de.epiceric.shopchest.nms.PacketQueue;
+import de.epiceric.shopchest.nms.network.PacketQueue;
 import net.minecraft.network.protocol.Packet;
 import net.minecraft.server.network.ServerPlayerConnection;
 import org.bukkit.craftbukkit.v1_18_R1.entity.CraftPlayer;

nms/v1_18_R1/src/main/java/de/epiceric/shopchest/nms/v1_18_R1/network/entity/FakeArmorStandImpl.java

@@ -1,6 +1,6 @@
-package de.epiceric.shopchest.nms.v1_18_R2;
+package de.epiceric.shopchest.nms.v1_18_R1.network.entity;
 
-import de.epiceric.shopchest.nms.FakeArmorStand;
+import de.epiceric.shopchest.nms.network.entity.FakeArmorStand;
 import net.minecraft.world.entity.EntityType;
 
 public class FakeArmorStandImpl extends FakeEntityImpl implements FakeArmorStand {

nms/v1_18_R1/src/main/java/de/epiceric/shopchest/nms/v1_18_R1/network/entity/FakeEntityImpl.java

@@ -1,10 +1,11 @@
-package de.epiceric.shopchest.nms.v1_17_R2;
+package de.epiceric.shopchest.nms.v1_18_R1.network.entity;
 
-import de.epiceric.shopchest.nms.FakeEntity;
+import de.epiceric.shopchest.nms.network.entity.FakeEntity;
-import de.epiceric.shopchest.nms.PacketQueue;
+import de.epiceric.shopchest.nms.network.PacketQueue;
 import de.epiceric.shopchest.nms.ReflectionUtils;
-import de.epiceric.shopchest.nms.metadata.MetadataValue;
+import de.epiceric.shopchest.nms.network.entity.metadata.MetadataValue;
-import de.epiceric.shopchest.nms.v1_17_R2.metadata.ExplicitMetadataValue;
+import de.epiceric.shopchest.nms.v1_18_R1.network.entity.metadata.ExplicitMetadataValue;
+import de.epiceric.shopchest.nms.v1_18_R1.network.PacketQueueImpl;
 import io.netty.buffer.Unpooled;
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.network.protocol.game.*;

nms/v1_18_R1/src/main/java/de/epiceric/shopchest/nms/v1_18_R1/network/entity/FakeItemImpl.java

@@ -1,6 +1,6 @@
-package de.epiceric.shopchest.nms.v1_17_R2;
+package de.epiceric.shopchest.nms.v1_18_R1.network.entity;
 
-import de.epiceric.shopchest.nms.FakeItem;
+import de.epiceric.shopchest.nms.network.entity.FakeItem;
 import net.minecraft.world.entity.EntityType;
 
 public class FakeItemImpl extends FakeEntityImpl implements FakeItem {

nms/v1_18_R1/src/main/java/de/epiceric/shopchest/nms/v1_18_R1/network/entity/metadata/ArmorStandMetadataProperties.java

@@ -1,7 +1,7 @@
-package de.epiceric.shopchest.nms.v1_17_R1.metadata;
+package de.epiceric.shopchest.nms.v1_18_R1.network.entity.metadata;
 
-import de.epiceric.shopchest.nms.metadata.MetadataProperties;
+import de.epiceric.shopchest.nms.network.entity.metadata.MetadataProperties;
-import de.epiceric.shopchest.nms.metadata.MetadataProperty;
+import de.epiceric.shopchest.nms.network.entity.metadata.MetadataProperty;
 import net.minecraft.network.syncher.SynchedEntityData;
 import net.minecraft.world.entity.decoration.ArmorStand;
 

nms/v1_18_R1/src/main/java/de/epiceric/shopchest/nms/v1_18_R1/network/entity/metadata/EntityMetadataProperties.java

@@ -1,9 +1,9 @@
-package de.epiceric.shopchest.nms.v1_18_R1.metadata;
+package de.epiceric.shopchest.nms.v1_18_R1.network.entity.metadata;
 
 import de.epiceric.shopchest.nms.NMSComponent;
 import de.epiceric.shopchest.nms.ReflectionUtils;
-import de.epiceric.shopchest.nms.metadata.MetadataProperties;
+import de.epiceric.shopchest.nms.network.entity.metadata.MetadataProperties;
-import de.epiceric.shopchest.nms.metadata.MetadataProperty;
+import de.epiceric.shopchest.nms.network.entity.metadata.MetadataProperty;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.syncher.EntityDataAccessor;
 import net.minecraft.network.syncher.SynchedEntityData;

nms/v1_18_R1/src/main/java/de/epiceric/shopchest/nms/v1_18_R1/network/entity/metadata/ExplicitMetadataValue.java

@@ -1,6 +1,6 @@
-package de.epiceric.shopchest.nms.v1_17_R1.metadata;
+package de.epiceric.shopchest.nms.v1_18_R1.network.entity.metadata;
 
-import de.epiceric.shopchest.nms.metadata.MetadataValue;
+import de.epiceric.shopchest.nms.network.entity.metadata.MetadataValue;
 import net.minecraft.network.syncher.SynchedEntityData;
 
 public interface ExplicitMetadataValue extends MetadataValue {

nms/v1_18_R1/src/main/java/de/epiceric/shopchest/nms/v1_18_R1/network/entity/metadata/ItemMetadataProperties.java

@@ -1,8 +1,8 @@
-package de.epiceric.shopchest.nms.v1_18_R1.metadata;
+package de.epiceric.shopchest.nms.v1_18_R1.network.entity.metadata;
 
 import de.epiceric.shopchest.nms.ReflectionUtils;
-import de.epiceric.shopchest.nms.metadata.MetadataProperties;
+import de.epiceric.shopchest.nms.network.entity.metadata.MetadataProperties;
-import de.epiceric.shopchest.nms.metadata.MetadataProperty;
+import de.epiceric.shopchest.nms.network.entity.metadata.MetadataProperty;
 import net.minecraft.network.syncher.EntityDataAccessor;
 import net.minecraft.network.syncher.SynchedEntityData;
 import net.minecraft.world.entity.item.ItemEntity;

nms/v1_18_R1/src/main/java/de/epiceric/shopchest/nms/v1_18_R1/network/entity/metadata/MetadataPropertiesImpl.java

@@ -1,6 +1,6 @@
-package de.epiceric.shopchest.nms.v1_17_R1.metadata;
+package de.epiceric.shopchest.nms.v1_18_R1.network.entity.metadata;
 
-import de.epiceric.shopchest.nms.metadata.MetadataProperties;
+import de.epiceric.shopchest.nms.network.entity.metadata.MetadataProperties;
 
 public class MetadataPropertiesImpl implements MetadataProperties {
 

nms/v1_18_R2/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>shopchest-nms</artifactId>
         <groupId>de.epiceric</groupId>
-        <version>1.1.0</version>
+        <version>1.1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

nms/v1_18_R2/src/main/java/de/epiceric/shopchest/nms/v1_18_R2/PlatformImpl.java

@@ -1,8 +1,14 @@
 package de.epiceric.shopchest.nms.v1_18_R2;
 
 import de.epiceric.shopchest.nms.*;
-import de.epiceric.shopchest.nms.metadata.MetadataProperties;
+import de.epiceric.shopchest.nms.network.entity.FakeArmorStand;
-import de.epiceric.shopchest.nms.v1_18_R2.metadata.MetadataPropertiesImpl;
+import de.epiceric.shopchest.nms.network.entity.FakeItem;
+import de.epiceric.shopchest.nms.network.entity.metadata.MetadataProperties;
+import de.epiceric.shopchest.nms.network.PacketQueue;
+import de.epiceric.shopchest.nms.v1_18_R2.network.entity.FakeArmorStandImpl;
+import de.epiceric.shopchest.nms.v1_18_R2.network.entity.FakeItemImpl;
+import de.epiceric.shopchest.nms.v1_18_R2.network.entity.metadata.MetadataPropertiesImpl;
+import de.epiceric.shopchest.nms.v1_18_R2.network.PacketQueueImpl;
 
 public class PlatformImpl implements Platform {
 

nms/v1_18_R2/src/main/java/de/epiceric/shopchest/nms/v1_18_R2/network/PacketQueueImpl.java

@@ -1,6 +1,6 @@
-package de.epiceric.shopchest.nms.v1_18_R2;
+package de.epiceric.shopchest.nms.v1_18_R2.network;
 
-import de.epiceric.shopchest.nms.PacketQueue;
+import de.epiceric.shopchest.nms.network.PacketQueue;
 import net.minecraft.network.protocol.Packet;
 import net.minecraft.server.network.ServerPlayerConnection;
 import org.bukkit.craftbukkit.v1_18_R2.entity.CraftPlayer;

nms/v1_18_R2/src/main/java/de/epiceric/shopchest/nms/v1_18_R2/network/entity/FakeArmorStandImpl.java

@@ -1,6 +1,6 @@
-package de.epiceric.shopchest.nms.v1_17_R1;
+package de.epiceric.shopchest.nms.v1_18_R2.network.entity;
 
-import de.epiceric.shopchest.nms.FakeArmorStand;
+import de.epiceric.shopchest.nms.network.entity.FakeArmorStand;
 import net.minecraft.world.entity.EntityType;
 
 public class FakeArmorStandImpl extends FakeEntityImpl implements FakeArmorStand {

nms/v1_18_R2/src/main/java/de/epiceric/shopchest/nms/v1_18_R2/network/entity/FakeEntityImpl.java

@@ -1,10 +1,11 @@
-package de.epiceric.shopchest.nms.v1_18_R2;
+package de.epiceric.shopchest.nms.v1_18_R2.network.entity;
 
-import de.epiceric.shopchest.nms.FakeEntity;
+import de.epiceric.shopchest.nms.network.entity.FakeEntity;
-import de.epiceric.shopchest.nms.PacketQueue;
+import de.epiceric.shopchest.nms.network.PacketQueue;
 import de.epiceric.shopchest.nms.ReflectionUtils;
-import de.epiceric.shopchest.nms.metadata.MetadataValue;
+import de.epiceric.shopchest.nms.network.entity.metadata.MetadataValue;
-import de.epiceric.shopchest.nms.v1_18_R2.metadata.ExplicitMetadataValue;
+import de.epiceric.shopchest.nms.v1_18_R2.network.entity.metadata.ExplicitMetadataValue;
+import de.epiceric.shopchest.nms.v1_18_R2.network.PacketQueueImpl;
 import io.netty.buffer.Unpooled;
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.network.protocol.game.*;

nms/v1_18_R2/src/main/java/de/epiceric/shopchest/nms/v1_18_R2/network/entity/FakeItemImpl.java

@@ -1,6 +1,6 @@
-package de.epiceric.shopchest.nms.v1_18_R2;
+package de.epiceric.shopchest.nms.v1_18_R2.network.entity;
 
-import de.epiceric.shopchest.nms.FakeItem;
+import de.epiceric.shopchest.nms.network.entity.FakeItem;
 import net.minecraft.world.entity.EntityType;
 
 public class FakeItemImpl extends FakeEntityImpl implements FakeItem {

nms/v1_18_R2/src/main/java/de/epiceric/shopchest/nms/v1_18_R2/network/entity/metadata/ArmorStandMetadataProperties.java

@@ -1,7 +1,7 @@
-package de.epiceric.shopchest.nms.v1_17_R2.metadata;
+package de.epiceric.shopchest.nms.v1_18_R2.network.entity.metadata;
 
-import de.epiceric.shopchest.nms.metadata.MetadataProperties;
+import de.epiceric.shopchest.nms.network.entity.metadata.MetadataProperties;
-import de.epiceric.shopchest.nms.metadata.MetadataProperty;
+import de.epiceric.shopchest.nms.network.entity.metadata.MetadataProperty;
 import net.minecraft.network.syncher.SynchedEntityData;
 import net.minecraft.world.entity.decoration.ArmorStand;
 

nms/v1_18_R2/src/main/java/de/epiceric/shopchest/nms/v1_18_R2/network/entity/metadata/EntityMetadataProperties.java

@@ -1,9 +1,9 @@
-package de.epiceric.shopchest.nms.v1_18_R2.metadata;
+package de.epiceric.shopchest.nms.v1_18_R2.network.entity.metadata;
 
 import de.epiceric.shopchest.nms.NMSComponent;
 import de.epiceric.shopchest.nms.ReflectionUtils;
-import de.epiceric.shopchest.nms.metadata.MetadataProperties;
+import de.epiceric.shopchest.nms.network.entity.metadata.MetadataProperties;
-import de.epiceric.shopchest.nms.metadata.MetadataProperty;
+import de.epiceric.shopchest.nms.network.entity.metadata.MetadataProperty;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.syncher.EntityDataAccessor;
 import net.minecraft.network.syncher.SynchedEntityData;

nms/v1_18_R2/src/main/java/de/epiceric/shopchest/nms/v1_18_R2/network/entity/metadata/ExplicitMetadataValue.java

@@ -1,6 +1,6 @@
-package de.epiceric.shopchest.nms.v1_17_R2.metadata;
+package de.epiceric.shopchest.nms.v1_18_R2.network.entity.metadata;
 
-import de.epiceric.shopchest.nms.metadata.MetadataValue;
+import de.epiceric.shopchest.nms.network.entity.metadata.MetadataValue;
 import net.minecraft.network.syncher.SynchedEntityData;
 
 public interface ExplicitMetadataValue extends MetadataValue {

nms/v1_18_R2/src/main/java/de/epiceric/shopchest/nms/v1_18_R2/network/entity/metadata/ItemMetadataProperties.java

@@ -1,8 +1,8 @@
-package de.epiceric.shopchest.nms.v1_18_R2.metadata;
+package de.epiceric.shopchest.nms.v1_18_R2.network.entity.metadata;
 
 import de.epiceric.shopchest.nms.ReflectionUtils;
-import de.epiceric.shopchest.nms.metadata.MetadataProperties;
+import de.epiceric.shopchest.nms.network.entity.metadata.MetadataProperties;
-import de.epiceric.shopchest.nms.metadata.MetadataProperty;
+import de.epiceric.shopchest.nms.network.entity.metadata.MetadataProperty;
 import net.minecraft.network.syncher.EntityDataAccessor;
 import net.minecraft.network.syncher.SynchedEntityData;
 import net.minecraft.world.entity.item.ItemEntity;

nms/v1_18_R2/src/main/java/de/epiceric/shopchest/nms/v1_18_R2/network/entity/metadata/MetadataPropertiesImpl.java

@@ -1,6 +1,6 @@
-package de.epiceric.shopchest.nms.v1_18_R2.metadata;
+package de.epiceric.shopchest.nms.v1_18_R2.network.entity.metadata;
 
-import de.epiceric.shopchest.nms.metadata.MetadataProperties;
+import de.epiceric.shopchest.nms.network.entity.metadata.MetadataProperties;
 
 public class MetadataPropertiesImpl implements MetadataProperties {
 

nms/v1_19_R1/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>shopchest-nms</artifactId>
         <groupId>de.epiceric</groupId>
-        <version>1.1.0</version>
+        <version>1.1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

nms/v1_19_R1/src/main/java/de/epiceric/shopchest/nms/v1_19_R1/FakeArmorStandImpl.java

@@ -1,16 +0,0 @@
-package de.epiceric.shopchest.nms.v1_19_R1;
-
-import de.epiceric.shopchest.nms.FakeArmorStand;
-import net.minecraft.world.entity.EntityType;
-
-public class FakeArmorStandImpl extends FakeEntityImpl implements FakeArmorStand {
-
-    public FakeArmorStandImpl() {
-        super();
-    }
-
-    @Override
-    protected EntityType<?> getEntityType() {
-        return EntityType.ARMOR_STAND;
-    }
-}

nms/v1_19_R1/src/main/java/de/epiceric/shopchest/nms/v1_19_R1/FakeItemImpl.java

@@ -1,16 +0,0 @@
-package de.epiceric.shopchest.nms.v1_19_R1;
-
-import de.epiceric.shopchest.nms.FakeItem;
-import net.minecraft.world.entity.EntityType;
-
-public class FakeItemImpl extends FakeEntityImpl implements FakeItem {
-
-    public FakeItemImpl() {
-        super();
-    }
-
-    @Override
-    protected EntityType<?> getEntityType() {
-        return EntityType.ITEM;
-    }
-}

nms/v1_19_R1/src/main/java/de/epiceric/shopchest/nms/v1_19_R1/PlatformImpl.java

@@ -1,8 +1,14 @@
 package de.epiceric.shopchest.nms.v1_19_R1;
 
 import de.epiceric.shopchest.nms.*;
-import de.epiceric.shopchest.nms.metadata.MetadataProperties;
+import de.epiceric.shopchest.nms.network.entity.FakeArmorStand;
-import de.epiceric.shopchest.nms.v1_19_R1.metadata.MetadataPropertiesImpl;
+import de.epiceric.shopchest.nms.network.entity.FakeItem;
+import de.epiceric.shopchest.nms.network.entity.metadata.MetadataProperties;
+import de.epiceric.shopchest.nms.network.PacketQueue;
+import de.epiceric.shopchest.nms.v1_19_R1.network.entity.FakeArmorStandImpl;
+import de.epiceric.shopchest.nms.v1_19_R1.network.entity.FakeItemImpl;
+import de.epiceric.shopchest.nms.v1_19_R1.network.entity.metadata.MetadataPropertiesImpl;
+import de.epiceric.shopchest.nms.v1_19_R1.network.PacketQueueImpl;
 
 public class PlatformImpl implements Platform {
 

nms/v1_19_R1/src/main/java/de/epiceric/shopchest/nms/v1_19_R1/metadata/ArmorStandMetadataProperties.java

@@ -1,17 +0,0 @@
-package de.epiceric.shopchest.nms.v1_19_R1.metadata;
-
-import de.epiceric.shopchest.nms.metadata.MetadataProperties;
-import de.epiceric.shopchest.nms.metadata.MetadataProperty;
-import net.minecraft.network.syncher.SynchedEntityData;
-import net.minecraft.world.entity.decoration.ArmorStand;
-
-public class ArmorStandMetadataProperties implements MetadataProperties.ArmorStand {
-
-    private final static byte MARKER_FLAG = 0b10000;
-
-    @Override
-    public MetadataProperty<Boolean> marker() {
-        return value -> (ExplicitMetadataValue) () -> new SynchedEntityData.DataItem<>(ArmorStand.DATA_CLIENT_FLAGS, value ? MARKER_FLAG : 0);
-    }
-
-}

nms/v1_19_R1/src/main/java/de/epiceric/shopchest/nms/v1_19_R1/metadata/ExplicitMetadataValue.java

@@ -1,10 +0,0 @@
-package de.epiceric.shopchest.nms.v1_19_R1.metadata;
-
-import de.epiceric.shopchest.nms.metadata.MetadataValue;
-import net.minecraft.network.syncher.SynchedEntityData;
-
-public interface ExplicitMetadataValue extends MetadataValue {
-
-    SynchedEntityData.DataItem<?> toNMS();
-
-}

nms/v1_19_R1/src/main/java/de/epiceric/shopchest/nms/v1_19_R1/metadata/MetadataPropertiesImpl.java

@@ -1,21 +0,0 @@
-package de.epiceric.shopchest.nms.v1_19_R1.metadata;
-
-import de.epiceric.shopchest.nms.metadata.MetadataProperties;
-
-public class MetadataPropertiesImpl implements MetadataProperties {
-
-    @Override
-    public Entity entity() {
-        return new EntityMetadataProperties();
-    }
-
-    @Override
-    public ArmorStand armorStand() {
-        return new ArmorStandMetadataProperties();
-    }
-
-    @Override
-    public Item item() {
-        return new ItemMetadataProperties();
-    }
-}

nms/v1_19_R1/src/main/java/de/epiceric/shopchest/nms/v1_19_R1/network/PacketQueueImpl.java

@@ -1,6 +1,6 @@
-package de.epiceric.shopchest.nms.v1_19_R1;
+package de.epiceric.shopchest.nms.v1_19_R1.network;
 
-import de.epiceric.shopchest.nms.PacketQueue;
+import de.epiceric.shopchest.nms.network.PacketQueue;
 import net.minecraft.network.protocol.Packet;
 import net.minecraft.server.network.ServerPlayerConnection;
 import org.bukkit.craftbukkit.v1_19_R1.entity.CraftPlayer;

nms/v1_19_R1/src/main/java/de/epiceric/shopchest/nms/v1_19_R1/network/entity/FakeArmorStandImpl.java

@@ -0,0 +1,16 @@
+package de.epiceric.shopchest.nms.v1_19_R1.network.entity;
+
+import de.epiceric.shopchest.nms.network.entity.FakeArmorStand;
+import net.minecraft.world.entity.EntityType;
+
+public class FakeArmorStandImpl extends FakeEntityImpl implements FakeArmorStand {
+
+    public FakeArmorStandImpl() {
+        super();
+    }
+
+    @Override
+    protected EntityType<?> getEntityType() {
+        return EntityType.ARMOR_STAND;
+    }
+}

nms/v1_19_R1/src/main/java/de/epiceric/shopchest/nms/v1_19_R1/network/entity/FakeEntityImpl.java

@@ -1,10 +1,11 @@
-package de.epiceric.shopchest.nms.v1_19_R1;
+package de.epiceric.shopchest.nms.v1_19_R1.network.entity;
 
-import de.epiceric.shopchest.nms.FakeEntity;
+import de.epiceric.shopchest.nms.network.entity.FakeEntity;
-import de.epiceric.shopchest.nms.PacketQueue;
+import de.epiceric.shopchest.nms.network.PacketQueue;
 import de.epiceric.shopchest.nms.ReflectionUtils;
-import de.epiceric.shopchest.nms.metadata.MetadataValue;
+import de.epiceric.shopchest.nms.network.entity.metadata.MetadataValue;
-import de.epiceric.shopchest.nms.v1_19_R1.metadata.ExplicitMetadataValue;
+import de.epiceric.shopchest.nms.v1_19_R1.network.entity.metadata.ExplicitMetadataValue;
+import de.epiceric.shopchest.nms.v1_19_R1.network.PacketQueueImpl;
 import io.netty.buffer.Unpooled;
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.network.protocol.game.*;

nms/v1_19_R1/src/main/java/de/epiceric/shopchest/nms/v1_19_R1/network/entity/FakeItemImpl.java

@@ -0,0 +1,16 @@
+package de.epiceric.shopchest.nms.v1_19_R1.network.entity;
+
+import de.epiceric.shopchest.nms.network.entity.FakeItem;
+import net.minecraft.world.entity.EntityType;
+
+public class FakeItemImpl extends FakeEntityImpl implements FakeItem {
+
+    public FakeItemImpl() {
+        super();
+    }
+
+    @Override
+    protected EntityType<?> getEntityType() {
+        return EntityType.ITEM;
+    }
+}

nms/v1_19_R1/src/main/java/de/epiceric/shopchest/nms/v1_19_R1/network/entity/metadata/ArmorStandMetadataProperties.java

@@ -0,0 +1,17 @@
+package de.epiceric.shopchest.nms.v1_19_R1.network.entity.metadata;
+
+import de.epiceric.shopchest.nms.network.entity.metadata.MetadataProperties;
+import de.epiceric.shopchest.nms.network.entity.metadata.MetadataProperty;
+import net.minecraft.network.syncher.SynchedEntityData;
+import net.minecraft.world.entity.decoration.ArmorStand;
+
+public class ArmorStandMetadataProperties implements MetadataProperties.ArmorStand {
+
+    private final static byte MARKER_FLAG = 0b10000;
+
+    @Override
+    public MetadataProperty<Boolean> marker() {
+        return value -> (ExplicitMetadataValue) () -> new SynchedEntityData.DataItem<>(ArmorStand.DATA_CLIENT_FLAGS, value ? MARKER_FLAG : 0);
+    }
+
+}

nms/v1_19_R1/src/main/java/de/epiceric/shopchest/nms/v1_19_R1/network/entity/metadata/EntityMetadataProperties.java

@@ -1,9 +1,9 @@
-package de.epiceric.shopchest.nms.v1_19_R1.metadata;
+package de.epiceric.shopchest.nms.v1_19_R1.network.entity.metadata;
 
 import de.epiceric.shopchest.nms.NMSComponent;
 import de.epiceric.shopchest.nms.ReflectionUtils;
-import de.epiceric.shopchest.nms.metadata.MetadataProperties;
+import de.epiceric.shopchest.nms.network.entity.metadata.MetadataProperties;
-import de.epiceric.shopchest.nms.metadata.MetadataProperty;
+import de.epiceric.shopchest.nms.network.entity.metadata.MetadataProperty;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.syncher.EntityDataAccessor;
 import net.minecraft.network.syncher.SynchedEntityData;

nms/v1_19_R1/src/main/java/de/epiceric/shopchest/nms/v1_19_R1/network/entity/metadata/ExplicitMetadataValue.java

@@ -0,0 +1,10 @@
+package de.epiceric.shopchest.nms.v1_19_R1.network.entity.metadata;
+
+import de.epiceric.shopchest.nms.network.entity.metadata.MetadataValue;
+import net.minecraft.network.syncher.SynchedEntityData;
+
+public interface ExplicitMetadataValue extends MetadataValue {
+
+    SynchedEntityData.DataItem<?> toNMS();
+
+}

nms/v1_19_R1/src/main/java/de/epiceric/shopchest/nms/v1_19_R1/network/entity/metadata/ItemMetadataProperties.java

@@ -1,8 +1,8 @@
-package de.epiceric.shopchest.nms.v1_19_R1.metadata;
+package de.epiceric.shopchest.nms.v1_19_R1.network.entity.metadata;
 
 import de.epiceric.shopchest.nms.ReflectionUtils;
-import de.epiceric.shopchest.nms.metadata.MetadataProperties;
+import de.epiceric.shopchest.nms.network.entity.metadata.MetadataProperties;
-import de.epiceric.shopchest.nms.metadata.MetadataProperty;
+import de.epiceric.shopchest.nms.network.entity.metadata.MetadataProperty;
 import net.minecraft.network.syncher.EntityDataAccessor;
 import net.minecraft.network.syncher.SynchedEntityData;
 import net.minecraft.world.entity.item.ItemEntity;

nms/v1_19_R1/src/main/java/de/epiceric/shopchest/nms/v1_19_R1/network/entity/metadata/MetadataPropertiesImpl.java

@@ -0,0 +1,21 @@
+package de.epiceric.shopchest.nms.v1_19_R1.network.entity.metadata;
+
+import de.epiceric.shopchest.nms.network.entity.metadata.MetadataProperties;
+
+public class MetadataPropertiesImpl implements MetadataProperties {
+
+    @Override
+    public Entity entity() {
+        return new EntityMetadataProperties();
+    }
+
+    @Override
+    public ArmorStand armorStand() {
+        return new ArmorStandMetadataProperties();
+    }
+
+    @Override
+    public Item item() {
+        return new ItemMetadataProperties();
+    }
+}

nms/v1_19_R2/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>shopchest-nms</artifactId>
         <groupId>de.epiceric</groupId>
-        <version>1.1.0</version>
+        <version>1.1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

nms/v1_19_R2/src/main/java/de/epiceric/shopchest/nms/v1_19_R2/FakeArmorStandImpl.java

@@ -1,16 +0,0 @@
-package de.epiceric.shopchest.nms.v1_19_R2;
-
-import de.epiceric.shopchest.nms.FakeArmorStand;
-import net.minecraft.world.entity.EntityType;
-
-public class FakeArmorStandImpl extends FakeEntityImpl implements FakeArmorStand {
-
-    public FakeArmorStandImpl() {
-        super();
-    }
-
-    @Override
-    protected EntityType<?> getEntityType() {
-        return EntityType.ARMOR_STAND;
-    }
-}

nms/v1_19_R2/src/main/java/de/epiceric/shopchest/nms/v1_19_R2/FakeItemImpl.java

@@ -1,16 +0,0 @@
-package de.epiceric.shopchest.nms.v1_19_R2;
-
-import de.epiceric.shopchest.nms.FakeItem;
-import net.minecraft.world.entity.EntityType;
-
-public class FakeItemImpl extends FakeEntityImpl implements FakeItem {
-
-    public FakeItemImpl() {
-        super();
-    }
-
-    @Override
-    protected EntityType<?> getEntityType() {
-        return EntityType.ITEM;
-    }
-}

nms/v1_19_R2/src/main/java/de/epiceric/shopchest/nms/v1_19_R2/PlatformImpl.java

@@ -1,8 +1,14 @@
 package de.epiceric.shopchest.nms.v1_19_R2;
 
 import de.epiceric.shopchest.nms.*;
-import de.epiceric.shopchest.nms.metadata.MetadataProperties;
+import de.epiceric.shopchest.nms.network.entity.FakeArmorStand;
-import de.epiceric.shopchest.nms.v1_19_R2.metadata.MetadataPropertiesImpl;
+import de.epiceric.shopchest.nms.network.entity.FakeItem;
+import de.epiceric.shopchest.nms.network.entity.metadata.MetadataProperties;
+import de.epiceric.shopchest.nms.network.PacketQueue;
+import de.epiceric.shopchest.nms.v1_19_R2.network.entity.FakeArmorStandImpl;
+import de.epiceric.shopchest.nms.v1_19_R2.network.entity.FakeItemImpl;
+import de.epiceric.shopchest.nms.v1_19_R2.network.entity.metadata.MetadataPropertiesImpl;
+import de.epiceric.shopchest.nms.v1_19_R2.network.PacketQueueImpl;
 
 public class PlatformImpl implements Platform {
 

nms/v1_19_R2/src/main/java/de/epiceric/shopchest/nms/v1_19_R2/metadata/MetadataPropertiesImpl.java

@@ -1,21 +0,0 @@
-package de.epiceric.shopchest.nms.v1_19_R2.metadata;
-
-import de.epiceric.shopchest.nms.metadata.MetadataProperties;
-
-public class MetadataPropertiesImpl implements MetadataProperties {
-
-    @Override
-    public Entity entity() {
-        return new EntityMetadataProperties();
-    }
-
-    @Override
-    public ArmorStand armorStand() {
-        return new ArmorStandMetadataProperties();
-    }
-
-    @Override
-    public Item item() {
-        return new ItemMetadataProperties();
-    }
-}

nms/v1_19_R2/src/main/java/de/epiceric/shopchest/nms/v1_19_R2/network/PacketQueueImpl.java

@@ -1,6 +1,6 @@
-package de.epiceric.shopchest.nms.v1_19_R2;
+package de.epiceric.shopchest.nms.v1_19_R2.network;
 
-import de.epiceric.shopchest.nms.PacketQueue;
+import de.epiceric.shopchest.nms.network.PacketQueue;
 import net.minecraft.network.protocol.Packet;
 import net.minecraft.server.network.ServerPlayerConnection;
 import org.bukkit.craftbukkit.v1_19_R2.entity.CraftPlayer;

nms/v1_19_R2/src/main/java/de/epiceric/shopchest/nms/v1_19_R2/network/entity/FakeArmorStandImpl.java

@@ -0,0 +1,16 @@
+package de.epiceric.shopchest.nms.v1_19_R2.network.entity;
+
+import de.epiceric.shopchest.nms.network.entity.FakeArmorStand;
+import net.minecraft.world.entity.EntityType;
+
+public class FakeArmorStandImpl extends FakeEntityImpl implements FakeArmorStand {
+
+    public FakeArmorStandImpl() {
+        super();
+    }
+
+    @Override
+    protected EntityType<?> getEntityType() {
+        return EntityType.ARMOR_STAND;
+    }
+}

nms/v1_19_R2/src/main/java/de/epiceric/shopchest/nms/v1_19_R2/network/entity/FakeEntityImpl.java

@@ -1,10 +1,11 @@
-package de.epiceric.shopchest.nms.v1_19_R2;
+package de.epiceric.shopchest.nms.v1_19_R2.network.entity;
 
-import de.epiceric.shopchest.nms.FakeEntity;
+import de.epiceric.shopchest.nms.network.entity.FakeEntity;
-import de.epiceric.shopchest.nms.PacketQueue;
+import de.epiceric.shopchest.nms.network.PacketQueue;
 import de.epiceric.shopchest.nms.ReflectionUtils;
-import de.epiceric.shopchest.nms.metadata.MetadataValue;
+import de.epiceric.shopchest.nms.network.entity.metadata.MetadataValue;
-import de.epiceric.shopchest.nms.v1_19_R2.metadata.ExplicitMetadataValue;
+import de.epiceric.shopchest.nms.v1_19_R2.network.entity.metadata.ExplicitMetadataValue;
+import de.epiceric.shopchest.nms.v1_19_R2.network.PacketQueueImpl;
 import io.netty.buffer.Unpooled;
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.network.protocol.game.*;

nms/v1_19_R2/src/main/java/de/epiceric/shopchest/nms/v1_19_R2/network/entity/FakeItemImpl.java

@@ -0,0 +1,16 @@
+package de.epiceric.shopchest.nms.v1_19_R2.network.entity;
+
+import de.epiceric.shopchest.nms.network.entity.FakeItem;
+import net.minecraft.world.entity.EntityType;
+
+public class FakeItemImpl extends FakeEntityImpl implements FakeItem {
+
+    public FakeItemImpl() {
+        super();
+    }
+
+    @Override
+    protected EntityType<?> getEntityType() {
+        return EntityType.ITEM;
+    }
+}

nms/v1_19_R2/src/main/java/de/epiceric/shopchest/nms/v1_19_R2/network/entity/metadata/ArmorStandMetadataProperties.java

@@ -1,7 +1,7 @@
-package de.epiceric.shopchest.nms.v1_19_R2.metadata;
+package de.epiceric.shopchest.nms.v1_19_R2.network.entity.metadata;
 
-import de.epiceric.shopchest.nms.metadata.MetadataProperties;
+import de.epiceric.shopchest.nms.network.entity.metadata.MetadataProperties;
-import de.epiceric.shopchest.nms.metadata.MetadataProperty;
+import de.epiceric.shopchest.nms.network.entity.metadata.MetadataProperty;
 import net.minecraft.network.syncher.SynchedEntityData;
 import net.minecraft.world.entity.decoration.ArmorStand;
 

nms/v1_19_R2/src/main/java/de/epiceric/shopchest/nms/v1_19_R2/network/entity/metadata/EntityMetadataProperties.java

@@ -1,9 +1,9 @@
-package de.epiceric.shopchest.nms.v1_19_R2.metadata;
+package de.epiceric.shopchest.nms.v1_19_R2.network.entity.metadata;
 
 import de.epiceric.shopchest.nms.NMSComponent;
 import de.epiceric.shopchest.nms.ReflectionUtils;
-import de.epiceric.shopchest.nms.metadata.MetadataProperties;
+import de.epiceric.shopchest.nms.network.entity.metadata.MetadataProperties;
-import de.epiceric.shopchest.nms.metadata.MetadataProperty;
+import de.epiceric.shopchest.nms.network.entity.metadata.MetadataProperty;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.syncher.EntityDataAccessor;
 import net.minecraft.network.syncher.SynchedEntityData;

nms/v1_19_R2/src/main/java/de/epiceric/shopchest/nms/v1_19_R2/network/entity/metadata/ExplicitMetadataValue.java

@@ -1,6 +1,6 @@
-package de.epiceric.shopchest.nms.v1_19_R2.metadata;
+package de.epiceric.shopchest.nms.v1_19_R2.network.entity.metadata;
 
-import de.epiceric.shopchest.nms.metadata.MetadataValue;
+import de.epiceric.shopchest.nms.network.entity.metadata.MetadataValue;
 import net.minecraft.network.syncher.SynchedEntityData;
 
 public interface ExplicitMetadataValue extends MetadataValue {

nms/v1_19_R2/src/main/java/de/epiceric/shopchest/nms/v1_19_R2/network/entity/metadata/ItemMetadataProperties.java

@@ -1,8 +1,8 @@
-package de.epiceric.shopchest.nms.v1_19_R2.metadata;
+package de.epiceric.shopchest.nms.v1_19_R2.network.entity.metadata;
 
 import de.epiceric.shopchest.nms.ReflectionUtils;
-import de.epiceric.shopchest.nms.metadata.MetadataProperties;
+import de.epiceric.shopchest.nms.network.entity.metadata.MetadataProperties;
-import de.epiceric.shopchest.nms.metadata.MetadataProperty;
+import de.epiceric.shopchest.nms.network.entity.metadata.MetadataProperty;
 import net.minecraft.network.syncher.EntityDataAccessor;
 import net.minecraft.network.syncher.SynchedEntityData;
 import net.minecraft.world.entity.item.ItemEntity;

nms/v1_19_R2/src/main/java/de/epiceric/shopchest/nms/v1_19_R2/network/entity/metadata/MetadataPropertiesImpl.java

@@ -0,0 +1,21 @@
+package de.epiceric.shopchest.nms.v1_19_R2.network.entity.metadata;
+
+import de.epiceric.shopchest.nms.network.entity.metadata.MetadataProperties;
+
+public class MetadataPropertiesImpl implements MetadataProperties {
+
+    @Override
+    public Entity entity() {
+        return new EntityMetadataProperties();
+    }
+
+    @Override
+    public ArmorStand armorStand() {
+        return new ArmorStandMetadataProperties();
+    }
+
+    @Override
+    public Item item() {
+        return new ItemMetadataProperties();
+    }
+}

plugin/src/main/java/de/epiceric/shopchest/nms/ArmorStandWrapper.java

@@ -1,7 +1,7 @@
 package de.epiceric.shopchest.nms;
 
 import de.epiceric.shopchest.ShopChest;
-import de.epiceric.shopchest.nms.metadata.MetadataProperties;
+import de.epiceric.shopchest.nms.network.entity.metadata.MetadataProperties;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;