events in autodoc

Author: diamonddevv

autodocs/autodoc.lua

@@ -2,7 +2,7 @@
 
 --#region Information
 -- GENERATED AUTODOC
--- Generated: 2026-01-28T10:54:53.955274400
+-- Generated: 2026-01-28T14:45:03.339480400
 -- Luafy Version: 2.0.0
 -- Format: Lua LS library file
 --#endregion
@@ -469,7 +469,21 @@ function text.compound(elements) end
 
 --#region Script Event
 
--- luafy:load: Executes after a reload. ; this generator does not currently provide additional information.
--- luafy:tick: Executes every server tick. ; this generator does not currently provide additional information.
+-- luafy:load | Executes after a reload.;
+-- 
+-- luafy:tick | Executes every server tick.;
+-- 
+-- luafy:entity_takes_damage | Executes after an entity takes damage.;
+-- 	entity: LivingEntity | Living Entity that took damage.
+-- 	attacker: Entity | Entity that dealt damage.
+-- 	damage_taken: number | Damage taken.
+-- 	source: string | Identifier of Damage Source.
+-- 	was_blocked: boolean | If true, the damage was blocked.
+-- 
+-- luafy:entity_dies | Executes after an entity dies.;
+-- 	entity: LivingEntity | Living Entity that died.
+-- 	attacker: Entity | Entity that killed this one.
+-- 	source: string | Identifier of Damage Source.
+-- 
 --#endregion
 

src/main/java/dev/diamond/luafy/autodoc/generator/LuaLanguageServerAutodocGenerator.java

@@ -128,7 +128,11 @@ public void addScriptApi(StringBuilder doc, ApiScriptPlugin.DocInfo api) {
 
     @Override
     public void addScriptEvent(StringBuilder doc, ScriptEvent<?> event) {
-        addComment(doc, LuafyRegistries.SCRIPT_EVENTS.getKey(event) + ": " + event.getDesc() + " ; this generator does not currently provide additional information.");
+        addComment(doc, LuafyRegistries.SCRIPT_EVENTS.getKey(event) + " | " + event.getDesc() + ";");
+        for (var arg : event.getArgList()) {
+            addComment(doc, "\t" + arg.argName() + ": " + arg.argType().getArgtypeString() + " -> " + arg.argDesc());
+        }
+        addComment(doc, "");
     }
 
     @Override

src/main/java/dev/diamond/luafy/registry/ScriptEvents.java

@@ -1,30 +1,80 @@
 package dev.diamond.luafy.registry;
 
 import dev.diamond.luafy.Luafy;
+import dev.diamond.luafy.autodoc.Argtypes;
 import dev.diamond.luafy.script.event.ScriptEvent;
+import net.fabricmc.fabric.api.entity.event.v1.ServerLivingEntityEvents;
 import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents;
 import net.fabricmc.fabric.api.event.lifecycle.v1.ServerTickEvents;
+import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.core.Registry;
+import net.minecraft.core.registries.Registries;
+import net.minecraft.world.damagesource.DamageSource;
+import net.minecraft.world.entity.LivingEntity;
 
 public class ScriptEvents {
 
     public static ScriptEvent<Object> LOAD = new ScriptEvent<>("Executes after a reload.", b -> {
 
-    }, (src, ctx) -> {
+    }, (b, ctx, script) -> {
 
     });
 
     public static ScriptEvent<Object> TICK = new ScriptEvent<>("Executes every server tick.", b -> {
 
-    }, (src, ctx) -> {
+    }, (b, ctx, script) -> {});
+
+    public static ScriptEvent<EntityTakesDamage> ENTITY_TAKES_DAMAGE = new ScriptEvent<>("Executes after an entity takes damage.", b -> {
+        b.add("entity", ScriptObjects.LIVING_ENTITY, "Living Entity that took damage.");
+        b.add("attacker", ScriptObjects.ENTITY, "Entity that dealt damage.");
+        b.add("damage_taken", Argtypes.NUMBER, "Damage taken.");
+        b.add("source", Argtypes.STRING, "Identifier of Damage Source.");
+        b.add("was_blocked", Argtypes.BOOLEAN, "If true, the damage was blocked.");
+    }, (b, ctx, script) -> {
+        b.add("entity", ScriptObjects.LIVING_ENTITY.provideTable(ctx.e, script));
+        b.add("attacker", ScriptObjects.ENTITY.provideTable(ctx.src.getDirectEntity(), script));
+        b.add("damage_taken", ctx.damageTaken);
+
+        var v = script
+                .getSource()
+                .getServer()
+                .registryAccess()
+                .get(Registries.DAMAGE_TYPE)
+                .orElseThrow()
+                .value()
+                .getKey(ctx.src.type());
+
+        b.add("source", v.toString());
+        b.add("was_blocked", ctx.damageTaken);
+    });
 
+    public static ScriptEvent<EntityDies> ENTITY_DIES = new ScriptEvent<>("Executes after an entity dies.", b -> {
+        b.add("entity", ScriptObjects.LIVING_ENTITY, "Living Entity that died.");
+        b.add("attacker", ScriptObjects.ENTITY, "Entity that killed this one.");
+        b.add("source", Argtypes.STRING, "Identifier of Damage Source.");
+    }, (b, ctx, script) -> {
+        b.add("entity", ScriptObjects.LIVING_ENTITY.provideTable(ctx.e, script));
+        b.add("attacker", ScriptObjects.ENTITY.provideTable(ctx.src.getDirectEntity(), script));
+
+        var v = script
+                .getSource()
+                .getServer()
+                .registryAccess()
+                .get(Registries.DAMAGE_TYPE)
+                .orElseThrow()
+                .value()
+                .getKey(ctx.src.type());
+
+        b.add("source", v.toString());
     });
 
 
 
     public static void registerAll() {
         Registry.register(LuafyRegistries.SCRIPT_EVENTS, Luafy.id("load"), LOAD);
         Registry.register(LuafyRegistries.SCRIPT_EVENTS, Luafy.id("tick"), TICK);
+        Registry.register(LuafyRegistries.SCRIPT_EVENTS, Luafy.id("entity_takes_damage"), ENTITY_TAKES_DAMAGE);
+        Registry.register(LuafyRegistries.SCRIPT_EVENTS, Luafy.id("entity_dies"), ENTITY_DIES);
     }
 
 
@@ -43,7 +93,27 @@ public static void applyEvents() {
         });
 
 
+        // damage
+        ServerLivingEntityEvents.AFTER_DAMAGE.register((e, src, baseDmgTaken, dmgTaken, isBlocked) -> {
+            ENTITY_TAKES_DAMAGE.trigger(getCommandSourceStack(e), new ScriptEvents.EntityTakesDamage(e, src, dmgTaken, isBlocked));
+        });
+
+        ServerLivingEntityEvents.AFTER_DEATH.register((e, src) -> {
+            ENTITY_DIES.trigger(getCommandSourceStack(e), new ScriptEvents.EntityDies(e, src));
+        });
+
 
+
+    }
+
+    public static CommandSourceStack getCommandSourceStack(LivingEntity le) {
+        if (le.level().getServer() == null) {
+            throw new RuntimeException("Tried to get the server of an entity that is not in the server (??)");
+        }
+        return le.level().getServer().createCommandSourceStack();
     }
 
