From 34e2f4d0222488a17b1f26ee7d513b00f7bdf5f8 Mon Sep 17 00:00:00 2001 From: TheMode Date: Wed, 30 Jun 2021 02:10:56 +0200 Subject: [PATCH] cleanup --- .../minestom/server/utils/incubator/Vec.java | 12 ++++----- .../server/utils/incubator/VecImpl.java | 25 +++++++++---------- 2 files changed, 18 insertions(+), 19 deletions(-) diff --git a/src/main/java/net/minestom/server/utils/incubator/Vec.java b/src/main/java/net/minestom/server/utils/incubator/Vec.java index 2c87b6a71..7191f0aa2 100644 --- a/src/main/java/net/minestom/server/utils/incubator/Vec.java +++ b/src/main/java/net/minestom/server/utils/incubator/Vec.java @@ -71,7 +71,7 @@ public interface Vec { @Contract(pure = true) default @NotNull Vec add(double value) { - return add(Vec.vec(value)); + return add(vec(value)); } @Contract(pure = true) @@ -81,7 +81,7 @@ public interface Vec { @Contract(pure = true) default @NotNull Vec sub(double value) { - return sub(Vec.vec(value)); + return sub(vec(value)); } @Contract(pure = true) @@ -91,7 +91,7 @@ public interface Vec { @Contract(pure = true) default @NotNull Vec mul(double value) { - return mul(Vec.vec(value)); + return mul(vec(value)); } @Contract(pure = true) @@ -101,7 +101,7 @@ public interface Vec { @Contract(pure = true) default @NotNull Vec div(double value) { - return div(Vec.vec(value)); + return div(vec(value)); } @Contract(pure = true) @@ -121,7 +121,7 @@ public interface Vec { @Contract(pure = true) default @NotNull Vec min(double value) { - return min(Vec.vec(value)); + return min(vec(value)); } @Contract(pure = true) @@ -131,7 +131,7 @@ public interface Vec { @Contract(pure = true) default @NotNull Vec max(double value) { - return max(Vec.vec(value)); + return max(vec(value)); } @Contract(pure = true) diff --git a/src/main/java/net/minestom/server/utils/incubator/VecImpl.java b/src/main/java/net/minestom/server/utils/incubator/VecImpl.java index b4ce16c55..fbd4ab0c2 100644 --- a/src/main/java/net/minestom/server/utils/incubator/VecImpl.java +++ b/src/main/java/net/minestom/server/utils/incubator/VecImpl.java @@ -3,7 +3,6 @@ package net.minestom.server.utils.incubator; import org.jetbrains.annotations.NotNull; class VecImpl { - static class Vec3 implements Vec { private final double x, y, z; @@ -18,22 +17,22 @@ class VecImpl { } @Override - public @NotNull Vec with(double x, double y, double z) { + public final @NotNull Vec with(double x, double y, double z) { return new Vec3(x, y, z); } @Override - public double x() { + public final double x() { return x; } @Override - public double y() { + public final double y() { return y; } @Override - public double z() { + public final double z() { return z; } } @@ -47,22 +46,22 @@ class VecImpl { } @Override - public @NotNull Vec with(double x, double y, double z) { + public final @NotNull Vec with(double x, double y, double z) { return new Vec3(x, y, z); } @Override - public double x() { + public final double x() { return x; } @Override - public double y() { + public final double y() { return 0; } @Override - public double z() { + public final double z() { return z; } } @@ -75,22 +74,22 @@ class VecImpl { } @Override - public @NotNull Vec with(double x, double y, double z) { + public final @NotNull Vec with(double x, double y, double z) { return new Vec3(x, y, z); } @Override - public double x() { + public final double x() { return value; } @Override - public double y() { + public final double y() { return value; } @Override - public double z() { + public final double z() { return value; } }