Merge branch 'master' into PiConstants

.editorconfig

@@ -0,0 +1,103 @@
+# https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/master/.editorconfig
+
+root = true
+
+[*.{csproj,props,targets}]
+indent_style = space
+indent_size = 2
+
+[*.yml]
+indent_style = space
+indent_size = 2
+
+[*.cs]
+charset = utf-8-bom
+insert_final_newline = true
+indent_style = space
+indent_size = 4
+
+# Sort using and Import directives with System.* appearing first
+dotnet_sort_system_directives_first = true
+dotnet_separate_import_directive_groups = false
+csharp_using_directive_placement = inside_namespace:none
+
+# Always use "this." and "Me." when applicable; let StyleCop Analyzers provide the warning and fix
+dotnet_style_qualification_for_field = true:none
+dotnet_style_qualification_for_property = true:none
+dotnet_style_qualification_for_method = true:none
+dotnet_style_qualification_for_event = true:none
+
+# Use language keywords where applicable; let StyleCop Analyzers provide the warning and fix
+dotnet_style_predefined_type_for_locals_parameters_members = true:none
+dotnet_style_predefined_type_for_member_access = true:none
+
+# Suggest more modern language features when available
+dotnet_style_object_initializer = true:none
+dotnet_style_collection_initializer = true:none
+dotnet_style_coalesce_expression = true:suggestion
+dotnet_style_null_propagation = true:suggestion
+dotnet_style_explicit_tuple_names = true:suggestion
+
+# New line preferences
+csharp_new_line_before_open_brace = all
+csharp_new_line_before_else = true
+csharp_new_line_before_catch = true
+csharp_new_line_before_finally = true
+csharp_new_line_before_members_in_object_initializers = true
+csharp_new_line_before_members_in_anonymous_types = true
+csharp_new_line_between_query_expression_clauses = true
+
+# Indentation preferences
+csharp_indent_block_contents = true
+csharp_indent_braces = false
+csharp_indent_case_contents = true
+csharp_indent_switch_labels = false
+csharp_indent_labels = flush_left
+
+# Space preferences
+csharp_space_after_cast = false
+csharp_space_after_colon_in_inheritance_clause = true
+csharp_space_after_comma = true
+csharp_space_after_dot = false
+csharp_space_after_keywords_in_control_flow_statements = true
+csharp_space_after_semicolon_in_for_statement = true
+csharp_space_around_binary_operators = before_and_after
+csharp_space_around_declaration_statements = do_not_ignore
+csharp_space_before_colon_in_inheritance_clause = true
+csharp_space_before_comma = false
+csharp_space_before_dot = false
+csharp_space_before_open_square_brackets = false
+csharp_space_before_semicolon_in_for_statement = false
+csharp_space_between_empty_square_brackets = false
+csharp_space_between_method_call_empty_parameter_list_parentheses = false
+csharp_space_between_method_call_name_and_opening_parenthesis = false
+csharp_space_between_method_call_parameter_list_parentheses = false
+csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
+csharp_space_between_method_declaration_name_and_open_parenthesis = false
+csharp_space_between_method_declaration_parameter_list_parentheses = false
+csharp_space_between_parentheses = false
+csharp_space_between_square_brackets = false
+
+# Prefer "var" only where type is obvious; disable diagnostics since no firm policy is in place yet
+csharp_style_var_for_built_in_types = false:none
+csharp_style_var_when_type_is_apparent = true:none
+csharp_style_var_elsewhere = false:none
+
+# Prefer method-like constructs to have a block body
+csharp_style_expression_bodied_methods = false:none
+csharp_style_expression_bodied_constructors = false:none
+csharp_style_expression_bodied_operators = false:none
+
+# Prefer property-like constructs to have an expression-body
+csharp_style_expression_bodied_properties = true:none
+csharp_style_expression_bodied_indexers = true:none
+csharp_style_expression_bodied_accessors = true:none
+
+# Suggest more modern language features when available
+csharp_style_pattern_matching_over_is_with_cast_check = true:suggestion
+csharp_style_pattern_matching_over_as_with_null_check = true:suggestion
+csharp_style_inlined_variable_declaration = true:none
+csharp_style_throw_expression = true:none
+csharp_style_conditional_delegate_call = true:suggestion
+
+csharp_prefer_braces = false

.github/workflows/compile.yml

