CommandSource now has getChecked methods to avoid constant unwrapping

Author: DatAsianBoi123

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

@@ -229,12 +229,12 @@ public static CommandCore getInstance() {
     public static @NotNull CommandSource createSource(CommandSender sender) {
         return new CommandSource() {
             @Override
-            public @NotNull Result<Player, String> getPlayer() {
+            public @NotNull Result<Player, String> getPlayerChecked() {
                 return Result.resolve(() -> (Player) sender, error -> "Sender is not a player");
             }
 
             @Override
-            public @NotNull Result<Entity, String> getEntity() {
+            public @NotNull Result<Entity, String> getEntityChecked() {
                 return Result.resolve(() -> (Entity) sender, error -> "Sender is not an entity");
             }
 

src/main/java/com/datasiqn/commandcore/argument/type/VectorArgumentType.java

@@ -33,7 +33,7 @@ class VectorArgumentType implements ArgumentType<Vector> {
 
     @Override
     public @NotNull List<String> getTabComplete(@NotNull CommandContext context) {
-        Result<Player, String> player = context.getSource().getPlayer();
+        Result<Player, String> player = context.getSource().getPlayerChecked();
         if (player.isError()) return Collections.emptyList();
         Block targetBlock = player.unwrap().getTargetBlockExact(5);
         if (targetBlock == null) return Collections.emptyList();

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

@@ -14,25 +14,40 @@
  */
 public interface CommandSource {
     /**
-     * Gets the player executing command
-     * @return A result describing the player. This can be safely unwrapped if the command link {@link CommandLink#requiresPlayer() requiresPlayer}.
+     * Gets the player executing command. This can be safely called if the command link {@link CommandLink#requiresPlayer() requiresPlayer}.
+     * @return The player
+     * @throws IllegalStateException If the sender is not a player
      */
-    @NotNull
-    Result<Player, String> getPlayer();
+    default @NotNull Player getPlayer() {
+        return getPlayerChecked().<IllegalStateException>unwrapOrThrow(IllegalStateException::new);
+    }
+
+    /**
+     * 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();
 
     /**
      * Gets the entity executing command
-     * @return A result describing the entity. This can be safely unwrapped if the command link {@link CommandLink#requiresEntity() requiresEntity}.
+     * @return The entity. This can be safely called if the command link {@link CommandLink#requiresEntity() requiresEntity}.
+     * @throws IllegalStateException If the sender is not an entity
+     */
+    default @NotNull Entity getEntity() {
+        return getEntityChecked().<IllegalStateException>unwrapOrThrow(IllegalStateException::new);
+    }
+
+    /**
+     * 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> getEntity();
+    @NotNull Result<Entity, String> getEntityChecked();
 
     /**
      * Gets the sender of the command
      * @return The sender
      */
-    @NotNull
-    CommandSender getSender();
+    @NotNull CommandSender getSender();
 
     /**
      * Sends the command source a message

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

@@ -37,7 +37,7 @@ public T requires(@NotNull Requirement requirement) {
      * @return Itself, for chaining
      */
     public T requiresPlayer() {
-        return requires(context -> context.getSource().getPlayer().and(Result.ok()).or(Result.error("A player is required to run this")));
+        return requires(context -> context.getSource().getPlayerChecked().and(Result.ok()).or(Result.error("A player is required to run this")));
     }
 
     /**
@@ -46,7 +46,7 @@ public T requiresPlayer() {
      * @return Itself, for chaining
      */
     public T requiresEntity() {
-        return requires(context -> context.getSource().getEntity().and(Result.ok()).or(Result.error("An entity is required to run this")));
+        return requires(context -> context.getSource().getEntityChecked().and(Result.ok()).or(Result.error("An entity is required to run this")));
     }
 
     /**