improved onUpdate event

TeamLapen · Dec 7, 2023 · 0876713 · 0876713
1 parent c9c8993
commit 0876713
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 22 deletions.
diff --git a/src/api/java/de/teamlapen/vampirism/api/event/ActionEvent.java b/src/api/java/de/teamlapen/vampirism/api/event/ActionEvent.java
@@ -72,7 +72,6 @@ public void setDuration(int duration) {
     /**
      * Posted when an action deactivates, either when deactivated manually or when out of time. As regular actions instantly deactivate, this only fires for actions that implement ILastingAction.
      */
-
     public static class ActionDeactivatedEvent extends ActionEvent {
         private final int remainingDuration;
         private int cooldown;
@@ -105,32 +104,19 @@ public void setCooldown(int cooldown) {
     /**
      * Posted when an action deactivates, either when deactivated manually or when out of time. As regular actions instantly deactivate, this only fires for actions that implement ILastingAction.
      */
+    @HasResult
     public static class ActionUpdateEvent extends ActionEvent {
         private final int remainingDuration;
-        private boolean shouldDeactivate;
-        public ActionUpdateEvent(@NotNull IFactionPlayer<?> factionPlayer, @NotNull IAction<?> action, int remainingDuration, boolean shouldDeactivate) {
+        public ActionUpdateEvent(@NotNull IFactionPlayer<?> factionPlayer, @NotNull IAction<?> action, int remainingDuration) {
             super(factionPlayer, action);
             this.remainingDuration = remainingDuration;
-            this.shouldDeactivate = shouldDeactivate;
         }
         /**
          * @return The remaining duration of the action, in ticks.
          */
         public int getRemainingDuration() {
             return this.remainingDuration;
         }
-        /**
-         * @return Whether the lasting action should be deactivated
-         */
-        public boolean shouldDeactivate() {
-            return this.shouldDeactivate;
-        }
-        /**
-         * @param deactivate If set to true, the action will deactivate. If set to false, the action will not deactivate at all on that update.
-         */
-        public void setDeactivation(boolean deactivate) {
-            this.shouldDeactivate = deactivate;
-        }
 
     }
 

diff --git a/src/main/java/de/teamlapen/vampirism/entity/player/actions/ActionHandler.java b/src/main/java/de/teamlapen/vampirism/entity/player/actions/ActionHandler.java
@@ -20,6 +20,7 @@
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.entity.Entity;
+import net.minecraftforge.eventbus.api.Event;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.jetbrains.annotations.NotNull;
@@ -427,9 +428,20 @@ public boolean updateActions() {
 
                 dirty = true;
             } else {
-                boolean shouldDeactivate= action.onUpdate(player);
-                boolean shouldReallyDeactivate = VampirismEventFactory.fireActionUpdateEvent(player, action, newtimer, shouldDeactivate);
-                if (shouldReallyDeactivate) {
+                /**
+                 * If the event result is DENY, the lasting action will always be deactivated next tick and won't call {@link de.teamlapen.vampirism.api.entity.player.actions.ILastingAction#onUpdate(de.teamlapen.vampirism.api.entity.player.IFactionPlayer)}.
+                 * If the event result is ALLOW, the lasting action will call onUpdate, but the return value will be ignored.
+                 * If its the default, there will be no change, onUpdate will be called and deactivated if it should.
+                 */
+                boolean shouldDeactivate = true;
+                Event.Result eventResult = VampirismEventFactory.fireActionUpdateEvent(player, action, newtimer);
+                if(eventResult != Event.Result.DENY) {
+                    shouldDeactivate = action.onUpdate(player);
+                }
+                if(eventResult == Event.Result.ALLOW) {
+                    shouldDeactivate = false;
+                }
+                if (shouldDeactivate) {
                     entry.setValue(1); //Value of means they are deactivated next tick and onUpdate is not called again
                 } else {
                     ModStats.updateActionTime(player.getRepresentingPlayer(), action);

diff --git a/src/main/java/de/teamlapen/vampirism/util/VampirismEventFactory.java b/src/main/java/de/teamlapen/vampirism/util/VampirismEventFactory.java
@@ -89,10 +89,10 @@ public static int fireActionDeactivatedEvent(@NotNull IFactionPlayer<?> factionP
         MinecraftForge.EVENT_BUS.post(event);
         return event.getCooldown();
     }
-    public static boolean fireActionUpdateEvent(@NotNull IFactionPlayer<?> factionPlayer, @NotNull IAction<?> action, int remainingDuration, boolean shouldDeactivate) {
-        ActionEvent.ActionUpdateEvent event = new ActionEvent.ActionUpdateEvent(factionPlayer, action, remainingDuration, shouldDeactivate);
+    public static Event.Result fireActionUpdateEvent(@NotNull IFactionPlayer<?> factionPlayer, @NotNull IAction<?> action, int remainingDuration) {
+        ActionEvent.ActionUpdateEvent event = new ActionEvent.ActionUpdateEvent(factionPlayer, action, remainingDuration);
         MinecraftForge.EVENT_BUS.post(event);
-        return event.shouldDeactivate();
+        return event.getResult();
     }
 
 }