aperx/factorio-scenario-ExpCluster
1
0
Fork 0
mirror of https://github.com/PHIDIAS0303/ExpCluster.git synced 2025-12-31 04:51:40 +09:00
Code Issues Packages Projects Releases Wiki Activity

Updated Json File To Remove module atibute

Browse Source
This commit is contained in:
Cooldude2606
2018-06-23 10:07:26 +01:00
parent f3d6d20ed5
commit 593d484f37
18 changed files with 22 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/ExpGamingCore/Commands/control.lua
View File

@@ -6,9 +6,7 @@
local Game = require('FactorioStdLib.Game') local Game = require('FactorioStdLib.Game')
local Color = require('FactorioStdLib.Color') local Color = require('FactorioStdLib.Color')
-- this is optional and is hanndled by it being present local Ranking -- this is optional and is hanndled by it being present, it is loaded on init
local success, Ranking = pcall(require,'ExpGamingCore.Ranking')
if not success then Ranking = nil end success = nil
--- Used as an error constant for validation --- Used as an error constant for validation
-- @field commands.error -- @field commands.error
@@ -226,6 +224,10 @@ commands.add_command = function(name, description, inputs, callback)
end) end)
end end
function commands:on_init()
if loaded_modules['ExpGamingCore.Ranking'] then Ranking = require('ExpGamingCore.Ranking') end
end
--[[ --[[
command example command example

1
modules/ExpGamingCore/Commands/softmod.json
View File

@@ -1,7 +1,6 @@
{ {
"name": "Commands", "name": "Commands",
"version": "4.0.0", "version": "4.0.0",
"module": "commands",
"type": "Submodule", "type": "Submodule",
"description": "A better command handler than the base game.", "description": "A better command handler than the base game.",
"location": "https://github.com/explosivegaming/scenario/releases/download/v4.0-core/ExpGamingCore.Commands.zip", "location": "https://github.com/explosivegaming/scenario/releases/download/v4.0-core/ExpGamingCore.Commands.zip",

2
modules/ExpGamingCore/Gui/control.lua
View File

@@ -157,6 +157,8 @@ script.on_event('on_player_respawned',function(event)
end) end)
function Gui:on_init() function Gui:on_init()
self.left:on_init(); self.left.on_init = nil
self.toolbar:on_init(); self.toolbar.on_init = nil
if loaded_modules['ExpGamingCore.Server'] then verbose('ExpGamingCore.Server is installed; Loading server src') require(module_path..'/src/server',{Gui=Gui}) end if loaded_modules['ExpGamingCore.Server'] then verbose('ExpGamingCore.Server is installed; Loading server src') require(module_path..'/src/server',{Gui=Gui}) end
if loaded_modules['ExpGamingCore.Ranking'] then if loaded_modules['ExpGamingCore.Ranking'] then
verbose('ExpGamingCore.Ranking is installed; Loading ranking src') verbose('ExpGamingCore.Ranking is installed; Loading ranking src')

1
modules/ExpGamingCore/Gui/softmod.json
View File

@@ -1,7 +1,6 @@
{ {
"name": "Gui", "name": "Gui",
"version": "4.0.0", "version": "4.0.0",
"module": "Gui",
"type": "Submodule", "type": "Submodule",
"description": "Adds a objective version to custom guis.", "description": "Adds a objective version to custom guis.",
"location": "https://github.com/explosivegaming/scenario/releases/download/v4.0-core/ExpGamingCore.Gui.zip", "location": "https://github.com/explosivegaming/scenario/releases/download/v4.0-core/ExpGamingCore.Gui.zip",

7
modules/ExpGamingCore/Gui/src/left.lua
View File

@@ -9,8 +9,7 @@
local Game = require('FactorioStdLib.Game') local Game = require('FactorioStdLib.Game')
local Color = require('FactorioStdLib.Color') local Color = require('FactorioStdLib.Color')
local success, Ranking = pcall(require,'ExpGamingCore.Ranking') local Ranking -- this is optional and is hanndled by it being present, it is loaded on init
if not success then Ranking = nil end success = nil
local mod_gui = require("mod-gui") local mod_gui = require("mod-gui")
local Gui = Gui -- this is to force gui to remain in the ENV local Gui = Gui -- this is to force gui to remain in the ENV
@@ -181,4 +180,8 @@ left.on_player_joined_game = function(event)
end end
end end
function left:on_init()
if loaded_modules['ExpGamingCore.Ranking'] then Ranking = require('ExpGamingCore.Ranking') end
end
return left return left

7
modules/ExpGamingCore/Gui/src/toolbar.lua
View File

@@ -8,8 +8,7 @@
-- @function _comment -- @function _comment
local Game = require('FactorioStdLib.Game') local Game = require('FactorioStdLib.Game')
local success, Ranking = pcall(require,'ExpGamingCore.Ranking') local Ranking -- this is optional and is hanndled by it being present, it is loaded on init
if not success then Ranking = nil end success = nil
local mod_gui = require("mod-gui") local mod_gui = require("mod-gui")
local Gui = Gui -- this is to force gui to remain in the ENV local Gui = Gui -- this is to force gui to remain in the ENV
@@ -49,6 +48,10 @@ function toolbar.draw(player)
end end
end end
function toolbar:on_init()
if loaded_modules['ExpGamingCore.Ranking'] then Ranking = require('ExpGamingCore.Ranking') end
end
toolbar.on_rank_change = toolbar.draw toolbar.on_rank_change = toolbar.draw
toolbar.on_player_joined_game = toolbar.draw toolbar.on_player_joined_game = toolbar.draw
return toolbar return toolbar

3
modules/ExpGamingCore/Ranking/softmod.json
View File

@@ -1,7 +1,6 @@
{ {
"name": "Ranking", "name": "Ranking",
"version": "4.0.0", "version": "4.0.0",
"module": "Ranking",
"type": "Submodule", "type": "Submodule",
"description": "A full ranking system for factorio.", "description": "A full ranking system for factorio.",
"location": "https://github.com/explosivegaming/scenario/releases/download/v4.0-core/ExpGamingCore.Ranking.zip", "location": "https://github.com/explosivegaming/scenario/releases/download/v4.0-core/ExpGamingCore.Ranking.zip",

3
modules/ExpGamingCore/Server/softmod.json
View File

@@ -1,7 +1,6 @@
{ {
"name": "Server", "name": "Server",
"version": "4.0.0", "version": "4.0.0",
"module": "Server",
"type": "Submodule", "type": "Submodule",
"description": "Adds a thread system and event listening and a admin bypass (recommend to disable /c and use optional /interface)", "description": "Adds a thread system and event listening and a admin bypass (recommend to disable /c and use optional /interface)",
"location": "https://github.com/explosivegaming/scenario/releases/download/v4.0-core/ExpGamingCore.Server.zip", "location": "https://github.com/explosivegaming/scenario/releases/download/v4.0-core/ExpGamingCore.Server.zip",

3
modules/ExpGamingCore/Server/src/commands.lua
View File

@@ -27,7 +27,8 @@ commands.add_command('interface',{'Server.interface-description'}, {
env.position = game.player.position env.position = game.player.position
env.entity = game.player.selected env.entity = game.player.selected
env.tile = game.player.surface.get_tile(game.player.position) env.tile = game.player.surface.get_tile(game.player.position)
if Ranking and Ranking.get_rank then env.rank = Ranking.get_rank(game.player) end -- this works if loaded modules is not present as Mamager will always have the modules
if Manager['ExpGamingCore.Ranking'] then env.rank = Manager['ExpGamingCore.Ranking'].get_rank(game.player) end
end end
-- runs the function -- runs the function
local success, err = Server.interface(callback,false,env) local success, err = Server.interface(callback,false,env)

1
modules/ExpGamingCore/Sync/softmod.json
View File

@@ -1,7 +1,6 @@
{ {
"name": "Sync", "name": "Sync",
"version": "4.0.0", "version": "4.0.0",
"module": "Sync",
"type": "Submodule", "type": "Submodule",
"description": "Allows syncing with an outside server and info panle.", "description": "Allows syncing with an outside server and info panle.",
"location": "https://github.com/explosivegaming/scenario/releases/download/v4.0-core/ExpGamingCore.Sync.zip", "location": "https://github.com/explosivegaming/scenario/releases/download/v4.0-core/ExpGamingCore.Sync.zip",

7
modules/ExpGamingCore/softmod.json
View File

@@ -1,7 +1,6 @@
{ {
"name": "ExpGamingCore", "name": "ExpGamingCore",
"version": "4.0.0", "version": "4.0.0",
"module": "expGamingCore",
"type": "Collection", "type": "Collection",
"description": "Explosive Gaming Core Files", "description": "Explosive Gaming Core Files",
"location": "https://github.com/explosivegaming/scenario/releases/download/v4.0-core/ExpGamingCore.zip", "location": "https://github.com/explosivegaming/scenario/releases/download/v4.0-core/ExpGamingCore.zip",
@@ -18,7 +17,6 @@
"Commands": { "Commands": {
"name": "Commands", "name": "Commands",
"version": "4.0.0", "version": "4.0.0",
"module": "commands",
"type": "Submodule", "type": "Submodule",
"description": "A better command handler than the base game.", "description": "A better command handler than the base game.",
"location": "https://github.com/explosivegaming/scenario/releases/download/v4.0-core/ExpGamingCore.Commands.zip", "location": "https://github.com/explosivegaming/scenario/releases/download/v4.0-core/ExpGamingCore.Commands.zip",
@@ -40,7 +38,6 @@
"Gui": { "Gui": {
"name": "Gui", "name": "Gui",
"version": "4.0.0", "version": "4.0.0",
"module": "Gui",
"description": "Adds a objective version to custom guis.", "description": "Adds a objective version to custom guis.",
"location": "https://github.com/explosivegaming/scenario/releases/download/v4.0-core/ExpGamingCore.Gui.zip", "location": "https://github.com/explosivegaming/scenario/releases/download/v4.0-core/ExpGamingCore.Gui.zip",
"keywords": [ "keywords": [
@@ -64,7 +61,6 @@
"Ranking": { "Ranking": {
"name": "Ranking", "name": "Ranking",
"version": "4.0.0", "version": "4.0.0",
"module": "Ranking",
"description": "A full ranking system for factorio.", "description": "A full ranking system for factorio.",
"location": "https://github.com/explosivegaming/scenario/releases/download/v4.0-core/ExpGamingCore.Ranking.zip", "location": "https://github.com/explosivegaming/scenario/releases/download/v4.0-core/ExpGamingCore.Ranking.zip",
"keywords": [ "keywords": [
@@ -89,7 +85,6 @@
"Server": { "Server": {
"name": "Server", "name": "Server",
"version": "4.0.0", "version": "4.0.0",
"module": "Server",
"description": "Adds a thread system and event listening and a admin bypass (recommend to disable /c and use optional /interface)", "description": "Adds a thread system and event listening and a admin bypass (recommend to disable /c and use optional /interface)",
"location": "https://github.com/explosivegaming/scenario/releases/download/v4.0-core/ExpGamingCore.Server.zip", "location": "https://github.com/explosivegaming/scenario/releases/download/v4.0-core/ExpGamingCore.Server.zip",
"keywords": [ "keywords": [
@@ -108,7 +103,6 @@
"FactorioStdLib.Color": "^0.8.0", "FactorioStdLib.Color": "^0.8.0",
"FactorioStdLib.String": "^0.8.0", "FactorioStdLib.String": "^0.8.0",
"FactorioStdLib.Game": "^0.8.0", "FactorioStdLib.Game": "^0.8.0",
"ExpGamingCore.Ranking": "?^4.0.0",
"ExpGamingCore.Commands": "?^4.0.0" "ExpGamingCore.Commands": "?^4.0.0"
}, },
"type": "Submodule" "type": "Submodule"
@@ -116,7 +110,6 @@
"Sync": { "Sync": {
"name": "Sync", "name": "Sync",
"version": "4.0.0", "version": "4.0.0",
"module": "Sync",
"description": "Allows syncing with an outside server and info panle.", "description": "Allows syncing with an outside server and info panle.",
"location": "https://github.com/explosivegaming/scenario/releases/download/v4.0-core/ExpGamingCore.Sync.zip", "location": "https://github.com/explosivegaming/scenario/releases/download/v4.0-core/ExpGamingCore.Sync.zip",
"keywords": [ "keywords": [

1
modules/ExpGamingLib/softmod.json
View File

@@ -1,7 +1,6 @@
{ {
"name": "ExpGamingLib", "name": "ExpGamingLib",
"version": "4.0.0", "version": "4.0.0",
"module": "GlobalLib",
"type": "Module", "type": "Module",
"description": "Adds some common functions used though out all ExpGaming modules", "description": "Adds some common functions used though out all ExpGaming modules",
"location": "https://github.com/explosivegaming/scenario/releases/download/v4.0-core/ExpGamingLib.zip", "location": "https://github.com/explosivegaming/scenario/releases/download/v4.0-core/ExpGamingLib.zip",

1
modules/FactorioStdLib/Color/softmod.json
View File

@@ -1,7 +1,6 @@
{ {
"name": "Color", "name": "Color",
"version": "0.8.0", "version": "0.8.0",
"module": "Color",
"type": "Submodule", "type": "Submodule",
"description": "A defines module for retrieving colors by name.", "description": "A defines module for retrieving colors by name.",
"location": "https://github.com/explosivegaming/scenario/releases/download/v4.0-core/FactorioStdLib.Color.zip", "location": "https://github.com/explosivegaming/scenario/releases/download/v4.0-core/FactorioStdLib.Color.zip",

1
modules/FactorioStdLib/Game/softmod.json
View File

@@ -1,7 +1,6 @@
{ {
"name": "Game", "name": "Game",
"version": "0.8.0", "version": "0.8.0",
"module": "Game",
"type": "Submodule", "type": "Submodule",
"description": "The game module.", "description": "The game module.",
"location": "https://github.com/explosivegaming/scenario/releases/download/v4.0-core/FactorioStdLib.Game.zip", "location": "https://github.com/explosivegaming/scenario/releases/download/v4.0-core/FactorioStdLib.Game.zip",

1
modules/FactorioStdLib/String/softmod.json
View File

@@ -1,7 +1,6 @@
{ {
"name": "String", "name": "String",
"version": "0.8.0", "version": "0.8.0",
"module": "string",
"type": "Submodule", "type": "Submodule",
"description": "Extends Lua 5.2 string.", "description": "Extends Lua 5.2 string.",
"location": "https://github.com/explosivegaming/scenario/releases/download/v4.0-core/FactorioStdLib.String.zip", "location": "https://github.com/explosivegaming/scenario/releases/download/v4.0-core/FactorioStdLib.String.zip",

1
modules/FactorioStdLib/Table/softmod.json
View File

@@ -1,7 +1,6 @@
{ {
"name": "Table", "name": "Table",
"version": "0.8.0", "version": "0.8.0",
"module": "table",
"type": "Submodule", "type": "Submodule",
"description": "Extends Lua 5.2 table.", "description": "Extends Lua 5.2 table.",
"location": "https://github.com/explosivegaming/scenario/releases/download/v4.0-core/FactorioStdLib.Table.zip", "location": "https://github.com/explosivegaming/scenario/releases/download/v4.0-core/FactorioStdLib.Table.zip",

5
modules/FactorioStdLib/softmod.json
View File

@@ -1,7 +1,6 @@
{ {
"name": "FactorioStdLib", "name": "FactorioStdLib",
"version": "0.8.0", "version": "0.8.0",
"module": "factorioStdLib",
"type": "Collection", "type": "Collection",
"description": "Factorio Standard Library Projects", "description": "Factorio Standard Library Projects",
"location": "https://github.com/explosivegaming/scenario/releases/download/v4.0-core/FactorioStdLib.zip", "location": "https://github.com/explosivegaming/scenario/releases/download/v4.0-core/FactorioStdLib.zip",
@@ -17,7 +16,6 @@
"Color": { "Color": {
"name": "Color", "name": "Color",
"version": "0.8.0", "version": "0.8.0",
"module": "Color",
"type": "Submodule", "type": "Submodule",
"description": "A defines module for retrieving colors by name.", "description": "A defines module for retrieving colors by name.",
"location": "https://github.com/explosivegaming/scenario/releases/download/v4.0-core/FactorioStdLib.Color.zip", "location": "https://github.com/explosivegaming/scenario/releases/download/v4.0-core/FactorioStdLib.Color.zip",
@@ -33,7 +31,6 @@
"Game": { "Game": {
"name": "Game", "name": "Game",
"version": "0.8.0", "version": "0.8.0",
"module": "Game",
"type": "Submodule", "type": "Submodule",
"description": "The game module.", "description": "The game module.",
"location": "https://github.com/explosivegaming/scenario/releases/download/v4.0-core/FactorioStdLib.Game.zip", "location": "https://github.com/explosivegaming/scenario/releases/download/v4.0-core/FactorioStdLib.Game.zip",
@@ -49,7 +46,6 @@
"String": { "String": {
"name": "String", "name": "String",
"version": "0.8.0", "version": "0.8.0",
"module": "string",
"type": "Submodule", "type": "Submodule",
"description": "Extends Lua 5.2 string.", "description": "Extends Lua 5.2 string.",
"location": "https://github.com/explosivegaming/scenario/releases/download/v4.0-core/FactorioStdLib.String.zip", "location": "https://github.com/explosivegaming/scenario/releases/download/v4.0-core/FactorioStdLib.String.zip",
@@ -65,7 +61,6 @@
"Table": { "Table": {
"name": "Table", "name": "Table",
"version": "0.8.0", "version": "0.8.0",
"module": "table",
"type": "Submodule", "type": "Submodule",
"description": "Extends Lua 5.2 table.", "description": "Extends Lua 5.2 table.",
"location": "https://github.com/explosivegaming/scenario/releases/download/v4.0-core/FactorioStdLib.Table.zip", "location": "https://github.com/explosivegaming/scenario/releases/download/v4.0-core/FactorioStdLib.Table.zip",

2
softmod.json
View File

@@ -1,7 +1,7 @@
{ {
"name": "ExpGamingScenario", "name": "ExpGamingScenario",
"version": "0.16.51", "version": "0.16.51",
"module": "expGamingScenario",
"type": "Scenario", "type": "Scenario",
"description": "Explosive gaming's factorio secenario ran on every public server", "description": "Explosive gaming's factorio secenario ran on every public server",
"modules": { "modules": {