v1.1

Author: ThePython10110

API/API.lua

@@ -42,7 +42,7 @@ end
 local timer = 0
 minetest.register_globalstep(function(dtime)
     timer = timer + dtime
-    if timer > better_commands.save_interval then
+    if timer > better_commands.settings.save_interval then
         timer = 0
         storage:set_string("scoreboard", minetest.serialize(better_commands.scoreboard))
         storage:set_string("teams", minetest.serialize(better_commands.teams))

API/damage.lua

@@ -11,18 +11,15 @@ function better_commands.deal_damage(target, damage, reason, damage_immortal)
 	if luaentity then
 		if luaentity.deal_damage then -- Mobs Redo/Mobs MC
 			luaentity:deal_damage(damage, reason or {type = "generic"})
-            minetest.log("deal_damage")
 			return
         elseif luaentity.hurt then -- Animalia
             luaentity:hurt(damage)
-            minetest.log("hurt")
             luaentity:indicate_damage()
             return
         elseif luaentity.health then -- Mobs Redo/Mobs MC/NSSM
 			-- local puncher = mcl_reason and mcl_reason.direct or target
 			-- target:punch(puncher, 1.0, {full_punch_interval = 1.0, damage_groups = {fleshy = damage}}, vector.direction(puncher:get_pos(), target:get_pos()), damage)
 			if luaentity.health > 0 then
-                minetest.log("luaentity.health")
 				luaentity.health = luaentity.health - damage
 			end
 			return
@@ -33,7 +30,6 @@ function better_commands.deal_damage(target, damage, reason, damage_immortal)
 	local armorgroups = target:get_armor_groups()
 
 	if hp > 0 and armorgroups and (damage_immortal or not armorgroups.immortal) then
-        minetest.log("set_hp")
 		target:set_hp(hp - damage, reason)
 	end
 end

API/parsing.lua

@@ -533,7 +533,7 @@ function better_commands.parse_time_string(time, absolute)
 
     if not absolute then
         result = (minetest.get_timeofday() + (amount/24000)) % 1
-    elseif better_commands.mc_time then
+    elseif better_commands.settings.acovg_time then
         result = ((amount + 6000)/24000) % 1
     else
         result = (amount/24000) % 1

API/register.lua

@@ -19,7 +19,7 @@ end
 minetest.register_on_mods_loaded(function()
     for name, def in pairs(better_commands.commands) do
         if minetest.registered_chatcommands[name] then
-            if better_commands.override then
+            if better_commands.settings.override then
                 minetest.log("action", "[Better Commands] Overriding "..name)
                 better_commands.old_commands[name] = minetest.registered_chatcommands[name]
                 minetest.unregister_chatcommand(name, def)

API/scoreboard.lua

@@ -4,21 +4,11 @@ local S = minetest.get_translator(minetest.get_current_modname())
 better_commands.criteria_patterns = {
     "^killed_by%..*$", -- killed_by.<entity name>
     "^teamkill%..*$", -- teamkill.<team name>
-    "^killedByTeam%..*$", -- killedByTeam. <team name>
+    "^killedByTeam%..*$", -- killedByTeam.<team name>
+    "^picked_up%.[_%w]*:?[_%w]+$" -- picked_up.<itemstring>
     --"^distanceTo%.%-?%d*%.?%d+,%-?%d*%.?%d+,%-?%d*%.?%d+$" -- distanceTo.<x>,<y>,<z>
 }
 
-function better_commands.validate_criterion(criterion)
-    if better_commands.valid_criteria[criterion] then
-        return true
-    end
-    for _, pattern in ipairs(better_commands.criteria_patterns) do
-        if criterion:match(pattern) then
-            return true
-        end
-    end
-end
-
 better_commands.valid_criteria = {
     dummy = true,
     trigger = true,
@@ -32,6 +22,21 @@ better_commands.valid_criteria = {
     --armor = (better_commands.mcl or minetest.get_modpath("3d_armor") and true)
 }
 
+---Validates a criterion
+---@param criterion string
+---@return boolean
+function better_commands.validate_criterion(criterion)
+    if better_commands.valid_criteria[criterion] then
+        return true
+    end
+    for _, pattern in ipairs(better_commands.criteria_patterns) do
+        if criterion:match(pattern) then
+            return true
+        end
+    end
+    return false
+end
+
 ---Gets matching names in a scoreboard
 ---@param selector splitParam
 ---@param context contextTable

CHANGELOG.md

@@ -1,4 +1,10 @@
 # Changelog
 
 ## v1.0
-Initial release. Missing *lots* of commands, several `execute` subcommands, lots of scoreboard objectives, and lots of entity selectors.
+Initial release. Missing *lots* of commands, several `execute` subcommands, lots of scoreboard objectives, and lots of entity selectors.
+
+## v1.1
+* Removed a reference to ACOVG (hopefully the last)
+* Added TODO.md
+* Redid settings slightly (so it's easy to add more)
+* Removed debug logging when using the `/kill` command

COMMANDS/kill.lua

@@ -17,7 +17,7 @@ better_commands.register_command("kill", {
         local last
         for _, target in ipairs(targets) do
             if target.is_player then
-                if better_commands.kill_creative_players or not (target:is_player() and minetest.is_creative_enabled(target:get_player_name())) then
+                if better_commands.settings.kill_creative_players or not (target:is_player() and minetest.is_creative_enabled(target:get_player_name())) then
                     last = better_commands.get_entity_name(target)
                     better_commands.deal_damage(
                         ---@diagnostic disable-next-line: param-type-mismatch

COMMANDS/time.lua

@@ -29,7 +29,7 @@ better_commands.register_command("time", {
             return true, S("Time set"), 1
         elseif action == "query" then
             if time == "daytime" then
-                if better_commands.mc_time then
+                if better_commands.settings.acovg_time then
                     return true, S("Current time: @1", math.floor(minetest.get_timeofday()*24000+18000) % 24000), 1
                 else
                     return true, S("Current time: @1", math.floor(minetest.get_timeofday()*24000)), 1

README.md

@@ -106,102 +106,4 @@ Some arguments (such as `name` and `type`) allow you to prefix the value with `!
 7. Except in MCLA/VL, the `playerKillCount` and `killed_by`, `teamkill`, and `killedByTeam` objectives can only track direct kills (so not arrows or explosions, for example).
 8. Objectives cannot be displayed as hearts, although literally the only reason is that there's no good half heart character.
 9. Team prefixes and suffixes have been replaced with `nameFormat` (for example, `/team modify a_nice_team nameFormat [Admin] %s the great`), where any `%s` is replaced with the player's name. If your name was `singleplayer`, it would appear as `[Admin] singleplayer the great`. The reason for this is pretty simple: I don't want to figure out how to do quotes, and Minetest removes trailing space, meaning prefixes ending in spaces are impossible. This fixes that.
-10. The `/give` command is currently unable to give multiple tools (so `/give @s default:pick_wood 5` will only give 1). This may change.
-
-## TODO
-- [ ] Add scoreboard playerlist and nametags (?)
-- [ ] Figure out feet/eyes since most entities don't have that
-- [ ] Make output match ACOVG's (error messages, number results, etc.)
-- [ ] Add more scoreboard criteria (settings to disable)
-  - [ ] `xp`/`level` (MCLA/VL only)
-  - [ ] `food` (MCLA/VL/stamina)
-  - [ ] `air`
-  - [ ] `armor` (MCLA/VL/3D Armor)
-  - [x] `trigger`
-  - [ ] `picked_up.<itemstring>`
-  - [ ] `mined.<itemstring>`
-  - [ ] `crafted.<itemstring>`
-  - [ ] `total_world_time`
-  - [ ] `leave_game`
-- [ ] Add missing `execute` subcommands
-  - [ ] `in`
-  - [ ] `summon`
-  - [ ] `if/unless`
-    - [ ] `biome`
-    - [ ] `block`/`node`
-    - [ ] `blocks`/`nodes`
-    - [ ] `data`
-    - [ ] `dimension`
-    - [ ] `entity`
-    - [ ] `loaded`
-    - [ ] `score`
-  - [ ] `store`
-    - [ ] `block`/`node`
-    - [ ] `bossbar`
-    - [ ] `entity`
-    - [ ] `score`
-- [ ] Add more commands
-  - [x] `trigger`
-  - [ ] `alwaysday`/`daylock`
-  - [ ] `ban`/`ban-ip`/`banlist`
-  - [ ] `bossbar`? (probably significantly modified)
-  - [ ] `advancement`
-  - [ ] `fill` (Extra argument for LBM vs `set_node(s)`)
-  - [ ] `changesetting`?
-  - [ ] `clear`
-  - [ ] `spawnpoint`
-  - [ ] `clearspawnpoint`
-  - [ ] `clone`
-  - [ ] `damage`
-  - [ ] `data`
-  - [ ] `deop` (removes all but basic privs)
-  - [ ] `op` (grants certain privs, including `server`)
-  - [ ] `effect` (MCLA/VL only)
-  - [ ] `enchant` (MCLA/VL only, also override forceenchant?)
-  - [ ] `experience`/`xp` (MCLA/VL only)
-  - [ ] `fog`
-  - [ ] `forceload`
-  - [ ] `gamemode` (in MTG, grants/revokes `creative`)
-  - [ ] `gamerule`? (maybe equivalent to `changesetting`?)
-  - [ ] `item`?
-  - [ ] `kick`
-  - [ ] `list`
-  - [ ] `locate` (copy from or depend on Wuzzy's `findbiome`, maybe also support MCLA/VL end shrines)
-  - [ ] `loot`
-  - [ ] `music` (depending on various mods)
-  - [ ] `pardon`
-  - [ ] `pardon-ip`
-  - [ ] `particle`
-  - [ ] `place`
-  - [ ] `random` (although seeds seem to be somewhat inconsistent in MT)
-  - [ ] `recipe` (MCLA/VL only)
-  - [ ] `remove`
-  - [ ] `replaceitem`
-  - [ ] `return`
-  - [ ] `ride`?
-  - [ ] `seed`
-  - [ ] `setidletimeout`?
-  - [ ] `spreadplayers`?
-  - [ ] `stop`
-  - [ ] `structure`?
-  - [x] `summon`
-  - [ ] `tag`
-  - [ ] `teammsg`/`tm`
-  - [ ] `testfor`
-  - [ ] `testforblock`
-  - [ ] `testforblocks`
-  - [ ] `tickingarea`?
-  - [ ] `toggledownfall` (depending on mods)
-  - [ ] `weather` (depending on mods)
-  - [ ] `whitelist`
-  - [ ] `worldborder`? (maybe not visible, probably no collision)
-- [ ] Add more selector arguments
-  - [ ] `dx`/`dy`/`dz`
-  - [ ] `x_rotation`/`rx`/`rxm`/`y_rotation`/`ry`/`rym`
-  - [ ] `scores`
-  - [ ] `tag`
-  - [ ] `team`
-  - [ ] `level`/`l`/`lm` (MCLA/VL only)
-  - [ ] `gamemode`/`l`/`lm` (more of an "is creative?" command)
-  - [ ] `advancements` (with MCLA/VL/awards), change syntax
-  - [ ] `haspermission` (privs)
+10. The `/give` command is currently unable to give multiple tools (so `/give @s default:pick_wood 5` will only give 1). This may change.

TODO.md

@@ -0,0 +1,100 @@
+# TODO
+A place for me to write out my future plans. Also, I can just copy/paste into a random generator and decide what to do next.
+
+- [ ] Add scoreboard playerlist and nametags (?)
+- [ ] Figure out feet/eyes since most entities don't have that
+- [ ] Make output match ACOVG's (error messages, number results, etc.)
+- [ ] Add more scoreboard criteria (settings to disable)
+  - [ ] `xp`/`level` (MCLA/VL only)
+  - [ ] `food` (MCLA/VL/stamina)
+  - [ ] `air`
+  - [ ] `armor` (MCLA/VL/3D Armor)
+  - [x] `trigger`
+  - [ ] `picked_up.<itemstring>`
+  - [ ] `mined.<itemstring>`
+  - [ ] `crafted.<itemstring>`
+  - [ ] `total_world_time`
+  - [ ] `leave_game`
+  - [ ] Advancements/awards?
+- [ ] Add missing `execute` subcommands
+  - [ ] `in`
+  - [ ] `summon`
+  - [ ] `if/unless`
+    - [ ] `biome`
+    - [ ] `block`/`node`
+    - [ ] `blocks`/`nodes`
+    - [ ] `data`
+    - [ ] `dimension`
+    - [ ] `entity`
+    - [ ] `loaded`
+    - [ ] `score`
+  - [ ] `store`
+    - [ ] `block`/`node`
+    - [ ] `bossbar`
+    - [ ] `entity`
+    - [ ] `score`
+- [ ] Add more selector arguments
+  - [ ] `dx`/`dy`/`dz`
+  - [ ] `x_rotation`/`rx`/`rxm`/`y_rotation`/`ry`/`rym`
+  - [ ] `scores`
+  - [ ] `tag`
+  - [ ] `team`
+  - [ ] `level`/`l`/`lm` (MCLA/VL only)
+  - [ ] `gamemode`/`l`/`lm` (more of an "is creative?" command)
+  - [ ] `advancements` (with MCLA/VL/awards), change syntax
+  - [ ] `haspermission` (privs)
+- [ ] Add more commands
+  - [x] `trigger`
+  - [ ] `alwaysday`/`daylock`
+  - [ ] `ban`/`ban-ip`/`banlist`
+  - [ ] `bossbar`? (probably significantly modified, maybe MCLA/VL only)
+  - [ ] `advancement`
+  - [ ] `fill` (Extra argument for LBM vs `set_node(s)`)
+  - [ ] `changesetting`?
+  - [ ] `clear`
+  - [ ] `spawnpoint`
+  - [ ] `clearspawnpoint`
+  - [ ] `clone`
+  - [ ] `damage`
+  - [ ] `data`
+  - [ ] `deop` (removes all but basic privs)
+  - [ ] `op` (grants certain privs, including `server`)
+  - [ ] `effect` (MCLA/VL only)
+  - [ ] `enchant` (MCLA/VL only, also override forceenchant?)
+  - [ ] `experience`/`xp` (MCLA/VL only)
+  - [ ] `fog`
+  - [ ] `forceload`
+  - [ ] `gamemode` (in MTG, grants/revokes `creative`)
+  - [ ] `gamerule`? (maybe equivalent to `changesetting`?)
+  - [ ] `item`?
+  - [ ] `kick`
+  - [ ] `list`
+  - [ ] `locate` (copy from or depend on Wuzzy's `findbiome`, maybe also support MCLA/VL end shrines)
+  - [ ] `loot`
+  - [ ] `music` (depending on various mods)
+  - [ ] `pardon`
+  - [ ] `pardon-ip`
+  - [ ] `particle`
+  - [ ] `place`
+  - [ ] `random` (although seeds seem to be somewhat inconsistent in MT)
+  - [ ] `recipe` (MCLA/VL only)
+  - [ ] `remove`
+  - [ ] `replaceitem`
+  - [ ] `return`
+  - [ ] `ride`?
+  - [ ] `seed`
+  - [ ] `setidletimeout`?
+  - [ ] `spreadplayers`?
+  - [ ] `stop`
+  - [ ] `structure`?
+  - [x] `summon`
+  - [ ] `tag`
+  - [ ] `teammsg`/`tm`
+  - [ ] `testfor`
+  - [ ] `testforblock`
+  - [ ] `testforblocks`
+  - [ ] `tickingarea`?
+  - [ ] `toggledownfall` (depending on mods)
+  - [ ] `weather` (depending on mods)
+  - [ ] `whitelist`
+  - [ ] `worldborder`? (maybe not visible, probably no collision)

init.lua

@@ -1,13 +1,10 @@
 better_commands = {commands = {}, old_commands = {}, players = {}}
 
-better_commands.override = minetest.settings:get_bool("better_commands_override", false)
-better_commands.mc_time = minetest.settings:get_bool("better_commands_mc_time", false)
-better_commands.save_interval = tonumber(minetest.settings:get("better_commands_save_interval")) or 3
-better_commands.kill_creative_players = minetest.settings:get_bool("better_commands_kill_creative_players", false)
 better_commands.mcl = minetest.get_modpath("mcl_core")
 
 local modpath = minetest.get_modpath("better_commands")
 dofile(modpath.."/entity_aliases.lua")
+dofile(modpath.."/settings.lua")
 dofile(modpath.."/API/api.lua")
 dofile(modpath.."/COMMANDS/commands.lua")
 

settings.lua

@@ -0,0 +1,27 @@
+better_commands.settings = {}
+
+---Gets a setting and stores it in better_commands.settings
+---@param setting string
+---@param default any
+---@param type string?
+local function get_setting(setting, default, type)
+    local long_setting = "better_commands_"..setting
+    if not type or type == "string" then
+        better_commands.settings[setting] = minetest.settings:get(long_setting) or default
+    elseif type == "bool" then
+        better_commands.settings[setting] = minetest.settings:get_bool(long_setting, default)
+    elseif type == "number" then
+        better_commands.settings[setting] = tonumber(minetest.settings:get(long_setting)) or default
+    end
+end
+
+local settings = {
+    {"override", false, "bool"},
+    {"acovg_time", false, "bool"},
+    {"save_interval", 3, "number"},
+    {"kill_creative_players", false, "bool"},
+}
+
+for _, setting in ipairs(settings) do
+    get_setting(unpack(setting))
+end

settingtypes.txt

@@ -2,7 +2,7 @@
 better_commands_override (Override existing commands?) bool false
 
 # Use ACOVG times for the /time command? If enabled, day starts at 0, not 7000.
-better_commands_mc_time (Use ACOVG time?) bool false
+better_commands_acovg_time (Use ACOVG time?) bool false
 
 # Can the /kill command kill players in creative mode?
 better_commands_kill_creative_players (Kill creative players?) bool false