add shortcut wrap methods for dynamic values

Author: brachy84

src/main/java/com/cleanroommc/modularui/api/value/IEnumValue.java

@@ -1,6 +1,6 @@
 package com.cleanroommc.modularui.api.value;
 
-public interface IEnumValue<T extends Enum<T>> {
+public interface IEnumValue<T extends Enum<T>> extends IValue<T> {
 
     Class<T> getEnumClass();
 }

src/main/java/com/cleanroommc/modularui/utils/FloatConsumer.java

@@ -0,0 +1,14 @@
+package com.cleanroommc.modularui.utils;
+
+import java.util.function.DoubleConsumer;
+
+@FunctionalInterface
+public interface FloatConsumer extends DoubleConsumer {
+
+    void accept(float value);
+
+    @Override
+    default void accept(double value) {
+        accept((float) value);
+    }
+}

src/main/java/com/cleanroommc/modularui/utils/FloatSupplier.java

@@ -0,0 +1,14 @@
+package com.cleanroommc.modularui.utils;
+
+import java.util.function.DoubleSupplier;
+
+@FunctionalInterface
+public interface FloatSupplier extends DoubleSupplier {
+
+    float getAsFloat();
+
+    @Override
+    default double getAsDouble() {
+        return getAsFloat();
+    }
+}

src/main/java/com/cleanroommc/modularui/utils/ReverseIterable.java

@@ -22,7 +22,7 @@ public ReverseIterable(List<T> list) {
     @Override
     public Iterator<T> iterator() {
         ListIterator<T> iterator = this.list.listIterator(this.list.size());
-        return new ListIterator<T>() {
+        return new ListIterator<>() {
             @Override
             public boolean hasNext() {
                 return iterator.hasPrevious();

src/main/java/com/cleanroommc/modularui/value/BinaryEnumValue.java

@@ -10,6 +10,10 @@
  */
 public class BinaryEnumValue<T extends Enum<T>> extends EnumValue<T> implements IBoolValue<T> {
 
+    public static <T extends Enum<T>, V extends EnumValue<T> & IBoolValue<T>> Dynamic<T> wrap(V val) {
+        return new Dynamic<>(val.getEnumClass(), val::getValue, val::setValue);
+    }
+
     public BinaryEnumValue(Class<T> enumClass, T value) {
         super(enumClass, value);
         if (enumClass.getEnumConstants().length != 2) {

src/main/java/com/cleanroommc/modularui/value/BoolValue.java

@@ -5,10 +5,19 @@
 import com.cleanroommc.modularui.api.value.IStringValue;
 import com.cleanroommc.modularui.utils.BooleanConsumer;
 
+import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.BooleanSupplier;
 
 public class BoolValue implements IBoolValue<Boolean>, IStringValue<Boolean> {
 
+    public static Dynamic wrap(IBoolValue<?> val) {
+        return new Dynamic(val::getBoolValue, val::setBoolValue);
+    }
+
+    public static Dynamic wrapAtomic(AtomicBoolean val) {
+        return new Dynamic(val::get, val::set);
+    }
+
     private boolean value;
 
     public BoolValue(boolean value) {

src/main/java/com/cleanroommc/modularui/value/ByteValue.java

@@ -4,6 +4,10 @@
 
 public class ByteValue implements IByteValue<Byte> {
 
+    public static Dynamic wrap(IByteValue<?> val) {
+        return new Dynamic(val::getByteValue, val::setByteValue);
+    }
+
     protected byte value;
 
     @Override
@@ -28,8 +32,8 @@ public void setValue(Byte value) {
 
     public static class Dynamic extends ByteValue {
 
-        private Supplier getter;
-        private Consumer setter;
+        private final Supplier getter;
+        private final Consumer setter;
 
         public Dynamic(Supplier getter, Consumer setter) {
             this.getter = getter;
@@ -48,9 +52,12 @@ public byte getByteValue() {
     }
 
     public interface Supplier {
+
         byte getByte();
     }
+
     public interface Consumer {
+
         void setByte(byte b);
     }
 }

src/main/java/com/cleanroommc/modularui/value/ConstValue.java

@@ -2,6 +2,13 @@
 
 import com.cleanroommc.modularui.api.value.IValue;
 
+import org.jetbrains.annotations.ApiStatus;
+
+/**
+ * @deprecated use {@link ObjectValue} instead
+ */
+@ApiStatus.ScheduledForRemoval(inVersion = "3.2.0")
+@Deprecated
 public class ConstValue<T> implements IValue<T> {
 
     protected T value;

src/main/java/com/cleanroommc/modularui/value/DoubleValue.java

@@ -2,12 +2,24 @@
 
 import com.cleanroommc.modularui.api.value.IDoubleValue;
 import com.cleanroommc.modularui.api.value.IStringValue;
+import com.cleanroommc.modularui.utils.FloatConsumer;
+import com.cleanroommc.modularui.utils.FloatSupplier;
+
+import com.google.common.util.concurrent.AtomicDouble;
 
 import java.util.function.DoubleConsumer;
 import java.util.function.DoubleSupplier;
 
 public class DoubleValue implements IDoubleValue<Double> {
 
+    public static Dynamic wrap(IDoubleValue<?> val) {
+        return new Dynamic(val::getDoubleValue, val::setDoubleValue);
+    }
+
+    public static Dynamic wrapAtomic(AtomicDouble val) {
+        return new Dynamic(val::get, val::set);
+    }
+
     private double value;
 
     public DoubleValue(double value) {
@@ -36,6 +48,10 @@ public void setDoubleValue(double val) {
 
     public static class Dynamic implements IDoubleValue<Double>, IStringValue<Double> {
 
+        public static Dynamic ofFloat(FloatSupplier getter, FloatConsumer setter) {
+            return new Dynamic(getter, setter);
+        }
+
         private final DoubleSupplier getter;
         private final DoubleConsumer setter;
 

src/main/java/com/cleanroommc/modularui/value/DynamicValue.java

@@ -2,11 +2,17 @@
 
 import com.cleanroommc.modularui.api.value.IValue;
 
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.function.Consumer;
 import java.util.function.Supplier;
 
+/**
+ * @deprecated use {@link ObjectValue.Dynamic} instead
+ */
+@ApiStatus.ScheduledForRemoval(inVersion = "3.2.0")
+@Deprecated
 public class DynamicValue<T> implements IValue<T> {
 
     private final Supplier<T> getter;