@@ -1,6 +1,6 @@
 name: Compile
 
-on: push
+on: [push, pull_request]
 
 jobs:
   build:
@@ -9,10 +9,10 @@ jobs:
 
     steps:
     - name: setup-msbuild
-      uses: microsoft/setup-msbuild@v1.1
+      uses: microsoft/setup-msbuild@v2
     - name: Enable Developer Command Prompt
-      uses: ilammy/msvc-dev-cmd@v1.10.0
-    - uses: actions/checkout@v3
+      uses: ilammy/msvc-dev-cmd@v1.13.0
+    - uses: actions/checkout@v4
 
     - name: Setup
       run: git submodule update --init --recursive
@@ -65,13 +65,13 @@ jobs:
         cp ../TwitchChatVotingProxy/bin/x64/Release/net6.0-windows/win-x64/publish/TwitchChatVotingProxy.pdb
 
     - name: Upload :)
-      uses: actions/upload-artifact@v1
+      uses: actions/upload-artifact@v4
       with:
         name: chaosmod
         path: dist
 
     - name: Upload symbols too
-      uses: actions/upload-artifact@v1
+      uses: actions/upload-artifact@v4
       with:
         name: symbols
         path: symbols

ChaosMod.sln

@@ -3,8 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.0.32014.148
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ChaosMod", "ChaosMod\ChaosMod.vcxproj", "{0D45DE2D-C8FC-4877-98F2-65EC8B7F9477}"
-EndProject
 Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Shared", "Shared\Shared.shproj", "{E8C71724-789E-46CF-82B9-8A9C0D964E91}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConfigApp", "ConfigApp\ConfigApp.csproj", "{6C0F4E58-1BD1-4E16-AF5F-D743A93C8F9C}"

ChaosMod/.clang-format

@@ -70,6 +70,7 @@ PenaltyReturnTypeOnItsOwnLine: 60
 PenaltyIndentedWhitespace: 0
 PointerAlignment: Right
 ReflowComments:  true
+RemoveBracesLLVM: true
 SortIncludes:    true
 SortUsingDeclarations: true
 SpaceAfterCStyleCast: false

ChaosMod/.clangd

@@ -0,0 +1,3 @@
+CompileFlags:
+  Add: -Wno-unknown-warning-option
+  Remove: [-m*, -f*]

ChaosMod/CMakeLists.txt

@@ -1,46 +1,45 @@
-cmake_minimum_required(VERSION 3.13)
-
+cmake_minimum_required(VERSION 3.31)
 project(ChaosMod)
 
