Update tooling, add loadorder

DartRuffian · DartRuffian · commit a0facce8d664 · 2026-06-12T10:19:56.000-05:00
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
@@ -25,4 +25,4 @@ jobs:
     - name: Setup HEMTT
       uses: arma-actions/hemtt@v1
     - name: Run HEMTT check
-      run: hemtt check -e --pedantic
+      run: hemtt check --error-on-all --pedantic
diff --git a/.gitignore b/.gitignore
@@ -1,17 +1,33 @@
 # HEMTT
+hemtt/
 hemtt.exe
 .hemtt/missions/~*
 .hemttout/
 releases/
 
+# Arma
+ArmaScriptCompiler.exe
+*.pbo
+*.sqfc
+
 # Textures
-Exports/
 *.spp
 *.spp.painter_lock
 *.psd
 
-# Other
+# Tools
+__pycache__
+tools/output
+.idea
+.venv
+
+# Keys
+.hemttprivatekey
 *.biprivatekey
+
+# Compressed Files
 *.zip
-*.pbo
-*.sqfc
+*.rar
+*.7z
+*.tar
+*.tar.gz
diff --git a/.hemtt/project.toml b/.hemtt/project.toml
@@ -20,5 +20,8 @@ include = [
 ]
 exclude = []
 
+[hemtt.release]
+archive = false
+
 [properties]
 author = "DartRuffian"
diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@
 <h1 align="center">MOD_TITLE</h1>
 <p align="center">
     <a href="https://github.com/DartsArmaMods/MOD_REPO/releases/latest">
-        <img src="https://img.shields.io/badge/Version-0.0.0-blue?style=flat-square" alt="MOD_TITLE Version">
+        <img src="https://img.shields.io/badge/Version-1.6.0-blue?style=flat-square" alt="MOD_TITLE Version">
     </a>
     <a href="https://github.com/DartsArmaMods/MOD_REPO/issues">
         <img src="https://img.shields.io/github/issues-raw/DartsArmaMods/MOD_REPO.svg?style=flat-square&label=Issues" alt="MOD_TITLE Issues">
diff --git a/addons/loadorder/$PBOPREFIX$ b/addons/loadorder/$PBOPREFIX$
@@ -0,0 +1 @@
+z\MOD_PREFIX\addons\loadorder
diff --git a/addons/loadorder/addons.hpp b/addons/loadorder/addons.hpp
diff --git a/addons/loadorder/config.cpp b/addons/loadorder/config.cpp
@@ -0,0 +1,16 @@
+#include "script_component.hpp"
+
+class CfgPatches {
+    class ADDON {
+        author = AUTHOR;
+        authors[] = {"DartRuffian"};
+        name = COMPONENT_NAME;
+        requiredVersion = REQUIRED_VERSION;
+        requiredAddons[] = {
+            #include "addons.hpp"
+        };
+        units[] = {};
+        weapons[] = {};
+        VERSION_CONFIG;
+    };
+};
diff --git a/addons/loadorder/script_component.hpp b/addons/loadorder/script_component.hpp
@@ -0,0 +1,9 @@
+#define COMPONENT loadorder
+#define COMPONENT_BEAUTIFIED Loadorder
+#include "\z\MOD_PREFIX\addons\main\script_mod.hpp"
+
+// #define DEBUG_MODE_FULL
+// #define DISABLE_COMPILE_CACHE
+// #define ENABLE_PERFORMANCE_COUNTERS
+
+#include "\z\MOD_PREFIX\addons\main\script_macros.hpp"
diff --git a/tools/build_current_addon.py b/tools/build_current_addon.py
@@ -0,0 +1,31 @@
+#!/usr/bin/env python3
+"""
+Author: DartRuffian
+Description:
+  Builds the addon of the given file path.
+"""
+
+import sys
+import os
+import logger
+
+
+def main() -> None:
+    try:
+        filepath = sys.argv[1]
+        if not (filepath.startswith("addons") or filepath.startswith("optionals")):
+            logger.log(logger.LogLevel.ERROR,
+                       f"Failed to build: {filepath} is not an addon path")
+
+        addon = filepath.split("\\")[1]
+        logger.log(logger.LogLevel.INFO, f"Building addon: {addon}")
+        os.system(f"hemtt ln sort")
+        os.system(f"hemtt build --just {addon} --just translations")
+    except KeyboardInterrupt:
+        # Echo "nothing" so the next message is on a new line
+        os.system("echo(")
+        logger.log(logger.LogLevel.INFO, "Canceling build")
+
+
+if __name__ == "__main__":
+    main()
diff --git a/tools/config_style_checker.py b/tools/config_style_checker.py
@@ -1,17 +1,25 @@
 #!/usr/bin/env python3
