made CommandCore.createSource actually a factory method

Author: DatAsianBoi123

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

@@ -4,14 +4,10 @@
 import com.datasiqn.commandcore.argument.type.ArgumentType;
 import com.datasiqn.commandcore.command.Command;
 import com.datasiqn.commandcore.command.CommandContext;
-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.command.source.*;
 import com.datasiqn.commandcore.managers.CommandManager;
-import com.datasiqn.resultapi.Result;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.command.BlockCommandSender;
@@ -235,37 +231,14 @@ public static CommandCore getInstance() {
      */
     @Contract(value = "_ -> new", pure = true)
     public static @NotNull CommandSource createSource(CommandSender sender) {
-        return new CommandSource() {
-            @Override
-            public @NotNull Result<Player, String> getPlayerChecked() {
-                return Result.resolve(() -> (Player) sender, error -> "Sender is not a player");
-            }
-
-            @Override
-            public @NotNull Result<Entity, String> getEntityChecked() {
-                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;
-            }
-        };
+        if (sender instanceof Player) {
+            return new PlayerCommandSource(((Player) sender));
+        } else if (sender instanceof Entity) {
+            return new EntityCommandSource(((Entity) sender));
+        } else if (sender instanceof BlockCommandSender) {
+            return new BlockCommandSource(((BlockCommandSender) sender));
+        } else {
+            return new GenericCommandSource(sender);
+        }
     }
 }

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

@@ -1,6 +1,7 @@
 package com.datasiqn.commandcore.command;
 
 import com.datasiqn.commandcore.argument.Arguments;
+import com.datasiqn.commandcore.command.source.CommandSource;
 import org.jetbrains.annotations.NotNull;
 
 /**

src/main/java/com/datasiqn/commandcore/command/source/BlockCommandSource.java

@@ -0,0 +1,44 @@
+package com.datasiqn.commandcore.command.source;
+
+import com.datasiqn.commandcore.CommandCore;
+import com.datasiqn.commandcore.locatable.LocatableBlockSender;
+import com.datasiqn.commandcore.locatable.LocatableCommandSender;
+import com.datasiqn.resultapi.Result;
+import org.bukkit.command.BlockCommandSender;
+import org.bukkit.command.CommandSender;
+
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Represents a {@code CommandSource} where the sender is a {@link BlockCommandSender}
+ * <br><br>
+ * <strong>NOTE: Do not directly instantiate this class! Instead, use the factory method {@link CommandCore#createSource(CommandSender) createSource}</strong>
+ */
+public class BlockCommandSource implements CommandSource {
+    private final BlockCommandSender sender;
+
+    /**
+     * Creates a new {@code BlockCommandSource} with the internal sender of {@code sender}.
+     * <br><br>
+     * <strong>NOTE: Do not directly use this constructor! Instead, use the factory method {@link CommandCore#createSource(CommandSender) createSource}</strong>
+     * @param sender The {@code BlockCommandSender} to internally use
+     */
+    public BlockCommandSource(BlockCommandSender sender) {
+        this.sender = sender;
+    }
+
+    @Override
+    public @NotNull Result<BlockCommandSender, String> getBlockChecked() {
+        return Result.ok(sender);
+    }
+
+    @Override
+    public @NotNull Result<LocatableCommandSender, String> getLocatableChecked() {
+        return Result.ok(new LocatableBlockSender(sender));
+    }
+
+    @Override
+    public @NotNull CommandSender getSender() {
+        return sender;
+    }
+}

src/main/java/com/datasiqn/commandcore/command/CommandSource.java renamed to src/main/java/com/datasiqn/commandcore/command/source/CommandSource.java

@@ -1,5 +1,6 @@
-package com.datasiqn.commandcore.command;
+package com.datasiqn.commandcore.command.source;
 
+import com.datasiqn.commandcore.CommandCore;
 import com.datasiqn.commandcore.command.builder.CommandLink;
 import com.datasiqn.commandcore.locatable.LocatableCommandSender;
 import com.datasiqn.resultapi.Result;
