Merge pull request #299 from plague006/features_split

Move features into features folder

control.lua

@@ -1,40 +1,52 @@
+-- Libraries. Removing these will likely lead to game crashes
 require 'config'
 require 'utils.utils'
 require 'utils.list_utils'
 require 'utils.math'
 
 local Game = require 'utils.game'
-
-require 'user_groups'
-require 'custom_commands'
-require 'base_data'
-require 'train_station_names'
-require 'nuke_control'
-require 'follow'
-require 'autodeconstruct'
-require 'corpse_util'
---require 'infinite_storage_chest'
---require 'fish_market'
-require 'reactor_meltdown'
-require 'train_saviour'
-require 'map_gen.shared.perlin_noise'
-require 'map_layout'
-require 'bot'
-require 'player_colors'
--- GUIs the order determines the order they appear at the top.
-require 'info'
-require 'player_list'
-require 'poll'
-require 'tag_group'
-require 'tasklist'
-require 'blueprint_helper'
-require 'paint'
-require 'score'
-require 'popup'
-
 local Event = require 'utils.event'
 local Donators = require 'resources.donators'
 
+require 'map_gen.shared.perlin_noise'
+require 'map_layout'
+
+
+-- Specific to RedMew hosts, can be disabled safely if not hosting on RedMew servers
+require 'features.bot'
+
+-- Library modules which, if missing, will cause other feature modules to fail
+require 'features.base_data'
+require 'features.follow'
+require 'features.user_groups'
+
+-- Feature modules, each can be disabled
+require 'features.autodeconstruct'
+require 'features.corpse_util'
+--require 'features.fish_market'
+--require 'features.infinite_storage_chest'
+require 'features.nuke_control'
+require 'features.player_colors'
+require 'features.reactor_meltdown'
+require 'features.train_saviour'
+require 'features.train_station_names'
+
+-- Contains various commands for users and admins alike
+require 'features.custom_commands'
+
+-- GUIs the order determines the order they appear from left to right.
+-- These can be safely disabled. Some map presets will add GUI modules themselves.
+require 'features.gui.info'
+require 'features.gui.player_list'
+require 'features.gui.poll'
+require 'features.gui.tag_group'
+require 'features.gui.tasklist'
+require 'features.gui.blueprint_helper'
+require 'features.gui.paint'
+require 'features.gui.score'
+require 'features.gui.popup'
+
+
 local function player_created(event)
     local player = Game.get_player_by_index(event.player_index)
 

features/custom_commands.lua

@@ -1,10 +1,10 @@
 local Task = require 'utils.Task'
 local Event = require 'utils.event'
 local Token = require 'utils.global_token'
-local UserGroups = require 'user_groups'
+local UserGroups = require 'features.user_groups'
 local Utils = require 'utils.utils'
 local Game = require 'utils.game'
---local Antigrief = require 'antigrief'
+--local Antigrief = require 'features.antigrief'
 
 local function invoke(cmd)
     if not (game.player and game.player.admin) then
@@ -707,7 +707,7 @@ commands.add_command(
 )
 commands.add_command('a', 'Admin chat. Messages all other admins (Admins only)', admin_chat)
 
-local Report = require('report')
+local Report = require('features.report')
 
 local function report(cmd)
     local reporting_player = game.player

features/fish_market.lua

@@ -19,7 +19,7 @@ make pet follow you moar
 local Event = require 'utils.event'
 local Token = require 'utils.global_token'
 local Task = require 'utils.Task'
-local PlayerStats = require 'player_stats'
+local PlayerStats = require 'features.player_stats'
 local Game = require 'utils.game'
 local Utils = require 'utils.utils'
 

features/gui/info.lua

@@ -1,7 +1,7 @@
 local Gui = require 'utils.gui'
 local Global = require 'utils.global'
 local Event = require 'utils.event'
-local UserGroups = require 'user_groups'
+local UserGroups = require 'features.user_groups'
 local Game = require 'utils.game'
 
 local normal_color = {r = 1, g = 1, b = 1}

features/gui/player_list.lua

@@ -2,10 +2,10 @@ local Event = require 'utils.event'
 local Global = require 'utils.global'
 local Gui = require 'utils.gui'
 local Donators = require 'resources.donators'
-local UserGroups = require 'user_groups'
+local UserGroups = require 'features.user_groups'
-local PlayerStats = require 'player_stats'
+local PlayerStats = require 'features.player_stats'
 local Utils = require 'utils.utils'
-local Report = require 'report'
+local Report = require 'features.report'
 local Game = require 'utils.game'
 local name = require "utils.math"
 

features/gui/poll.lua

@@ -1,7 +1,7 @@
 local Gui = require 'utils.gui'
 local Global = require 'utils.global'
 local Event = require 'utils.event'