+"""
+Author: thojkooi
+Description:
+  Modified from https://github.com/acemod/ACE3/blob/master/tools/config_style_checker.py
+  Validates that cpp, hpp, rvmat, and cfg files match the style guide.
+"""
 
 import fnmatch
 import os
 import re
-import ntpath
 import sys
 import argparse
+import logger
+
 
 def check_config_style(filepath):
     bad_count_file = 0
+
     def pushClosing(t):
         closingStack.append(closing.expr)
-        closing << Literal( closingFor[t[0]] )
+        closing << Literal(closingFor[t[0]])
 
     def popClosing():
         closing << closingStack.pop()
@@ -42,7 +50,7 @@ def popClosing():
         # We ignore everything inside a string
         isInString = False
         # Used to store the starting type of a string, so we can match that to the end of a string
-        inStringType = '';
+        inStringType = ''
 
         lastIsCurlyBrace = False
         checkForSemiColumn = False
@@ -55,9 +63,10 @@ def popClosing():
         for c in content:
             if (lastIsCurlyBrace):
                 lastIsCurlyBrace = False
-            if c == '\n': # Keeping track of our line numbers
-                lineNumber += 1 # so we can print accurate line number information when we detect a possible error
-            if (isInString): # while we are in a string, we can ignore everything else, except the end of the string
+            if c == '\n':  # Keeping track of our line numbers
+                # so we can print accurate line number information when we detect a possible error
+                lineNumber += 1
+            if (isInString):  # while we are in a string, we can ignore everything else, except the end of the string
                 if (c == inStringType):
                     isInString = False
             # if we are not in a comment block, we will check if we are at the start of one or count the () {} and []
@@ -66,16 +75,18 @@ def popClosing():
                 # This means we have encountered a /, so we are now checking if this is an inline comment or a comment block
                 if (checkIfInComment):
                     checkIfInComment = False
-                    if c == '*': # if the next character after / is a *, we are at the start of a comment block
+                    if c == '*':  # if the next character after / is a *, we are at the start of a comment block
                         isInCommentBlock = True
-                    elif (c == '/'): # Otherwise, will check if we are in an line comment
-                        ignoreTillEndOfLine = True # and an line comment is a / followed by another / (//) We won't care about anything that comes after it
+                    elif (c == '/'):  # Otherwise, will check if we are in an line comment
+                        # and an line comment is a / followed by another / (//) We won't care about anything that comes after it
+                        ignoreTillEndOfLine = True
 
                 if (isInCommentBlock == False):
-                    if (ignoreTillEndOfLine): # we are in a line comment, just continue going through the characters until we find an end of line
+                    # we are in a line comment, just continue going through the characters until we find an end of line
+                    if (ignoreTillEndOfLine):
                         if (c == '\n'):
                             ignoreTillEndOfLine = False
-                    else: # validate brackets
+                    else:  # validate brackets
                         if (c == '"' or c == "'"):
                             isInString = True
                             inStringType = c
@@ -85,31 +96,39 @@ def popClosing():
                             brackets_list.append('(')
                         elif (c == ')'):
                             if (len(brackets_list) > 0 and brackets_list[-1] in ['{', '[']):
-                                print("ERROR: Possible missing round bracket ')' detected at {0} Line number: {1}".format(filepath,lineNumber))
+                                logger.log(
+                                    logger.LogLevel.ERROR, "Possible missing round bracket ')' detected at {0} Line number: {1}".format(
+                                        filepath, lineNumber))
                                 bad_count_file += 1
                             brackets_list.append(')')
                         elif (c == '['):
                             brackets_list.append('[')
                         elif (c == ']'):
                             if (len(brackets_list) > 0 and brackets_list[-1] in ['{', '(']):
