Fixed many small bugs

2025-12-29 20:16:38 +09:00 · 2018-12-23 16:37:01 +00:00
parent 8dd52293e1
commit dde73c7b59
47 changed files with 174 additions and 100 deletions
--- a/modules/ExpGamingAdmin/AdminLib/softmod.json
+++ b/modules/ExpGamingAdmin/AdminLib/softmod.json
@@ -1,20 +0,0 @@
-{
-  "name": "ExpGamingAdmin.AdminLib",
-  "version": "4.0.0",
-  "description": "The base functions required to make the others work.",
-  "location": "FSM_ARCHIVE",
-  "keywords": [
-    "lib",
-    "ExpGaming",
-    "Admin"
-  ],
-  "dependencies": {
-    "FactorioStdLib": "^0.8.0",
-    "ExpGamingCore.Role": "?^4.0.0",
-    "ExpGamingCore.Sync": "?^4.0.0",
-    "FactorioStdLib.Game": "^0.8.0",
-    "ExpGamingCore.Server": "?^4.0.0"
-  },
-  "collection": "ExpGamingAdmin@4.0.0",
-  "submodules": {}
-}
--- a/modules/ExpGamingAdmin/Ban/control.lua
+++ b/modules/ExpGamingAdmin/Ban/control.lua
@@ -5,7 +5,7 @@
 -- @alais ThisModule 

 -- Module Require
-local Admin = require('ExpGamingAdmin.AdminLib')
+local Admin = require('ExpGamingAdmin')
 local AdminGui = require('ExpGamingAdmin.Gui')
 local Server = require('ExpGamingCore.Server')
 local Game = require('FactorioStdLib.Game')
--- a/modules/ExpGamingAdmin/Ban/softmod.json
+++ b/modules/ExpGamingAdmin/Ban/softmod.json
@@ -10,13 +10,13 @@
    "ExpGaming"
  ],
  "dependencies": {
-    "ExpGamingAdmin.AdminLib": "^4.0.0",
    "ExpGamingAdmin.Gui": "^4.0.0",
    "ExpGamingCore.Server": "^4.0.0",
    "FactorioStdLib.Game": "^0.8.0",
    "FactorioStdLib.Color": "?^0.8.0",
    "ExpGamingCore.Sync": "?^4.0.0",
-    "ExpGamingAdmin.ClearInventory": "?^4.0.0"
+    "ExpGamingAdmin.ClearInventory": "?^4.0.0",
+    "ExpGamingAdmin": "^4.0.0"
  },
  "collection": "ExpGamingAdmin@4.0.0",
  "submodules": {}
--- a/modules/ExpGamingAdmin/ClearInventory/control.lua
+++ b/modules/ExpGamingAdmin/ClearInventory/control.lua
@@ -5,7 +5,7 @@
 -- @alais ThisModule 

 -- Module Require
-local Admin = require('ExpGamingAdmin.AdminLib')
+local Admin = require('ExpGamingAdmin')
 local Game = require('FactorioStdLib.Game')

 -- Module Define
--- a/modules/ExpGamingAdmin/ClearInventory/softmod.json
+++ b/modules/ExpGamingAdmin/ClearInventory/softmod.json
@@ -12,8 +12,8 @@
    "Inventory"
  ],
  "dependencies": {
-    "ExpGamingAdmin.AdminLib": "^4.0.0",
-    "FactorioStdLib.Game": "^0.8.0"
+    "FactorioStdLib.Game": "^0.8.0",
+    "ExpGamingAdmin": "^4.0.0"
  },
  "collection": "ExpGamingAdmin@4.0.0",
  "submodules": {}
--- a/modules/ExpGamingAdmin/Commands/control.lua
+++ b/modules/ExpGamingAdmin/Commands/control.lua
@@ -3,7 +3,7 @@
 -- @author Cooldude2606
 -- @license https://github.com/explosivegaming/scenario/blob/master/LICENSE

-local Admin = require('ExpGamingAdmin.AdminLib')
+local Admin = require('ExpGamingAdmin')

 --- Used to clear all parts of a player, removing warnings, reports, jail and temp ban
 -- @command clear-all
--- a/modules/ExpGamingAdmin/Commands/softmod.json
+++ b/modules/ExpGamingAdmin/Commands/softmod.json
@@ -22,7 +22,7 @@
    "ExpGamingAdmin.Warnings": "?^4.0.0",
    "ExpGamingAdmin.Reports": "?^4.0.0",
    "ExpGamingAdmin.ClearInventory": "?^4.0.0",
