Merge remote-tracking branch 'soup_ext/eventplus' into 1.20

superpowers04 · Aug 10, 2024 · 2c5b799 · 2c5b799
2 parents ccd0b8d + bb30f95
commit 2c5b799
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 6 deletions.
diff --git a/common/src/main/java/org/figuramc/figura/avatar/Avatar.java b/common/src/main/java/org/figuramc/figura/avatar/Avatar.java
@@ -478,6 +478,10 @@ public boolean totemEvent() {
         return isCancelled(loaded ? run("TOTEM",tick) : null);
     }
 
+    public void customEvent(String event) {
+        if (loaded) run(event,tick);
+    }
+
 
 	// -- rendering events -- // 
 

diff --git a/common/src/main/java/org/figuramc/figura/lua/api/event/EventsAPI.java b/common/src/main/java/org/figuramc/figura/lua/api/event/EventsAPI.java
@@ -1,11 +1,12 @@
 package org.figuramc.figura.lua.api.event;
 
 import com.mojang.datafixers.util.Pair;
+import org.figuramc.figura.FiguraMod;
+import org.figuramc.figura.avatar.Avatar;
+import org.figuramc.figura.avatar.AvatarManager;
 import org.figuramc.figura.entries.FiguraEvent;
-import org.figuramc.figura.entries.FiguraVanillaPart;
 import org.figuramc.figura.lua.LuaNotNil;
 import org.figuramc.figura.lua.LuaWhitelist;
-import org.figuramc.figura.lua.api.vanilla_model.VanillaPart;
 import org.figuramc.figura.lua.docs.LuaFieldDoc;
 import org.figuramc.figura.lua.docs.LuaMetamethodDoc;
 import org.figuramc.figura.lua.docs.LuaMetamethodDoc.LuaMetamethodOverload;
@@ -148,6 +149,26 @@ public Map<String, LuaEvent> getEvents() {
         return events;
     }
 
+    @LuaWhitelist
+    @LuaMethodDoc("events.new_event")
+    public LuaEvent newEvent(@LuaNotNil String name) {
+        name = name.toUpperCase(Locale.US);
+        LuaEvent ev = events.get(name);
+        if(ev != null) throw new LuaError("Event \"" + name + "\" already exists!");
+        LuaEvent event = new LuaEvent();
+        events.put(name, event);
+        return event;
+    }
+
+    @LuaWhitelist
+    @LuaMethodDoc("events.fire_event")
+    public void fireEvent(@LuaNotNil String name) {
+        Avatar avatar = AvatarManager.getAvatarForPlayer(FiguraMod.getLocalPlayerUUID());
+        if (avatar != null) {
+            avatar.customEvent(name);
+        }
+    }
+
     @LuaWhitelist
     @LuaMetamethodDoc(overloads = @LuaMetamethodOverload(
             types = {LuaEvent.class, EventsAPI.class, String.class},

diff --git a/common/src/main/java/org/figuramc/figura/lua/api/event/LuaEvent.java b/common/src/main/java/org/figuramc/figura/lua/api/event/LuaEvent.java
@@ -2,17 +2,16 @@
 
 import com.google.common.collect.HashMultimap;
 import org.figuramc.figura.FiguraMod;
+import org.figuramc.figura.avatar.Avatar;
+import org.figuramc.figura.avatar.AvatarManager;
 import org.figuramc.figura.lua.LuaNotNil;
 import org.figuramc.figura.lua.LuaWhitelist;
 import org.figuramc.figura.lua.docs.LuaMetamethodDoc;
 import org.figuramc.figura.lua.docs.LuaMetamethodDoc.LuaMetamethodOverload;
 import org.figuramc.figura.lua.docs.LuaMethodDoc;
 import org.figuramc.figura.lua.docs.LuaMethodOverload;
 import org.figuramc.figura.lua.docs.LuaTypeDoc;
-import org.luaj.vm2.LuaError;
-import org.luaj.vm2.LuaFunction;
-import org.luaj.vm2.LuaTable;
-import org.luaj.vm2.Varargs;
+import org.luaj.vm2.*;
 
 import java.util.Deque;
 import java.util.Set;
@@ -82,6 +81,18 @@ private Varargs callPiped(Varargs args) {
         return vars;
     }
 
+    @LuaWhitelist
+    @LuaMethodDoc("event.run")
+    public LuaEvent run(Object... args){
+        Avatar avatar = AvatarManager.getAvatarForPlayer(FiguraMod.getLocalPlayerUUID());
+        if (avatar != null) {
+            if (args != null) avatar.run(this,avatar.tick,args);
+            else    avatar.run(this,avatar.tick);
+        }
+        return this;
+    }
+
+
     @LuaWhitelist
     @LuaMethodDoc(
             overloads = {