change settings to align with morphia deserialization

preplant · preplant · commit 5b361887783a · 2025-10-05T00:04:41.000+10:00
diff --git a/src/main/java/net/oceanias/opal/setting/OSetting.java b/src/main/java/net/oceanias/opal/setting/OSetting.java
@@ -9,34 +9,41 @@
 
 @SuppressWarnings({ "unused", "UnusedReturnValue" })
 @Getter
+@Setter
+@Accessors(fluent = true)
 public abstract class OSetting<T> {
-    @Accessors(fluent = true)
-    protected transient final String pretty;
+    protected transient String name = "Unspecified Name";
 
-    @Accessors(fluent = true)
-    protected transient final T initial;
+    protected transient T initial;
 
-    @Accessors(fluent = true)
     protected transient List<String> description;
 
-    @Accessors(fluent = true)
     protected transient Material material;
 
-    @Setter
-    @Accessors(fluent = true)
     protected T value;
 
-    protected OSetting(final String pretty, final T initial) {
+    protected OSetting(final T initial) {
         if (initial == null) {
             throw new IllegalArgumentException("Error creating setting; initial value must not be null.");
         }
 
-        this.pretty = pretty;
         this.initial = initial;
 
         value = initial;
     }
 
+    public OSetting<T> name(final String name) {
+        this.name = name;
+
+        return this;
+    }
+
+    public OSetting<T> initial(final T initial) {
+        this.initial = initial;
+
+        return this;
+    }
+
     public OSetting<T> description(final List<String> description) {
         this.description = description;
 
diff --git a/src/main/java/net/oceanias/opal/setting/impl/OBooleanSetting.java b/src/main/java/net/oceanias/opal/setting/impl/OBooleanSetting.java
@@ -20,8 +20,22 @@
 @SuppressWarnings("unused")
 @ExtensionMethod(OCommandSenderExtension.class)
 public final class OBooleanSetting extends OSetting<Boolean> {
-    public OBooleanSetting(final String pretty, final boolean initial) {
-        super(pretty, initial);
+    public OBooleanSetting() {
+        super(false);
+    }
+
+    @Override
+    public OBooleanSetting name(final String name) {
+        super.name(name);
+
+        return this;
+    }
+
+    @Override
+    public OBooleanSetting initial(final Boolean initial) {
+        super.initial(initial);
+
+        return this;
     }
 
     @Override
@@ -79,7 +93,7 @@ public ItemProvider getItemProvider(final Player viewer) {
             lore.add("&eClick &7to toggle!");
 
             return new OItemBuilder(type)
-                .setName("&e" + setting.pretty)
+                .setName("&e" + setting.name)
                 .addLore(lore)
                 .hideFlags();
         }
diff --git a/src/main/java/net/oceanias/opal/setting/impl/OChoiceSetting.java b/src/main/java/net/oceanias/opal/setting/impl/OChoiceSetting.java
@@ -14,26 +14,36 @@
 import xyz.xenondevs.invui.item.impl.AbstractItem;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
+import lombok.Setter;
+import lombok.experimental.Accessors;
 import lombok.experimental.ExtensionMethod;
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;
 
 @ExtensionMethod(OCommandSenderExtension.class)
 @SuppressWarnings("unused")
 @Getter
+@Setter
+@Accessors(fluent = true)
 public final class OChoiceSetting extends OSetting<String> {
-    private transient final List<String> choices;
+    private transient List<String> choices;
 
-    public OChoiceSetting(final String pretty, final String initial, final @NotNull List<String> choices) {
-        super(pretty, initial);
+    public OChoiceSetting() {
+        super("Option 1");
+    }
 
-        this.choices = choices;
+    @Override
+    public OChoiceSetting name(final String name) {
+        super.name(name);
 
-        if (choices.contains(initial)) {
-            return;
-        }
+        return this;
+    }
+
+    @Override
+    public OChoiceSetting initial(final String initial) {
+        super.initial(initial);
 
-        throw new IllegalArgumentException("Error creating setting; initial value must be in choices list.");
+        return this;
     }
 
     @Override
@@ -52,8 +62,12 @@ public OChoiceSetting material(final Material material) {
 
     @Override
     public OChoiceSetting value(final String value) {
+        if (choices == null) {
+            throw new IllegalArgumentException("Error updating setting; the choices list is null.");
+        }
+
         if (!choices.contains(value)) {
-            throw new IllegalArgumentException("Error updating setting; new value must be in choices list.");
+            throw new IllegalArgumentException("Error updating setting; new value must be in the choices list.");
         }
 
         this.value = value;
@@ -73,6 +87,12 @@ public static class Item extends AbstractItem {
 
         @Override
         public ItemProvider getItemProvider(final Player viewer) {
+            final List<String> choices = setting.choices;
+
+            if (choices == null) {
+                throw new IllegalArgumentException("Error constructing item; the choices list is null.");
+            }
+
             final Material material = setting.material;
 
             final List<String> description = setting.description;
@@ -91,7 +111,7 @@ public ItemProvider getItemProvider(final Player viewer) {
             lore.add("");
             lore.add("&eChoices:");
 
-            for (final String choice : setting.choices) {
+            for (final String choice : choices) {
                 final String colour = choice.equals(setting.value) ? "&a" : "&7";
 
                 lore.add(colour + "• " + choice);
@@ -102,7 +122,7 @@ public ItemProvider getItemProvider(final Player viewer) {
             lore.add("&eRight-click &7to cycle backwards.");
 
             return new OItemBuilder(type)
-                .setName("&e" + setting.pretty)
+                .setName("&e" + setting.name)
                 .addLore(lore)
                 .hideFlags();
         }
diff --git a/src/main/java/net/oceanias/opal/setting/impl/ODoubleSetting.java b/src/main/java/net/oceanias/opal/setting/impl/ODoubleSetting.java
@@ -13,26 +13,37 @@
 import xyz.xenondevs.invui.item.ItemProvider;
 import xyz.xenondevs.invui.item.impl.AbstractItem;
 import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
 import lombok.experimental.ExtensionMethod;
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;
 
 @SuppressWarnings("unused")
 @ExtensionMethod(OCommandSenderExtension.class)
 @Getter
+@Setter
+@Accessors(fluent = true)
 public final class ODoubleSetting extends OSetting<Double> {
-    private transient final Double min;
-    private transient final Double max;
+    private transient Double min;
+    private transient Double max;
 
-    public ODoubleSetting(final String pretty, final double initial) {
-        this(pretty, initial, null, null);
+    public ODoubleSetting() {
+        super(0.0);
     }
 
-    public ODoubleSetting(final String pretty, final double initial, final Double min, final Double max) {
-        super(pretty, initial);
+    @Override
+    public ODoubleSetting name(final String name) {
+        super.name(name);
+
+        return this;
+    }
 
-        this.min = min;
-        this.max = max;
+    @Override
+    public ODoubleSetting initial(final Double initial) {
+        super.initial(initial);
+
+        return this;
     }
 
     @Override
@@ -103,27 +114,16 @@ public ItemProvider getItemProvider(final Player viewer) {
             }
 
             lore.add("&fCurrent: &6" + String.format("%.2f", setting.value));
-
-            if (min != null) {
-                lore.add("");
-                lore.add("&fMinimum: &c" + String.format("%.2f", min));
-            }
-
-            if (max != null) {
-                if (min == null) {
-                    lore.add("");
-                }
-
-                lore.add("&fMaximum: &c" + (max == Double.MAX_VALUE ? "None" : String.format("%.2f", max)));
-            }
-
+            lore.add("");
+            lore.add("&fMinimum: &c" + (max == null ? "None" : String.format("%.2f", min)));
+            lore.add("&fMaximum: &c" + (max == null ? "None" : String.format("%.2f", max)));
             lore.add("");
             lore.add("&eLeft-click &7to add &n" + change + "&7.");
             lore.add("&eRight-click &7to subtract &n" + change + "&7.");
             lore.add("&eShift-click &7to change by &n" + (change * 10.0) + "&7.");
 
             return new OItemBuilder(type)
-                .setName("&e" + setting.pretty)
+                .setName("&e" + setting.name)
                 .addLore(lore)
                 .hideFlags();
         }
diff --git a/src/main/java/net/oceanias/opal/setting/impl/OIntegerSetting.java b/src/main/java/net/oceanias/opal/setting/impl/OIntegerSetting.java
@@ -3,7 +3,6 @@
 import net.oceanias.opal.setting.OSetting;
 import net.oceanias.opal.utility.builder.OItemBuilder;
 import net.oceanias.opal.utility.extension.OCommandSenderExtension;
-import java.beans.Transient;
 import java.util.ArrayList;
 import java.util.List;
 import org.bukkit.Material;
@@ -14,26 +13,37 @@
 import xyz.xenondevs.invui.item.ItemProvider;
 import xyz.xenondevs.invui.item.impl.AbstractItem;
 import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
 import lombok.experimental.ExtensionMethod;
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;
 
 @SuppressWarnings("unused")
 @ExtensionMethod(OCommandSenderExtension.class)
 @Getter
+@Setter
+@Accessors(fluent = true)
 public final class OIntegerSetting extends OSetting<Integer> {
-    private transient final Integer min;
-    private transient final Integer max;
+    private transient Integer min;
+    private transient Integer max;
 
-    public OIntegerSetting(final String pretty, final int initial) {
-        this(pretty, initial, null, null);
+    public OIntegerSetting() {
+        super(0);
     }
 
-    public OIntegerSetting(final String pretty, final int initial, final Integer min, final Integer max) {
-        super(pretty, initial);
+    @Override
+    public OIntegerSetting name(final String name) {
+        super.name(name);
+
+        return this;
+    }
 
-        this.min = min;
-        this.max = max;
+    @Override
+    public OIntegerSetting initial(final Integer initial) {
+        super.initial(initial);
+
+        return this;
     }
 
     @Override
@@ -104,27 +114,16 @@ public ItemProvider getItemProvider(final Player viewer) {
             }
 
             lore.add("&fCurrent: &6" + setting.value);
-
-            if (min != null) {
-                lore.add("");
-                lore.add("&fMinimum: &c" + min);
-            }
-
-            if (max != null) {
-                if (min == null) {
-                    lore.add("");
-                }
-
-                lore.add("&fMaximum: &c" + (max == Integer.MAX_VALUE ? "None" : max));
-            }
-
+            lore.add("");
+            lore.add("&fMinimum: &c" + (max == null ? "None" : min));
+            lore.add("&fMaximum: &c" + (max == null ? "None" : max));
             lore.add("");
             lore.add("&eLeft-click &7to add &n" + change + "&7.");
             lore.add("&eRight-click &7to subtract &n" + change + "&7.");
             lore.add("&eShift-click &7to change by &n" + (change * 10) + "&7.");
 
             return new OItemBuilder(type)
-                .setName("&e" + setting.pretty)
+                .setName("&e" + setting.name)
                 .addLore(lore)
                 .hideFlags();
         }
diff --git a/src/main/java/net/oceanias/opal/setting/impl/OStringSetting.java b/src/main/java/net/oceanias/opal/setting/impl/OStringSetting.java
@@ -40,16 +40,24 @@
 @ExtensionMethod({ OComponentExtension.class, OCommandSenderExtension.class })
 @Getter
 public final class OStringSetting extends OSetting<String> {
-    private transient final Integer limit;
+    private transient Integer limit;
 
-    public OStringSetting(final String pretty, final String initial) {
-        this(pretty, initial, null);
+    public OStringSetting() {
+        super("");
     }
 
-    public OStringSetting(final String pretty, final String initial, final Integer limit) {
-        super(pretty, initial);
+    @Override
+    public OStringSetting name(final String name) {
+        super.name(name);
+
+        return this;
+    }
 
-        this.limit = limit;
+    @Override
+    public OStringSetting initial(final String initial) {
+        super.initial(initial);
+
+        return this;
     }
 
     @Override
@@ -116,7 +124,7 @@ public ItemProvider getItemProvider(final Player viewer) {
             lore.add("&eClick &7to change!");
 
             return new OItemBuilder(type)
-                .setName("&e" + setting.pretty)
+                .setName("&e" + setting.name)
                 .addLore(lore)
                 .hideFlags();
         }
diff --git a/src/main/java/net/oceanias/opal/utility/helper/OLocationHelper.java b/src/main/java/net/oceanias/opal/utility/helper/OLocationHelper.java
@@ -3,7 +3,7 @@
 import org.bukkit.Location;
 import org.jetbrains.annotations.NotNull;
 
-@SuppressWarnings("unused")
+@SuppressWarnings({ "unused", "BooleanMethodIsAlwaysInverted" })
 public final class OLocationHelper {
     public static boolean hasMovedExact(final @NotNull Location from, final @NotNull Location to) {
         return from.getX() != to.getX()