-    "ExpGamingAdmin.AdminLib": "^4.0.0"
+    "ExpGamingAdmin": "^4.0.0"
  },
  "collection": "ExpGamingAdmin@4.0.0",
  "submodules": {}
--- a/modules/ExpGamingAdmin/Gui/control.lua
+++ b/modules/ExpGamingAdmin/Gui/control.lua
@@ -5,7 +5,7 @@
 -- @alais AdminGui 

 -- Module Require
-local Admin = require('ExpGamingAdmin.AdminLib')
+local Admin = require('ExpGamingAdmin')
 local Gui = require('ExpGamingCore.Gui')
 local Role = require('ExpGamingCore.Role')
 local Game = require('FactorioStdLib.Game')
--- a/modules/ExpGamingAdmin/Gui/softmod.json
+++ b/modules/ExpGamingAdmin/Gui/softmod.json
@@ -10,13 +10,13 @@
    "Gui"
  ],
  "dependencies": {
-    "ExpGamingAdmin.AdminLib": "^4.0.0",
    "ExpGamingCore.Gui": "^4.0.0",
    "ExpGamingCore.Role": "^4.0.0",
    "FactorioStdLib.Game": "^0.8.0",
    "ExpGamingPlayer": "?^4.0.0",
    "ExpGamingPlayer.playerInfo": "?^4.0.0",
-    "mod-gui": "*"
+    "mod-gui": "*",
+    "ExpGamingAdmin": "^4.0.0"
  },
  "collection": "ExpGamingAdmin@4.0.0",
  "submodules": {}
--- a/modules/ExpGamingAdmin/Jail/control.lua
+++ b/modules/ExpGamingAdmin/Jail/control.lua
@@ -5,7 +5,7 @@
 -- @alais ThisModule 

 -- Module Require
-local Admin = require('ExpGamingAdmin.AdminLib')
+local Admin = require('ExpGamingAdmin')
 local AdminGui = require('ExpGamingAdmin.Gui')
 local Server = require('ExpGamingCore.Server')
 local Role = require('ExpGamingCore.Role')
--- a/modules/ExpGamingAdmin/Jail/softmod.json
+++ b/modules/ExpGamingAdmin/Jail/softmod.json
@@ -10,14 +10,14 @@
    "ExpGaming"
  ],
  "dependencies": {
-    "ExpGamingAdmin.AdminLib": "^4.0.0",
    "ExpGamingAdmin.Gui": "^4.0.0",
    "ExpGamingCore.Server": "^4.0.0",
    "ExpGamingCore.Role": "^4.0.0",
    "FactorioStdLib.Game": "^0.8.0",
    "FactorioStdLib.Color": "?^0.8.0",
    "ExpGamingCore.Sync": "?^4.0.0",
-    "ExpGamingAdmin.ClearInventory": "?^4.0.0"
+    "ExpGamingAdmin.ClearInventory": "?^4.0.0",
+    "ExpGamingAdmin": "^4.0.0"
  },
  "collection": "ExpGamingAdmin@4.0.0",
  "submodules": {}
--- a/modules/ExpGamingAdmin/Kick/control.lua
+++ b/modules/ExpGamingAdmin/Kick/control.lua
@@ -5,7 +5,7 @@
 -- @alais ThisModule 

 -- Module Require
-local Admin = require('ExpGamingAdmin.AdminLib')
+local Admin = require('ExpGamingAdmin')
 local AdminGui = require('ExpGamingAdmin.Gui')
 local Server = require('ExpGamingCore.Server')
 local Game = require('FactorioStdLib.Game')
--- a/modules/ExpGamingAdmin/Kick/softmod.json
+++ b/modules/ExpGamingAdmin/Kick/softmod.json
@@ -10,13 +10,13 @@
    "Commands"
  ],
  "dependencies": {
-    "ExpGamingAdmin.AdminLib": "^4.0.0",
    "ExpGamingAdmin.Gui": "^4.0.0",
    "ExpGamingCore.Server": "^4.0.0",
    "FactorioStdLib.Game": "^0.8.0",
    "FactorioStdLib.Color": "?^0.8.0",
    "ExpGamingCore.Sync": "?^4.0.0",
-    "ExpGamingAdmin.ClearInventory": "?^4.0.0"
+    "ExpGamingAdmin.ClearInventory": "?^4.0.0",
+    "ExpGamingAdmin": "^4.0.0"
  },
  "collection": "ExpGamingAdmin@4.0.0",
  "submodules": {}
