Created interfaces for values with extended capabilities

Author: ZeroMemes

src/main/java/clientapi/value/IBooleanValue.java

@@ -0,0 +1,42 @@
+/*
+ * Copyright 2018 ImpactDevelopment
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package clientapi.value;
+
+import clientapi.util.interfaces.Toggleable;
+
+/**
+ * @author Brady
+ * @since 9/27/2018
+ */
+public interface IBooleanValue extends IValue<Boolean>, Toggleable {
+
+    @Override
+    default void setState(boolean state) {
+        this.setValue(state);
+
+        if (this.getState()) {
+            this.onEnable();
+        } else {
+            this.onDisable();
+        }
+    }
+
+    @Override
+    default boolean getState() {
+        return this.getValue();
+    }
+}

src/main/java/clientapi/value/ICycleableValue.java

@@ -0,0 +1,64 @@
+/*
+ * Copyright 2018 ImpactDevelopment
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package clientapi.value;
+
+import clientapi.util.interfaces.Cycleable;
+import org.apache.commons.lang3.ArrayUtils;
+
+/**
+ * @author Brady
+ * @since 9/27/2018
+ */
+public interface ICycleableValue<T> extends IValue<T>, Cycleable<T> {
+
+    @Override
+    default T current() {
+        return this.getValue();
+    }
+
+    @Override
+    default T next() {
+        T value = peekNext();
+        this.setValue(value);
+        return value;
+    }
+
+    @Override
+    default T last() {
+        T value = peekLast();
+        this.setValue(value);
+        return value;
+    }
+
+    @Override
+    default T peekNext() {
+        T[] values = getElements();
+        int index = ArrayUtils.indexOf(values, getValue());
+        if (++index >= values.length)
+            index = 0;
+        return values[index];
+    }
+
+    @Override
+    default T peekLast() {
+        T[] values = getElements();
+        int index = ArrayUtils.indexOf(values, getValue());
+        if (--index < 0)
+            index = values.length - 1;
+        return values[index];
+    }
+}

src/main/java/clientapi/value/INumberValue.java

@@ -0,0 +1,57 @@
+/*
+ * Copyright 2018 ImpactDevelopment
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package clientapi.value;
+
+import clientapi.value.type.number.AbstractNumberType;
+
+/**
+ * @author Brady
+ * @since 9/27/2018
+ */
+public interface INumberValue<T extends Number> extends IValue<T> {
+
+    /**
+     * @return The minimum value of the number
+     */
+    T getMinimum();
+
+    /**
+     * @return The maximum value of this number
+     */
+    T getMaximum();
+
+    /**
+     * @return The interval of change for this number value
+     */
+    T getInterval();
+
+    /**
+     * Increments the value of this {@link AbstractNumberType}
+     * by {@code 1/10th} the range, multiplied by the parameter.
+     *
+     * @param multiplier The incrementation multiplier
+     */
+    void increment(float multiplier);
+
+    /**
+     * Decrements the value of this {@link AbstractNumberType}
+     * by {@code 1/10th} the range, multiplied by the parameter.
+     *
+     * @param multiplier The decrementation multiplier
+     */
+    void decrement(float multiplier);
+}

src/main/java/clientapi/value/type/BooleanType.java

@@ -16,7 +16,7 @@
 
 package clientapi.value.type;
 
-import clientapi.util.interfaces.Toggleable;
+import clientapi.value.IBooleanValue;
 import clientapi.value.Value;
 import clientapi.value.annotation.BooleanValue;
 
@@ -30,25 +30,9 @@
  * @author Brady
  * @since 1/23/2017
  */
-public final class BooleanType extends Value<Boolean> implements Toggleable {
+public final class BooleanType extends Value<Boolean> implements IBooleanValue {
 
     public BooleanType(String name, String parent, String id, String description, Object object, Field field) {
         super(name, parent, id, description, object, field);
     }
-
-    @Override
-    public final void setState(boolean state) {
-        this.setValue(state);
-
-        if (this.getState()) {
-            this.onEnable();
-        } else {
-            this.onDisable();
-        }
-    }
-
-    @Override
-    public final boolean getState() {
-        return super.getValue();
-    }
 }

src/main/java/clientapi/value/type/EnumType.java

@@ -16,10 +16,9 @@
 
 package clientapi.value.type;
 
-import clientapi.util.interfaces.Cycleable;
+import clientapi.value.ICycleableValue;
 import clientapi.value.Value;
 import clientapi.value.annotation.EnumValue;
-import org.apache.commons.lang3.ArrayUtils;
 
 import java.lang.reflect.Field;
 
@@ -31,7 +30,7 @@
  * @author Brady
  * @since 12/1/2017
  */
-public final class EnumType<T extends Enum<?>> extends Value<T> implements Cycleable<T> {
+public final class EnumType<T extends Enum<?>> extends Value<T> implements ICycleableValue<T> {
 
     private final T[] values;
 
@@ -40,41 +39,6 @@ public EnumType(String name, String parent, String id, String description, Objec
         this.values = enumClass.getEnumConstants();
     }
 
-    @Override
-    public final T current() {
-        return this.getValue();
-    }
-
-    @Override
-    public final T next() {
-        T value = peekNext();
-        this.setValue(value);
-        return value;
-    }
-
-    @Override
-    public final T last() {
-        T value = peekLast();
-        this.setValue(value);
-        return value;
-    }
-
-    @Override
-    public final T peekNext() {
-        int index = ArrayUtils.indexOf(values, getValue());
-        if (++index >= values.length)
-            index = 0;
-        return values[index];
-    }
-
-    @Override
-    public final T peekLast() {
-        int index = ArrayUtils.indexOf(values, getValue());
-        if (--index < 0)
-            index = values.length - 1;
-        return values[index];
-    }
-
     @Override
     public final T[] getElements() {
         return this.values;

src/main/java/clientapi/value/type/MultiType.java

@@ -16,10 +16,8 @@
 
 package clientapi.value.type;
 
-import clientapi.util.ClientAPIUtils;
-import clientapi.util.interfaces.Cycleable;
+import clientapi.value.ICycleableValue;
 import clientapi.value.Value;
-import org.apache.commons.lang3.ArrayUtils;
 
 import java.lang.reflect.Field;
 
@@ -29,7 +27,7 @@
  * @author Brady
  * @since 2/24/2017
  */
-public final class MultiType extends Value<String> implements Cycleable<String> {
+public final class MultiType extends Value<String> implements ICycleableValue<String> {
 
     /**
      * Different values
@@ -42,46 +40,6 @@ public MultiType(String name, String parent, String id, String description, Obje
         this.setValue(values[0]);
     }
 
-    @Override
-    public final void setValue(String value) {
-        super.setValue(ClientAPIUtils.objectFrom(value, values));
-    }
-
-    @Override
-    public final String current() {
-        return this.getValue();
-    }
-
-    @Override
-    public final String next() {
-        String value = peekNext();
-        this.setValue(value);
-        return value;
-    }
-
-    @Override
-    public final String last() {
-        String value = peekLast();
-        this.setValue(value);
-        return value;
-    }
-
-    @Override
-    public final String peekNext() {
-        int index = ArrayUtils.indexOf(values, getValue());
-        if (++index >= values.length)
-            index = 0;
-        return values[index];
-    }
-
-    @Override
-    public final String peekLast() {
-        int index = ArrayUtils.indexOf(values, getValue());
-        if (--index < 0)
-            index = values.length - 1;
-        return values[index];
-    }
-
     @Override
     public final String[] getElements() {
         return this.values;