v3.0

Author: ThePython10110

API/API.lua

@@ -54,4 +54,20 @@ end)
 
 for _, file in ipairs(api_files) do
     better_commands.run_file(file, "API")
+end
+
+---Runs a Better Command (useful for debugging and stuff)
+---@param input string
+---@param player string?
+function better_commands.run(input, executor_name)
+    local command, param = input:match("%/?(%S+)%s+(.*)$")
+    local context
+    if executor_name then
+        context = {executor = executor_name}
+    else
+        context = {executor = {x=0,y=0,z=0}, command_block = true, pos = {x=0,y=0,z=0}, dir = {x=0,y=0,z=0}}
+    end
+    if better_commands.commands[command] then
+        better_commands.commands[command].func(executor_name or "", param, context)
+    end
 end

API/damage.lua

@@ -6,10 +6,11 @@
 ---@param reason table?
 ---@param damage_immortal? boolean
 function better_commands.deal_damage(target, damage, reason, damage_immortal)
+	core.log(dump({damage=damage,reason=reason}))
 
 	local luaentity = target:get_luaentity()
 
-	if luaentity then
+	if luaentity then -- (not player)
 		if luaentity.deal_damage then -- Mobs Redo/Mobs MC
 			--core.log("deal_damage")
 			luaentity:deal_damage(damage, reason or {type = "generic"})
@@ -25,28 +26,22 @@ function better_commands.deal_damage(target, damage, reason, damage_immortal)
 			if luaentity.health > 0 then
 				--core.log("luaentity.health")
 				luaentity.health = luaentity.health - damage
-				luaentity:check_for_death(reason)
+				if better_commands.mcl2 then
+					luaentity:check_for_death(reason and reason.type or "set_hp", reason)
+				else
+					luaentity:check_for_death(reason, damage)
+				end
 				--core.log(luaentity.health)
 			end
 			return
 		end
 	end
 
+	-- Player
 	local hp = target:get_hp()
 	local armorgroups = target:get_armor_groups()
 
 	if hp > 0 and armorgroups and (damage_immortal or not armorgroups.immortal) then
-		--core.log("set_hp")
 		target:set_hp(hp - damage, reason)
 	end
-	--core.log("nothing")
-end
-
--- Make sure players always die when /killed
-core.register_on_player_hpchange(function(player, hp_change, reason)
-    if reason.better_commands == "kill" then
----@diagnostic disable-next-line: redundant-return-value
-        return math.min(hp_change, -1000000000), true
-    end
-    return hp_change
-end, true)
+end

API/entity.lua

@@ -65,7 +65,8 @@ function better_commands.set_entity_rotation(obj, rotation)
         obj:set_look_vertical(rotation.x)
         obj:set_look_horizontal(rotation.y)
     elseif obj.set_rotation then
-        obj:set_rotation(rotation)
+        -- I have absolutely no idea why the x-axis needs to be flipped.
+        obj:set_rotation({x=-rotation.x, y=rotation.y, z=rotation.z})
     end
 end
 

API/parsing.lua

@@ -5,16 +5,17 @@ local S = core.get_translator(core.get_current_modname())
 ---@param str string
 ---@return splitParam[] split_param
 function better_commands.parse_params(str)
-    str = " "..str -- Don't ask
+    str = " "..str -- Adds a space to the beginning so I don't have to check for the beginning separately
     local i = 1
     local tmp
     local found = {}
     -- selectors, @?[data]
     repeat
-        -- p, a, r, s, e, and n are obviously the selectors but I just like the fact that they include the word "parse" (it was even better before I added @n)
-        tmp = {str:find("(@[parsen])%s*(%[.-%])", i)}
+        -- Obviously the selectors but I just like the fact that they include the word "parse" (it was even better before @n was added)
+        tmp = {str:find("%s(@[nparse])%s*(%[.-%])", i)}
         if tmp[1] then
             i = tmp[2] + 1
+            tmp[2] = tmp[2] - 1 -- Account for the extra space at the beginning
             tmp.type = "selector"
             tmp.extra_data = true
             table.insert(found, table.copy(tmp))
@@ -27,7 +28,6 @@ function better_commands.parse_params(str)
         -- modname:id[data] count wear (everything but id and data optional)
         tmp = {str:find("%s([_%w]*:?[_%w]+)%s*(%[.-%])%s*(%d*)%s*(%d*)", i)}
         if tmp[1] then
-            tmp[1] = tmp[1] + 1 -- ignore the space
             local overlap
             for _, thing in pairs(found) do
                 if tmp[1] >= thing[1] and tmp[1] <= thing[2]
@@ -38,6 +38,7 @@ function better_commands.parse_params(str)
                 end
             end
             i = tmp[2] + 1
+            tmp[2] = tmp[2] - 1 -- Account for the extra space at the beginning
             if not overlap then
                 if better_commands.handle_alias(tmp[3]) then
                     tmp.type = "item"
