initial usages of mech registration

DenizenScript · Aug 28, 2022 · c4cba4a · c4cba4a
1 parent e7eedae
commit c4cba4a
Show file tree

Hide file tree

Showing 14 changed files with 39 additions and 71 deletions.
diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/BiomeTag.java b/plugin/src/main/java/com/denizenscript/denizen/objects/BiomeTag.java
@@ -333,5 +333,6 @@ public void adjust(Mechanism mechanism) {
             biome.setPrecipitation(BiomeNMS.DownfallType.valueOf(mechanism.getValue().asString().toUpperCase()));
         }
 
+        tagProcessor.processMechanism(this, mechanism);
     }
 }
diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/ChunkTag.java b/plugin/src/main/java/com/denizenscript/denizen/objects/ChunkTag.java
@@ -694,8 +694,6 @@ public void applyProperty(Mechanism mechanism) {
     @Override
     public void adjust(Mechanism mechanism) {
 
-        AbstractFlagTracker.tryFlagAdjusts(this, mechanism);
-
         // <--[mechanism]
         // @object ChunkTag
         // @name inhabited_time
@@ -832,6 +830,5 @@ public void adjust(Mechanism mechanism) {
         }
 
         tagProcessor.processMechanism(this, mechanism);
-        CoreUtilities.autoPropertyMechanism(this, mechanism);
     }
 }
diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/CuboidTag.java b/plugin/src/main/java/com/denizenscript/denizen/objects/CuboidTag.java
@@ -1495,8 +1495,6 @@ public void applyProperty(Mechanism mechanism) {
     @Override
     public void adjust(Mechanism mechanism) {
 
-        AbstractFlagTracker.tryFlagAdjusts(this, mechanism);
-
         // <--[mechanism]
         // @object CuboidTag
         // @name set_member
@@ -1603,7 +1601,6 @@ public void adjust(Mechanism mechanism) {
         }
 
         tagProcessor.processMechanism(this, mechanism);
-        CoreUtilities.autoPropertyMechanism(this, mechanism);
     }
 
     @Override

diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/EllipsoidTag.java b/plugin/src/main/java/com/denizenscript/denizen/objects/EllipsoidTag.java
@@ -623,8 +623,7 @@ public void applyProperty(Mechanism mechanism) {
 
     @Override
     public void adjust(Mechanism mechanism) {
-
-        AbstractFlagTracker.tryFlagAdjusts(this, mechanism);
+        tagProcessor.processMechanism(this, mechanism);
     }
 
     @Override

diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/EntityTag.java b/plugin/src/main/java/com/denizenscript/denizen/objects/EntityTag.java
@@ -2938,8 +2938,6 @@ public void applyProperty(Mechanism mechanism) {
     @Override
     public void adjust(Mechanism mechanism) {
 
-        AbstractFlagTracker.tryFlagAdjusts(this, mechanism);
-
         if (isGeneric()) {
             mechanisms.add(mechanism);
             mechanism.fulfill();
@@ -4066,7 +4064,6 @@ else if (getBukkitEntity() instanceof Creeper) {
         }
 
         tagProcessor.processMechanism(this, mechanism);
-        CoreUtilities.autoPropertyMechanism(this, mechanism);
     }
 
     public static HashSet<String> specialEntityMatchables = new HashSet<>(Arrays.asList("entity", "npc", "player", "living", "vehicle", "fish", "projectile", "hanging", "monster", "mob", "animal"));

diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/InventoryTag.java b/plugin/src/main/java/com/denizenscript/denizen/objects/InventoryTag.java
@@ -2368,9 +2368,7 @@ public void applyProperty(Mechanism mechanism) {
     @Override
     public void adjust(Mechanism mechanism) {
 
-        AbstractFlagTracker.tryFlagAdjusts(this, mechanism);
         tagProcessor.processMechanism(this, mechanism);
-        CoreUtilities.autoPropertyMechanism(this, mechanism);
 
         // <--[mechanism]
         // @object InventoryTag

diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/ItemTag.java b/plugin/src/main/java/com/denizenscript/denizen/objects/ItemTag.java
@@ -496,7 +496,6 @@ public boolean isTruthy() {
 
     public static void registerTags() {
 
-        AbstractFlagTracker.registerFlagHandlers(tagProcessor);
         PropertyParser.registerPropertyTagHandlers(ItemTag.class, tagProcessor);
 
         // <--[tag]
@@ -719,6 +718,21 @@ else if (container != null) {
         tagProcessor.registerTag(ElementTag.class, "formatted", (attribute, object) -> {
             return new ElementTag(object.formattedName());
         });
+
+        // <--[mechanism]
+        // @object ItemTag
+        // @name material
+        // @input MaterialTag
+        // @description
+        // Changes the item's material to the given material.
+        // Only copies the base material type, not any advanced block-data material properties.
+        // Note that this may cause some properties of the item to be lost.
+        // @tags
+        // <ItemTag.material>
+        // -->
+        tagProcessor.registerMechanism("material", true, MaterialTag.class, (object, mechanism, material) -> {
+            object.item.setType(material.getMaterial());
+        });
     }
 
     public String formattedName() {
@@ -785,26 +799,7 @@ public void applyProperty(Mechanism mechanism) {
 
     @Override
     public void adjust(Mechanism mechanism) {
-
-        AbstractFlagTracker.tryFlagAdjusts(this, mechanism);
-
-        // <--[mechanism]
-        // @object ItemTag
-        // @name material
-        // @input MaterialTag
-        // @description
-        // Changes the item's material to the given material.
-        // Only copies the base material type, not any advanced block-data material properties.
-        // Note that this may cause some properties of the item to be lost.
-        // @tags
-        // <ItemTag.material>
-        // -->
-        if (mechanism.matches("material") && mechanism.requireObject(MaterialTag.class)) {
-            item.setType(mechanism.valueAsType(MaterialTag.class).getMaterial());
-        }
-
         tagProcessor.processMechanism(this, mechanism);
-        CoreUtilities.autoPropertyMechanism(this, mechanism);
     }
 
     public static class ItemPropertyMatchHelper {

diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/LocationTag.java b/plugin/src/main/java/com/denizenscript/denizen/objects/LocationTag.java
@@ -4376,8 +4376,6 @@ public void applyProperty(Mechanism mechanism) {
     @Override
     public void adjust(Mechanism mechanism) {
 
-        AbstractFlagTracker.tryFlagAdjusts(this, mechanism);
-
         // <--[mechanism]
         // @object LocationTag
         // @name block_facing
@@ -5428,7 +5426,6 @@ else if (state instanceof Dropper) {
         }
 
         tagProcessor.processMechanism(this, mechanism);
-        CoreUtilities.autoPropertyMechanism(this, mechanism);
     }
 
     @Override

diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/MaterialTag.java b/plugin/src/main/java/com/denizenscript/denizen/objects/MaterialTag.java
@@ -714,7 +714,6 @@ public void adjust(Mechanism mechanism) {
         }
 
         tagProcessor.processMechanism(this, mechanism);
-        CoreUtilities.autoPropertyMechanism(this, mechanism);
     }
 
     public static boolean advancedMatchesInternal(Material mat, String comparedto, boolean allowByMaterialName) {

diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/NPCTag.java b/plugin/src/main/java/com/denizenscript/denizen/objects/NPCTag.java
@@ -1303,8 +1303,6 @@ public void applyProperty(Mechanism mechanism) {
     @Override
     public void adjust(Mechanism mechanism) {
 
-        AbstractFlagTracker.tryFlagAdjusts(this, mechanism);
-
         // TODO: For all the mechanism tags, add the @Mechanism link!
 
         // <--[mechanism]
@@ -1877,7 +1875,6 @@ else if ((wp.getCurrentProvider() instanceof WanderWaypointProvider)) {
         }
 
         tagProcessor.processMechanism(this, mechanism);
-        CoreUtilities.autoPropertyMechanism(this, mechanism);
 
         // Pass along to EntityTag mechanism handler if not already handled.
         if (!mechanism.fulfilled()) {

diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/PlayerTag.java b/plugin/src/main/java/com/denizenscript/denizen/objects/PlayerTag.java
@@ -2506,8 +2506,6 @@ public void applyProperty(Mechanism mechanism) {
     @Override
     public void adjust(Mechanism mechanism) {
 
-        AbstractFlagTracker.tryFlagAdjusts(this, mechanism);
-
         // <--[mechanism]
         // @object PlayerTag
         // @name send_climbable_materials
@@ -3928,7 +3926,6 @@ else if (bal > goal) {
         }
 
         tagProcessor.processMechanism(this, mechanism);
-        CoreUtilities.autoPropertyMechanism(this, mechanism);
 
         // Pass along to EntityTag mechanism handler if not already handled.
         if (!mechanism.fulfilled()) {

diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/PolygonTag.java b/plugin/src/main/java/com/denizenscript/denizen/objects/PolygonTag.java
@@ -716,6 +716,27 @@ public static void registerTags() {
         tagProcessor.registerTag(ListTag.class, "outline", (attribute, polygon) -> {
             return polygon.getOutline();
         });
+
+        // <--[mechanism]
+        // @object PolygonTag
+        // @name add_corner
+        // @input LocationTag
+        // @description
+        // Adds a corner to the end of the polygon's corner list.
+        // @tags
+        // <PolygonTag.with_corner[<location>]>
+        // -->
+        tagProcessor.registerMechanism("add_corner", false, LocationTag.class, (object, mechanism, location) -> {
+            if (object.noteName != null) {
+                NotedAreaTracker.remove(object);
+            }
+            Corner newCorner = new Corner(location.getX(), location.getZ());
+            object.corners.add(newCorner);
+            object.recalculateToFit(newCorner);
+            if (object.noteName != null) {
+                NotedAreaTracker.add(object);
+            }
+        });
     }
 
     public static ObjectTagProcessor<PolygonTag> tagProcessor = new ObjectTagProcessor<>();
@@ -735,30 +756,7 @@ public void applyProperty(Mechanism mechanism) {
 
     @Override
     public void adjust(Mechanism mechanism) {
-
-        AbstractFlagTracker.tryFlagAdjusts(this, mechanism);
-
-        // <--[mechanism]
-        // @object PolygonTag
-        // @name add_corner
-        // @input LocationTag
-        // @description
-        // Adds a corner to the end of the polygon's corner list.
-        // @tags
-        // <PolygonTag.with_corner[<location>]>
-        // -->
-        if (mechanism.matches("add_corner") && mechanism.requireObject(LocationTag.class)) {
-            if (noteName != null) {
-                NotedAreaTracker.remove(this);
-            }
-            LocationTag loc = mechanism.valueAsType(LocationTag.class);
-            Corner newCorner = new Corner(loc.getX(), loc.getZ());
-            corners.add(newCorner);
-            recalculateToFit(newCorner);
-            if (noteName != null) {
-                NotedAreaTracker.add(this);
-            }
-        }
+        tagProcessor.processMechanism(this, mechanism);
     }
 
     @Override

diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/TradeTag.java b/plugin/src/main/java/com/denizenscript/denizen/objects/TradeTag.java
@@ -166,6 +166,5 @@ public void applyProperty(Mechanism mechanism) {
     @Override
     public void adjust(Mechanism mechanism) {
         tagProcessor.processMechanism(this, mechanism);
-        CoreUtilities.autoPropertyMechanism(this, mechanism);
     }
 }
diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/WorldTag.java b/plugin/src/main/java/com/denizenscript/denizen/objects/WorldTag.java
@@ -1058,8 +1058,6 @@ public void applyProperty(Mechanism mechanism) {
     @Override
     public void adjust(Mechanism mechanism) {
 
-        AbstractFlagTracker.tryFlagAdjusts(this, mechanism);
-
         // <--[mechanism]
         // @object WorldTag
         // @name ambient_spawn_limit
@@ -1405,7 +1403,6 @@ public void adjust(Mechanism mechanism) {
         }
 
         tagProcessor.processMechanism(this, mechanism);
-        CoreUtilities.autoPropertyMechanism(this, mechanism);
     }
 
     public void unloadWorldClean(Mechanism mechanism, boolean doSave) {