Trial Spawner and Vaults 1.21 additions

paper/src/main/java/com/denizenscript/denizen/paper/PaperModule.java

@@ -103,6 +103,9 @@ public static void init() {
             ScriptEvent.registerScriptEvent(TNTPrimesScriptEvent.class);
         }
         ScriptEvent.registerScriptEvent(UnknownCommandScriptEvent.class);
+        if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_21)) {
+            ScriptEvent.registerScriptEvent(VaultChangesStateScriptEvent.class);
+        }
         if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_19)) {
             ScriptEvent.registerScriptEvent(WardenChangesAngerLevelScriptEvent.class);
         }

paper/src/main/java/com/denizenscript/denizen/paper/events/VaultChangesStateScriptEvent.java

@@ -0,0 +1,74 @@
+package com.denizenscript.denizen.paper.events;
+
+import com.denizenscript.denizen.events.BukkitScriptEvent;
+import com.denizenscript.denizen.objects.LocationTag;
+import com.denizenscript.denizen.utilities.implementation.BukkitScriptEntryData;
+import com.denizenscript.denizencore.objects.ObjectTag;
+import com.denizenscript.denizencore.objects.core.ElementTag;
+import com.denizenscript.denizencore.scripts.ScriptEntryData;
+import io.papermc.paper.event.block.VaultChangeStateEvent;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+
+public class VaultChangesStateScriptEvent extends BukkitScriptEvent implements Listener {
+
+    // <--[event]
+    // @Events
+    // vault changes state
+    //
+    // @Plugin Paper
+    //
+    // @Group Block
+    //
+    // @Cancellable true
+    //
+    // @Location true
+    //
+    // @Triggers when a vault block's state changes. A list of states can be found at <@link url https://hub.spigotmc.org/javadocs/spigot/org/bukkit/block/data/type/Vault.State.html>.
+    //
+    // @Context
+    // <context.location> returns the LocationTag of the vault block.
+    // <context.old_state> returns the vault state before the change.
+    // <context.new_state> returns the vault state after the change.
+    //
+    // @Player when the entity who triggered the change is a player.
+    //
+    // -->
+
+    public VaultChangesStateScriptEvent() {
+        registerCouldMatcher("vault changes state");
+    }
+
+    public LocationTag location;
+    public VaultChangeStateEvent event;
+
+    @Override
+    public boolean matches(ScriptPath path) {
+        if (!runInCheck(path, location)) {
+            return false;
+        }
+        return super.matches(path);
+    }
+
+    @Override
+    public ScriptEntryData getScriptEntryData() {
+        return new BukkitScriptEntryData(event.getPlayer());
+    }
+
+    @Override
+    public ObjectTag getContext(String name) {
+        return switch (name) {
+            case "old_state" -> new ElementTag(event.getCurrentState());
+            case "new_state" -> new ElementTag(event.getNewState());
+            case "location" -> location;
+            default -> super.getContext(name);
+        };
+    }
+
+    @EventHandler
+    public void onVaultChangesStateEvent(VaultChangeStateEvent event) {
+        location = new LocationTag(event.getBlock().getLocation());
+        this.event = event;
+        fire(event);
+    }
+}

plugin/src/main/java/com/denizenscript/denizen/events/ScriptEventRegistry.java

@@ -68,6 +68,9 @@ public static void registerMainEvents() {
         ScriptEvent.registerScriptEvent(BlockBurnsScriptEvent.class);
         ScriptEvent.registerScriptEvent(BlockCooksSmeltsItemScriptEvent.class);
         ScriptEvent.registerScriptEvent(BlockDestroyedByExplosionEvent.class);
+        if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_21)) {
+            ScriptEvent.registerScriptEvent(BlockDispensesLootScriptEvent.class);
+        }
         ScriptEvent.registerScriptEvent(BlockDispensesScriptEvent.class);
         ScriptEvent.registerScriptEvent(BlockEquipsItemScriptEvent.class);
         ScriptEvent.registerScriptEvent(BlockExplodesScriptEvent.class);