-                                print("ERROR: Possible missing square bracket ']' detected at {0} Line number: {1}".format(filepath,lineNumber))
+                                logger.log(
+                                    logger.LogLevel.ERROR, "Possible missing square bracket ']' detected at {0} Line number: {1}".format(
+                                        filepath, lineNumber))
                                 bad_count_file += 1
                             brackets_list.append(']')
                         elif (c == '{'):
                             brackets_list.append('{')
                         elif (c == '}'):
                             lastIsCurlyBrace = True
                             if (len(brackets_list) > 0 and brackets_list[-1] in ['(', '[']):
-                                print("ERROR: Possible missing curly brace '}}' detected at {0} Line number: {1}".format(filepath,lineNumber))
+                                logger.log(
+                                    logger.LogLevel.ERROR, "Possible missing curly brace '}}' detected at {0} Line number: {1}".format(
+                                        filepath, lineNumber))
                                 bad_count_file += 1
                             brackets_list.append('}')
-                        elif (c== '\t'):
-                            print("ERROR: Tab detected at {0} Line number: {1}".format(filepath,lineNumber))
+                        elif (c == '\t'):
+                            logger.log(
+                                logger.LogLevel.ERROR, "Tab detected at {0} Line number: {1}".format(
+                                    filepath, lineNumber))
                             bad_count_file += 1
 
-            else: # Look for the end of our comment block
+            else:  # Look for the end of our comment block
                 if (c == '*'):
-                    checkIfNextIsClosingBlock = True;
+                    checkIfNextIsClosingBlock = True
                 elif (checkIfNextIsClosingBlock):
                     if (c == '/'):
                         isInCommentBlock = False
@@ -118,70 +137,73 @@ def popClosing():
             indexOfCharacter += 1
 
         if brackets_list.count('[') != brackets_list.count(']'):
-            print("ERROR: A possible missing square bracket [ or ] in file {0} [ = {1} ] = {2}".format(filepath,brackets_list.count('['),brackets_list.count(']')))
+            logger.log(logger.LogLevel.ERROR, f"A possible missing square bracket [ or ] in file {filepath} [ = {brackets_list.count('[')} ] = {brackets_list.count(']')}")
             bad_count_file += 1
         if brackets_list.count('(') != brackets_list.count(')'):
-            print("ERROR: A possible missing round bracket ( or ) in file {0} ( = {1} ) = {2}".format(filepath,brackets_list.count('('),brackets_list.count(')')))
+            logger.log(logger.LogLevel.ERROR, f"A possible missing square bracket ( or ) in file {filepath} [ = {brackets_list.count('(')} ] = {brackets_list.count(')')}")
             bad_count_file += 1
         if brackets_list.count('{') != brackets_list.count('}'):
-            print("ERROR: A possible missing curly brace {{ or }} in file {0} {{ = {1} }} = {2}".format(filepath,brackets_list.count('{'),brackets_list.count('}')))
+            logger.log("A possible missing curly brace {{ or }} in file {0} {{ = {1} }} = {2}".format(filepath,brackets_list.count('{'),brackets_list.count('}')))
             bad_count_file += 1
 
         file.seek(0)
         for lineNumber, line in enumerate(file.readlines()):
             if reIsClass.match(line):
                 if reBadColon.match(line):
-                    print(f"WARNING: bad class colon {filepath} Line number: {lineNumber+1}")
-                    # bad_count_file += 1
+                    logger.log(
+                        logger.LogLevel.WARN, f"Bad class colon {filepath} Line number: {lineNumber+1}")
+
+                    bad_count_file += 1
                 if reIsClassInherit.match(line):
                     if not reSpaceAfterColon.match(line):
-                        print(f"WARNING: bad class missing space after colon {filepath} Line number: {lineNumber+1}")
+                        logger.log(
+                            logger.LogLevel.WARN, f"Bad class missing space after colon {filepath} Line number: {lineNumber+1}")
                 if reIsClassBody.match(line):
                     if not reSpaceBeforeCurly.match(line):
-                        print(f"WARNING: bad class inherit missing space before curly braces {filepath} Line number: {lineNumber+1}")
+                        logger.log(
+                            logger.LogLevel.WARN, f"Bad class inherit missing space before curly braces {filepath} Line number: {lineNumber+1}")
                 if not reClassSingleLine.match(line):
