Simplify Implementation

KyoriPowered · Dec 18, 2021 · 6a7320c · 6a7320c
1 parent 1c0eb1c
commit 6a7320c
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 117 deletions.
diff --git a/api/src/main/java/net/kyori/adventure/util/HSVLikeImpl.java b/api/src/main/java/net/kyori/adventure/util/HSVLikeImpl.java
@@ -33,10 +33,9 @@ final class HSVLikeImpl implements HSVLike {
   private final float v;
 
   HSVLikeImpl(final float h, final float s, final float v) {
-    final RangeImpl range = new RangeImpl(0, 1);
-    range.requireInside(h, "h");
-    range.requireInside(s, "s");
-    range.requireInside(v, "v");
+    requireInsideRange(h, "h");
+    requireInsideRange(s, "s");
+    requireInsideRange(v, "v");
     this.h = h;
     this.s = s;
     this.v = v;
@@ -57,6 +56,13 @@ public float v() {
     return this.v;
   }
 
+  private static void requireInsideRange(final float number, final String name) throws IllegalArgumentException {
+    if (!(0 <= number && number <= 1)) {
+      throw new IllegalArgumentException(
+        name + " (" + number + ")" + " is not inside the required range: [" + 0 + "," + 1 + "]");
+    }
+  }
+
   @Override
   public boolean equals(final @Nullable Object other) {
     if (this == other) return true;

diff --git a/api/src/main/java/net/kyori/adventure/util/Range.java b/api/src/main/java/net/kyori/adventure/util/Range.java
diff --git a/api/src/main/java/net/kyori/adventure/util/RangeImpl.java b/api/src/main/java/net/kyori/adventure/util/RangeImpl.java