Add weather and stop commands

Author: ThePython10110

.vscode/settings.json

@@ -1,10 +1,10 @@
 {
     "Lua.workspace.library": [
-        "/home/nolan/.config/Code/User/globalStorage/sumneko.lua/addonManager/addons/minetest/module/library"
+        "C:/Users/Nolan/AppData/Roaming/Code/User/globalStorage/sumneko.lua/addonManager/addons/minetest/module/library"
     ],
     "Lua.diagnostics.disable": [
-        "undefined-field",
         "cast-local-type",
+        "undefined-field"
     ],
     "Lua.diagnostics.globals": [
         "mcl_formspec",
@@ -30,7 +30,10 @@
         "better_command_blocks",
         "mcl_gamemode",
         "mcl_experience",
-        "awards"
+        "awards",
+        "mcl_weather",
+        "weather",
+        "weather_mod"
     ],
     "Lua.workspace.checkThirdParty": false,
 }

API/parsing.lua

@@ -596,8 +596,8 @@ function better_commands.parse_time_string(time, absolute)
     -- The pattern shouldn't let through any negative numbers... but just in case
     if amount < 0 then return nil, S("Amount must not be negative") end
     if unit == "s" then
-        local second_multiplier = tonumber(minetest.settings:get("time_speed")) or 72
-        amount = amount * second_multiplier / 3.6 -- (3.6s = 1 millihour)
+        local tps = tonumber(minetest.settings:get("time_speed")) or 72
+        amount = amount * tps / 3.6 -- (3.6s = 1 millihour)
     elseif unit == "d" then
         amount = amount * 24000
     elseif unit ~= "t" then

API/register.lua

@@ -36,6 +36,8 @@ function better_commands.register_command(name, def)
                     end
                 end
             end
+        else
+            return success, nil, count
         end
         return success, "", count --don't actually send messages
     end

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## v3.0
+### New features
+* Added `/stop` command
+* Added `/weather` command
+* Added `/toggledownfall` command
+### Bugfixes
+* Leaving out arguments no longer fails to show the `params` string.
+
 ## v2.0 (May 31, 2024)
 ### New features
 * Added `gamemode`/`m` selector argument

COMMANDS/COMMANDS.lua

