Skip to content

Commit

Permalink
paper-only entity enter/exit area event
Browse files Browse the repository at this point in the history 
and impl item scriptname tag deprecation
adds #1996
  • Loading branch information
@mcmonkey4eva
mcmonkey4eva committed Feb 3, 2021
1 parent 95290eb commit b40b588
Show file tree
Hide file tree
Showing 5 changed files with 121 additions and 76 deletions.
1 change: 1 addition & 0 deletions paper/src/main/java/com/denizenscript/denizen/paper/PaperModule.java
View file
Expand Up @@ -16,6 +16,7 @@ public static void init() {
Debug.log("Loading Paper support module...");

// Events
ScriptEvent.registerScriptEvent(new AreaEnterExitScriptEventPaperImpl());
ScriptEvent.registerScriptEvent(new EntityKnocksbackEntityScriptEvent());
ScriptEvent.registerScriptEvent(new EntityPathfindScriptEvent());
ScriptEvent.registerScriptEvent(new ExperienceOrbMergeScriptEvent());
Expand Down
37 changes: 37 additions & 0 deletions ...c/main/java/com/denizenscript/denizen/paper/events/AreaEnterExitScriptEventPaperImpl.java
View file
@@ -0,0 +1,37 @@
package com.denizenscript.denizen.paper.events;

import com.denizenscript.denizen.events.player.AreaEnterExitScriptEvent;
import com.denizenscript.denizen.objects.EntityTag;
import com.denizenscript.denizencore.objects.ObjectTag;
import com.denizenscript.denizencore.objects.core.ElementTag;
import io.papermc.paper.event.entity.EntityMoveEvent;
import org.bukkit.event.EventHandler;

public class AreaEnterExitScriptEventPaperImpl extends AreaEnterExitScriptEvent {

@Override
public ObjectTag getContext(String name) {
if (name.equals("cause") && currentEvent instanceof EntityMoveEvent) {
return new ElementTag("WALK");
}
return super.getContext(name);
}

@Override
public void registerCorrectClass() {
if (onlyTrackPlayers) {
initListener(new SpigotListeners());
}
else {
initListener(new PaperListeners());
}
}

public class PaperListeners extends SpigotListeners {

@EventHandler
public void onEntityMove(EntityMoveEvent event) {
processNewPosition(new EntityTag(event.getEntity()), event.getTo(), event);
}
}
}
4 changes: 3 additions & 1 deletion plugin/src/main/java/com/denizenscript/denizen/events/ScriptEventRegistry.java
View file
Expand Up @@ -111,7 +111,9 @@ public static void registerMainEvents() {
ScriptEvent.registerScriptEvent(new ItemSpawnsScriptEvent());

// Player events
ScriptEvent.registerScriptEvent(new AreaEnterExitScriptEvent());
if (!Denizen.supportsPaper) {
ScriptEvent.registerScriptEvent(new AreaEnterExitScriptEvent());
}
ScriptEvent.registerScriptEvent(new BiomeEnterExitScriptEvent());
ScriptEvent.registerScriptEvent(new BlockDropsItemScriptEvent());
ScriptEvent.registerScriptEvent(new ChatScriptEvent());
Expand Down
132 changes: 73 additions & 59 deletions plugin/src/main/java/com/denizenscript/denizen/events/player/AreaEnterExitScriptEvent.java
View file
Expand Up @@ -13,7 +13,6 @@
import org.bukkit.Location;
import org.bukkit.block.Biome;
import org.bukkit.entity.Entity;
import org.bukkit.entity.Player;
import org.bukkit.event.Event;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
Expand All @@ -26,18 +25,17 @@ public class AreaEnterExitScriptEvent extends BukkitScriptEvent implements Liste

// <--[event]
// @Events
// player enters <area>
// player exits <area>
// player enters/exits cuboid
// player enters/exits ellipsoid
// entity enters/exits cuboid/ellipsoid/polygon
// <entity> enters <area>
// <entity> exits <area>
//
// @Regex ^on player (enters|exits) [^\s]+$
// @Regex ^on [^\s]+ (enters|exits) [^\s]+$
//
// @Group Player
//
// @Triggers when a player enters or exits a noted area (cuboid or ellipsoid).
// @Triggers when an entity enters or exits a noted area (cuboid, ellipsoid, or polygon). On Spigot servers, only fires for players. Paper is required for other mob types.
//
// @Warning cancelling this event will have different results depending on the cause. Teleporting the player away 1 tick later might be safer.
// @Warning cancelling this event will have different results depending on the cause. Teleporting the entity away 1 tick later might be safer.
//
// @Cancellable true
//
Expand All @@ -46,8 +44,9 @@ public class AreaEnterExitScriptEvent extends BukkitScriptEvent implements Liste
// <context.cause> returns the cause of the event. Can be: WALK, WORLD_CHANGE, JOIN, QUIT, TELEPORT, VEHICLE.
// <context.to> returns the location the player moved to.
// <context.from> returns the location the player moved from (when available).
// <context.entity> returns the entity that entered/exited an area.
//
// @Player Always.
// @Player When the entity is a player.
//
// -->

Expand All @@ -57,14 +56,17 @@ public AreaEnterExitScriptEvent() {

public static AreaEnterExitScriptEvent instance;

public PlayerTag currentPlayer;
public EntityTag currentEntity;
public AreaContainmentObject area;
public boolean isEntering;
public Location to;

@Override
public boolean couldMatch(ScriptPath path) {
if (!path.eventLower.startsWith("player enters") && !path.eventLower.startsWith("player exits")) {
if (!path.eventArgLowerAt(1).equals("enters") && !path.eventArgLowerAt(1).equals("exits")) {
return false;
}
if (!couldMatchEntity(path.eventArgLowerAt(0))) {
return false;
}
if (path.eventArgLowerAt(2).equals("biome") || exactMatchesEnum(path.eventArgLowerAt(2), Biome.values())) {
Expand Down Expand Up @@ -116,7 +118,7 @@ public String getName() {

@Override
public ScriptEntryData getScriptEntryData() {
return new BukkitScriptEntryData(currentPlayer, null);
return new BukkitScriptEntryData(currentEntity);
}

@Override
Expand Down Expand Up @@ -160,36 +162,44 @@ else if (currentEvent instanceof VehicleMoveEvent) {
return new LocationTag(((VehicleMoveEvent) currentEvent).getFrom());
}
else {
return new LocationTag(currentPlayer.getLocation());
return new LocationTag(currentEntity.getLocation());
}
}
else if (name.equals("entity")) {
return currentEntity.getDenizenObject();
}
return super.getContext(name);
}

public void registerCorrectClass() {
initListener(new SpigotListeners());
}

@Override
public void init() {
super.init();
registerCorrectClass();
doTrackAll = false;
boolean needsMatchers = false;
HashSet<String> exacts = new HashSet<>();
List<MatchHelper> matchList = new ArrayList<>();
onlyTrackPlayers = true;
for (ScriptPath path : eventPaths) {
if (!path.eventArgLowerAt(0).equals("player")) {
onlyTrackPlayers = false;
}
String area = path.eventArgLowerAt(2);
if (area.equals("notable")) {
area = path.eventArgLowerAt(3);
}
if (area.equals("cuboid")) {
doTrackAll = true;
break;
}
else if (area.equals("ellipsoid")) {
doTrackAll = true;
break;
}
MatchHelper matcher = createMatcher(area);
if (matcher instanceof AlwaysMatchHelper) {
doTrackAll = true;
break;
}
else if (!needsMatchers && (matcher instanceof ExactMatchHelper)) {
exacts.add(area);
Expand All @@ -206,12 +216,13 @@ else if (!needsMatchers && (matcher instanceof ExactMatchHelper)) {
public boolean doTrackAll = false;
public String[] exactTracked = null;
public MatchHelper[] matchers = null;
public static HashMap<UUID, HashSet<String>> playersInArea = new HashMap<>();
public boolean onlyTrackPlayers = true;
public static HashMap<UUID, HashSet<String>> entitiesInArea = new HashMap<>();

@Override
public void cancellationChanged() {
if (cancelled) {
HashSet<String> inAreas = playersInArea.get(currentPlayer.getUUID());
HashSet<String> inAreas = entitiesInArea.get(currentEntity.getUUID());
if (isEntering) {
inAreas.remove(CoreUtilities.toLowerCase(area.getNoteName()));
}
Expand All @@ -234,7 +245,7 @@ public boolean anyMatch(String name) {
return false;
}

public void processSingle(AreaContainmentObject obj, Player player, HashSet<String> inAreas, Location pos, Event eventCause) {
public void processSingle(AreaContainmentObject obj, EntityTag entity, HashSet<String> inAreas, Location pos, Event eventCause) {
boolean containedNow = obj.doesContainLocation(pos);
boolean wasContained = inAreas != null && inAreas.contains(obj.getNoteName());
if (containedNow == wasContained) {
Expand All @@ -246,36 +257,36 @@ public void processSingle(AreaContainmentObject obj, Player player, HashSet<Stri
else {
inAreas.remove(obj.getNoteName());
}
currentPlayer = new PlayerTag(player);
currentEntity = entity;
isEntering = containedNow;
area = obj;
to = pos;
fire(eventCause);
}

public void processNewPosition(Player player, Location pos, Event eventCause) {
if (EntityTag.isNPC(player)) {
public void processNewPosition(EntityTag entity, Location pos, Event eventCause) {
if (onlyTrackPlayers && !entity.isPlayer()) {
return;
}
HashSet<String> inAreas = playersInArea.get(player.getUniqueId());
HashSet<String> inAreas = entitiesInArea.get(entity.getUUID());
if (inAreas == null) {
inAreas = new HashSet<>();
playersInArea.put(player.getUniqueId(), inAreas);
entitiesInArea.put(entity.getUUID(), inAreas);
}
if (doTrackAll || matchers != null) {
for (CuboidTag cuboid : NotableManager.getAllType(CuboidTag.class)) {
if (anyMatch(cuboid.noteName)) {
processSingle(cuboid, player, inAreas, pos, eventCause);
processSingle(cuboid, entity, inAreas, pos, eventCause);
}
}
for (EllipsoidTag ellipsoid : NotableManager.getAllType(EllipsoidTag.class)) {
if (anyMatch(ellipsoid.noteName)) {
processSingle(ellipsoid, player, inAreas, pos, eventCause);
processSingle(ellipsoid, entity, inAreas, pos, eventCause);
}
}
for (PolygonTag polygon : NotableManager.getAllType(PolygonTag.class)) {
if (anyMatch(polygon.noteName)) {
processSingle(polygon, player, inAreas, pos, eventCause);
processSingle(polygon, entity, inAreas, pos, eventCause);
}
}
}
Expand All @@ -286,48 +297,51 @@ public void processNewPosition(Player player, Location pos, Event eventCause) {
Debug.echoError("Invalid area enter/exit event area '" + name + "'");
continue;
}
processSingle((AreaContainmentObject) obj, player, inAreas, pos, eventCause);
processSingle((AreaContainmentObject) obj, entity, inAreas, pos, eventCause);
}
}
}

@EventHandler
public void onQuit(PlayerQuitEvent event) {
processNewPosition(event.getPlayer(), new Location(event.getPlayer().getWorld(), 10000000d, 10000000d, 10000000d), event);
playersInArea.remove(event.getPlayer().getUniqueId());
}
public class SpigotListeners implements Listener {

@EventHandler
public void onJoin(PlayerJoinEvent event) {
processNewPosition(event.getPlayer(), event.getPlayer().getLocation(), event);
}
@EventHandler
public void onQuit(PlayerQuitEvent event) {
processNewPosition(new EntityTag(event.getPlayer()), new Location(event.getPlayer().getWorld(), 10000000d, 10000000d, 10000000d), event);
entitiesInArea.remove(event.getPlayer().getUniqueId());
}

@EventHandler
public void onMove(PlayerMoveEvent event) {
if (LocationTag.isSameBlock(event.getFrom(), event.getTo())) {
return;
@EventHandler
public void onJoin(PlayerJoinEvent event) {
processNewPosition(new EntityTag(event.getPlayer()), event.getPlayer().getLocation(), event);
}
processNewPosition(event.getPlayer(), event.getTo(), event);
}

@EventHandler
public void onTeleport(PlayerTeleportEvent event) {
processNewPosition(event.getPlayer(), event.getTo(), event);
}
@EventHandler
public void onMove(PlayerMoveEvent event) {
if (LocationTag.isSameBlock(event.getFrom(), event.getTo())) {
return;
}
processNewPosition(new EntityTag(event.getPlayer()), event.getTo(), event);
}

@EventHandler
public void onWorldChange(PlayerChangedWorldEvent event) {
processNewPosition(event.getPlayer(), event.getPlayer().getLocation(), event);
}
@EventHandler
public void onTeleport(PlayerTeleportEvent event) {
processNewPosition(new EntityTag(event.getPlayer()), event.getTo(), event);
}

@EventHandler
public void onVehicleMove(VehicleMoveEvent event) {
if (LocationTag.isSameBlock(event.getFrom(), event.getTo())) {
return;
@EventHandler
public void onWorldChange(PlayerChangedWorldEvent event) {
processNewPosition(new EntityTag(event.getPlayer()), event.getPlayer().getLocation(), event);
}
for (Entity entity : event.getVehicle().getPassengers()) {
if (EntityTag.isPlayer(entity)) {
processNewPosition((Player) entity, event.getTo(), event);

@EventHandler
public void onVehicleMove(VehicleMoveEvent event) {
if (LocationTag.isSameBlock(event.getFrom(), event.getTo())) {
return;
}
for (Entity entity : event.getVehicle().getPassengers()) {
if (!onlyTrackPlayers || EntityTag.isPlayer(entity)) {
processNewPosition(new EntityTag(entity), event.getTo(), event);
}
}
}
}
Expand Down
23 changes: 7 additions & 16 deletions plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemScript.java
View file
@@ -1,13 +1,15 @@
package com.denizenscript.denizen.objects.properties.item;

import com.denizenscript.denizen.scripts.containers.core.ItemScriptContainer;
import com.denizenscript.denizen.scripts.containers.core.ItemScriptHelper;
import com.denizenscript.denizencore.objects.core.ElementTag;
import com.denizenscript.denizencore.objects.Mechanism;
import com.denizenscript.denizencore.objects.ObjectTag;
import com.denizenscript.denizencore.objects.core.ScriptTag;
import com.denizenscript.denizen.objects.ItemTag;
import com.denizenscript.denizencore.objects.properties.Property;
import com.denizenscript.denizencore.tags.Attribute;
import com.denizenscript.denizencore.utilities.Deprecations;

public class ItemScript implements Property {

Expand Down Expand Up @@ -46,26 +48,14 @@ public ObjectTag getObjectAttribute(Attribute attribute) {
return null;
}

// <--[tag]
// @attribute <ItemTag.has_script>
// @returns ElementTag(Boolean)
// @group scripts
// @description
// Returns whether the item was created by an item script.
// -->
if (attribute.startsWith("has_script")) {
Deprecations.itemScriptNameTags.warn(attribute.context);
return new ElementTag(item.isItemscript())
.getObjectAttribute(attribute.fulfill(1));
}

// <--[tag]
// @attribute <ItemTag.scriptname>
// @returns ElementTag
// @group scripts
// @description
// Returns the script name of the item if it was created by an item script.
// -->
if (attribute.startsWith("scriptname")) {
Deprecations.itemScriptNameTags.warn(attribute.context);
if (item.isItemscript()) {
return new ElementTag(item.getScriptName())
.getObjectAttribute(attribute.fulfill(1));
Expand All @@ -80,8 +70,9 @@ public ObjectTag getObjectAttribute(Attribute attribute) {
// Returns the script of the item if it was created by an item script.
// -->
if (attribute.startsWith("script")) {
if (item.isItemscript()) {
return new ScriptTag(item.getScriptName())
ItemScriptContainer container = ItemScriptHelper.getItemScriptContainer(item.getItemStack());
if (container != null) {
return new ScriptTag(container)
.getObjectAttribute(attribute.fulfill(1));
}
}
Expand Down

0 comments on commit b40b588

Please sign in to comment.