@@ -80,8 +83,14 @@ public static void registerMainEvents() {
         ScriptEvent.registerScriptEvent(BlockShearEntityScriptEvent.class);
         ScriptEvent.registerScriptEvent(BlockSpreadsScriptEvent.class);
         ScriptEvent.registerScriptEvent(BrewingStandFueledScriptEvent.class);
+        if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_19)) {
+            ScriptEvent.registerScriptEvent(BrewingStartsScriptEvent.class);
+        }
         ScriptEvent.registerScriptEvent(BrewsScriptEvent.class);
         ScriptEvent.registerScriptEvent(CauldronLevelChangeScriptEvent.class);
+        if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_21)) {
+            ScriptEvent.registerScriptEvent(CrafterCraftsScriptEvent.class);
+        }
         ScriptEvent.registerScriptEvent(DragonEggMovesScriptEvent.class);
         ScriptEvent.registerScriptEvent(FurnaceBurnsItemScriptEvent.class);
         ScriptEvent.registerScriptEvent(FurnaceStartsSmeltingScriptEvent.class);
@@ -95,11 +104,10 @@ public static void registerMainEvents() {
         ScriptEvent.registerScriptEvent(RedstoneScriptEvent.class);
         ScriptEvent.registerScriptEvent(SpongeAbsorbsScriptEvent.class);
         if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_19)) {
-            ScriptEvent.registerScriptEvent(BrewingStartsScriptEvent.class);
             ScriptEvent.registerScriptEvent(TNTPrimesScriptEvent.class);
         }
         if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_21)) {
-            ScriptEvent.registerScriptEvent(CrafterCraftsScriptEvent.class);
+            ScriptEvent.registerScriptEvent(VaultDisplayItemScriptEvent.class);
         }
 
         // Entity events

plugin/src/main/java/com/denizenscript/denizen/events/block/BlockDispensesLootScriptEvent.java

@@ -0,0 +1,89 @@
+package com.denizenscript.denizen.events.block;
+
+import com.denizenscript.denizen.events.BukkitScriptEvent;
+import com.denizenscript.denizen.objects.*;
+import com.denizenscript.denizen.utilities.implementation.BukkitScriptEntryData;
+import com.denizenscript.denizencore.objects.ObjectTag;
+import com.denizenscript.denizencore.objects.core.ListTag;
+import com.denizenscript.denizencore.scripts.ScriptEntryData;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.block.BlockDispenseLootEvent;
+import org.bukkit.inventory.ItemStack;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class BlockDispensesLootScriptEvent extends BukkitScriptEvent implements Listener {
+
+    // <--[event]
+    // @Events
+    // loot dispenses from <block>
+    //
+    // @Group Block
+    //
+    // @Location true
+    //
+    // @Cancellable true
+    //
+    // @Player Always.
+    //
+    // @Triggers when a block dispenses loot containing multiple items.
+    //
+    // @Context
+    // <context.loot> returns a ListTag(ItemTag) of loot items.
+    // <context.location> returns a LocationTag of the block that is dispensing the items.
+    //
+    // @Determine
+    // "LOOT:<ListTag(ItemTag)>" to determine the new items that are outputted.
+    //
+    // -->
+
+    public BlockDispensesLootScriptEvent() {
+        registerCouldMatcher("loot dispenses from <block>");
+        this.<BlockDispensesLootScriptEvent, ListTag>registerDetermination("loot", ListTag.class, (evt, context, input) -> {
+            List<ItemStack> items = new ArrayList<>(input.size());
+            for (ItemTag item : input.filter(ItemTag.class, context)) {
+                items.add(item.getItemStack());
+            }
+            evt.event.setDispensedLoot(items);
+        });
+    }
+
+    public MaterialTag block;
+    public LocationTag location;
+    public BlockDispenseLootEvent event;
+
+    @Override
+    public boolean matches(ScriptPath path) {
+        if (!path.tryArgObject(3, block)) {
+            return false;
+        }
+        if (!runInCheck(path, location)) {
+            return false;
+        }
+        return super.matches(path);
+    }
+
+    @Override
+    public ScriptEntryData getScriptEntryData() {
+        return new BukkitScriptEntryData(new PlayerTag(event.getPlayer()), null);
+    }
+
+    @Override
+    public ObjectTag getContext(String name) {
+        return switch (name) {
+            case "loot" -> new ListTag(event.getDispensedLoot(), ItemTag::new);
+            case "location" -> location;
+            default -> super.getContext(name);
+        };
+    }
+
+    @EventHandler
+    public void onBlockDispensesLoot(BlockDispenseLootEvent event) {
+        block = new MaterialTag(event.getBlock().getType());
+        location = new LocationTag(event.getBlock().getLocation());
+        this.event = event;
+        fire(event);
+    }
+}

