Requested changes

Author: sovdeeth

src/main/java/ch/njol/skript/classes/data/JavaClasses.java

@@ -16,6 +16,7 @@
 import ch.njol.util.StringUtils;
 import ch.njol.yggdrasil.Fields;
 import org.jetbrains.annotations.Contract;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.joml.Quaternionf;
 import org.joml.Vector3d;
@@ -312,63 +313,8 @@ public boolean mustSyncDeserialization() {
 			.examples("")
 			.since("2.2-dev23")
 			.defaultExpression(new EventValueExpression<>(Vector3d.class))
-			.parser(new Parser<Vector3d>() {
-				@Override
-				@Nullable
-				public Vector3d parse(final String s, final ParseContext context) {
-					return null;
-				}
-
-				@Override
-				public boolean canParse(final ParseContext context) {
-					return false;
-				}
-
-				@Override
-				public String toString(final Vector3d vec, final int flags) {
-					return "x: " + Skript.toString(vec.x()) + ", y: " + Skript.toString(vec.y()) + ", z: " + Skript.toString(vec.z());
-				}
-
-				@Override
-				public String toVariableNameString(final Vector3d vec) {
-					return "vector:" + vec.x() + "," + vec.y() + "," + vec.z();
-				}
-
-				@Override
-				public String getDebugMessage(final Vector3d vec) {
-					return "(" + vec.x() + "," + vec.y() + "," + vec.z() + ")";
-				}
-			})
-			.serializer(new Serializer<>() {
-				@Override
-				public Fields serialize(Vector3d o) {
-					Fields f = new Fields();
-					f.putPrimitive("x", o.x());
-					f.putPrimitive("y", o.y());
-					f.putPrimitive("z", o.z());
-					return f;
-				}
-
-				@Override
-				public void deserialize(Vector3d o, Fields f) {
-					assert false;
-				}
-
-				@Override
-				public Vector3d deserialize(final Fields f) throws StreamCorruptedException {
-					return new Vector3d(f.getPrimitive("x", double.class), f.getPrimitive("y", double.class), f.getPrimitive("z", double.class));
-				}
-
-				@Override
-				public boolean mustSyncDeserialization() {
-					return false;
-				}
-
-				@Override
-				protected boolean canBeInstantiated() {
-					return false;
-				}
-			})
+			.parser(new Vector3dParser())
+			.serializer(new Vector3dSerializer())
 			.cloner(Vector3d::new));
 
 		// joml type - for display entities
@@ -941,4 +887,68 @@ protected boolean canBeInstantiated() {
 
 	}
 
+	private static class Vector3dParser extends Parser<Vector3d> {
+
+		@Override
+		public @Nullable Vector3d parse(String s, ParseContext context) {
+			return null;
+		}
+
+		@Override
+		public boolean canParse(ParseContext context) {
+			return false;
+		}
+
+		@Override
+		public @NotNull String toString(@NotNull Vector3d vec, int flags) {
+			return "x: " + Skript.toString(vec.x()) + ", y: " + Skript.toString(vec.y()) + ", z: " + Skript.toString(vec.z());
+		}
+
+		@Override
+		public @NotNull String toVariableNameString(@NotNull Vector3d vec) {
+			return "vector:" + vec.x() + "," + vec.y() + "," + vec.z();
+		}
+
+		@Override
+		public @NotNull String getDebugMessage(@NotNull Vector3d vec) {
+			return "(" + vec.x() + "," + vec.y() + "," + vec.z() + ")";
+		}
+
+	}
+
+	private static class Vector3dSerializer extends Serializer<Vector3d> {
+		@Override
+		public Fields serialize(Vector3d vector3d) {
+			Fields f = new Fields();
+			f.putPrimitive("x", vector3d.x());
+			f.putPrimitive("y", vector3d.y());
+			f.putPrimitive("z", vector3d.z());
+			return f;
+		}
+
+		@Override
+		public void deserialize(Vector3d o, Fields f) {
+			assert false;
+		}
+
+		@Override
+		public Vector3d deserialize(Fields fields) throws StreamCorruptedException {
+			return new Vector3d(
+				fields.getPrimitive("x", double.class),
+				fields.getPrimitive("y", double.class),
+				fields.getPrimitive("z", double.class));
+		}
+
+		@Override
+		public boolean mustSyncDeserialization() {
+			return false;
+		}
+
+		@Override
+		protected boolean canBeInstantiated() {
+			return false;
+		}
+
+	}
+
 }

src/main/java/ch/njol/skript/expressions/ExprYawPitch.java

@@ -217,33 +217,25 @@ public static Vector3d fromYawAndPitch(float yaw, float pitch) {
 		return new Vector3d(x,y,z);
 	}
 
-	// TODO Mark as private next version after VectorMath deletion
-	@ApiStatus.Internal
-	public static float getYaw(Vector3d vector) {
+	private static float getYaw(Vector3d vector) {
 		if (((Double) vector.x()).equals((double) 0) && ((Double) vector.z()).equals((double) 0)){
 			return 0;
 		}
 		return (float) (Math.atan2(vector.z(), vector.x()) * RAD_TO_DEG);
 	}
 
-	// TODO Mark as private next version after VectorMath deletion
-	@ApiStatus.Internal
-	public static float getPitch(Vector3d vector) {
+	private static float getPitch(Vector3d vector) {
 		double xy = Math.sqrt(vector.x() * vector.x() + vector.z() * vector.z());
 		return (float) (Math.atan(vector.y() / xy) * RAD_TO_DEG);
 	}
 
-	// TODO Mark as private next version after VectorMath deletion
-	@ApiStatus.Internal
-	public static float skriptYaw(float yaw) {
+	private static float skriptYaw(float yaw) {
 		return yaw < 90
 			? yaw + 270
 			: yaw - 90;
 	}
 
-	// TODO Mark as private next version after VectorMath deletion
-	@ApiStatus.Internal
-	public static float skriptPitch(float pitch) {
+	private static float skriptPitch(float pitch) {
 		return -pitch;
 	}
 
@@ -256,4 +248,5 @@ public static float fromSkriptYaw(float yaw) {
 	public static float fromSkriptPitch(float pitch) {
 		return -pitch;
 	}
+
 }

src/main/java/ch/njol/util/Math2.java

@@ -150,6 +150,11 @@ public static long addClamped(long x, long y) {
 		return result;
 	}
 
+	/**
+	 * @param x the first value
+	 * @param y the second value
+	 * @return the product of x and y, or {@link Long#MAX_VALUE}, {@link Long#MIN_VALUE} in case of an overflow/underflow.
+	 */
 	public static long multiplyClamped(long x, long y) {
 		long result = x * y;
 		long ax = Math.abs(x);
@@ -161,6 +166,10 @@ public static long multiplyClamped(long x, long y) {
 		return result;
 	}
 
+	/**
+	 * @param vector the vector to check
+	 * @return whether the x, y, and z components of the vector are all within {@link Skript#EPSILON} of 0.
+	 */
 	public static boolean vectorIsZero(Vector3d vector) {
 		return Math.abs(vector.x) < Skript.EPSILON &&
 				Math.abs(vector.y) < Skript.EPSILON &&