-add_subdirectory(${PROJECT_SOURCE_DIR}/../vendor/shv shv)
-add_subdirectory(${PROJECT_SOURCE_DIR}/../vendor/minhook minhook)
-if (WITH_DEBUG_PANEL_SUPPORT)
-    set(USE_ZLIB OFF CACHE BOOL "Enable zlib support")
-    add_subdirectory(${PROJECT_SOURCE_DIR}/../vendor/IXWebSocket ixwebsocket)
-endif ()
-
 file(GLOB ROOT_SRC ${PROJECT_SOURCE_DIR}/*.cpp)
 file(GLOB_RECURSE SRC ${PROJECT_SOURCE_DIR}/Components/*.cpp ${PROJECT_SOURCE_DIR}/Effects/*.cpp
     ${PROJECT_SOURCE_DIR}/Memory/*.cpp ${PROJECT_SOURCE_DIR}/Util/*.cpp)
 file(GLOB PATTERNS_SRC ${PROJECT_SOURCE_DIR}/../vendor/Patterns/Patterns.cpp)
 add_library(ChaosMod MODULE ${ROOT_SRC} ${SRC} ${PATTERNS_SRC} ChaosMod.rc)
 
-set_property(TARGET ChaosMod PROPERTY CXX_STANDARD 20)
-
-if (WITH_DEBUG_PANEL_SUPPORT)
-    target_compile_definitions(ChaosMod PRIVATE WITH_DEBUG_PANEL_SUPPORT)
-endif ()
+target_precompile_headers(ChaosMod PUBLIC stdafx.cpp)
 
-if (CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
-    target_compile_options(ChaosMod PRIVATE -DUNICODE -D_UNICODE -DNOMINMAX /Zi)
-    target_link_options(ChaosMod PRIVATE /DEBUG /OPT:REF /OPT:ICF)
-else()
-    target_compile_options(ChaosMod PRIVATE -municode -fpermissive)
-    target_link_options(ChaosMod PRIVATE -static)
-endif()
+set_target_properties(ChaosMod PROPERTIES SUFFIX ".asi")
+set_target_properties(ChaosMod PROPERTIES CXX_STANDARD 20)
+set_target_properties(ChaosMod PROPERTIES CXX_SCAN_FOR_MODULES OFF)
 
-target_include_directories(ChaosMod PRIVATE ${PROJECT_SOURCE_DIR} ${PROJECT_SOURCE_DIR}/../vendor ${PROJECT_SOURCE_DIR}/../vendor/websocketpp)
+target_compile_definitions(ChaosMod PUBLIC $<$<CONFIG:Debug>:CHAOSDEBUG>)
+target_compile_definitions(ChaosMod PUBLIC NDEBUG)
+target_compile_definitions(ChaosMod PUBLIC WIN32_LEAN_AND_MEAN)
 
+set(include_dirs ${PROJECT_SOURCE_DIR} ${PROJECT_SOURCE_DIR}/../vendor ${PROJECT_SOURCE_DIR}/../vendor/lua/include)
 set(link_libs shv minhook lua54 winmm d3dcompiler xinput)
 
+add_subdirectory(${PROJECT_SOURCE_DIR}/../vendor/shv shv)
+add_subdirectory(${PROJECT_SOURCE_DIR}/../vendor/minhook minhook)
 if (WITH_DEBUG_PANEL_SUPPORT)
-    set(link_libs ${link_libs} ixwebsocket wsock32 ws2_32)
-endif ()
+    set(include_dirs ${include_dirs} ${PROJECT_SOURCE_DIR}/../vendor/IXWebSocket)
+    set(link_libs ${link_libs} wsock32 ws2_32 ixwebsocket)
+
+    target_compile_definitions(ChaosMod PUBLIC WITH_DEBUG_PANEL_SUPPORT)
 
-target_link_directories(ChaosMod PRIVATE ${PROJECT_SOURCE_DIR}/../vendor/lua)
-target_link_libraries(ChaosMod PRIVATE ${link_libs})
+    set(USE_ZLIB OFF CACHE BOOL "Enable zlib support")
+    add_subdirectory(${PROJECT_SOURCE_DIR}/../vendor/IXWebSocket ixwebsocket)
+endif ()
 
-target_precompile_headers(ChaosMod PRIVATE stdafx.cpp)
+target_include_directories(ChaosMod PUBLIC ${include_dirs})
+target_link_directories(ChaosMod PUBLIC ${PROJECT_SOURCE_DIR}/../vendor/lua)
+target_link_libraries(ChaosMod PUBLIC ${link_libs})
 
-target_compile_definitions(ChaosMod PRIVATE $<$<CONFIG:Debug>:_DEBUG>)
-set_target_properties(ChaosMod PROPERTIES SUFFIX ".asi")
+if (CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
+    target_compile_options(ChaosMod PUBLIC /Zi /GT /W2 /WX -DUNICODE -D_UNICODE -DNOMINMAX -D_CRT_SECURE_NO_WARNINGS)
+    target_link_options(ChaosMod PUBLIC /DEBUG /OPT:REF /OPT:ICF)
+else()
+    target_compile_options(ChaosMod PUBLIC -municode -flarge-source-files -Werror -Wall -Wextra -Wno-unused-parameter -Wno-missing-field-initializers -Wno-unused-variable -Wno-maybe-uninitialized -Wno-array-bounds -Wno-unused-but-set-variable)
+    target_link_options(ChaosMod PUBLIC -static)
+endif()

ChaosMod/ChaosMod.rc

@@ -20,15 +20,30 @@ END
 
 FX_ASI_BUILD 2699
 BEGIN
-"\0"
+	"\0"
 END
 
 FX_ASI_BUILD 2802
 BEGIN
-"\0"
+	"\0"
 END
 
 FX_ASI_BUILD 2944
 BEGIN
-"\0"
+	"\0"
+END
+
+FX_ASI_BUILD 3095
+BEGIN
+	"\0"
+END
+
+FX_ASI_BUILD 3258
+BEGIN
+	"\0"
+END
+
+FX_ASI_BUILD 3407
+BEGIN
+	"\0"
 END