From fb1b3197a277d46368d4813d44818d7d65f1ddc0 Mon Sep 17 00:00:00 2001
From: Christian Koop <contact@sprax2013.de>
Date: Fri, 6 Sep 2024 11:20:48 +0200
Subject: [PATCH] build: fix misconfigured submodule NMS/NMS-v1_21_0

---
 NMS/NMS-v1_21_0/pom.xml                       |  2 +-
 .../nms/v1_21_0/NmsImplementationsImpl.java   |  7 +++++++
 .../core/nms/v1_21_0/item/NmsItemImpl.java    | 21 +++++++++++++++++++
 NMS/NMS-v1_21_R1/pom.xml                      |  7 +++++++
 NMS/NMS/pom.xml                               |  6 ------
 pom.xml                                       |  1 +
 6 files changed, 37 insertions(+), 7 deletions(-)
 create mode 100644 NMS/NMS-v1_21_0/src/main/java/com/craftaro/core/nms/v1_21_0/item/NmsItemImpl.java

diff --git a/NMS/NMS-v1_21_0/pom.xml b/NMS/NMS-v1_21_0/pom.xml
index c16e4b49..4f480782 100644
--- a/NMS/NMS-v1_21_0/pom.xml
+++ b/NMS/NMS-v1_21_0/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.craftaro</groupId>
         <artifactId>CraftaroCore-Modules</artifactId>
-        <version>3.3.0-SNAPSHOT</version>
+        <version>3.4.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>CraftaroCore-NMS-v1_21_0</artifactId>
diff --git a/NMS/NMS-v1_21_0/src/main/java/com/craftaro/core/nms/v1_21_0/NmsImplementationsImpl.java b/NMS/NMS-v1_21_0/src/main/java/com/craftaro/core/nms/v1_21_0/NmsImplementationsImpl.java
index a952065c..b937bb7d 100644
--- a/NMS/NMS-v1_21_0/src/main/java/com/craftaro/core/nms/v1_21_0/NmsImplementationsImpl.java
+++ b/NMS/NMS-v1_21_0/src/main/java/com/craftaro/core/nms/v1_21_0/NmsImplementationsImpl.java
@@ -21,6 +21,7 @@ public class NmsImplementationsImpl implements NmsImplementations {
     private final NmsWorldBorder worldBorder;
     private final com.craftaro.core.nms.anvil.AnvilCore anvil;
     private final NBTCore nbt;
+    private final NmsItem item;
 
     public NmsImplementationsImpl() {
         this.entity = new NmsEntityImpl();
@@ -29,6 +30,7 @@ public class NmsImplementationsImpl implements NmsImplementations {
         this.worldBorder = new NmsWorldBorderImpl();
         this.anvil = new AnvilCore();
         this.nbt = new NBTCoreImpl();
+        this.item = new NmsItemImpl();
     }
 
     @Override
@@ -60,4 +62,9 @@ public class NmsImplementationsImpl implements NmsImplementations {
     public @NotNull NBTCore getNbt() {
         return this.nbt;
     }
+
+    @Override
+    public @NotNull NmsItem getItem() {
+        return this.item;
+    }
 }
diff --git a/NMS/NMS-v1_21_0/src/main/java/com/craftaro/core/nms/v1_21_0/item/NmsItemImpl.java b/NMS/NMS-v1_21_0/src/main/java/com/craftaro/core/nms/v1_21_0/item/NmsItemImpl.java
new file mode 100644
index 00000000..4cafe127
--- /dev/null
+++ b/NMS/NMS-v1_21_0/src/main/java/com/craftaro/core/nms/v1_21_0/item/NmsItemImpl.java
@@ -0,0 +1,21 @@
+package com.craftaro.core.nms.v1_21_0.item;
+
+import com.craftaro.core.nms.item.NmsItem;
+import net.minecraft.util.RandomSource;
+import net.minecraft.world.item.enchantment.EnchantmentHelper;
+import org.bukkit.craftbukkit.v1_21_R1.CraftRegistry;
+import org.bukkit.craftbukkit.v1_21_R1.inventory.CraftItemStack;
+import org.bukkit.inventory.ItemStack;
+
+import java.util.Optional;
+
+public class NmsItemImpl implements NmsItem {
+    private final RandomSource randomSource = RandomSource.createNewThreadLocalInstance();
+
+    @Override
+    public ItemStack copyAndApplyRandomEnchantment(ItemStack item, int level) {
+        net.minecraft.world.item.ItemStack nmsItem = CraftItemStack.asNMSCopy(item);
+        EnchantmentHelper.enchantItem(this.randomSource, nmsItem, level, CraftRegistry.getMinecraftRegistry(), Optional.empty());
+        return CraftItemStack.asBukkitCopy(nmsItem);
+    }
+}
diff --git a/NMS/NMS-v1_21_R1/pom.xml b/NMS/NMS-v1_21_R1/pom.xml
index 5b7bddea..9f87775f 100644
--- a/NMS/NMS-v1_21_R1/pom.xml
+++ b/NMS/NMS-v1_21_R1/pom.xml
@@ -62,6 +62,13 @@
     </build>
 
     <dependencies>
+        <dependency>
+            <version>${project.version}</version>
+            <artifactId>CraftaroCore-NMS-v1_21_0</artifactId>
+            <groupId>${project.groupId}</groupId>
+            <scope>compile</scope>
+        </dependency>
+
         <!--suppress VulnerableLibrariesLocal -->
         <dependency>
             <groupId>org.spigotmc</groupId>
diff --git a/NMS/NMS/pom.xml b/NMS/NMS/pom.xml
index cb2891b4..53f567a2 100644
--- a/NMS/NMS/pom.xml
+++ b/NMS/NMS/pom.xml
@@ -28,12 +28,6 @@
             <groupId>${project.groupId}</groupId>
             <scope>compile</scope>
         </dependency>
-        <dependency>
-            <version>${project.version}</version>
-            <artifactId>CraftaroCore-NMS-v1_21_0</artifactId>
-            <groupId>${project.groupId}</groupId>
-            <scope>compile</scope>
-        </dependency>
         <dependency>
             <version>${project.version}</version>
             <artifactId>CraftaroCore-NMS-v1_20_R4</artifactId>
diff --git a/pom.xml b/pom.xml
index f5034c06..15a2a1f5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,6 +27,7 @@
         <module>NMS/NMS</module>
         <module>NMS/NMS-API</module>
         <module>NMS/NMS-v1_21_R1</module>
+        <module>NMS/NMS-v1_21_0</module>
         <module>NMS/NMS-v1_20_R4</module>
         <module>NMS/NMS-v1_20_R3</module>
         <module>NMS/NMS-v1_20_R2</module>