From 1eb447164478edddece8c4de02b69205e1cab5e9 Mon Sep 17 00:00:00 2001 From: ccuser44 <68124053+ccuser44@users.noreply.github.com> Date: Wed, 1 Mar 2023 09:38:59 +0200 Subject: [PATCH 01/17] Update Info.lua --- Info.lua | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/Info.lua b/Info.lua index c08a7ef..323c1db 100644 --- a/Info.lua +++ b/Info.lua @@ -235,6 +235,23 @@ g_PluginInfo = }, }, + ["/version"] = + { + Alias = "/ver", + Permission = "core.version", + Handler = HandleVersionCommand, + HelpString = "Shows the version of the server.", + }, + + ["/about"] = + { + Alias = "/a", + Permission = "core.about", + Handler = HandleAboutCommand, + HelpString = "Shows the version of the server.", + }, + + ["/portal"] = { Alias = "/world", From 3600e2d8d37ec333ab0b9eba3094a2e7afe74a53 Mon Sep 17 00:00:00 2001 From: ccuser44 <68124053+ccuser44@users.noreply.github.com> Date: Wed, 1 Mar 2023 09:43:32 +0200 Subject: [PATCH 02/17] Update Info.lua --- Info.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Info.lua b/Info.lua index 323c1db..774de83 100644 --- a/Info.lua +++ b/Info.lua @@ -246,8 +246,8 @@ g_PluginInfo = ["/about"] = { Alias = "/a", - Permission = "core.about", - Handler = HandleAboutCommand, + Permission = "core.version", + Handler = HandleVersionCommand, HelpString = "Shows the version of the server.", }, From 881dae1d7009e42965630602ca4efe2f42435e45 Mon Sep 17 00:00:00 2001 From: ccuser44 <68124053+ccuser44@users.noreply.github.com> Date: Wed, 1 Mar 2023 10:42:16 +0200 Subject: [PATCH 03/17] Create cmd_version.lua --- cmd_version.lua | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 cmd_version.lua diff --git a/cmd_version.lua b/cmd_version.lua new file mode 100644 index 0000000..5f1749a --- /dev/null +++ b/cmd_version.lua @@ -0,0 +1,17 @@ +function HandleVersionCommand(Split, Player) + -- Send output to player: + SendMessage(Player, string.format( + "This server is running CuberiteMC %s - %s (%s - %s) with Lua version %s and SQL version %s.", + cRoot:GetBuildSeriesName(), + cRoot:GetBuildID(), + cRoot:GetBuildCommitID(), + cRoot:GetBuildDateTime(), + _VERSION, + sqlite3.version + )) + return true +end +--This server is running Paper version git-Paper-"e591764" (MC: 1.12.2) (Implementing API version 1.12.2-R0.1-SNAPSHOT) +Previous version: git-Paper-1618 (MC: 1.12.2) +Checking version, please wait... +Unknown version From 99923d6fa7368aed8db0bdc06474322f91a524f3 Mon Sep 17 00:00:00 2001 From: ccuser44 <68124053+ccuser44@users.noreply.github.com> Date: Wed, 1 Mar 2023 10:42:43 +0200 Subject: [PATCH 04/17] Update cmd_version.lua --- cmd_version.lua | 4 ---- 1 file changed, 4 deletions(-) diff --git a/cmd_version.lua b/cmd_version.lua index 5f1749a..a9a8984 100644 --- a/cmd_version.lua +++ b/cmd_version.lua @@ -11,7 +11,3 @@ function HandleVersionCommand(Split, Player) )) return true end ---This server is running Paper version git-Paper-"e591764" (MC: 1.12.2) (Implementing API version 1.12.2-R0.1-SNAPSHOT) -Previous version: git-Paper-1618 (MC: 1.12.2) -Checking version, please wait... -Unknown version From cc866c7a53928377f88a2bc6560673bf677ee796 Mon Sep 17 00:00:00 2001 From: ccuser44 <68124053+ccuser44@users.noreply.github.com> Date: Wed, 1 Mar 2023 10:46:51 +0200 Subject: [PATCH 05/17] Update README.md --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 9903fa9..5430299 100644 --- a/README.md +++ b/README.md @@ -26,6 +26,8 @@ Implements some of the basic commands needed to run a simple server. |/motd | core.motd | Shows the message of the day.| |/op | core.rank | Add a player to the administrator rank.| |/plugins | core.plugins | Shows a list of the plugins.| +|/version | core.version | Shows the server version.| +|/about | core.version | Shows the server version.| |/portal | core.portal | Moves your player to a different world.| |/r | core.tell | Replies to the latest private message you received.| |/rank | core.rank | Shows or sets a player's rank.| @@ -91,6 +93,7 @@ Implements some of the basic commands needed to run a simple server. | core.me | | `/me` | | | core.motd | | `/motd` | | | core.plugins | | `/plugins` | | +| core.version | | `/version`, `/about` | | | core.portal | | `/portal` | | | core.rank | | `/rank`, `/op` | | | core.regen | | `/regen` | | From 83878f13897a8bc35138df9598a88f01070109a6 Mon Sep 17 00:00:00 2001 From: ccuser44 <68124053+ccuser44@users.noreply.github.com> Date: Wed, 1 Mar 2023 10:49:25 +0200 Subject: [PATCH 06/17] Update Info.lua --- Info.lua | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/Info.lua b/Info.lua index 774de83..ee78bef 100644 --- a/Info.lua +++ b/Info.lua @@ -943,6 +943,18 @@ g_PluginInfo = HelpString = "Shows a list of the plugins.", }, + ["version"] = + { + Handler = HandleVersionCommand, + HelpString = "Shows the version of the server.", + }, + + ["about"] = + { + Handler = HandleVersionCommand, + HelpString = "Shows the version of the server.", + }, + ["rank"] = { Handler = HandleConsoleRank, From bbdff2e510946cd99c9805ec7def18394ffc1eb4 Mon Sep 17 00:00:00 2001 From: ccuser44 <68124053+ccuser44@users.noreply.github.com> Date: Mon, 6 Mar 2023 09:58:11 +0200 Subject: [PATCH 07/17] Update cmd_version.lua Co-authored-by: Mat --- cmd_version.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd_version.lua b/cmd_version.lua index a9a8984..794cc6f 100644 --- a/cmd_version.lua +++ b/cmd_version.lua @@ -1,7 +1,7 @@ function HandleVersionCommand(Split, Player) -- Send output to player: SendMessage(Player, string.format( - "This server is running CuberiteMC %s - %s (%s - %s) with Lua version %s and SQL version %s.", + "This server is running Cuberite %s - %s (%s - %s) with Lua version %s and SQL version %s.", cRoot:GetBuildSeriesName(), cRoot:GetBuildID(), cRoot:GetBuildCommitID(), From 8c1b5b02f3f5af3d04bfad60605ff64d06fb4cbc Mon Sep 17 00:00:00 2001 From: ccuser44 <68124053+ccuser44@users.noreply.github.com> Date: Mon, 6 Mar 2023 09:59:58 +0200 Subject: [PATCH 08/17] Add ccuser44 to CONTRIBUTORS --- CONTRIBUTORS | 1 + 1 file changed, 1 insertion(+) diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 9884f97..a4bce3e 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -29,4 +29,5 @@ tigerw (Tiger Wang) tonibm19 tonitch (Debucquoy Anthony) xoft (Mattes Dolak/madmaxoft) +ccuser44 From 6f24a84fbcbb199ee650548b3bb311849a090451 Mon Sep 17 00:00:00 2001 From: ccuser44 <68124053+ccuser44@users.noreply.github.com> Date: Mon, 6 Mar 2023 10:01:06 +0200 Subject: [PATCH 09/17] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 5430299..d8b613b 100644 --- a/README.md +++ b/README.md @@ -26,8 +26,8 @@ Implements some of the basic commands needed to run a simple server. |/motd | core.motd | Shows the message of the day.| |/op | core.rank | Add a player to the administrator rank.| |/plugins | core.plugins | Shows a list of the plugins.| -|/version | core.version | Shows the server version.| -|/about | core.version | Shows the server version.| +|/version | core.version | Shows the server software version.| +|/about | core.version | Shows the server software version.| |/portal | core.portal | Moves your player to a different world.| |/r | core.tell | Replies to the latest private message you received.| |/rank | core.rank | Shows or sets a player's rank.| From 1b3679766130699a72ad5b86e0d562f7823dbcea Mon Sep 17 00:00:00 2001 From: ccuser44 <68124053+ccuser44@users.noreply.github.com> Date: Mon, 6 Mar 2023 10:05:21 +0200 Subject: [PATCH 10/17] Update Info.lua --- Info.lua | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Info.lua b/Info.lua index ee78bef..64150f6 100644 --- a/Info.lua +++ b/Info.lua @@ -240,7 +240,7 @@ g_PluginInfo = Alias = "/ver", Permission = "core.version", Handler = HandleVersionCommand, - HelpString = "Shows the version of the server.", + HelpString = "Shows the version of the server software.", }, ["/about"] = @@ -248,7 +248,7 @@ g_PluginInfo = Alias = "/a", Permission = "core.version", Handler = HandleVersionCommand, - HelpString = "Shows the version of the server.", + HelpString = "Shows the version of the server software.", }, @@ -946,13 +946,13 @@ g_PluginInfo = ["version"] = { Handler = HandleVersionCommand, - HelpString = "Shows the version of the server.", + HelpString = "Shows the version of the server software.", }, ["about"] = { Handler = HandleVersionCommand, - HelpString = "Shows the version of the server.", + HelpString = "Shows the version of the server software.", }, ["rank"] = From 23eabc250804067154c0c8b35d1cc88ca3ffe1b4 Mon Sep 17 00:00:00 2001 From: ccuser44 <68124053+ccuser44@users.noreply.github.com> Date: Mon, 6 Mar 2023 10:20:06 +0200 Subject: [PATCH 11/17] Update Info.lua --- Info.lua | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Info.lua b/Info.lua index 64150f6..2ed843e 100644 --- a/Info.lua +++ b/Info.lua @@ -1474,6 +1474,11 @@ g_PluginInfo = Description = "Allows players to manage the whitelist.", RecommendedGroups = "admins", }, + + ["core.version"] = + { + Description = "Shows the version of the server software.", + }, }, -- Permissions } -- g_PluginInfo From 23a5166aafe0976f1532ac397f7c06e0a028f3e4 Mon Sep 17 00:00:00 2001 From: ccuser44 <68124053+ccuser44@users.noreply.github.com> Date: Mon, 6 Mar 2023 10:25:38 +0200 Subject: [PATCH 12/17] Update Info.lua --- Info.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Info.lua b/Info.lua index 2ed843e..abcecb7 100644 --- a/Info.lua +++ b/Info.lua @@ -245,7 +245,7 @@ g_PluginInfo = ["/about"] = { - Alias = "/a", + Alias = "/abt", Permission = "core.version", Handler = HandleVersionCommand, HelpString = "Shows the version of the server software.", From 468a2cc0df9af1a008f73330302f5609039b1751 Mon Sep 17 00:00:00 2001 From: ccuser44 <68124053+ccuser44@users.noreply.github.com> Date: Mon, 13 Mar 2023 16:55:17 +0200 Subject: [PATCH 13/17] Update CONTRIBUTORS --- CONTRIBUTORS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTORS b/CONTRIBUTORS index a4bce3e..cad774c 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -8,6 +8,7 @@ as provided in the LICENSE file. 36451 bearbin (Alexander Harkness) Bond-009 +ccuser44 daniel0916 Etmix Howaner @@ -29,5 +30,4 @@ tigerw (Tiger Wang) tonibm19 tonitch (Debucquoy Anthony) xoft (Mattes Dolak/madmaxoft) -ccuser44 From 32f8410be6c47b6ea6aba0eb785bcd0c29756322 Mon Sep 17 00:00:00 2001 From: ccuser44 <68124053+ccuser44@users.noreply.github.com> Date: Mon, 13 Mar 2023 16:57:04 +0200 Subject: [PATCH 14/17] Update README.md --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index d8b613b..ad58dec 100644 --- a/README.md +++ b/README.md @@ -5,6 +5,7 @@ Implements some of the basic commands needed to run a simple server. ### General | Command | Permission | Description | | ------- | ---------- | ----------- | +|/about | core.version | Shows the server software version.| |/ban | core.ban | Bans a player.| |/clear | core.clear | Clears the inventory of a player.| |/difficulty | core.difficulty | Changes the difficulty level of the world you're located in.| @@ -26,8 +27,6 @@ Implements some of the basic commands needed to run a simple server. |/motd | core.motd | Shows the message of the day.| |/op | core.rank | Add a player to the administrator rank.| |/plugins | core.plugins | Shows a list of the plugins.| -|/version | core.version | Shows the server software version.| -|/about | core.version | Shows the server software version.| |/portal | core.portal | Moves your player to a different world.| |/r | core.tell | Replies to the latest private message you received.| |/rank | core.rank | Shows or sets a player's rank.| @@ -57,6 +56,7 @@ Implements some of the basic commands needed to run a simple server. |/unrank | core.unrank | Add a player to the default rank.| |/unsafegive | core.give.unsafe | Gives an item to a player, even if the item is blacklisted.| |/unsafeitem | core.item.unsafe | Gives your player an item, even if the item is blacklisted.| +|/version | core.version | Shows the server software version.| |/viewdistance | core.viewdistance | Changes your view distance.| |/weather | core.weather | Changes the world's weather.| |/whitelist | | Manages the whitelist.| @@ -93,7 +93,6 @@ Implements some of the basic commands needed to run a simple server. | core.me | | `/me` | | | core.motd | | `/motd` | | | core.plugins | | `/plugins` | | -| core.version | | `/version`, `/about` | | | core.portal | | `/portal` | | | core.rank | | `/rank`, `/op` | | | core.regen | | `/regen` | | @@ -116,6 +115,7 @@ Implements some of the basic commands needed to run a simple server. | core.tps | | `/tps` | | | core.unban | | `/unban` | | | core.unrank | | `/deop`, `/unrank` | | +| core.version | | `/version`, `/about` | | | core.viewdistance | | `/viewdistance` | | | core.weather | Allows players to change the weather. | `/weather` | admins | | core.whitelist | Allows players to manage the whitelist. | `/whitelist off`, `/whitelist list`, `/whitelist remove`, `/whitelist on`, `/whitelist add` | admins | From 39d63e607cb468bb81b89262a83fde66c3dd04e7 Mon Sep 17 00:00:00 2001 From: ccuser44 <68124053+ccuser44@users.noreply.github.com> Date: Mon, 13 Mar 2023 17:00:00 +0200 Subject: [PATCH 15/17] Update Info.lua --- Info.lua | 61 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 30 insertions(+), 31 deletions(-) diff --git a/Info.lua b/Info.lua index abcecb7..a1372e2 100644 --- a/Info.lua +++ b/Info.lua @@ -11,6 +11,14 @@ g_PluginInfo = Commands = { + ["/about"] = + { + Alias = "/abt", + Permission = "core.version", + Handler = HandleVersionCommand, + HelpString = "Shows the version of the server software.", + }, + ["/ban"] = { Permission = "core.ban", @@ -235,23 +243,6 @@ g_PluginInfo = }, }, - ["/version"] = - { - Alias = "/ver", - Permission = "core.version", - Handler = HandleVersionCommand, - HelpString = "Shows the version of the server software.", - }, - - ["/about"] = - { - Alias = "/abt", - Permission = "core.version", - Handler = HandleVersionCommand, - HelpString = "Shows the version of the server software.", - }, - - ["/portal"] = { Alias = "/world", @@ -678,7 +669,15 @@ g_PluginInfo = }, }, }, - + + ["/version"] = + { + Alias = "/ver", + Permission = "core.version", + Handler = HandleVersionCommand, + HelpString = "Shows the version of the server software.", + }, + ["/viewdistance"] = { Permission = "core.viewdistance", @@ -776,6 +775,12 @@ g_PluginInfo = ConsoleCommands = { + ["about"] = + { + Handler = HandleVersionCommand, + HelpString = "Shows the version of the server software.", + }, + ["ban"] = { Handler = HandleConsoleBan, @@ -943,18 +948,6 @@ g_PluginInfo = HelpString = "Shows a list of the plugins.", }, - ["version"] = - { - Handler = HandleVersionCommand, - HelpString = "Shows the version of the server software.", - }, - - ["about"] = - { - Handler = HandleVersionCommand, - HelpString = "Shows the version of the server software.", - }, - ["rank"] = { Handler = HandleConsoleRank, @@ -1316,7 +1309,13 @@ g_PluginInfo = }, }, }, - + + ["version"] = + { + Handler = HandleVersionCommand, + HelpString = "Shows the version of the server software.", + }, + ["weather"] = { Handler = HandleConsoleWeather, From 12f450a96597f220ded725da51df2a967397b0f6 Mon Sep 17 00:00:00 2001 From: ccuser44 <68124053+ccuser44@users.noreply.github.com> Date: Mon, 13 Mar 2023 17:01:34 +0200 Subject: [PATCH 16/17] Update cmd_version.lua --- cmd_version.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd_version.lua b/cmd_version.lua index 794cc6f..a419c92 100644 --- a/cmd_version.lua +++ b/cmd_version.lua @@ -1,7 +1,7 @@ function HandleVersionCommand(Split, Player) -- Send output to player: SendMessage(Player, string.format( - "This server is running Cuberite %s - %s (%s - %s) with Lua version %s and SQL version %s.", + "This server is running Cuberite %s - %s (%s - %s) with Lua version %s and SQLite version %s.", cRoot:GetBuildSeriesName(), cRoot:GetBuildID(), cRoot:GetBuildCommitID(), From f3d716df3fa73cd74034ba75b0799ef54504b431 Mon Sep 17 00:00:00 2001 From: Mat Date: Thu, 16 Mar 2023 23:35:29 +0200 Subject: [PATCH 17/17] cmd_version.lua: minor corrections --- cmd_version.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cmd_version.lua b/cmd_version.lua index a419c92..b649f7c 100644 --- a/cmd_version.lua +++ b/cmd_version.lua @@ -1,13 +1,13 @@ function HandleVersionCommand(Split, Player) -- Send output to player: - SendMessage(Player, string.format( + Response = SendMessage(Player, string.format( "This server is running Cuberite %s - %s (%s - %s) with Lua version %s and SQLite version %s.", cRoot:GetBuildSeriesName(), cRoot:GetBuildID(), cRoot:GetBuildCommitID(), cRoot:GetBuildDateTime(), _VERSION, - sqlite3.version + sqlite3.version() )) - return true + return true, Response end