+    public record EntityTakesDamage(LivingEntity e, DamageSource src, float damageTaken, boolean blocked) {}
+    public record EntityDies(LivingEntity e, DamageSource src) {}
+
 }

src/main/java/dev/diamond/luafy/script/event/ContextBuilder.java

@@ -0,0 +1,10 @@
+package dev.diamond.luafy.script.event;
+
+import dev.diamond.luafy.lua.LuaTableBuilder;
+import dev.diamond.luafy.script.LuaScript;
+
+
+@FunctionalInterface
+public interface ContextBuilder<T> {
+    void build(LuaTableBuilder b, T ctx, LuaScript script);
+}

src/main/java/dev/diamond/luafy/script/event/ScriptEvent.java

@@ -6,6 +6,7 @@
 import dev.diamond.luafy.Luafy;
 import dev.diamond.luafy.registry.LuafyRegistries;
 import dev.diamond.luafy.lua.LuaTableBuilder;
+import dev.diamond.luafy.script.LuaScript;
 import org.jetbrains.annotations.NotNull;
 import org.luaj.vm2.LuaTable;
 
@@ -18,11 +19,11 @@
 
 public class ScriptEvent<T> implements SimpleAutodocumentable {
     private final ArrayList<ScriptEntry> entries;
-    private final BiConsumer<T, LuaTableBuilder> ctxBuilder;
+    private final ContextBuilder<T> ctxBuilder;
     private final String desc;
     private final ArrayList<ArgDocInfo> argList;
 
-    public ScriptEvent(String desc, Consumer<ArglistBuilder> arglistBuilder, BiConsumer<T, LuaTableBuilder> ctxBuilder) {
+    public ScriptEvent(String desc, Consumer<ArglistBuilder> arglistBuilder, ContextBuilder<T> ctxBuilder) {
         this.entries = new ArrayList<>();
         this.ctxBuilder = ctxBuilder;
 
@@ -35,13 +36,15 @@ public ScriptEvent(String desc, Consumer<ArglistBuilder> arglistBuilder, BiConsu
     }
 
     public void trigger(@NotNull CommandSourceStack src, T context) {
-        LuaTableBuilder builder = new LuaTableBuilder();
-        ctxBuilder.accept(context, builder);
-        LuaTable ctx = builder.build();
 
         for (ScriptEntry entry : entries) {
             if (entry.canExecute()) {
-                entry.setLastResult(Luafy.SCRIPT_MANAGER.get(entry.id).execute(src, ctx));
+                LuaScript script = Luafy.SCRIPT_MANAGER.get(entry.id);
+                LuaTableBuilder builder = new LuaTableBuilder();
+                ctxBuilder.build(builder, context, script);
+                LuaTable ctx = builder.build();
+
+                entry.setLastResult(script.execute(src, ctx));
             }
         }
     }
@@ -58,6 +61,10 @@ public String getDesc() {
         return this.desc;
     }
 
+    public ArrayList<ArgDocInfo> getArgList() {
+        return this.argList;
+    }
+
     @Override
     public String generateAutodocString() {
         StringBuilder s = new StringBuilder();

src/main/java/dev/diamond/luafy/script/object/AbstractScriptObject.java

@@ -41,6 +41,10 @@ public void applyInheritanceToTable(T obj, LuaTableBuilder builder, LuaScript sc
         parent.ifPresent(abstractScriptObject -> abstractScriptObject.toTable(obj, builder, script));
     }
 
+    public LuaTable provideTable(T obj, LuaScript script) {
+        return LuaTableBuilder.provide(this, obj, script);
+    }
+
     public static void makeReadonly(LuaTableBuilder builder) {
         builder.addMetamethod(MetamethodNames.NEW_INDEX, args -> {
             Luafy.LOGGER.error("Tried to write to a readonly object!");