created locatable and command block sources

Author: DatAsianBoi123

src/main/java/com/datasiqn/commandcore/CommandCore.java

@@ -7,10 +7,14 @@
 import com.datasiqn.commandcore.command.CommandSource;
 import com.datasiqn.commandcore.command.builder.ArgumentBuilder;
 import com.datasiqn.commandcore.command.builder.CommandBuilder;
+import com.datasiqn.commandcore.locatable.LocatableBlockSender;
+import com.datasiqn.commandcore.locatable.LocatableCommandSender;
+import com.datasiqn.commandcore.locatable.LocatableEntitySender;
 import com.datasiqn.commandcore.managers.CommandManager;
 import com.datasiqn.resultapi.Result;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
+import org.bukkit.command.BlockCommandSender;
 import org.bukkit.command.CommandMap;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.PluginCommand;
@@ -238,6 +242,22 @@ public static CommandCore getInstance() {
                 return Result.resolve(() -> (Entity) sender, error -> "Sender is not an entity");
             }
 
+            @Override
+            public @NotNull Result<BlockCommandSender, String> getBlockChecked() {
+                return Result.resolve(() -> (BlockCommandSender) sender, error -> "Sender is not a block");
+            }
+
+            @Override
+            public @NotNull Result<LocatableCommandSender, String> getLocatableChecked() {
+                Result<LocatableCommandSender, String> result = Result.error("Sender is not locatable");
+                if (sender instanceof Entity) {
+                    result = result.or(Result.ok(new LocatableEntitySender((Entity) sender)));
+                } else if (sender instanceof BlockCommandSender) {
+                    result = result.or(Result.ok(new LocatableBlockSender((BlockCommandSender) sender)));
+                }
+                return result;
+            }
+
             @Override
             public @NotNull CommandSender getSender() {
                 return sender;

src/main/java/com/datasiqn/commandcore/command/CommandSource.java

@@ -1,7 +1,9 @@
 package com.datasiqn.commandcore.command;
 
 import com.datasiqn.commandcore.command.builder.CommandLink;
+import com.datasiqn.commandcore.locatable.LocatableCommandSender;
 import com.datasiqn.resultapi.Result;
+import org.bukkit.command.BlockCommandSender;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
@@ -43,6 +45,36 @@ public interface CommandSource {
      */
     @NotNull Result<Entity, String> getEntityChecked();
 
+    /**
+     * Gets the block executing command
+     * @return The block. This can be safely called if the command link {@link CommandLink#requiresBlock()} requiresBlock}.
+     * @throws IllegalStateException If the sender is not a block
+     */
+    default @NotNull BlockCommandSender getBlock() {
+        return getBlockChecked().<IllegalStateException>unwrapOrThrow(IllegalStateException::new);
+    }
+
+    /**
+     * Same as {@link #getBlock()}, except checks if the sender is a command block and returns a {@code Result}
+     * @return A result describing the command block. If the command link {@link CommandLink#requiresBlock()} requiresCommandBlock}, use {@link #getBlock()} instead
+     */
+    @NotNull Result<BlockCommandSender, String> getBlockChecked();
+
+    /**
+     * Gets the locatable sender executing command
+     * @return The locatable sender. This can be safely called if the command link {@link CommandLink#requiresLocatable() requiresLocatable}.
+     * @throws IllegalStateException If the sender is not a locatable sender
+     */
+    default @NotNull LocatableCommandSender getLocatable() {
+        return getLocatableChecked().<IllegalStateException>unwrapOrThrow(IllegalStateException::new);
+    }
+
+    /**
+     * Same as {@link #getLocatable()}, except checks if the sender is locatable and returns a {@code Result}
+     * @return A result describing the locatable sender. If the command link {@link CommandLink#requiresLocatable()} requiresCommandBlock}, use {@link #getLocatable()} instead
+     */
+    @NotNull Result<LocatableCommandSender, String> getLocatableChecked();
+
     /**
      * Gets the sender of the command
      * @return The sender

src/main/java/com/datasiqn/commandcore/command/builder/CommandLink.java

@@ -49,6 +49,24 @@ public T requiresEntity() {
         return requires(context -> context.getSource().getEntityChecked().and(Result.ok()).or(Result.error("An entity is required to run this")));
     }
 
+    /**
+     * Requires the sender to be a {@code BlockCommandSender}
+     * @see #requires(Requirement)
+     * @return Itself, for chaining
+     */
+    public T requiresBlock() {
+        return requires(context -> context.getSource().getBlockChecked().and(Result.ok()).or(Result.error("A block is required to run this")));
+    }
+
+    /**
+     * Requires the sender to be locatable
+     * @see #requires(Requirement)
+     * @return Itself, for chaining
+     */
+    public T requiresLocatable() {
+        return requires(context -> context.getSource().getLocatableChecked().and(Result.ok()).or(Result.error("A sender with a location is required to run this")));
+    }
+
     /**
      * Adds a new node onto this command builder
      * @param node The node

src/main/java/com/datasiqn/commandcore/locatable/LocatableBlockSender.java

@@ -0,0 +1,37 @@
+package com.datasiqn.commandcore.locatable;
+
+import org.bukkit.Location;
+import org.bukkit.World;
+import org.bukkit.command.BlockCommandSender;
+import org.bukkit.command.CommandSender;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Represents a block that can be located
+ */
+public class LocatableBlockSender implements LocatableCommandSender {
+    private final BlockCommandSender blockSender;
+
+    /**
+     * Constructs a new {@code LocatableBlock} with an internal command sender of {@code blockSender}
+     * @param blockSender The internal blockSender to use
+     */
+    public LocatableBlockSender(BlockCommandSender blockSender) {
+        this.blockSender = blockSender;
+    }
+
+    @Override
+    public @NotNull Location getLocation() {
+        return blockSender.getBlock().getLocation();
+    }
+
+    @Override
+    public @NotNull World getWorld() {
+        return blockSender.getBlock().getWorld();
+    }
+
+    @Override
+    public @NotNull CommandSender getSender() {
+        return blockSender;
+    }
+}

src/main/java/com/datasiqn/commandcore/locatable/LocatableCommandSender.java

@@ -0,0 +1,32 @@
+package com.datasiqn.commandcore.locatable;
+
+import org.bukkit.Location;
+import org.bukkit.World;
+import org.bukkit.command.CommandSender;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Represents a command sender that can be located
+ */
+public interface LocatableCommandSender {
+    /**
+     * Gets the location of this object
+     * @return A clone of location
+     */
+    @NotNull
+    Location getLocation();
+
+    /**
+     * Gets which world this object is located in
+     * @return The world
+     */
+    @NotNull
+    World getWorld();
+
+    /**
+     * Gets the sender of the command that got executed
+     * @return The sender
+     */
+    @NotNull
+    CommandSender getSender();
+}

src/main/java/com/datasiqn/commandcore/locatable/LocatableEntitySender.java

@@ -0,0 +1,37 @@
+package com.datasiqn.commandcore.locatable;
+
+import org.bukkit.Location;
+import org.bukkit.World;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Entity;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Represents an entity that can be located
+ */
+public class LocatableEntitySender implements LocatableCommandSender {
+    private final Entity entity;
+
+    /**
+     * Constructs a new {@code LocatableEntity} with an internal command sender of {@code entity}
+     * @param entity The internal entity to use
+     */
+    public LocatableEntitySender(Entity entity) {
+        this.entity = entity;
+    }
+
+    @Override
+    public @NotNull Location getLocation() {
+        return entity.getLocation();
+    }
+
+    @Override
+    public @NotNull World getWorld() {
+        return entity.getWorld();
+    }
+
+    @Override
+    public @NotNull CommandSender getSender() {
+        return entity;
+    }
+}