-                    print(f"WARNING: bad class braces placement {filepath} Line number: {lineNumber+1}")
-                    # bad_count_file += 1
+                    logger.log(
+                        logger.LogLevel.WARN, f"Bad class braces placement {filepath} Line number: {lineNumber+1}")
+                    bad_count_file += 1
 
     return bad_count_file
 
-def main():
 
-    print("Validating Config Style")
+def main():
+    logger.log(logger.LogLevel.INFO, "Validating config style")
 
     sqf_list = []
     bad_count = 0
 
-    parser = argparse.ArgumentParser()
-    parser.add_argument('-m','--module', help='only search specified module addon folder', required=False, default="")
-    args = parser.parse_args()
-
     for folder in ['addons', 'optionals']:
         # Allow running from root directory as well as from inside the tools directory
         rootDir = "../" + folder
         if (os.path.exists(folder)):
             rootDir = folder
 
-        for root, dirnames, filenames in os.walk(rootDir + '/' + args.module):
-          for filename in fnmatch.filter(filenames, '*.cpp'):
-            sqf_list.append(os.path.join(root, filename))
-          for filename in fnmatch.filter(filenames, '*.hpp'):
-            sqf_list.append(os.path.join(root, filename))
-          for filename in fnmatch.filter(filenames, '*.rvmat'):
-            sqf_list.append(os.path.join(root, filename))
-          for filename in fnmatch.filter(filenames, '*.cfg'):
-            sqf_list.append(os.path.join(root, filename))
+        for root, dirnames, filenames in os.walk(rootDir):
+            for filename in fnmatch.filter(filenames, '*.cpp'):
+                sqf_list.append(os.path.join(root, filename))
+            for filename in fnmatch.filter(filenames, '*.hpp'):
+                sqf_list.append(os.path.join(root, filename))
+            for filename in fnmatch.filter(filenames, '*.rvmat'):
+                sqf_list.append(os.path.join(root, filename))
+            for filename in fnmatch.filter(filenames, '*.cfg'):
+                sqf_list.append(os.path.join(root, filename))
 
     for filename in sqf_list:
         bad_count = bad_count + check_config_style(filename)
 
-    print("------\nChecked {0} files\nErrors detected: {1}".format(len(sqf_list), bad_count))
+    logger.log(logger.LogLevel.INFO,
+               f"Checked {len(sqf_list)} files, errors detected: {bad_count}")
     if (bad_count == 0):
-        print("Config validation PASSED")
+        logger.log(logger.LogLevel.INFO, "Config validation PASSED")
     else:
-        print("Config validation FAILED")
+        logger.log(logger.LogLevel.ERROR, "Config validation FAILED")
 
     return bad_count
 
+
 if __name__ == "__main__":
     sys.exit(main())
diff --git a/tools/logger.py b/tools/logger.py
@@ -0,0 +1,19 @@
+#!/usr/bin/env python3
+"""
+Author: DartRuffian
+Description:
+  Handles writing log messages with colored text for different log levels
+"""
+
+from enum import Enum
+
+
+class LogLevel(Enum):
+    INFO = "[32m INFO"
+    WARN = "[33m WARN"
+    ERROR = "[31mERROR"
+
+
+def log(level: LogLevel, message: str) -> None:
+    """Logs a message to stdout with the given level"""
+    print(f"\033{level.value}\033[0m {message}")
diff --git a/tools/release.bat b/tools/release.bat
@@ -1,4 +1,5 @@
 @ECHO off
-hemtt script update_build.rhai
-hemtt script update_minor.rhai
-hemtt release
+@REM If running from tools, move to project folder
+if /i [%cd:~-5%]==[tools] cd ..
+
+python ./tools/release.py
diff --git a/tools/release.py b/tools/release.py
diff --git a/tools/release_patch.bat b/tools/release_patch.bat

Original file line number	Diff line number	Diff line change
`@@ -20,5 +20,8 @@ include = [`
`20`	`20`	`]`
`21`	`21`	`exclude = []`
`22`	`22`
	`23`	`+[hemtt.release]`
	`24`	`+archive = false`
	`25`	`+`
`23`	`26`	`[properties]`
`24`	`27`	`author = "DartRuffian"`