kill events but better and working now

diamonddevv · diamonddevv · commit afa7a36c0f27 · 2026-01-29T12:17:40.000Z
diff --git a/autodocs/autodoc.lua b/autodocs/autodoc.lua
@@ -2,7 +2,7 @@
 
 --#region Information
 -- GENERATED AUTODOC
--- Generated: 2026-01-28T14:45:03.339480400
+-- Generated: 2026-01-29T12:14:59.199722800
 -- Luafy Version: 2.0.0
 -- Format: Lua LS library file
 --#endregion
@@ -144,6 +144,10 @@ function Entity.get_uuid() end
 ---@return string
 function Entity.get_name() end
 
+--- Gets the id of the entity type that this entity is.
+---@return string
+function Entity.get_type_id() end
+
 --- Returns true if this entity is a LivingEntity.
 ---@return boolean
 function Entity.is_living() end
@@ -152,6 +156,14 @@ function Entity.is_living() end
 ---@return LivingEntity
 function Entity.as_living() end
 
+--- Returns true if this entity is a PlayerEntity.
+---@return LivingEntity
+function Entity.is_player() end
+
+--- Return this entity as a PlayerEntity.
+---@return LivingEntity
+function Entity.as_player() end
+
 --- Execute a commmand as this entity.
 ---@param command string The command to execute.
 ---@return integer
@@ -203,6 +215,11 @@ local Player = {}
 ---@return nil
 function Player.tell(msg) end
 
+--- Prints a text component to this player's chat.
+---@param msg TextComponent Component to display.
+---@return nil
+function Player.tell(msg) end
+
 --- Gives this player this stack.
 ---@param stack ItemStack Stack to give.
 ---@return nil
@@ -319,7 +336,12 @@ function minecraft.get_version() end
 --- Prints an unformatted line to the server chat, visible to all players. (similar to /tellraw). Also prints to the console.
 ---@param message string Message to be printed.
 ---@return nil
-function minecraft.say(message) end
+function minecraft.print(message) end
+
+--- Prints a text component to the server chat, visible to all players. (similar to /tellraw). Also prints the raw string to the console.
+---@param message string Message to be printed.
+---@return nil
+function minecraft.print_component(message) end
 
 --- Executes the given command from the server command source. Returns the result of the command.
 ---@param command string Command to be executed.
@@ -474,16 +496,14 @@ function text.compound(elements) end
 -- 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.
+-- 	entity: LivingEntity -> Living Entity that took damage.
+-- 	attacker: Entity | nil -> Entity that dealt damage.
+-- 	damage_taken: number -> Damage taken.
+-- 	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.
+-- 	entity: LivingEntity -> Living Entity that died.
+-- 	attacker: Entity | nil -> Entity that killed this one.
 -- 
 --#endregion
 
diff --git a/src/main/java/dev/diamond/luafy/Luafy.java b/src/main/java/dev/diamond/luafy/Luafy.java
@@ -12,6 +12,7 @@
 import net.fabricmc.loader.api.FabricLoader;
 import net.fabricmc.loader.impl.FabricLoaderImpl;
 import net.minecraft.resources.Identifier;
