feat: HypixelPosition and Rays

Author: ArikSquad

commons/src/main/java/net/swofty/commons/Tuple.java

@@ -1,5 +1,10 @@
 package net.swofty.commons;
 
+import lombok.Getter;
+import lombok.Setter;
+
+@Setter
+@Getter
 public class Tuple<A, B> {
     private A key;
     private B value;
@@ -9,19 +14,4 @@ public Tuple(A key, B value) {
         this.value = value;
     }
 
-    public void setKey(A key) {
-        this.key = key;
-    }
-
-    public void setValue(B value) {
-        this.value = value;
-    }
-
-    public A getKey() {
-        return key;
-    }
-
-    public B getValue() {
-        return value;
-    }
 }

commons/src/main/java/net/swofty/commons/bedwars/map/BedWarsMapsConfig.java

@@ -3,6 +3,7 @@
 import lombok.Getter;
 import lombok.Setter;
 import net.swofty.commons.bedwars.BedWarsGameType;
+import net.swofty.commons.mc.HypixelPosition;
 
 import java.util.List;
 import java.util.Map;
@@ -33,8 +34,8 @@ public static class MapConfiguration {
             @Getter
             @Setter
             public static class MapLocations {
-                private Position waiting;
-                private Position spectator;
+                private HypixelPosition waiting;
+                private HypixelPosition spectator;
             }
 
             @Getter
@@ -51,19 +52,13 @@ public static class MapBounds {
             public static class GlobalGenerator {
                 private int amount;
                 private int max;
-                private List<Position> locations;
+                private List<HypixelPosition> locations;
             }
 
         }
     }
 
-    public record Position(double x, double y, double z) {
-    }
-
-    public record PitchYawPosition(double x, double y, double z, float pitch, float yaw) {
-    }
-
-    public record TwoBlockPosition(Position feet, Position head) {
+    public record TwoBlockPosition(HypixelPosition feet, HypixelPosition head) {
     }
 
     public record MinMax(double min, double max) {
@@ -143,11 +138,11 @@ public int getGoldDelaySeconds() {
     @Setter
     public static class MapTeam {
         private Shops shop;
-        private PitchYawPosition spawn;
+        private HypixelPosition spawn;
         private TwoBlockPosition bed;
-        private Position generator;
+        private HypixelPosition generator;
 
-        public record Shops(PitchYawPosition item, PitchYawPosition team) {
+        public record Shops(HypixelPosition item, HypixelPosition team) {
         }
     }
 

commons/src/main/java/net/swofty/commons/mc/HypixelPosition.java

@@ -0,0 +1,36 @@
+package net.swofty.commons.mc;
+
+
+public record HypixelPosition(double x, double y, double z, float yaw, float pitch) {
+
+    public static HypixelPosition ZERO = new HypixelPosition(0, 0, 0);
+
+    public HypixelPosition(double x, double y, double z) {
+        this(x, y, z, 0, 0);
+    }
+
+    public HypixelPosition sub(double x, double y, double z) {
+        return new HypixelPosition(this.x - x, this.y - y, this.z - z, yaw, pitch);
+    }
+
+    public HypixelPosition sub(double value) {
+        return sub(value, value, value);
+    }
+
+    public HypixelPosition sub(HypixelPosition other) {
+        return sub(other.x, other.y, other.z);
+    }
+
+    public HypixelPosition add(double x, double y, double z) {
+        return new HypixelPosition(this.x + x, this.y + y, this.z + z, yaw, pitch);
+    }
+
+    public HypixelPosition add(double value) {
+        return add(value, value, value);
+    }
+
+    public HypixelPosition add(HypixelPosition other) {
+        return add(other.x, other.y, other.z);
+    }
+
+}

commons/src/main/java/net/swofty/commons/murdermystery/map/MurderMysteryMapsConfig.java

@@ -2,6 +2,7 @@
 
 import lombok.Getter;
 import lombok.Setter;
+import net.swofty.commons.mc.HypixelPosition;
 import net.swofty.commons.murdermystery.MurderMysteryGameType;
 
 import java.util.List;
@@ -24,25 +25,19 @@ public static class MapEntry {
         public static class MapConfiguration {
             private List<MurderMysteryGameType> types;
             private MapLocations locations;
-            private List<Position> goldSpawns;
-            private List<Position> playerSpawns;
+            private List<HypixelPosition> goldSpawns;
+            private List<HypixelPosition> playerSpawns;
             private List<KillRegion> killRegions;
 
             @Getter
             @Setter
             public static class MapLocations {
-                private PitchYawPosition waiting;
+                private HypixelPosition waiting;
             }
         }
     }
 
-    public record Position(double x, double y, double z) {
-    }
-
-    public record PitchYawPosition(double x, double y, double z, float pitch, float yaw) {
-    }
-
-    public record KillRegion(String name, Position min, Position max) {
+    public record KillRegion(String name, HypixelPosition min, HypixelPosition max) {
         public boolean isComplete() {
             return min != null && max != null;
         }

commons/src/main/java/net/swofty/commons/skywars/map/SkywarsMapsConfig.java

@@ -2,6 +2,7 @@
 
 import lombok.Getter;
 import lombok.Setter;
+import net.swofty.commons.mc.HypixelPosition;
 import net.swofty.commons.skywars.SkywarsGameType;
 
 import java.util.List;
@@ -23,7 +24,7 @@ public static class MapEntry {
         @Setter
         public static class MapConfiguration {
             private List<SkywarsGameType> types;
-            private PitchYawPosition center;
+            private HypixelPosition center;
             private List<IslandSpawn> islands;
             private int voidY;
             private MapBounds bounds;
@@ -34,16 +35,10 @@ public static class MapConfiguration {
     @Setter
     public static class IslandSpawn {
         private int teamId;
-        private PitchYawPosition cageCenter;
+        private HypixelPosition cageCenter;
     }
 
-    public record Position(double x, double y, double z) {
-    }
-
-    public record PitchYawPosition(double x, double y, double z, float pitch, float yaw) {
-    }
-
-    public record MapBounds(Position min, Position max) {
+    public record MapBounds(HypixelPosition min, HypixelPosition max) {
         public boolean isWithinBounds(double x, double y, double z) {
             if (min == null || max == null) return true;
             double minX = Math.min(min.x(), max.x());