--- a/modules/ExpGamingAdmin/Reports/control.lua
+++ b/modules/ExpGamingAdmin/Reports/control.lua
@@ -5,7 +5,7 @@
 -- @alais ThisModule 

 -- Module Require
-local Admin = require('ExpGamingAdmin.AdminLib')
+local Admin = require('ExpGamingAdmin')
 local Server = require('ExpGamingCore.Server')
 local Role = require('ExpGamingCore.Role')
 local Gui = require('ExpGamingCore.Gui')
--- a/modules/ExpGamingAdmin/Reports/softmod.json
+++ b/modules/ExpGamingAdmin/Reports/softmod.json
@@ -12,13 +12,13 @@
    "Commands"
  ],
  "dependencies": {
-    "ExpGamingAdmin.AdminLib": "^4.0.0",
    "ExpGamingCore.Server": "^4.0.0",
    "ExpGamingCore.Role": "^4.0.0",
    "FactorioStdLib.Game": "^0.8.0",
    "FactorioStdLib.Color": "?^0.8.0",
    "ExpGamingCore.Sync": "?^4.0.0",
-    "ExpGamingCore.Gui": "^4.0.0"
+    "ExpGamingCore.Gui": "^4.0.0",
+    "ExpGamingAdmin": "^4.0.0"
  },
  "collection": "ExpGamingAdmin@4.0.0",
  "submodules": {}
--- a/modules/ExpGamingAdmin/Teleport/control.lua
+++ b/modules/ExpGamingAdmin/Teleport/control.lua
@@ -5,7 +5,7 @@
 -- @alais ThisModule 

 -- Module Require
-local Admin = require('ExpGamingAdmin.AdminLib')
+local Admin = require('ExpGamingAdmin')
 local AdminGui = require('ExpGamingAdmin.Gui')
 local Game = require('FactorioStdLib.Game')

--- a/modules/ExpGamingAdmin/Teleport/softmod.json
+++ b/modules/ExpGamingAdmin/Teleport/softmod.json
@@ -13,9 +13,9 @@
    "Commands"
  ],
  "dependencies": {
-    "ExpGamingAdmin.AdminLib": "^4.0.0",
    "ExpGamingAdmin.Gui": "^4.0.0",
-    "FactorioStdLib.Game": "^0.8.0"
+    "FactorioStdLib.Game": "^0.8.0",
+    "ExpGamingAdmin": "^4.0.0"
  },
  "collection": "ExpGamingAdmin@4.0.0",
  "submodules": {}
--- a/modules/ExpGamingAdmin/TempBan/control.lua
+++ b/modules/ExpGamingAdmin/TempBan/control.lua
@@ -5,7 +5,7 @@
 -- @alais ThisModule 

 -- Module Require
-local Admin = require('ExpGamingAdmin.AdminLib')
+local Admin = require('ExpGamingAdmin')
 local Server = require('ExpGamingCore.Server')
 local Role = require('ExpGamingCore.Role')
 local Game = require('FactorioStdLib.Game')
--- a/modules/ExpGamingAdmin/TempBan/softmod.json
+++ b/modules/ExpGamingAdmin/TempBan/softmod.json
@@ -11,13 +11,13 @@
    "Roles"
  ],
  "dependencies": {
-    "ExpGamingAdmin.AdminLib": "^4.0.0",
    "ExpGamingCore.Server": "^4.0.0",
    "ExpGamingCore.Role": "^4.0.0",
    "FactorioStdLib.Game": "^0.8.0",
    "FactorioStdLib.Color": "?^0.8.0",
    "ExpGamingCore.Sync": "?^4.0.0",
-    "ExpGamingAdmin.ClearInventory": "?^4.0.0"
+    "ExpGamingAdmin.ClearInventory": "?^4.0.0",
+    "ExpGamingAdmin": "^4.0.0"
  },
  "collection": "ExpGamingAdmin@4.0.0",
  "submodules": {}
--- a/modules/ExpGamingAdmin/Warnings/control.lua
+++ b/modules/ExpGamingAdmin/Warnings/control.lua
@@ -5,7 +5,7 @@
 -- @alais ThisModule 

 -- Module Require
