From 9e4b734eb8a4f1e8db1fe449e5b0de94d63ff1df Mon Sep 17 00:00:00 2001 From: Jeremy Smitherman Date: Wed, 26 Dec 2018 12:40:17 -0600 Subject: [PATCH] renamed lib to hoggit, added more options to .gitignore, added Hoggit module bootstrap for dev and prod mode --- .gitignore | 2 ++ hoggit.lua | 20 ++++++++++++++------ {lib => hoggit}/communication.lua | 0 {lib => hoggit}/error_handling.lua | 3 ++- {lib => hoggit}/group.lua | 0 {lib => hoggit}/logging.lua | 0 {lib => hoggit}/spawner.lua | 0 {lib => hoggit}/utils.lua | 0 squishy | 12 ++++++------ 9 files changed, 24 insertions(+), 13 deletions(-) create mode 100644 .gitignore rename {lib => hoggit}/communication.lua (100%) rename {lib => hoggit}/error_handling.lua (98%) rename {lib => hoggit}/group.lua (100%) rename {lib => hoggit}/logging.lua (100%) rename {lib => hoggit}/spawner.lua (100%) rename {lib => hoggit}/utils.lua (100%) diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..67903c9 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +dist/* +.idea diff --git a/hoggit.lua b/hoggit.lua index 63cda70..b52a1d0 100644 --- a/hoggit.lua +++ b/hoggit.lua @@ -1,6 +1,14 @@ -dofile(HOGGIT.script_base..[[\HOGGIT\lib\error_handling.lua]]) -dofile(HOGGIT.script_base..[[\HOGGIT\lib\logging.lua]]) -dofile(HOGGIT.script_base..[[\HOGGIT\lib\utils.lua]]) -dofile(HOGGIT.script_base..[[\HOGGIT\lib\spawner.lua]]) -dofile(HOGGIT.script_base..[[\HOGGIT\lib\communication.lua]]) -dofile(HOGGIT.script_base..[[\HOGGIT\lib\group.lua]]) +-- Development mode. This module is defined and configured with a base config +-- in the game install Scripts folder in development mode. +if HOGGIT and HOGGIT.script_base then + dofile(HOGGIT.script_base..[[\HOGGIT\lib\error_handling.lua]]) + dofile(HOGGIT.script_base..[[\HOGGIT\lib\logging.lua]]) + dofile(HOGGIT.script_base..[[\HOGGIT\lib\utils.lua]]) + dofile(HOGGIT.script_base..[[\HOGGIT\lib\spawner.lua]]) + dofile(HOGGIT.script_base..[[\HOGGIT\lib\communication.lua]]) + dofile(HOGGIT.script_base..[[\HOGGIT\lib\group.lua]]) +else + -- The dist version of this framework starts with this file in the minification, so we need to define the top + -- level module right here. + HOGGIT = {} +end \ No newline at end of file diff --git a/lib/communication.lua b/hoggit/communication.lua similarity index 100% rename from lib/communication.lua rename to hoggit/communication.lua diff --git a/lib/error_handling.lua b/hoggit/error_handling.lua similarity index 98% rename from lib/error_handling.lua rename to hoggit/error_handling.lua index 07504fd..8df803c 100644 --- a/lib/error_handling.lua +++ b/hoggit/error_handling.lua @@ -12,4 +12,5 @@ try = function(func, catch) end return r end -end \ No newline at end of file +end + diff --git a/lib/group.lua b/hoggit/group.lua similarity index 100% rename from lib/group.lua rename to hoggit/group.lua diff --git a/lib/logging.lua b/hoggit/logging.lua similarity index 100% rename from lib/logging.lua rename to hoggit/logging.lua diff --git a/lib/spawner.lua b/hoggit/spawner.lua similarity index 100% rename from lib/spawner.lua rename to hoggit/spawner.lua diff --git a/lib/utils.lua b/hoggit/utils.lua similarity index 100% rename from lib/utils.lua rename to hoggit/utils.lua diff --git a/squishy b/squishy index 355d4c4..9ac1af5 100644 --- a/squishy +++ b/squishy @@ -1,8 +1,8 @@ Output "dist/hoggit_framework.lua" -Main "lib/error_handling.lua" -Main "lib/logging.lua" -Main "lib/utils.lua" -Main "lib/spawner.lua" -Main "lib/communication.lua" -Main "lib/group.lua" \ No newline at end of file +Main "hoggit/error_handling.lua" +Main "hoggit/logging.lua" +Main "hoggit/utils.lua" +Main "hoggit/spawner.lua" +Main "hoggit/communication.lua" +Main "hoggit/group.lua" \ No newline at end of file