MaterialTag.directional,delay Property Modernization

plugin/src/main/java/com/denizenscript/denizen/objects/properties/material/MaterialDelay.java

@@ -2,52 +2,55 @@
 
 import com.denizenscript.denizen.objects.MaterialTag;
 import com.denizenscript.denizencore.objects.Mechanism;
-import com.denizenscript.denizencore.objects.ObjectTag;
 import com.denizenscript.denizencore.objects.core.ElementTag;
-import com.denizenscript.denizencore.objects.properties.Property;
 import com.denizenscript.denizencore.objects.properties.PropertyParser;
+import org.bukkit.block.data.BlockData;
 import org.bukkit.block.data.type.Repeater;
 
-public class MaterialDelay implements Property {
-
-    public static boolean describes(ObjectTag material) {
-        return material instanceof MaterialTag
-                && ((MaterialTag) material).hasModernData()
-                && ((MaterialTag) material).getModernData() instanceof Repeater;
+public class MaterialDelay extends MaterialProperty<ElementTag> {
+
+    // <--[property]
+    // @object MaterialTag
+    // @name delay
+    // @input ElementTag(Number)
+    // @description
+    // Controls the delay of a redstone repeater material.
+    // To get the maximum delay of the repeater, see <MaterialTag.max_delay>.
+    // To get the minimum delay of the repeater, see <MaterialTag.min_delay>.
+    // -->
+
+    public static boolean describes(MaterialTag material) {
+        BlockData data = material.getModernData();
+        return data instanceof Repeater;
     }
 
-    public static MaterialDelay getFrom(ObjectTag _material) {
-        if (!describes(_material)) {
-            return null;
-        }
-        else {
-            return new MaterialDelay((MaterialTag) _material);
-        }
-    }
+    MaterialTag material;
 
-    public static final String[] handledMechs = new String[] {
-            "delay"
-    };
+    @Override
+    public String getPropertyId() {
+        return "delay";
+    }
 
-    public MaterialDelay(MaterialTag _material) {
-        material = _material;
+    @Override
+    public ElementTag getPropertyValue() {
+        return new ElementTag(getCurrent());
     }
 
-    MaterialTag material;
+    @Override
+    public void setPropertyValue(ElementTag value, Mechanism mechanism) {
+        if (!mechanism.requireInteger()) {
+            return;
+        }
+        int delay = value.asInt();
+        if (delay < getMin() || delay > getMax()) {
+            mechanism.echoError("Delay value '" + delay + "' is not valid. Must be between " + getMin() + " and " + getMax() + ".");
+            return;
+        }
+        getRepeater().setDelay(delay);
+    }
 
     public static void register() {
-
-        // <--[tag]
-        // @attribute <MaterialTag.delay>
-        // @returns ElementTag(Number)
-        // @mechanism MaterialTag.delay
-        // @group properties
-        // @description
-        // Returns the current delay of a redstone repeater material.
-        // -->
-        PropertyParser.registerStaticTag(MaterialDelay.class, ElementTag.class, "delay", (attribute, material) -> {
-            return new ElementTag(material.getCurrent());
-        });
+        autoRegister("delay", MaterialDelay.class, ElementTag.class, true);
 
         // <--[tag]
         // @attribute <MaterialTag.max_delay>
@@ -90,38 +93,4 @@ public int getMax() {
     public int getMin() {
         return getRepeater().getMinimumDelay();
     }
-
-    @Override
-    public String getPropertyString() {
-        return String.valueOf(getCurrent());
-    }
-
-    @Override
-    public String getPropertyId() {
-        return "delay";
-    }
-
-    @Override
-    public void adjust(Mechanism mechanism) {
-
-        // <--[mechanism]
-        // @object MaterialTag
-        // @name delay
-        // @input ElementTag(Number)
-        // @description
-        // Sets the delay of a redstone repeater material.
-        // @tags
-        // <MaterialTag.delay>
-        // <MaterialTag.max_delay>
-        // <MaterialTag.min_delay>
-        // -->
-        if (mechanism.matches("delay") && mechanism.requireInteger()) {
-            int delay = mechanism.getValue().asInt();
-            if (delay < getMin() || delay > getMax()) {
-                mechanism.echoError("Delay value '" + delay + "' is not valid. Must be between " + getMin() + " and " + getMax() + ".");
-                return;
-            }
-            getRepeater().setDelay(delay);
-        }
-    }
 }