From fb6c86801e27affde434cabf8bb22b0a53d14ffd Mon Sep 17 00:00:00 2001 From: dfsek Date: Mon, 20 Dec 2021 00:06:35 -0700 Subject: [PATCH] make Vector3 constructor private --- .../addons/terrascript/script/functions/StateFunction.java | 2 +- .../dfsek/terra/addon/terrascript/check/CheckFunction.java | 2 +- .../main/java/com/dfsek/terra/api/util/vector/Vector2.java | 2 +- .../main/java/com/dfsek/terra/api/util/vector/Vector3.java | 2 +- .../src/main/java/com/dfsek/terra/bukkit/BukkitPlayer.java | 2 +- .../main/java/com/dfsek/terra/bukkit/world/BukkitAdapter.java | 4 ++-- .../main/java/com/dfsek/terra/fabric/util/FabricAdapter.java | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/StateFunction.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/StateFunction.java index 73c4ac6fe..de64219fd 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/StateFunction.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/StateFunction.java @@ -49,7 +49,7 @@ public class StateFunction implements Function { z.apply(implementationArguments, variableMap).doubleValue()); RotationUtil.rotateVector(xz, arguments.getRotation()); - Vector3 origin = new Vector3(FastMath.roundToInt(xz.getX()), y.apply(implementationArguments, variableMap).intValue(), + Vector3 origin = Vector3.of(FastMath.roundToInt(xz.getX()), y.apply(implementationArguments, variableMap).intValue(), FastMath.roundToInt(xz.getZ())).add(arguments.getOrigin()); try { BlockEntity state = arguments.getWorld().getBlockEntity(origin); diff --git a/common/addons/terrascript-function-check-noise-3d/src/main/java/com/dfsek/terra/addon/terrascript/check/CheckFunction.java b/common/addons/terrascript-function-check-noise-3d/src/main/java/com/dfsek/terra/addon/terrascript/check/CheckFunction.java index 1665e435e..b176d980a 100644 --- a/common/addons/terrascript-function-check-noise-3d/src/main/java/com/dfsek/terra/addon/terrascript/check/CheckFunction.java +++ b/common/addons/terrascript-function-check-noise-3d/src/main/java/com/dfsek/terra/addon/terrascript/check/CheckFunction.java @@ -51,7 +51,7 @@ public class CheckFunction implements Function { RotationUtil.rotateVector(xz, arguments.getRotation()); Vector3 location = arguments.getOrigin().toVector3().clone().add( - new Vector3(FastMath.roundToInt(xz.getX()), y.apply(implementationArguments, variableMap).doubleValue(), + Vector3.of(FastMath.roundToInt(xz.getX()), y.apply(implementationArguments, variableMap).doubleValue(), FastMath.roundToInt(xz.getZ()))); return apply(location, arguments.getWorld()); diff --git a/common/api/util/src/main/java/com/dfsek/terra/api/util/vector/Vector2.java b/common/api/util/src/main/java/com/dfsek/terra/api/util/vector/Vector2.java index 9bb9e5cd4..d8452af7d 100644 --- a/common/api/util/src/main/java/com/dfsek/terra/api/util/vector/Vector2.java +++ b/common/api/util/src/main/java/com/dfsek/terra/api/util/vector/Vector2.java @@ -135,7 +135,7 @@ public class Vector2 implements Cloneable { } public Vector3 extrude(double y) { - return new Vector3(this.x, y, this.z); + return Vector3.of(this.x, y, this.z); } public Vector2 add(double x, double z) { diff --git a/common/api/util/src/main/java/com/dfsek/terra/api/util/vector/Vector3.java b/common/api/util/src/main/java/com/dfsek/terra/api/util/vector/Vector3.java index 69b5e149a..24aaf4e37 100644 --- a/common/api/util/src/main/java/com/dfsek/terra/api/util/vector/Vector3.java +++ b/common/api/util/src/main/java/com/dfsek/terra/api/util/vector/Vector3.java @@ -20,7 +20,7 @@ public class Vector3 implements Cloneable { private double y; private double z; - public Vector3(double x, double y, double z) { + private Vector3(double x, double y, double z) { this.x = x; this.y = y; this.z = z; diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/BukkitPlayer.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/BukkitPlayer.java index 01d7bba98..e069d5f2b 100644 --- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/BukkitPlayer.java +++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/BukkitPlayer.java @@ -41,7 +41,7 @@ public class BukkitPlayer extends BukkitCommandSender implements Player { @Override public Vector3 position() { org.bukkit.Location bukkit = delegate.getLocation(); - return new Vector3(bukkit.getX(), bukkit.getY(), bukkit.getZ()); + return Vector3.of(bukkit.getX(), bukkit.getY(), bukkit.getZ()); } @Override diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitAdapter.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitAdapter.java index 5cc0ef271..621fe178b 100644 --- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitAdapter.java +++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitAdapter.java @@ -152,7 +152,7 @@ public final class BukkitAdapter { } public static Vector3 adapt(Location location) { - return new Vector3(location.getX(), location.getY(), location.getZ()); + return Vector3.of(location.getX(), location.getY(), location.getZ()); } public static Vector adapt(Vector3 vector3) { @@ -160,7 +160,7 @@ public final class BukkitAdapter { } public static Vector3 adapt(Vector vector) { - return new Vector3(vector.getX(), vector.getY(), vector.getZ()); + return Vector3.of(vector.getX(), vector.getY(), vector.getZ()); } public static CommandSender adapt(org.bukkit.command.CommandSender sender) { diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/util/FabricAdapter.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/util/FabricAdapter.java index e5c9345d0..c951655b0 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/util/FabricAdapter.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/util/FabricAdapter.java @@ -39,7 +39,7 @@ public final class FabricAdapter { } public static Vector3 adapt(BlockPos pos) { - return new Vector3(pos.getX(), pos.getY(), pos.getZ()); + return Vector3.of(pos.getX(), pos.getY(), pos.getZ()); } public static FabricBlockState adapt(BlockState state) {