+import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.packs.PackType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/src/main/java/dev/diamond/luafy/lua/LuaTableBuilder.java b/src/main/java/dev/diamond/luafy/lua/LuaTableBuilder.java
@@ -37,6 +37,7 @@ private void addInternal(String key, LuaValue value) {
     public void add(String key, float f) { addInternal(key, LuaValue.valueOf(f)); }
     public void add(String key, double d) { addInternal(key, LuaValue.valueOf(d)); }
     public void add(String key, LuaTable tbl) { addInternal(key, tbl); }
+    public void add(String key, LuaValue val) { addInternal(key, val); }
     public void add(String key, ScriptFunction function) { addInternal(key, new VarArgFunction() {
         @Override
         public Varargs invoke(Varargs args) {
diff --git a/src/main/java/dev/diamond/luafy/registry/ScriptEvents.java b/src/main/java/dev/diamond/luafy/registry/ScriptEvents.java
@@ -6,11 +6,13 @@
 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;
+import org.luaj.vm2.LuaTable;
+import org.luaj.vm2.LuaValue;
+
 
 public class ScriptEvents {
 
@@ -26,46 +28,30 @@ public class ScriptEvents {
 
     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("attacker", Argtypes.maybe(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("attacker", ctx.src.getEntity() == null ?
+                LuaValue.NIL :
+                ScriptObjects.ENTITY.provideTable(ctx.src.getEntity(), 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.add("attacker", Argtypes.maybe(ScriptObjects.ENTITY), "Entity that killed this one.");
     }, (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());
+        b.add("attacker", ctx.src.getEntity() == null ?
+                LuaValue.NIL :
+                ScriptObjects.ENTITY.provideTable(ctx.src.getEntity(), script)
+        );
+
     });
 
 
@@ -95,24 +81,17 @@ 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));
+            ENTITY_TAKES_DAMAGE.trigger(e.level().getServer().createCommandSourceStack(), new ScriptEvents.EntityTakesDamage(e, src, dmgTaken, isBlocked));
         });
 
         ServerLivingEntityEvents.AFTER_DEATH.register((e, src) -> {
-            ENTITY_DIES.trigger(getCommandSourceStack(e), new ScriptEvents.EntityDies(e, src));
+            ENTITY_DIES.trigger(e.level().getServer().createCommandSourceStack(), 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) {}
 
diff --git a/src/main/java/dev/diamond/luafy/script/LuaScript.java b/src/main/java/dev/diamond/luafy/script/LuaScript.java
@@ -71,6 +71,9 @@ public Globals getGlobals() {
         return globals;
     }
 
+    public void setSource(@NotNull CommandSourceStack src) {
+        this.src = src.withSuppressedOutput();
+    }
 
     private void injectSources() {
         for (ScriptPlugin plugin : LuafyRegistries.SCRIPT_PLUGINS) {
@@ -89,7 +92,7 @@ private ScriptExecutionResult executor(@NotNull CommandSourceStack src, @Nullabl
             return new ScriptExecutionResult(LuaValue.NIL, compilationError);
         }
         try {
-            this.src = src.withSuppressedOutput();
+            this.setSource(src);
             if (ctx == null) {
                 ctx = LuaTable.tableOf();
             }
diff --git a/src/main/java/dev/diamond/luafy/script/api/MinecraftApi.java b/src/main/java/dev/diamond/luafy/script/api/MinecraftApi.java
@@ -52,7 +52,7 @@ public void addFunctions(ScriptApiBuilder apiBuilder) {
                 return LuaString.valueOf(SharedConstants.getCurrentVersion().name());
             }, "Returns the current Minecraft version string.", args -> {}, Argtypes.STRING);
 
-            builder.add("say", args -> {
+            builder.add("print", args -> {
                 String s = args.nextString();
 
                 for (ServerPlayer spe : script.getSource().getServer().getPlayerList().getPlayers()) {
@@ -67,6 +67,21 @@ public void addFunctions(ScriptApiBuilder apiBuilder) {
                 args.add("message", Argtypes.STRING, "Message to be printed.");
             }, Argtypes.NIL);
 
+            builder.add("print_component", args -> {
+                Component c = args.nextScriptObject(ScriptObjects.TEXT_COMPONENT, script.getSource(), script);
+
+                for (ServerPlayer spe : script.getSource().getServer().getPlayerList().getPlayers()) {
+                    spe.sendSystemMessage(c, false);
+                }
+
+                script.getGlobals().STDOUT.print(c.getString());
+                script.getGlobals().STDOUT.print('\n');
+
+                return LuaValue.NIL;
+            }, "Prints a text component to the server chat, visible to all players. (similar to /tellraw). Also prints the raw string to the console.", args -> {
+                args.add("message", Argtypes.STRING, "Message to be printed.");
+            }, Argtypes.NIL);
+
             builder.add("command", args -> {
                 String s = args.nextString();
                 var source = script.getSource().getServer().createCommandSourceStack();
diff --git a/src/main/java/dev/diamond/luafy/script/event/ScriptEvent.java b/src/main/java/dev/diamond/luafy/script/event/ScriptEvent.java
@@ -22,9 +22,11 @@ public class ScriptEvent<T> implements SimpleAutodocumentable {
     private final ContextBuilder<T> ctxBuilder;
     private final String desc;
     private final ArrayList<ArgDocInfo> argList;
+    private boolean isEmpty;
 
     public ScriptEvent(String desc, Consumer<ArglistBuilder> arglistBuilder, ContextBuilder<T> ctxBuilder) {
         this.entries = new ArrayList<>();
+        this.isEmpty = true;
         this.ctxBuilder = ctxBuilder;
 
         this.desc = desc;
@@ -36,11 +38,13 @@ public ScriptEvent(String desc, Consumer<ArglistBuilder> arglistBuilder, Context
     }
 
     public void trigger(@NotNull CommandSourceStack src, T context) {
+        if (isEmpty) return;
 
         for (ScriptEntry entry : entries) {
             if (entry.canExecute()) {
                 LuaScript script = Luafy.SCRIPT_MANAGER.get(entry.id);
                 LuaTableBuilder builder = new LuaTableBuilder();
+                script.setSource(src);
                 ctxBuilder.build(builder, context, script);
                 LuaTable ctx = builder.build();
 
@@ -50,11 +54,13 @@ public void trigger(@NotNull CommandSourceStack src, T context) {
     }
 
     public void register(Collection<ScriptEntry> entries) {
+        this.isEmpty = false;
         this.entries.addAll(entries);
     }
 
     public void clear() {
-        entries.clear();
+        this.isEmpty = true;
+        this.entries.clear();
     }
 
     public String getDesc() {
diff --git a/src/main/java/dev/diamond/luafy/script/object/game/entity/EntityScriptObject.java b/src/main/java/dev/diamond/luafy/script/object/game/entity/EntityScriptObject.java
@@ -1,13 +1,14 @@
 package dev.diamond.luafy.script.object.game.entity;
 
-import com.mojang.brigadier.Command;
 import dev.diamond.luafy.autodoc.Argtypes;
 import dev.diamond.luafy.lua.LuaTableBuilder;
 import dev.diamond.luafy.registry.ScriptObjects;
 import dev.diamond.luafy.script.LuaScript;
 import dev.diamond.luafy.script.api.MinecraftApi;
 import dev.diamond.luafy.script.object.AbstractScriptObject;
 import net.minecraft.commands.CommandSourceStack;
+import net.minecraft.core.registries.BuiltInRegistries;
+import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.LivingEntity;
 import org.luaj.vm2.LuaTable;
@@ -20,22 +21,26 @@ public class EntityScriptObject extends AbstractScriptObject<Entity> {
     public static final String FUNC_GET_POS = "get_pos";
     public static final String FUNC_GET_UUID = "get_uuid";
     public static final String FUNC_GET_NAME = "get_name";
+    public static final String FUNC_GET_TYPE_ID = "get_type_id";
     public static final String FUNC_IS_LIVING = "is_living";
     public static final String FUNC_AS_LIVING = "as_living";
+    public static final String FUNC_IS_PLAYER = "is_player";
+    public static final String FUNC_AS_PLAYER = "as_player";
     public static final String FUNC_EXECUTE_AS = "execute_as";
-    public static final String FUNC_GET_NBT = "get_nbt";
 
     public EntityScriptObject() {
         super("An entity.", doc -> {
             doc.addFunction(FUNC_GET_POS, "Gets the entity's current position.", args -> {}, ScriptObjects.VEC3D);
             doc.addFunction(FUNC_GET_UUID, "Gets the entity's UUID.", args -> {}, Argtypes.STRING);
             doc.addFunction(FUNC_GET_NAME, "Gets the entity's name.", args -> {}, Argtypes.STRING);
+            doc.addFunction(FUNC_GET_TYPE_ID, "Gets the id of the entity type that this entity is.", args -> {}, Argtypes.STRING);
             doc.addFunction(FUNC_IS_LIVING, "Returns true if this entity is a LivingEntity.", args -> {}, Argtypes.BOOLEAN);
             doc.addFunction(FUNC_AS_LIVING, "Return this entity as a LivingEntity.", args -> {}, ScriptObjects.LIVING_ENTITY);
+            doc.addFunction(FUNC_IS_PLAYER, "Returns true if this entity is a PlayerEntity.", args -> {}, ScriptObjects.LIVING_ENTITY);
+            doc.addFunction(FUNC_AS_PLAYER, "Return this entity as a PlayerEntity.", args -> {}, ScriptObjects.LIVING_ENTITY);
             doc.addFunction(FUNC_EXECUTE_AS, "Execute a commmand as this entity.", args -> {
                 args.add("command", Argtypes.STRING, "The command to execute.");
             }, Argtypes.INTEGER);
-            //doc.addFunction(FUNC_GET_NBT, "Get this entity's NBT data.", args -> {}, Argtypes.TABLE);
         });
     }
 
@@ -47,8 +52,11 @@ public void toTable(Entity obj, LuaTableBuilder builder, LuaScript script) {
         builder.add(FUNC_GET_POS, args -> LuaTableBuilder.provide(b -> ScriptObjects.VEC3D.toTable(obj.position(), b, script)));
         builder.add(FUNC_GET_UUID, args -> LuaValue.valueOf(obj.getStringUUID()));
         builder.add(FUNC_GET_NAME, args -> LuaValue.valueOf(obj.getPlainTextName()));
+        builder.add(FUNC_GET_TYPE_ID, args -> LuaValue.valueOf(BuiltInRegistries.ENTITY_TYPE.getKey(obj.getType()).toString()));
         builder.add(FUNC_IS_LIVING, args -> LuaValue.valueOf(obj instanceof LivingEntity));
         builder.add(FUNC_AS_LIVING, args -> LuaTableBuilder.provide(b -> ScriptObjects.LIVING_ENTITY.toTable((LivingEntity) obj, b, script)));
+        builder.add(FUNC_IS_PLAYER, args -> LuaValue.valueOf(obj instanceof ServerPlayer));
+        builder.add(FUNC_AS_PLAYER, args -> LuaTableBuilder.provide(b -> ScriptObjects.PLAYER.toTable((ServerPlayer) obj, b, script)));
         builder.add(FUNC_EXECUTE_AS, args -> {
             String s = args.nextString();
             var source = script.getSource().withEntity(obj);
diff --git a/src/main/java/dev/diamond/luafy/script/object/game/entity/PlayerScriptObject.java b/src/main/java/dev/diamond/luafy/script/object/game/entity/PlayerScriptObject.java
@@ -17,6 +17,7 @@
 public class PlayerScriptObject extends AbstractScriptObject<ServerPlayer> {
 
     public static final String FUNC_TELL = "tell";
+    public static final String FUNC_TELL_COMPONENT = "tell_component";
     public static final String FUNC_GIVE_STACK = "give_stack";
 
     public PlayerScriptObject() {
@@ -25,6 +26,9 @@ public PlayerScriptObject() {
             doc.addFunction(FUNC_TELL, "Prints a line to this player's chat.", args -> {
                 args.add("msg", Argtypes.STRING, "String to display.");
             }, Argtypes.NIL);
+            doc.addFunction(FUNC_TELL, "Prints a text component to this player's chat.", args -> {
+                args.add("msg", ScriptObjects.TEXT_COMPONENT, "Component to display.");
+            }, Argtypes.NIL);
             doc.addFunction(FUNC_GIVE_STACK, "Gives this player this stack.", args -> {
                 args.add("stack", ScriptObjects.ITEM_STACK, "Stack to give.");
             }, Argtypes.NIL);
@@ -40,6 +44,10 @@ public void toTable(ServerPlayer obj, LuaTableBuilder builder, LuaScript script)
             obj.sendSystemMessage(Component.literal(args.nextString()), false);
             return LuaValue.NIL;
         });
+        builder.add(FUNC_TELL_COMPONENT, args -> {
+            obj.sendSystemMessage(args.nextScriptObject(ScriptObjects.TEXT_COMPONENT, script.getSource(), script), false);
+            return LuaValue.NIL;
+        });
         builder.add(FUNC_GIVE_STACK, args -> {
             ItemStack stack = args.nextScriptObject(ScriptObjects.ITEM_STACK, script.getSource(), script);
             obj.getInventory().add(stack);

Original file line number	Diff line number	Diff line change
`@@ -71,6 +71,9 @@ public Globals getGlobals() {`
`71`	`71`	`return globals;`
`72`	`72`	`}`
`73`	`73`
	`74`	`+ public void setSource(@NotNull CommandSourceStack src) {`
	`75`	`+ this.src = src.withSuppressedOutput();`
	`76`	`+ }`
`74`	`77`
`75`	`78`	`private void injectSources() {`
`76`	`79`	`for (ScriptPlugin plugin : LuafyRegistries.SCRIPT_PLUGINS) {`
`@@ -89,7 +92,7 @@ private ScriptExecutionResult executor(@NotNull CommandSourceStack src, @Nullabl`
`89`	`92`	`return new ScriptExecutionResult(LuaValue.NIL, compilationError);`
`90`	`93`	`}`
`91`	`94`	`try {`
`92`		`- this.src = src.withSuppressedOutput();`
	`95`	`+ this.setSource(src);`
`93`	`96`	`if (ctx == null) {`
`94`	`97`	`ctx = LuaTable.tableOf();`
`95`	`98`	`}`