Add extra abstraction for distance commands

ricglz · Jan 24, 2021 · d964024 · d964024
1 parent c267ffc
commit d964024
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/src/main/java/me/ricglz/discoords/commands/CommandDistance.java b/src/main/java/me/ricglz/discoords/commands/CommandDistance.java
@@ -18,9 +18,7 @@ public void run(Player sender, Command command, String label, String[] args)
         World world = sender.getWorld();
         Location point1 = createLocation(world, args, 0);
         Location point2 = args.length == 3 ? sender.getLocation() : createLocation(world, args, 3);
-        int distance = getDistance(point1, point2);
-        String message = String.format("The distance between the 2 points is %d units", distance);
-        sender.sendMessage(message);
+        getDistanceAndSendMessage(point1, point2, sender);
     }
 
     private Location createLocation(World world, String[] args, int start) {

diff --git a/src/main/java/me/ricglz/discoords/commands/CommandDistanceLabels.java b/src/main/java/me/ricglz/discoords/commands/CommandDistanceLabels.java
@@ -22,9 +22,7 @@ public void run(Player sender, Command command, String label, String[] args) thr
         final Coordinates coords = discoords.getCoordinates();
         Location point1 = coords.getCoordinates(args[0]);
         Location point2 = args.length == 1 ? sender.getLocation() : coords.getCoordinates(args[1]);
-        int distance = getDistance(point1, point2);
-        String message = String.format("The distance between the 2 points is %d units", distance);
-        sender.sendMessage(message);
+        getDistanceAndSendMessage(point1, point2, sender);
     }
 
     @Override

diff --git a/src/main/java/me/ricglz/discoords/commands/GeneralDistanceCommand.java b/src/main/java/me/ricglz/discoords/commands/GeneralDistanceCommand.java
@@ -1,6 +1,7 @@
 package me.ricglz.discoords.commands;
 
 import org.bukkit.Location;
+import org.bukkit.entity.Player;
 
 public class GeneralDistanceCommand extends GeneralCommand {
     protected int getDistance(Location point1, Location point2) {
@@ -10,4 +11,10 @@ protected int getDistance(Location point1, Location point2) {
 
         return (int) Math.sqrt(x * x + y * y + z * z);
     }
+
+    protected void getDistanceAndSendMessage(Location point1, Location point2, Player sender) {
+        int distance = getDistance(point1, point2);
+        String message = String.format("The distance between the 2 points is %d units", distance);
+        sender.sendMessage(message);
+    }
 }