From 116c017c6dad9d7146238e482432f7267a5337ed Mon Sep 17 00:00:00 2001
From: Vatuu <21113232+Vatuu@users.noreply.github.com>
Date: Tue, 16 Aug 2022 15:45:48 +0200
Subject: [PATCH] Fixed enchantments not applying to loot.

---
 .../iris/engine/object/IrisEnchantment.java   | 32 ++++++-------------
 1 file changed, 9 insertions(+), 23 deletions(-)

diff --git a/src/main/java/com/volmit/iris/engine/object/IrisEnchantment.java b/src/main/java/com/volmit/iris/engine/object/IrisEnchantment.java
index d97663d02..e23485913 100644
--- a/src/main/java/com/volmit/iris/engine/object/IrisEnchantment.java
+++ b/src/main/java/com/volmit/iris/engine/object/IrisEnchantment.java
@@ -19,21 +19,17 @@
 package com.volmit.iris.engine.object;
 
 import com.volmit.iris.Iris;
-import com.volmit.iris.engine.object.annotations.Desc;
-import com.volmit.iris.engine.object.annotations.MaxNumber;
-import com.volmit.iris.engine.object.annotations.MinNumber;
-import com.volmit.iris.engine.object.annotations.Required;
-import com.volmit.iris.engine.object.annotations.Snippet;
+import com.volmit.iris.engine.object.annotations.*;
 import com.volmit.iris.util.math.RNG;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
+import org.bukkit.NamespacedKey;
 import org.bukkit.enchantments.Enchantment;
 import org.bukkit.inventory.meta.EnchantmentStorageMeta;
 import org.bukkit.inventory.meta.ItemMeta;
 
-import java.lang.reflect.Field;
 
 @Snippet("enchantment")
 @Accessors(chain = true)
@@ -61,12 +57,17 @@ public class IrisEnchantment {
 
     public void apply(RNG rng, ItemMeta meta) {
         try {
+            Enchantment enchant = Enchantment.getByKey(NamespacedKey.minecraft(getEnchantment()));
+            if(enchant == null) {
+                Iris.warn("Unknown Enchantment: " + getEnchantment());
+                return;
+            }
             if(rng.nextDouble() < chance) {
                 if(meta instanceof EnchantmentStorageMeta) {
-                    ((EnchantmentStorageMeta) meta).addStoredEnchant(getEnchant(), getLevel(rng), true);
+                    ((EnchantmentStorageMeta) meta).addStoredEnchant(enchant, getLevel(rng), true);
                     return;
                 }
-                meta.addEnchant(getEnchant(), getLevel(rng), true);
+                meta.addEnchant(enchant, getLevel(rng), true);
             }
         } catch(Throwable e) {
             Iris.reportError(e);
@@ -74,21 +75,6 @@ public class IrisEnchantment {
         }
     }
 
-    public Enchantment getEnchant() {
-        for(Field i : Enchantment.class.getDeclaredFields()) {
-            if(i.getType().equals(Enchantment.class) && i.getName().equals(getEnchantment())) {
-                try {
-                    return (Enchantment) i.get(null);
-                } catch(IllegalArgumentException | IllegalAccessException e) {
-                    e.printStackTrace();
-                    Iris.reportError(e);
-                }
-            }
-        }
-
-        return null;
-    }
-
     public int getLevel(RNG rng) {
         return rng.i(getMinLevel(), getMaxLevel());
     }