@@ -58,7 +59,6 @@ function better_commands.parse_params(str)
         -- modname:id count wear (everything but id optional)
         tmp = {str:find("%s([_%w]*:?[_%w]+)%s*(%d*)%s*(%d*)", i)}
         if tmp[1] then
-            tmp[1] = tmp[1] + 1 -- ignore the space
             local overlap
             for _, thing in pairs(found) do
                 if tmp[1] >= thing[1] and tmp[1] <= thing[2]
@@ -69,6 +69,7 @@ function better_commands.parse_params(str)
                 end
             end
             i = tmp[2] + 1
+            tmp[2] = tmp[2] - 1 -- Account for the extra space at the beginning
             if not overlap then
                 if better_commands.handle_alias(tmp[3]) then
                     tmp.type = "item"
@@ -84,9 +85,10 @@ function better_commands.parse_params(str)
     -- everything else
     i = 1
     repeat
-        tmp = {str:find("(%S+)", i)}
+        tmp = {str:find("%s(%S+)", i)}
         if tmp[1] then
             i = tmp[2] + 1
+            tmp[2] = tmp[2] - 1 -- Account for the extra space at the beginning
             local overlap
             for _, thing in pairs(found) do
                 if tmp[1] >= thing[1] and tmp[1] <= thing[2]
@@ -503,7 +505,11 @@ function better_commands.parse_item(item_data, ignore_count)
     if item_data.type == "item" and not item_data.extra_data then
         local stack = ItemStack(item_data[3])
         if not ignore_count then
-            stack:set_count(tonumber(item_data[4]) or 1)
+            local count = tonumber(item_data[4]) or 1
+            if count > 65535 then
+                return nil, S("Maximum count is 65535, got @1", count)
+            end
+            stack:set_count(count)
         end
         stack:set_wear(tonumber(item_data[5]) or 0)
         return stack
@@ -527,7 +533,11 @@ function better_commands.parse_item(item_data, ignore_count)
             end
         end
         if not ignore_count then
-            stack:set_count(tonumber(item_data[5]) or 1)
+            local count = tonumber(item_data[5]) or 1
+            if count > 65535 then
+                return nil, S("Maximum count is 65535, got @1", count)
+            end
+            stack:set_count(count)
         end
         stack:set_wear(tonumber(item_data[6]) or stack:get_wear())
         return stack

API/scoreboard.lua

@@ -92,7 +92,9 @@ local sidebar_template = {
 }
 
 local function sort_scores(a, b)
-    return (a.score == b.score) and (a.name < b.name) or (tonumber(a.score) > tonumber(b.score))
+    local a_score, b_score, a_name, b_name = core.strip_colors(a.score), core.strip_colors(b.score),
+        core.strip_colors(a.name), core.strip_colors(b.name)
+    return (a_score == b_score) and (a_name < b_name) or (tonumber(a_score) > tonumber(b_score))
 end
 
 function better_commands.format_score(objective, name)
@@ -161,7 +163,6 @@ function better_commands.update_hud()
             local count = 0
             local sortable_scores = {}
             for name in pairs(scores) do
-                count = count + 1
                 local display_name = better_commands.format_name(name)
                 local score = better_commands.format_score(objective, name) or "???"
                 local width = #core.strip_colors(display_name) + #core.strip_colors(score)
@@ -174,8 +175,11 @@ function better_commands.update_hud()
                 table.sort(sortable_scores, function(...) return not sort_scores(...) end)
             end
             for _, data in ipairs(sortable_scores) do
-                name_text = name_text..data.name.."\n"
-                score_text = score_text..data.score.."\n"
+                if core.strip_colors(data.name):sub(1,1) ~= "#" then
+                    count = count + 1
+                    name_text = name_text..data.name.."\n"
+                    score_text = score_text..data.score.."\n"
+                end
             end
             if not title then
                 if sidebar.title then

CHANGELOG.md

@@ -1,7 +1,7 @@
 # Changelog
 
 ## v3.0
-This is a small update, mostly for the bugfixes.
+This is a small update, mostly composed of bugfixes. Lots of bugfixes. It's been over a year since I last updated this, and now I'm finally back.
 ### New features
 * Added `/stop` command
 * Added `/weather` command
@@ -14,7 +14,8 @@ This is a small update, mostly for the bugfixes.
 * Fixed unnecessary logging
 * Fixed `/scoreboard objectives remove <objective>` causing a crash
 * Maybe fixed command registration issue? For some reason, I can't reproduce it anymore, so I probably just fixed it months ago and then completely forgot about it.
-* Fixed a few other things, some caused by MCL updates, others caused by me making mistakes.
+* Fixed wrong argument order for `/scoreboard players operation ...`
+* Fixed a LOT of random things.
 
 ## v2.0 (May 31, 2024)
 ### New features

COMMANDS/clear.lua