-local Admin = require('ExpGamingAdmin.AdminLib')
+local Admin = require('ExpGamingAdmin')
 local Server = require('ExpGamingCore.Server')
 local Role = require('ExpGamingCore.Role')
 local Game = require('FactorioStdLib.Game')
--- a/modules/ExpGamingAdmin/Warnings/softmod.json
+++ b/modules/ExpGamingAdmin/Warnings/softmod.json
@@ -13,13 +13,13 @@
    "Ban"
  ],
  "dependencies": {
-    "ExpGamingAdmin.AdminLib": "^4.0.0",
    "ExpGamingCore.Server": "^4.0.0",
    "ExpGamingCore.Role": "^4.0.0",
    "FactorioStdLib.Game": "^0.8.0",
    "FactorioStdLib.Color": "?^0.8.0",
    "ExpGamingAdmin.Reports": "?^4.0.0",
-    "ExpGamingCore.Sync": "?^4.0.0"
+    "ExpGamingCore.Sync": "?^4.0.0",
+    "ExpGamingAdmin": "^4.0.0"
  },
  "collection": "ExpGamingAdmin@4.0.0",
  "submodules": {}
--- a/modules/ExpGamingAdmin/AdminLib/control.lua
+++ b/modules/ExpGamingAdmin/AdminLib/control.lua
@@ -1,5 +1,5 @@
 --- The base functions required to make the others work.
-- @module ExpGamingAdmin.AdminLib@4.0.0
+-- @module ExpGamingAdmin@4.0.0
 -- @author Cooldude2606
 -- @license https://github.com/explosivegaming/scenario/blob/master/LICENSE
 -- @alais Admin 
@@ -15,7 +15,7 @@ local Admin = {
    on_init=function()
        if loaded_modules['ExpGamingCore.Role'] then Role = require('ExpGamingCore.Role') end
        if loaded_modules['ExpGamingCore.Sync'] then Sync = require('ExpGamingCore.Sync') end
-        if loaded_modules['ExpGamingCore.Server'] then require('ExpGamingCore.Server') end
+        if loaded_modules['ExpGamingCore.Server'] then require('ExpGamingCore.Server').add_module_to_interface('Admin','ExpGamingAdmin') end
    end,
    actions={},
    action_functions={},
--- a/modules/ExpGamingAdmin/AdminLib/locale/de.cfg
+++ b/modules/ExpGamingAdmin/AdminLib/locale/de.cfg
--- a/modules/ExpGamingAdmin/AdminLib/locale/en.cfg
+++ b/modules/ExpGamingAdmin/AdminLib/locale/en.cfg
--- a/modules/ExpGamingAdmin/AdminLib/locale/fr.cfg
+++ b/modules/ExpGamingAdmin/AdminLib/locale/fr.cfg
--- a/modules/ExpGamingAdmin/AdminLib/locale/nl.cfg
+++ b/modules/ExpGamingAdmin/AdminLib/locale/nl.cfg
--- a/modules/ExpGamingAdmin/AdminLib/locale/sv-SE.cfg
+++ b/modules/ExpGamingAdmin/AdminLib/locale/sv-SE.cfg
--- a/modules/ExpGamingAdmin/softmod.json
+++ b/modules/ExpGamingAdmin/softmod.json
@@ -16,7 +16,7 @@
  "contact": "Discord: Cooldude2606#5241",
  "license": "https://github.com/explosivegaming/scenario/blob/master/LICENSE",
  "submodules": {
-    "ExpGamingAdmin.AdminLib": "4.0.0",
+    "ExpGamingAdmin": "4.0.0",
    "ExpGamingAdmin.Ban": "4.0.0",
    "ExpGamingAdmin.ClearInventory": "4.0.0",
    "ExpGamingAdmin.Gui": "4.0.0",
@@ -28,5 +28,10 @@
    "ExpGamingAdmin.Warnings": "4.0.0",
    "ExpGamingAdmin.Commands": "4.0.0"
  },
-  "dependencies": {}
+  "dependencies": {
+    "ExpGamingCore.Role": "?^4.0.0",
+    "ExpGamingCore.Sync": "?^4.0.0",
+    "ExpGamingCore.Server": "?^4.0.0",
+    "FactorioStdLib.Game": "^0.8.0"
+  }
 }