plugin/src/main/java/com/denizenscript/denizen/events/block/VaultDisplayItemScriptEvent.java

@@ -0,0 +1,73 @@
+package com.denizenscript.denizen.events.block;
+
+import com.denizenscript.denizen.events.BukkitScriptEvent;
+import com.denizenscript.denizen.objects.ItemTag;
+import com.denizenscript.denizen.objects.LocationTag;
+import com.denizenscript.denizencore.objects.ObjectTag;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.block.VaultDisplayItemEvent;
+
+public class VaultDisplayItemScriptEvent extends BukkitScriptEvent implements Listener {
+
+    // <--[event]
+    // @Events
+    // vault displays <item>
+    //
+    // @Group Block
+    //
+    // @Location true
+    //
+    // @Cancellable true
+    //
+    // @Triggers when a vault block displays an item.
+    //
+    // @Context
+    // <context.location> returns the LocationTag of the vault block.
+    // <context.item> returns the ItemTag being displayed.
+    //
+    // @Determine
+    // "ITEM:<ItemTag>" to set the item being displayed.
+    //
+    // -->
+
+    public VaultDisplayItemScriptEvent() {
+        registerCouldMatcher("vault displays <item>");
+        this.<VaultDisplayItemScriptEvent, ItemTag>registerDetermination("item", ItemTag.class, (evt, context, input) -> {
+            evt.item = input;
+            evt.event.setDisplayItem(item.getItemStack());
+        });
+    }
+
+    public LocationTag location;
+    public VaultDisplayItemEvent event;
+    public ItemTag item;
+
+    @Override
+    public boolean matches(ScriptPath path) {
+        if (!runInCheck(path, location)) {
+            return false;
+        }
+        if (!path.tryArgObject(2, item)) {
+            return false;
+        }
+        return super.matches(path);
+    }
+
+    @Override
+    public ObjectTag getContext(String name) {
+        return switch (name) {
+            case "item" -> item;
+            case "location" -> location;
+            default -> super.getContext(name);
+        };
+    }
+
+    @EventHandler
+    public void onVaultDisplayItemEvent(VaultDisplayItemEvent event) {
+        location = new LocationTag(event.getBlock().getLocation());
+        item = new ItemTag(event.getDisplayItem());
+        this.event = event;
+        fire(event);
+    }
+}

plugin/src/main/java/com/denizenscript/denizen/objects/properties/PropertyRegistry.java

@@ -296,6 +296,9 @@ public static void registerMainProperties() {
         PropertyParser.registerProperty(MaterialLightable.class, MaterialTag.class);
         PropertyParser.registerProperty(MaterialMode.class, MaterialTag.class);
         PropertyParser.registerProperty(MaterialNote.class, MaterialTag.class);
+        if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_21)) {
+            PropertyParser.registerProperty(MaterialOminous.class, MaterialTag.class);
+        }
         PropertyParser.registerProperty(MaterialPersistent.class, MaterialTag.class);
         PropertyParser.registerProperty(MaterialPower.class, MaterialTag.class);
         PropertyParser.registerProperty(MaterialShape.class, MaterialTag.class);