From 365034c08c0ca478ba78beebd837bd85fea56b58 Mon Sep 17 00:00:00 2001
From: Flowsqy <47575244+Flowsqy@users.noreply.github.com>
Date: Tue, 21 Feb 2023 22:59:41 +0100
Subject: [PATCH] Move nms implementation to dedicated package
---
nms/all/pom.xml | 4 ++--
nms/interface/pom.xml | 2 +-
.../de/epiceric/shopchest/nms/Platform.java | 7 +++++--
.../shopchest/nms/metadata/MetadataValue.java | 5 -----
.../nms/{ => network}/PacketQueue.java | 2 +-
.../{ => network/entity}/FakeArmorStand.java | 2 +-
.../nms/{ => network/entity}/FakeEntity.java | 5 +++--
.../nms/{ => network/entity}/FakeItem.java | 2 +-
.../entity}/metadata/MetadataProperties.java | 2 +-
.../entity}/metadata/MetadataProperty.java | 2 +-
.../entity/metadata/MetadataValue.java | 5 +++++
nms/pom.xml | 2 +-
nms/reflection/pom.xml | 2 +-
.../nms/reflection/FakeArmorStandImpl.java | 2 +-
.../nms/reflection/FakeEntityImpl.java | 8 +++----
.../nms/reflection/FakeItemImpl.java | 9 +-------
.../nms/reflection/PacketQueueImpl.java | 2 +-
.../nms/reflection/PlatformImpl.java | 5 ++++-
nms/v1_17_R1/pom.xml | 2 +-
.../shopchest/nms/v1_17_R1/PlatformImpl.java | 10 +++++++--
.../{ => network}/PacketQueueImpl.java | 4 ++--
.../network/entity}/FakeArmorStandImpl.java | 4 ++--
.../{ => network/entity}/FakeEntityImpl.java | 11 +++++-----
.../{ => network/entity}/FakeItemImpl.java | 4 ++--
.../ArmorStandMetadataProperties.java | 6 +++---
.../metadata/EntityMetadataProperties.java | 6 +++---
.../metadata/ExplicitMetadataValue.java | 4 ++--
.../metadata/ItemMetadataProperties.java | 6 +++---
.../metadata/MetadataPropertiesImpl.java | 4 ++--
nms/v1_17_R2/pom.xml | 2 +-
.../shopchest/nms/v1_17_R2/PlatformImpl.java | 10 +++++++--
.../{ => network}/PacketQueueImpl.java | 4 ++--
.../entity}/FakeArmorStandImpl.java | 4 ++--
.../network/entity}/FakeEntityImpl.java | 11 +++++-----
.../network/entity}/FakeItemImpl.java | 4 ++--
.../ArmorStandMetadataProperties.java | 6 +++---
.../metadata/EntityMetadataProperties.java | 6 +++---
.../metadata/ExplicitMetadataValue.java | 4 ++--
.../metadata/ItemMetadataProperties.java | 6 +++---
.../metadata/MetadataPropertiesImpl.java | 4 ++--
nms/v1_18_R1/pom.xml | 2 +-
.../shopchest/nms/v1_18_R1/PlatformImpl.java | 10 +++++++--
.../{ => network}/PacketQueueImpl.java | 4 ++--
.../network/entity}/FakeArmorStandImpl.java | 4 ++--
.../network/entity}/FakeEntityImpl.java | 11 +++++-----
.../network/entity}/FakeItemImpl.java | 4 ++--
.../ArmorStandMetadataProperties.java | 6 +++---
.../metadata/EntityMetadataProperties.java | 6 +++---
.../metadata/ExplicitMetadataValue.java | 4 ++--
.../metadata/ItemMetadataProperties.java | 6 +++---
.../metadata/MetadataPropertiesImpl.java | 4 ++--
nms/v1_18_R2/pom.xml | 2 +-
.../shopchest/nms/v1_18_R2/PlatformImpl.java | 10 +++++++--
.../{ => network}/PacketQueueImpl.java | 4 ++--
.../network/entity}/FakeArmorStandImpl.java | 4 ++--
.../{ => network/entity}/FakeEntityImpl.java | 11 +++++-----
.../{ => network/entity}/FakeItemImpl.java | 4 ++--
.../ArmorStandMetadataProperties.java | 6 +++---
.../metadata/EntityMetadataProperties.java | 6 +++---
.../metadata/ExplicitMetadataValue.java | 4 ++--
.../metadata/ItemMetadataProperties.java | 6 +++---
.../metadata/MetadataPropertiesImpl.java | 4 ++--
nms/v1_19_R1/pom.xml | 2 +-
.../nms/v1_19_R1/FakeArmorStandImpl.java | 16 --------------
.../shopchest/nms/v1_19_R1/FakeItemImpl.java | 16 --------------
.../shopchest/nms/v1_19_R1/PlatformImpl.java | 10 +++++++--
.../ArmorStandMetadataProperties.java | 17 ---------------
.../metadata/ExplicitMetadataValue.java | 10 ---------
.../metadata/MetadataPropertiesImpl.java | 21 -------------------
.../{ => network}/PacketQueueImpl.java | 4 ++--
.../network/entity/FakeArmorStandImpl.java | 16 ++++++++++++++
.../{ => network/entity}/FakeEntityImpl.java | 11 +++++-----
.../v1_19_R1/network/entity/FakeItemImpl.java | 16 ++++++++++++++
.../ArmorStandMetadataProperties.java | 17 +++++++++++++++
.../metadata/EntityMetadataProperties.java | 6 +++---
.../metadata/ExplicitMetadataValue.java | 10 +++++++++
.../metadata/ItemMetadataProperties.java | 6 +++---
.../metadata/MetadataPropertiesImpl.java | 21 +++++++++++++++++++
nms/v1_19_R2/pom.xml | 2 +-
.../nms/v1_19_R2/FakeArmorStandImpl.java | 16 --------------
.../shopchest/nms/v1_19_R2/FakeItemImpl.java | 16 --------------
.../shopchest/nms/v1_19_R2/PlatformImpl.java | 10 +++++++--
.../metadata/MetadataPropertiesImpl.java | 21 -------------------
.../{ => network}/PacketQueueImpl.java | 4 ++--
.../network/entity/FakeArmorStandImpl.java | 16 ++++++++++++++
.../{ => network/entity}/FakeEntityImpl.java | 11 +++++-----
.../v1_19_R2/network/entity/FakeItemImpl.java | 16 ++++++++++++++
.../ArmorStandMetadataProperties.java | 6 +++---
.../metadata/EntityMetadataProperties.java | 6 +++---
.../metadata/ExplicitMetadataValue.java | 4 ++--
.../metadata/ItemMetadataProperties.java | 6 +++---
.../metadata/MetadataPropertiesImpl.java | 21 +++++++++++++++++++
.../shopchest/nms/ArmorStandWrapper.java | 2 +-
93 files changed, 354 insertions(+), 314 deletions(-)
delete mode 100644 nms/interface/src/main/java/de/epiceric/shopchest/nms/metadata/MetadataValue.java
rename nms/interface/src/main/java/de/epiceric/shopchest/nms/{ => network}/PacketQueue.java (86%)
rename nms/interface/src/main/java/de/epiceric/shopchest/nms/{ => network/entity}/FakeArmorStand.java (70%)
rename nms/interface/src/main/java/de/epiceric/shopchest/nms/{ => network/entity}/FakeEntity.java (90%)
rename nms/interface/src/main/java/de/epiceric/shopchest/nms/{ => network/entity}/FakeItem.java (69%)
rename nms/interface/src/main/java/de/epiceric/shopchest/nms/{ => network/entity}/metadata/MetadataProperties.java (91%)
rename nms/interface/src/main/java/de/epiceric/shopchest/nms/{ => network/entity}/metadata/MetadataProperty.java (81%)
create mode 100644 nms/interface/src/main/java/de/epiceric/shopchest/nms/network/entity/metadata/MetadataValue.java
rename nms/v1_17_R1/src/main/java/de/epiceric/shopchest/nms/v1_17_R1/{ => network}/PacketQueueImpl.java (88%)
rename nms/{v1_18_R1/src/main/java/de/epiceric/shopchest/nms/v1_18_R1 => v1_17_R1/src/main/java/de/epiceric/shopchest/nms/v1_17_R1/network/entity}/FakeArmorStandImpl.java (70%)
rename nms/v1_17_R1/src/main/java/de/epiceric/shopchest/nms/v1_17_R1/{ => network/entity}/FakeEntityImpl.java (90%)
rename nms/v1_17_R1/src/main/java/de/epiceric/shopchest/nms/v1_17_R1/{ => network/entity}/FakeItemImpl.java (69%)
rename nms/{v1_18_R1/src/main/java/de/epiceric/shopchest/nms/v1_18_R1 => v1_17_R1/src/main/java/de/epiceric/shopchest/nms/v1_17_R1/network/entity}/metadata/ArmorStandMetadataProperties.java (68%)
rename nms/v1_17_R1/src/main/java/de/epiceric/shopchest/nms/v1_17_R1/{ => network/entity}/metadata/EntityMetadataProperties.java (92%)
rename nms/{v1_18_R1/src/main/java/de/epiceric/shopchest/nms/v1_18_R1 => v1_17_R1/src/main/java/de/epiceric/shopchest/nms/v1_17_R1/network/entity}/metadata/ExplicitMetadataValue.java (54%)
rename nms/v1_17_R1/src/main/java/de/epiceric/shopchest/nms/v1_17_R1/{ => network/entity}/metadata/ItemMetadataProperties.java (81%)
rename nms/{v1_17_R2/src/main/java/de/epiceric/shopchest/nms/v1_17_R2 => v1_17_R1/src/main/java/de/epiceric/shopchest/nms/v1_17_R1/network/entity}/metadata/MetadataPropertiesImpl.java (71%)
rename nms/v1_17_R2/src/main/java/de/epiceric/shopchest/nms/v1_17_R2/{ => network}/PacketQueueImpl.java (88%)
rename nms/v1_17_R2/src/main/java/de/epiceric/shopchest/nms/v1_17_R2/{ => network/entity}/FakeArmorStandImpl.java (70%)
rename nms/{v1_18_R1/src/main/java/de/epiceric/shopchest/nms/v1_18_R1 => v1_17_R2/src/main/java/de/epiceric/shopchest/nms/v1_17_R2/network/entity}/FakeEntityImpl.java (90%)
rename nms/{v1_18_R1/src/main/java/de/epiceric/shopchest/nms/v1_18_R1 => v1_17_R2/src/main/java/de/epiceric/shopchest/nms/v1_17_R2/network/entity}/FakeItemImpl.java (69%)
rename nms/{v1_18_R2/src/main/java/de/epiceric/shopchest/nms/v1_18_R2 => v1_17_R2/src/main/java/de/epiceric/shopchest/nms/v1_17_R2/network/entity}/metadata/ArmorStandMetadataProperties.java (68%)
rename nms/v1_17_R2/src/main/java/de/epiceric/shopchest/nms/v1_17_R2/{ => network/entity}/metadata/EntityMetadataProperties.java (92%)
rename nms/{v1_18_R2/src/main/java/de/epiceric/shopchest/nms/v1_18_R2 => v1_17_R2/src/main/java/de/epiceric/shopchest/nms/v1_17_R2/network/entity}/metadata/ExplicitMetadataValue.java (54%)
rename nms/v1_17_R2/src/main/java/de/epiceric/shopchest/nms/v1_17_R2/{ => network/entity}/metadata/ItemMetadataProperties.java (81%)
rename nms/{v1_18_R1/src/main/java/de/epiceric/shopchest/nms/v1_18_R1 => v1_17_R2/src/main/java/de/epiceric/shopchest/nms/v1_17_R2/network/entity}/metadata/MetadataPropertiesImpl.java (71%)
rename nms/v1_18_R1/src/main/java/de/epiceric/shopchest/nms/v1_18_R1/{ => network}/PacketQueueImpl.java (88%)
rename nms/{v1_18_R2/src/main/java/de/epiceric/shopchest/nms/v1_18_R2 => v1_18_R1/src/main/java/de/epiceric/shopchest/nms/v1_18_R1/network/entity}/FakeArmorStandImpl.java (70%)
rename nms/{v1_17_R2/src/main/java/de/epiceric/shopchest/nms/v1_17_R2 => v1_18_R1/src/main/java/de/epiceric/shopchest/nms/v1_18_R1/network/entity}/FakeEntityImpl.java (90%)
rename nms/{v1_17_R2/src/main/java/de/epiceric/shopchest/nms/v1_17_R2 => v1_18_R1/src/main/java/de/epiceric/shopchest/nms/v1_18_R1/network/entity}/FakeItemImpl.java (69%)
rename nms/{v1_17_R1/src/main/java/de/epiceric/shopchest/nms/v1_17_R1 => v1_18_R1/src/main/java/de/epiceric/shopchest/nms/v1_18_R1/network/entity}/metadata/ArmorStandMetadataProperties.java (68%)
rename nms/v1_18_R1/src/main/java/de/epiceric/shopchest/nms/v1_18_R1/{ => network/entity}/metadata/EntityMetadataProperties.java (92%)
rename nms/{v1_17_R1/src/main/java/de/epiceric/shopchest/nms/v1_17_R1 => v1_18_R1/src/main/java/de/epiceric/shopchest/nms/v1_18_R1/network/entity}/metadata/ExplicitMetadataValue.java (54%)
rename nms/v1_18_R1/src/main/java/de/epiceric/shopchest/nms/v1_18_R1/{ => network/entity}/metadata/ItemMetadataProperties.java (81%)
rename nms/{v1_17_R1/src/main/java/de/epiceric/shopchest/nms/v1_17_R1 => v1_18_R1/src/main/java/de/epiceric/shopchest/nms/v1_18_R1/network/entity}/metadata/MetadataPropertiesImpl.java (71%)
rename nms/v1_18_R2/src/main/java/de/epiceric/shopchest/nms/v1_18_R2/{ => network}/PacketQueueImpl.java (88%)
rename nms/{v1_17_R1/src/main/java/de/epiceric/shopchest/nms/v1_17_R1 => v1_18_R2/src/main/java/de/epiceric/shopchest/nms/v1_18_R2/network/entity}/FakeArmorStandImpl.java (70%)
rename nms/v1_18_R2/src/main/java/de/epiceric/shopchest/nms/v1_18_R2/{ => network/entity}/FakeEntityImpl.java (90%)
rename nms/v1_18_R2/src/main/java/de/epiceric/shopchest/nms/v1_18_R2/{ => network/entity}/FakeItemImpl.java (69%)
rename nms/{v1_17_R2/src/main/java/de/epiceric/shopchest/nms/v1_17_R2 => v1_18_R2/src/main/java/de/epiceric/shopchest/nms/v1_18_R2/network/entity}/metadata/ArmorStandMetadataProperties.java (68%)
rename nms/v1_18_R2/src/main/java/de/epiceric/shopchest/nms/v1_18_R2/{ => network/entity}/metadata/EntityMetadataProperties.java (92%)
rename nms/{v1_17_R2/src/main/java/de/epiceric/shopchest/nms/v1_17_R2 => v1_18_R2/src/main/java/de/epiceric/shopchest/nms/v1_18_R2/network/entity}/metadata/ExplicitMetadataValue.java (54%)
rename nms/v1_18_R2/src/main/java/de/epiceric/shopchest/nms/v1_18_R2/{ => network/entity}/metadata/ItemMetadataProperties.java (81%)
rename nms/v1_18_R2/src/main/java/de/epiceric/shopchest/nms/v1_18_R2/{ => network/entity}/metadata/MetadataPropertiesImpl.java (71%)
delete mode 100644 nms/v1_19_R1/src/main/java/de/epiceric/shopchest/nms/v1_19_R1/FakeArmorStandImpl.java
delete mode 100644 nms/v1_19_R1/src/main/java/de/epiceric/shopchest/nms/v1_19_R1/FakeItemImpl.java
delete mode 100644 nms/v1_19_R1/src/main/java/de/epiceric/shopchest/nms/v1_19_R1/metadata/ArmorStandMetadataProperties.java
delete mode 100644 nms/v1_19_R1/src/main/java/de/epiceric/shopchest/nms/v1_19_R1/metadata/ExplicitMetadataValue.java
delete mode 100644 nms/v1_19_R1/src/main/java/de/epiceric/shopchest/nms/v1_19_R1/metadata/MetadataPropertiesImpl.java
rename nms/v1_19_R1/src/main/java/de/epiceric/shopchest/nms/v1_19_R1/{ => network}/PacketQueueImpl.java (88%)
create mode 100644 nms/v1_19_R1/src/main/java/de/epiceric/shopchest/nms/v1_19_R1/network/entity/FakeArmorStandImpl.java
rename nms/v1_19_R1/src/main/java/de/epiceric/shopchest/nms/v1_19_R1/{ => network/entity}/FakeEntityImpl.java (90%)
create mode 100644 nms/v1_19_R1/src/main/java/de/epiceric/shopchest/nms/v1_19_R1/network/entity/FakeItemImpl.java
create mode 100644 nms/v1_19_R1/src/main/java/de/epiceric/shopchest/nms/v1_19_R1/network/entity/metadata/ArmorStandMetadataProperties.java
rename nms/v1_19_R1/src/main/java/de/epiceric/shopchest/nms/v1_19_R1/{ => network/entity}/metadata/EntityMetadataProperties.java (92%)
create mode 100644 nms/v1_19_R1/src/main/java/de/epiceric/shopchest/nms/v1_19_R1/network/entity/metadata/ExplicitMetadataValue.java
rename nms/v1_19_R1/src/main/java/de/epiceric/shopchest/nms/v1_19_R1/{ => network/entity}/metadata/ItemMetadataProperties.java (81%)
create mode 100644 nms/v1_19_R1/src/main/java/de/epiceric/shopchest/nms/v1_19_R1/network/entity/metadata/MetadataPropertiesImpl.java
delete mode 100644 nms/v1_19_R2/src/main/java/de/epiceric/shopchest/nms/v1_19_R2/FakeArmorStandImpl.java
delete mode 100644 nms/v1_19_R2/src/main/java/de/epiceric/shopchest/nms/v1_19_R2/FakeItemImpl.java
delete mode 100644 nms/v1_19_R2/src/main/java/de/epiceric/shopchest/nms/v1_19_R2/metadata/MetadataPropertiesImpl.java
rename nms/v1_19_R2/src/main/java/de/epiceric/shopchest/nms/v1_19_R2/{ => network}/PacketQueueImpl.java (88%)
create mode 100644 nms/v1_19_R2/src/main/java/de/epiceric/shopchest/nms/v1_19_R2/network/entity/FakeArmorStandImpl.java
rename nms/v1_19_R2/src/main/java/de/epiceric/shopchest/nms/v1_19_R2/{ => network/entity}/FakeEntityImpl.java (89%)
create mode 100644 nms/v1_19_R2/src/main/java/de/epiceric/shopchest/nms/v1_19_R2/network/entity/FakeItemImpl.java
rename nms/v1_19_R2/src/main/java/de/epiceric/shopchest/nms/v1_19_R2/{ => network/entity}/metadata/ArmorStandMetadataProperties.java (68%)
rename nms/v1_19_R2/src/main/java/de/epiceric/shopchest/nms/v1_19_R2/{ => network/entity}/metadata/EntityMetadataProperties.java (92%)
rename nms/v1_19_R2/src/main/java/de/epiceric/shopchest/nms/v1_19_R2/{ => network/entity}/metadata/ExplicitMetadataValue.java (54%)
rename nms/v1_19_R2/src/main/java/de/epiceric/shopchest/nms/v1_19_R2/{ => network/entity}/metadata/ItemMetadataProperties.java (81%)
create mode 100644 nms/v1_19_R2/src/main/java/de/epiceric/shopchest/nms/v1_19_R2/network/entity/metadata/MetadataPropertiesImpl.java
diff --git a/nms/all/pom.xml b/nms/all/pom.xml
index 72cf1bb..399dbc6 100644
--- a/nms/all/pom.xml
+++ b/nms/all/pom.xml
@@ -5,12 +5,12 @@
shopchest-nms
de.epiceric
- 1.1.0
+ 1.1.1-SNAPSHOT
4.0.0
shopchest-nms-all
- 1.1.0
+ 1.1.1-SNAPSHOT
pom
diff --git a/nms/interface/pom.xml b/nms/interface/pom.xml
index 3d1b524..4ab718d 100644
--- a/nms/interface/pom.xml
+++ b/nms/interface/pom.xml
@@ -5,7 +5,7 @@
shopchest-nms
de.epiceric
- 1.1.0
+ 1.1.1-SNAPSHOT
4.0.0
diff --git a/nms/interface/src/main/java/de/epiceric/shopchest/nms/Platform.java b/nms/interface/src/main/java/de/epiceric/shopchest/nms/Platform.java
index cad473d..58f92f0 100644
--- a/nms/interface/src/main/java/de/epiceric/shopchest/nms/Platform.java
+++ b/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
*/
diff --git a/nms/interface/src/main/java/de/epiceric/shopchest/nms/metadata/MetadataValue.java b/nms/interface/src/main/java/de/epiceric/shopchest/nms/metadata/MetadataValue.java
deleted file mode 100644
index 669bb95..0000000
--- a/nms/interface/src/main/java/de/epiceric/shopchest/nms/metadata/MetadataValue.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package de.epiceric.shopchest.nms.metadata;
-
-public interface MetadataValue {
-
-}
diff --git a/nms/interface/src/main/java/de/epiceric/shopchest/nms/PacketQueue.java b/nms/interface/src/main/java/de/epiceric/shopchest/nms/network/PacketQueue.java
similarity index 86%
rename from nms/interface/src/main/java/de/epiceric/shopchest/nms/PacketQueue.java
rename to nms/interface/src/main/java/de/epiceric/shopchest/nms/network/PacketQueue.java
index 4505575..e4f2900 100644
--- a/nms/interface/src/main/java/de/epiceric/shopchest/nms/PacketQueue.java
+++ b/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;
diff --git a/nms/interface/src/main/java/de/epiceric/shopchest/nms/FakeArmorStand.java b/nms/interface/src/main/java/de/epiceric/shopchest/nms/network/entity/FakeArmorStand.java
similarity index 70%
rename from nms/interface/src/main/java/de/epiceric/shopchest/nms/FakeArmorStand.java
rename to nms/interface/src/main/java/de/epiceric/shopchest/nms/network/entity/FakeArmorStand.java
index 5a21614..18045d6 100644
--- a/nms/interface/src/main/java/de/epiceric/shopchest/nms/FakeArmorStand.java
+++ b/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
diff --git a/nms/interface/src/main/java/de/epiceric/shopchest/nms/FakeEntity.java b/nms/interface/src/main/java/de/epiceric/shopchest/nms/network/entity/FakeEntity.java
similarity index 90%
rename from nms/interface/src/main/java/de/epiceric/shopchest/nms/FakeEntity.java
rename to nms/interface/src/main/java/de/epiceric/shopchest/nms/network/entity/FakeEntity.java
index b9b3b8e..8d09df0 100644
--- a/nms/interface/src/main/java/de/epiceric/shopchest/nms/FakeEntity.java
+++ b/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;
diff --git a/nms/interface/src/main/java/de/epiceric/shopchest/nms/FakeItem.java b/nms/interface/src/main/java/de/epiceric/shopchest/nms/network/entity/FakeItem.java
similarity index 69%
rename from nms/interface/src/main/java/de/epiceric/shopchest/nms/FakeItem.java
rename to nms/interface/src/main/java/de/epiceric/shopchest/nms/network/entity/FakeItem.java
index d498aa4..35ac34e 100644
--- a/nms/interface/src/main/java/de/epiceric/shopchest/nms/FakeItem.java
+++ b/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
diff --git a/nms/interface/src/main/java/de/epiceric/shopchest/nms/metadata/MetadataProperties.java b/nms/interface/src/main/java/de/epiceric/shopchest/nms/network/entity/metadata/MetadataProperties.java
similarity index 91%
rename from nms/interface/src/main/java/de/epiceric/shopchest/nms/metadata/MetadataProperties.java
rename to nms/interface/src/main/java/de/epiceric/shopchest/nms/network/entity/metadata/MetadataProperties.java
index d3a744b..5456324 100644
--- a/nms/interface/src/main/java/de/epiceric/shopchest/nms/metadata/MetadataProperties.java
+++ b/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;
diff --git a/nms/interface/src/main/java/de/epiceric/shopchest/nms/metadata/MetadataProperty.java b/nms/interface/src/main/java/de/epiceric/shopchest/nms/network/entity/metadata/MetadataProperty.java
similarity index 81%
rename from nms/interface/src/main/java/de/epiceric/shopchest/nms/metadata/MetadataProperty.java
rename to nms/interface/src/main/java/de/epiceric/shopchest/nms/network/entity/metadata/MetadataProperty.java
index e9c1aba..3779d8d 100644
--- a/nms/interface/src/main/java/de/epiceric/shopchest/nms/metadata/MetadataProperty.java
+++ b/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 {
diff --git a/nms/interface/src/main/java/de/epiceric/shopchest/nms/network/entity/metadata/MetadataValue.java b/nms/interface/src/main/java/de/epiceric/shopchest/nms/network/entity/metadata/MetadataValue.java
new file mode 100644
index 0000000..6bec869
--- /dev/null
+++ b/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 {
+
+}
diff --git a/nms/pom.xml b/nms/pom.xml
index 05f595f..3f4e73e 100644
--- a/nms/pom.xml
+++ b/nms/pom.xml
@@ -10,7 +10,7 @@
4.0.0
shopchest-nms
- 1.1.0
+ 1.1.1-SNAPSHOT
pom
diff --git a/nms/reflection/pom.xml b/nms/reflection/pom.xml
index ca32b4e..82ac913 100644
--- a/nms/reflection/pom.xml
+++ b/nms/reflection/pom.xml
@@ -5,7 +5,7 @@
shopchest-nms
de.epiceric
- 1.1.0
+ 1.1.1-SNAPSHOT
4.0.0
diff --git a/nms/reflection/src/main/java/de/epiceric/shopchest/nms/reflection/FakeArmorStandImpl.java b/nms/reflection/src/main/java/de/epiceric/shopchest/nms/reflection/FakeArmorStandImpl.java
index 44f122e..068ed38 100644
--- a/nms/reflection/src/main/java/de/epiceric/shopchest/nms/reflection/FakeArmorStandImpl.java
+++ b/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 {
diff --git a/nms/reflection/src/main/java/de/epiceric/shopchest/nms/reflection/FakeEntityImpl.java b/nms/reflection/src/main/java/de/epiceric/shopchest/nms/reflection/FakeEntityImpl.java
index 872b147..0bac1af 100644
--- a/nms/reflection/src/main/java/de/epiceric/shopchest/nms/reflection/FakeEntityImpl.java
+++ b/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.PacketQueue;
-import de.epiceric.shopchest.nms.metadata.MetadataValue;
+import de.epiceric.shopchest.nms.network.entity.FakeEntity;
+import de.epiceric.shopchest.nms.network.PacketQueue;
+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;
diff --git a/nms/reflection/src/main/java/de/epiceric/shopchest/nms/reflection/FakeItemImpl.java b/nms/reflection/src/main/java/de/epiceric/shopchest/nms/reflection/FakeItemImpl.java
index 5e52598..5137822 100644
--- a/nms/reflection/src/main/java/de/epiceric/shopchest/nms/reflection/FakeItemImpl.java
+++ b/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 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;
+import de.epiceric.shopchest.nms.network.entity.FakeItem;
public class FakeItemImpl extends FakeEntityImpl implements FakeItem {
diff --git a/nms/reflection/src/main/java/de/epiceric/shopchest/nms/reflection/PacketQueueImpl.java b/nms/reflection/src/main/java/de/epiceric/shopchest/nms/reflection/PacketQueueImpl.java
index 3ce5f53..cbe0945 100644
--- a/nms/reflection/src/main/java/de/epiceric/shopchest/nms/reflection/PacketQueueImpl.java
+++ b/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;
diff --git a/nms/reflection/src/main/java/de/epiceric/shopchest/nms/reflection/PlatformImpl.java b/nms/reflection/src/main/java/de/epiceric/shopchest/nms/reflection/PlatformImpl.java
index f65efe0..b7b7bbf 100644
--- a/nms/reflection/src/main/java/de/epiceric/shopchest/nms/reflection/PlatformImpl.java
+++ b/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 {
diff --git a/nms/v1_17_R1/pom.xml b/nms/v1_17_R1/pom.xml
index 118fffc..6196ec9 100644
--- a/nms/v1_17_R1/pom.xml
+++ b/nms/v1_17_R1/pom.xml
@@ -5,7 +5,7 @@
shopchest-nms
de.epiceric
- 1.1.0
+ 1.1.1-SNAPSHOT
4.0.0
diff --git a/nms/v1_17_R1/src/main/java/de/epiceric/shopchest/nms/v1_17_R1/PlatformImpl.java b/nms/v1_17_R1/src/main/java/de/epiceric/shopchest/nms/v1_17_R1/PlatformImpl.java
index 3f684b9..47cf37e 100644
--- a/nms/v1_17_R1/src/main/java/de/epiceric/shopchest/nms/v1_17_R1/PlatformImpl.java
+++ b/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.v1_17_R1.metadata.MetadataPropertiesImpl;
+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;
+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 {
diff --git a/nms/v1_17_R1/src/main/java/de/epiceric/shopchest/nms/v1_17_R1/PacketQueueImpl.java b/nms/v1_17_R1/src/main/java/de/epiceric/shopchest/nms/v1_17_R1/network/PacketQueueImpl.java
similarity index 88%
rename from nms/v1_17_R1/src/main/java/de/epiceric/shopchest/nms/v1_17_R1/PacketQueueImpl.java
rename to nms/v1_17_R1/src/main/java/de/epiceric/shopchest/nms/v1_17_R1/network/PacketQueueImpl.java
index 3c9f39b..4c9adc2 100644
--- a/nms/v1_17_R1/src/main/java/de/epiceric/shopchest/nms/v1_17_R1/PacketQueueImpl.java
+++ b/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;
diff --git a/nms/v1_18_R1/src/main/java/de/epiceric/shopchest/nms/v1_18_R1/FakeArmorStandImpl.java b/nms/v1_17_R1/src/main/java/de/epiceric/shopchest/nms/v1_17_R1/network/entity/FakeArmorStandImpl.java
similarity index 70%
rename from nms/v1_18_R1/src/main/java/de/epiceric/shopchest/nms/v1_18_R1/FakeArmorStandImpl.java
rename to nms/v1_17_R1/src/main/java/de/epiceric/shopchest/nms/v1_17_R1/network/entity/FakeArmorStandImpl.java
index cd50bf7..7385df8 100644
--- a/nms/v1_18_R1/src/main/java/de/epiceric/shopchest/nms/v1_18_R1/FakeArmorStandImpl.java
+++ b/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 {
diff --git a/nms/v1_17_R1/src/main/java/de/epiceric/shopchest/nms/v1_17_R1/FakeEntityImpl.java b/nms/v1_17_R1/src/main/java/de/epiceric/shopchest/nms/v1_17_R1/network/entity/FakeEntityImpl.java
similarity index 90%
rename from nms/v1_17_R1/src/main/java/de/epiceric/shopchest/nms/v1_17_R1/FakeEntityImpl.java
rename to nms/v1_17_R1/src/main/java/de/epiceric/shopchest/nms/v1_17_R1/network/entity/FakeEntityImpl.java
index 0f3e5f7..213fd75 100644
--- a/nms/v1_17_R1/src/main/java/de/epiceric/shopchest/nms/v1_17_R1/FakeEntityImpl.java
+++ b/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.PacketQueue;
+import de.epiceric.shopchest.nms.network.entity.FakeEntity;
+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.v1_17_R1.metadata.ExplicitMetadataValue;
+import de.epiceric.shopchest.nms.network.entity.metadata.MetadataValue;
+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.*;
diff --git a/nms/v1_17_R1/src/main/java/de/epiceric/shopchest/nms/v1_17_R1/FakeItemImpl.java b/nms/v1_17_R1/src/main/java/de/epiceric/shopchest/nms/v1_17_R1/network/entity/FakeItemImpl.java
similarity index 69%
rename from nms/v1_17_R1/src/main/java/de/epiceric/shopchest/nms/v1_17_R1/FakeItemImpl.java
rename to nms/v1_17_R1/src/main/java/de/epiceric/shopchest/nms/v1_17_R1/network/entity/FakeItemImpl.java
index 1e13c6d..c53d6a4 100644
--- a/nms/v1_17_R1/src/main/java/de/epiceric/shopchest/nms/v1_17_R1/FakeItemImpl.java
+++ b/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 {
diff --git a/nms/v1_18_R1/src/main/java/de/epiceric/shopchest/nms/v1_18_R1/metadata/ArmorStandMetadataProperties.java b/nms/v1_17_R1/src/main/java/de/epiceric/shopchest/nms/v1_17_R1/network/entity/metadata/ArmorStandMetadataProperties.java
similarity index 68%
rename from nms/v1_18_R1/src/main/java/de/epiceric/shopchest/nms/v1_18_R1/metadata/ArmorStandMetadataProperties.java
rename to nms/v1_17_R1/src/main/java/de/epiceric/shopchest/nms/v1_17_R1/network/entity/metadata/ArmorStandMetadataProperties.java
index 8f1fe75..7479673 100644
--- a/nms/v1_18_R1/src/main/java/de/epiceric/shopchest/nms/v1_18_R1/metadata/ArmorStandMetadataProperties.java
+++ b/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.metadata.MetadataProperty;
+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;
diff --git a/nms/v1_17_R1/src/main/java/de/epiceric/shopchest/nms/v1_17_R1/metadata/EntityMetadataProperties.java b/nms/v1_17_R1/src/main/java/de/epiceric/shopchest/nms/v1_17_R1/network/entity/metadata/EntityMetadataProperties.java
similarity index 92%
rename from nms/v1_17_R1/src/main/java/de/epiceric/shopchest/nms/v1_17_R1/metadata/EntityMetadataProperties.java
rename to nms/v1_17_R1/src/main/java/de/epiceric/shopchest/nms/v1_17_R1/network/entity/metadata/EntityMetadataProperties.java
index 3391d2c..a4faa3a 100644
--- a/nms/v1_17_R1/src/main/java/de/epiceric/shopchest/nms/v1_17_R1/metadata/EntityMetadataProperties.java
+++ b/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.metadata.MetadataProperty;
+import de.epiceric.shopchest.nms.network.entity.metadata.MetadataProperties;
+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;
diff --git a/nms/v1_18_R1/src/main/java/de/epiceric/shopchest/nms/v1_18_R1/metadata/ExplicitMetadataValue.java b/nms/v1_17_R1/src/main/java/de/epiceric/shopchest/nms/v1_17_R1/network/entity/metadata/ExplicitMetadataValue.java
similarity index 54%
rename from nms/v1_18_R1/src/main/java/de/epiceric/shopchest/nms/v1_18_R1/metadata/ExplicitMetadataValue.java
rename to nms/v1_17_R1/src/main/java/de/epiceric/shopchest/nms/v1_17_R1/network/entity/metadata/ExplicitMetadataValue.java
index 5abff29..846609b 100644
--- a/nms/v1_18_R1/src/main/java/de/epiceric/shopchest/nms/v1_18_R1/metadata/ExplicitMetadataValue.java
+++ b/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 {
diff --git a/nms/v1_17_R1/src/main/java/de/epiceric/shopchest/nms/v1_17_R1/metadata/ItemMetadataProperties.java b/nms/v1_17_R1/src/main/java/de/epiceric/shopchest/nms/v1_17_R1/network/entity/metadata/ItemMetadataProperties.java
similarity index 81%
rename from nms/v1_17_R1/src/main/java/de/epiceric/shopchest/nms/v1_17_R1/metadata/ItemMetadataProperties.java
rename to nms/v1_17_R1/src/main/java/de/epiceric/shopchest/nms/v1_17_R1/network/entity/metadata/ItemMetadataProperties.java
index a553a03..adeb3d2 100644
--- a/nms/v1_17_R1/src/main/java/de/epiceric/shopchest/nms/v1_17_R1/metadata/ItemMetadataProperties.java
+++ b/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.metadata.MetadataProperty;
+import de.epiceric.shopchest.nms.network.entity.metadata.MetadataProperties;
+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;
diff --git a/nms/v1_17_R2/src/main/java/de/epiceric/shopchest/nms/v1_17_R2/metadata/MetadataPropertiesImpl.java b/nms/v1_17_R1/src/main/java/de/epiceric/shopchest/nms/v1_17_R1/network/entity/metadata/MetadataPropertiesImpl.java
similarity index 71%
rename from nms/v1_17_R2/src/main/java/de/epiceric/shopchest/nms/v1_17_R2/metadata/MetadataPropertiesImpl.java
rename to nms/v1_17_R1/src/main/java/de/epiceric/shopchest/nms/v1_17_R1/network/entity/metadata/MetadataPropertiesImpl.java
index ff965f0..87f6ccf 100644
--- a/nms/v1_17_R2/src/main/java/de/epiceric/shopchest/nms/v1_17_R2/metadata/MetadataPropertiesImpl.java
+++ b/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 {
diff --git a/nms/v1_17_R2/pom.xml b/nms/v1_17_R2/pom.xml
index f795466..7ba1c44 100644
--- a/nms/v1_17_R2/pom.xml
+++ b/nms/v1_17_R2/pom.xml
@@ -5,7 +5,7 @@
shopchest-nms
de.epiceric
- 1.1.0
+ 1.1.1-SNAPSHOT
4.0.0
diff --git a/nms/v1_17_R2/src/main/java/de/epiceric/shopchest/nms/v1_17_R2/PlatformImpl.java b/nms/v1_17_R2/src/main/java/de/epiceric/shopchest/nms/v1_17_R2/PlatformImpl.java
index d58cced..87aedf6 100644
--- a/nms/v1_17_R2/src/main/java/de/epiceric/shopchest/nms/v1_17_R2/PlatformImpl.java
+++ b/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.v1_17_R2.metadata.MetadataPropertiesImpl;
+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;
+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 {
diff --git a/nms/v1_17_R2/src/main/java/de/epiceric/shopchest/nms/v1_17_R2/PacketQueueImpl.java b/nms/v1_17_R2/src/main/java/de/epiceric/shopchest/nms/v1_17_R2/network/PacketQueueImpl.java
similarity index 88%
rename from nms/v1_17_R2/src/main/java/de/epiceric/shopchest/nms/v1_17_R2/PacketQueueImpl.java
rename to nms/v1_17_R2/src/main/java/de/epiceric/shopchest/nms/v1_17_R2/network/PacketQueueImpl.java
index 2b6f9e3..4647197 100644
--- a/nms/v1_17_R2/src/main/java/de/epiceric/shopchest/nms/v1_17_R2/PacketQueueImpl.java
+++ b/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;
diff --git a/nms/v1_17_R2/src/main/java/de/epiceric/shopchest/nms/v1_17_R2/FakeArmorStandImpl.java b/nms/v1_17_R2/src/main/java/de/epiceric/shopchest/nms/v1_17_R2/network/entity/FakeArmorStandImpl.java
similarity index 70%
rename from nms/v1_17_R2/src/main/java/de/epiceric/shopchest/nms/v1_17_R2/FakeArmorStandImpl.java
rename to nms/v1_17_R2/src/main/java/de/epiceric/shopchest/nms/v1_17_R2/network/entity/FakeArmorStandImpl.java
index 3c0b070..c76f3cc 100644
--- a/nms/v1_17_R2/src/main/java/de/epiceric/shopchest/nms/v1_17_R2/FakeArmorStandImpl.java
+++ b/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 {
diff --git a/nms/v1_18_R1/src/main/java/de/epiceric/shopchest/nms/v1_18_R1/FakeEntityImpl.java b/nms/v1_17_R2/src/main/java/de/epiceric/shopchest/nms/v1_17_R2/network/entity/FakeEntityImpl.java
similarity index 90%
rename from nms/v1_18_R1/src/main/java/de/epiceric/shopchest/nms/v1_18_R1/FakeEntityImpl.java
rename to nms/v1_17_R2/src/main/java/de/epiceric/shopchest/nms/v1_17_R2/network/entity/FakeEntityImpl.java
index b6d07fd..9c61d1c 100644
--- a/nms/v1_18_R1/src/main/java/de/epiceric/shopchest/nms/v1_18_R1/FakeEntityImpl.java
+++ b/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.PacketQueue;
+import de.epiceric.shopchest.nms.network.entity.FakeEntity;
+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.v1_18_R1.metadata.ExplicitMetadataValue;
+import de.epiceric.shopchest.nms.network.entity.metadata.MetadataValue;
+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.*;
diff --git a/nms/v1_18_R1/src/main/java/de/epiceric/shopchest/nms/v1_18_R1/FakeItemImpl.java b/nms/v1_17_R2/src/main/java/de/epiceric/shopchest/nms/v1_17_R2/network/entity/FakeItemImpl.java
similarity index 69%
rename from nms/v1_18_R1/src/main/java/de/epiceric/shopchest/nms/v1_18_R1/FakeItemImpl.java
rename to nms/v1_17_R2/src/main/java/de/epiceric/shopchest/nms/v1_17_R2/network/entity/FakeItemImpl.java
index edb2d6d..0c2b561 100644
--- a/nms/v1_18_R1/src/main/java/de/epiceric/shopchest/nms/v1_18_R1/FakeItemImpl.java
+++ b/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 {
diff --git a/nms/v1_18_R2/src/main/java/de/epiceric/shopchest/nms/v1_18_R2/metadata/ArmorStandMetadataProperties.java b/nms/v1_17_R2/src/main/java/de/epiceric/shopchest/nms/v1_17_R2/network/entity/metadata/ArmorStandMetadataProperties.java
similarity index 68%
rename from nms/v1_18_R2/src/main/java/de/epiceric/shopchest/nms/v1_18_R2/metadata/ArmorStandMetadataProperties.java
rename to nms/v1_17_R2/src/main/java/de/epiceric/shopchest/nms/v1_17_R2/network/entity/metadata/ArmorStandMetadataProperties.java
index 034ab52..7996bd8 100644
--- a/nms/v1_18_R2/src/main/java/de/epiceric/shopchest/nms/v1_18_R2/metadata/ArmorStandMetadataProperties.java
+++ b/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.metadata.MetadataProperty;
+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;
diff --git a/nms/v1_17_R2/src/main/java/de/epiceric/shopchest/nms/v1_17_R2/metadata/EntityMetadataProperties.java b/nms/v1_17_R2/src/main/java/de/epiceric/shopchest/nms/v1_17_R2/network/entity/metadata/EntityMetadataProperties.java
similarity index 92%
rename from nms/v1_17_R2/src/main/java/de/epiceric/shopchest/nms/v1_17_R2/metadata/EntityMetadataProperties.java
rename to nms/v1_17_R2/src/main/java/de/epiceric/shopchest/nms/v1_17_R2/network/entity/metadata/EntityMetadataProperties.java
index 09c38de..28f0152 100644
--- a/nms/v1_17_R2/src/main/java/de/epiceric/shopchest/nms/v1_17_R2/metadata/EntityMetadataProperties.java
+++ b/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.metadata.MetadataProperty;
+import de.epiceric.shopchest.nms.network.entity.metadata.MetadataProperties;
+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;
diff --git a/nms/v1_18_R2/src/main/java/de/epiceric/shopchest/nms/v1_18_R2/metadata/ExplicitMetadataValue.java b/nms/v1_17_R2/src/main/java/de/epiceric/shopchest/nms/v1_17_R2/network/entity/metadata/ExplicitMetadataValue.java
similarity index 54%
rename from nms/v1_18_R2/src/main/java/de/epiceric/shopchest/nms/v1_18_R2/metadata/ExplicitMetadataValue.java
rename to nms/v1_17_R2/src/main/java/de/epiceric/shopchest/nms/v1_17_R2/network/entity/metadata/ExplicitMetadataValue.java
index bdb83d8..cabdcc6 100644
--- a/nms/v1_18_R2/src/main/java/de/epiceric/shopchest/nms/v1_18_R2/metadata/ExplicitMetadataValue.java
+++ b/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 {
diff --git a/nms/v1_17_R2/src/main/java/de/epiceric/shopchest/nms/v1_17_R2/metadata/ItemMetadataProperties.java b/nms/v1_17_R2/src/main/java/de/epiceric/shopchest/nms/v1_17_R2/network/entity/metadata/ItemMetadataProperties.java
similarity index 81%
rename from nms/v1_17_R2/src/main/java/de/epiceric/shopchest/nms/v1_17_R2/metadata/ItemMetadataProperties.java
rename to nms/v1_17_R2/src/main/java/de/epiceric/shopchest/nms/v1_17_R2/network/entity/metadata/ItemMetadataProperties.java
index c4b1e80..cee46ee 100644
--- a/nms/v1_17_R2/src/main/java/de/epiceric/shopchest/nms/v1_17_R2/metadata/ItemMetadataProperties.java
+++ b/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.metadata.MetadataProperty;
+import de.epiceric.shopchest.nms.network.entity.metadata.MetadataProperties;
+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;
diff --git a/nms/v1_18_R1/src/main/java/de/epiceric/shopchest/nms/v1_18_R1/metadata/MetadataPropertiesImpl.java b/nms/v1_17_R2/src/main/java/de/epiceric/shopchest/nms/v1_17_R2/network/entity/metadata/MetadataPropertiesImpl.java
similarity index 71%
rename from nms/v1_18_R1/src/main/java/de/epiceric/shopchest/nms/v1_18_R1/metadata/MetadataPropertiesImpl.java
rename to nms/v1_17_R2/src/main/java/de/epiceric/shopchest/nms/v1_17_R2/network/entity/metadata/MetadataPropertiesImpl.java
index 4a05b79..0f7b29b 100644
--- a/nms/v1_18_R1/src/main/java/de/epiceric/shopchest/nms/v1_18_R1/metadata/MetadataPropertiesImpl.java
+++ b/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 {
diff --git a/nms/v1_18_R1/pom.xml b/nms/v1_18_R1/pom.xml
index 06db50b..685bf6d 100644
--- a/nms/v1_18_R1/pom.xml
+++ b/nms/v1_18_R1/pom.xml
@@ -5,7 +5,7 @@
shopchest-nms
de.epiceric
- 1.1.0
+ 1.1.1-SNAPSHOT
4.0.0
diff --git a/nms/v1_18_R1/src/main/java/de/epiceric/shopchest/nms/v1_18_R1/PlatformImpl.java b/nms/v1_18_R1/src/main/java/de/epiceric/shopchest/nms/v1_18_R1/PlatformImpl.java
index 798664d..f1b7572 100644
--- a/nms/v1_18_R1/src/main/java/de/epiceric/shopchest/nms/v1_18_R1/PlatformImpl.java
+++ b/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.v1_18_R1.metadata.MetadataPropertiesImpl;
+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;
+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 {
diff --git a/nms/v1_18_R1/src/main/java/de/epiceric/shopchest/nms/v1_18_R1/PacketQueueImpl.java b/nms/v1_18_R1/src/main/java/de/epiceric/shopchest/nms/v1_18_R1/network/PacketQueueImpl.java
similarity index 88%
rename from nms/v1_18_R1/src/main/java/de/epiceric/shopchest/nms/v1_18_R1/PacketQueueImpl.java
rename to nms/v1_18_R1/src/main/java/de/epiceric/shopchest/nms/v1_18_R1/network/PacketQueueImpl.java
index 984e5fd..f7bf8f9 100644
--- a/nms/v1_18_R1/src/main/java/de/epiceric/shopchest/nms/v1_18_R1/PacketQueueImpl.java
+++ b/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;
diff --git a/nms/v1_18_R2/src/main/java/de/epiceric/shopchest/nms/v1_18_R2/FakeArmorStandImpl.java b/nms/v1_18_R1/src/main/java/de/epiceric/shopchest/nms/v1_18_R1/network/entity/FakeArmorStandImpl.java
similarity index 70%
rename from nms/v1_18_R2/src/main/java/de/epiceric/shopchest/nms/v1_18_R2/FakeArmorStandImpl.java
rename to nms/v1_18_R1/src/main/java/de/epiceric/shopchest/nms/v1_18_R1/network/entity/FakeArmorStandImpl.java
index 241189a..2573cc6 100644
--- a/nms/v1_18_R2/src/main/java/de/epiceric/shopchest/nms/v1_18_R2/FakeArmorStandImpl.java
+++ b/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 {
diff --git a/nms/v1_17_R2/src/main/java/de/epiceric/shopchest/nms/v1_17_R2/FakeEntityImpl.java b/nms/v1_18_R1/src/main/java/de/epiceric/shopchest/nms/v1_18_R1/network/entity/FakeEntityImpl.java
similarity index 90%
rename from nms/v1_17_R2/src/main/java/de/epiceric/shopchest/nms/v1_17_R2/FakeEntityImpl.java
rename to nms/v1_18_R1/src/main/java/de/epiceric/shopchest/nms/v1_18_R1/network/entity/FakeEntityImpl.java
index 3f6d40f..82a48b1 100644
--- a/nms/v1_17_R2/src/main/java/de/epiceric/shopchest/nms/v1_17_R2/FakeEntityImpl.java
+++ b/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.PacketQueue;
+import de.epiceric.shopchest.nms.network.entity.FakeEntity;
+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.v1_17_R2.metadata.ExplicitMetadataValue;
+import de.epiceric.shopchest.nms.network.entity.metadata.MetadataValue;
+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.*;
diff --git a/nms/v1_17_R2/src/main/java/de/epiceric/shopchest/nms/v1_17_R2/FakeItemImpl.java b/nms/v1_18_R1/src/main/java/de/epiceric/shopchest/nms/v1_18_R1/network/entity/FakeItemImpl.java
similarity index 69%
rename from nms/v1_17_R2/src/main/java/de/epiceric/shopchest/nms/v1_17_R2/FakeItemImpl.java
rename to nms/v1_18_R1/src/main/java/de/epiceric/shopchest/nms/v1_18_R1/network/entity/FakeItemImpl.java
index 70a00f6..f1355d3 100644
--- a/nms/v1_17_R2/src/main/java/de/epiceric/shopchest/nms/v1_17_R2/FakeItemImpl.java
+++ b/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 {
diff --git a/nms/v1_17_R1/src/main/java/de/epiceric/shopchest/nms/v1_17_R1/metadata/ArmorStandMetadataProperties.java b/nms/v1_18_R1/src/main/java/de/epiceric/shopchest/nms/v1_18_R1/network/entity/metadata/ArmorStandMetadataProperties.java
similarity index 68%
rename from nms/v1_17_R1/src/main/java/de/epiceric/shopchest/nms/v1_17_R1/metadata/ArmorStandMetadataProperties.java
rename to nms/v1_18_R1/src/main/java/de/epiceric/shopchest/nms/v1_18_R1/network/entity/metadata/ArmorStandMetadataProperties.java
index b3e5e29..b5402c8 100644
--- a/nms/v1_17_R1/src/main/java/de/epiceric/shopchest/nms/v1_17_R1/metadata/ArmorStandMetadataProperties.java
+++ b/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.metadata.MetadataProperty;
+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;
diff --git a/nms/v1_18_R1/src/main/java/de/epiceric/shopchest/nms/v1_18_R1/metadata/EntityMetadataProperties.java b/nms/v1_18_R1/src/main/java/de/epiceric/shopchest/nms/v1_18_R1/network/entity/metadata/EntityMetadataProperties.java
similarity index 92%
rename from nms/v1_18_R1/src/main/java/de/epiceric/shopchest/nms/v1_18_R1/metadata/EntityMetadataProperties.java
rename to nms/v1_18_R1/src/main/java/de/epiceric/shopchest/nms/v1_18_R1/network/entity/metadata/EntityMetadataProperties.java
index 9f2d5d5..4b775a8 100644
--- a/nms/v1_18_R1/src/main/java/de/epiceric/shopchest/nms/v1_18_R1/metadata/EntityMetadataProperties.java
+++ b/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.metadata.MetadataProperty;
+import de.epiceric.shopchest.nms.network.entity.metadata.MetadataProperties;
+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;
diff --git a/nms/v1_17_R1/src/main/java/de/epiceric/shopchest/nms/v1_17_R1/metadata/ExplicitMetadataValue.java b/nms/v1_18_R1/src/main/java/de/epiceric/shopchest/nms/v1_18_R1/network/entity/metadata/ExplicitMetadataValue.java
similarity index 54%
rename from nms/v1_17_R1/src/main/java/de/epiceric/shopchest/nms/v1_17_R1/metadata/ExplicitMetadataValue.java
rename to nms/v1_18_R1/src/main/java/de/epiceric/shopchest/nms/v1_18_R1/network/entity/metadata/ExplicitMetadataValue.java
index 165fdb2..1ece793 100644
--- a/nms/v1_17_R1/src/main/java/de/epiceric/shopchest/nms/v1_17_R1/metadata/ExplicitMetadataValue.java
+++ b/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 {
diff --git a/nms/v1_18_R1/src/main/java/de/epiceric/shopchest/nms/v1_18_R1/metadata/ItemMetadataProperties.java b/nms/v1_18_R1/src/main/java/de/epiceric/shopchest/nms/v1_18_R1/network/entity/metadata/ItemMetadataProperties.java
similarity index 81%
rename from nms/v1_18_R1/src/main/java/de/epiceric/shopchest/nms/v1_18_R1/metadata/ItemMetadataProperties.java
rename to nms/v1_18_R1/src/main/java/de/epiceric/shopchest/nms/v1_18_R1/network/entity/metadata/ItemMetadataProperties.java
index bb31a06..8d99375 100644
--- a/nms/v1_18_R1/src/main/java/de/epiceric/shopchest/nms/v1_18_R1/metadata/ItemMetadataProperties.java
+++ b/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.metadata.MetadataProperty;
+import de.epiceric.shopchest.nms.network.entity.metadata.MetadataProperties;
+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;
diff --git a/nms/v1_17_R1/src/main/java/de/epiceric/shopchest/nms/v1_17_R1/metadata/MetadataPropertiesImpl.java b/nms/v1_18_R1/src/main/java/de/epiceric/shopchest/nms/v1_18_R1/network/entity/metadata/MetadataPropertiesImpl.java
similarity index 71%
rename from nms/v1_17_R1/src/main/java/de/epiceric/shopchest/nms/v1_17_R1/metadata/MetadataPropertiesImpl.java
rename to nms/v1_18_R1/src/main/java/de/epiceric/shopchest/nms/v1_18_R1/network/entity/metadata/MetadataPropertiesImpl.java
index 17ccfdf..0e7ccc3 100644
--- a/nms/v1_17_R1/src/main/java/de/epiceric/shopchest/nms/v1_17_R1/metadata/MetadataPropertiesImpl.java
+++ b/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 {
diff --git a/nms/v1_18_R2/pom.xml b/nms/v1_18_R2/pom.xml
index e78576d..3c529c9 100644
--- a/nms/v1_18_R2/pom.xml
+++ b/nms/v1_18_R2/pom.xml
@@ -5,7 +5,7 @@
shopchest-nms
de.epiceric
- 1.1.0
+ 1.1.1-SNAPSHOT
4.0.0
diff --git a/nms/v1_18_R2/src/main/java/de/epiceric/shopchest/nms/v1_18_R2/PlatformImpl.java b/nms/v1_18_R2/src/main/java/de/epiceric/shopchest/nms/v1_18_R2/PlatformImpl.java
index 90131e9..befd300 100644
--- a/nms/v1_18_R2/src/main/java/de/epiceric/shopchest/nms/v1_18_R2/PlatformImpl.java
+++ b/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.v1_18_R2.metadata.MetadataPropertiesImpl;
+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;
+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 {
diff --git a/nms/v1_18_R2/src/main/java/de/epiceric/shopchest/nms/v1_18_R2/PacketQueueImpl.java b/nms/v1_18_R2/src/main/java/de/epiceric/shopchest/nms/v1_18_R2/network/PacketQueueImpl.java
similarity index 88%
rename from nms/v1_18_R2/src/main/java/de/epiceric/shopchest/nms/v1_18_R2/PacketQueueImpl.java
rename to nms/v1_18_R2/src/main/java/de/epiceric/shopchest/nms/v1_18_R2/network/PacketQueueImpl.java
index c809cea..db0edf5 100644
--- a/nms/v1_18_R2/src/main/java/de/epiceric/shopchest/nms/v1_18_R2/PacketQueueImpl.java
+++ b/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;
diff --git a/nms/v1_17_R1/src/main/java/de/epiceric/shopchest/nms/v1_17_R1/FakeArmorStandImpl.java b/nms/v1_18_R2/src/main/java/de/epiceric/shopchest/nms/v1_18_R2/network/entity/FakeArmorStandImpl.java
similarity index 70%
rename from nms/v1_17_R1/src/main/java/de/epiceric/shopchest/nms/v1_17_R1/FakeArmorStandImpl.java
rename to nms/v1_18_R2/src/main/java/de/epiceric/shopchest/nms/v1_18_R2/network/entity/FakeArmorStandImpl.java
index 02f5daf..87c7ee1 100644
--- a/nms/v1_17_R1/src/main/java/de/epiceric/shopchest/nms/v1_17_R1/FakeArmorStandImpl.java
+++ b/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 {
diff --git a/nms/v1_18_R2/src/main/java/de/epiceric/shopchest/nms/v1_18_R2/FakeEntityImpl.java b/nms/v1_18_R2/src/main/java/de/epiceric/shopchest/nms/v1_18_R2/network/entity/FakeEntityImpl.java
similarity index 90%
rename from nms/v1_18_R2/src/main/java/de/epiceric/shopchest/nms/v1_18_R2/FakeEntityImpl.java
rename to nms/v1_18_R2/src/main/java/de/epiceric/shopchest/nms/v1_18_R2/network/entity/FakeEntityImpl.java
index 03a1072..94a17db 100644
--- a/nms/v1_18_R2/src/main/java/de/epiceric/shopchest/nms/v1_18_R2/FakeEntityImpl.java
+++ b/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.PacketQueue;
+import de.epiceric.shopchest.nms.network.entity.FakeEntity;
+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.v1_18_R2.metadata.ExplicitMetadataValue;
+import de.epiceric.shopchest.nms.network.entity.metadata.MetadataValue;
+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.*;
diff --git a/nms/v1_18_R2/src/main/java/de/epiceric/shopchest/nms/v1_18_R2/FakeItemImpl.java b/nms/v1_18_R2/src/main/java/de/epiceric/shopchest/nms/v1_18_R2/network/entity/FakeItemImpl.java
similarity index 69%
rename from nms/v1_18_R2/src/main/java/de/epiceric/shopchest/nms/v1_18_R2/FakeItemImpl.java
rename to nms/v1_18_R2/src/main/java/de/epiceric/shopchest/nms/v1_18_R2/network/entity/FakeItemImpl.java
index e56fb1e..ee85a7a 100644
--- a/nms/v1_18_R2/src/main/java/de/epiceric/shopchest/nms/v1_18_R2/FakeItemImpl.java
+++ b/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 {
diff --git a/nms/v1_17_R2/src/main/java/de/epiceric/shopchest/nms/v1_17_R2/metadata/ArmorStandMetadataProperties.java b/nms/v1_18_R2/src/main/java/de/epiceric/shopchest/nms/v1_18_R2/network/entity/metadata/ArmorStandMetadataProperties.java
similarity index 68%
rename from nms/v1_17_R2/src/main/java/de/epiceric/shopchest/nms/v1_17_R2/metadata/ArmorStandMetadataProperties.java
rename to nms/v1_18_R2/src/main/java/de/epiceric/shopchest/nms/v1_18_R2/network/entity/metadata/ArmorStandMetadataProperties.java
index 6dc9c33..f1d7896 100644
--- a/nms/v1_17_R2/src/main/java/de/epiceric/shopchest/nms/v1_17_R2/metadata/ArmorStandMetadataProperties.java
+++ b/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.metadata.MetadataProperty;
+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;
diff --git a/nms/v1_18_R2/src/main/java/de/epiceric/shopchest/nms/v1_18_R2/metadata/EntityMetadataProperties.java b/nms/v1_18_R2/src/main/java/de/epiceric/shopchest/nms/v1_18_R2/network/entity/metadata/EntityMetadataProperties.java
similarity index 92%
rename from nms/v1_18_R2/src/main/java/de/epiceric/shopchest/nms/v1_18_R2/metadata/EntityMetadataProperties.java
rename to nms/v1_18_R2/src/main/java/de/epiceric/shopchest/nms/v1_18_R2/network/entity/metadata/EntityMetadataProperties.java
index bb29a42..1c07048 100644
--- a/nms/v1_18_R2/src/main/java/de/epiceric/shopchest/nms/v1_18_R2/metadata/EntityMetadataProperties.java
+++ b/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.metadata.MetadataProperty;
+import de.epiceric.shopchest.nms.network.entity.metadata.MetadataProperties;
+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;
diff --git a/nms/v1_17_R2/src/main/java/de/epiceric/shopchest/nms/v1_17_R2/metadata/ExplicitMetadataValue.java b/nms/v1_18_R2/src/main/java/de/epiceric/shopchest/nms/v1_18_R2/network/entity/metadata/ExplicitMetadataValue.java
similarity index 54%
rename from nms/v1_17_R2/src/main/java/de/epiceric/shopchest/nms/v1_17_R2/metadata/ExplicitMetadataValue.java
rename to nms/v1_18_R2/src/main/java/de/epiceric/shopchest/nms/v1_18_R2/network/entity/metadata/ExplicitMetadataValue.java
index 8b5983f..62c1a22 100644
--- a/nms/v1_17_R2/src/main/java/de/epiceric/shopchest/nms/v1_17_R2/metadata/ExplicitMetadataValue.java
+++ b/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 {
diff --git a/nms/v1_18_R2/src/main/java/de/epiceric/shopchest/nms/v1_18_R2/metadata/ItemMetadataProperties.java b/nms/v1_18_R2/src/main/java/de/epiceric/shopchest/nms/v1_18_R2/network/entity/metadata/ItemMetadataProperties.java
similarity index 81%
rename from nms/v1_18_R2/src/main/java/de/epiceric/shopchest/nms/v1_18_R2/metadata/ItemMetadataProperties.java
rename to nms/v1_18_R2/src/main/java/de/epiceric/shopchest/nms/v1_18_R2/network/entity/metadata/ItemMetadataProperties.java
index 2ce64f5..54337ea 100644
--- a/nms/v1_18_R2/src/main/java/de/epiceric/shopchest/nms/v1_18_R2/metadata/ItemMetadataProperties.java
+++ b/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.metadata.MetadataProperty;
+import de.epiceric.shopchest.nms.network.entity.metadata.MetadataProperties;
+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;
diff --git a/nms/v1_18_R2/src/main/java/de/epiceric/shopchest/nms/v1_18_R2/metadata/MetadataPropertiesImpl.java b/nms/v1_18_R2/src/main/java/de/epiceric/shopchest/nms/v1_18_R2/network/entity/metadata/MetadataPropertiesImpl.java
similarity index 71%
rename from nms/v1_18_R2/src/main/java/de/epiceric/shopchest/nms/v1_18_R2/metadata/MetadataPropertiesImpl.java
rename to nms/v1_18_R2/src/main/java/de/epiceric/shopchest/nms/v1_18_R2/network/entity/metadata/MetadataPropertiesImpl.java
index db98baa..f79668d 100644
--- a/nms/v1_18_R2/src/main/java/de/epiceric/shopchest/nms/v1_18_R2/metadata/MetadataPropertiesImpl.java
+++ b/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 {
diff --git a/nms/v1_19_R1/pom.xml b/nms/v1_19_R1/pom.xml
index 80809e0..617ca7c 100644
--- a/nms/v1_19_R1/pom.xml
+++ b/nms/v1_19_R1/pom.xml
@@ -5,7 +5,7 @@
shopchest-nms
de.epiceric
- 1.1.0
+ 1.1.1-SNAPSHOT
4.0.0
diff --git a/nms/v1_19_R1/src/main/java/de/epiceric/shopchest/nms/v1_19_R1/FakeArmorStandImpl.java b/nms/v1_19_R1/src/main/java/de/epiceric/shopchest/nms/v1_19_R1/FakeArmorStandImpl.java
deleted file mode 100644
index 7e5a97d..0000000
--- a/nms/v1_19_R1/src/main/java/de/epiceric/shopchest/nms/v1_19_R1/FakeArmorStandImpl.java
+++ /dev/null
@@ -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;
- }
-}
diff --git a/nms/v1_19_R1/src/main/java/de/epiceric/shopchest/nms/v1_19_R1/FakeItemImpl.java b/nms/v1_19_R1/src/main/java/de/epiceric/shopchest/nms/v1_19_R1/FakeItemImpl.java
deleted file mode 100644
index d3959c7..0000000
--- a/nms/v1_19_R1/src/main/java/de/epiceric/shopchest/nms/v1_19_R1/FakeItemImpl.java
+++ /dev/null
@@ -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;
- }
-}
diff --git a/nms/v1_19_R1/src/main/java/de/epiceric/shopchest/nms/v1_19_R1/PlatformImpl.java b/nms/v1_19_R1/src/main/java/de/epiceric/shopchest/nms/v1_19_R1/PlatformImpl.java
index cd20e26..6a16246 100644
--- a/nms/v1_19_R1/src/main/java/de/epiceric/shopchest/nms/v1_19_R1/PlatformImpl.java
+++ b/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.v1_19_R1.metadata.MetadataPropertiesImpl;
+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;
+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 {
diff --git a/nms/v1_19_R1/src/main/java/de/epiceric/shopchest/nms/v1_19_R1/metadata/ArmorStandMetadataProperties.java b/nms/v1_19_R1/src/main/java/de/epiceric/shopchest/nms/v1_19_R1/metadata/ArmorStandMetadataProperties.java
deleted file mode 100644
index 7cd4c14..0000000
--- a/nms/v1_19_R1/src/main/java/de/epiceric/shopchest/nms/v1_19_R1/metadata/ArmorStandMetadataProperties.java
+++ /dev/null
@@ -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 marker() {
- return value -> (ExplicitMetadataValue) () -> new SynchedEntityData.DataItem<>(ArmorStand.DATA_CLIENT_FLAGS, value ? MARKER_FLAG : 0);
- }
-
-}
diff --git a/nms/v1_19_R1/src/main/java/de/epiceric/shopchest/nms/v1_19_R1/metadata/ExplicitMetadataValue.java b/nms/v1_19_R1/src/main/java/de/epiceric/shopchest/nms/v1_19_R1/metadata/ExplicitMetadataValue.java
deleted file mode 100644
index 123da21..0000000
--- a/nms/v1_19_R1/src/main/java/de/epiceric/shopchest/nms/v1_19_R1/metadata/ExplicitMetadataValue.java
+++ /dev/null
@@ -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();
-
-}
diff --git a/nms/v1_19_R1/src/main/java/de/epiceric/shopchest/nms/v1_19_R1/metadata/MetadataPropertiesImpl.java b/nms/v1_19_R1/src/main/java/de/epiceric/shopchest/nms/v1_19_R1/metadata/MetadataPropertiesImpl.java
deleted file mode 100644
index 6a25b5e..0000000
--- a/nms/v1_19_R1/src/main/java/de/epiceric/shopchest/nms/v1_19_R1/metadata/MetadataPropertiesImpl.java
+++ /dev/null
@@ -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();
- }
-}
diff --git a/nms/v1_19_R1/src/main/java/de/epiceric/shopchest/nms/v1_19_R1/PacketQueueImpl.java b/nms/v1_19_R1/src/main/java/de/epiceric/shopchest/nms/v1_19_R1/network/PacketQueueImpl.java
similarity index 88%
rename from nms/v1_19_R1/src/main/java/de/epiceric/shopchest/nms/v1_19_R1/PacketQueueImpl.java
rename to nms/v1_19_R1/src/main/java/de/epiceric/shopchest/nms/v1_19_R1/network/PacketQueueImpl.java
index 1bb9d3f..ece53fc 100644
--- a/nms/v1_19_R1/src/main/java/de/epiceric/shopchest/nms/v1_19_R1/PacketQueueImpl.java
+++ b/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;
diff --git a/nms/v1_19_R1/src/main/java/de/epiceric/shopchest/nms/v1_19_R1/network/entity/FakeArmorStandImpl.java b/nms/v1_19_R1/src/main/java/de/epiceric/shopchest/nms/v1_19_R1/network/entity/FakeArmorStandImpl.java
new file mode 100644
index 0000000..78b3632
--- /dev/null
+++ b/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;
+ }
+}
diff --git a/nms/v1_19_R1/src/main/java/de/epiceric/shopchest/nms/v1_19_R1/FakeEntityImpl.java b/nms/v1_19_R1/src/main/java/de/epiceric/shopchest/nms/v1_19_R1/network/entity/FakeEntityImpl.java
similarity index 90%
rename from nms/v1_19_R1/src/main/java/de/epiceric/shopchest/nms/v1_19_R1/FakeEntityImpl.java
rename to nms/v1_19_R1/src/main/java/de/epiceric/shopchest/nms/v1_19_R1/network/entity/FakeEntityImpl.java
index 60629ba..cc0b04a 100644
--- a/nms/v1_19_R1/src/main/java/de/epiceric/shopchest/nms/v1_19_R1/FakeEntityImpl.java
+++ b/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.PacketQueue;
+import de.epiceric.shopchest.nms.network.entity.FakeEntity;
+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.v1_19_R1.metadata.ExplicitMetadataValue;
+import de.epiceric.shopchest.nms.network.entity.metadata.MetadataValue;
+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.*;
diff --git a/nms/v1_19_R1/src/main/java/de/epiceric/shopchest/nms/v1_19_R1/network/entity/FakeItemImpl.java b/nms/v1_19_R1/src/main/java/de/epiceric/shopchest/nms/v1_19_R1/network/entity/FakeItemImpl.java
new file mode 100644
index 0000000..525b189
--- /dev/null
+++ b/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;
+ }
+}
diff --git a/nms/v1_19_R1/src/main/java/de/epiceric/shopchest/nms/v1_19_R1/network/entity/metadata/ArmorStandMetadataProperties.java b/nms/v1_19_R1/src/main/java/de/epiceric/shopchest/nms/v1_19_R1/network/entity/metadata/ArmorStandMetadataProperties.java
new file mode 100644
index 0000000..d6f2c4a
--- /dev/null
+++ b/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 marker() {
+ return value -> (ExplicitMetadataValue) () -> new SynchedEntityData.DataItem<>(ArmorStand.DATA_CLIENT_FLAGS, value ? MARKER_FLAG : 0);
+ }
+
+}
diff --git a/nms/v1_19_R1/src/main/java/de/epiceric/shopchest/nms/v1_19_R1/metadata/EntityMetadataProperties.java b/nms/v1_19_R1/src/main/java/de/epiceric/shopchest/nms/v1_19_R1/network/entity/metadata/EntityMetadataProperties.java
similarity index 92%
rename from nms/v1_19_R1/src/main/java/de/epiceric/shopchest/nms/v1_19_R1/metadata/EntityMetadataProperties.java
rename to nms/v1_19_R1/src/main/java/de/epiceric/shopchest/nms/v1_19_R1/network/entity/metadata/EntityMetadataProperties.java
index a6b074f..dde60c2 100644
--- a/nms/v1_19_R1/src/main/java/de/epiceric/shopchest/nms/v1_19_R1/metadata/EntityMetadataProperties.java
+++ b/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.metadata.MetadataProperty;
+import de.epiceric.shopchest.nms.network.entity.metadata.MetadataProperties;
+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;
diff --git a/nms/v1_19_R1/src/main/java/de/epiceric/shopchest/nms/v1_19_R1/network/entity/metadata/ExplicitMetadataValue.java b/nms/v1_19_R1/src/main/java/de/epiceric/shopchest/nms/v1_19_R1/network/entity/metadata/ExplicitMetadataValue.java
new file mode 100644
index 0000000..eb4f045
--- /dev/null
+++ b/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();
+
+}
diff --git a/nms/v1_19_R1/src/main/java/de/epiceric/shopchest/nms/v1_19_R1/metadata/ItemMetadataProperties.java b/nms/v1_19_R1/src/main/java/de/epiceric/shopchest/nms/v1_19_R1/network/entity/metadata/ItemMetadataProperties.java
similarity index 81%
rename from nms/v1_19_R1/src/main/java/de/epiceric/shopchest/nms/v1_19_R1/metadata/ItemMetadataProperties.java
rename to nms/v1_19_R1/src/main/java/de/epiceric/shopchest/nms/v1_19_R1/network/entity/metadata/ItemMetadataProperties.java
index 56a0fa5..30a22c7 100644
--- a/nms/v1_19_R1/src/main/java/de/epiceric/shopchest/nms/v1_19_R1/metadata/ItemMetadataProperties.java
+++ b/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.metadata.MetadataProperty;
+import de.epiceric.shopchest.nms.network.entity.metadata.MetadataProperties;
+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;
diff --git a/nms/v1_19_R1/src/main/java/de/epiceric/shopchest/nms/v1_19_R1/network/entity/metadata/MetadataPropertiesImpl.java b/nms/v1_19_R1/src/main/java/de/epiceric/shopchest/nms/v1_19_R1/network/entity/metadata/MetadataPropertiesImpl.java
new file mode 100644
index 0000000..ef56436
--- /dev/null
+++ b/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();
+ }
+}
diff --git a/nms/v1_19_R2/pom.xml b/nms/v1_19_R2/pom.xml
index 691c64b..39dbc5f 100644
--- a/nms/v1_19_R2/pom.xml
+++ b/nms/v1_19_R2/pom.xml
@@ -5,7 +5,7 @@
shopchest-nms
de.epiceric
- 1.1.0
+ 1.1.1-SNAPSHOT
4.0.0
diff --git a/nms/v1_19_R2/src/main/java/de/epiceric/shopchest/nms/v1_19_R2/FakeArmorStandImpl.java b/nms/v1_19_R2/src/main/java/de/epiceric/shopchest/nms/v1_19_R2/FakeArmorStandImpl.java
deleted file mode 100644
index fbb9b3f..0000000
--- a/nms/v1_19_R2/src/main/java/de/epiceric/shopchest/nms/v1_19_R2/FakeArmorStandImpl.java
+++ /dev/null
@@ -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;
- }
-}
diff --git a/nms/v1_19_R2/src/main/java/de/epiceric/shopchest/nms/v1_19_R2/FakeItemImpl.java b/nms/v1_19_R2/src/main/java/de/epiceric/shopchest/nms/v1_19_R2/FakeItemImpl.java
deleted file mode 100644
index 4a69095..0000000
--- a/nms/v1_19_R2/src/main/java/de/epiceric/shopchest/nms/v1_19_R2/FakeItemImpl.java
+++ /dev/null
@@ -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;
- }
-}
diff --git a/nms/v1_19_R2/src/main/java/de/epiceric/shopchest/nms/v1_19_R2/PlatformImpl.java b/nms/v1_19_R2/src/main/java/de/epiceric/shopchest/nms/v1_19_R2/PlatformImpl.java
index 9cf12d7..0464897 100644
--- a/nms/v1_19_R2/src/main/java/de/epiceric/shopchest/nms/v1_19_R2/PlatformImpl.java
+++ b/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.v1_19_R2.metadata.MetadataPropertiesImpl;
+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;
+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 {
diff --git a/nms/v1_19_R2/src/main/java/de/epiceric/shopchest/nms/v1_19_R2/metadata/MetadataPropertiesImpl.java b/nms/v1_19_R2/src/main/java/de/epiceric/shopchest/nms/v1_19_R2/metadata/MetadataPropertiesImpl.java
deleted file mode 100644
index ad0970d..0000000
--- a/nms/v1_19_R2/src/main/java/de/epiceric/shopchest/nms/v1_19_R2/metadata/MetadataPropertiesImpl.java
+++ /dev/null
@@ -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();
- }
-}
diff --git a/nms/v1_19_R2/src/main/java/de/epiceric/shopchest/nms/v1_19_R2/PacketQueueImpl.java b/nms/v1_19_R2/src/main/java/de/epiceric/shopchest/nms/v1_19_R2/network/PacketQueueImpl.java
similarity index 88%
rename from nms/v1_19_R2/src/main/java/de/epiceric/shopchest/nms/v1_19_R2/PacketQueueImpl.java
rename to nms/v1_19_R2/src/main/java/de/epiceric/shopchest/nms/v1_19_R2/network/PacketQueueImpl.java
index 94ee128..3ef56d4 100644
--- a/nms/v1_19_R2/src/main/java/de/epiceric/shopchest/nms/v1_19_R2/PacketQueueImpl.java
+++ b/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;
diff --git a/nms/v1_19_R2/src/main/java/de/epiceric/shopchest/nms/v1_19_R2/network/entity/FakeArmorStandImpl.java b/nms/v1_19_R2/src/main/java/de/epiceric/shopchest/nms/v1_19_R2/network/entity/FakeArmorStandImpl.java
new file mode 100644
index 0000000..6237a04
--- /dev/null
+++ b/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;
+ }
+}
diff --git a/nms/v1_19_R2/src/main/java/de/epiceric/shopchest/nms/v1_19_R2/FakeEntityImpl.java b/nms/v1_19_R2/src/main/java/de/epiceric/shopchest/nms/v1_19_R2/network/entity/FakeEntityImpl.java
similarity index 89%
rename from nms/v1_19_R2/src/main/java/de/epiceric/shopchest/nms/v1_19_R2/FakeEntityImpl.java
rename to nms/v1_19_R2/src/main/java/de/epiceric/shopchest/nms/v1_19_R2/network/entity/FakeEntityImpl.java
index 29f9cec..c2e3668 100644
--- a/nms/v1_19_R2/src/main/java/de/epiceric/shopchest/nms/v1_19_R2/FakeEntityImpl.java
+++ b/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.PacketQueue;
+import de.epiceric.shopchest.nms.network.entity.FakeEntity;
+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.v1_19_R2.metadata.ExplicitMetadataValue;
+import de.epiceric.shopchest.nms.network.entity.metadata.MetadataValue;
+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.*;
diff --git a/nms/v1_19_R2/src/main/java/de/epiceric/shopchest/nms/v1_19_R2/network/entity/FakeItemImpl.java b/nms/v1_19_R2/src/main/java/de/epiceric/shopchest/nms/v1_19_R2/network/entity/FakeItemImpl.java
new file mode 100644
index 0000000..d35e4f2
--- /dev/null
+++ b/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;
+ }
+}
diff --git a/nms/v1_19_R2/src/main/java/de/epiceric/shopchest/nms/v1_19_R2/metadata/ArmorStandMetadataProperties.java b/nms/v1_19_R2/src/main/java/de/epiceric/shopchest/nms/v1_19_R2/network/entity/metadata/ArmorStandMetadataProperties.java
similarity index 68%
rename from nms/v1_19_R2/src/main/java/de/epiceric/shopchest/nms/v1_19_R2/metadata/ArmorStandMetadataProperties.java
rename to nms/v1_19_R2/src/main/java/de/epiceric/shopchest/nms/v1_19_R2/network/entity/metadata/ArmorStandMetadataProperties.java
index b944be3..9c5c1c8 100644
--- a/nms/v1_19_R2/src/main/java/de/epiceric/shopchest/nms/v1_19_R2/metadata/ArmorStandMetadataProperties.java
+++ b/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.metadata.MetadataProperty;
+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;
diff --git a/nms/v1_19_R2/src/main/java/de/epiceric/shopchest/nms/v1_19_R2/metadata/EntityMetadataProperties.java b/nms/v1_19_R2/src/main/java/de/epiceric/shopchest/nms/v1_19_R2/network/entity/metadata/EntityMetadataProperties.java
similarity index 92%
rename from nms/v1_19_R2/src/main/java/de/epiceric/shopchest/nms/v1_19_R2/metadata/EntityMetadataProperties.java
rename to nms/v1_19_R2/src/main/java/de/epiceric/shopchest/nms/v1_19_R2/network/entity/metadata/EntityMetadataProperties.java
index d1e9f2b..efd7d48 100644
--- a/nms/v1_19_R2/src/main/java/de/epiceric/shopchest/nms/v1_19_R2/metadata/EntityMetadataProperties.java
+++ b/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.metadata.MetadataProperty;
+import de.epiceric.shopchest.nms.network.entity.metadata.MetadataProperties;
+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;
diff --git a/nms/v1_19_R2/src/main/java/de/epiceric/shopchest/nms/v1_19_R2/metadata/ExplicitMetadataValue.java b/nms/v1_19_R2/src/main/java/de/epiceric/shopchest/nms/v1_19_R2/network/entity/metadata/ExplicitMetadataValue.java
similarity index 54%
rename from nms/v1_19_R2/src/main/java/de/epiceric/shopchest/nms/v1_19_R2/metadata/ExplicitMetadataValue.java
rename to nms/v1_19_R2/src/main/java/de/epiceric/shopchest/nms/v1_19_R2/network/entity/metadata/ExplicitMetadataValue.java
index e9e6bc5..31d524f 100644
--- a/nms/v1_19_R2/src/main/java/de/epiceric/shopchest/nms/v1_19_R2/metadata/ExplicitMetadataValue.java
+++ b/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 {
diff --git a/nms/v1_19_R2/src/main/java/de/epiceric/shopchest/nms/v1_19_R2/metadata/ItemMetadataProperties.java b/nms/v1_19_R2/src/main/java/de/epiceric/shopchest/nms/v1_19_R2/network/entity/metadata/ItemMetadataProperties.java
similarity index 81%
rename from nms/v1_19_R2/src/main/java/de/epiceric/shopchest/nms/v1_19_R2/metadata/ItemMetadataProperties.java
rename to nms/v1_19_R2/src/main/java/de/epiceric/shopchest/nms/v1_19_R2/network/entity/metadata/ItemMetadataProperties.java
index 35f0f80..fed22bf 100644
--- a/nms/v1_19_R2/src/main/java/de/epiceric/shopchest/nms/v1_19_R2/metadata/ItemMetadataProperties.java
+++ b/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.metadata.MetadataProperty;
+import de.epiceric.shopchest.nms.network.entity.metadata.MetadataProperties;
+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;
diff --git a/nms/v1_19_R2/src/main/java/de/epiceric/shopchest/nms/v1_19_R2/network/entity/metadata/MetadataPropertiesImpl.java b/nms/v1_19_R2/src/main/java/de/epiceric/shopchest/nms/v1_19_R2/network/entity/metadata/MetadataPropertiesImpl.java
new file mode 100644
index 0000000..a7aaaaf
--- /dev/null
+++ b/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();
+ }
+}
diff --git a/plugin/src/main/java/de/epiceric/shopchest/nms/ArmorStandWrapper.java b/plugin/src/main/java/de/epiceric/shopchest/nms/ArmorStandWrapper.java
index 270a8e5..6d59c60 100644
--- a/plugin/src/main/java/de/epiceric/shopchest/nms/ArmorStandWrapper.java
+++ b/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;