From 2e39a3230845836a119eaaee3eccdca3def1e429 Mon Sep 17 00:00:00 2001
From: Alexander <protonull@protonmail.com>
Date: Tue, 22 Jun 2021 10:13:53 +0100
Subject: [PATCH] Relocate itemHandling to inventory.items

---
 .../civmodcore/{itemHandling => inventory/items}/ItemMap.java | 4 +---
 .../{itemHandling => inventory/items}/TagManager.java         | 3 +--
 .../vg/civcraft/mc/civmodcore/serialization/NBTCompound.java  | 3 ++-
 3 files changed, 4 insertions(+), 6 deletions(-)
 rename plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/{itemHandling => inventory/items}/ItemMap.java (99%)
 rename plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/{itemHandling => inventory/items}/TagManager.java (98%)

diff --git a/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/itemHandling/ItemMap.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/items/ItemMap.java
similarity index 99%
rename from plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/itemHandling/ItemMap.java
rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/items/ItemMap.java
index 4bb266799..6a5d79bbd 100644
--- a/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/itemHandling/ItemMap.java
+++ b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/items/ItemMap.java
@@ -1,4 +1,4 @@
-package vg.civcraft.mc.civmodcore.itemHandling;
+package vg.civcraft.mc.civmodcore.inventory.items;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -17,8 +17,6 @@ import org.bukkit.enchantments.Enchantment;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.PlayerInventory;
-import vg.civcraft.mc.civmodcore.inventory.items.ItemUtils;
-import vg.civcraft.mc.civmodcore.inventory.items.MetaUtils;
 
 /**
  * Allows the storage and comparison of itemstacks while ignoring their maximum
diff --git a/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/itemHandling/TagManager.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/items/TagManager.java
similarity index 98%
rename from plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/itemHandling/TagManager.java
rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/items/TagManager.java
index a9090980d..e67d42396 100644
--- a/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/itemHandling/TagManager.java
+++ b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/items/TagManager.java
@@ -1,4 +1,4 @@
-package vg.civcraft.mc.civmodcore.itemHandling;
+package vg.civcraft.mc.civmodcore.inventory.items;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -20,7 +20,6 @@ import net.minecraft.nbt.NBTTagString;
 import org.bukkit.Bukkit;
 import org.bukkit.configuration.MemorySection;
 import org.bukkit.inventory.ItemStack;
-import vg.civcraft.mc.civmodcore.inventory.items.ItemUtils;
 
 @Deprecated
 public class TagManager {
diff --git a/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/serialization/NBTCompound.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/serialization/NBTCompound.java
index b139460ab..f9b30cd1e 100644
--- a/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/serialization/NBTCompound.java
+++ b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/serialization/NBTCompound.java
@@ -24,12 +24,13 @@ import org.bukkit.craftbukkit.v1_17_R1.persistence.CraftPersistentDataContainer;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.persistence.PersistentDataContainer;
 import vg.civcraft.mc.civmodcore.inventory.items.ItemUtils;
+import vg.civcraft.mc.civmodcore.inventory.items.TagManager;
 import vg.civcraft.mc.civmodcore.utilities.NullUtils;
 import vg.civcraft.mc.civmodcore.utilities.Validation;
 
 /**
  * Wrapper class for NBTTagCompounds to make NBT serialization and deserialization as robust as possible. Intended to
- * replace {@link vg.civcraft.mc.civmodcore.itemHandling.TagManager TagManager} though the .mapToNBT and .listToNBT
+ * replace {@link TagManager TagManager} though the .mapToNBT and .listToNBT
  * APIs will not be re-implemented here as it's better to have a finer control of how data is written and read.
  */
 public class NBTCompound implements Cloneable, Validation {