JSON Value Providers & Operators

core/pom.xml

@@ -25,7 +25,7 @@
     <parent>
         <artifactId>wolfyutilities-parent</artifactId>
         <groupId>com.wolfyscript.wolfyutilities</groupId>
-        <version>3.16.2.0</version>
+        <version>3.16-SNAPSHOT</version>
     </parent>
     <build>
         <plugins>

core/src/main/java/me/wolfyscript/utilities/registry/Registries.java

@@ -29,11 +29,13 @@
 import me.wolfyscript.utilities.api.inventory.tags.Tags;
 import me.wolfyscript.utilities.util.Keyed;
 import me.wolfyscript.utilities.util.NamespacedKey;
+import me.wolfyscript.utilities.util.eval.operators.Operator;
 import me.wolfyscript.utilities.util.particles.ParticleAnimation;
 import me.wolfyscript.utilities.util.particles.ParticleEffect;
 import me.wolfyscript.utilities.util.particles.animators.Animator;
 import me.wolfyscript.utilities.util.particles.shapes.Shape;
 import me.wolfyscript.utilities.util.particles.timer.Timer;
+import me.wolfyscript.utilities.util.eval.value_providers.ValueProvider;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -81,6 +83,9 @@ public class Registries {
     private final TypeRegistry<Action<?>> customItemActions;
     private final TypeRegistry<Event<?>> customItemEvents;
 
+    private final TypeRegistry<ValueProvider<?>> valueProviders;
+    private final TypeRegistry<Operator> operators;
+
     public Registries(WolfyUtilCore core) {
         this.core = core;
 
@@ -99,6 +104,8 @@ public Registries(WolfyUtilCore core) {
         customItemNbtChecks = new TypeRegistrySimple<>(new NamespacedKey(core, "custom_item_nbt_checks"), this);
         customItemActions = new TypeRegistrySimple<>(ITEM_ACTION_TYPES, this);
         customItemEvents = new TypeRegistrySimple<>(ITEM_EVENT_TYPES, this);
+        valueProviders = new TypeRegistrySimple<>(new NamespacedKey(core, "value_providers"), this);
+        operators = new TypeRegistrySimple<>(new NamespacedKey(core, "operators"), this);
     }
 
     void indexTypedRegistry(IRegistry<?> registry) {
@@ -170,10 +177,6 @@ public RegistryParticleAnimation getParticleAnimations() {
         return particleAnimations;
     }
 
-    public TypeRegistry<Shape> getParticleShapes() {
-        return particleShapes;
-    }
-
     /**
      * Gets the registry containing all the available {@link ParticleEffect}s.
      *
@@ -187,6 +190,18 @@ public Tags<CustomItem> getItemTags() {
         return itemTags;
     }
 
+    public Registry<Action<?>> getCustomItemActionValues() {
+        return customItemActionValues;
+    }
+
+    public Registry<Event<?>> getCustomItemEventValues() {
+        return customItemEventValues;
+    }
+
+    public TypeRegistry<Shape> getParticleShapes() {
+        return particleShapes;
+    }
+
     /**
      * Gets the registry containing all the available NBTChecks for CustomItems.
      *
@@ -222,11 +237,11 @@ public TypeRegistry<Event<?>> getCustomItemEvents() {
         return customItemEvents;
     }
 
-    public Registry<Action<?>> getCustomItemActionValues() {
-        return customItemActionValues;
+    public TypeRegistry<ValueProvider<?>> getValueProviders() {
+        return valueProviders;
     }
 
-    public Registry<Event<?>> getCustomItemEventValues() {
-        return customItemEventValues;
+    public TypeRegistry<Operator> getOperators() {
+        return operators;
     }
 }

core/src/main/java/me/wolfyscript/utilities/util/eval/context/EvalContext.java

@@ -0,0 +1,40 @@
+/*
+ *       WolfyUtilities, APIs and Utilities for Minecraft Spigot plugins
+ *                      Copyright (C) 2021  WolfyScript
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package me.wolfyscript.utilities.util.eval.context;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class EvalContext {
+
+    private final Map<String, Object> variables;
+
+    public EvalContext() {
+        this.variables = new HashMap<>();
+    }
+
+    public Object getVariable(String variableName) {
+        return variables.get(variableName);
+    }
+
+    public void setVariable(String name, Object value) {
+        variables.put(name, value);
+    }
+
+}

core/src/main/java/me/wolfyscript/utilities/util/eval/context/EvalContextPlayer.java

@@ -0,0 +1,35 @@
+/*
+ *       WolfyUtilities, APIs and Utilities for Minecraft Spigot plugins
+ *                      Copyright (C) 2021  WolfyScript
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package me.wolfyscript.utilities.util.eval.context;
+
+import org.bukkit.entity.Player;
+
+public class EvalContextPlayer extends EvalContext {
+
+    private final Player player;
+
+    public EvalContextPlayer(Player player) {
+        super();
+        this.player = player;
+    }
+
+    public Player getPlayer() {
+        return player;
+    }
+}

core/src/main/java/me/wolfyscript/utilities/util/eval/operators/BoolOperator.java

@@ -0,0 +1,36 @@
+/*
+ *       WolfyUtilities, APIs and Utilities for Minecraft Spigot plugins
+ *                      Copyright (C) 2021  WolfyScript
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package me.wolfyscript.utilities.util.eval.operators;
+
+import me.wolfyscript.utilities.util.NamespacedKey;
+import me.wolfyscript.utilities.util.eval.context.EvalContext;
+import me.wolfyscript.utilities.util.json.jackson.annotations.KeyedBaseType;
+
+/**
+ * An Operator that evaluates into a booleanish value.
+ */
+@KeyedBaseType(baseType = Operator.class)
+public abstract class BoolOperator extends Operator {
+
+    public BoolOperator(NamespacedKey namespacedKey) {
+        super(namespacedKey);
+    }
+
+    public abstract boolean evaluate(EvalContext context);
+}

core/src/main/java/me/wolfyscript/utilities/util/eval/operators/ComparisonOperator.java

@@ -0,0 +1,52 @@
+/*
+ *       WolfyUtilities, APIs and Utilities for Minecraft Spigot plugins
+ *                      Copyright (C) 2021  WolfyScript
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package me.wolfyscript.utilities.util.eval.operators;
+
+import me.wolfyscript.utilities.util.NamespacedKey;
+import me.wolfyscript.utilities.util.eval.context.EvalContext;
+import me.wolfyscript.utilities.util.eval.value_providers.ValueProvider;
+
+/**
+ * Represents comparison operators that compare values.<br>
+ * <ul>
+ *     <li>equal (==) {@link ComparisonOperatorEqual}</li>
+ *     <li>not equal (!=) {@link ComparisonOperatorNotEqual}</li>
+ *     <li>less (<) {@link ComparisonOperatorLess}</li>
+ *     <li>less or equal(<=) {@link ComparisonOperatorLessEqual}</li>
+ *     <li>greater (>) {@link ComparisonOperatorGreater}</li>
+ *     <li>greater or equal (>=) {@link ComparisonOperatorGreaterEqual}</li>
+ * </ul>
+ *
+ * @param <V> The type of the objects to compare. Must be the same for both objects.
+ */
+public abstract class ComparisonOperator<V extends Comparable<V>> extends BoolOperator {
+
+    protected ValueProvider<V> thisValue;
+    protected ValueProvider<V> thatValue;
+
+    protected ComparisonOperator(NamespacedKey namespacedKey, ValueProvider<V> thisValue, ValueProvider<V> thatValue) {
+        super(namespacedKey);
+        this.thisValue = thisValue;
+        this.thatValue = thatValue;
+    }
+
+    @Override
+    public abstract boolean evaluate(EvalContext context);
+
+}

core/src/main/java/me/wolfyscript/utilities/util/eval/operators/ComparisonOperatorEqual.java

@@ -0,0 +1,40 @@
+/*
+ *       WolfyUtilities, APIs and Utilities for Minecraft Spigot plugins
+ *                      Copyright (C) 2021  WolfyScript
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package me.wolfyscript.utilities.util.eval.operators;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import me.wolfyscript.utilities.util.NamespacedKey;
+import me.wolfyscript.utilities.util.eval.context.EvalContext;
+import me.wolfyscript.utilities.util.eval.value_providers.ValueProvider;
+
+public class ComparisonOperatorEqual<V extends Comparable<V>> extends ComparisonOperator<V> {
+
+    public static final NamespacedKey KEY = NamespacedKey.wolfyutilties("equal");
+
+    @JsonCreator
+    protected ComparisonOperatorEqual(@JsonProperty("this") ValueProvider<V> thisValue, @JsonProperty("that") ValueProvider<V> thatValue) {
+        super(KEY, thisValue, thatValue);
+    }
+
+    @Override
+    public boolean evaluate(EvalContext context) {
+        return this.thisValue.getValue(context).compareTo(this.thatValue.getValue(context)) == 0;
+    }
+}

core/src/main/java/me/wolfyscript/utilities/util/eval/operators/ComparisonOperatorGreater.java

@@ -0,0 +1,37 @@
+/*
+ *       WolfyUtilities, APIs and Utilities for Minecraft Spigot plugins
+ *                      Copyright (C) 2021  WolfyScript
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package me.wolfyscript.utilities.util.eval.operators;
+
+import me.wolfyscript.utilities.util.NamespacedKey;
+import me.wolfyscript.utilities.util.eval.context.EvalContext;
+import me.wolfyscript.utilities.util.eval.value_providers.ValueProvider;
+
+public class ComparisonOperatorGreater<V extends Comparable<V>> extends ComparisonOperator<V> {
+
+    public static final NamespacedKey KEY = NamespacedKey.wolfyutilties("greater");
+
+    protected ComparisonOperatorGreater(ValueProvider<V> thisValue, ValueProvider<V> thatValue) {
+        super(KEY, thisValue, thatValue);
+    }
+
+    @Override
+    public boolean evaluate(EvalContext context) {
+        return this.thisValue.getValue(context).compareTo(this.thatValue.getValue(context)) > 0;
+    }
+}

core/src/main/java/me/wolfyscript/utilities/util/eval/operators/ComparisonOperatorGreaterEqual.java

@@ -0,0 +1,37 @@
+/*
+ *       WolfyUtilities, APIs and Utilities for Minecraft Spigot plugins
+ *                      Copyright (C) 2021  WolfyScript
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package me.wolfyscript.utilities.util.eval.operators;
+
+import me.wolfyscript.utilities.util.NamespacedKey;
+import me.wolfyscript.utilities.util.eval.context.EvalContext;
+import me.wolfyscript.utilities.util.eval.value_providers.ValueProvider;
+
+public class ComparisonOperatorGreaterEqual<V extends Comparable<V>> extends ComparisonOperator<V> {
+
+    public static final NamespacedKey KEY = NamespacedKey.wolfyutilties("greater_equal");
+
+    protected ComparisonOperatorGreaterEqual(ValueProvider<V> thisValue, ValueProvider<V> thatValue) {
+        super(KEY, thisValue, thatValue);
+    }
+
+    @Override
+    public boolean evaluate(EvalContext context) {
+        return this.thisValue.getValue(context).compareTo(this.thatValue.getValue(context)) >= 0;
+    }
+}