-local UserGroups = require 'user_groups'
+local UserGroups = require 'features.user_groups'
 local Game = require 'utils.game'
 local math = require "utils.math"
 local Utils = require "utils.utils"

features/gui/tag_group.lua

@@ -1,7 +1,7 @@
 local Event = require 'utils.event'
 local Gui = require 'utils.gui'
 local Global = require 'utils.global'
-local UserGroups = require 'user_groups'
+local UserGroups = require 'features.user_groups'
 local Game = require 'utils.game'
 local Utils = require "utils.utils"
 

features/gui/tasklist.lua

@@ -1,7 +1,7 @@
 local Event = require 'utils.event'
 local Gui = require 'utils.gui'
 local Global = require 'utils.global'
-local UserGroups = require 'user_groups'
+local UserGroups = require 'features.user_groups'
 local Utils = require 'utils.utils'
 local Game = require 'utils.game'
 local math = require "utils.math"

features/nuke_control.lua

@@ -1,5 +1,5 @@
 local Event = require "utils.event"
-local UserGroups = require "user_groups"
+local UserGroups = require "features.user_groups"
 local Utils = require "utils.utils"
 local Game = require 'utils.game'
 

features/train_saviour.lua

@@ -2,7 +2,7 @@ local Event = require 'utils.event'
 local Market_items = require 'resources.market_items'
 local Global = require 'utils.global'
 local Donators = require 'resources.donators'
-local UserGroups = require 'user_groups'
+local UserGroups = require 'features.user_groups'
 local Game = require 'utils.game'
 local train_perk_flag = Donators.donator_perk_flags.train
 

features/wood_market.lua

@@ -1,7 +1,7 @@
 local Event = require 'utils.event'
 local Token = require 'utils.global_token'
 local Task = require 'utils.Task'
-local PlayerStats = require 'player_stats'
+local PlayerStats = require 'features.player_stats'
 local Game = require 'utils.game'
 local Utils = require "utils.utils"
 

map_gen/Diggy/Feature/DiggyCaveCollapse.lua

@@ -321,7 +321,7 @@ function DiggyCaveCollapse.register(cfg)
         end
 
         if (nil ~= support_beam_entities[event.entity.name]) then
-            require 'popup'.player(
+            require 'features.gui.popup'.player(
                 Game.get_player_by_index(player_index),[[
 Mining entities such as walls, stone paths, concrete
 and rocks, can cause a cave-in, be careful miner!

map_gen/Diggy/Scenario.lua

@@ -1,7 +1,7 @@
 -- dependencies
 local Config = require 'map_gen.Diggy.Config'
 local Debug = require 'map_gen.Diggy.Debug'
-local ScenarioInfo = require 'info'
+local ScenarioInfo = require 'features.gui.info'
 local Event = require 'utils.event'
 
 require 'utils.list_utils'

map_gen/combined/cave_miner/cave_miner.lua

@@ -21,7 +21,7 @@ local math = require 'utils.math'
 local market_items = require "map_gen.combined.cave_miner.market_items"
 local Game = require 'utils.game'
 
-local Info = require 'info'
+local Info = require 'features.gui.info'
 
 Info.set_map_name('Cave Miner')
 Info.set_map_description([[

map_gen/presets/crash_site.lua

@@ -8,7 +8,7 @@ local Random = require 'map_gen.shared.random'
 local OutpostBuilder = require 'map_gen.presets.crash_site.outpost_builder'
 local math = require 'utils.math'
 local degrees = math.degrees
-local ScenarioInfo = require 'info'
+local ScenarioInfo = require 'features.gui.info'
 
 -- Comment out this block if you're getting scenario info from another source.
 ScenarioInfo.set_map_name('Crashsite')

map_gen/presets/crash_site/market.lua

@@ -1,7 +1,7 @@
 local Gui = require 'utils.gui'
 local Event = require 'utils.event'
 local Global = require 'utils.global'
-local PlayerStats = require 'player_stats'
+local PlayerStats = require 'features.player_stats'
 local Game = require 'utils.game'
 local math = require "utils.math"
 

map_gen/presets/crash_site/outpost_builder.lua

@@ -4,7 +4,7 @@ local Global = require 'utils.global'
 local Event = require 'utils.event'
 local Task = require 'utils.Task'
 local Market = require 'map_gen.presets.crash_site.market'
-local PlayerStats = require 'player_stats'
+local PlayerStats = require 'features.player_stats'
 
 local b = require 'map_gen.shared.builders'
 

map_gen/presets/mobius_strip.lua

@@ -105,7 +105,7 @@ end
 
 map = b.apply_effect(map, effect)
 
-require 'spawn_control'
+require 'features.spawn_control'
 add_spawn('left', -88, -88)
 add_spawn('right', 88, 88)