Replace VanillaInterface#getDynamicDrops with actual behaviour

Author: GoldenStack

src/main/java/net/goldenstack/loot/LootEntry.java

@@ -1,9 +1,8 @@
 package net.goldenstack.loot;
 
+import net.goldenstack.loot.util.ExternalTags;
 import net.goldenstack.loot.util.Serial;
 import net.goldenstack.loot.util.Template;
-import net.goldenstack.loot.util.VanillaInterface;
-import net.kyori.adventure.nbt.CompoundBinaryTag;
 import net.minestom.server.instance.block.Block;
 import net.minestom.server.item.ItemStack;
 import net.minestom.server.item.Material;
@@ -200,16 +199,22 @@ record Dynamic(@NotNull List<LootPredicate> predicates, @NotNull List<LootFuncti
                 Dynamic::new
         );
 
-        @SuppressWarnings("DataFlowIssue")
         @Override
         public @NotNull List<ItemStack> apply(@NotNull LootContext context) {
             Block block = context.get(LootContext.BLOCK_STATE);
             if (block == null) return List.of();
 
-            CompoundBinaryTag nbt = block.hasNbt() ? block.nbt() : CompoundBinaryTag.empty();
-
-            VanillaInterface vanilla = context.require(LootContext.VANILLA_INTERFACE);
-            return vanilla.getDynamicDrops(name, nbt);
+            return switch (name.asString()) {
+                case "minecraft:sherds" -> {
+                    List<ItemStack> items = new ArrayList<>();
+                    for (Material material : block.getTag(ExternalTags.DECORATED_POT_SHERDS)) {
+                        items.add(ItemStack.of(material));
+                    }
+                    yield items;
+                }
+                case "minecraft:contents" -> block.getTag(ExternalTags.CONTAINER_ITEMS);
+                default -> List.of();
+            };
         }
     }
 

src/main/java/net/goldenstack/loot/LootFunction.java

@@ -24,7 +24,6 @@
 import net.minestom.server.potion.PotionType;
 import net.minestom.server.registry.DynamicRegistry;
 import net.minestom.server.registry.Registries;
-import net.minestom.server.tag.Tag;
 import net.minestom.server.utils.NamespaceID;
 import net.minestom.server.utils.nbt.BinaryTagSerializer;
 import org.jetbrains.annotations.NotNull;
@@ -277,8 +276,6 @@ record CopyName(@NotNull List<LootPredicate> predicates, @NotNull RelevantTarget
                 CopyName::new
         );
 
-        private static final @NotNull Tag<Component> BLOCK_CUSTOM_NAME = Tag.Component("CustomName");
-
         @Override
         public @NotNull ItemStack apply(@NotNull ItemStack input, @NotNull LootContext context) {
             if (!LootPredicate.all(predicates, context)) return input;
@@ -288,8 +285,8 @@ record CopyName(@NotNull List<LootPredicate> predicates, @NotNull RelevantTarget
             Component customName;
             if (key instanceof Entity entity && entity.getCustomName() != null) {
                 customName = entity.getCustomName();
-            } else if (key instanceof Block block && block.hasTag(BLOCK_CUSTOM_NAME)) {
-                customName = block.getTag(BLOCK_CUSTOM_NAME);
+            } else if (key instanceof Block block && block.hasTag(ExternalTags.CUSTOM_NAME)) {
+                customName = block.getTag(ExternalTags.CUSTOM_NAME);
             } else {
                 return input;
             }

src/main/java/net/goldenstack/loot/util/ExternalTags.java

@@ -0,0 +1,25 @@
+package net.goldenstack.loot.util;
+
+import net.kyori.adventure.text.Component;
+import net.minestom.server.item.ItemStack;
+import net.minestom.server.item.Material;
+import net.minestom.server.tag.Tag;
+import net.minestom.server.utils.NamespaceID;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.List;
+
+public class ExternalTags {
+
+    private ExternalTags() {}
+
+    public static final @NotNull Tag<Component> CUSTOM_NAME = Tag.Component("CustomName");
+
+    public static final @NotNull Tag<List<Material>> DECORATED_POT_SHERDS = Tag.String("sherds")
+            .map(NamespaceID::from, NamespaceID::asString)
+            .map(Material::fromNamespaceId, Material::namespace)
+            .list().defaultValue(List::of);
+
+    public static final @NotNull Tag<List<ItemStack>> CONTAINER_ITEMS = Tag.ItemStack("Items").list().defaultValue(List::of);
+
+}

src/main/java/net/goldenstack/loot/util/VanillaInterface.java

@@ -1,12 +1,10 @@
 package net.goldenstack.loot.util;
 
 import net.kyori.adventure.nbt.BinaryTag;
-import net.kyori.adventure.nbt.CompoundBinaryTag;
 import net.minestom.server.entity.Entity;
 import net.minestom.server.item.ItemStack;
 import net.minestom.server.item.enchant.Enchantment;
 import net.minestom.server.registry.DynamicRegistry;
-import net.minestom.server.utils.NamespaceID;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -23,8 +21,6 @@ public interface VanillaInterface {
 
     @NotNull ItemStack enchantItem(@NotNull Random random, @NotNull ItemStack item, int levels, @Nullable List<DynamicRegistry.Key<Enchantment>> enchantments);
 
-    @NotNull List<ItemStack> getDynamicDrops(@NotNull NamespaceID choiceID, @NotNull CompoundBinaryTag blockNBT);
-
     @Nullable ItemStack smelt(@NotNull ItemStack input);
 
 }