diff --git a/doc/index.html b/doc/index.html index d67b00a1..953f2c7e 100644 --- a/doc/index.html +++ b/doc/index.html @@ -49,7 +49,7 @@
  • config.warnings
  • control
  • Commands
    • -
  • Public
    • +
  • Common
  • expcore.gui
  • expcore.gui.buttons
  • expcore.gui.center
    • @@ -191,7 +191,7 @@ Factorio command making module that makes commands with better parse and more modularity - Public + Common Adds some commonly used functions used in many modules @@ -369,7 +369,7 @@
    generated by LDoc 1.4.3 -Last updated 2019-05-29 22:22:59 +Last updated 2019-05-29 22:26:12
    diff --git a/doc/modules/Commands.html b/doc/modules/Commands.html index 6a622949..5f570a52 100644 --- a/doc/modules/Commands.html +++ b/doc/modules/Commands.html @@ -56,7 +56,7 @@
  • config.warnings
  • control
  • Commands
    • -
  • Public
    • +
  • Common
  • expcore.gui
  • expcore.gui.buttons
  • expcore.gui.center
    • @@ -1300,7 +1300,7 @@
    generated by LDoc 1.4.3 -Last updated 2019-05-29 22:22:59 +Last updated 2019-05-29 22:26:12
    diff --git a/doc/modules/Public.html b/doc/modules/Common.html similarity index 99% rename from doc/modules/Public.html rename to doc/modules/Common.html index def2be2b..346c867c 100644 --- a/doc/modules/Public.html +++ b/doc/modules/Common.html @@ -56,7 +56,7 @@
  • config.warnings
  • control
  • Commands
    • -
  • Public
    • +
  • Common
  • expcore.gui
  • expcore.gui.buttons
  • expcore.gui.center
    • @@ -99,7 +99,7 @@
    -

    Module Public

    +

    Module Common

    Adds some commonly used functions used in many modules

    [[

    @@ -989,7 +989,7 @@
    generated by LDoc 1.4.3 -Last updated 2019-05-29 22:22:59 +Last updated 2019-05-29 22:26:12
    diff --git a/doc/modules/Permissions_Groups.html b/doc/modules/Permissions_Groups.html index d30beee9..33aafbb1 100644 --- a/doc/modules/Permissions_Groups.html +++ b/doc/modules/Permissions_Groups.html @@ -56,7 +56,7 @@
  • config.warnings
  • control
  • Commands
    • -
  • Public
    • +
  • Common
  • expcore.gui
  • expcore.gui.buttons
  • expcore.gui.center
    • @@ -653,7 +653,7 @@
    generated by LDoc 1.4.3 -Last updated 2019-05-29 22:22:59 +Last updated 2019-05-29 22:26:12
    diff --git a/doc/modules/config._file_loader.html b/doc/modules/config._file_loader.html index 46c6c81a..3985ea37 100644 --- a/doc/modules/config._file_loader.html +++ b/doc/modules/config._file_loader.html @@ -52,7 +52,7 @@
  • config.warnings
  • control
  • Commands
    • -
  • Public
    • +
  • Common
  • expcore.gui
  • expcore.gui.buttons
  • expcore.gui.center
    • @@ -114,7 +114,7 @@
    generated by LDoc 1.4.3 -Last updated 2019-05-29 22:22:59 +Last updated 2019-05-29 22:26:12
    diff --git a/doc/modules/config.action_buttons.html b/doc/modules/config.action_buttons.html index d4b608ae..788fe95c 100644 --- a/doc/modules/config.action_buttons.html +++ b/doc/modules/config.action_buttons.html @@ -52,7 +52,7 @@
  • config.warnings
  • control
  • Commands
    • -
  • Public
    • +
  • Common
  • expcore.gui
  • expcore.gui.buttons
  • expcore.gui.center
    • @@ -115,7 +115,7 @@
    generated by LDoc 1.4.3 -Last updated 2019-05-29 22:22:59 +Last updated 2019-05-29 22:26:12
    diff --git a/doc/modules/config.advanced_start.html b/doc/modules/config.advanced_start.html index afe165e4..bcff9a39 100644 --- a/doc/modules/config.advanced_start.html +++ b/doc/modules/config.advanced_start.html @@ -52,7 +52,7 @@
  • config.warnings
  • control
  • Commands
    • -
  • Public
    • +
  • Common
  • expcore.gui
  • expcore.gui.buttons
  • expcore.gui.center
    • @@ -111,7 +111,7 @@
    generated by LDoc 1.4.3 -Last updated 2019-05-29 22:22:59 +Last updated 2019-05-29 22:26:12
    diff --git a/doc/modules/config.death_logger.html b/doc/modules/config.death_logger.html index c8037547..ce8702b5 100644 --- a/doc/modules/config.death_logger.html +++ b/doc/modules/config.death_logger.html @@ -52,7 +52,7 @@
  • config.warnings
  • control
  • Commands
    • -
  • Public
    • +
  • Common
  • expcore.gui
  • expcore.gui.buttons
  • expcore.gui.center
    • @@ -113,7 +113,7 @@
    generated by LDoc 1.4.3 -Last updated 2019-05-29 22:22:59 +Last updated 2019-05-29 22:26:12
    diff --git a/doc/modules/config.expcore-commands.auth_admin.html b/doc/modules/config.expcore-commands.auth_admin.html index 64230092..4eec3011 100644 --- a/doc/modules/config.expcore-commands.auth_admin.html +++ b/doc/modules/config.expcore-commands.auth_admin.html @@ -52,7 +52,7 @@
  • config.warnings
  • control
  • Commands
    • -
  • Public
    • +
  • Common
  • expcore.gui
  • expcore.gui.buttons
  • expcore.gui.center
    • @@ -113,7 +113,7 @@
    generated by LDoc 1.4.3 -Last updated 2019-05-29 22:22:59 +Last updated 2019-05-29 22:26:12
    diff --git a/doc/modules/config.expcore-commands.auth_roles.html b/doc/modules/config.expcore-commands.auth_roles.html index bbf424a9..177ae679 100644 --- a/doc/modules/config.expcore-commands.auth_roles.html +++ b/doc/modules/config.expcore-commands.auth_roles.html @@ -52,7 +52,7 @@
  • config.warnings
  • control
  • Commands
    • -
  • Public
    • +
  • Common
  • expcore.gui
  • expcore.gui.buttons
  • expcore.gui.center
    • @@ -111,7 +111,7 @@
    generated by LDoc 1.4.3 -Last updated 2019-05-29 22:22:59 +Last updated 2019-05-29 22:26:12
    diff --git a/doc/modules/config.expcore-commands.auth_runtime_disable.html b/doc/modules/config.expcore-commands.auth_runtime_disable.html index 1a9fd7e4..eaf632bf 100644 --- a/doc/modules/config.expcore-commands.auth_runtime_disable.html +++ b/doc/modules/config.expcore-commands.auth_runtime_disable.html @@ -52,7 +52,7 @@
  • config.warnings
  • control
  • Commands
    • -
  • Public
    • +
  • Common
  • expcore.gui
  • expcore.gui.buttons
  • expcore.gui.center
    • @@ -112,7 +112,7 @@
    generated by LDoc 1.4.3 -Last updated 2019-05-29 22:22:59 +Last updated 2019-05-29 22:26:12
    diff --git a/doc/modules/config.expcore-commands.parse_general.html b/doc/modules/config.expcore-commands.parse_general.html index 8d39f9fc..fa9562e3 100644 --- a/doc/modules/config.expcore-commands.parse_general.html +++ b/doc/modules/config.expcore-commands.parse_general.html @@ -52,7 +52,7 @@
  • config.warnings
  • control
  • Commands
    • -
  • Public
    • +
  • Common
  • expcore.gui
  • expcore.gui.buttons
  • expcore.gui.center
    • @@ -115,7 +115,7 @@
    generated by LDoc 1.4.3 -Last updated 2019-05-29 22:22:59 +Last updated 2019-05-29 22:26:12
    diff --git a/doc/modules/config.expcore-commands.parse_roles.html b/doc/modules/config.expcore-commands.parse_roles.html index 7374331c..54625aba 100644 --- a/doc/modules/config.expcore-commands.parse_roles.html +++ b/doc/modules/config.expcore-commands.parse_roles.html @@ -52,7 +52,7 @@
  • config.warnings
  • control
  • Commands
    • -
  • Public
    • +
  • Common
  • expcore.gui
  • expcore.gui.buttons
  • expcore.gui.center
    • @@ -111,7 +111,7 @@
    generated by LDoc 1.4.3 -Last updated 2019-05-29 22:22:59 +Last updated 2019-05-29 22:26:12
    diff --git a/doc/modules/config.permission_groups.html b/doc/modules/config.permission_groups.html index 5b148167..cf3a80b0 100644 --- a/doc/modules/config.permission_groups.html +++ b/doc/modules/config.permission_groups.html @@ -52,7 +52,7 @@
  • config.warnings
  • control
  • Commands
    • -
  • Public
    • +
  • Common
  • expcore.gui
  • expcore.gui.buttons
  • expcore.gui.center
    • @@ -114,7 +114,7 @@
    generated by LDoc 1.4.3 -Last updated 2019-05-29 22:22:59 +Last updated 2019-05-29 22:26:12
    diff --git a/doc/modules/config.popup_messages.html b/doc/modules/config.popup_messages.html index d719afa7..1a4a411e 100644 --- a/doc/modules/config.popup_messages.html +++ b/doc/modules/config.popup_messages.html @@ -52,7 +52,7 @@
  • config.warnings
  • control
  • Commands
    • -
  • Public
    • +
  • Common
  • expcore.gui
  • expcore.gui.buttons
  • expcore.gui.center
    • @@ -111,7 +111,7 @@
    generated by LDoc 1.4.3 -Last updated 2019-05-29 22:22:59 +Last updated 2019-05-29 22:26:12
    diff --git a/doc/modules/config.rockets.html b/doc/modules/config.rockets.html index f00430ba..27876b0a 100644 --- a/doc/modules/config.rockets.html +++ b/doc/modules/config.rockets.html @@ -56,7 +56,7 @@
  • config.warnings
  • control
  • Commands
    • -
  • Public
    • +
  • Common
  • expcore.gui
  • expcore.gui.buttons
  • expcore.gui.center
    • @@ -158,7 +158,7 @@
    generated by LDoc 1.4.3 -Last updated 2019-05-29 22:22:59 +Last updated 2019-05-29 22:26:12
    diff --git a/doc/modules/config.roles.html b/doc/modules/config.roles.html index 8ca811a6..b94be117 100644 --- a/doc/modules/config.roles.html +++ b/doc/modules/config.roles.html @@ -52,7 +52,7 @@
  • config.warnings
  • control
  • Commands
    • -
  • Public
    • +
  • Common
  • expcore.gui
  • expcore.gui.buttons
  • expcore.gui.center
    • @@ -111,7 +111,7 @@
    generated by LDoc 1.4.3 -Last updated 2019-05-29 22:22:59 +Last updated 2019-05-29 22:26:12
    diff --git a/doc/modules/config.scorched_earth.html b/doc/modules/config.scorched_earth.html index 01474fac..82f1e1fd 100644 --- a/doc/modules/config.scorched_earth.html +++ b/doc/modules/config.scorched_earth.html @@ -52,7 +52,7 @@
  • config.warnings
  • control
  • Commands
    • -
  • Public
    • +
  • Common
  • expcore.gui
  • expcore.gui.buttons
  • expcore.gui.center
    • @@ -111,7 +111,7 @@
    generated by LDoc 1.4.3 -Last updated 2019-05-29 22:22:59 +Last updated 2019-05-29 22:26:12
    diff --git a/doc/modules/config.spawn_area.html b/doc/modules/config.spawn_area.html index 314256b2..a3d8fa33 100644 --- a/doc/modules/config.spawn_area.html +++ b/doc/modules/config.spawn_area.html @@ -52,7 +52,7 @@
  • config.warnings
  • control
  • Commands
    • -
  • Public
    • +
  • Common
  • expcore.gui
  • expcore.gui.buttons
  • expcore.gui.center
    • @@ -111,7 +111,7 @@
    generated by LDoc 1.4.3 -Last updated 2019-05-29 22:22:59 +Last updated 2019-05-29 22:26:12
    diff --git a/doc/modules/config.warnings.html b/doc/modules/config.warnings.html index 64511255..afa96974 100644 --- a/doc/modules/config.warnings.html +++ b/doc/modules/config.warnings.html @@ -52,7 +52,7 @@
  • config.warnings
  • control
  • Commands
    • -
  • Public
    • +
  • Common
  • expcore.gui
  • expcore.gui.buttons
  • expcore.gui.center
    • @@ -111,7 +111,7 @@
    generated by LDoc 1.4.3 -Last updated 2019-05-29 22:22:59 +Last updated 2019-05-29 22:26:12
    diff --git a/doc/modules/control.html b/doc/modules/control.html index 912524fd..0151cfeb 100644 --- a/doc/modules/control.html +++ b/doc/modules/control.html @@ -52,7 +52,7 @@
  • config.warnings
  • control
  • Commands
    • -
  • Public
    • +
  • Common
  • expcore.gui
  • expcore.gui.buttons
  • expcore.gui.center
    • @@ -114,7 +114,7 @@
    generated by LDoc 1.4.3 -Last updated 2019-05-29 22:22:59 +Last updated 2019-05-29 22:26:12
    diff --git a/doc/modules/expcore.gui.buttons.html b/doc/modules/expcore.gui.buttons.html index 30af2882..94f7a01b 100644 --- a/doc/modules/expcore.gui.buttons.html +++ b/doc/modules/expcore.gui.buttons.html @@ -56,7 +56,7 @@
  • config.warnings
  • control
  • Commands
    • -
  • Public
    • +
  • Common
  • expcore.gui
  • expcore.gui.buttons
  • expcore.gui.center
    • @@ -268,7 +268,7 @@
    generated by LDoc 1.4.3 -Last updated 2019-05-29 22:22:59 +Last updated 2019-05-29 22:26:12
    diff --git a/doc/modules/expcore.gui.center.html b/doc/modules/expcore.gui.center.html index bf096aeb..b0c22903 100644 --- a/doc/modules/expcore.gui.center.html +++ b/doc/modules/expcore.gui.center.html @@ -56,7 +56,7 @@
  • config.warnings
  • control
  • Commands
    • -
  • Public
    • +
  • Common
  • expcore.gui
  • expcore.gui.buttons
  • expcore.gui.center
    • @@ -465,7 +465,7 @@
    generated by LDoc 1.4.3 -Last updated 2019-05-29 22:22:59 +Last updated 2019-05-29 22:26:12
    diff --git a/doc/modules/expcore.gui.checkboxs.html b/doc/modules/expcore.gui.checkboxs.html index bc0924bd..d5c08478 100644 --- a/doc/modules/expcore.gui.checkboxs.html +++ b/doc/modules/expcore.gui.checkboxs.html @@ -56,7 +56,7 @@
  • config.warnings
  • control
  • Commands
    • -
  • Public
    • +
  • Common
  • expcore.gui
  • expcore.gui.buttons
  • expcore.gui.center
    • @@ -407,7 +407,7 @@
    generated by LDoc 1.4.3 -Last updated 2019-05-29 22:22:59 +Last updated 2019-05-29 22:26:12
    diff --git a/doc/modules/expcore.gui.core.html b/doc/modules/expcore.gui.core.html index f87e178c..9b26c60f 100644 --- a/doc/modules/expcore.gui.core.html +++ b/doc/modules/expcore.gui.core.html @@ -52,7 +52,7 @@
  • config.warnings
  • control
  • Commands
    • -
  • Public
    • +
  • Common
  • expcore.gui
  • expcore.gui.buttons
  • expcore.gui.center
    • @@ -114,7 +114,7 @@
    generated by LDoc 1.4.3 -Last updated 2019-05-29 22:22:59 +Last updated 2019-05-29 22:26:12
    diff --git a/doc/modules/expcore.gui.dropdown.html b/doc/modules/expcore.gui.dropdown.html index 50b18819..f796fef3 100644 --- a/doc/modules/expcore.gui.dropdown.html +++ b/doc/modules/expcore.gui.dropdown.html @@ -56,7 +56,7 @@
  • config.warnings
  • control
  • Commands
    • -
  • Public
    • +
  • Common
  • expcore.gui
  • expcore.gui.buttons
  • expcore.gui.center
    • @@ -359,7 +359,7 @@
    generated by LDoc 1.4.3 -Last updated 2019-05-29 22:22:59 +Last updated 2019-05-29 22:26:12
    diff --git a/doc/modules/expcore.gui.elem-button.html b/doc/modules/expcore.gui.elem-button.html index b6709691..78fcaedf 100644 --- a/doc/modules/expcore.gui.elem-button.html +++ b/doc/modules/expcore.gui.elem-button.html @@ -56,7 +56,7 @@
  • config.warnings
  • control
  • Commands
    • -
  • Public
    • +
  • Common
  • expcore.gui
  • expcore.gui.buttons
  • expcore.gui.center
    • @@ -217,7 +217,7 @@
    generated by LDoc 1.4.3 -Last updated 2019-05-29 22:22:59 +Last updated 2019-05-29 22:26:12
    diff --git a/doc/modules/expcore.gui.html b/doc/modules/expcore.gui.html index ffe43e1d..529f0c66 100644 --- a/doc/modules/expcore.gui.html +++ b/doc/modules/expcore.gui.html @@ -52,7 +52,7 @@
  • config.warnings
  • control
  • Commands
    • -
  • Public
    • +
  • Common
  • expcore.gui
  • expcore.gui.buttons
  • expcore.gui.center
    • @@ -112,7 +112,7 @@
    generated by LDoc 1.4.3 -Last updated 2019-05-29 22:22:59 +Last updated 2019-05-29 22:26:12
    diff --git a/doc/modules/expcore.gui.instances.html b/doc/modules/expcore.gui.instances.html index 9f036c3c..68442e01 100644 --- a/doc/modules/expcore.gui.instances.html +++ b/doc/modules/expcore.gui.instances.html @@ -52,7 +52,7 @@
  • config.warnings
  • control
  • Commands
    • -
  • Public
    • +
  • Common
  • expcore.gui
  • expcore.gui.buttons
  • expcore.gui.center
    • @@ -112,7 +112,7 @@
    generated by LDoc 1.4.3 -Last updated 2019-05-29 22:22:59 +Last updated 2019-05-29 22:26:12
    diff --git a/doc/modules/expcore.gui.left.html b/doc/modules/expcore.gui.left.html index 2394a49a..12eada3e 100644 --- a/doc/modules/expcore.gui.left.html +++ b/doc/modules/expcore.gui.left.html @@ -56,7 +56,7 @@
  • config.warnings
  • control
  • Commands
    • -
  • Public
    • +
  • Common
  • expcore.gui
  • expcore.gui.buttons
  • expcore.gui.center
    • @@ -566,7 +566,7 @@
    generated by LDoc 1.4.3 -Last updated 2019-05-29 22:22:59 +Last updated 2019-05-29 22:26:12
    diff --git a/doc/modules/expcore.gui.popups.html b/doc/modules/expcore.gui.popups.html index 1d014f0d..15afc4c7 100644 --- a/doc/modules/expcore.gui.popups.html +++ b/doc/modules/expcore.gui.popups.html @@ -57,7 +57,7 @@
  • config.warnings
  • control
  • Commands
    • -
  • Public
    • +
  • Common
  • expcore.gui
  • expcore.gui.buttons
  • expcore.gui.center
    • @@ -345,7 +345,7 @@
    generated by LDoc 1.4.3 -Last updated 2019-05-29 22:22:59 +Last updated 2019-05-29 22:26:12
    diff --git a/doc/modules/expcore.gui.progress-bar.html b/doc/modules/expcore.gui.progress-bar.html index db148260..58889949 100644 --- a/doc/modules/expcore.gui.progress-bar.html +++ b/doc/modules/expcore.gui.progress-bar.html @@ -56,7 +56,7 @@
  • config.warnings
  • control
  • Commands
    • -
  • Public
    • +
  • Common
  • expcore.gui
  • expcore.gui.buttons
  • expcore.gui.center
    • @@ -550,7 +550,7 @@
    generated by LDoc 1.4.3 -Last updated 2019-05-29 22:22:59 +Last updated 2019-05-29 22:26:12
    diff --git a/doc/modules/expcore.gui.slider.html b/doc/modules/expcore.gui.slider.html index 4d58666a..bcf7524f 100644 --- a/doc/modules/expcore.gui.slider.html +++ b/doc/modules/expcore.gui.slider.html @@ -56,7 +56,7 @@
  • config.warnings
  • control
  • Commands
    • -
  • Public
    • +
  • Common
  • expcore.gui
  • expcore.gui.buttons
  • expcore.gui.center
    • @@ -281,7 +281,7 @@
    generated by LDoc 1.4.3 -Last updated 2019-05-29 22:22:59 +Last updated 2019-05-29 22:26:12
    diff --git a/doc/modules/expcore.gui.test.html b/doc/modules/expcore.gui.test.html index d951fd6b..014cefb2 100644 --- a/doc/modules/expcore.gui.test.html +++ b/doc/modules/expcore.gui.test.html @@ -52,7 +52,7 @@
  • config.warnings
  • control
  • Commands
    • -
  • Public
    • +
  • Common
  • expcore.gui
  • expcore.gui.buttons
  • expcore.gui.center
    • @@ -113,7 +113,7 @@
    generated by LDoc 1.4.3 -Last updated 2019-05-29 22:22:59 +Last updated 2019-05-29 22:26:12
    diff --git a/doc/modules/expcore.gui.text.html b/doc/modules/expcore.gui.text.html index d564cf5b..f34a17e8 100644 --- a/doc/modules/expcore.gui.text.html +++ b/doc/modules/expcore.gui.text.html @@ -56,7 +56,7 @@
  • config.warnings
  • control
  • Commands
    • -
  • Public
    • +
  • Common
  • expcore.gui
  • expcore.gui.buttons
  • expcore.gui.center
    • @@ -283,7 +283,7 @@
    generated by LDoc 1.4.3 -Last updated 2019-05-29 22:22:59 +Last updated 2019-05-29 22:26:12
    diff --git a/doc/modules/expcore.gui.toolbar.html b/doc/modules/expcore.gui.toolbar.html index b06956ec..1c578bb1 100644 --- a/doc/modules/expcore.gui.toolbar.html +++ b/doc/modules/expcore.gui.toolbar.html @@ -56,7 +56,7 @@
  • config.warnings
  • control
  • Commands
    • -
  • Public
    • +
  • Common
  • expcore.gui
  • expcore.gui.buttons
  • expcore.gui.center
    • @@ -205,7 +205,7 @@
    generated by LDoc 1.4.3 -Last updated 2019-05-29 22:22:59 +Last updated 2019-05-29 22:26:12
    diff --git a/doc/modules/expcore.store.html b/doc/modules/expcore.store.html index e51e8806..d5aa81cc 100644 --- a/doc/modules/expcore.store.html +++ b/doc/modules/expcore.store.html @@ -56,7 +56,7 @@
  • config.warnings
  • control
  • Commands
    • -
  • Public
    • +
  • Common
  • expcore.gui
  • expcore.gui.buttons
  • expcore.gui.center
    • @@ -457,7 +457,7 @@
    generated by LDoc 1.4.3 -Last updated 2019-05-29 22:22:59 +Last updated 2019-05-29 22:26:12
    diff --git a/doc/modules/modules.addons.advanced-start.html b/doc/modules/modules.addons.advanced-start.html index 3f63d65c..b619211a 100644 --- a/doc/modules/modules.addons.advanced-start.html +++ b/doc/modules/modules.addons.advanced-start.html @@ -52,7 +52,7 @@
  • config.warnings
  • control
  • Commands
    • -
  • Public
    • +
  • Common
  • expcore.gui
  • expcore.gui.buttons
  • expcore.gui.center
    • @@ -111,7 +111,7 @@
    generated by LDoc 1.4.3 -Last updated 2019-05-29 22:22:59 +Last updated 2019-05-29 22:26:12
    diff --git a/doc/modules/modules.addons.chat-popups.html b/doc/modules/modules.addons.chat-popups.html index 608bb5b6..3d6e6856 100644 --- a/doc/modules/modules.addons.chat-popups.html +++ b/doc/modules/modules.addons.chat-popups.html @@ -52,7 +52,7 @@
  • config.warnings
  • control
  • Commands
    • -
  • Public
    • +
  • Common
  • expcore.gui
  • expcore.gui.buttons
  • expcore.gui.center
    • @@ -112,7 +112,7 @@
    generated by LDoc 1.4.3 -Last updated 2019-05-29 22:22:59 +Last updated 2019-05-29 22:26:12
    diff --git a/doc/modules/modules.addons.damage-popups.html b/doc/modules/modules.addons.damage-popups.html index 2bb0aca6..307f5a0a 100644 --- a/doc/modules/modules.addons.damage-popups.html +++ b/doc/modules/modules.addons.damage-popups.html @@ -52,7 +52,7 @@
  • config.warnings
  • control
  • Commands
    • -
  • Public
    • +
  • Common
  • expcore.gui
  • expcore.gui.buttons
  • expcore.gui.center
    • @@ -112,7 +112,7 @@
    generated by LDoc 1.4.3 -Last updated 2019-05-29 22:22:59 +Last updated 2019-05-29 22:26:12
    diff --git a/doc/modules/modules.gui.player-list.html b/doc/modules/modules.gui.player-list.html index 098838e2..39274a18 100644 --- a/doc/modules/modules.gui.player-list.html +++ b/doc/modules/modules.gui.player-list.html @@ -52,7 +52,7 @@
  • config.warnings
  • control
  • Commands
    • -
  • Public
    • +
  • Common
  • expcore.gui
  • expcore.gui.buttons
  • expcore.gui.center
    • @@ -111,7 +111,7 @@
    generated by LDoc 1.4.3 -Last updated 2019-05-29 22:22:59 +Last updated 2019-05-29 22:26:12
    diff --git a/doc/modules/modules.gui.rocket-info.html b/doc/modules/modules.gui.rocket-info.html index 295f4644..182cdfd7 100644 --- a/doc/modules/modules.gui.rocket-info.html +++ b/doc/modules/modules.gui.rocket-info.html @@ -52,7 +52,7 @@
  • config.warnings
  • control
  • Commands
    • -
  • Public
    • +
  • Common
  • expcore.gui
  • expcore.gui.buttons
  • expcore.gui.center
    • @@ -111,7 +111,7 @@
    generated by LDoc 1.4.3 -Last updated 2019-05-29 22:22:59 +Last updated 2019-05-29 22:26:12
    diff --git a/doc/modules/modules.gui.science-info.html b/doc/modules/modules.gui.science-info.html index 1c9a9526..5dea5ee0 100644 --- a/doc/modules/modules.gui.science-info.html +++ b/doc/modules/modules.gui.science-info.html @@ -52,7 +52,7 @@
  • config.warnings
  • control
  • Commands
    • -
  • Public
    • +
  • Common
  • expcore.gui
  • expcore.gui.buttons
  • expcore.gui.center
    • @@ -111,7 +111,7 @@
    generated by LDoc 1.4.3 -Last updated 2019-05-29 22:22:59 +Last updated 2019-05-29 22:26:12
    diff --git a/doc/modules/modules.gui.task-list.html b/doc/modules/modules.gui.task-list.html index 55e1aab4..bb085dff 100644 --- a/doc/modules/modules.gui.task-list.html +++ b/doc/modules/modules.gui.task-list.html @@ -52,7 +52,7 @@
  • config.warnings
  • control
  • Commands
    • -
  • Public
    • +
  • Common
  • expcore.gui
  • expcore.gui.buttons
  • expcore.gui.center
    • @@ -111,7 +111,7 @@
    generated by LDoc 1.4.3 -Last updated 2019-05-29 22:22:59 +Last updated 2019-05-29 22:26:12
    diff --git a/doc/modules/utils.alien_evolution_progress.html b/doc/modules/utils.alien_evolution_progress.html index 1db74f11..8395e327 100644 --- a/doc/modules/utils.alien_evolution_progress.html +++ b/doc/modules/utils.alien_evolution_progress.html @@ -56,7 +56,7 @@
  • config.warnings
  • control
  • Commands
    • -
  • Public
    • +
  • Common
  • expcore.gui
  • expcore.gui.buttons
  • expcore.gui.center
    • @@ -151,7 +151,7 @@ fraction will decide a chance to spawn. 1 alien for 2 spawners will have 50% on
    generated by LDoc 1.4.3 -Last updated 2019-05-29 22:22:59 +Last updated 2019-05-29 22:26:12
    diff --git a/doc/modules/utils.core.html b/doc/modules/utils.core.html index 14d79ff6..0f39df00 100644 --- a/doc/modules/utils.core.html +++ b/doc/modules/utils.core.html @@ -57,7 +57,7 @@
  • config.warnings
  • control
  • Commands
    • -
  • Public
    • +
  • Common
  • expcore.gui
  • expcore.gui.buttons
  • expcore.gui.center
    • @@ -445,7 +445,7 @@
    generated by LDoc 1.4.3 -Last updated 2019-05-29 22:22:59 +Last updated 2019-05-29 22:26:12
    diff --git a/doc/modules/utils.debug.html b/doc/modules/utils.debug.html index d1307dcd..d52a38b5 100644 --- a/doc/modules/utils.debug.html +++ b/doc/modules/utils.debug.html @@ -56,7 +56,7 @@
  • config.warnings
  • control
  • Commands
    • -
  • Public
    • +
  • Common
  • expcore.gui
  • expcore.gui.buttons
  • expcore.gui.center
    • @@ -299,7 +299,7 @@
    generated by LDoc 1.4.3 -Last updated 2019-05-29 22:22:59 +Last updated 2019-05-29 22:26:12
    diff --git a/doc/modules/utils.event.html b/doc/modules/utils.event.html index caa51ff3..708f0421 100644 --- a/doc/modules/utils.event.html +++ b/doc/modules/utils.event.html @@ -56,7 +56,7 @@
  • config.warnings
  • control
  • Commands
    • -
  • Public
    • +
  • Common
  • expcore.gui
  • expcore.gui.buttons
  • expcore.gui.center
    • @@ -561,7 +561,7 @@
    generated by LDoc 1.4.3 -Last updated 2019-05-29 22:22:59 +Last updated 2019-05-29 22:26:12
    diff --git a/doc/modules/utils.event_core.html b/doc/modules/utils.event_core.html index 4c241168..2358f09f 100644 --- a/doc/modules/utils.event_core.html +++ b/doc/modules/utils.event_core.html @@ -56,7 +56,7 @@
  • config.warnings
  • control
  • Commands
    • -
  • Public
    • +
  • Common
  • expcore.gui
  • expcore.gui.buttons
  • expcore.gui.center
    • @@ -197,7 +197,7 @@
    generated by LDoc 1.4.3 -Last updated 2019-05-29 22:22:59 +Last updated 2019-05-29 22:26:12
    diff --git a/doc/modules/utils.math.html b/doc/modules/utils.math.html index 947d4cd6..8d5bff64 100644 --- a/doc/modules/utils.math.html +++ b/doc/modules/utils.math.html @@ -56,7 +56,7 @@
  • config.warnings
  • control
  • Commands
    • -
  • Public
    • +
  • Common
  • expcore.gui
  • expcore.gui.buttons
  • expcore.gui.center
    • @@ -154,7 +154,7 @@
    generated by LDoc 1.4.3 -Last updated 2019-05-29 22:22:59 +Last updated 2019-05-29 22:26:12
    diff --git a/doc/modules/utils.recipe_locker.html b/doc/modules/utils.recipe_locker.html index 5527fd92..e1457859 100644 --- a/doc/modules/utils.recipe_locker.html +++ b/doc/modules/utils.recipe_locker.html @@ -56,7 +56,7 @@
  • config.warnings
  • control
  • Commands
    • -
  • Public
    • +
  • Common
  • expcore.gui
  • expcore.gui.buttons
  • expcore.gui.center
    • @@ -148,7 +148,7 @@
    generated by LDoc 1.4.3 -Last updated 2019-05-29 22:22:59 +Last updated 2019-05-29 22:26:12
    diff --git a/doc/modules/utils.state_machine.html b/doc/modules/utils.state_machine.html index 78414f3b..55295f83 100644 --- a/doc/modules/utils.state_machine.html +++ b/doc/modules/utils.state_machine.html @@ -56,7 +56,7 @@
  • config.warnings
  • control
  • Commands
    • -
  • Public
    • +
  • Common
  • expcore.gui
  • expcore.gui.buttons
  • expcore.gui.center
    • @@ -309,7 +309,7 @@
    generated by LDoc 1.4.3 -Last updated 2019-05-29 22:22:59 +Last updated 2019-05-29 22:26:12
    diff --git a/doc/modules/utils.table.html b/doc/modules/utils.table.html index bdfa0bdb..c7621cea 100644 --- a/doc/modules/utils.table.html +++ b/doc/modules/utils.table.html @@ -57,7 +57,7 @@
  • config.warnings
  • control
  • Commands
    • -
  • Public
    • +
  • Common
  • expcore.gui
  • expcore.gui.buttons
  • expcore.gui.center
    • @@ -576,7 +576,7 @@
    generated by LDoc 1.4.3 -Last updated 2019-05-29 22:22:59 +Last updated 2019-05-29 22:26:12
    diff --git a/doc/modules/utils.task.html b/doc/modules/utils.task.html index 290c641b..cc0fe691 100644 --- a/doc/modules/utils.task.html +++ b/doc/modules/utils.task.html @@ -56,7 +56,7 @@
  • config.warnings
  • control
  • Commands
    • -
  • Public
    • +
  • Common
  • expcore.gui
  • expcore.gui.buttons
  • expcore.gui.center
    • @@ -188,7 +188,7 @@
    generated by LDoc 1.4.3 -Last updated 2019-05-29 22:22:59 +Last updated 2019-05-29 22:26:12
    diff --git a/doc/modules/utils.timestamp.html b/doc/modules/utils.timestamp.html index 7a3c12d3..84b2893a 100644 --- a/doc/modules/utils.timestamp.html +++ b/doc/modules/utils.timestamp.html @@ -56,7 +56,7 @@
  • config.warnings
  • control
  • Commands
    • -
  • Public
    • +
  • Common
  • expcore.gui
  • expcore.gui.buttons
  • expcore.gui.center
    • @@ -210,7 +210,7 @@
    generated by LDoc 1.4.3 -Last updated 2019-05-29 22:22:59 +Last updated 2019-05-29 22:26:12
    diff --git a/expcore/common.lua b/expcore/common.lua index 674793e3..b640a9ca 100644 --- a/expcore/common.lua +++ b/expcore/common.lua @@ -1,40 +1,40 @@ --- Adds some commonly used functions used in many modules -- @author cooldude2606 --- @module Public +-- @module Common --[[ >>>>Functions List (see function for more detail): - Public.type_check(value,test_type) --- Compare types faster for faster validation of prams - Public.type_check_error(value,test_type,error_message,level) --- Raises an error if the value is of the incorrect type - Public.param_check(value,test_type,param_name,param_number) --- Raises an error when the value is the incorrect type, uses a consistent error message format + Common.type_check(value,test_type) --- Compare types faster for faster validation of prams + Common.type_check_error(value,test_type,error_message,level) --- Raises an error if the value is of the incorrect type + Common.param_check(value,test_type,param_name,param_number) --- Raises an error when the value is the incorrect type, uses a consistent error message format - Public.player_return(value,colour,player) --- Will return a value of any type to the player/server console, allows colour for in-game players - Public.write_json(path,tbl) --- Writes a table object to a file in json format + Common.player_return(value,colour,player) --- Will return a value of any type to the player/server console, allows colour for in-game players + Common.write_json(path,tbl) --- Writes a table object to a file in json format - Public.opt_require(path) --- Calls a require that will not error if the file is not found - Public.ext_require(path,...) --- Calls a require and returns only the keys given, file must return a table + Common.opt_require(path) --- Calls a require that will not error if the file is not found + Common.ext_require(path,...) --- Calls a require and returns only the keys given, file must return a table - Public.format_time(ticks,options) --- Formats tick into a clean format, denominations from highest to lowest + Common.format_time(ticks,options) --- Formats tick into a clean format, denominations from highest to lowest - Public.move_items(items,surface,position,radius,chest_type) --- Moves items to the position and stores them in the closest entity of the type given + Common.move_items(items,surface,position,radius,chest_type) --- Moves items to the position and stores them in the closest entity of the type given - Public.print_grid_value(value, surface, position, scale, offset, immutable) --- Prints a colored value on a location. - Public.print_colored_grid_value(value, surface, position, offset, immutable, + Common.print_grid_value(value, surface, position, scale, offset, immutable) --- Prints a colored value on a location. + Common.print_colored_grid_value(value, surface, position, offset, immutable, color_value, base_color, delta_color, under_bound, over_bound) --- Prints a colored value on a location. with extra settings. - Public.clear_flying_text(surface) --- Clears all flying text entites on a surface + Common.clear_flying_text(surface) --- Clears all flying text entites on a surface - Public.string_contains(s, contains) --- Tests if a string contains a given substring. + Common.string_contains(s, contains) --- Tests if a string contains a given substring. - Public.extract_keys(tbl,...) --- Extracts certain keys from a table - Public.enum(tbl) --- Converts a table to an enum - Public.auto_complete(options,input,use_key,rtn_key) --- Returns the closest match to the input - Public.table_keys(tbl) --- Returns all the keys of a table - Public.table_values(tbl) --- Returns all the values of a table - Public.table_alphanumsort(tbl) --- Returns the list is a sorted way that would be expected by people (this is by key) - Public.table_keysort(tbl) --- Returns the list is a sorted way that would be expected by people (this is by key) (faster alterative than above) + Common.extract_keys(tbl,...) --- Extracts certain keys from a table + Common.enum(tbl) --- Converts a table to an enum + Common.auto_complete(options,input,use_key,rtn_key) --- Returns the closest match to the input + Common.table_keys(tbl) --- Returns all the keys of a table + Common.table_values(tbl) --- Returns all the values of a table + Common.table_alphanumsort(tbl) --- Returns the list is a sorted way that would be expected by people (this is by key) + Common.table_keysort(tbl) --- Returns the list is a sorted way that would be expected by people (this is by key) (faster alterative than above) - Public.format_chat_colour(message,color) --- Returns a message with valid chat tags to change its colour - Public.format_chat_colour_localized(message,color) --- Returns a message with valid chat tags to change its colour, using localization - Public.format_chat_player_name(player,raw_string) --- Returns the players name in the players color + Common.format_chat_colour(message,color) --- Returns a message with valid chat tags to change its colour + Common.format_chat_colour_localized(message,color) --- Returns a message with valid chat tags to change its colour, using localization + Common.format_chat_player_name(player,raw_string) --- Returns the players name in the players color ]] local Colours = require 'resources.color_presets' @@ -43,7 +43,7 @@ local Util = require 'util' require 'utils.table' require 'utils.math' -local Public = {} +local Common = {} --- Compare types faster for faster validation of params -- @usage type_check('foo','string') -- return true @@ -51,7 +51,7 @@ local Public = {} -- @tparam any value the value to be tested -- @tparam[opt=nil] string test_type the type to test for if not given then it tests for nil -- @treturn boolean is v of type test_type -function Public.type_check(value,test_type) +function Common.type_check(value,test_type) return test_type and value and type(value) == test_type or not test_type and not value or false end @@ -62,9 +62,9 @@ end -- @tparam string error_message the error message that is returned -- @tparam number level the level to call the error on (level = 1 means the caller) -- @treturn boolean true if no error was called -function Public.type_check_error(value,test_type,error_message,level) +function Common.type_check_error(value,test_type,error_message,level) level = level and level+1 or 2 - return Public.test_type(value,test_type) or error(error_message,level) + return Common.test_type(value,test_type) or error(error_message,level) end --- Raises an error when the value is the incorrect type, uses a consistent error message format @@ -74,8 +74,8 @@ end -- @tparam string param_name the name of the param -- @tparam number param_number the number param it is -- @treturn boolean true if no error was raised -function Public.param_check(value,test_type,param_name,param_number) - if not Public.test_type(value,test_type) then +function Common.param_check(value,test_type,param_name,param_number) + if not Common.test_type(value,test_type) then local function_name = debug.getinfo(2,'n').name or '' local error_message = string.format('Invalid param #%2d given to %s; %s is not of type %s',param_number,function_name,param_name,test_type) return error(error_message,3) @@ -90,16 +90,16 @@ end -- @param value any value of any type that will be returned to the player or console -- @tparam[opt=defines.colour.white] ?defines.color|string colour the colour of the text for the player, ignored when printing to console -- @tparam[opt=game.player] LuaPlayer player the player that return will go to, if no game.player then returns to server -function Public.player_return(value,colour,player) - colour = Public.type_check(colour,'table') and colour or Colours[colour] ~= Colours.white and Colours[colour] or Colours.white +function Common.player_return(value,colour,player) + colour = Common.type_check(colour,'table') and colour or Colours[colour] ~= Colours.white and Colours[colour] or Colours.white player = player or game.player -- converts the value to a string local returnAsString - if Public.type_check(value,'table') or type(value) == 'userdata' then - if Public.type_check(value.__self,'userdata') or type(value) == 'userdata' then + if Common.type_check(value,'table') or type(value) == 'userdata' then + if Common.type_check(value.__self,'userdata') or type(value) == 'userdata' then -- value is userdata returnAsString = 'Cant Display Userdata' - elseif Public.type_check(value[1],'string') and string.find(value[1],'.+[.].+') and not string.find(value[1],'%s') then + elseif Common.type_check(value[1],'string') and string.find(value[1],'.+[.].+') and not string.find(value[1],'%s') then -- value is a locale string returnAsString = value elseif getmetatable(value) ~= nil and not tostring(value):find('table: 0x') then @@ -109,7 +109,7 @@ function Public.player_return(value,colour,player) -- value is a table returnAsString = table.inspect(value,{depth=5,indent=' ',newline='\n'}) end - elseif Public.type_check(value,'function') then + elseif Common.type_check(value,'function') then -- value is a function returnAsString = 'Cant Display Functions' else returnAsString = tostring(value) end @@ -127,7 +127,7 @@ end --- Writes a table object to a file in json format -- @tparam string path the path of the file to write include / to use dir -- @tparam table tbl the table that will be converted to a json string and wrote to file -function Public.write_json(path,tbl) +function Common.write_json(path,tbl) game.write_file(path,game.table_to_json(tbl)..'\n',true,0) end @@ -135,7 +135,7 @@ end -- @usage local file = opt_require('file.not.present') -- will not cause any error -- @tparam string path the path that you want to require -- @return the returns from that file or nil, error if not loaded -function Public.opt_require(path) +function Common.opt_require(path) local success, rtn = pcall(require,path) if success then return rtn else return nil,rtn end @@ -146,12 +146,12 @@ end -- @tparam string path the path that you want to require -- @tparam string ... the name of the keys that you want returned -- @return the keys in the order given -function Public.ext_require(path,...) +function Common.ext_require(path,...) local rtn = require(path) if type(rtn) ~= 'table' then error('File did not return a table, can not extract keys.',2) end - return Public.extract_keys(rtn,...) + return Common.extract_keys(rtn,...) end --- Formats tick into a clean format, denominations from highest to lowest @@ -162,7 +162,7 @@ end -- @tparam number ticks the number of ticks that represents a time -- @tparam table options table a of options to use for the format -- @treturn string a locale string that can be used -function Public.format_time(ticks,options) +function Common.format_time(ticks,options) -- Sets up the options options = options or { days=false, @@ -252,7 +252,7 @@ end -- @tparam[opt={0,0}] table position the position that the items will be moved to {x=100,y=100} -- @tparam[opt=32] number radius the radius in which the items are allowed to be placed -- @tparam[opt=iron-chest] string chest_type the chest type that the items should be moved into -function Public.move_items(items,surface,position,radius,chest_type) +function Common.move_items(items,surface,position,radius,chest_type) chest_type = chest_type or 'iron-chest' surface = surface or game.surfaces[1] if position and type(position) ~= 'table' then return end @@ -306,7 +306,7 @@ end @param offset float @param immutable bool if immutable, only set, never do a surface lookup, values never change ]] -function Public.print_grid_value(value, surface, position, scale, offset, immutable) +function Common.print_grid_value(value, surface, position, scale, offset, immutable) local is_string = type(value) == 'string' local color = Colours.white local text = value @@ -381,7 +381,7 @@ end @param under_bound {r,g,b} The color to be used if color_value < 0 @param over_bound {r,g,b} The color to be used if color_value > 1 ]] -function Public.print_colored_grid_value(value, surface, position, offset, immutable, +function Common.print_colored_grid_value(value, surface, position, offset, immutable, color_value, base_color, delta_color, under_bound, over_bound) local is_string = type(value) == 'string' -- default values: @@ -440,7 +440,7 @@ end --- Clears all flying text entites on a surface -- @tparam LuaSurface surface the surface to clear -function Public.clear_flying_text(surface) +function Common.clear_flying_text(surface) local entities = surface.find_entities_filtered{name ='flying-text'} for _,entity in pairs(entities) do if entity and entity.valid then @@ -453,7 +453,7 @@ end -- @tparam string s the string to check for the substring -- @tparam string contains the substring to test for -- @treturn boolean true if the substring was found in the string -function Public.string_contains(s, contains) +function Common.string_contains(s, contains) return s and string.find(s, contains) ~= nil end @@ -462,7 +462,7 @@ end -- @tparam table tbl table the which contains the keys -- @tparam string ... the names of the keys you want extracted -- @return the keys in the order given -function Public.extract_keys(tbl,...) +function Common.extract_keys(tbl,...) local values = {} for _,key in pairs({...}) do table.insert(values,tbl[key]) @@ -473,7 +473,7 @@ end --- Converts a table to an enum -- @tparam table tbl table the that will be converted -- @treturn table the new table that acts like an enum -function Public.enum(tbl) +function Common.enum(tbl) local rtn = {} for k,v in pairs(tbl) do if type(k) ~= 'number' then @@ -497,13 +497,13 @@ end -- @tparam[opt=false] boolean use_key when true the keys of options will be used as the options -- @tparam[opt=false] boolean rtn_key when true the the key will be returned rather than the value -- @return the list item found that matches the input -function Public.auto_complete(options,input,use_key,rtn_key) +function Common.auto_complete(options,input,use_key,rtn_key) local rtn = {} if type(input) ~= 'string' then return end input = input:lower() for key,value in pairs(options) do local check = use_key and key or value - if Public.string_contains(string.lower(check),input) then + if Common.string_contains(string.lower(check),input) then local result = rtn_key and key or value table.insert(rtn,result) end @@ -514,7 +514,7 @@ end --- Returns all the keys of a table -- @tparam table tbl table the to get the keys of -- @treturn table an array of the table keys -function Public.table_keys(tbl) +function Common.table_keys(tbl) local rtn = {} for key,_ in pairs(tbl) do table.insert(rtn,key) @@ -525,7 +525,7 @@ end --- Returns all the values of a table -- @tparam table tbl table the to get the values of -- @treturn table an array of the table values -function Public.table_values(tbl) +function Common.table_values(tbl) local rtn = {} for _,value in pairs(tbl) do table.insert(rtn,value) @@ -536,8 +536,8 @@ end --- Returns the list is a sorted way that would be expected by people (this is by key) -- @tparam table tbl the table to be sorted -- @treturn table the sorted table -function Public.table_alphanumsort(tbl) - local o = Public.table_keys(tbl) +function Common.table_alphanumsort(tbl) + local o = Common.table_keys(tbl) local function padnum(d) local dec, n = string.match(d, "(%.?)0*(.+)") return #dec > 0 and ("%.12f"):format(d) or ("%s%03d%s"):format(dec, #n, n) end table.sort(o, function(a,b) @@ -551,8 +551,8 @@ end --- Returns the list is a sorted way that would be expected by people (this is by key) (faster alterative than above) -- @tparam table tbl the table to be sorted -- @treturn table the sorted table -function Public.table_keysort(tbl) - local o = Public.table_keys(tbl,true) +function Common.table_keysort(tbl) + local o = Common.table_keys(tbl,true) local _tbl = {} for _,k in pairs(o) do _tbl[k] = tbl[k] end return _tbl @@ -562,7 +562,7 @@ end -- @tparam string message the message that will be in the output -- @tparam table color a color which contains r,g,b as its keys -- @treturn string the message with the color tags included -function Public.format_chat_colour(message,color) +function Common.format_chat_colour(message,color) color = color or Colours.white local color_tag = '[color='..math.round(color.r,3)..','..math.round(color.g,3)..','..math.round(color.b,3)..']' return string.format('%s%s[/color]',color_tag,message) @@ -572,7 +572,7 @@ end -- @tparam ?string|table message the message that will be in the output -- @tparam table color a color which contains r,g,b as its keys -- @treturn table the message with the color tags included -function Public.format_chat_colour_localized(message,color) +function Common.format_chat_colour_localized(message,color) color = color or Colours.white color = math.round(color.r,3)..','..math.round(color.g,3)..','..math.round(color.b,3) return {'color-tag',color,message} @@ -582,15 +582,15 @@ end -- @tparam LuaPlayer player the player to use the name and color of -- @tparam[opt=false] boolean raw_string when true a is returned rather than a localized string -- @treturn table the players name with tags for the players color -function Public.format_chat_player_name(player,raw_string) +function Common.format_chat_player_name(player,raw_string) player = Game.get_player_from_any(player) local player_name = player and player.name or '' local player_chat_colour = player and player.chat_color or Colours.white if raw_string then - return Public.format_chat_colour(player_name,player_chat_colour) + return Common.format_chat_colour(player_name,player_chat_colour) else - return Public.format_chat_colour_localized(player_name,player_chat_colour) + return Common.format_chat_colour_localized(player_name,player_chat_colour) end end -return Public \ No newline at end of file +return Common \ No newline at end of file