Trial Spawner and Vaults 1.21 additions #2790
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 VaultChangeStateScriptEvent extends BukkitScriptEvent implements Listener { | ||
|
|
||
| // <--[event] | ||
| // @Events | ||
| // vault changes state | ||
| // | ||
| // @Plugin Paper | ||
| // | ||
| // @Group Block | ||
| // | ||
| // @Cancellable true | ||
| // | ||
| // @Location true | ||
| // | ||
| // @Triggers when a vault block state changes | ||
|
Member
There was a problem hiding this comment. Needs to be |
||
| // | ||
| // @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 VaultChangeStateScriptEvent() { | ||
| 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 onVaultChangeStateEvent(VaultChangeStateEvent event) { | ||
| location = new LocationTag(event.getBlock().getLocation()); | ||
| this.event = event; | ||
| fire(event); | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 BlockDispenseLootScriptEvent extends BukkitScriptEvent implements Listener { | ||
|
Member
There was a problem hiding this comment. I believe the class name usually matches the Denizen name over the bukkit name, so that it's easier to spot in code for us. |
||
|
|
||
| // <--[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 outcome items. | ||
|
Member
There was a problem hiding this comment.
|
||
| // <context.location> returns a LocationTag of the block that is dispensing the items. | ||
| // | ||
| // @Determine | ||
| // <ListTag(ItemTag)> to determine the new items that are outputted. | ||
| // | ||
| // --> | ||
|
|
||
| public BlockDispenseLootScriptEvent() { | ||
| registerCouldMatcher("loot dispenses from <block>"); | ||
| this.<BlockDispenseLootScriptEvent, ListTag>registerDetermination(null, ListTag.class, (evt, context, input) -> { | ||
|
Member
There was a problem hiding this comment. Just in general, prefixed determinations (to match their |
||
| List<ItemStack> items = new ArrayList<>(); | ||
|
Member
There was a problem hiding this comment. Nitpick, but can initialize to |
||
| 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 onBlockLootDispense(BlockDispenseLootEvent event) { | ||
| block = new MaterialTag(event.getBlock().getType()); | ||
| location = new LocationTag(event.getBlock().getLocation()); | ||
| this.event = event; | ||
| fire(event); | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 | ||
| // ItemTag to set the item being displayed. | ||
| // | ||
| // --> | ||
|
|
||
| public VaultDisplayItemScriptEvent() { | ||
| registerCouldMatcher("vault displays <item>"); | ||
| this.<VaultDisplayItemScriptEvent, ItemTag>registerDetermination(null, ItemTag.class, (evt, context, item) -> { | ||
| this.item = item; | ||
| evt.event.setDisplayItem(item.getItemStack()); | ||
| }); | ||
| } | ||
|
|
||
| public LocationTag location; | ||
| public ItemTag item; | ||
| public VaultDisplayItemEvent event; | ||
|
|
||
| @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; | ||
|
Member
There was a problem hiding this comment. This has the same issue with the context potentially becoming outdated due to another plugin accessing it (e.g. if you |
||
| 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); | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nitpick, but the event is called
changesand this sayschange.