@@ -12,7 +13,7 @@
 import org.jetbrains.annotations.Nullable;
 
 /**
- * Represents the source of a command
+ * Represents the source of a command. Get one using the factory method {@link CommandCore#createSource(CommandSender) createSource}.
  */
 public interface CommandSource {
     /**
@@ -26,9 +27,13 @@ public interface CommandSource {
 
     /**
      * Same as {@link #getPlayer()}, except checks if the sender is a player and returns a {@code Result}
+     *
      * @return A result describing the player. If the command link {@link CommandLink#requiresPlayer() requiresPlayer}, use {@link #getPlayer()} instead
      */
-    @NotNull Result<Player, String> getPlayerChecked();
+    @NotNull
+    default Result<Player, String> getPlayerChecked() {
+        return Result.error("Sender is not a player");
+    }
 
     /**
      * Gets the entity executing command
@@ -41,9 +46,13 @@ public interface CommandSource {
 
     /**
      * Same as {@link #getEntity()}, except checks if the sender is an entity and returns a {@code Result}
+     *
      * @return A result describing the entity. If the command link {@link CommandLink#requiresEntity() requiresEntity}, use {@link #getEntity()} instead
      */
-    @NotNull Result<Entity, String> getEntityChecked();
+    @NotNull
+    default Result<Entity, String> getEntityChecked() {
+        return Result.error("Sender is not an entity");
+    }
 
     /**
      * Gets the block executing command
@@ -56,9 +65,13 @@ public interface CommandSource {
 
     /**
      * 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();
+    @NotNull
+    default Result<BlockCommandSender, String> getBlockChecked() {
+        return Result.error("Sender is not a block");
+    }
 
     /**
      * Gets the locatable sender executing command
@@ -71,9 +84,13 @@ public interface CommandSource {
 
     /**
      * 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();
+    @NotNull
+    default Result<LocatableCommandSender, String> getLocatableChecked() {
+        return Result.error("Sender is not locatable");
+    }
 
     /**
      * Gets the sender of the command

src/main/java/com/datasiqn/commandcore/command/source/EntityCommandSource.java

@@ -0,0 +1,43 @@
+package com.datasiqn.commandcore.command.source;
+
+import com.datasiqn.commandcore.CommandCore;
+import com.datasiqn.commandcore.locatable.LocatableCommandSender;
+import com.datasiqn.commandcore.locatable.LocatableEntitySender;
+import com.datasiqn.resultapi.Result;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Entity;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Represents a {@code CommandSource} where the sender is an {@link Entity}.
+ * <br><br>
+ * <strong>NOTE: Do not directly instantiate this class! Instead, use the factory method {@link CommandCore#createSource(CommandSender) createSource}</strong>
+ */
+public class EntityCommandSource implements CommandSource {
+    private final Entity sender;
+
+    /**
+     * Creates a new {@code EntityCommandSource} with the internal sender of {@code sender}.
+     * <br><br>
+     * <strong>NOTE: Do not directly use this constructor! Instead, use the factory method {@link CommandCore#createSource(CommandSender) createSource}</strong>
+     * @param sender The sender
+     */
+    public EntityCommandSource(Entity sender) {
+        this.sender = sender;
+    }
+
+    @Override
+    public @NotNull Result<Entity, String> getEntityChecked() {
+        return Result.ok(sender);
+    }
+
+    @Override
+    public @NotNull Result<LocatableCommandSender, String> getLocatableChecked() {
+        return Result.ok(new LocatableEntitySender(sender));
+    }
+
+    @Override
+    public @NotNull CommandSender getSender() {
+        return sender;
+    }
+}

src/main/java/com/datasiqn/commandcore/command/source/GenericCommandSource.java

@@ -0,0 +1,29 @@
+package com.datasiqn.commandcore.command.source;
+
+import com.datasiqn.commandcore.CommandCore;
+import org.bukkit.command.CommandSender;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Represents a generic command source that is none of the other command sources.
+ * <br><br>
+ * <strong>Do not directly instantiate this class! Instead, use the factory method {@link CommandCore#createSource(CommandSender) createSource}</strong>
+ */
+public class GenericCommandSource implements CommandSource {
+    private final CommandSender sender;
+
+    /**
+     * Creates a new {@code GenericCommandSource} with the internal sender of {@code sender}.
+     * <br><br>
+     * <strong>Do not directly use constructor! Instead, use the factory method {@link CommandCore#createSource(CommandSender) createSource}</strong>
+     * @param sender The command sender
+     */
+    public GenericCommandSource(CommandSender sender) {
+        this.sender = sender;
+    }
+
+    @Override
+    public @NotNull CommandSender getSender() {
+        return sender;
+    }
+}

src/main/java/com/datasiqn/commandcore/command/source/PlayerCommandSource.java

@@ -0,0 +1,32 @@
+package com.datasiqn.commandcore.command.source;
+
+import com.datasiqn.commandcore.CommandCore;
+import com.datasiqn.resultapi.Result;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Represents a {@code CommandSource} where the sender is a {@link Player}.\
+ * <br><br>
+ * <strong>NOTE: Do not directly instantiate this class! Instead, use the factory method {@link CommandCore#createSource(CommandSender) createSource}</strong>
+ */
+public class PlayerCommandSource extends EntityCommandSource {
+    private final Player player;
+
+    /**
+     * Creates a new {@code CommandSource} with the internal sender of {@code sender}.
+     * <br><br>
+     * <strong>NOTE: Do not directly use this constructor! Instead, use the factory method {@link CommandCore#createSource(CommandSender) createSource}</strong>
+     * @param sender The sender
+     */
+    public PlayerCommandSource(Player sender) {
+        super(sender);
+        this.player = sender;
+    }
+
+    @Override
+    public @NotNull Result<Player, String> getPlayerChecked() {
+        return Result.ok(player);
+    }
+}