From e3b07aa62f1ac7c070030e20d50db3e326b29715 Mon Sep 17 00:00:00 2001
From: lars <larslukasneuhaus@gmx.de>
Date: Sat, 5 Oct 2024 18:37:04 +0200
Subject: [PATCH] solved pr comments

---
 .../customAdvancements/CustomAdvancements.java        |  9 +++++----
 .../listener/CustomAdvancementsListener.java          | 11 +++++------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/customAdvancements/CustomAdvancements.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/customAdvancements/CustomAdvancements.java
index 6ef7ae8..1dc82d2 100644
--- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/customAdvancements/CustomAdvancements.java
+++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/customAdvancements/CustomAdvancements.java
@@ -30,11 +30,12 @@ public class CustomAdvancements extends Appliance {
         }
 
         try {
-            NamespacedKey namespacedKey = Objects.requireNonNull(NamespacedKey.fromString("custom_advancements:craftattack/" + advancementName));
-            Advancement advancement = Objects.requireNonNull(Bukkit.getAdvancement(namespacedKey));
+            NamespacedKey namespacedKey = Objects.requireNonNull(NamespacedKey.fromString("custom_advancements:craftattack/" + advancementName), "NamespacedKey is invalid!");
+            Advancement advancement = Objects.requireNonNull(Bukkit.getAdvancement(namespacedKey), "The advancement does not exist!");
             player.getAdvancementProgress(advancement).awardCriteria("criteria");
         } catch (Exception e) {
-            Main.logger().info("Custom Advancements Datapack not found!");
+            Main.logger().info("Advancement " + advancementName + " not found! (is Custom Advancements data pack loaded?)");
+            throw e;
         }
     }
 
@@ -46,7 +47,7 @@ public class CustomAdvancements extends Appliance {
         grantedAdvancements.forEach(pendingAdvancement -> grantAdvancement(pendingAdvancement.advancement(), player.getUniqueId()));
     }
 
-    public void addPendingAdvancement(UUID receiver, String advancement) {
+    private void addPendingAdvancement(UUID receiver, String advancement) {
         pendingAdvancements.add(new PendingAdvancement(receiver, advancement));
     }
 
diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/customAdvancements/listener/CustomAdvancementsListener.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/customAdvancements/listener/CustomAdvancementsListener.java
index 0389bda..ace859e 100644
--- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/customAdvancements/listener/CustomAdvancementsListener.java
+++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/customAdvancements/listener/CustomAdvancementsListener.java
@@ -30,12 +30,11 @@ public class CustomAdvancementsListener extends ApplianceListener<CustomAdvancem
         if(!(event.getView().getPlayer() instanceof Player player)) return;
 
         if(result.getType() == Material.RED_SHULKER_BOX) {
-//            getAppliance().grantAdvancement(Advancements.fleischerchest, player.getUniqueId());
-            getAppliance().addPendingAdvancement(player.getUniqueId(), Advancements.fleischerchest);
-        } else if(
-            result.getItemMeta().itemName().equals(Component.text("98fdf0ae-c3ab-4ef7-ae25-efd518d600de"))
-            && result.getItemMeta().getEnchantmentGlintOverride()
-        ) {
+            getAppliance().grantAdvancement(Advancements.fleischerchest, player.getUniqueId());
+            return;
+        }
+
+        if(result.getItemMeta().itemName().equals(Component.text("98fdf0ae-c3ab-4ef7-ae25-efd518d600de"))) {
             getAppliance().grantAdvancement(Advancements.craftPixelblock, player.getUniqueId());
         }
     }