@@ -18,6 +18,8 @@ local command_files = {
     "spawnpoint",
     "clear",
     "settings",
+    "stop",
+    "weather",
 }
 
 local mcl_only = {

COMMANDS/clear.lua

@@ -126,7 +126,7 @@ better_commands.register_command("clear", {
             end
         end
         if count < 1 then
-            return false, better_commands.error(S("No player was found"))
+            return false, better_commands.error(S("No player was found")), 0
         elseif count == 1 then
             if all and remove_max == -1 then
                 return true, S("Removed all items from player @1", last), 1

COMMANDS/stop.lua

@@ -0,0 +1,10 @@
+local S = minetest.get_translator(minetest.get_current_modname())
+
+better_commands.register_command("stop", {
+    description = "Stops the server",
+    privs = {server = true},
+    func = function(name, param, context)
+        minetest.request_shutdown(S("Server stopping."), true, 0)
+        return true, "", 1
+    end
+})

COMMANDS/weather.lua

@@ -0,0 +1,119 @@
+local S = minetest.get_translator(minetest.get_current_modname())
+
+local set_weather, get_weather, validate_weather
+
+if better_commands.mcl and minetest.settings:get_bool("mcl_doWeatherCycle", true) and mcl_weather then
+    ---@param w string
+    ---@param end_time? integer
+    ---@return boolean, string?
+    set_weather = function(w, end_time)
+        if w == "clear" then w = "none" end
+        return mcl_weather.change_weather(w or "none", end_time)
+    end
+
+    ---@return string
+    get_weather = mcl_weather.get_weather
+
+    ---@param w string
+    ---@return string?
+    validate_weather = function (w)
+        if mcl_weather.reg_weathers and mcl_weather.reg_weathers[w] then
+            return w
+        else
+            return
+        end
+    end
+elseif minetest.get_modpath("weather") and weather and weather_mod then
+    ---@param w string
+    ---@return boolean
+    set_weather = function(w)
+        if w == "clear" then w = "none" end
+        weather.type = w or "none"
+        weather_mod.handle_lightning()
+        weather_mod.handle_weather_change({type = w or "none"})
+        return true
+    end
+
+    ---@return string
+    get_weather = function() return weather.type end
+
+    ---@param w string
+    ---@return string?
+    validate_weather = function (w)
+        if w == "clear" then return "none" end
+        if not weather_mod.registered_downfalls[w] then
+            for downfall in pairs(weather_mod.registered_downfalls) do
+                if downfall:match("[%w_]+:"..w) then
+                    return downfall
+                end
+            end
+            return
+        end
+        return w
+    end
+else -- Don't bother registering the commands if there's no weather mod.
+    return
+end
+
+better_commands.register_command("weather", {
+    description = "Sets or outputs the current weather",
+    privs = {server = true},
+    params = "query|"..
+        (better_commands.mcl and "(" or "")..
+        "<weather>"..
+        (better_commands.mcl and " [<duration>])" or ""),
+    func = function (name, param, context)
+        local split_param, err = better_commands.parse_params(param)
+        if err or not split_param then return false, err, 0 end
+        if not split_param[1] then
+            return false, nil, 0
+        end
+        if split_param[1][3] == "query" then
+            if split_param[2] then
+                return false, better_commands.error(S("Unexpected argument: @1", split_param[2][3])), 0
+            end
+            local w = get_weather()
+            if w == "none" then w = "clear" end
+            return true, S("Weather state is: @1", w), 1
+        end
+        local w = validate_weather(split_param[1][3])
+        if w then
+            local end_time
+            if split_param[2] then
+                if not better_commands.mcl then
+                    return false, better_commands.error(S("Unexpected argument: @1", split_param[2][3])), 0
+                else
+                    local duration, err = better_commands.parse_time_string(split_param[2][3], true)
+                    if err or not duration then return false, err, 0 end
+                    local tps = tonumber(minetest.settings:get("time_speed"))
+                    -- Don't ask how the math works; I already forgot.
+                    local duration_s = duration*24000/(tps/3.6)
+                    end_time = minetest.get_gametime() + duration_s
+                end
+            end
+            set_weather(w, end_time)
+            return true, S("Set weather to @1", split_param[1][3])
+        else
+            return false, S("Invalid weather: @1", split_param[1][3])
+        end
+    end
+})
+
+better_commands.register_command("toggledownfall", {
+    description = "Toggles weather",
+    privs = {server = true},
+    func = function (name, param, context)
+        local w = get_weather()
+        if w == "none" or w == "clear" then
+            local new_weather = validate_weather("rain")
+            if new_weather then
+                set_weather(new_weather)
+            else
+                return false, S("No weather called 'rain'"), 0
+            end
+        else
+            set_weather("none")
+        end
+        return true, S("Toggled downfall"), 1
+    end
+})

TODO.md

@@ -1,6 +1,16 @@
 # TODO
 A place for me to write out my future plans. I decide what to do next [randomly](https://wheelofnames.com/24r-ygp) (yes, this is genuinely how I do it).
 
+## Short-term goals
+Things that *must* be done before the next release
+- [ ] `/give <player> <item_without_metadata> <count>` only gives 1 item.
+  - Items with metadata work fine.
+
+
+
+
+## Long-term goals
+Things that I hope to do *eventually*.
 - [ ] Add scoreboard playerlist
 - [x] Add scoreboard nametags
 - [ ] Make output match ACOVG's (error messages, number results, etc.)
@@ -84,7 +94,7 @@ A place for me to write out my future plans. I decide what to do next [randomly]
   - [ ] `ride`?
   - [ ] `seed`
   - [ ] `setidletimeout`?
-  - [ ] `stop`
+  - [x] `stop`
   - [ ] `structure`?
   - [x] `summon`
   - [ ] `tag`