@@ -14,14 +14,8 @@ better_commands.register_command("clear", {
             targets, err = better_commands.parse_selector(selector, context)
             if err or not targets then return false, better_commands.error(err), 0 end
         end
-        local filter, group
+        local filter, group, remove_max
         if split_param[2] then
-            if split_param[2][5] then
-                split_param[3] = split_param[2][5]
-            end
-            split_param[2][5] = nil
-            split_param[2][6] = nil
-
             if split_param[2][3] == "*" then
                 filter = "*"
             elseif split_param[2][3]:sub(1,6) == "group:" then
@@ -31,10 +25,19 @@ better_commands.register_command("clear", {
                 filter, err = better_commands.parse_item(split_param[2], true)
                 if err or not filter then return false, better_commands.error(err), 0 end
             end
-        end
-        local remove_max = tonumber(split_param[3] and split_param[3][3])
-        if split_param[3] and not remove_max then
-            return false, better_commands.error(S("maxCount must be a number")), 0
+            local remove_max_str
+            if split_param[2].type == "item" then
+                local count_index = split_param[2].extra_data and 5 or 4
+                remove_max_str = split_param[2][count_index]
+            elseif split_param[2].type == "string" then
+                remove_max_str = split_param[3] and split_param[3][3]
+            end
+            if remove_max_str and remove_max_str ~= "" then
+                remove_max = tonumber(remove_max_str)
+                if not remove_max then
+                    return false, better_commands.error(S("maxCount must be a number")), 0
+                end
+            end
         end
         if remove_max then
             remove_max = math.floor(remove_max)
@@ -60,7 +63,7 @@ better_commands.register_command("clear", {
                                 if all then
                                     match_count = match_count + stack:get_count()
                                 elseif group then
-                                    if core.get_item_group(stack:get_name(), filter) then
+                                    if core.get_item_group(stack:get_name(), filter) ~= 0 then
                                         match_count = match_count + stack:get_count()
                                     end
                                 elseif split_param[2].extra_data then
@@ -78,7 +81,7 @@ better_commands.register_command("clear", {
                                 if all then
                                     matches = true
                                 elseif group then
-                                    if core.get_item_group(stack:get_name(), filter) then
+                                    if core.get_item_group(stack:get_name(), filter) ~= 0 then
                                         matches = true
                                     end
                                 elseif split_param[2].extra_data then
@@ -131,7 +134,7 @@ better_commands.register_command("clear", {
             if all and remove_max == -1 then
                 return true, S("Removed all items from player @1", last), 1
             elseif match_total < 1 then
-                return false, better_commands.error(S("No items were found on player @1", last)), 0
+                return false, better_commands.error(S("No items were found on player @1", better_commands.get_entity_name(targets[1]))), 0
             elseif remove_max == 0 then
                 return true, S("Found @1 matching items(s) on player @2", match_total, last), match_total
             else

COMMANDS/command_runners.lua

@@ -37,7 +37,7 @@ better_commands.register_command("old", {
             local missing
             if not privs then privs, missing = core.check_player_privs(name, def.privs) end
             if privs then
-                return def.real_func(name, command_param, context)
+                return def.func(name, command_param, context)
             else
                 return false, better_commands.error(S("You don't have permission to run this command (missing privileges: @1)", table.concat(missing, ", "))), 0
             end

COMMANDS/damage.lua

@@ -92,9 +92,9 @@ better_commands.register_command("remove", {
         if count < 1 then
             return false, better_commands.error(S("No entity was found")), 0
         elseif count == 1 then
-            return true, S("Killed @1", last), count
+            return true, S("Removed @1", last), count
         else
-            return true, S("Killed @1 entities", count), count
+            return true, S("Removed @1 entities", count), count
         end
     end
 })
@@ -111,23 +111,26 @@ better_commands.register_command("damage", {
         amount = math.floor(amount)
         if amount < 1 then return false, better_commands.error(S("<amount> must not be negative")), 0 end
         local damage_type = split_param[3] and split_param[3][3] or "set_hp"
-        local cause = (split_param[4] and split_param[4][3] == "by") and split_param[5]
+        local cause
+        if split_param[4] then
+            if split_param[4][3] ~= "by" then
+                return false, better_commands.error(S("Expected 'by <cause>', got '@1'", split_param[4][3])), 0
+            end
+            if split_param[5] then
+                cause = split_param[5]
+            else
+                return false, better_commands.error(S("Missing cause")), 0
+            end
+        end
         local damage_source
         if cause then
             local results, err = better_commands.parse_selector(cause, context, true)
             if err or not results then return false, better_commands.error(err), 0 end
             damage_source = results[1]
         end
         local reason = {
-            type = damage_type,
             object = damage_source,
         }
-        if better_commands.mcl2 and damage_type then
-            if mcl_damage.types[damage_type] then
-                reason._mcl_reason = table.copy(reason)
-                reason.type = nil
-            end
-        end
         local targets, err = better_commands.parse_selector(selector, context)
         if err or not targets then return false, better_commands.error(err), 0 end
         local count = 0