Fix flag inversion not working

GlowingInk · Feb 10, 2024 · ad040b1 · ad040b1
1 parent 0ee9998
commit ad040b1
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 3 deletions.
diff --git a/reactions/src/main/java/fun/reactions/model/Logic.java b/reactions/src/main/java/fun/reactions/model/Logic.java
@@ -101,7 +101,7 @@ public void execute(@NotNull Environment env) {
             String params = flag.hasPlaceholders()
                     ? placeholders.parse(env, flag.getContent())
                     : flag.getContent();
-            if (!flag.getActivity().proceed(env, params)) {
+            if (!flag.proceed(env, params)) {
                 executeActions(env, reactions);
                 return;
             }
@@ -116,7 +116,7 @@ public static void executeActions(Environment env, List<Action.Stored> actions)
             String params = action.hasPlaceholders()
                     ? placeholders.parse(env, action.getContent())
                     : action.getContent();
-            if (action.getActivity().proceed(env, params) && action.getActivity() instanceof Interrupting stopAction) {
+            if (action.proceed(env, params) && action.getActivity() instanceof Interrupting stopAction) {
                 stopAction.stop(env, action.getContent(), new ArrayList<>(actions.subList(i + 1, actions.size())));
                 break;
             }

diff --git a/reactions/src/main/java/fun/reactions/model/activity/Activity.java b/reactions/src/main/java/fun/reactions/model/activity/Activity.java
@@ -35,6 +35,8 @@ public Stored(@NotNull A activity, @NotNull String content) {
             this.placeholders = content.indexOf('%') != -1;
         }
 
+        public abstract boolean proceed(@NotNull Environment env, @NotNull String paramsStr);
+
         public @NotNull A getActivity() {
             return activity;
         }

diff --git a/reactions/src/main/java/fun/reactions/model/activity/actions/Action.java b/reactions/src/main/java/fun/reactions/model/activity/actions/Action.java
@@ -2,6 +2,7 @@
 
 import com.google.common.base.Objects;
 import fun.reactions.model.activity.Activity;
+import fun.reactions.model.environment.Environment;
 import fun.reactions.util.parameter.Parameters;
 import org.jetbrains.annotations.NotNull;
 
@@ -13,6 +14,11 @@ public Stored(@NotNull Action action, @NotNull String content) {
             super(action, content);
         }
 
+        @Override
+        public boolean proceed(@NotNull Environment env, @NotNull String paramsStr) {
+            return activity.proceed(env, paramsStr);
+        }
+
         @Override
         public @NotNull Parameters asParameters() {
             return Parameters.fromMap(Map.of(

diff --git a/reactions/src/main/java/fun/reactions/model/activity/flags/Flag.java b/reactions/src/main/java/fun/reactions/model/activity/flags/Flag.java
@@ -2,6 +2,7 @@
 
 import com.google.common.base.Objects;
 import fun.reactions.model.activity.Activity;
+import fun.reactions.model.environment.Environment;
 import fun.reactions.util.parameter.Parameters;
 import org.jetbrains.annotations.NotNull;
 
@@ -20,6 +21,11 @@ public boolean isInverted() {
             return inverted;
         }
 
+        @Override
+        public boolean proceed(@NotNull Environment env, @NotNull String paramsStr) {
+            return activity.proceed(env, paramsStr) != inverted;
+        }
+
         @Override
         public @NotNull String toString() {
             return (inverted ? "!" : "") + activity.getName() + "=" + content;

diff --git a/reactions/src/main/java/fun/reactions/util/Rng.java b/reactions/src/main/java/fun/reactions/util/Rng.java
@@ -53,7 +53,7 @@ public static double nextDouble(double min, double max) {
      * @param numsStr String with min-max values or just max value(e.g. "2-47", "76")
      * @return Random value
      */
-    public static int nextIntRanged(String numsStr) { // TODO Requires refactoring to nextRanged
+    public static int nextIntRanged(@NotNull String numsStr) { // TODO Requires refactoring to nextRanged
         int index = numsStr.indexOf('-');
         if (index > -1) {
             int min = NumberUtils.parseInteger(numsStr.substring(0, index), Is.NON_NEGATIVE).orElse(0);