Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
End disagreement with mcmonkey by renaming Shoot into Move and lettin…
…g him do a new Sentry-like Shoot command.
- Loading branch information
1 parent
0f25109
commit 599f7e2
Showing
5 changed files
with
302 additions
and
12 deletions.
There are no files selected for viewing
This file contains 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 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
243 changes: 243 additions & 0 deletions
243
src/main/java/net/aufdemrand/denizen/scripts/commands/entity/MoveCommand.java
This file contains 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,243 @@ | ||
| package net.aufdemrand.denizen.scripts.commands.entity; | ||
|
|
||
| import java.util.HashMap; | ||
| import java.util.List; | ||
| import java.util.Map; | ||
|
|
||
| import net.aufdemrand.denizen.exceptions.CommandExecutionException; | ||
| import net.aufdemrand.denizen.exceptions.InvalidArgumentsException; | ||
| import net.aufdemrand.denizen.objects.Duration; | ||
| import net.aufdemrand.denizen.objects.Element; | ||
| import net.aufdemrand.denizen.objects.aH; | ||
| import net.aufdemrand.denizen.objects.dEntity; | ||
| import net.aufdemrand.denizen.objects.dList; | ||
| import net.aufdemrand.denizen.objects.dLocation; | ||
| import net.aufdemrand.denizen.objects.dScript; | ||
| import net.aufdemrand.denizen.scripts.ScriptEntry; | ||
| import net.aufdemrand.denizen.scripts.commands.AbstractCommand; | ||
| import net.aufdemrand.denizen.scripts.containers.core.TaskScriptContainer; | ||
| import net.aufdemrand.denizen.utilities.debugging.dB; | ||
| import net.aufdemrand.denizen.utilities.debugging.dB.Messages; | ||
| import net.aufdemrand.denizen.utilities.Conversion; | ||
| import net.aufdemrand.denizen.utilities.entity.Position; | ||
| import net.aufdemrand.denizen.utilities.entity.Rotation; | ||
|
|
||
| import org.bukkit.entity.Entity; | ||
| import org.bukkit.entity.LivingEntity; | ||
| import org.bukkit.entity.Projectile; | ||
| import org.bukkit.scheduler.BukkitRunnable; | ||
| import org.bukkit.util.Vector; | ||
|
|
||
| /** | ||
| * Moves entities through the air from an origin to a destination. | ||
| * The origin can optionally be an entity that will look at the | ||
| * object it is moving. | ||
| * | ||
| * @author David Cernat | ||
| */ | ||
|
|
||
| public class MoveCommand extends AbstractCommand { | ||
|
|
||
| @Override | ||
| public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException { | ||
|
|
||
| for (aH.Argument arg : aH.interpret(scriptEntry.getArguments())) { | ||
|
|
||
| if (!scriptEntry.hasObject("origin") | ||
| && arg.matchesPrefix("origin, o, source, shooter, s")) { | ||
|
|
||
| if (arg.matchesArgumentType(dEntity.class)) | ||
| scriptEntry.addObject("originEntity", arg.asType(dEntity.class)); | ||
| else if (arg.matchesArgumentType(dLocation.class)) | ||
| scriptEntry.addObject("originLocation", arg.asType(dLocation.class)); | ||
| } | ||
|
|
||
| else if (!scriptEntry.hasObject("entities") | ||
| && arg.matchesArgumentList(dEntity.class)) { | ||
| // Entity arg | ||
| scriptEntry.addObject("entities", ((dList) arg.asType(dList.class)).filter(dEntity.class)); | ||
| } | ||
|
|
||
| else if (!scriptEntry.hasObject("destination") | ||
| && arg.matchesArgumentType(dLocation.class)) { | ||
| // Location arg | ||
| scriptEntry.addObject("destination", arg.asType(dLocation.class)); | ||
| } | ||
|
|
||
| else if (!scriptEntry.hasObject("duration") | ||
| && arg.matchesArgumentType(Duration.class) | ||
| && arg.matchesPrefix("duration, d")) { | ||
| // Add value | ||
| scriptEntry.addObject("duration", arg.asType(Duration.class)); | ||
| } | ||
|
|
||
| else if (!scriptEntry.hasObject("speed") | ||
| && arg.matchesPrimitive(aH.PrimitiveType.Double) | ||
| && arg.matchesPrefix("speed, s")) { | ||
| // Add value | ||
| scriptEntry.addObject("speed", arg.asElement()); | ||
| } | ||
|
|
||
| else if (!scriptEntry.hasObject("height") | ||
| && arg.matchesPrimitive(aH.PrimitiveType.Double) | ||
| && arg.matchesPrefix("height, h")) { | ||
| // Add value | ||
| scriptEntry.addObject("height", arg.asElement()); | ||
| } | ||
|
|
||
| else if (!scriptEntry.hasObject("script") | ||
| && arg.matchesArgumentType(dScript.class)) { | ||
| // add value | ||
| scriptEntry.addObject("script", arg.asType(dScript.class)); | ||
| } | ||
| } | ||
|
|
||
| // Use the NPC or player's locations as the origin if one is not specified | ||
|
|
||
| if (!scriptEntry.hasObject("originLocation")) { | ||
|
|
||
| scriptEntry.defaultObject("originEntity", | ||
| scriptEntry.hasNPC() ? scriptEntry.getNPC().getDenizenEntity() : null, | ||
| scriptEntry.hasPlayer() ? scriptEntry.getPlayer().getDenizenEntity() : null); | ||
| } | ||
|
|
||
| // Use a default speed of 1.5 if one is not specified | ||
|
|
||
| scriptEntry.defaultObject("speed", new Element(1.5)); | ||
| scriptEntry.defaultObject("height", new Element(0)); | ||
| scriptEntry.defaultObject("duration", Duration.valueOf("80t")); | ||
|
|
||
| // Check to make sure required arguments have been filled | ||
|
|
||
| if (!scriptEntry.hasObject("entities")) | ||
| throw new InvalidArgumentsException(Messages.ERROR_MISSING_OTHER, "entities"); | ||
|
|
||
| if (!scriptEntry.hasObject("originEntity") && !scriptEntry.hasObject("originLocation")) | ||
| throw new InvalidArgumentsException(Messages.ERROR_MISSING_OTHER, "origin"); | ||
| } | ||
|
|
||
| @SuppressWarnings("unchecked") | ||
| @Override | ||
| public void execute(final ScriptEntry scriptEntry) throws CommandExecutionException { | ||
| // Get objects | ||
|
|
||
| dEntity originEntity = (dEntity) scriptEntry.getObject("originEntity"); | ||
| dLocation originLocation = scriptEntry.hasObject("originLocation") ? | ||
| (dLocation) scriptEntry.getObject("originLocation") : | ||
| new dLocation(originEntity.getEyeLocation() | ||
| .add(originEntity.getEyeLocation().getDirection()) | ||
| .subtract(0, 0.4, 0)); | ||
|
|
||
|
|
||
| // If an entity is doing the shooting, get its LivingEntity | ||
| LivingEntity shooter = originEntity.isLivingEntity() ? originEntity.getLivingEntity() : null; | ||
|
|
||
| final dLocation destination = scriptEntry.hasObject("destination") ? | ||
| (dLocation) scriptEntry.getObject("destination") : | ||
| new dLocation(shooter.getEyeLocation() | ||
| .add(shooter.getEyeLocation().getDirection() | ||
| .multiply(30))); | ||
|
|
||
| List<dEntity> entities = (List<dEntity>) scriptEntry.getObject("entities"); | ||
| final dScript script = (dScript) scriptEntry.getObject("script"); | ||
|
|
||
| final double speed = ((Element) scriptEntry.getObject("speed")).asDouble(); | ||
| final double height = ((Element) scriptEntry.getObject("height")).asDouble(); | ||
| final int maxTicks = ((Duration) scriptEntry.getObject("duration")).getTicksAsInt() / 2; | ||
|
|
||
| // Report to dB | ||
| dB.report(getName(), aH.debugObj("origin", originEntity != null ? originEntity : originLocation) + | ||
| aH.debugObj("entities", entities.toString()) + | ||
| aH.debugObj("destination", destination) + | ||
| aH.debugObj("speed", speed) + | ||
| (script != null ? aH.debugObj("script", script) : "")); | ||
|
|
||
| // If the shooter is not a player, always rotate it to face the destination | ||
| // of the projectile, but if the shooter is a player, only rotate him/her | ||
| // if he/she is not looking in the correct general direction | ||
|
|
||
| if (shooter != null) { | ||
|
|
||
| if (!originEntity.isPlayer() || | ||
| Rotation.isFacingLocation(shooter, destination, 45) == false) { | ||
|
|
||
| Rotation.faceLocation(shooter, destination); | ||
| } | ||
| } | ||
|
|
||
| // Go through all the entities, spawning/teleporting and rotating them | ||
| for (dEntity entity : entities) { | ||
|
|
||
| if (entity.isSpawned() == false) { | ||
| entity.spawnAt(originLocation); | ||
| } | ||
| else { | ||
| entity.teleport(originLocation); | ||
| } | ||
|
|
||
| Rotation.faceLocation(entity.getBukkitEntity(), destination); | ||
|
|
||
| if (entity.getBukkitEntity() instanceof Projectile && shooter != null) { | ||
| ((Projectile) entity.getBukkitEntity()).setShooter(shooter); | ||
| } | ||
| } | ||
|
|
||
| Position.mount(Conversion.convert(entities)); | ||
|
|
||
| // Only use the last projectile in the task below | ||
| final Entity lastEntity = entities.get(entities.size() - 1).getBukkitEntity(); | ||
| final Vector v2 = destination.toVector(); | ||
|
|
||
| BukkitRunnable task = new BukkitRunnable() { | ||
|
|
||
| int runs = 0; | ||
|
|
||
| public void run() { | ||
|
|
||
| if (runs < maxTicks && lastEntity.isValid()) { | ||
|
|
||
| Vector v1 = lastEntity.getLocation().toVector(); | ||
| Vector v3 = v2.clone().subtract(v1).normalize().multiply(speed); | ||
|
|
||
| lastEntity.setVelocity(v3); | ||
| runs++; | ||
|
|
||
| // Check if the entity is close to its destination | ||
|
|
||
| if (Math.abs(v2.getX() - v1.getX()) < 2 && Math.abs(v2.getY() - v1.getY()) < 2 | ||
| && Math.abs(v2.getZ() - v1.getZ()) < 2) { | ||
|
|
||
| runs = maxTicks; | ||
| } | ||
|
|
||
| // Check if the entity has collided with something | ||
| // using the most basic possible calculation | ||
|
|
||
| if (lastEntity.getLocation().add(v3).getBlock().getType().toString().equals("AIR") == false) { | ||
|
|
||
| runs = maxTicks; | ||
| } | ||
| } | ||
| else { | ||
|
|
||
| this.cancel(); | ||
| runs = 0; | ||
|
|
||
| if (script != null) | ||
| { | ||
| Map<String, String> context = new HashMap<String, String>(); | ||
| context.put("1", lastEntity.getLocation().getX() + "," + lastEntity.getLocation().getY() + "," + lastEntity.getLocation().getZ() + "," + lastEntity.getLocation().getWorld().getName()); | ||
| context.put("2", "e@" + lastEntity.getEntityId()); | ||
|
|
||
| ((TaskScriptContainer) script.getContainer()).setSpeed(new Duration(0)) | ||
| .runTaskScript(scriptEntry.getPlayer(), scriptEntry.getNPC(), context); | ||
| } | ||
|
|
||
| } | ||
| } | ||
| }; | ||
|
|
||
| task.runTaskTimer(denizen, 0, 2); | ||
| } | ||
|
|
||
| } |
This file contains 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 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
599f7e2There 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.
Sooo... Is there any specific reason the ShootCommand file is still there?/Does it even matter?
599f7e2There 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.
...move?