remove usage of xmldoc as a ptr

resolves a memory leak in BrickDatabase, adds stability to character save doc.

Tested that saving manually via force-save, logout and /crash all saved my position and my removed banana as expected.
The doc was always deleted on character destruction and on any updates, so this is just a semantic change (and now we no longer have new'd tinyxml2::documents on the heap)

.clang-format

@@ -1,37 +0,0 @@
----
-BraceWrapping: 
-  AfterCaseLabel: false
-  AfterClass: false
-  AfterControlStatement: false
-  AfterEnum: false
-  AfterFunction: false
-  AfterNamespace: false
-  AfterObjCDeclaration: false
-  AfterStruct: false
-  AfterUnion: false
-  AfterExternBlock: false
-  BeforeCatch: false
-  BeforeElse: false
-  IndentBraces: false
-  SplitEmptyFunction: false
-  SplitEmptyRecord: false
-  SplitEmptyNamespace: false
-  BeforeLambdaBody: false
-  BeforeWhile: false
-BreakBeforeBraces: Attach
-ColumnLimit: 0
-IndentWidth: 4
-IndentCaseLabels: true
-IncludeBlocks: Regroup
-IncludeCategories:
-  - Regex: '<[[:alnum:].]+\.h>'
-    Priority: 1
-  - Regex: '<[[:alnum:].]+>'
-    Priority: 2
-  - Regex: '.*/.*'
-    Priority: 3
-  - Regex: '.*'
-    Priority: 4
-DerivePointerAlignment: false
-PointerAlignment: Left
-...

.clang-tidy

@@ -1,17 +0,0 @@
-Checks: '-*,readability-*,performance-*,modernize-*,-modernize-use-trailing-return-type,bugprone-*'
-WarningsAsErrors: true
-HeaderFilterRegex: ''
-FormatStyle: none
-CheckOptions:
-  - key: readability-identifier-naming.ClassCase
-    value: CamelCase
-  - key: readability-identifier-naming.ClassMethodCase
-    value: CamelCase
-  - key: readability-identifier-naming.ClassMemberPrefix
-    value: m_
-  - key: readability-identifier-naming.ClassMemberCase
-    value: CamelCase
-  - key: readability-identifier-naming.ClassConstantCase
-    value: UPPER_CASE
-  - key: readability-identifier-naming.FunctionCase
-    value: CamelCase

.dockerignore

@@ -0,0 +1,10 @@
+.git
+Dockerfile
+*.md
+logo.png
+versions.txt
+docker-compose.yml
+.env
+docker/__pycache__
+.env.example
+build

.editorconfig

@@ -0,0 +1,76 @@
+# top-most EditorConfig file
+root=true
+
+# Unix-style newlines with a newline ending every file
+[*]
+indent_style=tab
+tab_width=4
+charset=utf-8
+trim_trailing_whitespace=true
+end_of_line=lf
+insert_final_newline=true
+
+[*.{c++,cc,cpp,cxx,h,h++,hh,hpp,hxx,inl,ipp,tlh,tli}]
+
+vc_generate_documentation_comments=doxygen_slash_star
+
+cpp_indent_braces=false
+cpp_alignment_tab_fill_style=use_spaces
+cpp_indent_multi_line_relative_to=innermost_parenthesis
+cpp_indent_within_parentheses=indent
+cpp_indent_preserve_within_parentheses=false
+cpp_indent_case_labels=false
+cpp_indent_case_contents=true
+cpp_indent_case_contents_when_block=false
+cpp_indent_lambda_braces_when_parameter=true
+cpp_indent_goto_labels=one_left
+cpp_indent_preprocessor=leftmost_column
+cpp_indent_access_specifiers=false
+cpp_indent_namespace_contents=true
+cpp_indent_preserve_comments=false
+cpp_new_line_before_open_brace_namespace=same_line
+cpp_new_line_before_open_brace_type=same_line
+cpp_new_line_before_open_brace_function=same_line
+cpp_new_line_before_open_brace_block=same_line
+cpp_new_line_before_open_brace_lambda=same_line
+cpp_new_line_scope_braces_on_separate_lines=false
+cpp_new_line_close_brace_same_line_empty_type=false
+cpp_new_line_close_brace_same_line_empty_function=false
+cpp_new_line_before_catch=false
+cpp_new_line_before_else=false
+cpp_new_line_before_while_in_do_while=false
+cpp_space_before_function_open_parenthesis=remove
+cpp_space_within_parameter_list_parentheses=false
+cpp_space_between_empty_parameter_list_parentheses=false
+cpp_space_after_keywords_in_control_flow_statements=true
+cpp_space_within_control_flow_statement_parentheses=false
+cpp_space_before_lambda_open_parenthesis=false
+cpp_space_within_cast_parentheses=false
+cpp_space_after_cast_close_parenthesis=false
+cpp_space_within_expression_parentheses=false
+cpp_space_before_block_open_brace=true
+cpp_space_between_empty_braces=false
+cpp_space_before_initializer_list_open_brace=false
+cpp_space_within_initializer_list_braces=true
+cpp_space_preserve_in_initializer_list=true
+cpp_space_before_open_square_bracket=false
+cpp_space_within_square_brackets=false
+cpp_space_before_empty_square_brackets=false
+cpp_space_between_empty_square_brackets=false
+cpp_space_group_square_brackets=true
+cpp_space_within_lambda_brackets=false
+cpp_space_between_empty_lambda_brackets=false
+cpp_space_before_comma=false
+cpp_space_after_comma=true
+cpp_space_remove_around_member_operators=true
+cpp_space_before_inheritance_colon=true
+cpp_space_before_constructor_colon=true
+cpp_space_remove_before_semicolon=true
+cpp_space_after_semicolon=false
+cpp_space_remove_around_unary_operator=true
+cpp_space_around_binary_operator=insert
+cpp_space_around_assignment_operator=insert
+cpp_space_pointer_reference_alignment=left
+cpp_space_around_ternary_operator=insert
+cpp_wrap_preserve_blocks=one_liners
+cpp_indent_comment=fasle

.env.example

@@ -0,0 +1,14 @@
+# Full path to the LEGO Universe client
+CLIENT_PATH=./client
+# Updates NET_VERSION in CMakeVariables.txt
+NET_VERSION=171022
+# make sure this is a long random string
+# grab a "SHA 256-bit Key" from here: https://keygen.io/
+ACCOUNT_MANAGER_SECRET=
+# Should be the externally facing IP of your server host
+EXTERNAL_IP=localhost
+# Database values
+# Be careful with special characters here. It is more safe to use normal characters and/or numbers.
+MARIADB_USER=darkflame
+MARIADB_PASSWORD=
+MARIADB_DATABASE=darkflame

.git-blame-ignore-revs

@@ -0,0 +1,11 @@
+# format codebase
+19e77a38d837ce781ba0ca6ea8e78b67a6e3b5a5
+
+# add semi-colons to macros consistently
+9e4ce24fd2851e65df776dd9c57bcb0d45f4453a
+
+# convert to unix line endings
+72477e01e2711e0f61cdb192ee266e5e21b8846f
+
+# enum cleanup
+faf42d2f8cf432df2993b031f079b0b8c6d7dbe7

.gitattributes

@@ -0,0 +1 @@
+* text=auto eol=lf

.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -0,0 +1,60 @@
+name: Bug Report
+description: Report incorrect behavior in DarkflameServer
+title: "BUG: "
+labels: ["bug", "triage"]
+
+body:
+  - type: checkboxes
+    id: checks
+    attributes:
+      label: "Make sure you've done the following:"
+      options:
+        - label: >
+            I have checked that this issue has not already been reported.
+          required: true
+        - label: >
+            I have validated that this issue is not a syntax error of either MySQL or SQLite.
+          required: true
+        - label: >
+            I have pulled the latest version of the main branch of DarkflameServer and have confirmed that the issue exists there.
+          required: true
+  - type: input
+    id: server-version
+    attributes:
+      label: DarkflameServer Version
+      description: >
+        DarkflameServer version or commit SHA (can be obtained with `git rev-parse --short HEAD`)
+    validations:
+      required: true
+  - type: textarea
+    id: problem
+    attributes:
+      label: Issue Description
+      description: >
+        Please provide a description of the issue. If this is an in-game bug, please also include pictures that showcase the issue.
+    validations:
+      required: true
+  - type: textarea
+    id: reproduction
+    attributes:
+      label: Reproduction Steps
+      description: >
+        Please provide a concise list of steps needed to reproduce this issue.
+    validations:
+      required: true
+  - type: textarea
+    id: expected-behavior
+    attributes:
+      label: Expected Behavior
+      description: >
+        Please describe what you expected to happen instead of the issue.
+    validations:
+      required: true
+  - type: textarea
+    id: environment
+    attributes:
+      label: Environment
+      description: >
+        Please include the environment you're running DarkflameServer on (for example: Windows, macOS, Ubuntu, WSL, etc).
+    validations:
+      required: true

.github/ISSUE_TEMPLATE/documentation_improvement.yaml

@@ -0,0 +1,44 @@
+name: Documentation Improvement
+description: Report wrong or missing documentation
+title: "DOC: "
+labels: ["docs", "triage"]
+
+body:
+  - type: checkboxes
+    id: checks
+    attributes:
+      label: "Make sure you've done the following:"
+      options:
+        - label: >
+            I have checked that this issue has not already been reported.
+          required: true
+        - label: >
+            I have validated that the documentation is wrong or missing on the latest version of the main branch of DarkflameServer
+          required: true
+  - type: textarea
+    id: location
+    attributes:
+      label: Location of the documentation
+      description: >
+        Please provide the location of the documentation, e.g. "Entity.cpp" or the
+        URL of the documentation, e.g.
+        "https://github.com/DarkflameUniverse/DarkflameServer/blob/main/README.md"
+      placeholder: https://github.com/DarkflameUniverse/DarkflameServer/blob/main/README.md
+    validations:
+      required: true
+  - type: textarea
+    id: problem
+    attributes:
+      label: Documentation problem
+      description: >
+        Please provide a description of what documentation you believe needs to be fixed/improved
+    validations:
+      required: true
+  - type: textarea
+    id: suggested-fix
+    attributes:
+      label: Suggested fix for documentation
+      description: >
+        Please explain the suggested fix and **why** it's better than the existing documentation
+    validations:
+      required: true

.github/ISSUE_TEMPLATE/feature_request.yaml

@@ -0,0 +1,40 @@
+name: Feature Request
+description: Suggest an idea for DarkflameServer
+title: "ENH: "
+labels: ["enhancement", "triage"]
+
+body:
+  - type: textarea
+    id: problem
+    attributes:
+      label: Is your feature request related to a problem?
+      description: >
+        Please provide a description of what the problem is, e.g. "I wish I could use DarkflameServer to do [...]"
+    validations:
+      required: true
+  - type: textarea
+    id: solution
+    attributes:
+      label: Describe the solution you'd like
+      description: >
+        Please provide a description of the feature request, e.g. "`SlashCommandHandler.cpp` should get a new command `/unlimited-coins` that [...]", try to write a docstring for the desired feature
+    validations:
+      required: true
+  - type: textarea
+    id: implications
+    attributes:
+      label: Repository breaking implications
+      description: >
+        Please provide a description of how this feature will affect the DarkflameServer repository
+  - type: textarea
+    id: alternatives
+    attributes:
+      label: Describe alternatives you've considered
+      description: >
+        Please provide a description of any alternative solutions or features you've considered
+  - type: textarea
+    id: example
+    attributes:
+      label: Additional context
+      description: >
+        Please add any other context, code examples, or references to existing implementations about the feature request here

.github/ISSUE_TEMPLATE/installation_issue.yaml

@@ -0,0 +1,62 @@
+name: Installation Issue
+description: Report issues installing the DarkflameServer on your system
+title: "BUILD: "
+labels: ["build", "triage"]
+
+body:
+  - type: checkboxes
+    id: checks
+    attributes:
+      label: "Make sure you've done the following:"
+      options:
+        - label: >
+            I have read the [installation guide](https://github.com/DarkflameUniverse/DarkflameServer/blob/main/README.md).
+          required: true
+  - type: input
+    id: server-version
+    attributes:
+      label: DarkflameServer Version
+      description: >
+        DarkflameServer version or commit SHA (can be obtained with `git rev-parse --short HEAD`)
+    validations:
+      required: true
+  - type: dropdown
+    id: platform
+    attributes:
+      label: Platform
+      description: >
+        Please provide on which platform you've tried to install DarkflameServer
+      options:
+        - Windows
+        - WSL1
+        - WSL2
+        - macOS
+        - Ubuntu
+        - Other
+    validations:
+      required: true
+  - type: dropdown
+    id: architecture
+    attributes:
+      label: Architecture
+      description: >
+        Please provide on which architecture you've tried to install DarkflameServer
+      options:
+        - x86
+        - ARM
+    validations:
+      required: true
+  - type: textarea
+    id: logs
+    attributes:
+      label: Error Logs
+      description: >
+        If possible, please copy and paste the error logs when attempting to install DarkflameServer.
+      value: >
+        <details>
+
+
+        Replace this line with the error logs.
+
+
+        </details>

.github/ISSUE_TEMPLATE/performance_issue.yaml

@@ -0,0 +1,50 @@
+name: Performance Issue
+description: Report slow performance or memory issues when running DarkflameServer
+title: "PERF: "
+labels: ["performance", "triage"]
+
+body:
+  - type: checkboxes
+    id: checks
+    attributes:
+      label: "Make sure you've done the following:"
+      options:
+        - label: >
+            I have checked that this issue has not already been reported.
+          required: true
+        - label: >
+            I have pulled the latest version of the main branch of DarkflameServer and have confirmed that the issue exists there.
+          required: true
+  - type: input
+    id: server-version
+    attributes:
+      label: DarkflameServer Version
+      description: >
+        DarkflameServer version or commit SHA (can be obtained with `git rev-parse --short HEAD`)
+    validations:
+      required: true
+  - type: textarea
+    id: environment
+    attributes:
+      label: Environment
+      description: >
+        Please include the environment you're running DarkflameServer on (for example: Windows, macOS, Ubuntu, WSL, etc), available memory, number of CPU cores.
+    validations:
+      required: true
+  - type: textarea
+    id: example
+    attributes:
+      label: Reproducible Example
+      description: >
+        Please provide a minimal, example that quantifies slow runtime or memory issues. 
+        Ideally include screenshots of CPU usage or memory usage. And if possible point
+        to the code that you may suspect to cause the issue.
+    validations:
+      required: true
+  - type: textarea
+    id: prior-performance
+    attributes:
+      label: Prior Performance
+      description: >
+        If applicable, please provide the prior version of DarkflameServer and output
+        of the same reproducible example where the performance issue did not exist.

.github/workflows/build-and-push-docker.yml

@@ -0,0 +1,56 @@
+name: CI
+
+on:
+  push:
+    branches:
+      - "main"
+    tags:
+      - "v*.*.*"
+  pull_request:
+    branches:
+      - "main"
+
+env:
+  REGISTRY: ghcr.io
+  IMAGE_NAME: ${{ github.repository }}
+
+jobs:
+  build-and-push-image:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+
+      - name: Log in to the Container registry
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+          # generate Docker tags based on the following events/attributes
+          tags: |
+            type=ref,event=pr
+            type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', 'main') }}
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
+            type=semver,pattern={{major}}
+
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}

.github/workflows/build-and-test.yml

@@ -0,0 +1,53 @@
+name: CI
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+
+jobs:
+  build-and-test:
+    name: Build & Test (${{ matrix.os }})
+    runs-on: ${{ matrix.os }}
+    continue-on-error: true
+    strategy:
+      matrix:
+        os: [ windows-2022, ubuntu-22.04, macos-13 ]
+
+    steps:
+    - uses: actions/checkout@v3
+      with:
+        submodules: true
+    - name: Add msbuild to PATH (Windows only)
+      if: ${{ matrix.os == 'windows-2022' }}
+      uses: microsoft/setup-msbuild@v1.1
+      with:
+        vs-version: '[17,18)'
+        msbuild-architecture: x64
+    - name: Install libssl and switch to XCode 15.2 (Mac Only)
+      if: ${{ matrix.os == 'macos-13' }}
+      run: |
+        brew install openssl@3
+        sudo xcode-select -s /Applications/Xcode_15.2.app/Contents/Developer
+    - name: cmake
+      uses: lukka/run-cmake@v10
+      with:
+        configurePreset: "ci-${{matrix.os}}"
+        buildPreset: "ci-${{matrix.os}}"
+        testPreset: "ci-${{matrix.os}}"
+    - name: artifacts
+      uses: actions/upload-artifact@v3
+      with:
+        name: build-${{matrix.os}}
+        path: |
+          build/*Server*
+          build/*.ini
+          build/*.so
+          build/*.dll
+          build/vanity/
+          build/navmeshes/
+          build/migrations/
+          build/*.dcf
+          !build/*.pdb
+          !build/d*/

.gitignore

@@ -1,6 +1,7 @@
 temp/
 cmake-build-debug/
 RelWithDebInfo/
+docker/configs
 
 # Third party libraries
 thirdparty/mysql/
@@ -114,3 +115,11 @@ CMakeFiles/TargetDirectories.txt
 # clangd
 .cache
 thirdparty/zlib-1.2.11/
+
+.env
+docker/__pycache__
+
+docker-compose.override.yml
+
+!*Test.bin
+!cmake/*

.gitmodules

@@ -10,3 +10,10 @@
 [submodule "thirdparty/libbcrypt"]
 	path = thirdparty/libbcrypt
 	url = https://github.com/trusch/libbcrypt.git
+[submodule "thirdparty/mariadb-connector-cpp"]
+	path = thirdparty/mariadb-connector-cpp
+	url = https://github.com/mariadb-corporation/mariadb-connector-cpp.git
+	ignore = dirty
+[submodule "thirdparty/magic_enum"]
+	path = thirdparty/magic_enum
+	url = https://github.com/Neargye/magic_enum.git

CMakeLists.txt

@@ -1,5 +1,13 @@
-cmake_minimum_required(VERSION 3.12)
+cmake_minimum_required(VERSION 3.25)
 project(Darkflame)
+include(CTest)
+
+set(CMAKE_CXX_STANDARD 20)
+set(CXX_STANDARD_REQUIRED ON)
+set(CMAKE_EXPORT_COMPILE_COMMANDS ON) 	# Export the compile commands for debugging
+set(CMAKE_POLICY_DEFAULT_CMP0063 NEW) 	# Set CMAKE visibility policy to NEW on project and subprojects
+set(CMAKE_VISIBILITY_INLINES_HIDDEN ON) # Set C and C++ symbol visibility to hide inlined functions
+set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
 
 # Read variables from file
 FILE(READ "${CMAKE_SOURCE_DIR}/CMakeVariables.txt" variables)
@@ -9,478 +17,305 @@ string(REPLACE "\n" ";" variables ${variables})
 
 # Set the cmake variables, formatted as "VARIABLE #" in variables
 foreach(variable ${variables})
-    # If the string contains a #, skip it
-    if("${variable}" MATCHES "#")
-        continue()
-    endif()
+	# If the string contains a #, skip it
+	if(NOT "${variable}" MATCHES "#")
+		# Split the variable into name and value
+		string(REPLACE "=" ";" variable ${variable})
 
-    # Split the variable into name and value
-    string(REPLACE "=" ";" variable ${variable})
+		# Check that the length of the variable is 2 (name and value)
+		list(LENGTH variable length)
 
-    # Check that the length of the variable is 2 (name and value)
-    list(LENGTH variable length)
-    if(NOT ${length} EQUAL 2)
-        continue()
-    endif()
+		if(${length} EQUAL 2)
+			list(GET variable 0 variable_name)
+			list(GET variable 1 variable_value)
 
-    list(GET variable 0 variable_name)
-    list(GET variable 1 variable_value)
+			# Set the variable
+			set(${variable_name} ${variable_value})
 
-    # Set the variable
-    set(${variable_name} ${variable_value})
-
-    # Add compiler definition
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D${variable_name}=${variable_value}")
-
-    message(STATUS "Variable: ${variable_name} = ${variable_value}")
+			message(STATUS "Variable: ${variable_name} = ${variable_value}")
+		endif()
+	endif()
 endforeach()
 
-# On windows it's better to build this from source, as there's no way FindZLIB is gonna find it
-if(NOT WIN32)
-find_package(ZLIB REQUIRED)
-endif()
-
-# Fetch External (Non-Submodule) Libraries
-if(WIN32)
-include(FetchContent)
-
-FetchContent_Declare(
-    mysql
-    URL https://dev.mysql.com/get/Downloads/Connector-C++/mysql-connector-c++-8.0.27-winx64.zip
-    URL_HASH MD5=e3c53f6e4d0a72fde2713f7597bf9468
-)
-
-FetchContent_Declare(
-    zlib
-    URL http://github.com/madler/zlib/archive/refs/tags/v1.2.11.zip
-    URL_HASH MD5=9d6a627693163bbbf3f26403a3a0b0b1
-)
-
-FetchContent_MakeAvailable(zlib)
-FetchContent_MakeAvailable(mysql)
-
-set(ZLIB_INCLUDE_DIRS ${zlib_SOURCE_DIR} ${zlib_BINARY_DIR})
-set_target_properties(zlib PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${ZLIB_INCLUDE_DIRS}") # Why?
-add_library(ZLIB::ZLIB ALIAS zlib) # You're welcome
-
-endif(WIN32)
-if(UNIX)
-if(APPLE)
-else()
-include(FetchContent)
-
-FetchContent_Declare(
-    mysql
-    URL https://dev.mysql.com/get/Downloads/Connector-C++/mysql-connector-c++-8.0.27-linux-glibc2.12-x86-64bit.tar.gz
-    URL_HASH MD5=12f086b76c11022cc7139b41a36cdf9e
-)
-
-FetchContent_MakeAvailable(mysql)
-
-if (__include_backtrace__ AND __compile_backtrace__)
-    FetchContent_Declare(
-        backtrace
-        GIT_REPOSITORY https://github.com/ianlancetaylor/libbacktrace.git
-    )
-
-    FetchContent_MakeAvailable(backtrace)
-
-    if (NOT EXISTS ${backtrace_SOURCE_DIR}/.libs)
-    set(backtrace_make_cmd "${backtrace_SOURCE_DIR}/configure --prefix=\"/usr\" --enable-shared --with-system-libunwind")
-
-    execute_process(
-        COMMAND bash -c "cd ${backtrace_SOURCE_DIR} && ${backtrace_make_cmd} && make && cd ${CMAKE_SOURCE_DIR}"
-    )
-    endif()
-
-    link_directories(${backtrace_SOURCE_DIR}/.libs/)
-    include_directories(${backtrace_SOURCE_DIR})
-endif(__include_backtrace__)
-
-endif()
-endif(UNIX)
-
 # Set the version
-set(PROJECT_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
-
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DPROJECT_VERSION=${PROJECT_VERSION}")
+set(PROJECT_VERSION "\"${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}\"")
 
 # Echo the version
 message(STATUS "Version: ${PROJECT_VERSION}")
 
-set(CMAKE_CXX_STANDARD 17)
-
-if(WIN32)
-    add_compile_definitions(_CRT_SECURE_NO_WARNINGS)
-endif(WIN32)
-
-# Our output dir
-set(CMAKE_BINARY_DIR ${PROJECT_BINARY_DIR})
-
-# Create a /res directory
-make_directory(${CMAKE_BINARY_DIR}/res)
-
-# Create a /locale directory
-make_directory(${CMAKE_BINARY_DIR}/locale)
-
-# Copy ini files on first build
-if (NOT EXISTS ${PROJECT_BINARY_DIR}/authconfig.ini)
-    configure_file(
-        ${CMAKE_SOURCE_DIR}/resources/authconfig.ini ${PROJECT_BINARY_DIR}/authconfig.ini
-        COPYONLY
-    )
-endif()
-if (NOT EXISTS ${PROJECT_BINARY_DIR}/chatconfig.ini)
-    configure_file(
-        ${CMAKE_SOURCE_DIR}/resources/chatconfig.ini ${PROJECT_BINARY_DIR}/chatconfig.ini
-        COPYONLY
-    )
-endif()
-if (NOT EXISTS ${PROJECT_BINARY_DIR}/worldconfig.ini)
-    configure_file(
-        ${CMAKE_SOURCE_DIR}/resources/worldconfig.ini ${PROJECT_BINARY_DIR}/worldconfig.ini
-        COPYONLY
-    )
-endif()
-if (NOT EXISTS ${PROJECT_BINARY_DIR}/masterconfig.ini)
-    configure_file(
-        ${CMAKE_SOURCE_DIR}/resources/masterconfig.ini ${PROJECT_BINARY_DIR}/masterconfig.ini
-        COPYONLY
-    )
-endif()
-
-# Copy files to output
-configure_file("${CMAKE_SOURCE_DIR}/vanity/CREDITS.md" "${CMAKE_BINARY_DIR}/vanity/CREDITS.md" COPYONLY)
-configure_file("${CMAKE_SOURCE_DIR}/vanity/INFO.md" "${CMAKE_BINARY_DIR}/vanity/INFO.md" COPYONLY)
-configure_file("${CMAKE_SOURCE_DIR}/vanity/TESTAMENT.md" "${CMAKE_BINARY_DIR}/vanity/TESTAMENT.md" COPYONLY)
-configure_file("${CMAKE_SOURCE_DIR}/vanity/NPC.xml" "${CMAKE_BINARY_DIR}/vanity/NPC.xml" COPYONLY)
-
-# 3rdparty includes
-include_directories(${PROJECT_SOURCE_DIR}/thirdparty/raknet/Source/)
-if(UNIX)
-    if(APPLE)
-        include_directories(/usr/local/include/)
-        include_directories(/usr/local/mysql-connector-c++/include/jdbc/)
-        include_directories(/usr/local/mysql-connector-c++/include/jdbc/cppconn/)
-    else()
-        include_directories(${mysql_SOURCE_DIR}/include/jdbc/)
-        include_directories(${mysql_SOURCE_DIR}/include/jdbc/cppconn/)
-    endif(APPLE)
-endif(UNIX)
-if(WIN32)
-include_directories(${mysql_SOURCE_DIR}/include/jdbc)
-include_directories(${mysql_SOURCE_DIR}/include/jdbc/cppconn)
-endif(WIN32)
-include_directories(${PROJECT_SOURCE_DIR}/thirdparty/tinyxml2/)
-include_directories(${PROJECT_SOURCE_DIR}/thirdparty/recastnavigation/Recast/Include)
-include_directories(${PROJECT_SOURCE_DIR}/thirdparty/recastnavigation/Detour/Include)
-include_directories(${ZLIB_INCLUDE_DIRS})
-
-# Bcrypt
-if (NOT WIN32)
-include_directories(${PROJECT_SOURCE_DIR}/thirdparty/libbcrypt)
-include_directories(${PROJECT_SOURCE_DIR}/thirdparty/libbcrypt/include/bcrypt)
-else ()
-include_directories(${PROJECT_SOURCE_DIR}/thirdparty/libbcrypt/include)
-endif ()
-
-# Our includes
-include_directories(${PROJECT_BINARY_DIR})
-include_directories(${PROJECT_SOURCE_DIR}/dChatFilter/)
-include_directories(${PROJECT_SOURCE_DIR}/dCommon/)
-include_directories(${PROJECT_SOURCE_DIR}/dGame/)
-include_directories(${PROJECT_SOURCE_DIR}/dGame/dBehaviors)
-include_directories(${PROJECT_SOURCE_DIR}/dGame/dComponents)
-include_directories(${PROJECT_SOURCE_DIR}/dGame/dGameMessages)
-include_directories(${PROJECT_SOURCE_DIR}/dGame/dInventory)
-include_directories(${PROJECT_SOURCE_DIR}/dGame/dMission)
-include_directories(${PROJECT_SOURCE_DIR}/dGame/dEntity)
-include_directories(${PROJECT_SOURCE_DIR}/dGame/dUtilities)
-include_directories(${PROJECT_SOURCE_DIR}/dPhysics/)
-include_directories(${PROJECT_SOURCE_DIR}/dZoneManager/)
-include_directories(${PROJECT_SOURCE_DIR}/dDatabase/)
-include_directories(${PROJECT_SOURCE_DIR}/dDatabase/Tables/)
-include_directories(${PROJECT_SOURCE_DIR}/thirdparty/SQLite/)
-include_directories(${PROJECT_SOURCE_DIR}/thirdparty/cpplinq/)
-include_directories(${PROJECT_SOURCE_DIR}/dNet/)
-include_directories(${PROJECT_SOURCE_DIR}/dScripts/)
-
-# Default to linking to libmysql
-set(MYSQL_LIB mysql)
-if(WIN32)
-set(MYSQL_LIB mysqlcppconn)
-endif(WIN32)
-
-# Lib folders:
-link_directories(${PROJECT_BINARY_DIR})
-if(UNIX)
-    if(APPLE)
-        link_directories(/usr/local/mysql-connector-c++/lib64/)
-    else()
-        link_directories(${mysql_SOURCE_DIR}/lib64/)
-
-        # Link to libmysqlcppconn on Linux
-        set(MYSQL_LIB mysqlcppconn)
-    endif(APPLE)
-endif(UNIX)
-if(WIN32)
-link_directories(${mysql_SOURCE_DIR}/lib64/vs14)
-endif(WIN32)
-
-# Source Code
-file(
-GLOB SOURCES
-LIST_DIRECTORIES false
-RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}"
-${PROJECT_SOURCE_DIR}/dWorldServer/*.cpp
-)
-
-# Source Code for AuthServer
-file(
-GLOB SOURCES_AUTH
-LIST_DIRECTORIES false
-RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}"
-${PROJECT_SOURCE_DIR}/dAuthServer/*.cpp
-)
-
-# Source Code for MasterServer
-file(
-GLOB SOURCES_MASTER
-LIST_DIRECTORIES false
-RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}"
-${PROJECT_SOURCE_DIR}/dMasterServer/*.cpp
-)
-
-# Source Code for ChatServer
-file(
-GLOB SOURCES_CHAT
-LIST_DIRECTORIES false
-RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}"
-${PROJECT_SOURCE_DIR}/dChatServer/*.cpp
-)
-
-# Source Code for raknet
-file(
-GLOB SOURCES_RAKNET
-LIST_DIRECTORIES false
-RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}"
-${PROJECT_SOURCE_DIR}/thirdparty/raknet/Source/*.cpp
-)
-
-# Source Code for recast
-file(
-GLOB SOURCES_RECAST
-LIST_DIRECTORIES false
-RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}"
-${PROJECT_SOURCE_DIR}/thirdparty/recastnavigation/Recast/Source/*.cpp
-)
-
-# Source Code for detour
-file(
-GLOB SOURCES_DETOUR
-LIST_DIRECTORIES false
-RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}"
-${PROJECT_SOURCE_DIR}/thirdparty/recastnavigation/Detour/Source/*.cpp
-)
-
-# Source Code for tinyxml2
-file(
-GLOB SOURCES_TINYXML2
-LIST_DIRECTORIES false
-RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}"
-${PROJECT_SOURCE_DIR}/thirdparty/tinyxml2/tinyxml2.cpp
-)
-
-# Source Code for libbcrypt
-file(
-GLOB SOURCES_LIBBCRYPT
-LIST_DIRECTORIES false
-RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}"
-${PROJECT_SOURCE_DIR}/thirdparty/libbcrypt/*.c
-${PROJECT_SOURCE_DIR}/thirdparty/libbcrypt/src/*.c
-)
-
-# Source Code for dCommon
-file(
-GLOB SOURCES_DCOMMON
-LIST_DIRECTORIES false
-RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}"
-${PROJECT_SOURCE_DIR}/dCommon/*.cpp
-)
-
-# Source Code for dChatFilter
-file(
-GLOB SOURCES_DCHATFILTER
-LIST_DIRECTORIES false
-RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}"
-${PROJECT_SOURCE_DIR}/dChatFilter/*.cpp
-)
-
-# Source Code for dDatabase
-file(
-GLOB SOURCES_DDATABASE
-LIST_DIRECTORIES false
-RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}"
-${PROJECT_SOURCE_DIR}/dDatabase/*.cpp
-${PROJECT_SOURCE_DIR}/dDatabase/Tables/*.cpp
-${PROJECT_SOURCE_DIR}/thirdparty/SQLite/*.cpp
-${PROJECT_SOURCE_DIR}/thirdparty/SQLite/*.c
-)
-
-# Source Code for dNet
-file(
-GLOB SOURCES_DNET
-LIST_DIRECTORIES false
-RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}"
-${PROJECT_SOURCE_DIR}/dNet/*.cpp
-)
-
-# Source Code for dGame
-file(
-GLOB SOURCES_DGAME
-LIST_DIRECTORIES false
-RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}"
-${PROJECT_SOURCE_DIR}/dGame/*.cpp
-${PROJECT_SOURCE_DIR}/dGame/dBehaviors/*.cpp
-${PROJECT_SOURCE_DIR}/dGame/dComponents/*.cpp
-${PROJECT_SOURCE_DIR}/dGame/dGameMessages/*.cpp
-${PROJECT_SOURCE_DIR}/dGame/dInventory/*.cpp
-${PROJECT_SOURCE_DIR}/dGame/dMission/*.cpp
-${PROJECT_SOURCE_DIR}/dGame/dEntity/*.cpp
-${PROJECT_SOURCE_DIR}/dGame/dUtilities/*.cpp
-${PROJECT_SOURCE_DIR}/dScripts/*.cpp
-)
-
-# Source Code for dZoneManager
-file(
-GLOB SOURCES_DZM
-LIST_DIRECTORIES false
-RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}"
-${PROJECT_SOURCE_DIR}/dZoneManager/*.cpp
-)
-
-# Source Code for dPhysics
-file(
-GLOB SOURCES_DPHYSICS
-LIST_DIRECTORIES false
-RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}"
-${PROJECT_SOURCE_DIR}/dPhysics/*.cpp
-)
-
-# 3rdparty static libraries:
-#add_library(zlib ${SOURCES_ZLIB})
-add_library(raknet ${SOURCES_RAKNET})
-add_library(tinyxml2 ${SOURCES_TINYXML2})
-add_library(detour ${SOURCES_DETOUR})
-add_library(recast ${SOURCES_RECAST})
-add_library(libbcrypt ${SOURCES_LIBBCRYPT})
-
-# Our static libraries:
-add_library(dCommon ${SOURCES_DCOMMON})
-add_library(dChatFilter ${SOURCES_DCHATFILTER})
-add_library(dDatabase ${SOURCES_DDATABASE})
-add_library(dNet ${SOURCES_DNET})
-add_library(dGame ${SOURCES_DGAME})
-add_library(dZoneManager ${SOURCES_DZM})
-add_library(dPhysics ${SOURCES_DPHYSICS})
-target_link_libraries(dNet dCommon) #Needed because otherwise linker errors occur.
-target_link_libraries(dCommon ZLIB::ZLIB)
-target_link_libraries(dCommon libbcrypt)
-
-# Our executables:
-add_executable(WorldServer ${SOURCES})
-add_executable(AuthServer ${SOURCES_AUTH})
-add_executable(MasterServer ${SOURCES_MASTER})
-add_executable(ChatServer ${SOURCES_CHAT})
-
-# Target libraries to link to:
-target_link_libraries(WorldServer dCommon)
-target_link_libraries(WorldServer dChatFilter)
-target_link_libraries(WorldServer dDatabase)
-target_link_libraries(WorldServer dNet)
-target_link_libraries(WorldServer dGame)
-target_link_libraries(WorldServer dZoneManager)
-target_link_libraries(WorldServer dPhysics)
-target_link_libraries(WorldServer detour)
-target_link_libraries(WorldServer recast)
-target_link_libraries(WorldServer raknet)
-target_link_libraries(WorldServer ${MYSQL_LIB})
-if(UNIX)
-target_link_libraries(WorldServer pthread)
-target_link_libraries(WorldServer dl)
-
-if(NOT APPLE AND __include_backtrace__)
-target_link_libraries(WorldServer backtrace)
-target_link_libraries(MasterServer backtrace)
-target_link_libraries(AuthServer backtrace)
-target_link_libraries(ChatServer backtrace)
-endif()
-
-endif(UNIX)
-if(WIN32)
-target_link_libraries(WorldServer ws2_32)
-endif(WIN32)
-target_link_libraries(WorldServer tinyxml2)
-
-# Target libraries for Auth:
-target_link_libraries(AuthServer dCommon)
-target_link_libraries(AuthServer dDatabase)
-target_link_libraries(AuthServer dNet)
-target_link_libraries(AuthServer raknet)
-target_link_libraries(AuthServer ${MYSQL_LIB})
-if(UNIX)
-target_link_libraries(AuthServer pthread)
-target_link_libraries(AuthServer dl)
-endif(UNIX)
-if(WIN32)
-target_link_libraries(AuthServer ws2_32)
-endif(WIN32)
-
-# Target libraries for Master:
-target_link_libraries(MasterServer dCommon)
-target_link_libraries(MasterServer dDatabase)
-target_link_libraries(MasterServer dNet)
-target_link_libraries(MasterServer raknet)
-target_link_libraries(MasterServer ${MYSQL_LIB})
-if(UNIX)
-target_link_libraries(MasterServer pthread)
-target_link_libraries(MasterServer dl)
-endif(UNIX)
-if(WIN32)
-target_link_libraries(MasterServer ws2_32)
-endif(WIN32)
-
-# Target libraries for Chat:
-target_link_libraries(ChatServer dCommon)
-target_link_libraries(ChatServer dChatFilter)
-target_link_libraries(ChatServer dDatabase)
-target_link_libraries(ChatServer dNet)
-target_link_libraries(ChatServer raknet)
-target_link_libraries(ChatServer ${MYSQL_LIB})
-if(UNIX)
-target_link_libraries(ChatServer pthread)
-target_link_libraries(ChatServer dl)
-endif(UNIX)
-if(WIN32)
-target_link_libraries(ChatServer ws2_32)
-endif(WIN32)
+# Disable demo, tests and examples for recastNavigation.  Turn these to ON if you want to use them
+# This has to be done here to prevent a rare build error due to missing dependencies on the initial generations.
+set(RECASTNAVIGATION_DEMO OFF CACHE BOOL "" FORCE)
+set(RECASTNAVIGATION_TESTS OFF CACHE BOOL "" FORCE)
+set(RECASTNAVIGATION_EXAMPLES OFF CACHE BOOL "" FORCE)
 
 # Compiler flags:
-# Disabled deprecated warnings as the MySQL includes have deprecated code in them. 
+# Disabled deprecated warnings as the MySQL includes have deprecated code in them.
 # Disabled misleading indentation as DL_LinkedList from RakNet has a weird indent.
 # Disabled no-register
 # Disabled unknown pragmas because Linux doesn't understand Windows pragmas.
 if(UNIX)
-    if(APPLE)
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++17 -O2 -Wuninitialized -Wno-unused-result -Wno-unknown-pragmas -fpermissive -D_GLIBCXX_USE_CXX11_ABI=0 -D_GLIBCXX_USE_CXX17_ABI=0 -fPIC")
-    else()
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++17 -O2 -Wuninitialized -Wno-unused-result -Wno-unknown-pragmas -fpermissive -D_GLIBCXX_USE_CXX11_ABI=0 -D_GLIBCXX_USE_CXX17_ABI=0 -static-libgcc -fPIC")
-    endif()
-    if (__dynamic)
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -rdynamic")
-    endif()
-    if (__ggdb)
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ggdb")
-    endif()
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99 -O2 -fPIC")
-endif(UNIX)
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2 -Wuninitialized -fPIC")
+	add_compile_definitions(_GLIBCXX_USE_CXX11_ABI=0 _GLIBCXX_USE_CXX17_ABI=0)
+
+	if(NOT APPLE)
+		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -static-libgcc -lstdc++fs")
+	endif()
+
+	if(${DYNAMIC} AND CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -rdynamic")
+	endif()
+
+	if(${GGDB})
+		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ggdb")
+	endif()
+
+	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99 -O2 -fPIC")
+elseif(MSVC)
+	# Skip warning for invalid conversion from size_t to uint32_t for all targets below for now
+	# Also disable non-portable MSVC volatile behavior
+	add_compile_options("/wd4267" "/utf-8" "/volatile:iso")
+elseif(WIN32)
+	add_compile_definitions(_CRT_SECURE_NO_WARNINGS)
+endif()
+
+# Our output dir
+set(CMAKE_BINARY_DIR ${PROJECT_BINARY_DIR})
+#set(CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE ON) # unfortunately, forces all libraries to be built in series, which will slow down the build process
+
+# TODO make this not have to override the build type directories
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO ${CMAKE_BINARY_DIR})
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELWITHDEBINFO ${CMAKE_BINARY_DIR})
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELWITHDEBINFO ${CMAKE_BINARY_DIR})
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR})
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR})
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR})
+
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
+
+find_package(MariaDB)
+
+# Create a /resServer directory
+make_directory(${CMAKE_BINARY_DIR}/resServer)
+
+# Create a /logs directory
+make_directory(${CMAKE_BINARY_DIR}/logs)
+
+# Copy resource files on first build
+set(RESOURCE_FILES "sharedconfig.ini" "authconfig.ini" "chatconfig.ini" "worldconfig.ini" "masterconfig.ini" "blocklist.dcf")
+message(STATUS "Checking resource file integrity")
+
+include(Utils)
+UpdateConfigOption(${PROJECT_BINARY_DIR}/authconfig.ini "port" "auth_server_port")
+UpdateConfigOption(${PROJECT_BINARY_DIR}/chatconfig.ini "port" "chat_server_port")
+UpdateConfigOption(${PROJECT_BINARY_DIR}/masterconfig.ini "port" "master_server_port")
+
+foreach(resource_file ${RESOURCE_FILES})
+	set(file_size 0)
+
+	if(EXISTS ${PROJECT_BINARY_DIR}/${resource_file})
+		file(SIZE ${PROJECT_BINARY_DIR}/${resource_file} file_size)
+	endif()
+
+	if(${file_size} EQUAL 0)
+		configure_file(
+			${CMAKE_SOURCE_DIR}/resources/${resource_file} ${PROJECT_BINARY_DIR}/${resource_file}
+			COPYONLY
+		)
+		message(STATUS "Moved " ${resource_file} " to project binary directory")
+	elseif(resource_file MATCHES ".ini")
+		message(STATUS "Checking " ${resource_file} " for missing config options")
+		file(READ ${PROJECT_BINARY_DIR}/${resource_file} current_file_contents)
+		string(REPLACE "\\\n" "" current_file_contents ${current_file_contents})
+		string(REPLACE "\n" ";" current_file_contents ${current_file_contents})
+		set(parsed_current_file_contents "")
+
+		# Remove comment lines so they do not interfere with the variable parsing
+		foreach(line ${current_file_contents})
+			string(FIND ${line} "#" is_comment)
+
+			if(NOT ${is_comment} EQUAL 0)
+				string(APPEND parsed_current_file_contents ${line})
+			endif()
+		endforeach()
+
+		file(READ ${CMAKE_SOURCE_DIR}/resources/${resource_file} depot_file_contents)
+		string(REPLACE "\\\n" "" depot_file_contents ${depot_file_contents})
+		string(REPLACE "\n" ";" depot_file_contents ${depot_file_contents})
+		set(line_to_add "")
+
+		foreach(line ${depot_file_contents})
+			string(FIND ${line} "#" is_comment)
+
+			if(NOT ${is_comment} EQUAL 0)
+				string(REPLACE "=" ";" line_split ${line})
+				list(GET line_split 0 variable_name)
+
+				if(NOT ${parsed_current_file_contents} MATCHES ${variable_name})
+					message(STATUS "Adding missing config option " ${variable_name} " to " ${resource_file})
+					set(line_to_add ${line_to_add} ${line})
+
+					foreach(line_to_append ${line_to_add})
+						file(APPEND ${PROJECT_BINARY_DIR}/${resource_file} "\n" ${line_to_append})
+					endforeach()
+
+					file(APPEND ${PROJECT_BINARY_DIR}/${resource_file} "\n")
+				endif()
+
+				set(line_to_add "")
+			else()
+				set(line_to_add ${line_to_add} ${line})
+			endif()
+		endforeach()
+	endif()
+endforeach()
+
+message(STATUS "Resource file integrity check complete")
+
+# if navmeshes directory does not exist, create it
+if(NOT EXISTS ${PROJECT_BINARY_DIR}/navmeshes)
+	file(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/navmeshes)
+endif()
+
+# Copy navmesh data on first build and extract it
+configure_file(${CMAKE_SOURCE_DIR}/resources/navmeshes.zip ${PROJECT_BINARY_DIR}/navmeshes.zip COPYONLY)
+
+file(ARCHIVE_EXTRACT INPUT ${PROJECT_BINARY_DIR}/navmeshes.zip DESTINATION ${PROJECT_BINARY_DIR}/navmeshes)
+file(REMOVE ${PROJECT_BINARY_DIR}/navmeshes.zip)
+
+# Copy vanity files on first build
+set(VANITY_FILES "CREDITS.md" "INFO.md" "TESTAMENT.md" "root.xml" "dev-tribute.xml" "atm.xml" "demo.xml")
+
+foreach(file ${VANITY_FILES})
+	configure_file("${CMAKE_SOURCE_DIR}/vanity/${file}" "${CMAKE_BINARY_DIR}/vanity/${file}" COPYONLY)
+endforeach()
+
+# Move our migrations for MasterServer to run
+file(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/migrations/dlu/)
+file(GLOB SQL_FILES ${CMAKE_SOURCE_DIR}/migrations/dlu/*.sql)
+
+foreach(file ${SQL_FILES})
+	get_filename_component(file ${file} NAME)
+	configure_file(${CMAKE_SOURCE_DIR}/migrations/dlu/${file} ${PROJECT_BINARY_DIR}/migrations/dlu/${file})
+endforeach()
+
+file(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/migrations/cdserver/)
+file(GLOB SQL_FILES ${CMAKE_SOURCE_DIR}/migrations/cdserver/*.sql)
+
+foreach(file ${SQL_FILES})
+	get_filename_component(file ${file} NAME)
+	configure_file(${CMAKE_SOURCE_DIR}/migrations/cdserver/${file} ${PROJECT_BINARY_DIR}/migrations/cdserver/${file})
+endforeach()
+
+# Add system specfic includes for Apple, Windows and Other Unix OS' (including Linux)
+if (APPLE)
+	include_directories("/usr/local/include/")
+endif()
+
+# Load all of our third party directories
+add_subdirectory(thirdparty SYSTEM)
+
+# Create our list of include directories
+include_directories(
+	"dPhysics"
+
+	"dNavigation"
+
+	"dNet"
+
+	"tests"
+	"tests/dCommonTests"
+	"tests/dGameTests"
+	"tests/dGameTests/dComponentsTests"
+
+	SYSTEM "thirdparty/magic_enum/include/magic_enum"
+	SYSTEM "thirdparty/raknet/Source"
+	SYSTEM "thirdparty/tinyxml2"
+	SYSTEM "thirdparty/recastnavigation"
+	SYSTEM "thirdparty/SQLite"
+	SYSTEM "thirdparty/cpplinq"
+	SYSTEM "thirdparty/cpp-httplib"
+	SYSTEM "thirdparty/MD5"
+)
+
+# Add system specfic includes for Apple, Windows and Other Unix OS' (including Linux)
+# TODO: Should probably not do this.
+if(APPLE)
+	include_directories("/usr/local/include/")
+endif()
+
+# Add linking directories:
+if (UNIX)
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wold-style-cast -Werror") # Warning flags
+endif()
+file(
+	GLOB HEADERS_DZONEMANAGER
+	LIST_DIRECTORIES false
+	${PROJECT_SOURCE_DIR}/dZoneManager/*.h
+)
+
+file(
+	GLOB HEADERS_DCOMMON
+	LIST_DIRECTORIES false
+	${PROJECT_SOURCE_DIR}/dCommon/*.h
+)
+
+file(
+	GLOB HEADERS_DGAME
+	LIST_DIRECTORIES false
+	${PROJECT_SOURCE_DIR}/dGame/Entity.h
+	${PROJECT_SOURCE_DIR}/dGame/dGameMessages/GameMessages.h
+	${PROJECT_SOURCE_DIR}/dGame/EntityManager.h
+	${PROJECT_SOURCE_DIR}/dScripts/CppScripts.h
+)
+
+# Add our library subdirectories for creation of the library object
+add_subdirectory(dCommon)
+add_subdirectory(dDatabase)
+add_subdirectory(dChatFilter)
+add_subdirectory(dNet)
+add_subdirectory(dScripts) # Add for dGame to use
+add_subdirectory(dGame)
+add_subdirectory(dZoneManager)
+add_subdirectory(dNavigation)
+add_subdirectory(dPhysics)
+add_subdirectory(dServer)
+
+# Create a list of common libraries shared between all binaries
+set(COMMON_LIBRARIES "dCommon" "dDatabase" "dNet" "raknet" "MariaDB::ConnCpp" "magic_enum")
+
+# Add platform specific common libraries
+if(UNIX)
+	set(COMMON_LIBRARIES ${COMMON_LIBRARIES} "dl" "pthread")
+
+	if(NOT APPLE AND ${INCLUDE_BACKTRACE})
+		set(COMMON_LIBRARIES ${COMMON_LIBRARIES} "backtrace")
+	endif()
+endif()
+
+# Include all of our binary directories
+add_subdirectory(dWorldServer)
+add_subdirectory(dAuthServer)
+add_subdirectory(dChatServer)
+add_subdirectory(dMasterServer) # Add MasterServer last so it can rely on the other binaries
+
+target_precompile_headers(
+	dZoneManager PRIVATE
+	${HEADERS_DZONEMANAGER}
+)
+
+target_precompile_headers(
+	dCommon PRIVATE
+	${HEADERS_DCOMMON}
+)
+
+target_precompile_headers(
+	tinyxml2 PRIVATE
+	"$<$<COMPILE_LANGUAGE:CXX>:${PROJECT_SOURCE_DIR}/thirdparty/tinyxml2/tinyxml2.h>"
+)
+
+if(${ENABLE_TESTING})
+	add_subdirectory(tests)
+endif()

CMakePresets.json

@@ -0,0 +1,128 @@
+{
+    "version": 3,
+    "cmakeMinimumRequired": {
+      "major": 3,
+      "minor": 14,
+      "patch": 0
+    },
+    "configurePresets": [
+      {
+        "name": "default",
+        "displayName": "Default configure step",
+        "description": "Use 'build' dir and Unix makefiles",
+        "binaryDir": "${sourceDir}/build",
+        "generator": "Unix Makefiles"
+      },
+      {
+        "name": "ci-ubuntu-22.04",
+        "displayName": "CI configure step for Ubuntu",
+        "description": "Same as default, Used in GitHub actions workflow",
+        "inherits": "default"
+      },
+      {
+        "name": "ci-macos-13",
+        "displayName": "CI configure step for MacOS",
+        "description": "Same as default, Used in GitHub actions workflow",
+        "inherits": "default"
+      },
+      {
+        "name": "ci-windows-2022",
+        "displayName": "CI configure step for Windows",
+        "description": "Set architecture to 64-bit (b/c RakNet)",
+        "inherits": "default",
+        "generator": "Visual Studio 17 2022",
+        "architecture": {
+          "value": "x64"
+        },
+        "cacheVariables": {
+          "CMAKE_BUILD_TYPE": "RelWithDebInfo"
+        }
+      },
+      {
+        "name": "windows-default",
+        "inherits": "ci-windows-2022",
+        "displayName": "Windows only Configure Settings",
+        "description": "Sets build and install directories",
+        "generator": "Ninja",
+        "architecture": {
+          "value": "x64",
+          "strategy": "external"
+        }
+      }
+    ],
+    "buildPresets": [
+      {
+        "name": "default",
+        "configurePreset": "default",
+        "displayName": "Default Build",
+        "description": "Default Build",
+        "jobs": 2
+      },
+      {
+        "name": "ci-windows-2022",
+        "configurePreset": "ci-windows-2022",
+        "displayName": "Windows CI Build",
+        "description": "This preset is used by the CI build on windows",
+        "configuration": "RelWithDebInfo",
+        "jobs": 2
+      },
+      {
+        "name": "ci-ubuntu-22.04",
+        "configurePreset": "ci-ubuntu-22.04",
+        "displayName": "Linux CI Build",
+        "description": "This preset is used by the CI build on linux",
+        "jobs": 2
+      },
+      {
+        "name": "ci-macos-13",
+        "configurePreset": "ci-macos-13",
+        "displayName": "MacOS CI Build",
+        "description": "This preset is used by the CI build on MacOS",
+        "jobs": 2
+      }
+    ],
+    "testPresets": [
+      {
+        "name": "ci-ubuntu-22.04",
+        "configurePreset": "ci-ubuntu-22.04",
+        "displayName": "CI Tests on Linux",
+        "description": "Runs all tests on a linux configuration",
+		"execution": {
+			"jobs": 2
+		},
+        "output": {
+          "outputOnFailure": true
+        }
+      },
+      {
+        "name": "ci-macos-13",
+        "configurePreset": "ci-macos-13",
+        "displayName": "CI Tests on MacOS",
+        "description": "Runs all tests on a Mac configuration",
+		"execution": {
+			"jobs": 2
+		},
+        "output": {
+          "outputOnFailure": true
+        }
+      },
+      {
+        "name": "ci-windows-2022",
+        "configurePreset": "ci-windows-2022",
+        "displayName": "CI Tests on windows",
+        "description": "Runs all tests on a windows configuration",
+		"configuration": "RelWithDebInfo",
+		"execution": {
+			"jobs": 2
+		},
+        "output": {
+          "outputOnFailure": true
+        },
+		"filter": {
+			"exclude": {
+				"name": "((example)|(minigzip))+"
+			}
+		}
+      }
+    ]
+  }

CMakeVariables.txt

@@ -1,18 +1,32 @@
 PROJECT_VERSION_MAJOR=1
-PROJECT_VERSION_MINOR=0
-PROJECT_VERSION_PATCH=0
-# LICENSE
-LICENSE=AGPL-3.0
-# The network version.
-# 171023 - Darkflame Universe client
-# 171022 - Unmodded client
-NET_VERSION=171023
+PROJECT_VERSION_MINOR=1
+PROJECT_VERSION_PATCH=1
+
 # Debugging
-# __dynamic=1
-# Set __dynamic to 1 to enable the -rdynamic flag for the linker, yielding some symbols in crashlogs.
-# __ggdb=1
-# Set __ggdb to 1 to enable the -ggdb flag for the linker, including more debug info.
-# __include_backtrace__=1
-# Set __include_backtrace__ to 1 to includes the backtrace library for better crashlogs.
-# __compile_backtrace__=1
-# Set __compile_backtrace__ to 1 to compile the backtrace library instead of using system libraries. 
+# Set DYNAMIC to 1 to enable the -rdynamic flag for the linker, yielding some symbols in crashlogs.
+DYNAMIC=1
+
+# Set GGDB to 1 to enable the -ggdb flag for the linker, including more debug info.
+# Do note, changing this will re-build the whole server
+GGDB=0
+
+# Set INCLUDE_BACKTRACE to 1 to includes the backtrace library for better crashlogs.
+# Do note, changing this will re-build the whole server
+INCLUDE_BACKTRACE=0
+
+# Set COMPILE_BACKTRACE to 1 to compile the backtrace library instead of using system libraries.
+# Do note, changing this will re-build the whole server
+COMPILE_BACKTRACE=0
+
+# Set to the number of jobs (make -j equivalent) to compile the mariadbconn files with.
+MARIADB_CONNECTOR_COMPILE_JOBS=1
+
+# When set to 1 and uncommented, compiling and linking testing folders and libraries will be done.
+ENABLE_TESTING=1
+
+# The path to OpenSSL.  Change this if your OpenSSL install path is different than the default.
+OPENSSL_ROOT_DIR=/usr/local/opt/openssl@3/
+
+# Whether or not to cache the entire CDClient Database into memory instead of lazy loading.
+# 0 means to lazy load, all other values mean load the entire database.
+CDCLIENT_CACHE_ALL=0

CONTRIBUTING.md

@@ -36,23 +36,109 @@ In general, we follow the "fork-and-pull" Git workflow
 - Open a PR in our repository.
 
 PRs should include (when applicable):
+- A descriptive title that covers the **entire** content of the pull request
 - Description
 - Motivation and Context
 - Type of Changes
 - How Has This Been Tested?
 - Screenshots
 
+## Commits
+
+Commits to this project should be concise, descriptive and to the point. Writing proper commits helps define a clear project history and makes it easier to browse the source and pinpoint issues. Although this might seem trivial, a pull request with improperly formatted commits will not be accepted. An overview of good commit practices can be found in [this](https://cbea.ms/git-commit/) article. In a nutshell, a good commit has:
+
+#### one conceptual change with a subject line that reflects it
+
+The subject line of the commit is what you specify when doing `git commit -m "<subject-line>"`.  When making commit, make sure that you create it for one conceptual change. E.g. do not use a commit to dump all the changes you have locally, but split your changes into commits that conceptually make sense and use the subject line to refelct that. Some examples:
+
+**Bad:**
+Commit message: `Document MovementAIComponent and add Avant Gardens Mech Scripts and fix Entity.cpp bug causing infinite loops`
+Changed files:
+- MovementAIComponent.cpp
+- AgMechScript.cpp
+- Entity.cpp
+
+**Good:**
+
+Commit message: `Document MovementAIComponent`
+Changed files:
+- MovementAIComponent.cpp
+
+Commit message: `Add Avant Gardens Mech Scripts`
+Changed files:
+- AgMechScript.cpp
+
+Commit message: `Fix Entity.cpp bug causing infinite loops`
+Changed files:
+- Entity.cpp
+
+Not only does this logically make more sense, it'll make it easier to revert a conceptual change once something wrong with it. If you commit using the bad example but your bugfix turned out to introduce an even worse bug, all your changes have to be reverted, even though your other changes might not be broken. Splitting your commits into conceptually unique commits makes it easier to find and revert issues.
+
+#### an imperative subject line
+
+In the subject line it's also important to have an imperative writing style that covers the contents of your commit so that it easily reflects what it'll do when applied. We pick an imperative writing style so that all commits have equal tonality. An easy check for this is placing `When applied, this commit will ...` in front of your commit message and checking if that makes sense. Some examples:
+
+**Bad:**
+```
+Nice commit :) -> "When applied, this commit will nice commit :)"
+```
+
+**Bad:**
+```
+fixed bug -> "When applied, this commit will fixed bug"
+```
+
+**Good:**
+```
+Fix Entity.cpp bug causing infinite loop -> "When applied, this commit will fix Entity.cpp bug causing infinite loop"
+```
+
+**Good:**
+```
+Add Avant Gardens mech scripts -> "When applied, this commit will add Avant Gardens mech scripts"
+```
+
+#### a subject line and a body
+
+A good commit has a subject line that summarizes the change and a body that further describes the context required to understand the change. In this body you don't have to explain *what* the change was, as the code should reflect that, but *why* a change was made. Some examples:
+
+**Bad:**
+```
+Add Avant Gardens mech scripts
+
+Added the Avant Gardens mech scripts by creaing a new file called
+AgMechScripts.cpp and then adding the proper event handlers to that
+to send events to the client regarding changes of the mech.
+```
+
+**Good:**
+```
+Add Avant Gardens mech scripts
+
+Added the Avant Gardens mech scripts as they were previously not
+added, which produced InvalidScript errors.
+```
+
 ## Development Resources
 
 Check out a compiled list of development resources and tools [here](https://lu-dev.net/).
 
+
+Please use [.editorconfig](https://editorconfig.org/#pre-installed) with your preferred IDE.
+
+And run:
+```bash
+git config blame.ignoreRevsFile .git-blame-ignore-revs
+```
+to ignore the gitblame of mass formatting commits
+
 ## Coding Style
 
 This project has gone through multiple iterations of coding style. In the code you'll find a number of different coding styles in use. What follows is the preferred style for this project.
 
 ### General
 
-Use 4 spaces instead of the tab character.
+**Never** use spaces instead of tabs. 1 Tab = 4 space character's width by default.
 
 Use typically trailing braces everywhere (if, else, functions, structures, typedefs, class definitions, etc.)
 
@@ -77,7 +163,7 @@ if (x) {
 }
 ```
 
-Instead of 
+Instead of
 
 ```cpp
 if ( x ) {

Dockerfile

@@ -0,0 +1,50 @@
+FROM gcc:12 as build
+
+WORKDIR /app
+
+RUN set -ex; \
+    apt-get update; \
+    apt-get install -y cmake
+
+COPY . /app/
+COPY --chmod=0500 ./build.sh /app/
+
+RUN sed -i 's/MARIADB_CONNECTOR_COMPILE_JOBS__=.*/MARIADB_CONNECTOR_COMPILE_JOBS__=2/' /app/CMakeVariables.txt 
+
+RUN ./build.sh
+
+FROM debian:12 as runtime
+
+WORKDIR /app
+
+RUN --mount=type=cache,id=build-apt-cache,target=/var/cache/apt \
+    apt update && \
+    apt install -y libssl3 libcurl4 && \
+    rm -rf /var/lib/apt/lists/*
+
+# Grab libraries and load them
+COPY --from=build /app/build/mariadbcpp/libmariadbcpp.so /usr/local/lib/
+RUN ldconfig
+
+# Server bins
+COPY --from=build /app/build/*Server /app/
+
+# Necessary suplimentary files
+COPY --from=build /app/build/*.ini /app/configs/
+COPY --from=build /app/build/vanity/*.* /app/vanity/*
+COPY --from=build /app/build/navmeshes /app/navmeshes
+COPY --from=build /app/build/migrations /app/migrations
+COPY --from=build /app/build/*.dcf /app/
+
+# backup of config and vanity files to copy to the host incase 
+# of a mount clobbering the copy from above
+COPY --from=build /app/build/*.ini /app/default-configs/ 
+COPY --from=build /app/build/vanity/*.* /app/default-vanity/*
+
+# needed as the container runs with the root user
+# and therefore sudo doesn't exist
+ENV USE_SUDO_AUTH=0
+ENV DLU_CONFIG_DIR=/app/configs/
+
+COPY --chmod=0500 ./entrypoint.sh /app/
+ENTRYPOINT [ "/app/entrypoint.sh" ]

README.md

@@ -18,162 +18,196 @@ Darkflame Universe is licensed under AGPLv3, please read [LICENSE](LICENSE). Som
 Throughout the entire build and setup process a level of familiarity with the command line and preferably a Unix-like development environment is greatly advantageous.
 
 ### Hosting a server
-We do not recommend hosting public servers. DLU is intended for small scale deployment, for example within a group of friends. It has not been tested for large scale deployment which comes with additional security risks.
+We do not recommend hosting public servers. Darkflame Universe is intended for small scale deployment, for example within a group of friends. It has not been tested for large scale deployment which comes with additional security risks.
 
 ### Supply of resource files
-Darkflame Universe is a server emulator and does not distribute any LEGO® Universe files. A separate game client is required to setup this server emulator and play the game, which we cannot supply. Users are strongly suggested to refer to the safe checksums listed in the resources tab below when checking if a client will work.
+Darkflame Universe is a server emulator and does not distribute any LEGO® Universe files. A separate game client is required to setup this server emulator and play the game, which we cannot supply. Users are strongly suggested to refer to the safe checksums listed [here](#verifying-your-client-files) to see if a client will work.
 
-## Build
-Development of the latest iteration of Darkflame Universe has been done primarily in a Unix-like environment and is where it has been tested and designed for deployment. It is therefore highly recommended that Darkflame Universe be built and deployed using a Unix-like environment for the most streamlined experience.
+## Step by step walkthrough for a single-player server
+If you would like a setup for a single player server only on a Windows machine, use the [Native Windows Setup Guide by HailStorm](https://gist.github.com/HailStorm32/169df65a47a104199b5cc57d10fa57de) and skip this README.
 
-### Prerequisites
-**Clone the repository**
+## Steps to setup server
+* [Clone this repository](#clone-the-repository)
+* [Install dependencies](#install-dependencies)
+* [Database setup](#database-setup)
+* [Build the server](#build-the-server)
+* [Configuring your server](#configuring-your-server)
+	* [Required Configuration](#required-configuration)
+	* [Optional Configuration](#optional-configuration)
+* [Verify your setup](#verify-your-setup)
+* [Running the server](#running-the-server)
+* [User Guide](#user-guide)
+* [Docker](#docker)
+
+## Clone the repository
+If you are on Windows, you will need to download and install git from [here](https://git-scm.com/download/win)
+
+Then run the following command
 ```bash
 git clone --recursive https://github.com/DarkflameUniverse/DarkflameServer
 ```
 
-**Python**
+## Install dependencies
 
-Some tools utilized to streamline the setup process require Python 3, make sure you have it installed.
+### Windows packages
+Ensure that you have either the [MSVC C++ compiler](https://visualstudio.microsoft.com/vs/features/cplusplus/) (recommended) or the [Clang compiler](https://github.com/llvm/llvm-project/releases/) installed.
+You'll also need to download and install [CMake](https://cmake.org/download/) (version <font size="4">**CMake version 3.25**</font> or later!).
 
-**Choosing the right version for your client**
-DLU clients identify themselves using a higher version number than the regular live clients out there.
-This was done make sure that older and incomplete clients wouldn't produce false positive bug reports for us, and because we made bug fixes and new content for the client. 
-
-If you're using a DLU client, then you don't need to change anything. But if you're using any other client, you'll have to go into the "CMakeVariables.txt" file and change it to match your client's version. (likely 171022)
-
-### Linux builds
-Make sure packages like `gcc`, `cmake`, and `zlib` are installed. Depending on the distribution, these packages might already be installed.
-
-**Build the repository**
+### MacOS packages
+Ensure you have [brew](https://brew.sh) installed.
+You will need to install the following packages
 ```bash
-# Create the build directory, preserving it if it already exists
-mkdir -p build
-cd build
-
-# Run CMake to generate make files
-cmake ..
-
-# Run make to build the project. To build utilizing multiple cores, append `-j` and the amount of cores to utilize, for example `make -j8`
-make
+brew install cmake gcc mariadb openssl zlib
 ```
 
-### MacOS builds
+### Linux packages
+Make sure packages like `gcc`, and `zlib` are installed. Depending on the distribution, these packages might already be installed. Note that on systems like Ubuntu, you will need the `zlib1g-dev` package so that the header files are available. `libssl-dev` will also be required as well as `openssl`. You will also need a MySQL database solution to use. We recommend using `mariadb-server`.
 
-**Download precompiled MySQL connector**
-```bash
-# Install required tools
-brew install boost mysql-connector-c++
-
-# Symlinks for finding the required modules
-sudo ln -s /usr/local/mysql-connector-c++/lib64/libmysqlcppconn.dylib /usr/local/mysql-connector-c++/lib64/libmysql.dylib 
-sudo ln -s /usr/local/mysql-connector-c++/lib64/libcrypto.1.1.dylib /usr/local/mysql/lib/libcrypto.1.1.dylib
-```
-
-Then follow the Linux build steps (gcc is not required), but before running `make`, run the following to make sure all the libs are available in the build folder:
+For Ubuntu, you would run the following commands. On other systems, the package install command will differ.
 
 ```bash
-sudo ln -s /usr/local/mysql-connector-c++/lib64/libssl.1.1.dylib /path/to/build/folder/libssl.1.1.dylib
-sudo ln -s /usr/local/mysql-connector-c++/lib64/libcrypto.1.1.dylib /path/to/build/folder/libcrypto.1.1.dylib
+sudo apt update && sudo apt upgrade
+
+# Install packages
+sudo apt install build-essential gcc zlib1g-dev libssl-dev openssl mariadb-server cmake
 ```
 
-### Windows builds (native)
-Ensure that you have either the [MSVC](https://visualstudio.microsoft.com/vs/) or the [Clang](https://github.com/llvm/llvm-project/releases/) (recommended) compiler installed. You will also need to install [CMake](https://cmake.org/download/).
-
-**Build the repository**
-```batch
-:: Create the build directory
-mkdir build
-cd build
-
-:: Run CMake to generate make files
-cmake ..
-
-:: Run CMake with build flag to build
-cmake --build .
-```
-
-
-### Windows builds (WSL)
-This section will go through how to install [WSL](https://docs.microsoft.com/en-us/windows/wsl/install) and building in a Linux environment under Windows. WSL requires Windows 10 version 2004 and higher (Build 19041 and higher) or Windows 11.
-
-**Open the Command Prompt application with Administrator permissions and run the following:**
+#### Required CMake version
+This project uses <font size="4">**CMake version 3.25**</font> or higher and as such you will need to ensure you have this version installed.
+You can check your CMake version by using the following command in a terminal.
 ```bash
-# Installing Windows Subsystem for Linux
-wsl --install
+cmake --version
 ```
 
-**Open the Ubuntu application and run the following:**
-```bash
-# Make sure the install is up to date
-apt update && apt upgrade
+If you are going to be using an Ubuntu environment to run the server, you may need to get a more recent version of `cmake` than the packages available may provide.
 
-# Make sure the gcc, cmake, and build-essentials are installed
-sudo apt install gcc
+The general approach to do so would be to obtain a copy of the signing key and then add the CMake repository to your apt.
+You can do so with the following commands.
+
+[Source of the below commands](https://askubuntu.com/questions/355565/how-do-i-install-the-latest-version-of-cmake-from-the-command-line)
+
+```bash
+# Remove the old version of CMake
+sudo apt purge --auto-remove cmake
+
+# Prepare for installation
+sudo apt update && sudo apt install -y software-properties-common lsb-release && sudo apt clean all
+
+# Obtain a copy of the signing key
+wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | gpg --dearmor - | sudo tee /etc/apt/trusted.gpg.d/kitware.gpg >/dev/null
+
+# Add the repository to your sources list.
+sudo apt-add-repository "deb https://apt.kitware.com/ubuntu/ $(lsb_release -cs) main"
+
+# Next you'll want to ensure that Kitware's keyring stays up to date
+sudo apt update
+sudo apt install kitware-archive-keyring
+sudo rm /etc/apt/trusted.gpg.d/kitware.gpg
+
+# If sudo apt update above returned an error, copy the public key at the end of the error message and run the following command
+# if the error message was "The following signatures couldn't be verified because the public key is not available: NO_PUBKEY 6AF7F09730B3F0A4"
+# then the below command would be "sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 6AF7F09730B3F0A4"
+sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys <TheCopiedPublicKey>
+
+# Finally update and install
+sudo apt update
 sudo apt install cmake
-sudo apt install build-essentials
 ```
 
-[**Follow the Linux instructions**](#linux-builds)
+## Database setup
+First you'll need to start MariaDB.
 
-## Setting up the environment
+For Windows the service is always running by default.
 
-### Database
-Darkflame Universe utilizes a MySQL/MariaDB database for account and character information.
-
-Initial setup can vary drastically based on which operating system or distribution you are running; there are instructions out there for most setups, follow those and come back here when you have a database up and running.
-* Create a database for Darkflame Universe to use
-* Run each SQL file in the order at which they appear [here](migrations/dlu/) on the database
-
-### Resources
-
-**LEGO® Universe 1.10.64**
-
-This repository does not distribute any LEGO® Universe files. A full install of LEGO® Universe version 1.10.64 (latest) is required to finish setting up Darkflame Universe.
-
-Known good SHA256 checksums of the client:
-- `8f6c7e84eca3bab93232132a88c4ae6f8367227d7eafeaa0ef9c40e86c14edf5` (packed client, rar compressed)
-- `c1531bf9401426042e8bab2de04ba1b723042dc01d9907c2635033d417de9e05` (packed client, includes extra locales, rar compressed)
-- `0d862f71eedcadc4494c4358261669721b40b2131101cbd6ef476c5a6ec6775b` (unpacked client, includes extra locales, rar compressed)
-
-Known good *SHA1* checksum of the DLU client:
-- `91498e09b83ce69f46baf9e521d48f23fe502985` (packed client, zip compressed) 
-
-How to generate a SHA256 checksum:
+For MacOS, run the following command
 ```bash
-# Replace <file> with the file path to the client
-
-# If on Linux or MacOS
-shasum -a 256 <file>
-
-# If on Windows
-certutil -hashfile <file> SHA256
+brew services start mariadb
 ```
 
-**Unpacking the client**
-* Clone lcdr's utilities repository [here](https://github.com/lcdr/utils)
-* Use `pkextractor.pyw` to unpack the client files if they are not already unpacked
+For Linux, run the following command
+```bash
+sudo systemctl start mysql
+# If systemctl is not a known command on your distribution, try the following instead
+sudo service mysql start
+```
 
-**Setup resource directory**
-* In the `build` directory create a `res` directory if it does not already exist.
-* Copy over or create symlinks from `macros`, `BrickModels`, `chatplus_en_us.txt`, and `maps` in your client `res` directory to the server `build/res` directory
-* Unzip the navmeshes [here](./resources/navmeshes.zip) and place them in `build/res/maps/navmeshes`
+<font size="4">**You will need to run this command every time you restart your environment**</font>
 
-**Setup locale**
-* In the `build` directory create a `locale` directory if it does not already exist
-* Copy over or create symlinks from `locale.xml` in your client `locale` directory to the `build/locale` directory
+If you are using Linux and `systemctl` and want the MariaDB instance to start on startup, run the following command
+```bash
+sudo systemctl enable --now mysql
+```
 
-**Client database**
-* Use `fdb_to_sqlite.py` in lcdr's utilities on `res/cdclient.fdb` in the unpacked client to convert the client database to `cdclient.sqlite`
-* Move and rename `cdclient.sqlite` into `build/res/CDServer.sqlite`
-* Run each SQL file in the order at which they appear [here](migrations/cdserver/) on the SQLite database
+Once MariaDB is started, you'll need to create a user and an empty database for Darkflame Universe to use.
 
-**Configuration**
+First, login to the MariaDB instance.
 
-After the server has been built there should be four `ini` files in the build director: `authconfig.ini`, `chatconfig.ini`, `masterconfig.ini`, and `worldconfig.ini`. Go through them and fill in the database credentials and configure other settings if necessary.
+To do this on Ubuntu/Linux, MacOS, or another Unix like operating system, run the following command in a terminal
+```bash
+# Logs you into the MariaDB instance as root
+sudo mysql
+```
 
-**Verify**
+For Windows, run the following command in the `Command Prompt (MariaDB xx.xx)` terminal
+```bash
+# Logs you into the mysql instance
+mysql -u root -p
+# You will then be prompted for the password you set for root during installation of MariaDB
+```
 
+Now that you are logged in, run the following commands.
+
+```bash
+# Creates a user for this computer which uses a password and grant said user all privileges.
+# Change mydarkflameuser to a custom username and password to a custom password. 
+GRANT ALL ON *.* TO 'mydarkflameuser'@'localhost' IDENTIFIED BY 'password' WITH GRANT OPTION;
+FLUSH PRIVILEGES;
+
+# Then create a database for Darkflame Universe to use.
+CREATE DATABASE darkflame;
+```
+
+## Build the server
+You can either run `build.sh` when in the root folder of the repository:
+
+```bash
+./build.sh
+```
+
+Or manually run the commands used in [build.sh](build.sh).
+
+If you would like to build the server faster, append `-j<number>` where number is the number of simultaneous compile jobs to run at once.  It is recommended that you have this number always be 1 less than your core count to prevent slowdowns.  The command would look like this if you would build with 4 jobs at once:
+```bash
+./build.sh -j4
+```
+### Notes
+Depending on your operating system, you may need to adjust some pre-processor defines in [CMakeVariables.txt](./CMakeVariables.txt) before building:
+* If you are on MacOS, ensure OPENSSL_ROOT_DIR is pointing to the openssl root directory.
+* If you are using a Darkflame Universe client, ensure `client_net_version` in `build/sharedconfig.ini` is changed to 171023.
+
+## Configuring your server
+This server has a few steps that need to be taken to configure the server for your use case.
+
+### Required Configuration
+Darkflame Universe can run with either a packed or an unpacked client.
+Navigate to `build/sharedconfig.ini` and fill in the following fields:
+* `mysql_host` (This is the IP address or hostname of your MariaDB server.  This is highly likely `localhost`)
+  * If you setup your MariaDB instance on a port other than 3306, which can be done on a Windows install, you will need to make this value `tcp://localhost:portNum` where portNum is replaced with the port you chose to run MariaDB on.
+* `mysql_database` (This is the database you created for the server)
+* `mysql_username` (This is the user you created for the server)
+* `mysql_password` (This is the password for the user you created for the server)
+* `client_location` (This is the location of the client files.  This should be the folder path of a packed or unpacked client)
+	* Ideally the path to the client should not contain any spaces.
+
+### Optional Configuration
+* After the server has been built there should be five `ini` files in the build directory: `sharedconfig.ini`, `authconfig.ini`, `chatconfig.ini`, `masterconfig.ini`, and `worldconfig.ini`.
+* `authconfig.ini` contains an option to enable or disable play keys on your server. Do not change the default port for auth.
+* `chatconfig.ini` contains a port option.
+* `masterconfig.ini` contains options related to permissions you want to run your servers with.
+* `sharedconfig.ini` contains several options that are shared across all servers
+* `worldconfig.ini` contains several options to turn on QOL improvements should you want them. If you would like the most vanilla experience possible, you will need to turn some of these settings off.
+
+## Verify your setup
 Your build directory should now look like this:
 * AuthServer
 * ChatServer
@@ -182,228 +216,236 @@ Your build directory should now look like this:
 * authconfig.ini
 * chatconfig.ini
 * masterconfig.ini
+* sharedconfig.ini
 * worldconfig.ini
-* **locale/**
-  * locale.xml
-* **res/**
-  * CDServer.sqlite
-  * chatplus_en_us.txt
-  * **macros/**
-    * ...
-  * **BrickModels/**
-    * ...
-  * **maps/**
-    * **navmeshes/**
-      * ...
-    * ...
 * ...
 
 ## Running the server
-If everything has been configured correctly you should now be able to run the `MasterServer` binary. Darkflame Universe utilizes port numbers under 1024, so under Linux you either have to give the binary network permissions or run it under sudo.
+If everything has been configured correctly you should now be able to run the `MasterServer` binary which is located in the `build` directory. Darkflame Universe utilizes port numbers under 1024, so under Linux you either have to give the `AuthServer` binary network permissions or run it under sudo.
+To give `AuthServer` network permissions and not require sudo, run the following command
+```bash
+sudo setcap 'cap_net_bind_service=+ep' AuthServer
+```
+and then go to `build/masterconfig.ini` and change `use_sudo_auth` to 0.
+
+### Linux Service
+If you are running this on a linux based system, it will use your terminal to run the program interactively, preventing you using it for other tasks and requiring it to be open to run the server.  
+_Note: You could use screen or tmux instead for virtual terminals_  
+To run the server non-interactively, we can use a systemctl service by copying the following file:  
+```shell
+cp ./systemd.example /etc/systemd/system/darkflame.service
+```  
+
+Make sure to edit the file in `/etc/systemd/system/darkflame.service` and change the:  
+- `User` and `Group` to the user that runs the darkflame server.  
+- `ExecPath` to the full file path of the server executable.  
+
+To register, enable and start the service use the following commands:
+
+- Reload the systemd manager configuration to make it aware of the new service file:
+```shell
+systemctl daemon-reload
+```
+- Start the service:
+```shell
+systemctl start darkflame.service
+```
+- Enable OR disable the service to start on boot using:
+```shell
+systemctl enable darkflame.service
+systemctl disable darkflame.service
+```
+- Verify that the service is running without errors:
+```shell
+systemctl status darkflame.service
+```
+- You can also restart, stop, or check the logs of the service using journalctl
+```shell
+systemctl restart darkflame.service
+systemctl stop darkflame.service
+journalctl -xeu darkflame.service
+```
 
 ### First admin user
 Run `MasterServer -a` to get prompted to create an admin account. This method is only intended for the system administrator as a means to get started, do NOT use this method to create accounts for other users!
 
-### Account Manager
+### Account management tool (Nexus Dashboard)
+**If you are just using this server for yourself, you can skip setting up Nexus Dashboard**
 
-Follow the instructions [here](https://github.com/DarkflameUniverse/AccountManager) to setup the DLU account management Python web application. This is the intended way for users to create accounts.
+Follow the instructions [here](https://github.com/DarkflameUniverse/NexusDashboard) to setup the DLU Nexus Dashboard web application. This is the intended way for users to create accounts and the intended way for moderators to approve names/pets/properties and do other moderation actions.
 
 ### Admin levels
+The admin level, or Game Master level (hereafter referred to as gmlevel), is specified in the `accounts.gm_level` column in the MySQL database. Normal players should have this set to `0`, which comes with no special privileges. The system administrator will have this set to `9`, which comes will all privileges. gmlevel `8` should be used to give a player a majority of privileges without the safety critical once.
 
-The admin level, or game master level, is specified in the `accounts.gm_level` column in the MySQL database. Normal players should have this set to `0`, which comes with no special privileges. The system administrator will have this set to `9`, which comes will all privileges. Admin level `8` should be used to give a player a majority of privileges without the safety critical once.
+While a character has a gmlevel of anything but `0`, some gameplay behavior will change. When testing gameplay, you should always use a character with a gmlevel of `0`.
 
-While a character has a gmlevel of anything but 0, some gameplay behavior will change. When testing gameplay, you should always use a character with a gmlevel of 0.
+# User guide
+Some changes to the client `boot.cfg` file are needed to play on your server.
 
-## User guide
-A few modifications have to be made to the client.
-
-### Client configuration
+## Allowing a user to connect to your server
 To connect to a server follow these steps:
 * In the client directory, locate `boot.cfg`
 * Open it in a text editor and locate where it says `AUTHSERVERIP=0:`
 * Replace the contents after to `:` and the following `,` with what you configured as the server's public facing IP. For example `AUTHSERVERIP=0:localhost` for locally hosted servers
+* Next locate the line `UGCUSE3DSERVICES=7:`
+* Ensure the number after the 7 is a `0`
 * Launch `legouniverse.exe`, through `wine` if on a Unix-like operating system
+* Note that if you are on WSL2, you will need to configure the public IP in the server and client to be the IP of the WSL2 instance and not localhost, which can be found by running `ifconfig` in the terminal. Windows defaults to WSL1, so this will not apply to most users.
 
-### Survival
+## Updating your server
+To update your server to the latest version navigate to your cloned directory
+```bash
+cd path/to/DarkflameServer
+```
+Run the following commands to update to the latest changes
+```bash
+git pull
+git submodule update --init --recursive
+```
+Now follow the [build](#build-the-server) section for your system and your server is up to date.
 
-The client script for the survival minigame has a bug in it which can cause the minigame to not load. To fix this, follow these instructions:
-* Open `res/scripts/ai/minigame/survival/l_zone_survival_client.lua`
-* Navigate to line `617`
-* Change `PlayerReady(self)` to `onPlayerReady(self)`
-* Save the file, overriding readonly mode if required
+## In-game commands
+* A list of all in-game commands can be found [here](./docs/Commands.md).
 
-### Brick-By-Brick building
+## Verifying your client files
 
-Brick-By-Brick building requires `PATCHSERVERIP=0:` in the `boot.cfg` to point to a HTTP server which always returns `HTTP 404 - Not Found` for all requests. This can be achieved by pointing it to `localhost` while having `sudo python -m http.server 80` running in the background.
+### LEGO® Universe 1.10.64
+To verify that you are indeed using a LEGO® Universe 1.10.64 client, make sure you have the full client compressed **in a rar file** and run the following command.
+```bash
+# Replace <file> with the file path to the zipped client
 
-### In-game commands
-Here is a summary of the commands available in-game. All commands are prefixed by `/` and typed in the in-game chat window. Some commands requires admin privileges. Operands within `<>` are required, operands within `()` are not. For the full list of in-game commands, please checkout [the source file](./dGame/dUtilities/SlashCommandHandler.cpp).
+# If on Linux or MacOS
+shasum -a 256 <file>
 
-<table>
-<thead>
-  <th>
-    Command
-  </th>
-  <th>
-    Usage
-  </th>
-  <th>
-    Description
-  </th>
-  <th>
-    Admin Level Requirement
-  </th>
-</thead>
-<tbody>
-  <tr>
-    <td>
-      info
-    </td>
-    <td>
-      /info
-    </td>
-    <td>
-      Displays server info to the user, including where to find the server's source code.
-    </td>
-    <td>
-    </td>
-  </tr>
-  <tr>
-    <td>
-      credits
-    </td>
-    <td>
-      /credits
-    </td>
-    <td>
-      Displays the names of the people behind Darkflame Universe.
-    </td>
-    <td>
-    </td>
-  </tr>
-  <tr>
-    <td>
-      instance-info
-    </td>
-    <td>
-      /instance-info
-    </td>
-    <td>
-      Displays in the chat the current zone, clone, and instance id. 
-    </td>
-    <td>
-    </td>
-  </tr>
-  <tr>
-    <td>
-      gmlevel
-    </td>
-    <td>
-      /gmlevel &#60;level&#62;
-    </td>
-    <td>
-      Within the authorized range of levels for the current account, changes the character's game master level to the specified value. This is required to use certain commands.
-    </td>
-    <td>
-    </td>
-  </tr>
-  <tr>
-    <td>
-      testmap
-    </td>
-    <td>
-      /testmap &#60;zone&#62; (clone-id)
-    </td>
-    <td>
-      Transfers you to the given zone by id and clone id.
-    </td>
-    <td>
-      1
-    </td>
-  </tr>
-  <tr>
-    <td>
-      ban
-    </td>
-    <td>
-      /ban &#60;username&#62;
-    </td>
-    <td>
-      Bans a user from the server.
-    </td>
-    <td>
-      4
-    </td>
-  </tr>
-  <tr>
-    <td>
-      gmadditem
-    </td>
-    <td>
-      /gmadditem &#60;id&#62; (count)
-    </td>
-    <td>
-      Adds the given item to your inventory by id.
-    </td>
-    <td>
-      8
-    </td>
-  </tr>
-  <tr>
-    <td>
-      spawn
-    </td>
-    <td>
-      /spawn &#60;id&#62;
-    </td>
-    <td>
-      Spawns an object at your location by id.
-    </td>
-    <td>
-      8
-    </td>
-  </tr>
-  <tr>
-    <td>
-      metrics
-    </td>
-    <td>
-      /metrics
-    </td>
-    <td>
-      Prints some information about the server's performance.
-    </td>
-    <td>
-      8
-    </td>
-  </tr>
-</tbody>
-</table>
+# If on Windows using the Command Prompt
+certutil -hashfile <file> SHA256
+```
 
-## Credits
-### Contributors to DLUv3
-* DarwinAnim8or
-* Wincent01
-* Mick
-* averysumner
-* Jon002
-* Jonny
-* Xiphoseer
+Below are known good SHA256 checksums of the client:
+* `8f6c7e84eca3bab93232132a88c4ae6f8367227d7eafeaa0ef9c40e86c14edf5` (packed client, rar compressed)
+* `c1531bf9401426042e8bab2de04ba1b723042dc01d9907c2635033d417de9e05` (packed client, includes extra locales, rar compressed)
+* `0d862f71eedcadc4494c4358261669721b40b2131101cbd6ef476c5a6ec6775b` (unpacked client, includes extra locales, rar compressed)
 
-### Research and tools
-* lcdr
+If the returned hash matches one of the lines above then you can continue with setting up the server. If you are using a fully downloaded and complete client from live, then it will work, but the hash above may not match. Otherwise you must obtain a full install of LEGO® Universe 1.10.64.
+You must also make absolutely sure your LEGO Universe client is not in a Windows OneDrive. DLU is not and will not support a client being stored in a OneDrive, so ensure you have moved the client outside of that location.
 
-### Community management
-* Neal
+### Darkflame Universe Client
+Darkflame Universe clients identify themselves using a higher version number than the regular live clients out there.
+This was done make sure that older and incomplete clients wouldn't produce false positive bug reports for us, and because we made bug fixes and new content for the client.
 
-### Former contributors
+To verify that you are indeed using a Darkflame Universe client, make sure you have the full client compressed **in a zip file** and run the following command.
+
+```bash
+# Replace <file> with the file path to the zipped client
+
+# If on Linux or MacOS
+shasum -a 1 <file>
+
+# If on Windows using the Command Prompt
+certutil -hashfile <file> SHA1
+```
+
+Known good *SHA1* checksum of the Darkflame Universe client:
+- `91498e09b83ce69f46baf9e521d48f23fe502985` (packed client, zip compressed)
+
+
+# Docker
+
+The Darkflame Server is automatically built and published as a Docker Container / [OCI](https://opencontainers.org/) Image to the GitHub Container Registry at:
+[`ghcr.io/darkflameuniverse/darkflameserver`](https://github.com/DarkflameUniverse/DarkflameServer/pkgs/container/darkflameserver).
+
+## Compose
+
+> [!WARNING]
+> It seems that Docker Desktop on Windows with the WSL 2 backend has some issues with MariaDB (c.f. [mariadb-docker#331](https://github.com/MariaDB/mariadb-docker/issues/331)) triggered by NexusDashboard
+> migrations, so this setup may not work for you. If that is the case, please tell us about your setup in [NexusDashboard#92](https://github.com/DarkflameUniverse/NexusDashboard/issues/92).
+
+You can use the `docker-compose` tool to [setup a MariaDB database](#database-setup), run the Darkflame Server and manage it with [Nexus Dashboard](https://github.com/DarkflameUniverse/NexusDashboard) all
+at once. For that:
+
+- [Install Docker Desktop](https://docs.docker.com/get-docker/)
+- Open the directory that contains your LU Client
+  - If the `legouniverse.exe` is in a subfolder called `client`, you're good to go. There may also be a folder `versions`.
+  - Otherwise, create a new `client` folder and move the exe and everything else (e.g. `res` and `locale`) in there. This is necessary to work around a bug in the client that will prevent that you to log back in after getting disconnected.
+- Download the [docker-compose.yml](docker-compose.yml) file and place it next to `client`.
+- Download the [.env.example](.env.example) file and place it next to `client` with the file name `.env`
+  - You may get warnings that this name starts with a dot, acknowledge those, this is intentional. Depending on your operating system, you may need to activate showing hidden files (e.g. Ctrl-H in Gnome on Linux) and/or file extensions ("File name extensions" in the "View" tab on Windows).
+  - Update the `ACCOUNT_MANAGER_SECRET` and `MARIADB_PASSWORD` with strong random passwords.
+    - Use a password generator like <https://keygen.io>
+    - Avoid `:` and `@` characters
+    - Once the database user is created, changing the password will not update it, so the server will just fail to connect.
+  - Set `EXTERNAL_IP` to your LAN IP or public IP if you want to host the game for friends & family
+- Open a terminal in the folder with the `docker-compose.yml` and `client`
+- Run `docker compose up -d`
+  - This might require `sudo` on Linux, and a recent version of [docker compose](https://docs.docker.com/compose/install/)
+- Run `docker exec -it dlu-darkflameserver-1 /app/MasterServer -a` and follow the instructions to create the initial admin account
+- Open <http://localhost:8000> to access Nexus Dashboard with the admin account to create normal users
+- Set `AUTHSERVERIP=0:localhost` in `client/boot.cfg`
+  - Replace `localhost` with the value of `EXTERNAL_IP` if you changed that earlier.
+  - Also make sure `UGCUSE3DSERVICES=7:` is set to `0`
+- Launch `legouniverse.exe`
+
+## Standalone
+
+This assumes that you have a database deployed to your host or in another docker container.
+
+A basic deployment of this contianer would look like:
+```sh
+# example docker contianer deployment
+docker run -it \
+    -v /path/to/configs/:/app/configs \
+    -v /path/to/logs/:/app/logs \
+    -v /path/to/dumps/:/app/dumps \
+    -v /path/to/res:/app/res:ro \
+    -v /path/to/resServer:/app/resServer \
+    -e DUMP_FOLDER=/app/dumps \
+    -p 1001:1001/udp \
+    -p 2005:2005/udp \
+    -p 3000-3300:3000-3300/udp \
+ghcr.io/darkflameuniverse/darkflameserver:latest
+```
+You will need to replace the `/path/to/`'s to reflect the paths on your host.
+
+Any config option in the `.ini`'s can be overridden with environmental variables: Ex: `log_to_console=1` from `shared_config.ini` would be overidden like  `-e LOG_TO_CONSOLE=0`
+
+# Development Documentation
+This is a Work in Progress, but below are some quick links to documentaion for systems and structs in the server
+[Networked message structs](https://lcdruniverse.org/lu_packets/lu_packets/index.html)
+[General system documentation](https://docs.lu-dev.net/en/latest/index.html)
+
+# Credits
+
+## DLU Team
+* [DarwinAnim8or](https://github.com/DarwinAnim8or)
+* [Wincent01](https://github.com/Wincent01)
+* [Mick](https://github.com/MickVermeulen)
+* [averysumner](https://github.com/codeshaunted)
+* [Jon002](https://github.com/jaller200)
+* [Jonny](https://github.com/cuzitsjonny)
+* [Aaron K.](https://github.com/aronwk-aaron)
+
+### Research and Tools
+* [lcdr](https://github.com/lcdr)
+* [Xiphoseer](https://github.com/Xiphoseer)
+
+### Community Management
+* [Neal](https://github.com/NealSpellman)
+
+### Logo
+* Cole Peterson (BlasterBuilder)
+
+## Active Contributors
+* [EmosewaMC](https://github.com/EmosewaMC)
+* [Jettford](https://github.com/Jettford)
+
+## Former Contributors
 * TheMachine
 * Matthew
-* Raine
+* [Raine](https://github.com/uwainium)
 * Bricknave
 
-### Special thanks
+## Special Thanks
 * humanoid24
 * pwjones1969
-* BlasterBuilder for the logo
-* ALL OF THE NETDEVIL AND LEGO TEAMS!
+* [Simon](https://github.com/SimonNitzsche)
+* [ALL OF THE NETDEVIL AND LEGO TEAMS!](https://www.mobygames.com/game/macintosh/lego-universe/credits)

SECURITY.md

@@ -0,0 +1,51 @@
+# Security Policy
+
+## Supported Versions
+
+At the moment, only the latest commit on the `main` branch will be supported for security vulnerabilities. Private server operators
+should keep their instances up to date and forks should regularily rebase on `main`.
+
+| Branch  | Supported          |
+| ------- | ------------------ |
+| `main`  | :white_check_mark: |
+
+## Reporting a Vulnerability
+
+If you found a security vulnerability in DLU, please send a message to [darkflame-security@googlegroups.com][darkflame-security]. You should get a
+reply within *72 hours* that we have received your report and a tentative [CVSS score](https://nvd.nist.gov/vuln-metrics/cvss/v3-calculator).
+We will do a preliminary analysis to confirm that the vulnerability is a plausible claim and decline the report otherwise.
+
+If possible, please include
+
+1. reproducible steps on how to trigger the vulnerability
+2. a description on why you are convinced that it exists.
+3. any information you may have on active exploitation of the vulnerability (zero-day).
+
+## Security Advisories
+
+The project will release advisories on resolved vulnerabilities at <https://github.com/DarkflameUniverse/DarkflameServer/security/advisories>
+
+## Receiving Security Updates
+
+We set up [darkflame-security-announce@googlegroups.com][darkflame-security-announce] for private server operators to receive updates on vulnerabilities
+such as the release of [Security Advisories](#security-advisories) or early workarounds and recommendations to mitigate ongoing
+vulnerabilities.
+
+Unfortunately, we cannot guarantee that announcements will be sent for every vulnerability.
+
+## Embargo
+
+We propose a 90 day (approx. 3 months) embargo on security vulnerabilities. That is, we ask everyone not to disclose the vulnerabilty
+publicly until either:
+
+1. 90 days have passed from the time the first related email is sent to `darkflame-security@`
+2. a security advisory related to the vulnerability has been published by the project.
+
+If you fail to comply with this embargo, you might be exluded from [receiving security updates](#receiving-security-updates).
+
+## Bug Bounty
+
+Unfortunately we cannot provide bug bounties at this time.
+
+[darkflame-security]: mailto:darkflame-security@googlegroups.com
+[darkflame-security-announce]: https://groups.google.com/g/darkflame-security-announce

build.sh

@@ -1,3 +1,6 @@
+# Error if any command fails
+set -e
+
 # Create the build directory, preserving it if it already exists
 mkdir -p build
 cd build
@@ -5,5 +8,6 @@ cd build
 # Run cmake to generate make files
 cmake ..
 
-# Run make to build the project. To build utilizing multiple cores, append `-j` and the amount of cores to utilize, for example `make -j8`
-make
+# To build utilizing multiple cores, append `-j` and the amount of cores to utilize, for example `cmake --build . --config Release -j8'
+cmake --build . --config Release $1
+

cmake/FindGoogleTest.cmake

@@ -0,0 +1,17 @@
+include(FetchContent)
+
+message(STATUS "Fetching gtest...")
+
+FetchContent_Declare(
+	googletest
+	GIT_REPOSITORY https://github.com/google/googletest.git
+	GIT_TAG release-1.12.1
+)
+
+# For Windows: Prevent overriding the parent project's compiler/linker settings
+set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
+
+FetchContent_MakeAvailable(GoogleTest)
+
+message(STATUS "gtest fetched and is now ready.")
+set(GoogleTest_FOUND TRUE)

cmake/FindMariaDB.cmake

@@ -0,0 +1,146 @@
+# mariadb connector cpp
+# On Windows ClangCL can't compile the connector from source but can link to an msvc compiled one,
+# so prefer the prebuilt binaries unless MARIADB_BUILD_SOURCE is specified
+if(WIN32 AND NOT MARIADB_BUILD_SOURCE)
+	set(MARIADB_MSI_DIR "${PROJECT_BINARY_DIR}/msi")
+	set(MARIADB_CONNECTOR_DIR "${PROJECT_BINARY_DIR}/mariadbcpp")
+	set(MARIADB_C_CONNECTOR_DIR "${MARIADB_CONNECTOR_DIR}/MariaDB/MariaDB Connector C 64-bit")
+	set(MARIADB_CPP_CONNECTOR_DIR "${MARIADB_CONNECTOR_DIR}/MariaDB/MariaDB C++ Connector 64-bit")
+
+	file(MAKE_DIRECTORY "${MARIADB_MSI_DIR}")
+	file(MAKE_DIRECTORY "${MARIADB_CONNECTOR_DIR}")
+
+    # These values need to be updated whenever a new minor release replaces an old one
+	# Go to https://mariadb.com/downloads/connectors/ to find the up-to-date URL parts
+    set(MARIADB_CONNECTOR_C_VERSION "3.2.7")
+	set(MARIADB_CONNECTOR_C_BUCKET "2319651")
+	set(MARIADB_CONNECTOR_C_MD5 "f8636d733f1d093af9d4f22f3239f885")
+    set(MARIADB_CONNECTOR_CPP_VERSION "1.0.2")
+	set(MARIADB_CONNECTOR_CPP_BUCKET "2531525")
+	set(MARIADB_CONNECTOR_CPP_MD5 "3034bbd6ca00a0125345f9fd1a178401")
+	
+	set(MARIADB_CONNECTOR_C_MSI "mariadb-connector-c-${MARIADB_CONNECTOR_C_VERSION}-win64.msi")
+	set(MARIADB_CONNECTOR_CPP_MSI "mariadb-connector-cpp-${MARIADB_CONNECTOR_CPP_VERSION}-win64.msi")
+	
+	if(NOT EXISTS "${MARIADB_MSI_DIR}/${MARIADB_CONNECTOR_C_MSI}" )
+		message(STATUS "Downloading mariadb connector/c")
+		file(DOWNLOAD https://dlm.mariadb.com/${MARIADB_CONNECTOR_C_BUCKET}/Connectors/c/connector-c-${MARIADB_CONNECTOR_C_VERSION}/${MARIADB_CONNECTOR_C_MSI}
+			"${MARIADB_MSI_DIR}/${MARIADB_CONNECTOR_C_MSI}"
+			EXPECTED_HASH MD5=${MARIADB_CONNECTOR_C_MD5})
+	endif()
+
+	if(NOT EXISTS "${MARIADB_MSI_DIR}/${MARIADB_CONNECTOR_CPP_MSI}" )
+		message(STATUS "Downloading mariadb connector/c++")
+		file(DOWNLOAD https://dlm.mariadb.com/${MARIADB_CONNECTOR_CPP_BUCKET}/Connectors/cpp/connector-cpp-${MARIADB_CONNECTOR_CPP_VERSION}/${MARIADB_CONNECTOR_CPP_MSI}
+			"${MARIADB_MSI_DIR}/${MARIADB_CONNECTOR_CPP_MSI}"
+			EXPECTED_HASH MD5=${MARIADB_CONNECTOR_CPP_MD5})
+	endif()
+
+
+	file(TO_NATIVE_PATH "${MARIADB_CONNECTOR_DIR}" MSIEXEC_TARGETDIR)
+	# extract msi files without installing to users system
+	if(NOT EXISTS "${MARIADB_C_CONNECTOR_DIR}")
+		file(TO_NATIVE_PATH "${MARIADB_MSI_DIR}/${MARIADB_CONNECTOR_C_MSI}" MSI_DIR)
+		execute_process(COMMAND msiexec /a ${MSI_DIR} /qn TARGETDIR=${MSIEXEC_TARGETDIR})
+	endif()
+	set(MARIADBC_SHARED_LIBRARY_LOCATION "${MARIADB_C_CONNECTOR_DIR}/lib/libmariadb.dll")
+
+	if(NOT EXISTS "${MARIADB_CPP_CONNECTOR_DIR}")
+	file(TO_NATIVE_PATH "${MARIADB_MSI_DIR}/${MARIADB_CONNECTOR_CPP_MSI}" MSI_DIR)
+		execute_process(COMMAND msiexec /a ${MSI_DIR} /qn TARGETDIR=${MSIEXEC_TARGETDIR})
+	endif()
+
+	set(MARIADBCPP_SHARED_LIBRARY_LOCATION "${MARIADB_CPP_CONNECTOR_DIR}/mariadbcpp.dll")
+	set(MARIADB_IMPLIB_LOCATION "${MARIADB_CPP_CONNECTOR_DIR}/mariadbcpp.lib")
+	set(MARIADB_INCLUDE_DIR "${MARIADB_CPP_CONNECTOR_DIR}/include/mariadb")
+
+	add_custom_target(mariadb_connector_cpp)
+	add_custom_command(TARGET mariadb_connector_cpp POST_BUILD
+					COMMAND ${CMAKE_COMMAND} -E copy_if_different
+					"${MARIADBCPP_SHARED_LIBRARY_LOCATION}"
+					"${MARIADBC_SHARED_LIBRARY_LOCATION}"
+					"${PROJECT_BINARY_DIR}")
+
+	# MariaDB uses plugins that the database needs to load, the prebuilt binaries by default will try to find the libraries in system directories,
+	# so set this define and the servers will set the MARIADB_PLUGIN_DIR environment variable to the appropriate directory.
+	# Plugin directory is determined at dll load time (this will happen before main()) so we need to delay the dll load so that we can set the environment variable
+	add_link_options(/DELAYLOAD:${MARIADBCPP_SHARED_LIBRARY_LOCATION})
+	add_compile_definitions(MARIADB_PLUGIN_DIR_OVERRIDE="${MARIADB_CPP_CONNECTOR_DIR}/plugin")
+else() # Build from source
+
+	include(ExternalProject)
+	if(WIN32)
+		set(MARIADB_EXTRA_CMAKE_ARGS
+			-DCMAKE_C_FLAGS=/w # disable zlib warnings
+			-DCMAKE_CXX_FLAGS=/EHsc
+			-DWITH_MSI=OFF)
+	elseif(APPLE)
+		set(MARIADB_EXTRA_CMAKE_ARGS
+			-DWITH_EXTERNAL_ZLIB=ON
+			-DOPENSSL_ROOT_DIR=${OPENSSL_ROOT_DIR}
+			-DCMAKE_C_FLAGS=-w # disable zlib warnings
+			-DCMAKE_CXX_FLAGS=-D_GLIBCXX_USE_CXX11_ABI=0)
+	else()
+		set(MARIADB_EXTRA_CMAKE_ARGS
+			-DCMAKE_C_FLAGS=-w # disable zlib warnings
+			-DCMAKE_CXX_FLAGS=-D_GLIBCXX_USE_CXX11_ABI=0)
+	endif()
+
+	set(MARIADBCPP_INSTALL_DIR ${PROJECT_BINARY_DIR}/prefix)
+	set(MARIADBCPP_LIBRARY_DIR ${PROJECT_BINARY_DIR}/mariadbcpp)
+	set(MARIADBCPP_PLUGIN_DIR ${MARIADBCPP_LIBRARY_DIR}/plugin)
+	set(MARIADBCPP_SOURCE_DIR ${PROJECT_SOURCE_DIR}/thirdparty/mariadb-connector-cpp)
+	set(MARIADB_INCLUDE_DIR "${MARIADBCPP_SOURCE_DIR}/include")
+	ExternalProject_Add(mariadb_connector_cpp
+		PREFIX "${PROJECT_BINARY_DIR}/thirdparty/mariadb-connector-cpp"
+		SOURCE_DIR ${MARIADBCPP_SOURCE_DIR}
+		INSTALL_DIR ${MARIADBCPP_INSTALL_DIR}
+		CMAKE_ARGS  -Wno-dev
+					-DWITH_UNIT_TESTS=OFF
+					-DMARIADB_LINK_DYNAMIC=OFF
+					-DCMAKE_BUILD_RPATH_USE_ORIGIN=${CMAKE_BUILD_RPATH_USE_ORIGIN}
+					-DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
+					-DINSTALL_LIBDIR=${MARIADBCPP_LIBRARY_DIR}
+					-DINSTALL_PLUGINDIR=${MARIADBCPP_PLUGIN_DIR}
+					${MARIADB_EXTRA_CMAKE_ARGS}
+		BUILD_ALWAYS true
+	)
+
+	if(WIN32)
+		set(MARIADB_SHARED_LIBRARY_NAME mariadbcpp.dll)
+		set(MARIADB_PLUGIN_SUFFIX .dll)
+		set(MARIADB_IMPLIB_LOCATION "${MARIADBCPP_LIBRARY_DIR}/mariadbcpp.lib")
+
+		# When built from source windows only seems to check same folder as exe instead specified folder, so use
+		# environment variable to force it
+		add_link_options(/DELAYLOAD:mariadbcpp.dll)
+		add_compile_definitions(MARIADB_PLUGIN_DIR_OVERRIDE="${MARIADBCPP_PLUGIN_DIR}")
+	else()
+		set(MARIADB_SHARED_LIBRARY_NAME libmariadbcpp${CMAKE_SHARED_LIBRARY_SUFFIX})
+		set(MARIADB_PLUGIN_SUFFIX ${CMAKE_SHARED_LIBRARY_SUFFIX})
+	endif()
+
+	set(MARIADBCPP_SHARED_LIBRARY_LOCATION "${MARIADBCPP_LIBRARY_DIR}/${MARIADB_SHARED_LIBRARY_NAME}")
+	if(WIN32)
+		set(MARIADBC_SHARED_LIBRARY_LOCATION "${MARIADBCPP_LIBRARY_DIR}/libmariadb.lib")
+	endif()
+endif()
+
+# Create mariadb connector library object
+add_library(MariaDB::ConnCpp SHARED IMPORTED GLOBAL)
+add_dependencies(MariaDB::ConnCpp mariadb_connector_cpp)
+set_target_properties(MariaDB::ConnCpp PROPERTIES
+	IMPORTED_LOCATION "${MARIADBCPP_SHARED_LIBRARY_LOCATION}")
+
+if(WIN32)
+	set_target_properties(MariaDB::ConnCpp PROPERTIES
+		IMPORTED_IMPLIB "${MARIADB_IMPLIB_LOCATION}")
+elseif(APPLE)
+	set_target_properties(MariaDB::ConnCpp PROPERTIES
+		IMPORTED_SONAME "libmariadbcpp")
+endif()
+
+# Add directories to include lists
+target_include_directories(MariaDB::ConnCpp SYSTEM INTERFACE ${MARIADB_INCLUDE_DIR})
+
+set(MariaDB_FOUND TRUE)

cmake/Utils.cmake

@@ -0,0 +1,51 @@
+# Parses a config file for a specific option and appends the new option if it does not exist
+# If the new option does exist, this function will do nothing.
+# file_name: The name of the file to parse
+# old_option_name: The name of the option to find
+# new_option_name: The name of the option to add
+function(UpdateConfigOption file_name old_option_name new_option_name)
+	string(APPEND old_option_name "=")
+	string(APPEND new_option_name "=")
+	message(STATUS "Checking " ${file_name} " for " ${old_option_name} " and adding " ${new_option_name} " if it does not exist")
+	if(NOT EXISTS ${file_name}) 
+		message(STATUS ${file_name} " does not exist. Doing nothing")
+		return()
+	endif()
+	file(READ ${file_name} current_file_contents)
+	string(REPLACE "\\\n" "" current_file_contents ${current_file_contents})
+	string(REPLACE "\n" ";" current_file_contents ${current_file_contents})
+	set(parsed_current_file_contents "")
+
+	# Remove comment lines so they do not interfere with the variable parsing
+	foreach(line ${current_file_contents})
+		string(FIND ${line} "#" is_comment)
+
+		if(NOT ${is_comment} EQUAL 0)
+			string(APPEND parsed_current_file_contents ${line})
+		endif()
+	endforeach()
+
+	set(found_new_option -1)
+	set(found_old_option -1)
+	set(current_value -1)
+
+	foreach(line ${current_file_contents})
+		string(FIND ${line} ${old_option_name} old_option_in_file)
+
+		if(${old_option_in_file} EQUAL 0)
+			set(found_old_option 1)
+			set(current_value ${line})
+		endif()
+
+		string(FIND ${line} ${new_option_name} found_new_option_in_file)
+
+		if(${found_new_option_in_file} EQUAL 0)
+			set(found_new_option 1)
+		endif()
+	endforeach(line ${current_file_contents})
+
+	if(${found_old_option} EQUAL 1 AND NOT ${found_new_option} EQUAL 1)
+		string(REPLACE ${old_option_name} ${new_option_name} current_value ${current_value})
+		file(APPEND ${file_name} "\n" ${current_value})
+	endif()
+endfunction()

dAuthServer/AuthServer.cpp

@@ -1,104 +1,119 @@
 #include <iostream>
 #include <string>
 #include <ctime>
+#include <csignal>
 #include <chrono>
 #include <thread>
 
 //DLU Includes:
 #include "dCommonVars.h"
 #include "dServer.h"
-#include "dLogger.h"
+#include "Logger.h"
 #include "Database.h"
 #include "dConfig.h"
 #include "Diagnostics.h"
+#include "BinaryPathFinder.h"
 
 //RakNet includes:
 #include "RakNetDefines.h"
+#include "MessageIdentifiers.h"
 
 //Auth includes:
 #include "AuthPackets.h"
-#include "dMessageIdentifiers.h"
+#include "eConnectionType.h"
+#include "eServerMessageType.h"
+#include "eAuthMessageType.h"
 
 #include "Game.h"
+#include "Server.h"
+
+
 namespace Game {
-	dLogger* logger;
-	dServer* server;
-	dConfig* config;
+	Logger* logger = nullptr;
+	dServer* server = nullptr;
+	dConfig* config = nullptr;
+	Game::signal_t lastSignal = 0;
+	std::mt19937 randomEngine;
 }
 
-dLogger* SetupLogger();
 void HandlePacket(Packet* packet);
 
 int main(int argc, char** argv) {
+	constexpr uint32_t authFramerate = mediumFramerate;
+	constexpr uint32_t authFrameDelta = mediumFrameDelta;
 	Diagnostics::SetProcessName("Auth");
 	Diagnostics::SetProcessFileName(argv[0]);
 	Diagnostics::Initialize();
 
+	std::signal(SIGINT, Game::OnSignal);
+	std::signal(SIGTERM, Game::OnSignal);
+
+	Game::config = new dConfig("authconfig.ini");
+
 	//Create all the objects we need to run our service:
-	Game::logger = SetupLogger();
-	if (!Game::logger) return 0;
-	Game::logger->Log("AuthServer", "Starting Auth server...\n");
-	Game::logger->Log("AuthServer", "Version: %i.%i\n", PROJECT_VERSION_MAJOR, PROJECT_VERSION_MINOR);
-	Game::logger->Log("AuthServer", "Compiled on: %s\n", __TIMESTAMP__);
+	Server::SetupLogger("AuthServer");
+	if (!Game::logger) return EXIT_FAILURE;
 
-	//Read our config:
-	dConfig config("authconfig.ini");
-	Game::config = &config;
-	Game::logger->SetLogToConsole(bool(std::stoi(config.GetValue("log_to_console"))));
+	LOG("Starting Auth server...");
+	LOG("Version: %s", PROJECT_VERSION);
+	LOG("Compiled on: %s", __TIMESTAMP__);
 
-	//Connect to the MySQL Database
-	std::string mysql_host = config.GetValue("mysql_host");
-	std::string mysql_database = config.GetValue("mysql_database");
-	std::string mysql_username = config.GetValue("mysql_username");
-	std::string mysql_password = config.GetValue("mysql_password");
-
-    try {
-        Database::Connect(mysql_host, mysql_database, mysql_username, mysql_password);
-    } catch (sql::SQLException& ex) {
-		Game::logger->Log("AuthServer", "Got an error while connecting to the database: %s\n", ex.what());
-		Database::Destroy();
+	try {
+		Database::Connect();
+	} catch (sql::SQLException& ex) {
+		LOG("Got an error while connecting to the database: %s", ex.what());
+		Database::Destroy("AuthServer");
 		delete Game::server;
 		delete Game::logger;
-		return 0;
-    }
+		return EXIT_FAILURE;
+	}
 
 	//Find out the master's IP:
 	std::string masterIP;
-	int masterPort = 1500;
-	sql::PreparedStatement* stmt = Database::CreatePreppedStmt("SELECT ip, port FROM servers WHERE name='master';");
-	auto res = stmt->executeQuery();
-	while (res->next()) {
-		masterIP = res->getString(1).c_str();
-		masterPort = res->getInt(2);
-	}
+	uint32_t masterPort = 1500;
 
-	delete res;
-	delete stmt;
+	auto masterInfo = Database::Get()->GetMasterInfo();
+	if (masterInfo) {
+		masterIP = masterInfo->ip;
+		masterPort = masterInfo->port;
+	}
+	LOG("Master is at %s:%d", masterIP.c_str(), masterPort);
+
+	Game::randomEngine = std::mt19937(time(0));
 
 	//It's safe to pass 'localhost' here, as the IP is only used as the external IP.
-	int maxClients = 50;
-	int ourPort = 1001; //LU client is hardcoded to use this for auth port, so I'm making it the default. 
-	if (config.GetValue("max_clients") != "") maxClients = std::stoi(config.GetValue("max_clients"));
-	if (config.GetValue("port") != "") ourPort = std::atoi(config.GetValue("port").c_str());
-	
-	Game::server = new dServer(config.GetValue("external_ip"), ourPort, 0, maxClients, false, true, Game::logger, masterIP, masterPort, ServerType::Auth);
+	std::string ourIP = "localhost";
+	const uint32_t maxClients = GeneralUtils::TryParse<uint32_t>(Game::config->GetValue("max_clients")).value_or(999);
+
+	//LU client is hardcoded to use this for auth port, so I'm making it the default.
+	const uint32_t ourPort = GeneralUtils::TryParse<uint32_t>(Game::config->GetValue("auth_server_port")).value_or(1001);
+	const auto externalIPString = Game::config->GetValue("external_ip");
+	if (!externalIPString.empty()) ourIP = externalIPString;
+
+	Game::server = new dServer(ourIP, ourPort, 0, maxClients, false, true, Game::logger, masterIP, masterPort, ServerType::Auth, Game::config, &Game::lastSignal);
 
 	//Run it until server gets a kill message from Master:
 	auto t = std::chrono::high_resolution_clock::now();
 	Packet* packet = nullptr;
-	int framesSinceLastFlush = 0;
-	int framesSinceMasterDisconnect = 0;
-	int framesSinceLastSQLPing = 0;
+	constexpr uint32_t logFlushTime = 30 * authFramerate; // 30 seconds in frames
+	constexpr uint32_t sqlPingTime = 10 * 60 * authFramerate; // 10 minutes in frames
+	uint32_t framesSinceLastFlush = 0;
+	uint32_t framesSinceMasterDisconnect = 0;
+	uint32_t framesSinceLastSQLPing = 0;
 
-	while (true) {
+	AuthPackets::LoadClaimCodes();
+	
+	Game::logger->Flush(); // once immediately before main loop
+	while (!Game::ShouldShutdown()) {
 		//Check if we're still connected to master:
 		if (!Game::server->GetIsConnectedToMaster()) {
 			framesSinceMasterDisconnect++;
 
-			if (framesSinceMasterDisconnect >= 30)
+			if (framesSinceMasterDisconnect >= authFramerate) {
+				LOG("No connection to master!");
 				break; //Exit our loop, shut down.
-		}
-		else framesSinceMasterDisconnect = 0;
+			}
+		} else framesSinceMasterDisconnect = 0;
 
 		//In world we'd update our other systems here.
 
@@ -112,61 +127,50 @@ int main(int argc, char** argv) {
 		}
 
 		//Push our log every 30s:
-		if (framesSinceLastFlush >= 900) {
+		if (framesSinceLastFlush >= logFlushTime) {
 			Game::logger->Flush();
 			framesSinceLastFlush = 0;
 		} else framesSinceLastFlush++;
 
 		//Every 10 min we ping our sql server to keep it alive hopefully:
-		if (framesSinceLastSQLPing >= 40000) {
+		if (framesSinceLastSQLPing >= sqlPingTime) {
 			//Find out the master's IP for absolutely no reason:
 			std::string masterIP;
-			int masterPort;
-			sql::PreparedStatement* stmt = Database::CreatePreppedStmt("SELECT ip, port FROM servers WHERE name='master';");
-			auto res = stmt->executeQuery();
-			while (res->next()) {
-				masterIP = res->getString(1).c_str();
-				masterPort = res->getInt(2);
+			uint32_t masterPort;
+			auto masterInfo = Database::Get()->GetMasterInfo();
+			if (masterInfo) {
+				masterIP = masterInfo->ip;
+				masterPort = masterInfo->port;
 			}
 
-			delete res;
-			delete stmt;
-
 			framesSinceLastSQLPing = 0;
-		}
-		else framesSinceLastSQLPing++;
+		} else framesSinceLastSQLPing++;
 
 		//Sleep our thread since auth can afford to.
-		t += std::chrono::milliseconds(mediumFramerate); //Auth can run at a lower "fps"
+		t += std::chrono::milliseconds(authFrameDelta); //Auth can run at a lower "fps"
 		std::this_thread::sleep_until(t);
 	}
 
+	LOG("Exited Main Loop! (signal %d)", Game::lastSignal);
 	//Delete our objects here:
-	Database::Destroy();
+	Database::Destroy("AuthServer");
 	delete Game::server;
 	delete Game::logger;
+	delete Game::config;
 
-	return 0;
-}
-
-dLogger * SetupLogger() {
-	std::string logPath = "./logs/AuthServer_" + std::to_string(time(nullptr)) + ".log";
-	bool logToConsole = false;
-#ifdef _DEBUG
-	logToConsole = true;
-#endif
-
-	return new dLogger(logPath, logToConsole);
+	return EXIT_SUCCESS;
 }
 
 void HandlePacket(Packet* packet) {
+	if (packet->length < 4) return;
+
 	if (packet->data[0] == ID_USER_PACKET_ENUM) {
-		if (packet->data[1] == SERVER) {
-			if (packet->data[3] == MSG_SERVER_VERSION_CONFIRM) {
+		if (static_cast<eConnectionType>(packet->data[1]) == eConnectionType::SERVER) {
+			if (static_cast<eServerMessageType>(packet->data[3]) == eServerMessageType::VERSION_CONFIRM) {
 				AuthPackets::HandleHandshake(Game::server, packet);
 			}
-		} else if (packet->data[1] == AUTH) {
-			if (packet->data[3] == MSG_AUTH_LOGIN_REQUEST) {
+		} else if (static_cast<eConnectionType>(packet->data[1]) == eConnectionType::AUTH) {
+			if (static_cast<eAuthMessageType>(packet->data[3]) == eAuthMessageType::LOGIN_REQUEST) {
 				AuthPackets::HandleLoginRequest(Game::server, packet);
 			}
 		}

dAuthServer/CMakeLists.txt

@@ -0,0 +1,7 @@
+add_executable(AuthServer "AuthServer.cpp")
+
+target_link_libraries(AuthServer ${COMMON_LIBRARIES} dServer)
+
+target_include_directories(AuthServer PRIVATE ${PROJECT_SOURCE_DIR}/dServer)
+
+add_compile_definitions(AuthServer PRIVATE PROJECT_VERSION="\"${PROJECT_VERSION}\"")

dChatFilter/CMakeLists.txt

@@ -0,0 +1,4 @@
+set(DCHATFILTER_SOURCES "dChatFilter.cpp")
+
+add_library(dChatFilter STATIC ${DCHATFILTER_SOURCES})
+target_link_libraries(dChatFilter dDatabase)

dChatFilter/dChatFilter.cpp

@@ -8,9 +8,11 @@
 #include <regex>
 
 #include "dCommonVars.h"
+#include "Logger.h"
+#include "dConfig.h"
 #include "Database.h"
-#include "dLogger.h"
 #include "Game.h"
+#include "eGameMasterLevel.h"
 
 using namespace dChatFilterDCF;
 
@@ -18,78 +20,84 @@ dChatFilter::dChatFilter(const std::string& filepath, bool dontGenerateDCF) {
 	m_DontGenerateDCF = dontGenerateDCF;
 
 	if (!BinaryIO::DoesFileExist(filepath + ".dcf") || m_DontGenerateDCF) {
-		ReadWordlistPlaintext(filepath + ".txt");
-		if (!m_DontGenerateDCF) ExportWordlistToDCF(filepath + ".dcf");
+		ReadWordlistPlaintext(filepath + ".txt", true);
+		if (!m_DontGenerateDCF) ExportWordlistToDCF(filepath + ".dcf", true);
+	} else if (!ReadWordlistDCF(filepath + ".dcf", true)) {
+		ReadWordlistPlaintext(filepath + ".txt", true);
+		ExportWordlistToDCF(filepath + ".dcf", true);
 	}
-	else {
-		ReadWordlistDCF(filepath + ".dcf");
+
+	if (BinaryIO::DoesFileExist("blocklist.dcf")) {
+		ReadWordlistDCF("blocklist.dcf", false);
 	}
 
 	//Read player names that are ok as well:
-	auto stmt = Database::CreatePreppedStmt("select name from charinfo;");
-	auto res = stmt->executeQuery();
-	while (res->next()) {
-		std::string line = res->getString(1).c_str();
-		std::transform(line.begin(), line.end(), line.begin(), ::tolower); //Transform to lowercase
-		m_Words.push_back(CalculateHash(line));
+	auto approvedNames = Database::Get()->GetApprovedCharacterNames();
+	for (auto& name : approvedNames) {
+		std::transform(name.begin(), name.end(), name.begin(), ::tolower); //Transform to lowercase
+		m_ApprovedWords.push_back(CalculateHash(name));
 	}
-	delete res;
-	delete stmt;
 }
 
 dChatFilter::~dChatFilter() {
-	m_Words.clear();
+	m_ApprovedWords.clear();
+	m_DeniedWords.clear();
 }
 
-void dChatFilter::ReadWordlistPlaintext(const std::string& filepath) {
+void dChatFilter::ReadWordlistPlaintext(const std::string& filepath, bool allowList) {
 	std::ifstream file(filepath);
 	if (file) {
 		std::string line;
 		while (std::getline(file, line)) {
+			line.erase(std::remove(line.begin(), line.end(), '\r'), line.end());
 			std::transform(line.begin(), line.end(), line.begin(), ::tolower); //Transform to lowercase
-			m_Words.push_back(CalculateHash(line));
+			if (allowList) m_ApprovedWords.push_back(CalculateHash(line));
+			else m_DeniedWords.push_back(CalculateHash(line));
 		}
 	}
 }
 
-void dChatFilter::ReadWordlistDCF(const std::string& filepath) {
+bool dChatFilter::ReadWordlistDCF(const std::string& filepath, bool allowList) {
 	std::ifstream file(filepath, std::ios::binary);
 	if (file) {
 		fileHeader hdr;
 		BinaryIO::BinaryRead(file, hdr);
 		if (hdr.header != header) {
-			std::cout << "Wrong file header!" << std::endl;
 			file.close();
-			return;
+			return false;
 		}
 
-		if (hdr.formatVersion <= formatVersion) {
+		if (hdr.formatVersion == formatVersion) {
 			size_t wordsToRead = 0;
 			BinaryIO::BinaryRead(file, wordsToRead);
-			m_Words.reserve(wordsToRead);
+			if (allowList) m_ApprovedWords.reserve(wordsToRead);
+			else m_DeniedWords.reserve(wordsToRead);
 
 			size_t word = 0;
 			for (size_t i = 0; i < wordsToRead; ++i) {
 				BinaryIO::BinaryRead(file, word);
-				m_Words.push_back(word);
+				if (allowList) m_ApprovedWords.push_back(word);
+				else m_DeniedWords.push_back(word);
 			}
-		}
-		else {
-			std::cout << "Newer file or corrupt" << std::endl;
+
+			return true;
+		} else {
 			file.close();
-			return;
+			return false;
 		}
 	}
+
+	return false;
 }
 
-void dChatFilter::ExportWordlistToDCF(const std::string& filepath) {
-	std::ofstream file(filepath, std::ios::binary);
+void dChatFilter::ExportWordlistToDCF(const std::string& filepath, bool allowList) {
+	std::ofstream file(filepath, std::ios::binary | std::ios_base::out);
 	if (file) {
 		BinaryIO::BinaryWrite(file, uint32_t(dChatFilterDCF::header));
 		BinaryIO::BinaryWrite(file, uint32_t(dChatFilterDCF::formatVersion));
-		BinaryIO::BinaryWrite(file, size_t(m_Words.size()));
+		BinaryIO::BinaryWrite(file, size_t(allowList ? m_ApprovedWords.size() : m_DeniedWords.size()));
 
-		for (size_t word : m_Words) {
+		for (size_t word : allowList ? m_ApprovedWords : m_DeniedWords) {
 			BinaryIO::BinaryWrite(file, word);
 		}
 
@@ -97,31 +105,45 @@ void dChatFilter::ExportWordlistToDCF(const std::string& filepath) {
 	}
 }
 
-bool dChatFilter::IsSentenceOkay(const std::string& message, int gmLevel) {
-	if (gmLevel > GAME_MASTER_LEVEL_FORUM_MODERATOR) return true; //If anything but a forum mod, return true.
-	if (message.empty()) return true;
+std::vector<std::pair<uint8_t, uint8_t>> dChatFilter::IsSentenceOkay(const std::string& message, eGameMasterLevel gmLevel, bool allowList) {
+	if (gmLevel > eGameMasterLevel::FORUM_MODERATOR) return { }; //If anything but a forum mod, return true.
+	if (message.empty()) return { };
+	if (!allowList && m_DeniedWords.empty()) return { { 0, message.length() } };
 
 	std::stringstream sMessage(message);
 	std::string segment;
 	std::regex reg("(!*|\\?*|\\;*|\\.*|\\,*)");
 
+	std::vector<std::pair<uint8_t, uint8_t>> listOfBadSegments = std::vector<std::pair<uint8_t, uint8_t>>();
+
+	uint32_t position = 0;
+
 	while (std::getline(sMessage, segment, ' ')) {
+		std::string originalSegment = segment;
+
 		std::transform(segment.begin(), segment.end(), segment.begin(), ::tolower); //Transform to lowercase
 		segment = std::regex_replace(segment, reg, "");
 
 		size_t hash = CalculateHash(segment);
 
-		if (std::find(m_UserUnapprovedWordCache.begin(), m_UserUnapprovedWordCache.end(), hash) != m_UserUnapprovedWordCache.end()) {
-			return false;
+		if (std::find(m_UserUnapprovedWordCache.begin(), m_UserUnapprovedWordCache.end(), hash) != m_UserUnapprovedWordCache.end() && allowList) {
+			listOfBadSegments.emplace_back(position, originalSegment.length());
 		}
 
-		if (!IsInWordlist(hash)) {
+		if (std::find(m_ApprovedWords.begin(), m_ApprovedWords.end(), hash) == m_ApprovedWords.end() && allowList) {
 			m_UserUnapprovedWordCache.push_back(hash);
-			return false;
+			listOfBadSegments.emplace_back(position, originalSegment.length());
 		}
+
+		if (std::find(m_DeniedWords.begin(), m_DeniedWords.end(), hash) != m_DeniedWords.end() && !allowList) {
+			m_UserUnapprovedWordCache.push_back(hash);
+			listOfBadSegments.emplace_back(position, originalSegment.length());
+		}
+
+		position += originalSegment.length() + 1;
 	}
 
-	return true;
+	return listOfBadSegments;
 }
 
 size_t dChatFilter::CalculateHash(const std::string& word) {
@@ -131,7 +153,3 @@ size_t dChatFilter::CalculateHash(const std::string& word) {
 
 	return value;
 }
-
-bool dChatFilter::IsInWordlist(size_t word) {
-	return std::find(m_Words.begin(), m_Words.end(), word) != m_Words.end();
-}

dChatFilter/dChatFilter.h

@@ -4,9 +4,10 @@
 
 #include "dCommonVars.h"
 
+enum class eGameMasterLevel : uint8_t;
 namespace dChatFilterDCF {
 	static const uint32_t header = ('D' + ('C' << 8) + ('F' << 16) + ('B' << 24));
-	static const uint32_t formatVersion = 1;
+	static const uint32_t formatVersion = 2;
 
 	struct fileHeader {
 		uint32_t header;
@@ -20,17 +21,17 @@ public:
 	dChatFilter(const std::string& filepath, bool dontGenerateDCF);
 	~dChatFilter();
 
-	void ReadWordlistPlaintext(const std::string & filepath);
-	void ReadWordlistDCF(const std::string & filepath);
-	void ExportWordlistToDCF(const std::string & filepath);
-	bool IsSentenceOkay(const std::string& message, int gmLevel);
+	void ReadWordlistPlaintext(const std::string& filepath, bool allowList);
+	bool ReadWordlistDCF(const std::string& filepath, bool allowList);
+	void ExportWordlistToDCF(const std::string& filepath, bool allowList);
+	std::vector<std::pair<uint8_t, uint8_t>> IsSentenceOkay(const std::string& message, eGameMasterLevel gmLevel, bool allowList = true);
 
 private:
 	bool m_DontGenerateDCF;
-	std::vector<size_t> m_Words;
+	std::vector<size_t> m_DeniedWords;
+	std::vector<size_t> m_ApprovedWords;
 	std::vector<size_t> m_UserUnapprovedWordCache;
 
 	//Private functions:
 	size_t CalculateHash(const std::string& word);
-	bool IsInWordlist(size_t word);
 };

dChatServer/CMakeLists.txt

@@ -0,0 +1,16 @@
+set(DCHATSERVER_SOURCES
+	"ChatIgnoreList.cpp"
+	"ChatPacketHandler.cpp"
+	"PlayerContainer.cpp"
+)
+
+add_executable(ChatServer "ChatServer.cpp")
+target_include_directories(ChatServer PRIVATE "${PROJECT_SOURCE_DIR}/dChatFilter")
+add_compile_definitions(ChatServer PRIVATE PROJECT_VERSION="\"${PROJECT_VERSION}\"")
+
+add_library(dChatServer ${DCHATSERVER_SOURCES})
+target_include_directories(dChatServer PRIVATE "${PROJECT_SOURCE_DIR}/dServer")
+
+target_link_libraries(dChatServer ${COMMON_LIBRARIES} dChatFilter)
+target_link_libraries(ChatServer ${COMMON_LIBRARIES} dChatFilter dChatServer dServer)
+

dChatServer/ChatIgnoreList.cpp

@@ -0,0 +1,171 @@
+#include "ChatIgnoreList.h"
+#include "PlayerContainer.h"
+#include "eChatMessageType.h"
+#include "BitStreamUtils.h"
+#include "Game.h"
+#include "Logger.h"
+#include "eObjectBits.h"
+
+#include "Database.h"
+
+// A note to future readers, The client handles all the actual ignoring logic:
+// not allowing teams, rejecting DMs, friends requets etc.
+// The only thing not auto-handled is instance activities force joining the team on the server.
+
+void WriteOutgoingReplyHeader(RakNet::BitStream& bitStream, const LWOOBJID& receivingPlayer, const ChatIgnoreList::Response type) {
+	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CHAT,  eChatMessageType::WORLD_ROUTE_PACKET);
+	bitStream.Write(receivingPlayer);
+
+	//portion that will get routed:
+	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CLIENT, type);
+}
+
+void ChatIgnoreList::GetIgnoreList(Packet* packet) {
+	CINSTREAM_SKIP_HEADER;
+	LWOOBJID playerId;
+	inStream.Read(playerId);
+
+	auto& receiver = Game::playerContainer.GetPlayerDataMutable(playerId);
+	if (!receiver) {
+		LOG("Tried to get ignore list, but player %llu not found in container", playerId);
+		return;
+	}
+
+	if (!receiver.ignoredPlayers.empty()) {
+		LOG_DEBUG("Player %llu already has an ignore list, but is requesting it again.", playerId);
+	} else {
+		auto ignoreList = Database::Get()->GetIgnoreList(static_cast<uint32_t>(playerId));
+		if (ignoreList.empty()) {
+			LOG_DEBUG("Player %llu has no ignores", playerId);
+			return;
+		}
+
+		for (auto& ignoredPlayer : ignoreList) {
+			receiver.ignoredPlayers.emplace_back(ignoredPlayer.name, ignoredPlayer.id);
+			GeneralUtils::SetBit(receiver.ignoredPlayers.back().playerId, eObjectBits::CHARACTER);
+			GeneralUtils::SetBit(receiver.ignoredPlayers.back().playerId, eObjectBits::PERSISTENT);
+		}
+	}
+
+	CBITSTREAM;
+	WriteOutgoingReplyHeader(bitStream, receiver.playerID, ChatIgnoreList::Response::GET_IGNORE);
+
+	bitStream.Write<uint8_t>(false); // Probably is Is Free Trial, but we don't care about that
+	bitStream.Write<uint16_t>(0); // literally spacing due to struct alignment
+
+	bitStream.Write<uint16_t>(receiver.ignoredPlayers.size());
+	for (const auto& ignoredPlayer : receiver.ignoredPlayers) {
+		bitStream.Write(ignoredPlayer.playerId);
+		bitStream.Write(LUWString(ignoredPlayer.playerName, 36));
+	}
+
+	Game::server->Send(bitStream, packet->systemAddress, false);
+}
+
+void ChatIgnoreList::AddIgnore(Packet* packet) {
+	CINSTREAM_SKIP_HEADER;
+	LWOOBJID playerId;
+	inStream.Read(playerId);
+
+	auto& receiver = Game::playerContainer.GetPlayerDataMutable(playerId);
+	if (!receiver) {
+		LOG("Tried to get ignore list, but player %llu not found in container", playerId);
+		return;
+	}
+
+	constexpr int32_t MAX_IGNORES = 32;
+	if (receiver.ignoredPlayers.size() > MAX_IGNORES) {
+		LOG_DEBUG("Player %llu has too many ignores", playerId);
+		return;
+	}
+
+	inStream.IgnoreBytes(4); // ignore some garbage zeros idk
+
+	LUWString toIgnoreName;
+	inStream.Read(toIgnoreName);
+	std::string toIgnoreStr = toIgnoreName.GetAsString();
+
+	CBITSTREAM;
+	WriteOutgoingReplyHeader(bitStream, receiver.playerID, ChatIgnoreList::Response::ADD_IGNORE);
+
+	// Check if the player exists
+	LWOOBJID ignoredPlayerId = LWOOBJID_EMPTY;
+	if (toIgnoreStr == receiver.playerName || toIgnoreStr.find("[GM]") == 0) {
+		LOG_DEBUG("Player %llu tried to ignore themselves", playerId);
+
+		bitStream.Write(ChatIgnoreList::AddResponse::GENERAL_ERROR);
+	} else if (std::count(receiver.ignoredPlayers.begin(), receiver.ignoredPlayers.end(), toIgnoreStr) > 0) {
+		LOG_DEBUG("Player %llu is already ignoring %s", playerId, toIgnoreStr.c_str());
+
+		bitStream.Write(ChatIgnoreList::AddResponse::ALREADY_IGNORED);
+	} else {
+		// Get the playerId falling back to query if not online
+		const auto& playerData = Game::playerContainer.GetPlayerData(toIgnoreStr);
+		if (!playerData) {
+			// Fall back to query
+			auto player = Database::Get()->GetCharacterInfo(toIgnoreStr);
+			if (!player || player->name != toIgnoreStr) {
+				LOG_DEBUG("Player %s not found", toIgnoreStr.c_str());
+			} else {
+				ignoredPlayerId = player->id;
+			}
+		} else {
+			ignoredPlayerId = playerData.playerID;
+		}
+
+		if (ignoredPlayerId != LWOOBJID_EMPTY) {
+			Database::Get()->AddIgnore(static_cast<uint32_t>(playerId), static_cast<uint32_t>(ignoredPlayerId));
+			GeneralUtils::SetBit(ignoredPlayerId, eObjectBits::CHARACTER);
+			GeneralUtils::SetBit(ignoredPlayerId, eObjectBits::PERSISTENT);
+
+			receiver.ignoredPlayers.emplace_back(toIgnoreStr, ignoredPlayerId);
+			LOG_DEBUG("Player %llu is ignoring %s", playerId, toIgnoreStr.c_str());
+
+			bitStream.Write(ChatIgnoreList::AddResponse::SUCCESS);
+		} else {
+			bitStream.Write(ChatIgnoreList::AddResponse::PLAYER_NOT_FOUND);
+		}
+	}
+
+	LUWString playerNameSend(toIgnoreStr, 33);
+	bitStream.Write(playerNameSend);
+	bitStream.Write(ignoredPlayerId);
+
+	Game::server->Send(bitStream, packet->systemAddress, false);
+}
+
+void ChatIgnoreList::RemoveIgnore(Packet* packet) {
+	CINSTREAM_SKIP_HEADER;
+	LWOOBJID playerId;
+	inStream.Read(playerId);
+
+	auto& receiver = Game::playerContainer.GetPlayerDataMutable(playerId);
+	if (!receiver) {
+		LOG("Tried to get ignore list, but player %llu not found in container", playerId);
+		return;
+	}
+
+	inStream.IgnoreBytes(4); // ignore some garbage zeros idk
+
+	LUWString removedIgnoreName;
+	inStream.Read(removedIgnoreName);
+	std::string removedIgnoreStr = removedIgnoreName.GetAsString();
+
+	auto toRemove = std::remove(receiver.ignoredPlayers.begin(), receiver.ignoredPlayers.end(), removedIgnoreStr);
+	if (toRemove == receiver.ignoredPlayers.end()) {
+		LOG_DEBUG("Player %llu is not ignoring %s", playerId, removedIgnoreStr.c_str());
+		return;
+	}
+
+	Database::Get()->RemoveIgnore(static_cast<uint32_t>(playerId), static_cast<uint32_t>(toRemove->playerId));
+	receiver.ignoredPlayers.erase(toRemove, receiver.ignoredPlayers.end());
+
+	CBITSTREAM;
+	WriteOutgoingReplyHeader(bitStream, receiver.playerID, ChatIgnoreList::Response::REMOVE_IGNORE);
+
+	bitStream.Write<int8_t>(0);
+	LUWString playerNameSend(removedIgnoreStr, 33);
+	bitStream.Write(playerNameSend);
+
+	Game::server->Send(bitStream, packet->systemAddress, false);
+}

dChatServer/ChatIgnoreList.h

@@ -0,0 +1,27 @@
+#ifndef __CHATIGNORELIST__H__
+#define __CHATIGNORELIST__H__
+
+struct Packet;
+
+#include <cstdint>
+
+namespace ChatIgnoreList {
+	void GetIgnoreList(Packet* packet);
+	void AddIgnore(Packet* packet);
+	void RemoveIgnore(Packet* packet);
+
+	enum class Response : uint8_t {
+		ADD_IGNORE = 32,
+		REMOVE_IGNORE = 33,
+		GET_IGNORE = 34,
+	};
+
+	enum class AddResponse : uint8_t {
+		SUCCESS,
+		ALREADY_IGNORED,
+		PLAYER_NOT_FOUND,
+		GENERAL_ERROR,
+	};
+};
+
+#endif  //!__CHATIGNORELIST__H__

dChatServer/ChatPacketHandler.h

@@ -5,14 +5,55 @@
 
 struct PlayerData;
 
+enum class eAddFriendResponseType : uint8_t;
+
+enum class eChatChannel : uint8_t {
+	SYSTEMNOTIFY = 0,
+	SYSTEMWARNING,
+	SYSTEMERROR,
+	BROADCAST,
+	LOCAL,
+	LOCALNOANIM,
+	EMOTE,
+	PRIVATE_CHAT,
+	TEAM,
+	TEAMLOCAL,
+	GUILD,
+	GUILDNOTIFY,
+	PROPERTY,
+	ADMIN,
+	COMBATDAMAGE,
+	COMBATHEALING,
+	COMBATLOOT,
+	COMBATEXP,
+	COMBATDEATH,
+	GENERAL,
+	TRADE,
+	LFG,
+	USER
+};
+
+
+enum class eChatMessageResponseCode : uint8_t {
+    SENT = 0,
+    NOTONLINE,
+    GENERALERROR,
+    RECEIVEDNEWWHISPER,
+    NOTFRIENDS,
+    SENDERFREETRIAL,
+    RECEIVERFREETRIAL,
+};
+
 namespace ChatPacketHandler {
 	void HandleFriendlistRequest(Packet* packet);
 	void HandleFriendRequest(Packet* packet);
 	void HandleFriendResponse(Packet* packet);
 	void HandleRemoveFriend(Packet* packet);
+	void HandleGMLevelUpdate(Packet* packet);
 
 	void HandleChatMessage(Packet* packet);
 	void HandlePrivateChatMessage(Packet* packet);
+	void SendPrivateChatMessage(const PlayerData& sender, const PlayerData& receiver, const PlayerData& routeTo, const LUWString& message, const eChatChannel channel, const eChatMessageResponseCode responseCode);
 
 	void HandleTeamInvite(Packet* packet);
 	void HandleTeamInviteResponse(Packet* packet);
@@ -22,19 +63,18 @@ namespace ChatPacketHandler {
 	void HandleTeamLootOption(Packet* packet);
 	void HandleTeamStatusRequest(Packet* packet);
 
-	void SendTeamInvite(PlayerData* receiver, PlayerData* sender);
-	void SendTeamInviteConfirm(PlayerData* receiver, bool bLeaderIsFreeTrial, LWOOBJID i64LeaderID, LWOZONEID i64LeaderZoneID, uint8_t ucLootFlag, uint8_t ucNumOfOtherPlayers, uint8_t ucResponseCode, std::u16string wsLeaderName);
-	void SendTeamStatus(PlayerData* receiver, LWOOBJID i64LeaderID, LWOZONEID i64LeaderZoneID, uint8_t ucLootFlag, uint8_t ucNumOfOtherPlayers, std::u16string wsLeaderName);
-	void SendTeamSetLeader(PlayerData* receiver, LWOOBJID i64PlayerID);
-	void SendTeamAddPlayer(PlayerData* receiver, bool bIsFreeTrial, bool bLocal, bool bNoLootOnDeath, LWOOBJID i64PlayerID, std::u16string wsPlayerName, LWOZONEID zoneID);
-	void SendTeamRemovePlayer(PlayerData* receiver, bool bDisband, bool bIsKicked, bool bIsLeaving, bool bLocal, LWOOBJID i64LeaderID, LWOOBJID i64PlayerID, std::u16string wsPlayerName);
-	void SendTeamSetOffWorldFlag(PlayerData* receiver, LWOOBJID i64PlayerID, LWOZONEID zoneID);
+	void SendTeamInvite(const PlayerData& receiver, const PlayerData& sender);
+	void SendTeamInviteConfirm(const PlayerData& receiver, bool bLeaderIsFreeTrial, LWOOBJID i64LeaderID, LWOZONEID i64LeaderZoneID, uint8_t ucLootFlag, uint8_t ucNumOfOtherPlayers, uint8_t ucResponseCode, std::u16string wsLeaderName);
+	void SendTeamStatus(const PlayerData& receiver, LWOOBJID i64LeaderID, LWOZONEID i64LeaderZoneID, uint8_t ucLootFlag, uint8_t ucNumOfOtherPlayers, std::u16string wsLeaderName);
+	void SendTeamSetLeader(const PlayerData& receiver, LWOOBJID i64PlayerID);
+	void SendTeamAddPlayer(const PlayerData& receiver, bool bIsFreeTrial, bool bLocal, bool bNoLootOnDeath, LWOOBJID i64PlayerID, std::u16string wsPlayerName, LWOZONEID zoneID);
+	void SendTeamRemovePlayer(const PlayerData& receiver, bool bDisband, bool bIsKicked, bool bIsLeaving, bool bLocal, LWOOBJID i64LeaderID, LWOOBJID i64PlayerID, std::u16string wsPlayerName);
+	void SendTeamSetOffWorldFlag(const PlayerData& receiver, LWOOBJID i64PlayerID, LWOZONEID zoneID);
 
 	//FriendData is the player we're SENDING this stuff to. Player is the friend that changed state.
-	void SendFriendUpdate(PlayerData* friendData, PlayerData* playerData, uint8_t notifyType);
+	void SendFriendUpdate(const PlayerData& friendData, const PlayerData& playerData, uint8_t notifyType, uint8_t isBestFriend);
 
-	void SendFriendRequest(PlayerData* receiver, PlayerData* sender, bool isBFFReq = false);
-	void SendFriendResponse(PlayerData* receiver, PlayerData* sender, uint8_t responseCode = 3);
-	void SendRemoveFriend(PlayerData* receiver, std::string& personToRemove, bool isSuccessful);
+	void SendFriendRequest(const PlayerData& receiver, const PlayerData& sender);
+	void SendFriendResponse(const PlayerData& receiver, const PlayerData& sender, eAddFriendResponseType responseCode, uint8_t isBestFriendsAlready = 0U, uint8_t isBestFriendRequest = 0U);
+	void SendRemoveFriend(const PlayerData& receiver, std::string& personToRemove, bool isSuccessful);
 };
-

dChatServer/ChatServer.cpp

@@ -6,105 +6,131 @@
 //DLU Includes:
 #include "dCommonVars.h"
 #include "dServer.h"
-#include "dLogger.h"
+#include "Logger.h"
 #include "Database.h"
 #include "dConfig.h"
-#include "dMessageIdentifiers.h"
 #include "dChatFilter.h"
 #include "Diagnostics.h"
-
+#include "AssetManager.h"
+#include "BinaryPathFinder.h"
+#include "eConnectionType.h"
 #include "PlayerContainer.h"
 #include "ChatPacketHandler.h"
+#include "eChatMessageType.h"
+#include "eWorldMessageType.h"
+#include "ChatIgnoreList.h"
+#include "StringifiedEnum.h"
 
 #include "Game.h"
-namespace Game {
-	dLogger* logger;
-	dServer* server;
-	dConfig* config;
-	dChatFilter* chatFilter;
-}
+#include "Server.h"
 
 //RakNet includes:
 #include "RakNetDefines.h"
+#include "MessageIdentifiers.h"
+
+namespace Game {
+	Logger* logger = nullptr;
+	dServer* server = nullptr;
+	dConfig* config = nullptr;
+	dChatFilter* chatFilter = nullptr;
+	AssetManager* assetManager = nullptr;
+	Game::signal_t lastSignal = 0;
+	std::mt19937 randomEngine;
+	PlayerContainer playerContainer;
+}
 
-dLogger* SetupLogger();
 void HandlePacket(Packet* packet);
 
-PlayerContainer playerContainer;
-
 int main(int argc, char** argv) {
+	constexpr uint32_t chatFramerate = mediumFramerate;
+	constexpr uint32_t chatFrameDelta = mediumFrameDelta;
 	Diagnostics::SetProcessName("Chat");
 	Diagnostics::SetProcessFileName(argv[0]);
 	Diagnostics::Initialize();
 
+	std::signal(SIGINT, Game::OnSignal);
+	std::signal(SIGTERM, Game::OnSignal);
+
+	Game::config = new dConfig("chatconfig.ini");
+
 	//Create all the objects we need to run our service:
-	Game::logger = SetupLogger();
-	if (!Game::logger) return 0;
-	Game::logger->Log("ChatServer", "Starting Chat server...\n");
-	Game::logger->Log("ChatServer", "Version: %i.%i\n", PROJECT_VERSION_MAJOR, PROJECT_VERSION_MINOR);
-	Game::logger->Log("ChatServer", "Compiled on: %s\n", __TIMESTAMP__);
+	Server::SetupLogger("ChatServer");
+	if (!Game::logger) return EXIT_FAILURE;
 
 	//Read our config:
-	dConfig config("chatconfig.ini");
-	Game::config = &config;
-	Game::logger->SetLogToConsole(bool(std::stoi(config.GetValue("log_to_console"))));
 
-	//Connect to the MySQL Database
-	std::string mysql_host = config.GetValue("mysql_host");
-	std::string mysql_database = config.GetValue("mysql_database");
-	std::string mysql_username = config.GetValue("mysql_username");
-	std::string mysql_password = config.GetValue("mysql_password");
+	LOG("Starting Chat server...");
+	LOG("Version: %s", PROJECT_VERSION);
+	LOG("Compiled on: %s", __TIMESTAMP__);
 
 	try {
-		Database::Connect(mysql_host, mysql_database, mysql_username, mysql_password);
+		std::string clientPathStr = Game::config->GetValue("client_location");
+		if (clientPathStr.empty()) clientPathStr = "./res";
+		std::filesystem::path clientPath = std::filesystem::path(clientPathStr);
+		if (clientPath.is_relative()) {
+			clientPath = BinaryPathFinder::GetBinaryDir() / clientPath;
+		}
+
+		Game::assetManager = new AssetManager(clientPath);
+	} catch (std::runtime_error& ex) {
+		LOG("Got an error while setting up assets: %s", ex.what());
+
+		return EXIT_FAILURE;
 	}
-	catch (sql::SQLException& ex) {
-		Game::logger->Log("ChatServer", "Got an error while connecting to the database: %s\n", ex.what());
-		Database::Destroy();
+
+	//Connect to the MySQL Database
+	try {
+		Database::Connect();
+	} catch (sql::SQLException& ex) {
+		LOG("Got an error while connecting to the database: %s", ex.what());
+		Database::Destroy("ChatServer");
 		delete Game::server;
 		delete Game::logger;
-		return 0;
+		return EXIT_FAILURE;
 	}
 
 	//Find out the master's IP:
 	std::string masterIP;
-	int masterPort = 1000;
-	sql::PreparedStatement* stmt = Database::CreatePreppedStmt("SELECT ip, port FROM servers WHERE name='master';");
-	auto res = stmt->executeQuery();
-	while (res->next()) {
-		masterIP = res->getString(1).c_str();
-		masterPort = res->getInt(2);
+	uint32_t masterPort = 1000;
+	auto masterInfo = Database::Get()->GetMasterInfo();
+	if (masterInfo) {
+		masterIP = masterInfo->ip;
+		masterPort = masterInfo->port;
 	}
-
-	delete res;
-	delete stmt;
-
 	//It's safe to pass 'localhost' here, as the IP is only used as the external IP.
-	int maxClients = 50;
-	int ourPort = 1501;
-	if (config.GetValue("max_clients") != "") maxClients = std::stoi(config.GetValue("max_clients"));
-	if (config.GetValue("port") != "") ourPort = std::atoi(config.GetValue("port").c_str());
+	std::string ourIP = "localhost";
+	const uint32_t maxClients = GeneralUtils::TryParse<uint32_t>(Game::config->GetValue("max_clients")).value_or(999);
+	const uint32_t ourPort = GeneralUtils::TryParse<uint32_t>(Game::config->GetValue("chat_server_port")).value_or(2005);
+	const auto externalIPString = Game::config->GetValue("external_ip");
+	if (!externalIPString.empty()) ourIP = externalIPString;
 
-	Game::server = new dServer(config.GetValue("external_ip"), ourPort, 0, maxClients, false, true, Game::logger, masterIP, masterPort, ServerType::Chat);
+	Game::server = new dServer(ourIP, ourPort, 0, maxClients, false, true, Game::logger, masterIP, masterPort, ServerType::Chat, Game::config, &Game::lastSignal);
 
-	Game::chatFilter = new dChatFilter("./res/chatplus_en_us", bool(std::stoi(config.GetValue("dont_generate_dcf"))));
+	const bool dontGenerateDCF = GeneralUtils::TryParse<bool>(Game::config->GetValue("dont_generate_dcf")).value_or(false);
+	Game::chatFilter = new dChatFilter(Game::assetManager->GetResPath().string() + "/chatplus_en_us", dontGenerateDCF);
+	
+	Game::randomEngine = std::mt19937(time(0));
+
+	Game::playerContainer.Initialize();
 
 	//Run it until server gets a kill message from Master:
 	auto t = std::chrono::high_resolution_clock::now();
 	Packet* packet = nullptr;
-	int framesSinceLastFlush = 0;
-	int framesSinceMasterDisconnect = 0;
-	int framesSinceLastSQLPing = 0;
+	constexpr uint32_t logFlushTime = 30 * chatFramerate; // 30 seconds in frames
+	constexpr uint32_t sqlPingTime = 10 * 60 * chatFramerate; // 10 minutes in frames
+	uint32_t framesSinceLastFlush = 0;
+	uint32_t framesSinceMasterDisconnect = 0;
+	uint32_t framesSinceLastSQLPing = 0;
 
-	while (true) {
+	Game::logger->Flush(); // once immediately before main loop
+	while (!Game::ShouldShutdown()) {
 		//Check if we're still connected to master:
 		if (!Game::server->GetIsConnectedToMaster()) {
 			framesSinceMasterDisconnect++;
 
-			if (framesSinceMasterDisconnect >= 30)
+			if (framesSinceMasterDisconnect >= chatFramerate)
 				break; //Exit our loop, shut down.
-		}
-		else framesSinceMasterDisconnect = 0;
+		} else framesSinceMasterDisconnect = 0;
 
 		//In world we'd update our other systems here.
 
@@ -118,171 +144,198 @@ int main(int argc, char** argv) {
 		}
 
 		//Push our log every 30s:
-		if (framesSinceLastFlush >= 900) {
+		if (framesSinceLastFlush >= logFlushTime) {
 			Game::logger->Flush();
 			framesSinceLastFlush = 0;
-		}
-		else framesSinceLastFlush++;
+		} else framesSinceLastFlush++;
 
 		//Every 10 min we ping our sql server to keep it alive hopefully:
-		if (framesSinceLastSQLPing >= 40000) {
+		if (framesSinceLastSQLPing >= sqlPingTime) {
 			//Find out the master's IP for absolutely no reason:
 			std::string masterIP;
-			int masterPort;
-			sql::PreparedStatement* stmt = Database::CreatePreppedStmt("SELECT ip, port FROM servers WHERE name='master';");
-			auto res = stmt->executeQuery();
-			while (res->next()) {
-				masterIP = res->getString(1).c_str();
-				masterPort = res->getInt(2);
+			uint32_t masterPort;
+
+			auto masterInfo = Database::Get()->GetMasterInfo();
+			if (masterInfo) {
+				masterIP = masterInfo->ip;
+				masterPort = masterInfo->port;
 			}
 
-			delete res;
-			delete stmt;
-
 			framesSinceLastSQLPing = 0;
-		}
-		else framesSinceLastSQLPing++;
+		} else framesSinceLastSQLPing++;
 
 		//Sleep our thread since auth can afford to.
-		t += std::chrono::milliseconds(mediumFramerate); //Chat can run at a lower "fps"
+		t += std::chrono::milliseconds(chatFrameDelta); //Chat can run at a lower "fps"
 		std::this_thread::sleep_until(t);
 	}
 
 	//Delete our objects here:
-	Database::Destroy();
+	Database::Destroy("ChatServer");
 	delete Game::server;
 	delete Game::logger;
+	delete Game::config;
 
-	return 0;
-}
-
-dLogger* SetupLogger() {
-	std::string logPath = "./logs/ChatServer_" + std::to_string(time(nullptr)) + ".log";
-	bool logToConsole = false;
-#ifdef _DEBUG
-	logToConsole = true;
-#endif
-
-	return new dLogger(logPath, logToConsole);
+	return EXIT_SUCCESS;
 }
 
 void HandlePacket(Packet* packet) {
 	if (packet->data[0] == ID_DISCONNECTION_NOTIFICATION || packet->data[0] == ID_CONNECTION_LOST) {
-		Game::logger->Log("ChatServer", "A server has disconnected, erasing their connected players from the list.\n");
-	}
+		LOG("A server has disconnected, erasing their connected players from the list.");
+	} else if (packet->data[0] == ID_NEW_INCOMING_CONNECTION) {
+		LOG("A server is connecting, awaiting user list.");
+	} else if (packet->length < 4 || packet->data[0] != ID_USER_PACKET_ENUM) return; // Nothing left to process or not the right packet type
 
-	if (packet->data[0] == ID_NEW_INCOMING_CONNECTION) {
-		Game::logger->Log("ChatServer", "A server is connecting, awaiting user list.\n");
-	}
+	CINSTREAM;
+	inStream.SetReadOffset(BYTES_TO_BITS(1));
 
-	if (packet->data[1] == CHAT_INTERNAL) {
-		switch (packet->data[3]) {
-		case MSG_CHAT_INTERNAL_PLAYER_ADDED_NOTIFICATION:
-			playerContainer.InsertPlayer(packet);
+	eConnectionType connection;
+	eChatMessageType chatMessageID;
+
+	inStream.Read(connection);
+	if (connection != eConnectionType::CHAT) return;
+	inStream.Read(chatMessageID);
+	
+	switch (chatMessageID) {
+		case eChatMessageType::GM_MUTE:
+			Game::playerContainer.MuteUpdate(packet);
 			break;
 
-		case MSG_CHAT_INTERNAL_PLAYER_REMOVED_NOTIFICATION:
-			playerContainer.RemovePlayer(packet);
+		case eChatMessageType::CREATE_TEAM:
+			Game::playerContainer.CreateTeamServer(packet);
 			break;
 
-		case MSG_CHAT_INTERNAL_MUTE_UPDATE:
-			playerContainer.MuteUpdate(packet);
-			break;
-
-		case MSG_CHAT_INTERNAL_CREATE_TEAM:
-			playerContainer.CreateTeamServer(packet);
-			break;
-
-		case MSG_CHAT_INTERNAL_ANNOUNCEMENT: {
-			//we just forward this packet to every connected server
-			CINSTREAM;
-			Game::server->Send(&inStream, packet->systemAddress, true); //send to everyone except origin
-			break;
-		}
-
-		default:
-			Game::logger->Log("ChatServer", "Unknown CHAT_INTERNAL id: %i\n", int(packet->data[3]));
-		}
-	}
-
-	if (packet->data[1] == CHAT) {
-		switch (packet->data[3]) {
-		case MSG_CHAT_GET_FRIENDS_LIST:
+		case eChatMessageType::GET_FRIENDS_LIST:
 			ChatPacketHandler::HandleFriendlistRequest(packet);
 			break;
 
-		case MSG_CHAT_GET_IGNORE_LIST:
-			Game::logger->Log("ChatServer", "Asked for ignore list, but is unimplemented right now.\n");
+		case eChatMessageType::GET_IGNORE_LIST:
+			ChatIgnoreList::GetIgnoreList(packet);
 			break;
 
-		case MSG_CHAT_TEAM_GET_STATUS:
+		case eChatMessageType::ADD_IGNORE:
+			ChatIgnoreList::AddIgnore(packet);
+			break;
+
+		case eChatMessageType::REMOVE_IGNORE:
+			ChatIgnoreList::RemoveIgnore(packet);
+			break;
+
+		case eChatMessageType::TEAM_GET_STATUS:
 			ChatPacketHandler::HandleTeamStatusRequest(packet);
 			break;
 
-		case MSG_CHAT_ADD_FRIEND_REQUEST:
+		case eChatMessageType::ADD_FRIEND_REQUEST:
 			//this involves someone sending the initial request, the response is below, response as in from the other player.
 			//We basically just check to see if this player is online or not and route the packet.
 			ChatPacketHandler::HandleFriendRequest(packet);
 			break;
 
-		case MSG_CHAT_ADD_FRIEND_RESPONSE:
+		case eChatMessageType::ADD_FRIEND_RESPONSE:
 			//This isn't the response a server sent, rather it is a player's response to a received request.
 			//Here, we'll actually have to add them to eachother's friend lists depending on the response code.
 			ChatPacketHandler::HandleFriendResponse(packet);
 			break;
 
-		case MSG_CHAT_REMOVE_FRIEND:
+		case eChatMessageType::REMOVE_FRIEND:
 			ChatPacketHandler::HandleRemoveFriend(packet);
 			break;
 
-		case MSG_CHAT_GENERAL_CHAT_MESSAGE:
+		case eChatMessageType::GENERAL_CHAT_MESSAGE:
 			ChatPacketHandler::HandleChatMessage(packet);
 			break;
 
-		case MSG_CHAT_PRIVATE_CHAT_MESSAGE:
+		case eChatMessageType::PRIVATE_CHAT_MESSAGE:
 			//This message is supposed to be echo'd to both the sender and the receiver
 			//BUT: they have to have different responseCodes, so we'll do some of the ol hacky wacky to fix that right up.
 			ChatPacketHandler::HandlePrivateChatMessage(packet);
 			break;
 
-		case MSG_CHAT_TEAM_INVITE:
+		case eChatMessageType::TEAM_INVITE:
 			ChatPacketHandler::HandleTeamInvite(packet);
 			break;
 
-		case MSG_CHAT_TEAM_INVITE_RESPONSE:
+		case eChatMessageType::TEAM_INVITE_RESPONSE:
 			ChatPacketHandler::HandleTeamInviteResponse(packet);
 			break;
 
-		case MSG_CHAT_TEAM_LEAVE:
+		case eChatMessageType::TEAM_LEAVE:
 			ChatPacketHandler::HandleTeamLeave(packet);
 			break;
 
-		case MSG_CHAT_TEAM_SET_LEADER:
+		case eChatMessageType::TEAM_SET_LEADER:
 			ChatPacketHandler::HandleTeamPromote(packet);
 			break;
 
-		case MSG_CHAT_TEAM_KICK:
+		case eChatMessageType::TEAM_KICK:
 			ChatPacketHandler::HandleTeamKick(packet);
 			break;
 
-		case MSG_CHAT_TEAM_SET_LOOT:
+		case eChatMessageType::TEAM_SET_LOOT:
 			ChatPacketHandler::HandleTeamLootOption(packet);
 			break;
-		
-		default:
-			Game::logger->Log("ChatServer", "Unknown CHAT id: %i\n", int(packet->data[3]));
-		}
-	}
-
-	if (packet->data[1] == WORLD) {
-		switch (packet->data[3]) {
-		case MSG_WORLD_CLIENT_ROUTE_PACKET: {
-			printf("routing packet from world\n");
+		case eChatMessageType::GMLEVEL_UPDATE:
+			ChatPacketHandler::HandleGMLevelUpdate(packet);
+			break;
+		case eChatMessageType::LOGIN_SESSION_NOTIFY:
+			Game::playerContainer.InsertPlayer(packet);
+			break;
+		case eChatMessageType::GM_ANNOUNCE:{
+			// we just forward this packet to every connected server
+			inStream.ResetReadPointer();
+			Game::server->Send(inStream, packet->systemAddress, true); // send to everyone except origin
+			}
+			break;
+		case eChatMessageType::UNEXPECTED_DISCONNECT:
+			Game::playerContainer.RemovePlayer(packet);
+			break;
+		case eChatMessageType::WHO:
+		case eChatMessageType::SHOW_ALL:
+		case eChatMessageType::USER_CHANNEL_CHAT_MESSAGE:
+		case eChatMessageType::WORLD_DISCONNECT_REQUEST:
+		case eChatMessageType::WORLD_PROXIMITY_RESPONSE:
+		case eChatMessageType::WORLD_PARCEL_RESPONSE:
+		case eChatMessageType::TEAM_MISSED_INVITE_CHECK:
+		case eChatMessageType::GUILD_CREATE:
+		case eChatMessageType::GUILD_INVITE:
+		case eChatMessageType::GUILD_INVITE_RESPONSE:
+		case eChatMessageType::GUILD_LEAVE:
+		case eChatMessageType::GUILD_KICK:
+		case eChatMessageType::GUILD_GET_STATUS:
+		case eChatMessageType::GUILD_GET_ALL:
+		case eChatMessageType::BLUEPRINT_MODERATED:
+		case eChatMessageType::BLUEPRINT_MODEL_READY:
+		case eChatMessageType::PROPERTY_READY_FOR_APPROVAL:
+		case eChatMessageType::PROPERTY_MODERATION_CHANGED:
+		case eChatMessageType::PROPERTY_BUILDMODE_CHANGED:
+		case eChatMessageType::PROPERTY_BUILDMODE_CHANGED_REPORT:
+		case eChatMessageType::MAIL:
+		case eChatMessageType::WORLD_INSTANCE_LOCATION_REQUEST:
+		case eChatMessageType::REPUTATION_UPDATE:
+		case eChatMessageType::SEND_CANNED_TEXT:
+		case eChatMessageType::CHARACTER_NAME_CHANGE_REQUEST:
+		case eChatMessageType::CSR_REQUEST:
+		case eChatMessageType::CSR_REPLY:
+		case eChatMessageType::GM_KICK:
+		case eChatMessageType::WORLD_ROUTE_PACKET:
+		case eChatMessageType::GET_ZONE_POPULATIONS:
+		case eChatMessageType::REQUEST_MINIMUM_CHAT_MODE:
+		case eChatMessageType::MATCH_REQUEST:
+		case eChatMessageType::UGCMANIFEST_REPORT_MISSING_FILE:
+		case eChatMessageType::UGCMANIFEST_REPORT_DONE_FILE:
+		case eChatMessageType::UGCMANIFEST_REPORT_DONE_BLUEPRINT:
+		case eChatMessageType::UGCC_REQUEST:
+		case eChatMessageType::WORLD_PLAYERS_PET_MODERATED_ACKNOWLEDGE:
+		case eChatMessageType::ACHIEVEMENT_NOTIFY:
+		case eChatMessageType::GM_CLOSE_PRIVATE_CHAT_WINDOW:
+		case eChatMessageType::PLAYER_READY:
+		case eChatMessageType::GET_DONATION_TOTAL:
+		case eChatMessageType::UPDATE_DONATION:
+		case eChatMessageType::PRG_CSR_COMMAND:
+		case eChatMessageType::HEARTBEAT_REQUEST_FROM_WORLD:
+		case eChatMessageType::UPDATE_FREE_TRIAL_STATUS:
+			LOG("Unhandled CHAT Message id: %s (%i)", StringifiedEnum::ToString(chatMessageID).data(), chatMessageID);
 			break;
-		}
-
 		default:
-			Game::logger->Log("ChatServer", "Unknown World id: %i\n", int(packet->data[3]));
-		}
+			LOG("Unknown CHAT Message id: %i", chatMessageID);
 	}
 }

dChatServer/PlayerContainer.cpp

@@ -3,125 +3,119 @@
 #include <iostream>
 #include <algorithm>
 #include "Game.h"
-#include "dLogger.h"
+#include "Logger.h"
 #include "ChatPacketHandler.h"
 #include "GeneralUtils.h"
-#include "dMessageIdentifiers.h"
-#include "PacketUtils.h"
+#include "BitStreamUtils.h"
 #include "Database.h"
+#include "eConnectionType.h"
+#include "ChatPackets.h"
+#include "dConfig.h"
+#include "eChatMessageType.h"
 
-PlayerContainer::PlayerContainer() {
+void PlayerContainer::Initialize() {
+	m_MaxNumberOfBestFriends =
+		GeneralUtils::TryParse<uint32_t>(Game::config->GetValue("max_number_of_best_friends")).value_or(m_MaxNumberOfBestFriends);
+	m_MaxNumberOfFriends =
+		GeneralUtils::TryParse<uint32_t>(Game::config->GetValue("max_number_of_friends")).value_or(m_MaxNumberOfFriends);
 }
 
-PlayerContainer::~PlayerContainer() {
-	mPlayers.clear();
+TeamData::TeamData() {
+	lootFlag = Game::config->GetValue("default_team_loot") == "0" ? 0 : 1;
 }
 
 void PlayerContainer::InsertPlayer(Packet* packet) {
-	CINSTREAM;
-	PlayerData* data = new PlayerData();
-	inStream.Read(data->playerID);
-	inStream.Read(data->playerID);
-	inStream.Read(data->playerName);
-	inStream.Read(data->zoneID);
-	inStream.Read(data->muteExpire);
-	data->sysAddr = packet->systemAddress;
-
-	mNames[data->playerID] = GeneralUtils::ASCIIToUTF16(std::string(data->playerName.C_String()));
-
-	mPlayers.insert(std::make_pair(data->playerID, data));
-	Game::logger->Log("PlayerContainer", "Added user: %s (%llu), zone: %i\n", data->playerName.C_String(), data->playerID, data->zoneID.GetMapID());
-
-	auto* insertLog = Database::CreatePreppedStmt("INSERT INTO activity_log (character_id, activity, time, map_id) VALUES (?, ?, ?, ?);");
-
-	insertLog->setInt(1, data->playerID);
-	insertLog->setInt(2, 0);
-	insertLog->setUInt64(3, time(nullptr));
-	insertLog->setInt(4, data->zoneID.GetMapID());
-
-	insertLog->executeUpdate();
-}
-
-void PlayerContainer::RemovePlayer(Packet* packet) {
-	CINSTREAM;
-	LWOOBJID playerID;
-	inStream.Read(playerID); //skip header
-	inStream.Read(playerID);
-
-	//Before they get kicked, we need to also send a message to their friends saying that they disconnected.
-	auto player = this->GetPlayerData(playerID);
-
-	if (player == nullptr) {
+	CINSTREAM_SKIP_HEADER;
+	LWOOBJID playerId;
+	if (!inStream.Read(playerId)) {
+		LOG("Failed to read player ID");
 		return;
 	}
 
-	for (auto& fr : player->friends) {
-		//if (!fr.isOnline) continue;
+	auto& data = m_Players[playerId];
+	data.playerID = playerId;
 
-		auto fd = this->GetPlayerData(fr.friendID);
-		if (fd) ChatPacketHandler::SendFriendUpdate(fd, player, 0);
+	uint32_t len;
+	inStream.Read<uint32_t>(len);
+
+	for (int i = 0; i < len; i++) {
+		char character; inStream.Read<char>(character);
+		data.playerName += character;
+	}
+
+	inStream.Read(data.zoneID);
+	inStream.Read(data.muteExpire);
+	inStream.Read(data.gmLevel);
+	data.sysAddr = packet->systemAddress;
+
+	m_Names[data.playerID] = GeneralUtils::UTF8ToUTF16(data.playerName);
+
+	LOG("Added user: %s (%llu), zone: %i", data.playerName.c_str(), data.playerID, data.zoneID.GetMapID());
+
+	Database::Get()->UpdateActivityLog(data.playerID, eActivityType::PlayerLoggedIn, data.zoneID.GetMapID());
+}
+
+void PlayerContainer::RemovePlayer(Packet* packet) {
+	CINSTREAM_SKIP_HEADER;
+	LWOOBJID playerID;
+	inStream.Read(playerID);
+
+	//Before they get kicked, we need to also send a message to their friends saying that they disconnected.
+	const auto& player = GetPlayerData(playerID);
+
+	if (!player) {
+		LOG("Failed to find user: %llu", playerID);
+		return;
+	}
+
+	for (const auto& fr : player.friends) {
+		const auto& fd = this->GetPlayerData(fr.friendID);
+		if (fd) ChatPacketHandler::SendFriendUpdate(fd, player, 0, fr.isBestFriend);
 	}
 
 	auto* team = GetTeam(playerID);
 
-	if (team != nullptr)
-	{
-		//TeamStatusUpdate(team);
+	if (team != nullptr) {
+		const auto memberName = GeneralUtils::UTF8ToUTF16(player.playerName);
 
-		const auto memberName = GeneralUtils::ASCIIToUTF16(std::string(player->playerName.C_String()));
-		
-		for (const auto memberId : team->memberIDs)
-		{
-			auto* otherMember = GetPlayerData(memberId);
+		for (const auto memberId : team->memberIDs) {
+			const auto& otherMember = GetPlayerData(memberId);
 
-			if (otherMember == nullptr) continue;
+			if (!otherMember) continue;
 
-			ChatPacketHandler::SendTeamSetOffWorldFlag(otherMember, playerID, {0, 0, 0});
-			//ChatPacketHandler::SendTeamRemovePlayer(otherMember, false, false, true, false, team->leaderID, player->playerID, memberName);
+			ChatPacketHandler::SendTeamSetOffWorldFlag(otherMember, playerID, { 0, 0, 0 });
 		}
 	}
 
-	Game::logger->Log("PlayerContainer", "Removed user: %llu\n", playerID);
-	mPlayers.erase(playerID);
+	LOG("Removed user: %llu", playerID);
+	m_Players.erase(playerID);
 
-	auto* insertLog = Database::CreatePreppedStmt("INSERT INTO activity_log (character_id, activity, time, map_id) VALUES (?, ?, ?, ?);");
-
-	insertLog->setInt(1, playerID);
-	insertLog->setInt(2, 1);
-	insertLog->setUInt64(3, time(nullptr));
-	insertLog->setInt(4, player->zoneID.GetMapID());
-
-	insertLog->executeUpdate();
+	Database::Get()->UpdateActivityLog(playerID, eActivityType::PlayerLoggedOut, player.zoneID.GetMapID());
 }
 
-void PlayerContainer::MuteUpdate(Packet* packet) 
-{
-	CINSTREAM;
+void PlayerContainer::MuteUpdate(Packet* packet) {
+	CINSTREAM_SKIP_HEADER;
 	LWOOBJID playerID;
-	inStream.Read(playerID); //skip header
 	inStream.Read(playerID);
 	time_t expire = 0;
 	inStream.Read(expire);
 
-	auto* player = this->GetPlayerData(playerID);
+	auto& player = this->GetPlayerDataMutable(playerID);
 
-	if (player == nullptr)
-	{
-		Game::logger->Log("PlayerContainer", "Failed to find user: %llu\n", playerID);
+	if (!player) {
+		LOG("Failed to find user: %llu", playerID);
 
 		return;
 	}
 
-	player->muteExpire = expire;
+	player.muteExpire = expire;
 
 	BroadcastMuteUpdate(playerID, expire);
 }
 
-void PlayerContainer::CreateTeamServer(Packet* packet) 
-{
-	CINSTREAM;
+void PlayerContainer::CreateTeamServer(Packet* packet) {
+	CINSTREAM_SKIP_HEADER;
 	LWOOBJID playerID;
-	inStream.Read(playerID); //skip header
 	inStream.Read(playerID);
 	size_t membersSize = 0;
 	inStream.Read(membersSize);
@@ -130,8 +124,7 @@ void PlayerContainer::CreateTeamServer(Packet* packet)
 
 	members.reserve(membersSize);
 
-	for (size_t i = 0; i < membersSize; i++)
-	{
+	for (size_t i = 0; i < membersSize; i++) {
 		LWOOBJID member;
 		inStream.Read(member);
 		members.push_back(member);
@@ -140,52 +133,43 @@ void PlayerContainer::CreateTeamServer(Packet* packet)
 	LWOZONEID zoneId;
 
 	inStream.Read(zoneId);
-	
+
 	auto* team = CreateLocalTeam(members);
 
-	if (team != nullptr)
-	{
+	if (team != nullptr) {
 		team->zoneId = zoneId;
 	}
 
 	UpdateTeamsOnWorld(team, false);
 }
 
-void PlayerContainer::BroadcastMuteUpdate(LWOOBJID player, time_t time) 
-{
+void PlayerContainer::BroadcastMuteUpdate(LWOOBJID player, time_t time) {
 	CBITSTREAM;
-	PacketUtils::WriteHeader(bitStream, CHAT_INTERNAL, MSG_CHAT_INTERNAL_MUTE_UPDATE);
+	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CHAT, eChatMessageType::GM_MUTE);
 
 	bitStream.Write(player);
 	bitStream.Write(time);
 
-	Game::server->Send(&bitStream, UNASSIGNED_SYSTEM_ADDRESS, true);
+	Game::server->Send(bitStream, UNASSIGNED_SYSTEM_ADDRESS, true);
 }
 
-TeamData* PlayerContainer::CreateLocalTeam(std::vector<LWOOBJID> members) 
-{
-	if (members.empty())
-	{
+TeamData* PlayerContainer::CreateLocalTeam(std::vector<LWOOBJID> members) {
+	if (members.empty()) {
 		return nullptr;
 	}
 
 	TeamData* newTeam = nullptr;
 
-	for (const auto member : members)
-	{
+	for (const auto member : members) {
 		auto* team = GetTeam(member);
 
-		if (team != nullptr)
-		{
+		if (team != nullptr) {
 			RemoveMember(team, member, false, false, true);
 		}
 
-		if (newTeam == nullptr)
-		{
+		if (newTeam == nullptr) {
 			newTeam = CreateTeam(member, true);
-		}
-		else
-		{
+		} else {
 			AddMember(newTeam, member);
 		}
 	}
@@ -197,14 +181,13 @@ TeamData* PlayerContainer::CreateLocalTeam(std::vector<LWOOBJID> members)
 	return newTeam;
 }
 
-TeamData* PlayerContainer::CreateTeam(LWOOBJID leader, bool local) 
-{
+TeamData* PlayerContainer::CreateTeam(LWOOBJID leader, bool local) {
 	auto* team = new TeamData();
-	
-	team->teamID = ++mTeamIDCounter;
+
+	team->teamID = ++m_TeamIDCounter;
 	team->leaderID = leader;
 	team->local = local;
-	
+
 	mTeams.push_back(team);
 
 	AddMember(team, leader);
@@ -212,95 +195,85 @@ TeamData* PlayerContainer::CreateTeam(LWOOBJID leader, bool local)
 	return team;
 }
 
-TeamData* PlayerContainer::GetTeam(LWOOBJID playerID) 
-{
-	for (auto* team : mTeams)
-	{
+TeamData* PlayerContainer::GetTeam(LWOOBJID playerID) {
+	for (auto* team : mTeams) {
 		if (std::find(team->memberIDs.begin(), team->memberIDs.end(), playerID) == team->memberIDs.end()) continue;
 
 		return team;
 	}
-	
+
 	return nullptr;
 }
 
-void PlayerContainer::AddMember(TeamData* team, LWOOBJID playerID) 
-{
+void PlayerContainer::AddMember(TeamData* team, LWOOBJID playerID) {
+	if (team->memberIDs.size() >= 4) {
+		LOG("Tried to add player to team that already had 4 players");
+		const auto& player = GetPlayerData(playerID);
+		if (!player) return;
+		ChatPackets::SendSystemMessage(player.sysAddr, u"The teams is full! You have not been added to a team!");
+		return;
+	}
+
 	const auto index = std::find(team->memberIDs.begin(), team->memberIDs.end(), playerID);
 
 	if (index != team->memberIDs.end()) return;
 
 	team->memberIDs.push_back(playerID);
 
-	auto* leader = GetPlayerData(team->leaderID);
-	auto* member = GetPlayerData(playerID);
+	const auto& leader = GetPlayerData(team->leaderID);
+	const auto& member = GetPlayerData(playerID);
 
-	if (leader == nullptr || member == nullptr) return;
+	if (!leader || !member) return;
 
-	const auto leaderName = GeneralUtils::ASCIIToUTF16(std::string(leader->playerName.C_String()));
-	const auto memberName = GeneralUtils::ASCIIToUTF16(std::string(member->playerName.C_String()));
+	const auto leaderName = GeneralUtils::UTF8ToUTF16(leader.playerName);
+	const auto memberName = GeneralUtils::UTF8ToUTF16(member.playerName);
 
-	ChatPacketHandler::SendTeamInviteConfirm(member, false, leader->playerID, leader->zoneID, team->lootFlag, 0, 0, leaderName);
-	
-	/*
-	ChatPacketHandler::SendTeamAddPlayer(member, false, false, false, leader->playerID, leaderName, leader->zoneID);
+	ChatPacketHandler::SendTeamInviteConfirm(member, false, leader.playerID, leader.zoneID, team->lootFlag, 0, 0, leaderName);
 
-	Game::logger->Log("PlayerContainer", "Team invite successfully accepted, leader: %s, member: %s\n", leader->playerName.C_String(), member->playerName.C_String());
-	*/
-
-	if (!team->local)
-	{
-		ChatPacketHandler::SendTeamSetLeader(member, leader->playerID);
-	}
-	else
-	{
+	if (!team->local) {
+		ChatPacketHandler::SendTeamSetLeader(member, leader.playerID);
+	} else {
 		ChatPacketHandler::SendTeamSetLeader(member, LWOOBJID_EMPTY);
 	}
 
 	UpdateTeamsOnWorld(team, false);
 
-	for (const auto memberId : team->memberIDs)
-	{
-		auto* otherMember = GetPlayerData(memberId);
+	for (const auto memberId : team->memberIDs) {
+		const auto& otherMember = GetPlayerData(memberId);
 
 		if (otherMember == member) continue;
 
 		const auto otherMemberName = GetName(memberId);
-		
-		ChatPacketHandler::SendTeamAddPlayer(member, false, team->local, false, memberId, otherMemberName, otherMember != nullptr ? otherMember->zoneID : LWOZONEID(0, 0, 0));
 
-		if (otherMember != nullptr)
-		{
-			ChatPacketHandler::SendTeamAddPlayer(otherMember, false, team->local, false, member->playerID, memberName, member->zoneID);
+		ChatPacketHandler::SendTeamAddPlayer(member, false, team->local, false, memberId, otherMemberName, otherMember ? otherMember.zoneID : LWOZONEID(0, 0, 0));
+
+		if (otherMember) {
+			ChatPacketHandler::SendTeamAddPlayer(otherMember, false, team->local, false, member.playerID, memberName, member.zoneID);
 		}
 	}
 }
 
-void PlayerContainer::RemoveMember(TeamData* team, LWOOBJID playerID, bool disband, bool kicked, bool leaving, bool silent) 
-{
+void PlayerContainer::RemoveMember(TeamData* team, LWOOBJID playerID, bool disband, bool kicked, bool leaving, bool silent) {
 	const auto index = std::find(team->memberIDs.begin(), team->memberIDs.end(), playerID);
 
 	if (index == team->memberIDs.end()) return;
 
-	auto* member = GetPlayerData(playerID);
-	
-	if (member != nullptr && !silent)
-	{
+	const auto& member = GetPlayerData(playerID);
+
+	if (member && !silent) {
 		ChatPacketHandler::SendTeamSetLeader(member, LWOOBJID_EMPTY);
 	}
 
 	const auto memberName = GetName(playerID);
 
-	for (const auto memberId : team->memberIDs)
-	{
-		if (silent && memberId == playerID)
-		{
+	for (const auto memberId : team->memberIDs) {
+		if (silent && memberId == playerID) {
 			continue;
 		}
 
-		auto* otherMember = GetPlayerData(memberId);
+		const auto& otherMember = GetPlayerData(memberId);
 
-		if (otherMember == nullptr) continue;
+		if (!otherMember) continue;
 
 		ChatPacketHandler::SendTeamRemovePlayer(otherMember, disband, kicked, leaving, false, team->leaderID, playerID, memberName);
 	}
@@ -309,51 +282,43 @@ void PlayerContainer::RemoveMember(TeamData* team, LWOOBJID playerID, bool disba
 
 	UpdateTeamsOnWorld(team, false);
 
-	if (team->memberIDs.size() <= 1)
-	{
+	if (team->memberIDs.size() <= 1) {
 		DisbandTeam(team);
-	}
-	else
-	{
-		if (playerID == team->leaderID)
-		{
+	} else {
+		if (playerID == team->leaderID) {
 			PromoteMember(team, team->memberIDs[0]);
 		}
 	}
 }
 
-void PlayerContainer::PromoteMember(TeamData* team, LWOOBJID newLeader) 
-{
+void PlayerContainer::PromoteMember(TeamData* team, LWOOBJID newLeader) {
 	team->leaderID = newLeader;
 
-	for (const auto memberId : team->memberIDs)
-	{
-		auto* otherMember = GetPlayerData(memberId);
+	for (const auto memberId : team->memberIDs) {
+		const auto& otherMember = GetPlayerData(memberId);
 
-		if (otherMember == nullptr) continue;
+		if (!otherMember) continue;
 
 		ChatPacketHandler::SendTeamSetLeader(otherMember, newLeader);
 	}
 }
 
-void PlayerContainer::DisbandTeam(TeamData* team) 
-{
+void PlayerContainer::DisbandTeam(TeamData* team) {
 	const auto index = std::find(mTeams.begin(), mTeams.end(), team);
 
 	if (index == mTeams.end()) return;
 
-	for (const auto memberId : team->memberIDs)
-	{
-		auto* otherMember = GetPlayerData(memberId);
+	for (const auto memberId : team->memberIDs) {
+		const auto& otherMember = GetPlayerData(memberId);
 
-		if (otherMember == nullptr) continue;
+		if (!otherMember) continue;
 
-		const auto memberName = GeneralUtils::ASCIIToUTF16(std::string(otherMember->playerName.C_String()));
+		const auto memberName = GeneralUtils::UTF8ToUTF16(otherMember.playerName);
 
 		ChatPacketHandler::SendTeamSetLeader(otherMember, LWOOBJID_EMPTY);
-		ChatPacketHandler::SendTeamRemovePlayer(otherMember, true, false, false, team->local, team->leaderID, otherMember->playerID, memberName);
+		ChatPacketHandler::SendTeamRemovePlayer(otherMember, true, false, false, team->local, team->leaderID, otherMember.playerID, memberName);
 	}
-	
+
 	UpdateTeamsOnWorld(team, true);
 
 	mTeams.erase(index);
@@ -361,81 +326,85 @@ void PlayerContainer::DisbandTeam(TeamData* team)
 	delete team;
 }
 
-void PlayerContainer::TeamStatusUpdate(TeamData* team) 
-{
+void PlayerContainer::TeamStatusUpdate(TeamData* team) {
 	const auto index = std::find(mTeams.begin(), mTeams.end(), team);
 
 	if (index == mTeams.end()) return;
 
-	auto* leader = GetPlayerData(team->leaderID);
+	const auto& leader = GetPlayerData(team->leaderID);
 
-	if (leader == nullptr) return;
+	if (!leader) return;
 
-	const auto leaderName = GeneralUtils::ASCIIToUTF16(std::string(leader->playerName.C_String()));
+	const auto leaderName = GeneralUtils::UTF8ToUTF16(leader.playerName);
 
-	for (const auto memberId : team->memberIDs)
-	{
-		auto* otherMember = GetPlayerData(memberId);
+	for (const auto memberId : team->memberIDs) {
+		const auto& otherMember = GetPlayerData(memberId);
 
-		if (otherMember == nullptr) continue;
+		if (!otherMember) continue;
 
-		if (!team->local)
-		{
-			ChatPacketHandler::SendTeamStatus(otherMember, team->leaderID, leader->zoneID, team->lootFlag, 0, leaderName);
-		}
-		else
-		{
-			//ChatPacketHandler::SendTeamStatus(otherMember, LWOOBJID_EMPTY, LWOZONEID(0, 0, 0), 1, 0, u"");
+		if (!team->local) {
+			ChatPacketHandler::SendTeamStatus(otherMember, team->leaderID, leader.zoneID, team->lootFlag, 0, leaderName);
 		}
 	}
 
 	UpdateTeamsOnWorld(team, false);
 }
 
-void PlayerContainer::UpdateTeamsOnWorld(TeamData* team, bool deleteTeam) 
-{
+void PlayerContainer::UpdateTeamsOnWorld(TeamData* team, bool deleteTeam) {
 	CBITSTREAM;
-	PacketUtils::WriteHeader(bitStream, CHAT_INTERNAL, MSG_CHAT_INTERNAL_TEAM_UPDATE);
+	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CHAT, eChatMessageType::TEAM_GET_STATUS);
 
 	bitStream.Write(team->teamID);
 	bitStream.Write(deleteTeam);
 
-	if (!deleteTeam)
-	{
+	if (!deleteTeam) {
 		bitStream.Write(team->lootFlag);
-		bitStream.Write(static_cast<char>(team->memberIDs.size()));
-		for (const auto memberID : team->memberIDs)
-		{
+		bitStream.Write<char>(team->memberIDs.size());
+		for (const auto memberID : team->memberIDs) {
 			bitStream.Write(memberID);
 		}
 	}
 
-	Game::server->Send(&bitStream, UNASSIGNED_SYSTEM_ADDRESS, true);
+	Game::server->Send(bitStream, UNASSIGNED_SYSTEM_ADDRESS, true);
 }
 
-std::u16string PlayerContainer::GetName(LWOOBJID playerID) 
-{
-	const auto& pair = mNames.find(playerID);
+std::u16string PlayerContainer::GetName(LWOOBJID playerID) {
+	const auto iter = m_Names.find(playerID);
 
-	if (pair == mNames.end()) return u"";
+	if (iter == m_Names.end()) return u"";
 
-	return pair->second;
+	return iter->second;
 }
 
-LWOOBJID PlayerContainer::GetId(const std::u16string& playerName) 
-{
-	for (const auto& pair : mNames)
-	{
-		if (pair.second == playerName)
-		{
-			return pair.first;
+LWOOBJID PlayerContainer::GetId(const std::u16string& playerName) {
+	LWOOBJID toReturn = LWOOBJID_EMPTY;
+
+	for (const auto& [id, name] : m_Names) {
+		if (name == playerName) {
+			toReturn = id;
+			break;
 		}
 	}
-	
-	return LWOOBJID_EMPTY;
+
+	return toReturn;
 }
 
-bool PlayerContainer::GetIsMuted(PlayerData* data) 
-{
-	return data->muteExpire == 1 || data->muteExpire > time(NULL);
+PlayerData& PlayerContainer::GetPlayerDataMutable(const LWOOBJID& playerID) {
+	return m_Players.contains(playerID) ? m_Players[playerID] : m_Players[LWOOBJID_EMPTY];
+}
+
+PlayerData& PlayerContainer::GetPlayerDataMutable(const std::string& playerName) {
+	for (auto& [id, player] : m_Players) {
+		if (!player) continue;
+		if (player.playerName == playerName) return player;
+	}
+	return m_Players[LWOOBJID_EMPTY];
+}
+
+const PlayerData& PlayerContainer::GetPlayerData(const LWOOBJID& playerID) {
+	return GetPlayerDataMutable(playerID);
+}
+
+const PlayerData& PlayerContainer::GetPlayerData(const std::string& playerName) {
+	return GetPlayerDataMutable(playerName);
 }

dChatServer/PlayerContainer.h

@@ -7,19 +7,52 @@
 #include "dServer.h"
 #include <unordered_map>
 
+enum class eGameMasterLevel : uint8_t;
+
+struct IgnoreData {
+	IgnoreData(const std::string& name, const LWOOBJID& id) : playerName{ name }, playerId{ id } {}
+	inline bool operator==(const std::string& other) const noexcept {
+		return playerName == other;
+	}
+
+	inline bool operator==(const LWOOBJID& other) const noexcept {
+		return playerId == other;
+	}
+
+	LWOOBJID playerId = LWOOBJID_EMPTY;
+	std::string playerName;
+};
+
 struct PlayerData {
-	LWOOBJID playerID;
-	RakNet::RakString playerName;
-	SystemAddress sysAddr;
-	LWOZONEID zoneID;
+	operator bool() const noexcept {
+		return playerID != LWOOBJID_EMPTY;
+	}
+
+	bool operator==(const PlayerData& other) const noexcept {
+		return playerID == other.playerID;
+	}
+
+	bool GetIsMuted() const {
+		return muteExpire == 1 || muteExpire > time(NULL);
+	}
+
+	SystemAddress sysAddr{};
+	LWOZONEID zoneID{};
+	LWOOBJID playerID = LWOOBJID_EMPTY;
+	time_t muteExpire = 0;
+	uint8_t countOfBestFriends = 0;
+	std::string playerName;
 	std::vector<FriendData> friends;
-	time_t muteExpire;
+	std::vector<IgnoreData> ignoredPlayers;
+	eGameMasterLevel gmLevel = static_cast<eGameMasterLevel>(0); // CIVILLIAN
+	bool isFTP = false;
 };
 
 struct TeamData {
+	TeamData();
 	LWOOBJID teamID = LWOOBJID_EMPTY; // Internal use
 	LWOOBJID leaderID = LWOOBJID_EMPTY;
-	std::vector<LWOOBJID> memberIDs {};
+	std::vector<LWOOBJID> memberIDs{};
 	uint8_t lootFlag = 0;
 	bool local = false;
 	LWOZONEID zoneId = {};
@@ -27,31 +60,17 @@ struct TeamData {
 
 class PlayerContainer {
 public:
-	PlayerContainer();
-	~PlayerContainer();
-
+	void Initialize();
 	void InsertPlayer(Packet* packet);
 	void RemovePlayer(Packet* packet);
 	void MuteUpdate(Packet* packet);
 	void CreateTeamServer(Packet* packet);
 	void BroadcastMuteUpdate(LWOOBJID player, time_t time);
 
-	PlayerData* GetPlayerData(const LWOOBJID& playerID) {
-		auto it = mPlayers.find(playerID);
-		if (it != mPlayers.end()) return it->second;
-		return nullptr;
-	}
-
-	PlayerData* GetPlayerData(const std::string& playerName) {
-		for (auto player : mPlayers) {
-			if (player.second) {
-				std::string pn = player.second->playerName.C_String();
-				if (pn == playerName) return player.second;
-			}
-		}
-
-		return nullptr;
-	}
+	const PlayerData& GetPlayerData(const LWOOBJID& playerID);
+	const PlayerData& GetPlayerData(const std::string& playerName);
+	PlayerData& GetPlayerDataMutable(const LWOOBJID& playerID);
+	PlayerData& GetPlayerDataMutable(const std::string& playerName);
 
 	TeamData* CreateLocalTeam(std::vector<LWOOBJID> members);
 	TeamData* CreateTeam(LWOOBJID leader, bool local = false);
@@ -64,14 +83,15 @@ public:
 	void UpdateTeamsOnWorld(TeamData* team, bool deleteTeam);
 	std::u16string GetName(LWOOBJID playerID);
 	LWOOBJID GetId(const std::u16string& playerName);
-	bool GetIsMuted(PlayerData* data);
-
-	std::map<LWOOBJID, PlayerData*>& GetAllPlayerData() { return mPlayers; }
+	uint32_t GetMaxNumberOfBestFriends() { return m_MaxNumberOfBestFriends; }
+	uint32_t GetMaxNumberOfFriends() { return m_MaxNumberOfFriends; }
 
 private:
-	LWOOBJID mTeamIDCounter = 0;
-	std::map<LWOOBJID, PlayerData*> mPlayers;
+	LWOOBJID m_TeamIDCounter = 0;
+	std::map<LWOOBJID, PlayerData> m_Players;
 	std::vector<TeamData*> mTeams;
-	std::unordered_map<LWOOBJID, std::u16string> mNames;
+	std::unordered_map<LWOOBJID, std::u16string> m_Names;
+	uint32_t m_MaxNumberOfBestFriends = 5;
+	uint32_t m_MaxNumberOfFriends = 50;
 };
 

dCommon/AMFDeserialize.cpp

@@ -0,0 +1,152 @@
+#include "AMFDeserialize.h"
+
+#include <stdexcept>
+
+#include "Amf3.h"
+
+/**
+ * AMF3 Reference document https://rtmp.veriskope.com/pdf/amf3-file-format-spec.pdf
+ * AMF3 Deserializer written by EmosewaMC
+ */
+
+AMFBaseValue* AMFDeserialize::Read(RakNet::BitStream& inStream) {
+	AMFBaseValue* returnValue = nullptr;
+	// Read in the value type from the bitStream
+	eAmf marker;
+	inStream.Read(marker);
+	// Based on the typing, create the value associated with that and return the base value class
+	switch (marker) {
+	case eAmf::Undefined: {
+		returnValue = new AMFBaseValue();
+		break;
+	}
+
+	case eAmf::Null: {
+		returnValue = new AMFNullValue();
+		break;
+	}
+
+	case eAmf::False: {
+		returnValue = new AMFBoolValue(false);
+		break;
+	}
+
+	case eAmf::True: {
+		returnValue = new AMFBoolValue(true);
+		break;
+	}
+
+	case eAmf::Integer: {
+		returnValue = ReadAmfInteger(inStream);
+		break;
+	}
+
+	case eAmf::Double: {
+		returnValue = ReadAmfDouble(inStream);
+		break;
+	}
+
+	case eAmf::String: {
+		returnValue = ReadAmfString(inStream);
+		break;
+	}
+
+	case eAmf::Array: {
+		returnValue = ReadAmfArray(inStream);
+		break;
+	}
+
+	// These values are unimplemented in the live client and will remain unimplemented
+	// unless someone modifies the client to allow serializing of these values.
+	case eAmf::XMLDoc:
+	case eAmf::Date:
+	case eAmf::Object:
+	case eAmf::XML:
+	case eAmf::ByteArray:
+	case eAmf::VectorInt:
+	case eAmf::VectorUInt:
+	case eAmf::VectorDouble:
+	case eAmf::VectorObject:
+	case eAmf::Dictionary: {
+		throw marker;
+		break;
+	}
+	default:
+		throw std::invalid_argument("Invalid AMF3 marker" + std::to_string(static_cast<int32_t>(marker)));
+		break;
+	}
+	return returnValue;
+}
+
+uint32_t AMFDeserialize::ReadU29(RakNet::BitStream& inStream) {
+	bool byteFlag = true;
+	uint32_t actualNumber{};
+	uint8_t numberOfBytesRead{};
+	while (byteFlag && numberOfBytesRead < 4) {
+		uint8_t byte{};
+		inStream.Read(byte);
+		// Parse the byte
+		if (numberOfBytesRead < 3) {
+			byteFlag = byte & static_cast<uint8_t>(1 << 7);
+			byte = byte << 1UL;
+		}
+		// Combine the read byte with our current read in number
+		actualNumber <<= 8UL;
+		actualNumber |= static_cast<uint32_t>(byte);
+		// If we are not done reading in bytes, shift right 1 bit
+		if (numberOfBytesRead < 3) actualNumber = actualNumber >> 1UL;
+		numberOfBytesRead++;
+	}
+	return actualNumber;
+}
+
+const std::string AMFDeserialize::ReadString(RakNet::BitStream& inStream) {
+	auto length = ReadU29(inStream);
+	// Check if this is a reference
+	bool isReference = length % 2 == 1;
+	// Right shift by 1 bit to get index if reference or size of next string if value
+	length = length >> 1;
+	if (isReference) {
+		std::string value(length, 0);
+		inStream.Read(&value[0], length);
+		// Empty strings are never sent by reference
+		if (!value.empty()) accessedElements.push_back(value);
+		return value;
+	} else {
+		// Length is a reference to a previous index - use that as the read in value
+		return accessedElements.at(length);
+	}
+}
+
+AMFBaseValue* AMFDeserialize::ReadAmfDouble(RakNet::BitStream& inStream) {
+	double value;
+	inStream.Read<double>(value);
+	return new AMFDoubleValue(value);
+}
+
+AMFBaseValue* AMFDeserialize::ReadAmfArray(RakNet::BitStream& inStream) {
+	auto arrayValue = new AMFArrayValue();
+
+	// Read size of dense array
+	const auto sizeOfDenseArray = (ReadU29(inStream) >> 1);
+	// Then read associative portion
+	while (true) {
+		const auto key = ReadString(inStream);
+		// No more associative values when we encounter an empty string key
+		if (key.size() == 0) break;
+		arrayValue->Insert(key, Read(inStream));
+	}
+	// Finally read dense portion
+	for (uint32_t i = 0; i < sizeOfDenseArray; i++) {
+		arrayValue->Insert(i, Read(inStream));
+	}
+	return arrayValue;
+}
+
+AMFBaseValue* AMFDeserialize::ReadAmfString(RakNet::BitStream& inStream) {
+	return new AMFStringValue(ReadString(inStream));
+}
+
+AMFBaseValue* AMFDeserialize::ReadAmfInteger(RakNet::BitStream& inStream) {
+	return new AMFIntValue(ReadU29(inStream));
+}

dCommon/AMFDeserialize.h

@@ -0,0 +1,72 @@
+#pragma once
+
+#include "BitStream.h"
+
+#include <vector>
+#include <string>
+
+class AMFBaseValue;
+
+class AMFDeserialize {
+public:
+	/**
+	 * Read an AMF3 value from a bitstream.
+	 *
+	 * @param inStream inStream to read value from.
+	 * @return Returns an AMFValue with all the information from the bitStream in it.
+	 */
+	AMFBaseValue* Read(RakNet::BitStream& inStream);
+private:
+	/**
+	 * @brief Private method to read a U29 integer from a bitstream
+	 *
+	 * @param inStream bitstream to read data from
+	 * @return The number as an unsigned 29 bit integer
+	 */
+	static uint32_t ReadU29(RakNet::BitStream& inStream);
+
+	/**
+	 * @brief Reads a string from a bitstream
+	 *
+	 * @param inStream bitStream to read data from
+	 * @return The read string
+	 */
+	const std::string ReadString(RakNet::BitStream& inStream);
+
+	/**
+	 * @brief Read an AMFDouble value from a bitStream
+	 *
+	 * @param inStream bitStream to read data from
+	 * @return Double value represented as an AMFValue
+	 */
+	AMFBaseValue* ReadAmfDouble(RakNet::BitStream& inStream);
+
+	/**
+	 * @brief Read an AMFArray from a bitStream
+	 *
+	 * @param inStream bitStream to read data from
+	 * @return Array value represented as an AMFValue
+	 */
+	AMFBaseValue* ReadAmfArray(RakNet::BitStream& inStream);
+
+	/**
+	 * @brief Read an AMFString from a bitStream
+	 *
+	 * @param inStream bitStream to read data from
+	 * @return String value represented as an AMFValue
+	 */
+	AMFBaseValue* ReadAmfString(RakNet::BitStream& inStream);
+
+	/**
+	 * @brief Read an AMFInteger from a bitStream
+	 *
+	 * @param inStream bitStream to read data from
+	 * @return Integer value represented as an AMFValue
+	 */
+	AMFBaseValue* ReadAmfInteger(RakNet::BitStream& inStream);
+
+	/**
+	 * List of strings read so far saved to be read by reference.
+	 */
+	std::vector<std::string> accessedElements;
+};

dCommon/AMFFormat.cpp

@@ -1,157 +0,0 @@
-#include "AMFFormat.h"
-
-// AMFInteger
-void AMFIntegerValue::SetIntegerValue(uint32_t value) {
-    this->value = value;
-}
-
-uint32_t AMFIntegerValue::GetIntegerValue() {
-    return this->value;
-}
-
-// AMFDouble
-void AMFDoubleValue::SetDoubleValue(double value) {
-    this->value = value;
-}
-
-double AMFDoubleValue::GetDoubleValue() {
-    return this->value;
-}
-
-// AMFString
-void AMFStringValue::SetStringValue(const std::string& value) {
-    this->value = value;
-}
-
-std::string AMFStringValue::GetStringValue() {
-    return this->value;
-}
-
-// AMFXMLDoc
-void AMFXMLDocValue::SetXMLDocValue(const std::string& value) {
-    this->xmlData = value;
-}
-
-std::string AMFXMLDocValue::GetXMLDocValue() {
-    return this->xmlData;
-}
-
-// AMFDate
-void AMFDateValue::SetDateValue(uint64_t value) {
-    this->millisecondTimestamp = value;
-}
-
-uint64_t AMFDateValue::GetDateValue() {
-    return this->millisecondTimestamp;
-}
-
-// AMFArray Insert Value
-void AMFArrayValue::InsertValue(const std::string& key, AMFValue* value) {
-    this->associative.insert(std::make_pair(key, value));
-}
-
-// AMFArray Remove Value
-void AMFArrayValue::RemoveValue(const std::string& key) {
-    _AMFArrayMap_::iterator it = this->associative.find(key);
-    if (it != this->associative.end()) {
-        this->associative.erase(it);
-    }
-}
-
-// AMFArray Find Value
-AMFValue* AMFArrayValue::FindValue(const std::string& key) {
-    _AMFArrayMap_::iterator it = this->associative.find(key);
-    if (it != this->associative.end()) {
-        return it->second;
-    }
-    
-    return nullptr;
-}
-
-// AMFArray Get Associative Iterator Begin
-_AMFArrayMap_::iterator AMFArrayValue::GetAssociativeIteratorValueBegin() {
-    return this->associative.begin();
-}
-
-// AMFArray Get Associative Iterator End
-_AMFArrayMap_::iterator AMFArrayValue::GetAssociativeIteratorValueEnd() {
-    return this->associative.end();
-}
-
-// AMFArray Push Back Value
-void AMFArrayValue::PushBackValue(AMFValue* value) {
-    this->dense.push_back(value);
-}
-
-// AMFArray Pop Back Value
-void AMFArrayValue::PopBackValue() {
-    this->dense.pop_back();
-}
-
-// AMFArray Get Dense List Size
-uint32_t AMFArrayValue::GetDenseValueSize() {
-    return (uint32_t)this->dense.size();
-}
-
-// AMFArray Get value at index in Dense List
-AMFValue* AMFArrayValue::GetValueAt(uint32_t index) {
-    return this->dense.at(index);
-}
-
-// AMFArray Get Dense Iterator Begin
-_AMFArrayList_::iterator AMFArrayValue::GetDenseIteratorBegin() {
-    return this->dense.begin();
-}
-
-// AMFArray Get Dense Iterator End
-_AMFArrayList_::iterator AMFArrayValue::GetDenseIteratorEnd() {
-    return this->dense.end();
-}
-
-
-// AMFObject Constructor
-AMFObjectValue::AMFObjectValue(std::vector<std::pair<std::string, AMFValueType>> traits) {
-    this->traits.reserve(traits.size());
-    std::vector<std::pair<std::string, AMFValueType>>::iterator it = traits.begin();
-    while (it != traits.end()) {
-        this->traits.insert(std::make_pair(it->first, std::make_pair(it->second, new AMFNullValue())));
-        it++;
-    }
-}
-
-// AMFObject Set Value
-void AMFObjectValue::SetTraitValue(const std::string& trait, AMFValue* value) {
-    if (value) {
-        _AMFObjectTraits_::iterator it = this->traits.find(trait);
-        if (it != this->traits.end()) {
-            if (it->second.first == value->GetValueType()) {
-                it->second.second = value;
-            }
-        }
-    }
-}
-
-// AMFObject Get Value
-AMFValue* AMFObjectValue::GetTraitValue(const std::string& trait) {
-    _AMFObjectTraits_::iterator it = this->traits.find(trait);
-    if (it != this->traits.end()) {
-        return it->second.second;
-    }
-    
-    return nullptr;
-}
-
-// AMFObject Get Trait Iterator Begin
-_AMFObjectTraits_::iterator AMFObjectValue::GetTraitsIteratorBegin() {
-    return this->traits.begin();
-}
-
-// AMFObject Get Trait Iterator End
-_AMFObjectTraits_::iterator AMFObjectValue::GetTraitsIteratorEnd() {
-    return this->traits.end();
-}
-
-// AMFObject Get Trait Size
-uint32_t AMFObjectValue::GetTraitArrayCount() {
-    return (uint32_t)this->traits.size();
-}

dCommon/AMFFormat.h

@@ -1,368 +0,0 @@
-#pragma once
-
-// Custom Classes
-#include "dCommonVars.h"
-
-// C++
-#include <unordered_map>
-#include <vector>
-
-/*!
-  \file AMFFormat.hpp
-  \brief A class for managing AMF values
- */
-
-class AMFValue;     // Forward declaration
-
-// Definitions
-#define _AMFArrayMap_               std::unordered_map<std::string, AMFValue*>
-#define _AMFArrayList_              std::vector<AMFValue*>
-
-#define _AMFObjectTraits_           std::unordered_map<std::string, std::pair<AMFValueType, AMFValue*>>
-#define _AMFObjectDynamicTraits_    std::unordered_map<std::string, AMFValue*>
-
-//! An enum for each AMF value type
-enum AMFValueType : unsigned char {
-    AMFUndefined = 0x00,            //!< An undefined AMF Value
-    AMFNull = 0x01,                 //!< A null AMF value
-    AMFFalse = 0x02,                //!< A false AMF value
-    AMFTrue = 0x03,                 //!< A true AMF value
-    AMFInteger = 0x04,              //!< An integer AMF value
-    AMFDouble = 0x05,               //!< A double AMF value
-    AMFString = 0x06,               //!< A string AMF value
-    AMFXMLDoc = 0x07,               //!< An XML Doc AMF value
-    AMFDate = 0x08,                 //!< A date AMF value
-    AMFArray = 0x09,                //!< An array AMF value
-    AMFObject = 0x0A,               //!< An object AMF value
-    AMFXML = 0x0B,                  //!< An XML AMF value
-    AMFByteArray = 0x0C,            //!< A byte array AMF value
-    AMFVectorInt = 0x0D,            //!< An integer vector AMF value
-    AMFVectorUInt = 0x0E,           //!< An unsigned integer AMF value
-    AMFVectorDouble = 0x0F,         //!< A double vector AMF value
-    AMFVectorObject = 0x10,         //!< An object vector AMF value
-    AMFDictionary = 0x11            //!< A dictionary AMF value
-};
-
-//! An enum for the object value types
-enum AMFObjectValueType : unsigned char {
-    AMFObjectAnonymous = 0x01,
-    AMFObjectTyped = 0x02,
-    AMFObjectDynamic = 0x03,
-    AMFObjectExternalizable = 0x04
-};
-
-//! The base AMF value class
-class AMFValue {
-public:
-    //! Returns the AMF value type
-    /*!
-      \return The AMF value type
-     */
-    virtual AMFValueType GetValueType() = 0;
-};
-
-//! A typedef for a pointer to an AMF value
-typedef AMFValue* NDGFxValue;
-
-
-// The various AMF value types
-
-//! The undefined value AMF type
-class AMFUndefinedValue : public AMFValue {
-private:
-    //! Returns the AMF value type
-    /*!
-      \return The AMF value type
-     */
-    AMFValueType GetValueType() { return AMFUndefined; }
-};
-
-//! The null value AMF type
-class AMFNullValue : public AMFValue {
-private:
-    //! Returns the AMF value type
-    /*!
-     \return The AMF value type
-     */
-    AMFValueType GetValueType() { return AMFNull; }
-};
-
-//! The false value AMF type
-class AMFFalseValue : public AMFValue {
-private:
-    //! Returns the AMF value type
-    /*!
-     \return The AMF value type
-     */
-    AMFValueType GetValueType() { return AMFFalse; }
-};
-
-//! The true value AMF type
-class AMFTrueValue : public AMFValue {
-private:
-    //! Returns the AMF value type
-    /*!
-     \return The AMF value type
-     */
-    AMFValueType GetValueType() { return AMFTrue; }
-};
-
-//! The integer value AMF type
-class AMFIntegerValue : public AMFValue {
-private:
-    uint32_t value;         //!< The value of the AMF type
-    
-    //! Returns the AMF value type
-    /*!
-     \return The AMF value type
-     */
-    AMFValueType GetValueType() { return AMFInteger; }
-    
-public:
-    //! Sets the integer value
-    /*!
-      \param value The value to set
-     */
-    void SetIntegerValue(uint32_t value);
-    
-    //! Gets the integer value
-    /*!
-      \return The integer value
-     */
-    uint32_t GetIntegerValue();
-};
-
-//! The double value AMF type
-class AMFDoubleValue : public AMFValue {
-private:
-    double value;           //!< The value of the AMF type
-    
-    //! Returns the AMF value type
-    /*!
-     \return The AMF value type
-     */
-    AMFValueType GetValueType() { return AMFDouble; }
-    
-public:
-    //! Sets the double value
-    /*!
-      \param value The value to set to
-     */
-    void SetDoubleValue(double value);
-    
-    //! Gets the double value
-    /*!
-      \return The double value
-     */
-    double GetDoubleValue();
-};
-
-//! The string value AMF type
-class AMFStringValue : public AMFValue {
-private:
-    std::string value;          //!< The value of the AMF type
-    
-    //! Returns the AMF value type
-    /*!
-     \return The AMF value type
-     */
-    AMFValueType GetValueType() { return AMFString; }
-    
-public:
-    //! Sets the string value
-    /*!
-      \param value The string value to set to
-     */
-    void SetStringValue(const std::string& value);
-    
-    //! Gets the string value
-    /*!
-      \return The string value
-     */
-    std::string GetStringValue();
-};
-
-//! The XML doc value AMF type
-class AMFXMLDocValue : public AMFValue {
-private:
-    std::string xmlData;            //!< The value of the AMF type
-    
-    //! Returns the AMF value type
-    /*!
-     \return The AMF value type
-     */
-    AMFValueType GetValueType() { return AMFXMLDoc; }
-    
-public:
-    //! Sets the XML Doc value
-    /*!
-      \param value The value to set to
-     */
-    void SetXMLDocValue(const std::string& value);
-    
-    //! Gets the XML Doc value
-    /*!
-      \return The XML Doc value
-     */
-    std::string GetXMLDocValue();
-};
-
-//! The date value AMF type
-class AMFDateValue : public AMFValue {
-private:
-    uint64_t millisecondTimestamp;      //!< The time in milliseconds since the ephoch
-    
-    //! Returns the AMF value type
-    /*!
-     \return The AMF value type
-     */
-    AMFValueType GetValueType() { return AMFDate; }
-    
-public:
-    //! Sets the date time
-    /*!
-      \param value The value to set to
-     */
-    void SetDateValue(uint64_t value);
-    
-    //! Gets the date value
-    /*!
-      \return The date value in milliseconds since the epoch
-     */
-    uint64_t GetDateValue();
-};
-
-//! The array value AMF type
-class AMFArrayValue : public AMFValue {
-private:
-    _AMFArrayMap_ associative;      //!< The array map (associative part)
-    _AMFArrayList_ dense;           //!< The array list (dense part)
-    
-    //! Returns the AMF value type
-    /*!
-     \return The AMF value type
-     */
-    AMFValueType GetValueType() { return AMFArray; }
-    
-public:
-    //! Inserts an item into the array map for a specific key
-    /*!
-      \param key The key to set
-      \param value The value to add
-     */
-    void InsertValue(const std::string& key, AMFValue* value);
-    
-    //! Removes an item for a specific key
-    /*!
-      \param key The key to remove
-     */
-    void RemoveValue(const std::string& key);
-    
-    //! Finds an AMF value
-    /*!
-      \return The AMF value if found, nullptr otherwise
-     */
-    AMFValue* FindValue(const std::string& key);
-    
-    //! Returns where the associative iterator begins
-    /*!
-      \return Where the array map iterator begins
-     */
-    _AMFArrayMap_::iterator GetAssociativeIteratorValueBegin();
-    
-    //! Returns where the associative iterator ends
-    /*!
-      \return Where the array map iterator ends
-     */
-    _AMFArrayMap_::iterator GetAssociativeIteratorValueEnd();
-    
-    //! Pushes back a value into the array list
-    /*!
-      \param value The value to push back
-     */
-    void PushBackValue(AMFValue* value);
-    
-    //! Pops back the last value in the array list
-    void PopBackValue();
-    
-    //! Gets the count of the dense list
-    /*!
-      \return The dense list size
-     */
-    uint32_t GetDenseValueSize();
-    
-    //! Gets a specific value from the list for the specified index
-    /*!
-      \param index The index to get
-     */
-    AMFValue* GetValueAt(uint32_t index);
-    
-    //! Returns where the dense iterator begins
-    /*!
-      \return Where the iterator begins
-     */
-    _AMFArrayList_::iterator GetDenseIteratorBegin();
-    
-    //! Returns where the dense iterator ends
-    /*!
-      \return Where the iterator ends
-     */
-    _AMFArrayList_::iterator GetDenseIteratorEnd();
-};
-
-//! The anonymous object value AMF type
-class AMFObjectValue : public AMFValue {
-private:
-    _AMFObjectTraits_ traits;           //!< The object traits
-    
-    //! Returns the AMF value type
-    /*!
-     \return The AMF value type
-     */
-    AMFValueType GetValueType() { return AMFObject; }
-    
-public:
-    //! Constructor
-    /*!
-      \param traits The traits to set
-     */
-    AMFObjectValue(std::vector<std::pair<std::string, AMFValueType>> traits);
-    
-    //! Gets the object value type
-    /*!
-      \return The object value type
-     */
-    virtual AMFObjectValueType GetObjectValueType() { return AMFObjectAnonymous; }
-    
-    //! Sets the value of a trait
-    /*!
-      \param trait The trait to set the value for
-      \param value The AMF value to set
-     */
-    void SetTraitValue(const std::string& trait, AMFValue* value);
-    
-    //! Gets a trait value
-    /*!
-      \param trait The trait to get the value for
-      \return The trait value
-     */
-    AMFValue* GetTraitValue(const std::string& trait);
-    
-    //! Gets the beginning of the object traits iterator
-    /*!
-      \return The AMF trait array iterator begin
-     */
-    _AMFObjectTraits_::iterator GetTraitsIteratorBegin();
-    
-    //! Gets the end of the object traits iterator
-    /*!
-      \return The AMF trait array iterator begin
-     */
-    _AMFObjectTraits_::iterator GetTraitsIteratorEnd();
-    
-    //! Gets the amount of traits
-    /*!
-      \return The amount of traits
-     */
-    uint32_t GetTraitArrayCount();
-};

dCommon/AMFFormat_BitStream.cpp

@@ -1,271 +0,0 @@
-#include "AMFFormat_BitStream.h"
-
-// Writes an AMFValue pointer to a RakNet::BitStream
-template<>
-void RakNet::BitStream::Write<AMFValue*>(AMFValue* value) {
-    if (value != nullptr) {
-        AMFValueType type = value->GetValueType();
-        
-        switch (type) {
-            case AMFUndefined: {
-                AMFUndefinedValue* v = (AMFUndefinedValue*)value;
-                this->Write(*v);
-                break;
-            }
-                
-            case AMFNull: {
-                AMFNullValue* v = (AMFNullValue*)value;
-                this->Write(*v);
-                break;
-            }
-                
-            case AMFFalse: {
-                AMFFalseValue* v = (AMFFalseValue*)value;
-                this->Write(*v);
-                break;
-            }
-                
-            case AMFTrue: {
-                AMFTrueValue* v = (AMFTrueValue*)value;
-                this->Write(*v);
-                break;
-            }
-                
-            case AMFInteger: {
-                AMFIntegerValue* v = (AMFIntegerValue*)value;
-                this->Write(*v);
-                break;
-            }
-                
-            case AMFString: {
-                AMFStringValue* v = (AMFStringValue*)value;
-                this->Write(*v);
-                break;
-            }
-                
-            case AMFXMLDoc: {
-                AMFXMLDocValue* v = (AMFXMLDocValue*)value;
-                this->Write(*v);
-                break;
-            }
-                
-            case AMFDate: {
-                AMFDateValue* v = (AMFDateValue*)value;
-                this->Write(*v);
-                break;
-            }
-                
-            case AMFArray: {
-                AMFArrayValue* v = (AMFArrayValue*)value;
-                this->Write(*v);
-                break;
-            }
-        }
-    }
-}
-
-// A private function to write an value to a RakNet::BitStream
-void WriteUInt29(RakNet::BitStream* bs, uint32_t v) {
-    unsigned char b4 = (unsigned char)v;
-    if (v < 0x00200000) {
-        b4 = b4 & 0x7F;
-        if (v > 0x7F) {
-            unsigned char b3;
-            v = v >> 7;
-            b3 = ((unsigned char)(v)) | 0x80;
-            if (v > 0x7F) {
-                unsigned char b2;
-                v = v >> 7;
-                b2 = ((unsigned char)(v)) | 0x80;
-                bs->Write(b2);
-            }
-            
-            bs->Write(b3);
-        }
-    } else {
-        unsigned char b1;
-        unsigned char b2;
-        unsigned char b3;
-        
-        v = v >> 8;
-        b3 = ((unsigned char)(v)) | 0x80;
-        v = v >> 7;
-        b2 = ((unsigned char)(v)) | 0x80;
-        v = v >> 7;
-        b1 = ((unsigned char)(v)) | 0x80;
-        
-        bs->Write(b1);
-        bs->Write(b2);
-        bs->Write(b3);
-    }
-    
-    bs->Write(b4);
-}
-
-// Writes a flag number to a RakNet::BitStream
-void WriteFlagNumber(RakNet::BitStream* bs, uint32_t v) {
-    v = (v << 1) | 0x01;
-    WriteUInt29(bs, v);
-}
-
-// Writes an AMFString to a RakNet::BitStream
-void WriteAMFString(RakNet::BitStream* bs, const std::string& str) {
-    WriteFlagNumber(bs, (uint32_t)str.size());
-    bs->Write(str.c_str(), (uint32_t)str.size());
-}
-
-// Writes an AMF U16 to a RakNet::BitStream
-void WriteAMFU16(RakNet::BitStream* bs, uint16_t value) {
-    unsigned char b2;
-    b2 = (unsigned char)value;
-    value = value >> 8;
-    bs->Write((unsigned char)value);
-    bs->Write(b2);
-}
-
-// Writes an AMF U32 to RakNet::BitStream
-void WriteAMFU32(RakNet::BitStream* bs, uint32_t value) {
-    unsigned char b2;
-    unsigned char b3;
-    unsigned char b4;
-    
-    b4 = (unsigned char)value;
-    value = value >> 8;
-    b3 = (unsigned char)value;
-    value = value >> 8;
-    b2 = (unsigned char)value;
-    value = value >> 8;
-    
-    bs->Write((unsigned char)value);
-    bs->Write(b2);
-    bs->Write(b3);
-    bs->Write(b4);
-}
-
-// Writes an AMF U64 to RakNet::BitStream
-void WriteAMFU64(RakNet::BitStream* bs, uint64_t value) {
-    unsigned char b2;
-    unsigned char b3;
-    unsigned char b4;
-    unsigned char b5;
-    unsigned char b6;
-    unsigned char b7;
-    unsigned char b8;
-    
-    b8 = (unsigned char)value;
-    value = value >> 8;
-    b7 = (unsigned char)value;
-    value = value >> 8;
-    b6 = (unsigned char)value;
-    value = value >> 8;
-    b5 = (unsigned char)value;
-    value = value >> 8;
-    b4 = (unsigned char)value;
-    value = value >> 8;
-    b3 = (unsigned char)value;
-    value = value >> 8;
-    b2 = (unsigned char)value;
-    value = value >> 8;
-    
-    bs->Write((unsigned char)value);
-    bs->Write(b2);
-    bs->Write(b3);
-    bs->Write(b4);
-    bs->Write(b5);
-    bs->Write(b6);
-    bs->Write(b7);
-    bs->Write(b8);
-}
-
-
-// Writes an AMFUndefinedValue to BitStream
-template<>
-void RakNet::BitStream::Write<AMFUndefinedValue>(AMFUndefinedValue value) {
-    this->Write(AMFUndefined);
-}
-
-// Writes an AMFNullValue to BitStream
-template<>
-void RakNet::BitStream::Write<AMFNullValue>(AMFNullValue value) {
-    this->Write(AMFNull);
-}
-
-// Writes an AMFFalseValue to BitStream
-template<>
-void RakNet::BitStream::Write<AMFFalseValue>(AMFFalseValue value) {
-    this->Write(AMFFalse);
-}
-
-// Writes an AMFTrueValue to BitStream
-template<>
-void RakNet::BitStream::Write<AMFTrueValue>(AMFTrueValue value) {
-    this->Write(AMFTrue);
-}
-
-// Writes an AMFIntegerValue to BitStream
-template<>
-void RakNet::BitStream::Write<AMFIntegerValue>(AMFIntegerValue value) {
-    this->Write(AMFInteger);
-    WriteUInt29(this, value.GetIntegerValue());
-}
-
-// Writes an AMFDoubleValue to BitStream
-template<>
-void RakNet::BitStream::Write<AMFDoubleValue>(AMFDoubleValue value) {
-    this->Write(AMFDouble);
-    double d = value.GetDoubleValue();
-    WriteAMFU64(this, *((unsigned long long*)&d));
-}
-
-// Writes an AMFStringValue to BitStream
-template<>
-void RakNet::BitStream::Write<AMFStringValue>(AMFStringValue value) {
-    this->Write(AMFString);
-    std::string v = value.GetStringValue();
-    WriteAMFString(this, v);
-}
-
-// Writes an AMFXMLDocValue to BitStream
-template<>
-void RakNet::BitStream::Write<AMFXMLDocValue>(AMFXMLDocValue value) {
-    this->Write(AMFXMLDoc);
-    std::string v = value.GetXMLDocValue();
-    WriteAMFString(this, v);
-}
-
-// Writes an AMFDateValue to BitStream
-template<>
-void RakNet::BitStream::Write<AMFDateValue>(AMFDateValue value) {
-    this->Write(AMFDate);
-    uint64_t date = value.GetDateValue();
-    WriteAMFU64(this, date);
-}
-
-// Writes an AMFArrayValue to BitStream
-template<>
-void RakNet::BitStream::Write<AMFArrayValue>(AMFArrayValue value) {
-    this->Write(AMFArray);
-    uint32_t denseSize = value.GetDenseValueSize();
-    WriteFlagNumber(this, denseSize);
-    
-    _AMFArrayMap_::iterator it = value.GetAssociativeIteratorValueBegin();
-    _AMFArrayMap_::iterator end = value.GetAssociativeIteratorValueEnd();
-    
-    while (it != end) {
-        WriteAMFString(this, it->first);
-        this->Write(it->second);
-        it++;
-    }
-    
-    this->Write(AMFNull);
-    
-    if (denseSize > 0) {
-        _AMFArrayList_::iterator it2 = value.GetDenseIteratorBegin();
-        _AMFArrayList_::iterator end2 = value.GetDenseIteratorEnd();
-        
-        while (it2 != end2) {
-            this->Write(*it2);
-            it2++;
-        }
-    }
-}

dCommon/AMFFormat_BitStream.h

@@ -1,92 +0,0 @@
-#pragma once
-
-// Custom Classes
-#include "AMFFormat.h"
-
-// RakNet
-#include <BitStream.h>
-
-/*!
-  \file AMFBitStream.hpp
-  \brief A class that implements native writing of AMF values to RakNet::BitStream
- */
-
-// We are using the RakNet namespace
-namespace RakNet {
-    //! Writes an AMFValue pointer to a RakNet::BitStream
-    /*!
-     \param value The value to write
-     */
-    template<>
-    void RakNet::BitStream::Write<AMFValue*>(AMFValue* value);
-    
-    //! Writes an AMFUndefinedValue to a RakNet::BitStream
-    /*!
-     \param value The value to write
-     */
-    template<>
-    void RakNet::BitStream::Write<AMFUndefinedValue>(AMFUndefinedValue value);
-    
-    //! Writes an AMFNullValue to a RakNet::BitStream
-    /*!
-     \param value The value to write
-     */
-    template<>
-    void RakNet::BitStream::Write<AMFNullValue>(AMFNullValue value);
-    
-    //! Writes an AMFFalseValue to a RakNet::BitStream
-    /*!
-     \param value The value to write
-     */
-    template<>
-    void RakNet::BitStream::Write<AMFFalseValue>(AMFFalseValue value);
-    
-    //! Writes an AMFTrueValue to a RakNet::BitStream
-    /*!
-     \param value The value to write
-     */
-    template<>
-    void RakNet::BitStream::Write<AMFTrueValue>(AMFTrueValue value);
-    
-    //! Writes an AMFIntegerValue to a RakNet::BitStream
-    /*!
-     \param value The value to write
-     */
-    template<>
-    void RakNet::BitStream::Write<AMFIntegerValue>(AMFIntegerValue value);
-    
-    //! Writes an AMFDoubleValue to a RakNet::BitStream
-    /*!
-     \param value The value to write
-     */
-    template<>
-    void RakNet::BitStream::Write<AMFDoubleValue>(AMFDoubleValue value);
-    
-    //! Writes an AMFStringValue to a RakNet::BitStream
-    /*!
-     \param value The value to write
-     */
-    template<>
-    void RakNet::BitStream::Write<AMFStringValue>(AMFStringValue value);
-    
-    //! Writes an AMFXMLDocValue to a RakNet::BitStream
-    /*!
-     \param value The value to write
-     */
-    template<>
-    void RakNet::BitStream::Write<AMFXMLDocValue>(AMFXMLDocValue value);
-    
-    //! Writes an AMFDateValue to a RakNet::BitStream
-    /*!
-     \param value The value to write
-     */
-    template<>
-    void RakNet::BitStream::Write<AMFDateValue>(AMFDateValue value);
-    
-    //! Writes an AMFArrayValue to a RakNet::BitStream
-    /*!
-     \param value The value to write
-     */
-    template<>
-    void RakNet::BitStream::Write<AMFArrayValue>(AMFArrayValue value);
-}

dCommon/Amf3.h

@@ -0,0 +1,380 @@
+#ifndef __AMF3__H__
+#define __AMF3__H__
+
+#include "dCommonVars.h"
+#include "Logger.h"
+#include "Game.h"
+
+#include <unordered_map>
+#include <vector>
+
+enum class eAmf : uint8_t {
+	Undefined = 0x00,            // An undefined AMF Value
+	Null = 0x01,                 // A null AMF value
+	False = 0x02,                // A false AMF value
+	True = 0x03,                 // A true AMF value
+	Integer = 0x04,              // An integer AMF value
+	Double = 0x05,               // A double AMF value
+	String = 0x06,               // A string AMF value
+	XMLDoc = 0x07,               // Unused in the live client and cannot be serialized without modification.  An XML Doc AMF value
+	Date = 0x08,                 // Unused in the live client and cannot be serialized without modification.  A date AMF value
+	Array = 0x09,                // An array AMF value
+	Object = 0x0A,               // Unused in the live client and cannot be serialized without modification.  An object AMF value
+	XML = 0x0B,                  // Unused in the live client and cannot be serialized without modification.  An XML AMF value
+	ByteArray = 0x0C,            // Unused in the live client and cannot be serialized without modification.  A byte array AMF value
+	VectorInt = 0x0D,            // Unused in the live client and cannot be serialized without modification.  An integer vector AMF value
+	VectorUInt = 0x0E,           // Unused in the live client and cannot be serialized without modification.  An unsigned integer AMF value
+	VectorDouble = 0x0F,         // Unused in the live client and cannot be serialized without modification.  A double vector AMF value
+	VectorObject = 0x10,         // Unused in the live client and cannot be serialized without modification.  An object vector AMF value
+	Dictionary = 0x11            // Unused in the live client and cannot be serialized without modification.  A dictionary AMF value
+};
+
+class AMFBaseValue {
+public:
+	[[nodiscard]] constexpr virtual eAmf GetValueType() const noexcept { return eAmf::Undefined; }
+	constexpr AMFBaseValue() noexcept = default;
+	constexpr virtual ~AMFBaseValue() noexcept = default;
+};
+
+// AMFValue template class instantiations
+template <typename ValueType>
+class AMFValue : public AMFBaseValue {
+public:
+	AMFValue() = default;
+	AMFValue(const ValueType value) : m_Data{ value } {}
+
+	virtual ~AMFValue() override = default;
+
+	[[nodiscard]] constexpr eAmf GetValueType() const noexcept override;
+
+	[[nodiscard]] const ValueType& GetValue() const { return m_Data; }
+
+	void SetValue(const ValueType value) { m_Data = value; }
+
+protected:
+	ValueType m_Data;
+};
+
+// Explicit template class instantiations
+template class AMFValue<std::nullptr_t>;
+template class AMFValue<bool>;
+template class AMFValue<int32_t>;
+template class AMFValue<uint32_t>;
+template class AMFValue<std::string>;
+template class AMFValue<double>;
+
+// AMFValue template class member function instantiations
+template <> [[nodiscard]] constexpr eAmf AMFValue<std::nullptr_t>::GetValueType() const noexcept { return eAmf::Null; }
+template <> [[nodiscard]] constexpr eAmf AMFValue<bool>::GetValueType() const noexcept { return m_Data ? eAmf::True : eAmf::False; }
+template <> [[nodiscard]] constexpr eAmf AMFValue<int32_t>::GetValueType() const noexcept { return eAmf::Integer; }
+template <> [[nodiscard]] constexpr eAmf AMFValue<uint32_t>::GetValueType() const noexcept { return eAmf::Integer; }
+template <> [[nodiscard]] constexpr eAmf AMFValue<std::string>::GetValueType() const noexcept { return eAmf::String; }
+template <> [[nodiscard]] constexpr eAmf AMFValue<double>::GetValueType() const noexcept { return eAmf::Double; }
+
+template <typename ValueType>
+[[nodiscard]] constexpr eAmf AMFValue<ValueType>::GetValueType() const noexcept { return eAmf::Undefined; }
+
+// As a string this is much easier to write and read from a BitStream.
+template <>
+class AMFValue<const char*> : public AMFBaseValue {
+public:
+	AMFValue() = default;
+	AMFValue(const char* value) { m_Data = value; }
+	virtual ~AMFValue() override = default;
+
+	[[nodiscard]] constexpr eAmf GetValueType() const noexcept override { return eAmf::String; }
+
+	[[nodiscard]] const std::string& GetValue() const { return m_Data; }
+	void SetValue(const std::string& value) { m_Data = value; }
+protected:
+	std::string m_Data;
+};
+
+using AMFNullValue = AMFValue<std::nullptr_t>;
+using AMFBoolValue = AMFValue<bool>;
+using AMFIntValue = AMFValue<int32_t>;
+using AMFStringValue = AMFValue<std::string>;
+using AMFDoubleValue = AMFValue<double>;
+
+/**
+ * The AMFArrayValue object holds 2 types of lists:
+ * An associative list where a key maps to a value
+ * A Dense list where elements are stored back to back
+ *
+ * Objects that are Registered are owned by this object
+ * and are not to be deleted by a caller.
+ */
+class AMFArrayValue : public AMFBaseValue {
+	using AMFAssociative = std::unordered_map<std::string, AMFBaseValue*>;
+	using AMFDense = std::vector<AMFBaseValue*>;
+
+public:
+	[[nodiscard]] constexpr eAmf GetValueType() const noexcept override { return eAmf::Array; }
+
+	~AMFArrayValue() override {
+		for (const auto* valueToDelete : GetDense()) {
+			if (valueToDelete) {
+				delete valueToDelete;
+				valueToDelete = nullptr;
+			}
+		}
+		for (auto valueToDelete : GetAssociative()) {
+			if (valueToDelete.second) {
+				delete valueToDelete.second;
+				valueToDelete.second = nullptr;
+			}
+		}
+	}
+
+	/**
+	 * Returns the Associative portion of the object
+	 */
+	[[nodiscard]] inline const AMFAssociative& GetAssociative() const noexcept { return m_Associative; }
+
+	/**
+	 * Returns the dense portion of the object
+	 */
+	[[nodiscard]] inline const AMFDense& GetDense() const noexcept { return m_Dense; }
+
+	/**
+	 * Inserts an AMFValue into the associative portion with the given key.
+	 * If a duplicate is attempted to be inserted, it is ignored and the
+	 * first value with that key is kept in the map.
+	 *
+	 * These objects are not to be deleted by the caller as they are owned by
+	 * the AMFArray object which manages its own memory.
+	 *
+	 * @param key The key to associate with the value
+	 * @param value The value to insert
+	 *
+	 * @return The inserted element if the type matched,
+	 * or nullptr if a key existed and was not the same type
+	 */
+	template <typename ValueType>
+	[[maybe_unused]] std::pair<AMFValue<ValueType>*, bool> Insert(const std::string& key, const ValueType value) {
+		const auto element = m_Associative.find(key);
+		AMFValue<ValueType>* val = nullptr;
+		bool found = true;
+		if (element == m_Associative.cend()) {
+			val = new AMFValue<ValueType>(value);
+			m_Associative.emplace(key, val);
+		} else {
+			val = dynamic_cast<AMFValue<ValueType>*>(element->second);
+			found = false;
+		}
+		return std::make_pair(val, found);
+	}
+
+	// Associates an array with a string key
+	[[maybe_unused]] std::pair<AMFBaseValue*, bool> Insert(const std::string& key) {
+		const auto element = m_Associative.find(key);
+		AMFArrayValue* val = nullptr;
+		bool found = true;
+		if (element == m_Associative.cend()) {
+			val = new AMFArrayValue();
+			m_Associative.emplace(key, val);
+		} else {
+			val = dynamic_cast<AMFArrayValue*>(element->second);
+			found = false;
+		}
+		return std::make_pair(val, found);
+	}
+
+	// Associates an array with an integer key
+	[[maybe_unused]] std::pair<AMFBaseValue*, bool> Insert(const size_t index) {
+		AMFArrayValue* val = nullptr;
+		bool inserted = false;
+		if (index >= m_Dense.size()) {
+			m_Dense.resize(index + 1);
+			val = new AMFArrayValue();
+			m_Dense.at(index) = val;
+			inserted = true;
+		}
+		return std::make_pair(dynamic_cast<AMFArrayValue*>(m_Dense.at(index)), inserted);
+	}
+
+	/**
+	 * @brief Inserts an AMFValue into the AMFArray key'd by index.
+	 * Attempting to insert the same key to the same value twice overwrites
+	 * the previous value with the new one.
+	 *
+	 * @param index The index to associate with the value
+	 * @param value The value to insert
+	 * @return The inserted element, or nullptr if the type did not match
+	 * what was at the index.
+	 */
+	template <typename ValueType>
+	[[maybe_unused]] std::pair<AMFValue<ValueType>*, bool> Insert(const size_t index, const ValueType value) {
+		AMFValue<ValueType>* val = nullptr;
+		bool inserted = false;
+		if (index >= m_Dense.size()) {
+			m_Dense.resize(index + 1);
+			val = new AMFValue<ValueType>(value);
+			m_Dense.at(index) = val;
+			inserted = true;
+		}
+		return std::make_pair(dynamic_cast<AMFValue<ValueType>*>(m_Dense.at(index)), inserted);
+	}
+
+	/**
+	 * Inserts an AMFValue into the associative portion with the given key.
+	 * If a duplicate is attempted to be inserted, it replaces the original
+	 *
+	 * The inserted element is now owned by this object and is not to be deleted
+	 *
+	 * @param key The key to associate with the value
+	 * @param value The value to insert
+	 */
+	void Insert(const std::string& key, AMFBaseValue* const value) {
+		const auto element = m_Associative.find(key);
+		if (element != m_Associative.cend() && element->second) {
+			delete element->second;
+			element->second = value;
+		} else {
+			m_Associative.emplace(key, value);
+		}
+	}
+
+	/**
+	 * Inserts an AMFValue into the associative portion with the given index.
+	 * If a duplicate is attempted to be inserted, it replaces the original
+	 *
+	 * The inserted element is now owned by this object and is not to be deleted
+	 *
+	 * @param key The key to associate with the value
+	 * @param value The value to insert
+	 */
+	void Insert(const size_t index, AMFBaseValue* const value) {
+		if (index < m_Dense.size()) {
+			const AMFDense::const_iterator itr = m_Dense.cbegin() + index;
+			if (*itr) delete m_Dense.at(index);
+		} else {
+			m_Dense.resize(index + 1);
+		}
+		m_Dense.at(index) = value;
+	}
+
+	/**
+	 * Pushes an AMFValue into the back of the dense portion.
+	 *
+	 * These objects are not to be deleted by the caller as they are owned by
+	 * the AMFArray object which manages its own memory.
+	 *
+	 * @param value The value to insert
+	 *
+	 * @return The inserted pointer, or nullptr should the key already be in use.
+	 */
+	template <typename ValueType>
+	[[maybe_unused]] inline AMFValue<ValueType>* Push(const ValueType value) {
+		return Insert(m_Dense.size(), value).first;
+	}
+
+	/**
+	 * Removes the key from the associative portion
+	 *
+	 * The pointer removed is now no longer managed by this container
+	 *
+	 * @param key The key to remove from the associative portion
+	 */
+	void Remove(const std::string& key, const bool deleteValue = true) {
+		const AMFAssociative::const_iterator it = m_Associative.find(key);
+		if (it != m_Associative.cend()) {
+			if (deleteValue) delete it->second;
+			m_Associative.erase(it);
+		}
+	}
+
+	/**
+	 * Pops the last element in the dense portion, deleting it in the process.
+	 */
+	void Remove(const size_t index) {
+		if (!m_Dense.empty() && index < m_Dense.size()) {
+			const auto itr = m_Dense.cbegin() + index;
+			if (*itr) delete (*itr);
+			m_Dense.erase(itr);
+		}
+	}
+
+	void Pop() {
+		if (!m_Dense.empty()) Remove(m_Dense.size() - 1);
+	}
+
+	[[nodiscard]] AMFArrayValue* GetArray(const std::string& key) const {
+		const AMFAssociative::const_iterator it = m_Associative.find(key);
+		return it != m_Associative.cend() ? dynamic_cast<AMFArrayValue*>(it->second) : nullptr;
+	}
+
+	[[nodiscard]] AMFArrayValue* GetArray(const size_t index) const {
+		return index < m_Dense.size() ? dynamic_cast<AMFArrayValue*>(m_Dense.at(index)) : nullptr;
+	}
+
+	[[maybe_unused]] inline AMFArrayValue* InsertArray(const std::string& key) {
+		return static_cast<AMFArrayValue*>(Insert(key).first);
+	}
+
+	[[maybe_unused]] inline AMFArrayValue* InsertArray(const size_t index) {
+		return static_cast<AMFArrayValue*>(Insert(index).first);
+	}
+
+	[[maybe_unused]] inline AMFArrayValue* PushArray() {
+		return static_cast<AMFArrayValue*>(Insert(m_Dense.size()).first);
+	}
+
+	/**
+	 * Gets an AMFValue by the key from the associative portion and converts it
+	 * to the AmfValue template type.  If the key did not exist, it is inserted.
+	 *
+	 * @tparam The target object type
+	 * @param key The key to lookup
+	 *
+	 * @return The AMFValue
+	 */
+	template <typename AmfType>
+	[[nodiscard]] AMFValue<AmfType>* Get(const std::string& key) const {
+		const AMFAssociative::const_iterator it = m_Associative.find(key);
+		return it != m_Associative.cend() ?
+			dynamic_cast<AMFValue<AmfType>*>(it->second) :
+			nullptr;
+	}
+
+	// Get from the array but dont cast it
+	[[nodiscard]] AMFBaseValue* Get(const std::string& key) const {
+		const AMFAssociative::const_iterator it = m_Associative.find(key);
+		return it != m_Associative.cend() ? it->second : nullptr;
+	}
+
+	/**
+	 * @brief Get an AMFValue object at a position in the dense portion.
+	 * Gets an AMFValue by the index from the dense portion and converts it
+	 * to the AmfValue template type.  If the index did not exist, it is inserted.
+	 *
+	 * @tparam The target object type
+	 * @param index The index to get
+	 * @return The casted object, or nullptr.
+	 */
+	template <typename AmfType>
+	[[nodiscard]] AMFValue<AmfType>* Get(const size_t index) const {
+		return index < m_Dense.size() ?
+			dynamic_cast<AMFValue<AmfType>*>(m_Dense.at(index)) :
+			nullptr;
+	}
+
+	// Get from the dense but dont cast it
+	[[nodiscard]] AMFBaseValue* Get(const size_t index) const {
+		return index < m_Dense.size() ? m_Dense.at(index) : nullptr;
+	}
+
+private:
+	/**
+	 * The associative portion.  These values are key'd with strings to an AMFValue.
+	 */
+	AMFAssociative m_Associative;
+
+	/**
+	 * The dense portion.  These AMFValue's are stored one after
+	 * another with the most recent addition being at the back.
+	 */
+	AMFDense m_Dense;
+};
+
+#endif  //!__AMF3__H__

dCommon/AmfSerialize.cpp

@@ -0,0 +1,184 @@
+#include "AmfSerialize.h"
+
+#include "Game.h"
+#include "Logger.h"
+
+// Writes an AMFValue pointer to a RakNet::BitStream
+template<>
+void RakNet::BitStream::Write<AMFBaseValue&>(AMFBaseValue& value) {
+	eAmf type = value.GetValueType();
+	this->Write(type);
+	switch (type) {
+	case eAmf::Integer: {
+		this->Write<AMFIntValue&>(*static_cast<AMFIntValue*>(&value));
+		break;
+	}
+
+	case eAmf::Double: {
+		this->Write<AMFDoubleValue&>(*static_cast<AMFDoubleValue*>(&value));
+		break;
+	}
+
+	case eAmf::String: {
+		this->Write<AMFStringValue&>(*static_cast<AMFStringValue*>(&value));
+		break;
+	}
+
+	case eAmf::Array: {
+		this->Write<AMFArrayValue&>(*static_cast<AMFArrayValue*>(&value));
+		break;
+	}
+	default: {
+		LOG("Encountered unwritable AMFType %i!", type);
+	}
+	case eAmf::Undefined:
+	case eAmf::Null:
+	case eAmf::False:
+	case eAmf::True:
+	case eAmf::Date:
+	case eAmf::Object:
+	case eAmf::XML:
+	case eAmf::XMLDoc:
+	case eAmf::ByteArray:
+	case eAmf::VectorInt:
+	case eAmf::VectorUInt:
+	case eAmf::VectorDouble:
+	case eAmf::VectorObject:
+	case eAmf::Dictionary:
+		break;
+	}
+}
+
+/**
+ * A private function to write an value to a RakNet::BitStream
+ * RakNet writes in the correct byte order - do not reverse this.
+ */
+void WriteUInt29(RakNet::BitStream& bs, uint32_t v) {
+	unsigned char b4 = static_cast<unsigned char>(v);
+	if (v < 0x00200000) {
+		b4 = b4 & 0x7F;
+		if (v > 0x7F) {
+			unsigned char b3;
+			v = v >> 7;
+			b3 = static_cast<unsigned char>(v) | 0x80;
+			if (v > 0x7F) {
+				unsigned char b2;
+				v = v >> 7;
+				b2 = static_cast<unsigned char>(v) | 0x80;
+				bs.Write(b2);
+			}
+
+			bs.Write(b3);
+		}
+	} else {
+		unsigned char b1;
+		unsigned char b2;
+		unsigned char b3;
+
+		v = v >> 8;
+		b3 = static_cast<unsigned char>(v) | 0x80;
+		v = v >> 7;
+		b2 = static_cast<unsigned char>(v) | 0x80;
+		v = v >> 7;
+		b1 = static_cast<unsigned char>(v) | 0x80;
+
+		bs.Write(b1);
+		bs.Write(b2);
+		bs.Write(b3);
+	}
+
+	bs.Write(b4);
+}
+
+/**
+ * Writes a flag number to a RakNet::BitStream
+ * RakNet writes in the correct byte order - do not reverse this.
+ */
+void WriteFlagNumber(RakNet::BitStream& bs, uint32_t v) {
+	v = (v << 1) | 0x01;
+	WriteUInt29(bs, v);
+}
+
+/**
+ * Writes an AMFString to a RakNet::BitStream
+ *
+ * RakNet writes in the correct byte order - do not reverse this.
+ */
+void WriteAMFString(RakNet::BitStream& bs, const std::string& str) {
+	WriteFlagNumber(bs, static_cast<uint32_t>(str.size()));
+	bs.Write(str.c_str(), static_cast<uint32_t>(str.size()));
+}
+
+/**
+ * Writes an U16 to a bitstream
+ *
+ * RakNet writes in the correct byte order - do not reverse this.
+ */
+void WriteAMFU16(RakNet::BitStream& bs, uint16_t value) {
+	bs.Write(value);
+}
+
+/**
+ * Writes an U32 to a bitstream
+ *
+ * RakNet writes in the correct byte order - do not reverse this.
+ */
+void WriteAMFU32(RakNet::BitStream& bs, uint32_t value) {
+	bs.Write(value);
+}
+
+/**
+ * Writes an U64 to a bitstream
+ *
+ * RakNet writes in the correct byte order - do not reverse this.
+ */
+void WriteAMFU64(RakNet::BitStream& bs, uint64_t value) {
+	bs.Write(value);
+}
+
+// Writes an AMFIntegerValue to BitStream
+template<>
+void RakNet::BitStream::Write<AMFIntValue&>(AMFIntValue& value) {
+	WriteUInt29(*this, value.GetValue());
+}
+
+// Writes an AMFDoubleValue to BitStream
+template<>
+void RakNet::BitStream::Write<AMFDoubleValue&>(AMFDoubleValue& value) {
+	double d = value.GetValue();
+	WriteAMFU64(*this, *reinterpret_cast<uint64_t*>(&d));
+}
+
+// Writes an AMFStringValue to BitStream
+template<>
+void RakNet::BitStream::Write<AMFStringValue&>(AMFStringValue& value) {
+	WriteAMFString(*this, value.GetValue());
+}
+
+// Writes an AMFArrayValue to BitStream
+template<>
+void RakNet::BitStream::Write<AMFArrayValue&>(AMFArrayValue& value) {
+	uint32_t denseSize = value.GetDense().size();
+	WriteFlagNumber(*this, denseSize);
+
+	auto it = value.GetAssociative().begin();
+	auto end = value.GetAssociative().end();
+
+	while (it != end) {
+		WriteAMFString(*this, it->first);
+		this->Write<AMFBaseValue&>(*it->second);
+		it++;
+	}
+
+	this->Write(eAmf::Null);
+
+	if (denseSize > 0) {
+		auto it2 = value.GetDense().begin();
+		auto end2 = value.GetDense().end();
+
+		while (it2 != end2) {
+			this->Write<AMFBaseValue&>(**it2);
+			it2++;
+		}
+	}
+}

dCommon/AmfSerialize.h

@@ -0,0 +1,50 @@
+#pragma once
+
+// Custom Classes
+#include "Amf3.h"
+
+// RakNet
+#include "BitStream.h"
+
+/*!
+ \file AmfSerialize.h
+ \brief A class that implements native writing of AMF values to RakNet::BitStream
+ */
+
+ // We are using the RakNet namespace
+namespace RakNet {
+	//! Writes an AMFValue pointer to a RakNet::BitStream
+	/*!
+	 \param value The value to write
+	 */
+	template <>
+	void RakNet::BitStream::Write<AMFBaseValue&>(AMFBaseValue& value);
+
+	//! Writes an AMFIntegerValue to a RakNet::BitStream
+	/*!
+	 \param value The value to write
+	 */
+	template <>
+	void RakNet::BitStream::Write<AMFIntValue&>(AMFIntValue& value);
+
+	//! Writes an AMFDoubleValue to a RakNet::BitStream
+	/*!
+	 \param value The value to write
+	 */
+	template <>
+	void RakNet::BitStream::Write<AMFDoubleValue&>(AMFDoubleValue& value);
+
+	//! Writes an AMFStringValue to a RakNet::BitStream
+	/*!
+	 \param value The value to write
+	 */
+	template <>
+	void RakNet::BitStream::Write<AMFStringValue&>(AMFStringValue& value);
+
+	//! Writes an AMFArrayValue to a RakNet::BitStream
+	/*!
+	 \param value The value to write
+	 */
+	template <>
+	void RakNet::BitStream::Write<AMFArrayValue&>(AMFArrayValue& value);
+} // namespace RakNet

dCommon/BinaryIO.cpp

@@ -1,16 +1,8 @@
 #include "BinaryIO.h"
 #include <string>
 
-void BinaryIO::WriteString(const std::string& stringToWrite, std::ofstream& outstream) {
-	//BinaryWrite(outstream, uint32_t(stringToWrite.length()));
-
-	for (size_t i = 0; i < size_t(stringToWrite.length()); ++i) {
-		BinaryIO::BinaryWrite(outstream, stringToWrite[i]);
-	}
-}
-
 //For reading null-terminated strings
-std::string BinaryIO::ReadString(std::ifstream & instream) {
+std::string BinaryIO::ReadString(std::istream& instream) {
 	std::string toReturn;
 	char buffer;
 
@@ -23,36 +15,3 @@ std::string BinaryIO::ReadString(std::ifstream & instream) {
 
 	return toReturn;
 }
-
-//For reading strings of a specific size
-std::string BinaryIO::ReadString(std::ifstream& instream, size_t size) {
-	std::string toReturn;
-	char buffer;
-
-	for (size_t i = 0; i < size; ++i) {
-		BinaryIO::BinaryRead(instream, buffer);
-		toReturn += buffer;
-	}
-
-	return toReturn;
-}
-
-std::string BinaryIO::ReadWString(std::ifstream & instream) {
-	size_t size;
-	BinaryRead(instream, size);
-	//toReturn.resize(size);
-	std::string test;
-	unsigned char buf;
-
-	for (size_t i = 0; i < size; ++i) {
-		//instream.ignore(1);
-		BinaryRead(instream, buf);
-		test += buf;
-	}
-
-	//printf("%s\n", test.c_str());
-
-	//instream.read((char*)&toReturn[0], size * 2);
-	//std::string str(toReturn.begin(), toReturn.end());
-	return test;
-}

dCommon/BinaryIO.h

@@ -1,28 +1,74 @@
 #pragma once
+
+#ifndef __BINARYIO__H__
+#define __BINARYIO__H__
+
 #include <iostream>
 #include <fstream>
+#include <string>
+
+#include "Game.h"
+#include "Logger.h"
 
 namespace BinaryIO {
+
 	template<typename T>
 	std::ostream& BinaryWrite(std::ostream& stream, const T& value) {
 		return stream.write(reinterpret_cast<const char*>(&value), sizeof(T));
 	}
 
 	template<typename T>
-	std::istream & BinaryRead(std::istream& stream, T& value) {
-		if (!stream.good()) 
-			printf("bla");
+	std::istream& BinaryRead(std::istream& stream, T& value) {
+		if (!stream.good()) throw std::runtime_error("Failed to read from istream.");
 
 		return stream.read(reinterpret_cast<char*>(&value), sizeof(T));
 	}
 
-	void WriteString(const std::string& stringToWrite, std::ofstream& outstream);
-	std::string ReadString(std::ifstream & instream);
-	std::string ReadString(std::ifstream& instream, size_t size);
-	std::string ReadWString(std::ifstream& instream);
+	enum class ReadType : int8_t {
+		WideString = 0,
+		String = 1,
+	};
+
+	template<typename SizeType>
+	inline void ReadString(std::istream& stream, std::u16string& value) {
+		static_assert(std::is_integral<SizeType>::value, "SizeType must be an integral type.");
+
+		SizeType size;
+		BinaryRead(stream, size);
+
+		if (!stream.good()) throw std::runtime_error("Failed to read from istream.");
+		value.resize(size);
+		stream.read(reinterpret_cast<char*>(value.data()), size * sizeof(uint16_t));
+	}
+
+	template<typename SizeType>
+	inline void ReadString(std::istream& stream, std::string& value, ReadType readType) {
+		static_assert(std::is_integral<SizeType>::value, "SizeType must be an integral type.");
+
+		SizeType size;
+		BinaryRead(stream, size);
+
+		if (!stream.good()) throw std::runtime_error("Failed to read from istream.");
+		value.resize(size);
+		if (readType == ReadType::WideString) {
+			uint16_t wideChar;
+
+			// Faster to do this than to read a u16string and convert it to a string since we only go through allocator once
+			for (SizeType i = 0; i < size; ++i) {
+				BinaryRead(stream, wideChar);
+				value[i] = static_cast<char>(wideChar);
+			}
+		} else {
+			stream.read(value.data(), size);
+		}
+	}
+
+	std::string ReadString(std::istream& instream);
 
 	inline bool DoesFileExist(const std::string& name) {
 		std::ifstream f(name.c_str());
 		return f.good();
 	}
 }
+
+#endif  //!__BINARYIO__H__

dCommon/BinaryPathFinder.cpp

@@ -0,0 +1,71 @@
+#include <filesystem>
+#include <string>
+#include "BinaryPathFinder.h"
+#include "dPlatforms.h"
+
+#if defined(DARKFLAME_PLATFORM_WIN32)
+#include <Windows.h>
+#elif defined(DARKFLAME_PLATFORM_MACOS) || defined(DARKFLAME_PLATFORM_IOS)
+#include <mach-o/dyld.h>
+#elif defined(DARKFLAME_PLATFORM_FREEBSD)
+#include <sys/types.h>
+#include <sys/sysctl.h>
+#include <stdlib.h>
+#endif
+
+std::filesystem::path BinaryPathFinder::binaryDir;
+
+std::filesystem::path BinaryPathFinder::GetBinaryDir() {
+	if (!binaryDir.empty()) {
+		return binaryDir;
+	}
+
+	std::string pathStr;
+
+	// Derived from boost::dll::program_location, licensed under the Boost Software License: http://www.boost.org/LICENSE_1_0.txt
+#if defined(DARKFLAME_PLATFORM_WIN32)
+	char path[MAX_PATH];
+	GetModuleFileName(NULL, path, MAX_PATH);
+	pathStr = std::string(path);
+#elif defined(DARKFLAME_PLATFORM_MACOS) || defined(DARKFLAME_PLATFORM_IOS)
+	char path[1024];
+	uint32_t size = sizeof(path);
+	if (_NSGetExecutablePath(path, &size) == 0) {
+		pathStr = std::string(path);
+	} else {
+		// The filepath size is greater than our initial buffer size, so try again with the size
+		// that _NSGetExecutablePath told us it actually is
+		char *p = new char[size];
+		if (_NSGetExecutablePath(p, &size) != 0) {
+			throw std::runtime_error("Failed to get binary path from _NSGetExecutablePath");
+		}
+
+		pathStr = std::string(p);
+		delete[] p;
+	}
+#elif defined(DARKFLAME_PLATFORM_FREEBSD)
+	int mib[4];
+	mib[0] = CTL_KERN;
+	mib[1] = KERN_PROC;
+	mib[2] = KERN_PROC_PATHNAME;
+	mib[3] = -1;
+	char buf[10240];
+	size_t cb = sizeof(buf);
+	sysctl(mib, 4, buf, &cb, NULL, 0);
+	pathStr = std::string(buf);
+#else // DARKFLAME_PLATFORM_LINUX || DARKFLAME_PLATFORM_UNIX || DARKFLAME_PLATFORM_ANDROID
+	pathStr = std::filesystem::read_symlink("/proc/self/exe");
+#endif
+
+	// Some methods like _NSGetExecutablePath could return a symlink
+	// Either way, we need to get the parent path because we want the directory, not the binary itself
+	// We also ensure that it is an absolute path so that it is valid if we need to construct a path
+	// to exucute on unix systems (eg sudo BinaryPathFinder::GetBinaryDir() / WorldServer)
+	if (std::filesystem::is_symlink(pathStr)) {
+		binaryDir = std::filesystem::absolute(std::filesystem::read_symlink(pathStr).parent_path());
+	} else {
+		binaryDir = std::filesystem::absolute(std::filesystem::path(pathStr).parent_path());
+	}
+
+	return binaryDir;
+}

dCommon/BinaryPathFinder.h

@@ -0,0 +1,15 @@
+#pragma once
+
+#ifndef __BINARYPATHFINDER__H__
+#define __BINARYPATHFINDER__H__
+
+#include <filesystem>
+
+class BinaryPathFinder {
+private:
+	static std::filesystem::path binaryDir;
+public:
+	static std::filesystem::path GetBinaryDir();
+};
+
+#endif  //!__BINARYPATHFINDER__H__

dCommon/Brick.h

@@ -0,0 +1,11 @@
+#ifndef __BRICK__H__
+#define __BRICK__H__
+
+#include <cstdint>
+
+struct Brick {
+	uint32_t designerID;
+	uint32_t materialID;
+};
+
+#endif  //!__BRICK__H__

dCommon/BrickByBrickFix.cpp

@@ -0,0 +1,154 @@
+#include "BrickByBrickFix.h"
+
+#include <memory>
+#include <iostream>
+#include <sstream>
+
+#include "tinyxml2.h"
+
+#include "Database.h"
+#include "Game.h"
+#include "ZCompression.h"
+#include "Logger.h"
+
+//! Forward declarations
+
+void WriteSd0Magic(char* input, uint32_t chunkSize);
+bool CheckSd0Magic(std::istream& streamToCheck);
+
+/**
+ * @brief Truncates all models with broken data from the database.
+ *
+ * @return The number of models deleted
+ */
+uint32_t BrickByBrickFix::TruncateBrokenBrickByBrickXml() {
+	uint32_t modelsTruncated{};
+	auto modelsToTruncate = Database::Get()->GetAllUgcModels();
+	bool previousCommitValue = Database::Get()->GetAutoCommit();
+	Database::Get()->SetAutoCommit(false);
+	for (auto& model : modelsToTruncate) {
+		std::string completeUncompressedModel{};
+		uint32_t chunkCount{};
+		// Check that header is sd0 by checking for the sd0 magic.
+		if (CheckSd0Magic(model.lxfmlData)) {
+			while (true) {
+				uint32_t chunkSize{};
+				model.lxfmlData.read(reinterpret_cast<char*>(&chunkSize), sizeof(uint32_t)); // Extract chunk size from istream
+
+				// Check if good here since if at the end of an sd0 file, this will have eof flagged.
+				if (!model.lxfmlData.good()) break;
+
+				std::unique_ptr<uint8_t[]> compressedChunk(new uint8_t[chunkSize]);
+				for (uint32_t i = 0; i < chunkSize; i++) {
+					compressedChunk[i] = model.lxfmlData.get();
+				}
+
+				// Ignore the valgrind warning about uninitialized values.  These are discarded later when we know the actual uncompressed size.
+				std::unique_ptr<uint8_t[]> uncompressedChunk(new uint8_t[ZCompression::MAX_SD0_CHUNK_SIZE]);
+				int32_t err{};
+				int32_t actualUncompressedSize = ZCompression::Decompress(
+					compressedChunk.get(), chunkSize, uncompressedChunk.get(), ZCompression::MAX_SD0_CHUNK_SIZE, err);
+
+				if (actualUncompressedSize != -1) {
+					uint32_t previousSize = completeUncompressedModel.size();
+					completeUncompressedModel.append(reinterpret_cast<char*>(uncompressedChunk.get()));
+					completeUncompressedModel.resize(previousSize + actualUncompressedSize);
+				} else {
+					LOG("Failed to inflate chunk %i for model %llu.  Error: %i", chunkCount, model.id, err);
+					break;
+				}
+				chunkCount++;
+			}
+			std::unique_ptr<tinyxml2::XMLDocument> document = std::make_unique<tinyxml2::XMLDocument>();
+			if (!document) {
+				LOG("Failed to initialize tinyxml document.  Aborting.");
+				return 0;
+			}
+
+			if (!(document->Parse(completeUncompressedModel.c_str(), completeUncompressedModel.size()) == tinyxml2::XML_SUCCESS)) {
+				if (completeUncompressedModel.find(
+					"</LXFML>",
+					completeUncompressedModel.length() >= 15 ? completeUncompressedModel.length() - 15 : 0) == std::string::npos
+					) {
+					LOG("Brick-by-brick model %llu will be deleted!", model.id);
+					Database::Get()->DeleteUgcModelData(model.id);
+					modelsTruncated++;
+				}
+			}
+		} else {
+			LOG("Brick-by-brick model %llu will be deleted!", model.id);
+			Database::Get()->DeleteUgcModelData(model.id);
+			modelsTruncated++;
+		}
+	}
+
+	Database::Get()->Commit();
+	Database::Get()->SetAutoCommit(previousCommitValue);
+	return modelsTruncated;
+}
+
+/**
+ * @brief Updates all current models in the database to have the Segmented Data 0 (SD0) format.
+ * Any models that do not start with zlib and best compression magic will not be updated.
+ *
+ * @return The number of models updated to SD0
+ */
+uint32_t BrickByBrickFix::UpdateBrickByBrickModelsToSd0() {
+	uint32_t updatedModels = 0;
+	auto modelsToUpdate = Database::Get()->GetAllUgcModels();
+	auto previousAutoCommitState = Database::Get()->GetAutoCommit();
+	Database::Get()->SetAutoCommit(false);
+	for (auto& model : modelsToUpdate) {
+		// Check if the stored blob starts with zlib magic (0x78 0xDA - best compression of zlib)
+		// If it does, convert it to sd0.
+		if (model.lxfmlData.get() == 0x78 && model.lxfmlData.get() == 0xDA) {
+			// Get and save size of zlib compressed chunk.
+			model.lxfmlData.seekg(0, std::ios::end);
+			uint32_t oldLxfmlSize = static_cast<uint32_t>(model.lxfmlData.tellg());
+			model.lxfmlData.seekg(0);
+
+			// Allocate 9 extra bytes.  5 for sd0 magic, 4 for the only zlib compressed size.
+			uint32_t oldLxfmlSizeWithHeader = oldLxfmlSize + 9;
+			std::unique_ptr<char[]> sd0ConvertedModel(new char[oldLxfmlSizeWithHeader]);
+
+			WriteSd0Magic(sd0ConvertedModel.get(), oldLxfmlSize);
+			for (uint32_t i = 9; i < oldLxfmlSizeWithHeader; i++) {
+				sd0ConvertedModel.get()[i] = model.lxfmlData.get();
+			}
+
+			std::string outputString(sd0ConvertedModel.get(), oldLxfmlSizeWithHeader);
+			std::istringstream outputStringStream(outputString);
+
+			try {
+				Database::Get()->UpdateUgcModelData(model.id, outputStringStream);
+				LOG("Updated model %i to sd0", model.id);
+				updatedModels++;
+			} catch (sql::SQLException exception) {
+				LOG("Failed to update model %i.  This model should be inspected manually to see why."
+					"The database error is %s", model.id, exception.what());
+			}
+		}
+	}
+	Database::Get()->Commit();
+	Database::Get()->SetAutoCommit(previousAutoCommitState);
+	return updatedModels;
+}
+
+/**
+ * @brief Writes sd0 magic at the front of a char*
+ *
+ * @param input the char* to write at the front of
+ * @param chunkSize The size of the first chunk to write the size of
+ */
+void WriteSd0Magic(char* input, uint32_t chunkSize) {
+	input[0] = 's';
+	input[1] = 'd';
+	input[2] = '0';
+	input[3] = 0x01;
+	input[4] = 0xFF;
+	*reinterpret_cast<uint32_t*>(input + 5) = chunkSize; // Write the integer to the character array
+}
+
+bool CheckSd0Magic(std::istream& streamToCheck) {
+	return streamToCheck.get() == 's' && streamToCheck.get() == 'd' && streamToCheck.get() == '0' && streamToCheck.get() == 0x01 && streamToCheck.get() == 0xFF;
+}

dCommon/BrickByBrickFix.h

@@ -0,0 +1,20 @@
+#pragma once
+
+#include <cstdint>
+
+namespace BrickByBrickFix {
+	/**
+	 * @brief Deletes all broken BrickByBrick models that have invalid XML
+	 *
+	 * @return The number of BrickByBrick models that were truncated
+	 */
+	uint32_t TruncateBrokenBrickByBrickXml();
+
+	/**
+	 * @brief Updates all BrickByBrick models in the database to be
+	 * in the sd0 format as opposed to a zlib compressed format.
+	 *
+	 * @return The number of BrickByBrick models that were updated
+	 */
+	uint32_t UpdateBrickByBrickModelsToSd0();
+};

dCommon/CMakeLists.txt

@@ -0,0 +1,74 @@
+set(DCOMMON_SOURCES
+		"AMFDeserialize.cpp"
+		"AmfSerialize.cpp"
+		"BinaryIO.cpp"
+		"dConfig.cpp"
+		"Diagnostics.cpp"
+		"Logger.cpp"
+		"Game.cpp"
+		"GeneralUtils.cpp"
+		"LDFFormat.cpp"
+		"Metrics.cpp"
+		"NiPoint3.cpp"
+		"NiQuaternion.cpp"
+		"Demangler.cpp"
+		"ZCompression.cpp"
+		"BrickByBrickFix.cpp"
+		"BinaryPathFinder.cpp"
+		"FdbToSqlite.cpp"
+)
+
+# Workaround for compiler bug where the optimized code could result in a memcpy of 0 bytes, even though that isnt possible.
+# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=97185
+if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+	set_source_files_properties("FdbToSqlite.cpp" PROPERTIES COMPILE_FLAGS "-Wno-stringop-overflow")
+endif()
+
+add_subdirectory(dClient)
+
+foreach(file ${DCOMMON_DCLIENT_SOURCES})
+	set(DCOMMON_SOURCES ${DCOMMON_SOURCES} "dClient/${file}")
+endforeach()
+
+add_library(dCommon STATIC ${DCOMMON_SOURCES})
+target_include_directories(dCommon
+	PUBLIC "." "dClient" "dEnums"
+	PRIVATE
+	"${PROJECT_SOURCE_DIR}/dDatabase/GameDatabase"
+	"${PROJECT_SOURCE_DIR}/dDatabase/GameDatabase/ITables"
+	"${PROJECT_SOURCE_DIR}/dDatabase/CDClientDatabase"
+	"${PROJECT_SOURCE_DIR}/thirdparty/mariadb-connector-cpp/include"
+)
+
+if (UNIX)
+	find_package(ZLIB REQUIRED)
+elseif (WIN32)
+	include(FetchContent)
+
+	# TODO Keep an eye on the zlib repository for an update to disable testing.  Don't forget to update CMakePresets
+	FetchContent_Declare(
+		zlib
+		URL https://github.com/madler/zlib/archive/refs/tags/v1.2.11.zip
+		URL_HASH MD5=9d6a627693163bbbf3f26403a3a0b0b1
+	)
+
+	# Disable warning about no project version.
+	set(CMAKE_POLICY_DEFAULT_CMP0048 NEW)
+	# Disable warning about the minimum version of cmake used for bcrypt being deprecated in the future
+	set(CMAKE_WARN_DEPRECATED OFF CACHE BOOL "" FORCE)
+
+	FetchContent_MakeAvailable(zlib)
+
+	set(ZLIB_INCLUDE_DIRS ${zlib_SOURCE_DIR} ${zlib_BINARY_DIR})
+	set_target_properties(zlib PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${ZLIB_INCLUDE_DIRS}")
+	add_library(ZLIB::ZLIB ALIAS zlib)
+else ()
+	message(
+		FATAL_ERROR
+		"This platform does not have a way to use zlib.\nCreate an issue on GitHub with your build system so it can be configured."
+	)
+endif ()
+
+target_link_libraries(dCommon
+	PRIVATE ZLIB::ZLIB bcrypt tinyxml2
+	INTERFACE dDatabase)

dCommon/Demangler.cpp

@@ -0,0 +1,29 @@
+#include "Demangler.h"
+#ifdef __GNUG__
+#include <cstdlib>
+#include <cxxabi.h>
+#include <memory>
+#include <typeinfo>
+
+std::string Demangler::Demangle(const char* name) {
+	// some arbitrary value to eliminate the compiler warning
+	// -4 is not a valid return value for __cxa_demangle so we'll use that.
+	int status = -4;
+
+	// __cxa_demangle requires that we free the returned char*
+	std::unique_ptr<char, void (*)(void*)> res{
+		abi::__cxa_demangle(name, NULL, NULL, &status),
+		std::free
+	};
+
+	return (status == 0) ? res.get() : "";
+}
+
+#else // __GNUG__
+
+// does nothing if not g++
+std::string Demangler::Demangle(const char* name) {
+	return name;
+}
+
+#endif // __GNUG__

dCommon/Demangler.h

@@ -0,0 +1,9 @@
+#pragma once
+
+#include <string>
+
+namespace Demangler {
+	// Given a char* containing a mangled name, return a std::string containing the demangled name.
+	// If the function fails for any reason, it returns an empty string.
+	std::string Demangle(const char* name);
+}

dCommon/Diagnostics.cpp

@@ -1,59 +1,62 @@
 #include "Diagnostics.h"
+#include "Game.h"
+#include "Logger.h"
 
 // If we're on Win32, we'll include our minidump writer
 #ifdef _WIN32
-#include <Dbghelp.h>
+
 #include <Windows.h>
+#include <Dbghelp.h>
 
 #include "Game.h"
-#include "dLogger.h"
+#include "Logger.h"
 
 void make_minidump(EXCEPTION_POINTERS* e) {
-    auto hDbgHelp = LoadLibraryA("dbghelp");
-    if (hDbgHelp == nullptr)
-        return;
-    auto pMiniDumpWriteDump = (decltype(&MiniDumpWriteDump))GetProcAddress(hDbgHelp, "MiniDumpWriteDump");
-    if (pMiniDumpWriteDump == nullptr)
-        return;
+	auto hDbgHelp = LoadLibraryA("dbghelp");
+	if (hDbgHelp == nullptr)
+		return;
+	auto pMiniDumpWriteDump = (decltype(&MiniDumpWriteDump))GetProcAddress(hDbgHelp, "MiniDumpWriteDump");
+	if (pMiniDumpWriteDump == nullptr)
+		return;
 
-    char name[MAX_PATH];
-    {
-        auto nameEnd = name + GetModuleFileNameA(GetModuleHandleA(0), name, MAX_PATH);
-        SYSTEMTIME t;
-        GetSystemTime(&t);
-        wsprintfA(nameEnd - strlen(".exe"),
-                  "_%4d%02d%02d_%02d%02d%02d.dmp",
-                  t.wYear, t.wMonth, t.wDay, t.wHour, t.wMinute, t.wSecond);
-    }
+	char name[MAX_PATH];
+	{
+		auto nameEnd = name + GetModuleFileNameA(GetModuleHandleA(0), name, MAX_PATH);
+		SYSTEMTIME t;
+		GetSystemTime(&t);
+		wsprintfA(nameEnd - strlen(".exe"),
+			"_%4d%02d%02d_%02d%02d%02d.dmp",
+			t.wYear, t.wMonth, t.wDay, t.wHour, t.wMinute, t.wSecond);
+	}
+	LOG("Creating crash dump %s", name);
+	auto hFile = CreateFileA(name, GENERIC_WRITE, FILE_SHARE_READ, 0, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0);
+	if (hFile == INVALID_HANDLE_VALUE)
+		return;
 
-    auto hFile = CreateFileA(name, GENERIC_WRITE, FILE_SHARE_READ, 0, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0);
-    if (hFile == INVALID_HANDLE_VALUE)
-        return;
+	MINIDUMP_EXCEPTION_INFORMATION exceptionInfo;
+	exceptionInfo.ThreadId = GetCurrentThreadId();
+	exceptionInfo.ExceptionPointers = e;
+	exceptionInfo.ClientPointers = FALSE;
 
-    MINIDUMP_EXCEPTION_INFORMATION exceptionInfo;
-    exceptionInfo.ThreadId = GetCurrentThreadId();
-    exceptionInfo.ExceptionPointers = e;
-    exceptionInfo.ClientPointers = FALSE;
+	auto dumped = pMiniDumpWriteDump(
+		GetCurrentProcess(),
+		GetCurrentProcessId(),
+		hFile,
+		MINIDUMP_TYPE(MiniDumpWithIndirectlyReferencedMemory | MiniDumpScanMemory),
+		e ? &exceptionInfo : nullptr,
+		nullptr,
+		nullptr);
 
-    auto dumped = pMiniDumpWriteDump(
-        GetCurrentProcess(),
-        GetCurrentProcessId(),
-        hFile,
-        MINIDUMP_TYPE(MiniDumpWithIndirectlyReferencedMemory | MiniDumpScanMemory),
-        e ? &exceptionInfo : nullptr,
-        nullptr,
-        nullptr);
+	CloseHandle(hFile);
 
-    CloseHandle(hFile);
-
-    return;
+	return;
 }
 
 LONG CALLBACK unhandled_handler(EXCEPTION_POINTERS* e) {
-    make_minidump(e);
-    if (Game::logger)
-        Game::logger->Flush(); // Flush our log if we have one, before exiting.
-    return EXCEPTION_CONTINUE_SEARCH;
+	make_minidump(e);
+	if (Game::logger)
+		Game::logger->Flush(); // Flush our log if we have one, before exiting.
+	return EXCEPTION_CONTINUE_SEARCH;
 }
 #endif
 
@@ -68,152 +71,161 @@ LONG CALLBACK unhandled_handler(EXCEPTION_POINTERS* e) {
 #include <cstring>
 #include <exception>
 
-#if defined(__include_backtrace__)
+#if defined(INCLUDE_BACKTRACE)
 #include <backtrace.h>
 
 #include <backtrace-supported.h>
 
 struct bt_ctx {
-    struct backtrace_state* state;
-    int error;
+	struct backtrace_state* state;
+	int error;
 };
 
 static inline void Bt(struct backtrace_state* state) {
-    std::string fileName = Diagnostics::GetOutDirectory() + "crash_" + Diagnostics::GetProcessName() + "_" + std::to_string(getpid()) + ".log";
-    FILE* file = fopen(fileName.c_str(), "w+");
-    if (file != nullptr) {
-        backtrace_print(state, 2, file);
-        fclose(file);
-    }
+	std::string fileName = Diagnostics::GetOutDirectory() + "crash_" + Diagnostics::GetProcessName() + "_" + std::to_string(getpid()) + ".log";
+	LOG("backtrace is enabled, crash dump located at %s", fileName.c_str());
+	FILE* file = fopen(fileName.c_str(), "w+");
+	if (file != nullptr) {
+		backtrace_print(state, 2, file);
+		fclose(file);
+	}
 
-    backtrace_print(state, 2, stdout);
+	backtrace_print(state, 2, stdout);
 }
 
 static void ErrorCallback(void* data, const char* msg, int errnum) {
-    auto* ctx = (struct bt_ctx*)data;
-    fprintf(stderr, "ERROR: %s (%d)", msg, errnum);
-    ctx->error = 1;
+	auto* ctx = (struct bt_ctx*)data;
+	fprintf(stderr, "ERROR: %s (%d)", msg, errnum);
+	ctx->error = 1;
 
-    std::string fileName = Diagnostics::GetOutDirectory() + "crash_" + Diagnostics::GetProcessName() + "_" + std::to_string(getpid()) + ".log";
-    FILE* file = fopen(fileName.c_str(), "w+");
-    if (file != nullptr) {
-        fprintf(file, "ERROR: %s (%d)", msg, errnum);
-        fclose(file);
-    }
+	std::string fileName = Diagnostics::GetOutDirectory() + "crash_" + Diagnostics::GetProcessName() + "_" + std::to_string(getpid()) + ".log";
+	FILE* file = fopen(fileName.c_str(), "w+");
+	if (file != nullptr) {
+		fprintf(file, "ERROR: %s (%d)", msg, errnum);
+		fclose(file);
+	}
 }
 #endif
 
-#include "Type.h"
+#include "Demangler.h"
 
 void GenerateDump() {
-    std::string cmd = "sudo gcore " + std::to_string(getpid());
-    system(cmd.c_str());
+	std::string cmd = "sudo gcore " + std::to_string(getpid());
+	int ret = system(cmd.c_str()); // Saving a return just to prevent warning
 }
 
 void CatchUnhandled(int sig) {
-#ifndef __include_backtrace__
+	std::exception_ptr eptr = std::current_exception();
+	try {
+		if (eptr) std::rethrow_exception(eptr);
+	} catch(const std::exception& e) {
+		LOG("Caught exception: '%s'", e.what());
+	}
 
-    if (Diagnostics::GetProduceMemoryDump()) {
-        GenerateDump();
-    }
+#ifndef INCLUDE_BACKTRACE
 
-    void* array[10];
-    size_t size;
+	std::string fileName = Diagnostics::GetOutDirectory() + "crash_" + Diagnostics::GetProcessName() + "_" + std::to_string(getpid()) + ".log";
+	LOG("Encountered signal %i, creating crash dump %s", sig, fileName.c_str());
+	if (Diagnostics::GetProduceMemoryDump()) {
+		GenerateDump();
+	}
+	constexpr uint8_t MaxStackTrace = 32;
+	void* array[MaxStackTrace];
+	size_t size;
 
-    // get void*'s for all entries on the stack
-    size = backtrace(array, 10);
+	// get void*'s for all entries on the stack
+	size = backtrace(array, MaxStackTrace);
 
-    printf("Fatal error %i\nStacktrace:\n", sig);
-#if defined(__GNUG__) and defined(__dynamic)
+#  if defined(__GNUG__)
 
-    // Loop through the returned addresses, and get the symbols to be demangled
-    char** strings = backtrace_symbols(array, size);
+	// Loop through the returned addresses, and get the symbols to be demangled
+	char** strings = backtrace_symbols(array, size);
 
-    // Print the stack trace
-    for (size_t i = 0; i < size; i++) {
-        // Take a string like './WorldServer(_ZN19SlashCommandHandler17HandleChatCommandERKSbIDsSt11char_traitsIDsESaIDsEEP6EntityRK13SystemAddress+0x6187) [0x55869c44ecf7]' and extract the function name
-        std::string functionName = strings[i];
-        std::string::size_type start = functionName.find('(');
-        std::string::size_type end = functionName.find('+');
-        if (start != std::string::npos && end != std::string::npos) {
-            std::string demangled = functionName.substr(start + 1, end - start - 1);
+	FILE* file = fopen(fileName.c_str(), "w+");
+	if (file != NULL) {
+		fprintf(file, "Error: signal %d:\n", sig);
+	}
+	// Print the stack trace
+	for (size_t i = 0; i < size; i++) {
+		// Take a string like './WorldServer(_ZN19SlashCommandHandler17HandleChatCommandERKSbIDsSt11char_traitsIDsESaIDsEEP6EntityRK13SystemAddress+0x6187) [0x55869c44ecf7]'
+		// and extract '_ZN19SlashCommandHandler17HandleChatCommandERKSbIDsSt11char_traitsIDsESaIDsEEP6EntityRK13SystemAddress' from it to be demangled into a proper name
+		std::string functionName = strings[i];
+		std::string::size_type start = functionName.find('(');
+		std::string::size_type end = functionName.find('+');
+		if (start != std::string::npos && end != std::string::npos) {
+			std::string demangled = functionName.substr(start + 1, end - start - 1);
 
-            demangled = demangle(functionName.c_str());
+			demangled = Demangler::Demangle(demangled.c_str());
 
-            if (demangled.empty()) {
-                printf("[%02d] %s\n", i, demangled.c_str());
-            } else {
-                printf("[%02d] %s\n", i, functionName.c_str());
-            }
-        } else {
-            printf("[%02d] %s\n", i, functionName.c_str());
-        }
-    }
-#else
-    backtrace_symbols_fd(array, size, STDOUT_FILENO);
-#endif
+			// If the demangled string is not empty, then we can replace the mangled string with the demangled one
+			if (!demangled.empty()) {
+				demangled.push_back('(');
+				demangled += functionName.substr(end);
+				functionName = demangled;
+			}
+		}
 
-    std::string fileName = Diagnostics::GetOutDirectory() + "crash_" + Diagnostics::GetProcessName() + "_" + std::to_string(getpid()) + ".log";
-    FILE* file = fopen(fileName.c_str(), "w+");
-    if (file != NULL) {
-        // print out all the frames to stderr
-        fprintf(file, "Error: signal %d:\n", sig);
-        backtrace_symbols_fd(array, size, fileno(file));
-        fclose(file);
-    }
+		LOG("[%02zu] %s", i, functionName.c_str());
+		if (file != NULL) {
+			fprintf(file, "[%02zu] %s\n", i, functionName.c_str());
+		}
+	}
+#  else // defined(__GNUG__)
+	backtrace_symbols_fd(array, size, STDOUT_FILENO);
+#  endif // defined(__GNUG__)
 
-#else
+#else // INCLUDE_BACKTRACE
 
-    struct backtrace_state* state = backtrace_create_state(
-        Diagnostics::GetProcessFileName().c_str(),
-        BACKTRACE_SUPPORTS_THREADS,
-        ErrorCallback,
-        nullptr);
+	struct backtrace_state* state = backtrace_create_state(
+		Diagnostics::GetProcessFileName().c_str(),
+		BACKTRACE_SUPPORTS_THREADS,
+		ErrorCallback,
+		nullptr);
 
-    struct bt_ctx ctx = {state, 0};
-    Bt(state);
+	struct bt_ctx ctx = { state, 0 };
+	Bt(state);
 
-#endif
+#endif // INCLUDE_BACKTRACE
 
-    exit(EXIT_FAILURE);
+	exit(EXIT_FAILURE);
 }
 
 void CritErrHdlr(int sig_num, siginfo_t* info, void* ucontext) {
-    CatchUnhandled(sig_num);
+	CatchUnhandled(sig_num);
 }
 
 void OnTerminate() {
-    CatchUnhandled(-1);
+	CatchUnhandled(-1);
 }
 
 void MakeBacktrace() {
-    struct sigaction sigact;
+	struct sigaction sigact;
 
-    sigact.sa_sigaction = CritErrHdlr;
-    sigact.sa_flags = SA_RESTART | SA_SIGINFO;
+	sigact.sa_sigaction = CritErrHdlr;
+	sigact.sa_flags = SA_RESTART | SA_SIGINFO;
 
-    if (sigaction(SIGSEGV, &sigact, (struct sigaction*)nullptr) != 0 ||
-        sigaction(SIGFPE, &sigact, (struct sigaction*)nullptr) != 0 ||
-        sigaction(SIGABRT, &sigact, (struct sigaction*)nullptr) != 0 ||
-        sigaction(SIGILL, &sigact, (struct sigaction*)nullptr) != 0) {
-        fprintf(stderr, "error setting signal handler for %d (%s)\n",
-                SIGSEGV,
-                strsignal(SIGSEGV));
+	if (sigaction(SIGSEGV, &sigact, nullptr) != 0 ||
+		sigaction(SIGFPE, &sigact, nullptr) != 0 ||
+		sigaction(SIGABRT, &sigact, nullptr) != 0 ||
+		sigaction(SIGILL, &sigact, nullptr) != 0) {
+		fprintf(stderr, "error setting signal handler for %d (%s)\n",
+			SIGSEGV,
+			strsignal(SIGSEGV));
 
-        exit(EXIT_FAILURE);
-    }
+		exit(EXIT_FAILURE);
+	}
 
-    std::set_terminate(OnTerminate);
+	std::set_terminate(OnTerminate);
 }
 #endif
 
 void Diagnostics::Initialize() {
 #ifdef _WIN32
-    SetUnhandledExceptionFilter(unhandled_handler);
+	SetUnhandledExceptionFilter(unhandled_handler);
 #elif defined(__linux__) //&& !defined(__clang__)
-    MakeBacktrace();
+	MakeBacktrace();
 #else
-    fprintf(stderr, "Diagnostics not supported on this platform.\n");
+	fprintf(stderr, "Diagnostics not supported on this platform.\n");
 #endif
 }
 
@@ -223,33 +235,33 @@ std::string Diagnostics::m_OutDirectory{};
 bool Diagnostics::m_ProduceMemoryDump{};
 
 void Diagnostics::SetProcessName(const std::string& name) {
-    m_ProcessName = name;
+	m_ProcessName = name;
 }
 
 void Diagnostics::SetProcessFileName(const std::string& name) {
-    m_ProcessFileName = name;
+	m_ProcessFileName = name;
 }
 
 void Diagnostics::SetOutDirectory(const std::string& path) {
-    m_OutDirectory = path;
+	m_OutDirectory = path;
 }
 
 void Diagnostics::SetProduceMemoryDump(bool value) {
-    m_ProduceMemoryDump = value;
+	m_ProduceMemoryDump = value;
 }
 
 const std::string& Diagnostics::GetProcessName() {
-    return m_ProcessName;
+	return m_ProcessName;
 }
 
 const std::string& Diagnostics::GetProcessFileName() {
-    return m_ProcessFileName;
+	return m_ProcessFileName;
 }
 
 const std::string& Diagnostics::GetOutDirectory() {
-    return m_OutDirectory;
+	return m_OutDirectory;
 }
 
 bool Diagnostics::GetProduceMemoryDump() {
-    return m_ProduceMemoryDump;
+	return m_ProduceMemoryDump;
 }

dCommon/Diagnostics.h

@@ -5,27 +5,27 @@
 class Diagnostics
 {
 public:
-    static void Initialize();
+	static void Initialize();
 
-    static void SetProcessName(const std::string& name);
+	static void SetProcessName(const std::string& name);
 
-    static void SetProcessFileName(const std::string& name);
+	static void SetProcessFileName(const std::string& name);
 
-    static void SetOutDirectory(const std::string& path);
+	static void SetOutDirectory(const std::string& path);
 
-    static void SetProduceMemoryDump(bool value);
+	static void SetProduceMemoryDump(bool value);
 
-    static const std::string& GetProcessName();
+	static const std::string& GetProcessName();
 
-    static const std::string& GetProcessFileName();
+	static const std::string& GetProcessFileName();
 
-    static const std::string& GetOutDirectory();
+	static const std::string& GetOutDirectory();
 
-    static bool GetProduceMemoryDump();
+	static bool GetProduceMemoryDump();
 
 private:
-    static std::string m_ProcessName;
-    static std::string m_ProcessFileName;
-    static std::string m_OutDirectory;
-    static bool m_ProduceMemoryDump;
+	static std::string m_ProcessName;
+	static std::string m_ProcessFileName;
+	static std::string m_OutDirectory;
+	static bool m_ProduceMemoryDump;
 };

dCommon/DluAssert.h

@@ -0,0 +1,12 @@
+#ifndef __DLUASSERT__H__
+#define __DLUASSERT__H__
+
+#include <assert.h>
+
+#ifdef _DEBUG
+#	define DluAssert(expression) assert(expression)
+#else
+#	define DluAssert(expression)
+#endif
+
+#endif  //!__DLUASSERT__H__

dCommon/FdbToSqlite.cpp

@@ -0,0 +1,245 @@
+#include "FdbToSqlite.h"
+
+#include <map>
+#include <fstream>
+#include <cassert>
+#include <iomanip>
+
+#include "BinaryIO.h"
+#include "CDClientDatabase.h"
+#include "GeneralUtils.h"
+#include "Game.h"
+#include "Logger.h"
+#include "AssetManager.h"
+
+#include "eSqliteDataType.h"
+
+std::map<eSqliteDataType, std::string> FdbToSqlite::Convert::m_SqliteType = {
+			{ eSqliteDataType::NONE, "none"},
+			{ eSqliteDataType::INT32, "int32"},
+			{ eSqliteDataType::REAL, "real"},
+			{ eSqliteDataType::TEXT_4, "text_4"},
+			{ eSqliteDataType::INT_BOOL, "int_bool"},
+			{ eSqliteDataType::INT64, "int64"},
+			{ eSqliteDataType::TEXT_8, "text_8"}
+};
+
+FdbToSqlite::Convert::Convert(std::string binaryOutPath) {
+	this->m_BinaryOutPath = binaryOutPath;
+}
+
+bool FdbToSqlite::Convert::ConvertDatabase(AssetStream& buffer) {
+	if (m_ConversionStarted) return false;
+
+	this->m_ConversionStarted = true;
+	try {
+		CDClientDatabase::Connect(m_BinaryOutPath + "/CDServer.sqlite");
+
+		CDClientDatabase::ExecuteQuery("BEGIN TRANSACTION;");
+
+		int32_t numberOfTables = ReadInt32(buffer);
+		ReadTables(numberOfTables, buffer);
+
+		CDClientDatabase::ExecuteQuery("COMMIT;");
+	} catch (CppSQLite3Exception& e) {
+		LOG("Encountered error %s converting FDB to SQLite", e.errorMessage());
+		return false;
+	}
+
+	return true;
+}
+
+int32_t FdbToSqlite::Convert::ReadInt32(std::istream& cdClientBuffer) {
+	int32_t nextInt{};
+	BinaryIO::BinaryRead(cdClientBuffer, nextInt);
+	return nextInt;
+}
+
+int64_t FdbToSqlite::Convert::ReadInt64(std::istream& cdClientBuffer) {
+	int32_t prevPosition = SeekPointer(cdClientBuffer);
+
+	int64_t value{};
+	BinaryIO::BinaryRead(cdClientBuffer, value);
+
+	cdClientBuffer.seekg(prevPosition);
+	return value;
+}
+
+std::string FdbToSqlite::Convert::ReadString(std::istream& cdClientBuffer) {
+	int32_t prevPosition = SeekPointer(cdClientBuffer);
+
+	auto readString = BinaryIO::ReadString(cdClientBuffer);
+
+	cdClientBuffer.seekg(prevPosition);
+	return readString;
+}
+
+int32_t FdbToSqlite::Convert::SeekPointer(std::istream& cdClientBuffer) {
+	int32_t position{};
+	BinaryIO::BinaryRead(cdClientBuffer, position);
+	int32_t prevPosition = cdClientBuffer.tellg();
+	cdClientBuffer.seekg(position);
+	return prevPosition;
+}
+
+std::string FdbToSqlite::Convert::ReadColumnHeader(std::istream& cdClientBuffer) {
+	int32_t prevPosition = SeekPointer(cdClientBuffer);
+
+	int32_t numberOfColumns = ReadInt32(cdClientBuffer);
+	std::string tableName = ReadString(cdClientBuffer);
+
+	auto columns = ReadColumns(numberOfColumns, cdClientBuffer);
+	std::string newTable = "CREATE TABLE IF NOT EXISTS '" + tableName + "' (" + columns + ");";
+	CDClientDatabase::ExecuteDML(newTable);
+
+	cdClientBuffer.seekg(prevPosition);
+
+	return tableName;
+}
+
+void FdbToSqlite::Convert::ReadTables(int32_t& numberOfTables, std::istream& cdClientBuffer) {
+	int32_t prevPosition = SeekPointer(cdClientBuffer);
+
+	for (int32_t i = 0; i < numberOfTables; i++) {
+		auto columnHeader = ReadColumnHeader(cdClientBuffer);
+		ReadRowHeader(columnHeader, cdClientBuffer);
+	}
+
+	cdClientBuffer.seekg(prevPosition);
+}
+
+std::string FdbToSqlite::Convert::ReadColumns(int32_t& numberOfColumns, std::istream& cdClientBuffer) {
+	std::stringstream columnsToCreate;
+	int32_t prevPosition = SeekPointer(cdClientBuffer);
+
+	std::string name{};
+	eSqliteDataType dataType{};
+	for (int32_t i = 0; i < numberOfColumns; i++) {
+		if (i != 0) columnsToCreate << ", ";
+		dataType = static_cast<eSqliteDataType>(ReadInt32(cdClientBuffer));
+		name = ReadString(cdClientBuffer);
+		columnsToCreate << "'" << name << "' " << FdbToSqlite::Convert::m_SqliteType[dataType];
+	}
+
+	cdClientBuffer.seekg(prevPosition);
+	return columnsToCreate.str();
+}
+
+void FdbToSqlite::Convert::ReadRowHeader(std::string& tableName, std::istream& cdClientBuffer) {
+	int32_t prevPosition = SeekPointer(cdClientBuffer);
+
+	int32_t numberOfAllocatedRows = ReadInt32(cdClientBuffer);
+	if (numberOfAllocatedRows != 0) assert((numberOfAllocatedRows & (numberOfAllocatedRows - 1)) == 0);  // assert power of 2 allocation size
+	ReadRows(numberOfAllocatedRows, tableName, cdClientBuffer);
+
+	cdClientBuffer.seekg(prevPosition);
+}
+
+void FdbToSqlite::Convert::ReadRows(int32_t& numberOfAllocatedRows, std::string& tableName, std::istream& cdClientBuffer) {
+	int32_t prevPosition = SeekPointer(cdClientBuffer);
+
+	int32_t rowid = 0;
+	for (int32_t row = 0; row < numberOfAllocatedRows; row++) {
+		int32_t rowPointer = ReadInt32(cdClientBuffer);
+		if (rowPointer == -1) rowid++;
+		else ReadRow(rowPointer, tableName, cdClientBuffer);
+	}
+
+	cdClientBuffer.seekg(prevPosition);
+}
+
+void FdbToSqlite::Convert::ReadRow(int32_t& position, std::string& tableName, std::istream& cdClientBuffer) {
+	int32_t prevPosition = cdClientBuffer.tellg();
+	cdClientBuffer.seekg(position);
+
+	while (true) {
+		ReadRowInfo(tableName, cdClientBuffer);
+		int32_t linked = ReadInt32(cdClientBuffer);
+		if (linked == -1) break;
+		cdClientBuffer.seekg(linked);
+	}
+
+	cdClientBuffer.seekg(prevPosition);
+}
+
+void FdbToSqlite::Convert::ReadRowInfo(std::string& tableName, std::istream& cdClientBuffer) {
+	int32_t prevPosition = SeekPointer(cdClientBuffer);
+
+	int32_t numberOfColumns = ReadInt32(cdClientBuffer);
+	ReadRowValues(numberOfColumns, tableName, cdClientBuffer);
+
+	cdClientBuffer.seekg(prevPosition);
+}
+
+void FdbToSqlite::Convert::ReadRowValues(int32_t& numberOfColumns, std::string& tableName, std::istream& cdClientBuffer) {
+	int32_t prevPosition = SeekPointer(cdClientBuffer);
+
+	int32_t emptyValue{};
+	int32_t intValue{};
+	float_t floatValue{};
+	std::string stringValue{};
+	int32_t boolValue{};
+	int64_t int64Value{};
+	bool insertedFirstEntry = false;
+	std::stringstream insertedRow;
+	insertedRow << "INSERT INTO " << tableName << " values (";
+
+	for (int32_t i = 0; i < numberOfColumns; i++) {
+		if (i != 0) insertedRow << ", "; // Only append comma and space after first entry in row.
+		switch (static_cast<eSqliteDataType>(ReadInt32(cdClientBuffer))) {
+		case eSqliteDataType::NONE:
+			BinaryIO::BinaryRead(cdClientBuffer, emptyValue);
+			assert(emptyValue == 0);
+			insertedRow << "NULL";
+			break;
+
+		case eSqliteDataType::INT32:
+			intValue = ReadInt32(cdClientBuffer);
+			insertedRow << intValue;
+			break;
+
+		case eSqliteDataType::REAL:
+			BinaryIO::BinaryRead(cdClientBuffer, floatValue);
+			insertedRow << std::fixed << std::setprecision(34) << floatValue; // maximum precision of floating point number
+			break;
+
+		case eSqliteDataType::TEXT_4:
+		case eSqliteDataType::TEXT_8: {
+			stringValue = ReadString(cdClientBuffer);
+			size_t position = 0;
+
+			// Need to escape quote with a double of ".
+			while (position < stringValue.size()) {
+				if (stringValue.at(position) == '\"') {
+					stringValue.insert(position, "\"");
+					position++;
+				}
+				position++;
+			}
+			insertedRow << "\"" << stringValue << "\"";
+			break;
+		}
+
+		case eSqliteDataType::INT_BOOL:
+			BinaryIO::BinaryRead(cdClientBuffer, boolValue);
+			insertedRow << static_cast<bool>(boolValue);
+			break;
+
+		case eSqliteDataType::INT64:
+			int64Value = ReadInt64(cdClientBuffer);
+			insertedRow << std::to_string(int64Value);
+			break;
+
+		default:
+			throw std::invalid_argument("Unsupported SQLite type encountered.");
+			break;
+
+		}
+	}
+
+	insertedRow << ");";
+
+	auto copiedString = insertedRow.str();
+	CDClientDatabase::ExecuteDML(copiedString);
+	cdClientBuffer.seekg(prevPosition);
+}

dCommon/FdbToSqlite.h

@@ -0,0 +1,145 @@
+#ifndef __FDBTOSQLITE__H__
+#define __FDBTOSQLITE__H__
+
+#pragma once
+
+#include <cstdint>
+#include <iosfwd>
+#include <map>
+
+#include "AssetManager.h"
+
+enum class eSqliteDataType : int32_t;
+
+namespace FdbToSqlite {
+	class Convert {
+	public:
+		/**
+		 * Create a new convert object with an input .fdb file and an output binary path.
+		 * 
+		 * @param inputFile The file which ends in .fdb to be converted
+		 * @param binaryPath The base path where the file will be saved
+		 */
+		Convert(std::string binaryOutPath);
+
+		/**
+		 * Converts the input file to sqlite.  Calling multiple times is safe.
+		 * 
+		 * @return true if the database was converted properly, false otherwise. 
+		 */
+		bool ConvertDatabase(AssetStream& buffer);
+
+		/**
+		 * @brief Reads a 32 bit int from the fdb file.
+		 * 
+		 * @return The read value
+		 */
+		int32_t ReadInt32(std::istream& cdClientBuffer);
+
+		/**
+		 * @brief Reads a 64 bit integer from the fdb file.
+		 * 
+		 * @return The read value
+		 */
+		int64_t ReadInt64(std::istream& cdClientBuffer);
+
+		/**
+		 * @brief Reads a string from the fdb file.
+		 * 
+		 * @return The read string
+		 * 
+		 * TODO This needs to be translated to latin-1!
+		 */
+		std::string ReadString(std::istream& cdClientBuffer);
+
+		/**
+		 * @brief Seeks to a pointer position.
+		 * 
+		 * @return The previous position before the seek
+		 */
+		int32_t SeekPointer(std::istream& cdClientBuffer);
+
+		/**
+		 * @brief Reads a column header from the fdb file and creates the table in the database
+		 * 
+		 * @return The table name
+		 */
+		std::string ReadColumnHeader(std::istream& cdClientBuffer);
+
+		/**
+		 * @brief Read the tables from the fdb file.
+		 * 
+		 * @param numberOfTables The number of tables to read
+		 */
+		void ReadTables(int32_t& numberOfTables, std::istream& cdClientBuffer);
+
+		/**
+		 * @brief Reads the columns from the fdb file.
+		 * 
+		 * @param numberOfColumns The number of columns to read
+		 * @return All columns of the table formatted for a sql query
+		 */
+		std::string ReadColumns(int32_t& numberOfColumns, std::istream& cdClientBuffer);
+
+		/**
+		 * @brief Reads the row header from the fdb file.
+		 * 
+		 * @param tableName The tables name
+		 */
+		void ReadRowHeader(std::string& tableName, std::istream& cdClientBuffer);
+
+		/**
+		 * @brief Read the rows from the fdb file.,
+		 * 
+		 * @param numberOfAllocatedRows The number of rows that were allocated.  Always a power of 2! 
+		 * @param tableName The tables name.
+		 */
+		void ReadRows(int32_t& numberOfAllocatedRows, std::string& tableName, std::istream& cdClientBuffer);
+
+		/**
+		 * @brief Reads a row from the fdb file.
+		 * 
+		 * @param position The position to seek in the fdb to
+		 * @param tableName The tables name
+		 */
+		void ReadRow(int32_t& position, std::string& tableName, std::istream& cdClientBuffer);
+
+		/**
+		 * @brief Reads the row info from the fdb file.
+		 * 
+		 * @param tableName The tables name
+		 */
+		void ReadRowInfo(std::string& tableName, std::istream& cdClientBuffer);
+
+		/**
+		 * @brief Reads each row and its values from the fdb file and inserts them into the database
+		 * 
+		 * @param numberOfColumns The number of columns to read in
+		 * @param tableName The tables name
+		 */
+		void ReadRowValues(int32_t& numberOfColumns, std::string& tableName, std::istream& cdClientBuffer);
+	private:
+
+		/**
+		 * Maps each sqlite data type to its string equivalent.
+		 */
+		static std::map<eSqliteDataType, std::string> m_SqliteType;
+
+		/**
+		 * Base path of the folder containing the fdb file
+		 */
+		std::string m_BasePath{};
+		
+		/**
+		 * Whether or not a conversion was started.  If one was started, do not attempt to convert the file again.
+		 */
+		bool m_ConversionStarted{};
+
+		/**
+		 * The path where the CDServer will be stored
+		 */
+		std::string m_BinaryOutPath{};
+	}; //! class FdbToSqlite
+}; //! namespace FdbToSqlite
+
+#endif  //!__FDBTOSQLITE__H__

dCommon/Game.cpp

@@ -0,0 +1,7 @@
+#include "Game.h"
+
+namespace Game {
+	void OnSignal(int signal) {
+		lastSignal = signal;
+	}
+}

dCommon/Game.h

@@ -1,26 +1,40 @@
 #pragma once
 
+#include <string>
 #include <random>
+#include <csignal>
 
 class dServer;
-class dLogger;
+class Logger;
 class InstanceManager;
-class dpWorld;
 class dChatFilter;
 class dConfig;
-class dLocale;
 class RakPeerInterface;
+class AssetManager;
 struct SystemAddress;
+class EntityManager;
+class dZoneManager;
+class PlayerContainer;
 
 namespace Game {
-	extern dLogger* logger;
+	using signal_t = volatile std::sig_atomic_t;
+	extern Logger* logger;
 	extern dServer* server;
 	extern InstanceManager* im;
-	extern dpWorld* physicsWorld;
 	extern dChatFilter* chatFilter;
 	extern dConfig* config;
-	extern dLocale* locale;
 	extern std::mt19937 randomEngine;
 	extern RakPeerInterface* chatServer;
+	extern AssetManager* assetManager;
 	extern SystemAddress chatSysAddr;
-}
+	extern signal_t lastSignal;
+	extern EntityManager* entityManager;
+	extern dZoneManager* zoneManager;
+	extern PlayerContainer playerContainer;
+	extern std::string projectVersion;
+
+	inline bool ShouldShutdown() {
+		return lastSignal != 0;
+	}
+	void OnSignal(int signal);
+}

dCommon/GeneralUtils.cpp

@@ -4,168 +4,271 @@
 #include <cstdint>
 #include <cassert>
 #include <algorithm>
+#include <filesystem>
+#include <map>
 
 template <typename T>
-inline size_t MinSize(size_t size, const std::basic_string<T>& string) {
-    if (size == size_t(-1) || size > string.size()) {
-        return string.size();
-    } else {
-        return size;
-    }
+inline size_t MinSize(size_t size, const std::basic_string_view<T>& string) {
+	if (size == size_t(-1) || size > string.size()) {
+		return string.size();
+	} else {
+		return size;
+	}
 }
 
 inline bool IsLeadSurrogate(char16_t c) {
-    return (0xD800 <= c) && (c <= 0xDBFF);
+	return (0xD800 <= c) && (c <= 0xDBFF);
 }
 
 inline bool IsTrailSurrogate(char16_t c) {
-    return (0xDC00 <= c) && (c <= 0xDFFF);
+	return (0xDC00 <= c) && (c <= 0xDFFF);
 }
 
 inline void PushUTF8CodePoint(std::string& ret, char32_t cp) {
-    if (cp <= 0x007F) {
-        ret.push_back(cp);
-    } else if (cp <= 0x07FF) {
-        ret.push_back(0xC0 | (cp >> 6));
-        ret.push_back(0x80 | (cp & 0x3F));
-    } else if (cp <= 0xFFFF) {
-        ret.push_back(0xE0 | (cp >> 12));
-        ret.push_back(0x80 | ((cp >> 6) & 0x3F));
-        ret.push_back(0x80 | (cp & 0x3F));
-    } else if (cp <= 0x10FFFF) {
-        ret.push_back(0xF0 | (cp >> 18));
-        ret.push_back(0x80 | ((cp >> 12) & 0x3F));
-        ret.push_back(0x80 | ((cp >> 6) & 0x3F));
-        ret.push_back(0x80 | (cp & 0x3F));
-    } else {
-        assert(false);
-    }
+	if (cp <= 0x007F) {
+		ret.push_back(static_cast<uint8_t>(cp));
+	} else if (cp <= 0x07FF) {
+		ret.push_back(0xC0 | (cp >> 6));
+		ret.push_back(0x80 | (cp & 0x3F));
+	} else if (cp <= 0xFFFF) {
+		ret.push_back(0xE0 | (cp >> 12));
+		ret.push_back(0x80 | ((cp >> 6) & 0x3F));
+		ret.push_back(0x80 | (cp & 0x3F));
+	} else if (cp <= 0x10FFFF) {
+		ret.push_back(0xF0 | (cp >> 18));
+		ret.push_back(0x80 | ((cp >> 12) & 0x3F));
+		ret.push_back(0x80 | ((cp >> 6) & 0x3F));
+		ret.push_back(0x80 | (cp & 0x3F));
+	} else {
+		assert(false);
+	}
+}
+
+constexpr const char16_t REPLACEMENT_CHARACTER = 0xFFFD;
+
+bool _IsSuffixChar(uint8_t c) {
+	return (c & 0xC0) == 0x80;
+}
+
+bool GeneralUtils::_NextUTF8Char(std::string_view& slice, uint32_t& out) {
+	size_t rem = slice.length();
+	if (slice.empty()) return false;
+	const uint8_t* bytes = reinterpret_cast<const uint8_t*>(&slice.front());
+	if (rem > 0) {
+		uint8_t first = bytes[0];
+		if (first < 0x80) { // 1 byte character
+			out = static_cast<uint32_t>(first & 0x7F);
+			slice.remove_prefix(1);
+			return true;
+		} else if (first < 0xC0) {
+			// middle byte, not valid at start, fall through
+		} else if (first < 0xE0) { // two byte character
+			if (rem > 1) {
+				uint8_t second = bytes[1];
+				if (_IsSuffixChar(second)) {
+					out = (static_cast<uint32_t>(first & 0x1F) << 6)
+						+ static_cast<uint32_t>(second & 0x3F);
+					slice.remove_prefix(2);
+					return true;
+				}
+			}
+		} else if (first < 0xF0) { // three byte character
+			if (rem > 2) {
+				uint8_t second = bytes[1];
+				uint8_t third = bytes[2];
+				if (_IsSuffixChar(second) && _IsSuffixChar(third)) {
+					out = (static_cast<uint32_t>(first & 0x0F) << 12)
+						+ (static_cast<uint32_t>(second & 0x3F) << 6)
+						+ static_cast<uint32_t>(third & 0x3F);
+					slice.remove_prefix(3);
+					return true;
+				}
+			}
+		} else if (first < 0xF8) { // four byte character
+			if (rem > 3) {
+				uint8_t second = bytes[1];
+				uint8_t third = bytes[2];
+				uint8_t fourth = bytes[3];
+				if (_IsSuffixChar(second) && _IsSuffixChar(third) && _IsSuffixChar(fourth)) {
+					out = (static_cast<uint32_t>(first & 0x07) << 18)
+						+ (static_cast<uint32_t>(second & 0x3F) << 12)
+						+ (static_cast<uint32_t>(third & 0x3F) << 6)
+						+ static_cast<uint32_t>(fourth & 0x3F);
+					slice.remove_prefix(4);
+					return true;
+				}
+			}
+		}
+		out = static_cast<uint32_t>(REPLACEMENT_CHARACTER);
+		slice.remove_prefix(1);
+		return true;
+	}
+	return false;
+}
+
+/// See <https://www.ietf.org/rfc/rfc2781.html#section-2.1>
+bool PushUTF16CodePoint(std::u16string& output, uint32_t U, size_t size) {
+	if (output.length() >= size) return false;
+	if (U < 0x10000) {
+		// If U < 0x10000, encode U as a 16-bit unsigned integer and terminate.
+		output.push_back(static_cast<uint16_t>(U));
+		return true;
+	} else if (U > 0x10FFFF) {
+		output.push_back(REPLACEMENT_CHARACTER);
+		return true;
+	} else if (output.length() + 1 < size) {
+		// Let U' = U - 0x10000. Because U is less than or equal to 0x10FFFF,
+		// U' must be less than or equal to 0xFFFFF. That is, U' can be
+		// represented in 20 bits.
+		uint32_t Ut = U - 0x10000;
+
+		// Initialize two 16-bit unsigned integers, W1 and W2, to 0xD800 and
+		// 0xDC00, respectively. These integers each have 10 bits free to
+		// encode the character value, for a total of 20 bits.
+		uint16_t W1 = 0xD800;
+		uint16_t W2 = 0xDC00;
+
+		// Assign the 10 high-order bits of the 20-bit U' to the 10 low-order
+		// bits of W1 and the 10 low-order bits of U' to the 10 low-order
+		// bits of W2.
+		W1 += static_cast<uint16_t>((Ut & 0x3FC00) >> 10);
+		W2 += static_cast<uint16_t>((Ut & 0x3FF) >> 0);
+
+		// Terminate.
+		output.push_back(W1); // high surrogate
+		output.push_back(W2); // low surrogate
+		return true;
+	} else return false;
+}
+
+std::u16string GeneralUtils::UTF8ToUTF16(const std::string_view& string, size_t size) {
+	size_t newSize = MinSize(size, string);
+	std::u16string output;
+	output.reserve(newSize);
+	std::string_view iterator = string;
+
+	uint32_t c;
+	while (_NextUTF8Char(iterator, c) && PushUTF16CodePoint(output, c, size)) {}
+	return output;
 }
 
 //! Converts an std::string (ASCII) to UCS-2 / UTF-16
-std::u16string GeneralUtils::ASCIIToUTF16(const std::string& string, size_t size) {
-    size_t newSize = MinSize(size, string);
-    std::u16string ret;
-    ret.reserve(newSize);
+std::u16string GeneralUtils::ASCIIToUTF16(const std::string_view& string, size_t size) {
+	size_t newSize = MinSize(size, string);
+	std::u16string ret;
+	ret.reserve(newSize);
 
-    for (size_t i = 0; i < newSize; i++) {
-        char c = string[i];
-        assert(c > 0 && c <= 127);
-        ret.push_back(static_cast<char16_t>(c));
-    }
+	for (size_t i = 0; i < newSize; i++) {
+		char c = string[i];
+		// Note: both 7-bit ascii characters and REPLACEMENT_CHARACTER fit in one char16_t
+		ret.push_back((c > 0 && c <= 127) ? static_cast<char16_t>(c) : REPLACEMENT_CHARACTER);
+	}
 
-    return ret;
+	return ret;
 }
 
 //! Converts a (potentially-ill-formed) UTF-16 string to UTF-8
 //! See: <http://simonsapin.github.io/wtf-8/#decoding-ill-formed-utf-16>
-std::string GeneralUtils::UTF16ToWTF8(const std::u16string& string, size_t size) {
-    size_t newSize = MinSize(size, string);
-    std::string ret;
-    ret.reserve(newSize);
+std::string GeneralUtils::UTF16ToWTF8(const std::u16string_view& string, size_t size) {
+	size_t newSize = MinSize(size, string);
+	std::string ret;
+	ret.reserve(newSize);
 
-    for (size_t i = 0; i < newSize; i++) {
-        char16_t u = string[i];
-        if (IsLeadSurrogate(u) && (i + 1) < newSize) {
-            char16_t next = string[i + 1];
-            if (IsTrailSurrogate(next)) {
-                i += 1;
-                char32_t cp = 0x10000
-                    + ((static_cast<char32_t>(u) - 0xD800) << 10)
-                    + (static_cast<char32_t>(next) - 0xDC00);
-                PushUTF8CodePoint(ret, cp);
-            } else {
-                PushUTF8CodePoint(ret, u);
-            }
-        } else {
-            PushUTF8CodePoint(ret, u);
-        }
-    }
+	for (size_t i = 0; i < newSize; i++) {
+		char16_t u = string[i];
+		if (IsLeadSurrogate(u) && (i + 1) < newSize) {
+			char16_t next = string[i + 1];
+			if (IsTrailSurrogate(next)) {
+				i += 1;
+				char32_t cp = 0x10000
+					+ ((static_cast<char32_t>(u) - 0xD800) << 10)
+					+ (static_cast<char32_t>(next) - 0xDC00);
+				PushUTF8CodePoint(ret, cp);
+			} else {
+				PushUTF8CodePoint(ret, u);
+			}
+		} else {
+			PushUTF8CodePoint(ret, u);
+		}
+	}
 
-    return ret;
+	return ret;
 }
 
 bool GeneralUtils::CaseInsensitiveStringCompare(const std::string& a, const std::string& b) {
-    return std::equal(a.begin(), a.end (), b.begin(), b.end(),[](char a, char b) { return tolower(a) == tolower(b); });
+	return std::equal(a.begin(), a.end(), b.begin(), b.end(), [](char a, char b) { return tolower(a) == tolower(b); });
 }
 
 // MARK: Bits
 
 //! Sets a specific bit in a signed 64-bit integer
 int64_t GeneralUtils::SetBit(int64_t value, uint32_t index) {
-    return value |= 1ULL << index;
+	return value |= 1ULL << index;
 }
 
 //! Clears a specific bit in a signed 64-bit integer
 int64_t GeneralUtils::ClearBit(int64_t value, uint32_t index) {
-    return value &= ~(1ULL << index);
+	return value &= ~(1ULL << index);
 }
 
 //! Checks a specific bit in a signed 64-bit integer
 bool GeneralUtils::CheckBit(int64_t value, uint32_t index) {
-    return value & (1ULL << index);
+	return value & (1ULL << index);
 }
 
 bool GeneralUtils::ReplaceInString(std::string& str, const std::string& from, const std::string& to) {
-    size_t start_pos = str.find(from);
-    if(start_pos == std::string::npos)
-        return false;
-    str.replace(start_pos, from.length(), to);
-    return true;
+	size_t start_pos = str.find(from);
+	if (start_pos == std::string::npos)
+		return false;
+	str.replace(start_pos, from.length(), to);
+	return true;
 }
 
-std::vector<std::wstring> GeneralUtils::SplitString(std::wstring& str, wchar_t delimiter)
-{
-    std::vector<std::wstring> vector = std::vector<std::wstring>();
-    std::wstring current;
+std::vector<std::wstring> GeneralUtils::SplitString(std::wstring& str, wchar_t delimiter) {
+	std::vector<std::wstring> vector = std::vector<std::wstring>();
+	std::wstring current;
 
-    for (const auto& c : str) {
-        if (c == delimiter) {
-            vector.push_back(current);
-            current = L"";
-        } else {
-            current += c;
-        }
-    }
+	for (const auto& c : str) {
+		if (c == delimiter) {
+			vector.push_back(current);
+			current = L"";
+		} else {
+			current += c;
+		}
+	}
 
-    vector.push_back(current);
-    return vector;
+	vector.push_back(current);
+	return vector;
 }
 
-std::vector<std::u16string> GeneralUtils::SplitString(std::u16string& str, char16_t delimiter)
-{
-    std::vector<std::u16string> vector = std::vector<std::u16string>();
-    std::u16string current;
+std::vector<std::u16string> GeneralUtils::SplitString(const std::u16string& str, char16_t delimiter) {
+	std::vector<std::u16string> vector = std::vector<std::u16string>();
+	std::u16string current;
 
-    for (const auto& c : str) {
-        if (c == delimiter) {
-            vector.push_back(current);
-            current = u"";
-        } else {
-            current += c;
-        }
-    }
+	for (const auto& c : str) {
+		if (c == delimiter) {
+			vector.push_back(current);
+			current = u"";
+		} else {
+			current += c;
+		}
+	}
 
-    vector.push_back(current);
-    return vector;
+	vector.push_back(current);
+	return vector;
 }
 
-std::vector<std::string> GeneralUtils::SplitString(const std::string& str, char delimiter)
-{
+std::vector<std::string> GeneralUtils::SplitString(const std::string& str, char delimiter) {
 	std::vector<std::string> vector = std::vector<std::string>();
 	std::string current = "";
 
-	for (size_t i = 0; i < str.length(); i++)
-	{
+	for (size_t i = 0; i < str.length(); i++) {
 		char c = str[i];
 
-		if (c == delimiter)
-		{
+		if (c == delimiter) {
 			vector.push_back(current);
 			current = "";
-		}
-		else
-		{
+		} else {
 			current += c;
 		}
 	}
@@ -175,16 +278,66 @@ std::vector<std::string> GeneralUtils::SplitString(const std::string& str, char
 	return vector;
 }
 
-std::u16string GeneralUtils::ReadWString(RakNet::BitStream *inStream) {
-    uint32_t length;
-    inStream->Read<uint32_t>(length);
+std::u16string GeneralUtils::ReadWString(RakNet::BitStream& inStream) {
+	uint32_t length;
+	inStream.Read<uint32_t>(length);
 
-    std::u16string string;
-    for (auto i = 0; i < length; i++) {
-        uint16_t c;
-        inStream->Read(c);
-        string.push_back(c);
-    }
+	std::u16string string;
+	for (auto i = 0; i < length; i++) {
+		uint16_t c;
+		inStream.Read(c);
+		string.push_back(c);
+	}
 
-    return string;
+	return string;
 }
+
+std::vector<std::string> GeneralUtils::GetSqlFileNamesFromFolder(const std::string& folder) {
+	// Because we dont know how large the initial number before the first _ is we need to make it a map like so.
+	std::map<uint32_t, std::string> filenames{};
+	for (auto& t : std::filesystem::directory_iterator(folder)) {
+		auto filename = t.path().filename().string();
+		auto index = std::stoi(GeneralUtils::SplitString(filename, '_').at(0));
+		filenames.insert(std::make_pair(index, filename));
+	}
+
+	// Now sort the map by the oldest migration.
+	std::vector<std::string> sortedFiles{};
+	auto fileIterator = filenames.begin();
+	std::map<uint32_t, std::string>::iterator oldest = filenames.begin();
+	while (!filenames.empty()) {
+		if (fileIterator == filenames.end()) {
+			sortedFiles.push_back(oldest->second);
+			filenames.erase(oldest);
+			fileIterator = filenames.begin();
+			oldest = filenames.begin();
+			continue;
+		}
+		if (oldest->first > fileIterator->first) oldest = fileIterator;
+		fileIterator++;
+	}
+
+	return sortedFiles;
+}
+
+#if !(__GNUC__ >= 11 || _MSC_VER >= 1924)
+
+// MacOS floating-point parse function specializations
+namespace GeneralUtils::details {
+	template <>
+	[[nodiscard]] float _parse<float>(const std::string_view str, size_t& parseNum) {
+		return std::stof(std::string{ str }, &parseNum);
+	}
+
+	template <>
+	[[nodiscard]] double _parse<double>(const std::string_view str, size_t& parseNum) {
+		return std::stod(std::string{ str }, &parseNum);
+	}
+
+	template <>
+	[[nodiscard]] long double _parse<long double>(const std::string_view str, size_t& parseNum) {
+		return std::stold(std::string{ str }, &parseNum);
+	}
+}
+
+#endif

dCommon/GeneralUtils.h

@@ -1,210 +1,285 @@
 #pragma once
 
 // C++
-#include <stdint.h>
+#include <charconv>
+#include <cstdint>
 #include <random>
-#include <time.h>
+#include <ctime>
 #include <string>
-#include <type_traits>
+#include <string_view>
+#include <optional>
 #include <functional>
 #include <type_traits>
 #include <stdexcept>
-#include <BitStream.h>
+#include "BitStream.h"
+#include "NiPoint3.h"
 
+#include "dPlatforms.h"
 #include "Game.h"
+#include "Logger.h"
+
+enum eInventoryType : uint32_t;
+enum class eObjectBits : size_t;
+enum class eReplicaComponentType : uint32_t;
 
 /*!
   \file GeneralUtils.hpp
   \brief A namespace containing general utility functions
  */
 
-//! The general utils namespace
+ //! The general utils namespace
 namespace GeneralUtils {
-    //! Converts a plain ASCII string to a UTF-16 string
-    /*!
-      \param string The string to convert
-      \param size A size to trim the string to. Default is -1 (No trimming)
-      \return An UTF-16 representation of the string
-     */
-    std::u16string ASCIIToUTF16(const std::string& string, size_t size = -1);
+	//! Converts a plain ASCII string to a UTF-16 string
+	/*!
+	  \param string The string to convert
+	  \param size A size to trim the string to. Default is -1 (No trimming)
+	  \return An UTF-16 representation of the string
+	 */
+	std::u16string ASCIIToUTF16(const std::string_view& string, size_t size = -1);
 
-    //! Converts a UTF-16 string to a UTF-8 string
-    /*!
-      \param string The string to convert
-      \param size A size to trim the string to. Default is -1 (No trimming)
-      \return An UTF-8 representation of the string
-     */
-    std::string UTF16ToWTF8(const std::u16string& string, size_t size = -1);
+	//! Converts a UTF-8 String to a UTF-16 string
+	/*!
+	  \param string The string to convert
+	  \param size A size to trim the string to. Default is -1 (No trimming)
+	  \return An UTF-16 representation of the string
+	 */
+	std::u16string UTF8ToUTF16(const std::string_view& string, size_t size = -1);
 
-    /**
-     * Compares two basic strings but does so ignoring case sensitivity
-     * \param a the first string to compare against the second string
-     * \param b the second string to compare against the first string
-     * @return if the two strings are equal
-     */
-    bool CaseInsensitiveStringCompare(const std::string& a, const std::string& b);
+	//! Internal, do not use
+	bool _NextUTF8Char(std::string_view& slice, uint32_t& out);
 
-    // MARK: Bits
+	//! Converts a UTF-16 string to a UTF-8 string
+	/*!
+	  \param string The string to convert
+	  \param size A size to trim the string to. Default is -1 (No trimming)
+	  \return An UTF-8 representation of the string
+	 */
+	std::string UTF16ToWTF8(const std::u16string_view& string, size_t size = -1);
 
-    // MARK: Bits
+	/**
+	 * Compares two basic strings but does so ignoring case sensitivity
+	 * \param a the first string to compare against the second string
+	 * \param b the second string to compare against the first string
+	 * @return if the two strings are equal
+	 */
+	bool CaseInsensitiveStringCompare(const std::string& a, const std::string& b);
 
-    //! Sets a bit on a numerical value
-    template <typename T>
-    void SetBit(T& value, size_t index) {
-        static_assert(std::is_arithmetic<T>::value, "Not an arithmetic type");
-        
-        if (index > (sizeof(T) * 8) - 1) {
-            return;
-        }
-        
-        value |= static_cast<T>(1) << index;
-    }
-    
-    //! Clears a bit on a numerical value
-    template <typename T>
-    void ClearBit(T& value, size_t index) {
-        static_assert(std::is_arithmetic<T>::value, "Not an arithmetic type");
-        
-        if (index > (sizeof(T) * 8 - 1)) {
-            return;
-        }
-        
-        value &= ~(static_cast<T>(1) << index);
-    }
-    
-    //! Sets a specific bit in a signed 64-bit integer
-    /*!
-      \param value The value to set the bit for
-      \param index The index of the bit
-     */
-    int64_t SetBit(int64_t value, uint32_t index);
-    
-    //! Clears a specific bit in a signed 64-bit integer
-    /*!
-      \param value The value to clear the bit from
-      \param index The index of the bit
-     */
-    int64_t ClearBit(int64_t value, uint32_t index);
-    
-    //! Checks a specific bit in a signed 64-bit integer
-    /*!
-      \parma value The value to check the bit in
-      \param index The index of the bit
-      \return Whether or not the bit is set
-     */
-    bool CheckBit(int64_t value, uint32_t index);
+	// MARK: Bits
 
-    // MARK: Random Number Generation
+	// MARK: Bits
 
-    //! Generates a random number
-    /*!
-      \param min The minimum the generate from
-      \param max The maximum to generate to
-     */
-    template <typename T>
-    inline T GenerateRandomNumber(std::size_t min, std::size_t max) {
-        // Make sure it is a numeric type
-        static_assert(std::is_arithmetic<T>::value, "Not an arithmetic type");
+	//! Sets a bit on a numerical value
+	template <typename T>
+	inline void SetBit(T& value, eObjectBits bits) {
+		static_assert(std::is_arithmetic<T>::value, "Not an arithmetic type");
+		auto index = static_cast<size_t>(bits);
+		if (index > (sizeof(T) * 8) - 1) {
+			return;
+		}
 
-        if constexpr (std::is_integral_v<T>) {  // constexpr only necessary on first statement
-            std::uniform_int_distribution<T> distribution(min, max);
-            return distribution(Game::randomEngine);
-        }
-        else if (std::is_floating_point_v<T>) {
-            std::uniform_real_distribution<T> distribution(min, max);
-            return distribution(Game::randomEngine);
-        }
+		value |= static_cast<T>(1) << index;
+	}
+
+	//! Clears a bit on a numerical value
+	template <typename T>
+	inline void ClearBit(T& value, eObjectBits bits) {
+		static_assert(std::is_arithmetic<T>::value, "Not an arithmetic type");
+		auto index = static_cast<size_t>(bits);
+		if (index > (sizeof(T) * 8 - 1)) {
+			return;
+		}
+
+		value &= ~(static_cast<T>(1) << index);
+	}
+
+	//! Sets a specific bit in a signed 64-bit integer
+	/*!
+	  \param value The value to set the bit for
+	  \param index The index of the bit
+	 */
+	int64_t SetBit(int64_t value, uint32_t index);
+
+	//! Clears a specific bit in a signed 64-bit integer
+	/*!
+	  \param value The value to clear the bit from
+	  \param index The index of the bit
+	 */
+	int64_t ClearBit(int64_t value, uint32_t index);
+
+	//! Checks a specific bit in a signed 64-bit integer
+	/*!
+	  \parma value The value to check the bit in
+	  \param index The index of the bit
+	  \return Whether or not the bit is set
+	 */
+	bool CheckBit(int64_t value, uint32_t index);
 
-        return T();
-    }
-    
 	bool ReplaceInString(std::string& str, const std::string& from, const std::string& to);
 
-    std::u16string ReadWString(RakNet::BitStream *inStream);
+	std::u16string ReadWString(RakNet::BitStream& inStream);
 
 	std::vector<std::wstring> SplitString(std::wstring& str, wchar_t delimiter);
 
-	std::vector<std::u16string> SplitString(std::u16string& str, char16_t delimiter);
+	std::vector<std::u16string> SplitString(const std::u16string& str, char16_t delimiter);
 
 	std::vector<std::string> SplitString(const std::string& str, char delimiter);
 
-    template <typename T>
-    T Parse(const char* value);
+	std::vector<std::string> GetSqlFileNamesFromFolder(const std::string& folder);
 
-	template <>
-    inline int32_t Parse(const char* value)
-	{
-        return std::stoi(value);
+	// Concept constraining to enum types
+	template <typename T>
+	concept Enum = std::is_enum_v<T>;
+
+	// Concept constraining to numeric types
+	template <typename T>
+	concept Numeric = std::integral<T> || Enum<T> || std::floating_point<T>;
+
+	// Concept trickery to enable parsing underlying numeric types
+	template <Numeric T>
+	struct numeric_parse { using type = T; };
+
+	// If an enum, present an alias to its underlying type for parsing
+	template <Numeric T> requires Enum<T>
+	struct numeric_parse<T> { using type = std::underlying_type_t<T>; };
+
+	// If a boolean, present an alias to an intermediate integral type for parsing
+	template <Numeric T> requires std::same_as<T, bool>
+	struct numeric_parse<T> { using type = uint32_t; };
+
+	// Shorthand type alias
+	template <Numeric T>
+	using numeric_parse_t = numeric_parse<T>::type;
+
+	/**
+	 * For numeric values: Parses a string_view and returns an optional variable depending on the result.
+	 * @param str The string_view to be evaluated
+	 * @returns An std::optional containing the desired value if it is equivalent to the string
+	*/
+	template <Numeric T>
+	[[nodiscard]] std::optional<T> TryParse(const std::string_view str) {
+		numeric_parse_t<T> result;
+
+		const char* const strEnd = str.data() + str.size();
+		const auto [parseEnd, ec] = std::from_chars(str.data(), strEnd, result);
+		const bool isParsed = parseEnd == strEnd && ec == std::errc{};
+
+		return isParsed ? static_cast<T>(result) : std::optional<T>{};
 	}
 
-    template <>
-    inline int64_t Parse(const char* value)
-    {
-        return std::stoll(value);
-    }
+#if !(__GNUC__ >= 11 || _MSC_VER >= 1924)
 
-    template <>
-    inline float Parse(const char* value)
-    {
-        return std::stof(value);
-    }
+	// MacOS floating-point parse helper function specializations
+	namespace details {
+		template <std::floating_point T>
+		[[nodiscard]] T _parse(const std::string_view str, size_t& parseNum);
+	}
 
-    template <>
-    inline double Parse(const char* value)
-    {
-        return std::stod(value);
-    }
-	
-    template <>
-    inline uint32_t Parse(const char* value)
-    {
-        return std::stoul(value);
-    }
+	/**
+	 * For floating-point values: Parses a string_view and returns an optional variable depending on the result.
+	 * Note that this function overload is only included for MacOS, as from_chars will fulfill its purpose otherwise.
+	 * @param str The string_view to be evaluated
+	 * @returns An std::optional containing the desired value if it is equivalent to the string
+	*/
+	template <std::floating_point T>
+	[[nodiscard]] std::optional<T> TryParse(const std::string_view str) noexcept
+	try {
+		size_t parseNum;
+		const T result = details::_parse<T>(str, parseNum);
+		const bool isParsed = str.length() == parseNum;
 
-    template <>
-    inline uint64_t Parse(const char* value)
-    {
-        return std::stoull(value);
-    }
-	
-    template <typename T>
-    bool TryParse(const char* value, T& dst)
-    {
-        try
-        {
-            dst = Parse<T>(value);
+		return isParsed ? result : std::optional<T>{};
+	} catch (...) {
+		return std::nullopt;
+	}
 
-            return true;
-        }
-        catch (...)
-        {
-            return false;
-        }
-    }
+#endif
 
-    template <typename T>
-    T Parse(const std::string& value)
-    {
-        return Parse<T>(value.c_str());
-    }
+	/**
+	 * The TryParse overload for handling NiPoint3 by passing 3 seperate string references
+	 * @param strX The string representing the X coordinate
+	 * @param strY The string representing the Y coordinate
+	 * @param strZ The string representing the Z coordinate
+	 * @returns An std::optional containing the desired NiPoint3 if it can be constructed from the string parameters
+	*/
+	template <typename T>
+	[[nodiscard]] std::optional<NiPoint3> TryParse(const std::string& strX, const std::string& strY, const std::string& strZ) {
+		const auto x = TryParse<float>(strX);
+		if (!x) return std::nullopt;
 
-    template <typename T>
-    bool TryParse(const std::string& value, T& dst)
-    {
-        return TryParse<T>(value.c_str(), dst);
-    }
+		const auto y = TryParse<float>(strY);
+		if (!y) return std::nullopt;
 
-    template<typename T>
-    std::u16string to_u16string(T value)
-    {
-        return GeneralUtils::ASCIIToUTF16(std::to_string(value));
-    }
+		const auto z = TryParse<float>(strZ);
+		return z ? std::make_optional<NiPoint3>(x.value(), y.value(), z.value()) : std::nullopt;
+	}
 
-    // From boost::hash_combine
-    template <class T>
-    void hash_combine(std::size_t& s, const T& v)
-    {
-        std::hash<T> h;
-        s ^= h(v) + 0x9e3779b9 + (s << 6) + (s >> 2);
-    }
+	/**
+	 * The TryParse overload for handling NiPoint3 by passingn a reference to a vector of three strings
+	 * @param str The string vector representing the X, Y, and Xcoordinates
+	 * @returns An std::optional containing the desired NiPoint3 if it can be constructed from the string parameters
+	*/
+	template <typename T>
+	[[nodiscard]] std::optional<NiPoint3> TryParse(const std::vector<std::string>& str) {
+		return (str.size() == 3) ? TryParse<NiPoint3>(str[0], str[1], str[2]) : std::nullopt;
+	}
+
+	template <typename T>
+	std::u16string to_u16string(T value) {
+		return GeneralUtils::ASCIIToUTF16(std::to_string(value));
+	}
+
+	// From boost::hash_combine
+	template <class T>
+	constexpr void hash_combine(std::size_t& s, const T& v) {
+		std::hash<T> h;
+		s ^= h(v) + 0x9e3779b9 + (s << 6) + (s >> 2);
+	}
+
+	// MARK: Random Number Generation
+
+	//! Generates a random number
+	/*!
+	  \param min The minimum the generate from
+	  \param max The maximum to generate to
+	 */
+	template <typename T>
+	inline T GenerateRandomNumber(std::size_t min, std::size_t max) {
+		// Make sure it is a numeric type
+		static_assert(std::is_arithmetic<T>::value, "Not an arithmetic type");
+
+		if constexpr (std::is_integral_v<T>) {  // constexpr only necessary on first statement
+			std::uniform_int_distribution<T> distribution(min, max);
+			return distribution(Game::randomEngine);
+		} else if (std::is_floating_point_v<T>) {
+			std::uniform_real_distribution<T> distribution(min, max);
+			return distribution(Game::randomEngine);
+		}
+
+		return T();
+	}
+
+	/**
+	 * Casts the value of an enum entry to its underlying type
+	 * @param entry Enum entry to cast
+	 * @returns The enum entry's value in its underlying type
+	*/
+	template <Enum eType>
+	constexpr std::underlying_type_t<eType> ToUnderlying(const eType entry) noexcept {
+		return static_cast<std::underlying_type_t<eType>>(entry);
+	}
+
+	// on Windows we need to undef these or else they conflict with our numeric limits calls
+	// DEVELOPERS DEVELOPERS DEVELOPERS DEVELOPERS DEVELOPERS DEVELOPERS DEVELOPERS DEVELOPERS
+	#ifdef _WIN32
+	#undef min
+	#undef max
+	#endif
+
+	template <typename T>
+	inline T GenerateRandomNumber() {
+		// Make sure it is a numeric type
+		static_assert(std::is_arithmetic<T>::value, "Not an arithmetic type");
+
+		return GenerateRandomNumber<T>(std::numeric_limits<T>::min(), std::numeric_limits<T>::max());
+	}
 }

dCommon/LDFFormat.cpp

@@ -3,132 +3,170 @@
 // Custom Classes
 #include "GeneralUtils.h"
 
+#include "Game.h"
+#include "Logger.h"
+
 // C++
-#include <sstream>
+#include <string_view>
 #include <vector>
 
-//! Returns a pointer to a LDFData value based on string format
-LDFBaseData * LDFBaseData::DataFromString(const std::string& format) {
-    
-    // First, check the format
-    std::istringstream ssFormat(format);
-    std::string token;
-    
-    std::vector<std::string> keyValueArray;
-    while (std::getline(ssFormat, token, '=')) {
-        keyValueArray.push_back(token);
-    }
-    
-    if (keyValueArray.size() == 2) {
-        std::u16string key = GeneralUtils::ASCIIToUTF16(keyValueArray[0]);
-        
-        std::vector<std::string> dataArray;
-        std::istringstream ssData(keyValueArray[1]);
-        while (std::getline(ssData, token, ':')) {
-            dataArray.push_back(token);
-        }
+using LDFKey = std::string_view;
+using LDFTypeAndValue = std::string_view;
 
-		if (dataArray.size() > 2) { // hacky fix for strings with colons in them
-			std::vector<std::string> newDataArray;
-			newDataArray.push_back(dataArray[0]);
-			std::string value = "";
-			for (size_t i = 1; i < dataArray.size(); ++i) {
-				value += dataArray[i] + ':';
-			}
-			value.pop_back(); // remove last colon
-			newDataArray.push_back(value);
-			dataArray = newDataArray;
+using LDFType = std::string_view;
+using LDFValue = std::string_view;
+
+//! Returns a pointer to a LDFData value based on string format
+LDFBaseData* LDFBaseData::DataFromString(const std::string_view& format) {
+	// A valid LDF must be at least 3 characters long (=0:) is the shortest valid LDF (empty UTF-16 key with no initial value)
+	if (format.empty() || format.length() <= 2) return nullptr;
+	auto equalsPosition = format.find('=');
+	// You can have an empty key, just make sure the type and value might exist
+	if (equalsPosition == std::string::npos || equalsPosition == (format.size() - 1)) return nullptr;
+
+	std::pair<LDFKey, LDFTypeAndValue> keyValue;
+	keyValue.first = format.substr(0, equalsPosition);
+	keyValue.second = format.substr(equalsPosition + 1, format.size());
+
+	std::u16string key = GeneralUtils::ASCIIToUTF16(keyValue.first);
+
+	auto colonPosition = keyValue.second.find(':');
+
+	// If : is the first thing after an =, then this is an invalid LDF since
+	// we dont have a type to use.
+	if (colonPosition == std::string::npos || colonPosition == 0) return nullptr;
+
+	std::pair<LDFType, LDFValue> ldfTypeAndValue;
+	ldfTypeAndValue.first = keyValue.second.substr(0, colonPosition);
+	ldfTypeAndValue.second = keyValue.second.substr(colonPosition + 1, keyValue.second.size());
+
+	// Only allow empty values for string values.
+	if (ldfTypeAndValue.second.size() == 0 && !(ldfTypeAndValue.first == "0" || ldfTypeAndValue.first == "13")) return nullptr;
+
+	eLDFType type;
+	char* storage;
+	try {
+		type = static_cast<eLDFType>(strtol(ldfTypeAndValue.first.data(), &storage, 10));
+	} catch (std::exception) {
+		LOG("Attempted to process invalid ldf type (%s) from string (%s)", ldfTypeAndValue.first.data(), format.data());
+		return nullptr;
+	}
+
+	LDFBaseData* returnValue = nullptr;
+	switch (type) {
+	case LDF_TYPE_UTF_16: {
+		std::u16string data = GeneralUtils::UTF8ToUTF16(ldfTypeAndValue.second);
+		returnValue = new LDFData<std::u16string>(key, data);
+		break;
+	}
+
+	case LDF_TYPE_S32: {
+		const auto data = GeneralUtils::TryParse<int32_t>(ldfTypeAndValue.second);
+		if (!data) {
+			LOG("Warning: Attempted to process invalid int32 value (%s) from string (%s)", ldfTypeAndValue.second.data(), format.data());
+			return nullptr;
 		}
-        
-        if ((dataArray[0] == "0" || dataArray[0] == "13") && dataArray.size() == 1) {
-            dataArray.push_back("");
-        }
-        
-        if (dataArray.size() == 2) {
-            eLDFType type = static_cast<eLDFType>(stoi(dataArray[0]));
-            
-            switch (type) {
-                case LDF_TYPE_UTF_16: {
-                    std::u16string data = GeneralUtils::ASCIIToUTF16(dataArray[1]);
-                    return new LDFData<std::u16string>(key, data);
-                }
-                    
-                case LDF_TYPE_S32: {
-                    int32_t data = static_cast<int32_t>(stol(dataArray[1]));
-                    return new LDFData<int32_t>(key, data);
-                }
-                    
-                case LDF_TYPE_FLOAT: {
-                    float data = static_cast<float>(stof(dataArray[1]));
-                    return new LDFData<float>(key, data);
-                }
-                    
-                case LDF_TYPE_DOUBLE: {
-                    double data = static_cast<float>(stod(dataArray[1]));
-                    return new LDFData<double>(key, data);
-                }
-                    
-                case LDF_TYPE_U32:
-            	{
-                    uint32_t data;
-                	
-                	if (dataArray[1] == "true")
-                	{
-                        data = 1;
-                	}
-                    else if (dataArray[1] == "false")
-                    {
-                        data = 0;
-                    }
-                    else
-                    {
-	                    data = static_cast<uint32_t>(stoul(dataArray[1]));
-                    }
-                	
-                    return new LDFData<uint32_t>(key, data);
-                }
-                    
-                case LDF_TYPE_BOOLEAN: {
-                    bool data;
-                	
-                	if (dataArray[1] == "true")
-                	{
-                        data = true;
-                	}
-                    else if (dataArray[1] == "false")
-                    {
-                        data = false;
-                    }
-                    else
-                    {
-	                    data = static_cast<bool>(stoi(dataArray[1]));
-                    }
-                	
-                    return new LDFData<bool>(key, data);
-                }
-                    
-                case LDF_TYPE_U64: {
-                    uint64_t data = static_cast<uint64_t>(stoull(dataArray[1]));
-                    return new LDFData<uint64_t>(key, data);
-                }
-                    
-                case LDF_TYPE_OBJID: {
-                    LWOOBJID data = static_cast<LWOOBJID>(stoll(dataArray[1]));
-                    return new LDFData<LWOOBJID>(key, data);
-                }
-                    
-                case LDF_TYPE_UTF_8: {
-                    std::string data = dataArray[1];
-                    return new LDFData<std::string>(key, data);
-                }
-                    
-                case LDF_TYPE_UNKNOWN: {
-                    return nullptr;
-                }
-            }
-        }
-    }
-    
-    return nullptr;
-    
+		returnValue = new LDFData<int32_t>(key, data.value());
+
+		break;
+	}
+
+	case LDF_TYPE_FLOAT: {
+		const auto data = GeneralUtils::TryParse<float>(ldfTypeAndValue.second);
+		if (!data) {
+			LOG("Warning: Attempted to process invalid float value (%s) from string (%s)", ldfTypeAndValue.second.data(), format.data());
+			return nullptr;
+		}
+		returnValue = new LDFData<float>(key, data.value());
+		break;
+	}
+
+	case LDF_TYPE_DOUBLE: {
+		const auto data = GeneralUtils::TryParse<double>(ldfTypeAndValue.second);
+		if (!data) {
+			LOG("Warning: Attempted to process invalid double value (%s) from string (%s)", ldfTypeAndValue.second.data(), format.data());
+			return nullptr;
+		}
+		returnValue = new LDFData<double>(key, data.value());
+		break;
+	}
+
+	case LDF_TYPE_U32:
+	{
+		uint32_t data;
+
+		if (ldfTypeAndValue.second == "true") {
+			data = 1;
+		} else if (ldfTypeAndValue.second == "false") {
+			data = 0;
+		} else {
+			const auto dataOptional = GeneralUtils::TryParse<uint32_t>(ldfTypeAndValue.second);
+			if (!dataOptional) {
+				LOG("Warning: Attempted to process invalid uint32 value (%s) from string (%s)", ldfTypeAndValue.second.data(), format.data());
+				return nullptr;
+			}
+			data = dataOptional.value();
+		}
+
+		returnValue = new LDFData<uint32_t>(key, data);
+		break;
+	}
+
+	case LDF_TYPE_BOOLEAN: {
+		bool data;
+
+		if (ldfTypeAndValue.second == "true") {
+			data = true;
+		} else if (ldfTypeAndValue.second == "false") {
+			data = false;
+		} else {
+			const auto dataOptional = GeneralUtils::TryParse<bool>(ldfTypeAndValue.second);
+			if (!dataOptional) {
+				LOG("Warning: Attempted to process invalid bool value (%s) from string (%s)", ldfTypeAndValue.second.data(), format.data());
+				return nullptr;
+			}
+			data = dataOptional.value();
+		}
+
+		returnValue = new LDFData<bool>(key, data);
+		break;
+	}
+
+	case LDF_TYPE_U64: {
+		const auto data = GeneralUtils::TryParse<uint64_t>(ldfTypeAndValue.second);
+		if (!data) {
+			LOG("Warning: Attempted to process invalid uint64 value (%s) from string (%s)", ldfTypeAndValue.second.data(), format.data());
+			return nullptr;
+		}
+		returnValue = new LDFData<uint64_t>(key, data.value());
+		break;
+	}
+
+	case LDF_TYPE_OBJID: {
+		const auto data = GeneralUtils::TryParse<LWOOBJID>(ldfTypeAndValue.second);
+		if (!data) {
+			LOG("Warning: Attempted to process invalid LWOOBJID value (%s) from string (%s)", ldfTypeAndValue.second.data(), format.data());
+			return nullptr;
+		}
+		returnValue = new LDFData<LWOOBJID>(key, data.value());
+		break;
+	}
+
+	case LDF_TYPE_UTF_8: {
+		std::string data = ldfTypeAndValue.second.data();
+		returnValue = new LDFData<std::string>(key, data);
+		break;
+	}
+
+	case LDF_TYPE_UNKNOWN: {
+		LOG("Warning: Attempted to process invalid unknown value (%s) from string (%s)", ldfTypeAndValue.second.data(), format.data());
+		break;
+	}
+
+	default: {
+		LOG("Warning: Attempted to process invalid LDF type (%d) from string (%s)", type, format.data());
+		break;
+	}
+	}
+	return returnValue;
 }

dCommon/LDFFormat.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __LDFFORMAT__H__
+#define __LDFFORMAT__H__
 
 // Custom Classes
 #include "dCommonVars.h"
@@ -6,191 +7,162 @@
 
 // C++
 #include <string>
+#include <string_view>
 #include <sstream>
 
 // RakNet
+#include "BitStream.h"
 
-#include "../thirdparty/raknet/Source/BitStream.h"
-
-/*!
-  \file LDFFormat.hpp
-  \brief A collection of LDF format classes
- */
-
-//! An enum for LDF Data Types
 enum eLDFType {
-    LDF_TYPE_UNKNOWN = -1,          //!< Unknown data type
-    LDF_TYPE_UTF_16 = 0,            //!< UTF-16 wstring data type
-    LDF_TYPE_S32 = 1,               //!< Signed 32-bit data type
-    LDF_TYPE_FLOAT = 3,             //!< Float data type
-    LDF_TYPE_DOUBLE = 4,            //!< Double data type
-    LDF_TYPE_U32 = 5,               //!< Unsigned 32-bit data type
-    LDF_TYPE_BOOLEAN = 7,           //!< Boolean data type
-    LDF_TYPE_U64 = 8,               //!< Unsigned 64-bit data type (originally signed, templates won't work with both S64 & OBJID
-    LDF_TYPE_OBJID = 9,             //!< Signed 64-bit data type (reserved for object IDs)
-    LDF_TYPE_UTF_8 = 13,            //!< UTF-8 string data type
+	LDF_TYPE_UNKNOWN = -1,          //!< Unknown data type
+	LDF_TYPE_UTF_16 = 0,            //!< UTF-16 wstring data type
+	LDF_TYPE_S32 = 1,               //!< Signed 32-bit data type
+	LDF_TYPE_FLOAT = 3,             //!< Float data type
+	LDF_TYPE_DOUBLE = 4,            //!< Double data type
+	LDF_TYPE_U32 = 5,               //!< Unsigned 32-bit data type
+	LDF_TYPE_BOOLEAN = 7,           //!< Boolean data type
+	LDF_TYPE_U64 = 8,               //!< Unsigned 64-bit data type (originally signed, templates won't work with both S64 & OBJID
+	LDF_TYPE_OBJID = 9,             //!< Signed 64-bit data type (reserved for object IDs)
+	LDF_TYPE_UTF_8 = 13,            //!< UTF-8 string data type
 };
 
-//! A base class for the LDF data
 class LDFBaseData {
 public:
-    
-    //! Destructor
-    virtual ~LDFBaseData(void) { }
-    
-    //! Writes the data to a packet
-    /*!
-      \param packet The packet
-     */
-    virtual void WriteToPacket(RakNet::BitStream * packet) = 0;
-    
-    //! Gets the key
-    /*!
-      \return The key
-     */
-    virtual const std::u16string& GetKey(void) = 0;
-    
-    //! Gets the value type
-    /*!
-      \return The value type
-     */
-    virtual eLDFType GetValueType(void) = 0;
-    
-    //! Gets a string from the key/value pair
-    /*!
-      \param includeKey Whether or not to include the key in the data
-      \param includeTypeId Whether or not to include the type id in the data
-      \return The string representation of the data
-     */
-    virtual std::string GetString(bool includeKey = true, bool includeTypeId = true) = 0;
-    
-    virtual std::string GetValueAsString() = 0;
 
-    virtual LDFBaseData * Copy() = 0;
-    
-    // MARK: Functions
-    
-    //! Returns a pointer to a LDFData value based on string format
-    /*!
-      \param format The format
-     */
-    static LDFBaseData * DataFromString(const std::string& format);
+	virtual ~LDFBaseData() {}
+
+	virtual void WriteToPacket(RakNet::BitStream& packet) = 0;
+
+	virtual const std::u16string& GetKey() = 0;
+
+	virtual eLDFType GetValueType() = 0;
+
+	/** Gets a string from the key/value pair
+	 * @param includeKey Whether or not to include the key in the data
+	 * @param includeTypeId Whether or not to include the type id in the data
+	 * @return The string representation of the data
+	 */
+	virtual std::string GetString(bool includeKey = true, bool includeTypeId = true) = 0;
+
+	virtual std::string GetValueAsString() = 0;
+
+	virtual LDFBaseData* Copy() = 0;
+
+	/**
+	 * Given an input string, return the data as a LDF key.
+	 */
+	static LDFBaseData* DataFromString(const std::string_view& format);
 
 };
 
-//! A structure for an LDF key-value pair
 template<typename T>
-class LDFData : public LDFBaseData {
+class LDFData: public LDFBaseData {
 private:
-    std::u16string key;
-    T value;
-    
-    //! Writes the key to the packet
-    void WriteKey(RakNet::BitStream * packet) {
-        packet->Write(static_cast<uint8_t>(this->key.length() * sizeof(uint16_t)));
-        for (uint32_t i = 0; i < this->key.length(); ++i) {
-            packet->Write(static_cast<uint16_t>(this->key[i]));
-        }
-    }
-    
-    //! Writes the value to the packet
-    void WriteValue(RakNet::BitStream * packet) {
-        packet->Write(static_cast<uint8_t>(this->GetValueType()));
-        packet->Write(this->value);
-    }
+	std::u16string key;
+	T value;
+
+	//! Writes the key to the packet
+	void WriteKey(RakNet::BitStream& packet) {
+		packet.Write<uint8_t>(this->key.length() * sizeof(uint16_t));
+		for (uint32_t i = 0; i < this->key.length(); ++i) {
+			packet.Write<uint16_t>(this->key[i]);
+		}
+	}
+
+	//! Writes the value to the packet
+	void WriteValue(RakNet::BitStream& packet) {
+		packet.Write<uint8_t>(this->GetValueType());
+		packet.Write(this->value);
+	}
 
 public:
-    
-    //! Initializer
-    LDFData(const std::u16string& key, const T& value) {
-        this->key = key;
-        this->value = value;
-    }
-    
-    //! Destructor
-    ~LDFData(void) override { }
-    
-    //! Gets the value
-    /*!
-      \return The value
-     */
-    const T& GetValue(void) { return this->value; }
-    
-    //! Sets the value
-    /*!
-      \param value The value to set to
-     */
-    void SetValue(T value) { this->value = value; };
 
-    //! Gets the value string
-    /*!
-      \return The value string
-     */
-    std::string GetValueString(void) { return ""; }
-    
-    //! Writes the data to a packet
-    /*!
-      \param packet The packet
-     */
-    void WriteToPacket(RakNet::BitStream * packet) override {
-        this->WriteKey(packet);
-        this->WriteValue(packet);
-    }
-    
-    //! Gets the key
-    /*!
-     \return The key
-     */
-    const std::u16string& GetKey(void) override { return this->key; }
-    
-    //! Gets the LDF Type
-    /*!
-     \return The LDF value type
-     */
-    eLDFType GetValueType(void) override { return LDF_TYPE_UNKNOWN; }
-    
-    //! Gets the string data
-    /*!
-      \param includeKey Whether or not to include the key in the data
-      \param includeTypeId Whether or not to include the type id in the data
-      \return The string representation of the data
-     */
-    std::string GetString(const bool includeKey = true, const bool includeTypeId = true) override {
-        if (GetValueType() == -1) {
-            return GeneralUtils::UTF16ToWTF8(this->key) + "=-1:<server variable>";
-        }
+	//! Initializer
+	LDFData(const std::u16string& key, const T& value) {
+		this->key = key;
+		this->value = value;
+	}
 
-        std::stringstream stream;
+	//! Destructor
+	~LDFData(void) override {}
 
-        if (includeKey) {
-            const std::string& sKey = GeneralUtils::UTF16ToWTF8(this->key, this->key.size());
-        	
-            stream << sKey << "=";
-        }
+	//! Gets the value
+	/*!
+	  \return The value
+	 */
+	const T& GetValue(void) { return this->value; }
 
-    	if (includeTypeId) {
-	        const std::string& sType = std::to_string(this->GetValueType());
+	//! Sets the value
+	/*!
+	  \param value The value to set to
+	 */
+	void SetValue(T value) { this->value = value; };
 
-    		
-            stream << sType << ":";
-    	}
+	//! Gets the value string
+	/*!
+	  \return The value string
+	 */
+	std::string GetValueString(void) { return ""; }
 
-        const std::string& sData = this->GetValueString();
-    	
-        stream << sData;
+	//! Writes the data to a packet
+	/*!
+	  \param packet The packet
+	 */
+	void WriteToPacket(RakNet::BitStream& packet) override {
+		this->WriteKey(packet);
+		this->WriteValue(packet);
+	}
 
-        return stream.str();
-    }
-    
-    std::string GetValueAsString() override {
-        return this->GetValueString();
-    }
-    
-    LDFBaseData * Copy() override {
-        return new LDFData<T>(key, value);
-    }
-    
-    inline static T Default = {};
+	//! Gets the key
+	/*!
+	 \return The key
+	 */
+	const std::u16string& GetKey(void) override { return this->key; }
+
+	//! Gets the LDF Type
+	/*!
+	 \return The LDF value type
+	 */
+	eLDFType GetValueType(void) override { return LDF_TYPE_UNKNOWN; }
+
+	//! Gets the string data
+	/*!
+	  \param includeKey Whether or not to include the key in the data
+	  \param includeTypeId Whether or not to include the type id in the data
+	  \return The string representation of the data
+	 */
+	std::string GetString(const bool includeKey = true, const bool includeTypeId = true) override {
+		if (GetValueType() == -1) {
+			return GeneralUtils::UTF16ToWTF8(this->key) + "=-1:<server variable>";
+		}
+
+		std::stringstream stream;
+
+		if (includeKey) {
+			const std::string& sKey = GeneralUtils::UTF16ToWTF8(this->key, this->key.size());
+			stream << sKey << '=';
+		}
+
+		if (includeTypeId) {
+			stream << this->GetValueType() << ':';
+		}
+
+		const std::string& sData = this->GetValueString();
+
+		stream << sData;
+
+		return stream.str();
+	}
+
+	std::string GetValueAsString() override {
+		return this->GetValueString();
+	}
+
+	LDFBaseData* Copy() override {
+		return new LDFData<T>(key, value);
+	}
+
+	inline static const T Default = {};
 };
 
 // LDF Types
@@ -206,48 +178,46 @@ template<> inline eLDFType LDFData<std::string>::GetValueType(void) { return LDF
 
 // The specialized version for std::u16string (UTF-16)
 template<>
-inline void LDFData<std::u16string>::WriteValue(RakNet::BitStream * packet) {
-    packet->Write(static_cast<uint8_t>(this->GetValueType()));
-    
-    packet->Write(static_cast<uint32_t>(this->value.length()));
-    for (uint32_t i = 0; i < this->value.length(); ++i) {
-        packet->Write(static_cast<uint16_t>(this->value[i]));
-    }
+inline void LDFData<std::u16string>::WriteValue(RakNet::BitStream& packet) {
+	packet.Write<uint8_t>(this->GetValueType());
+
+	packet.Write<uint32_t>(this->value.length());
+	for (uint32_t i = 0; i < this->value.length(); ++i) {
+		packet.Write<uint16_t>(this->value[i]);
+	}
 }
 
 // The specialized version for bool
 template<>
-inline void LDFData<bool>::WriteValue(RakNet::BitStream * packet) {
-    packet->Write(static_cast<uint8_t>(this->GetValueType()));
-    
-    packet->Write(static_cast<uint8_t>(this->value));
+inline void LDFData<bool>::WriteValue(RakNet::BitStream& packet) {
+	packet.Write<uint8_t>(this->GetValueType());
+
+	packet.Write<uint8_t>(this->value);
 }
 
 // The specialized version for std::string (UTF-8)
 template<>
-inline void LDFData<std::string>::WriteValue(RakNet::BitStream * packet) {
-    packet->Write(static_cast<uint8_t>(this->GetValueType()));
-    
-    packet->Write(static_cast<uint32_t>(this->value.length()));
-    for (uint32_t i = 0; i < this->value.length(); ++i) {
-        packet->Write(static_cast<uint8_t>(this->value[i]));
-    }
+inline void LDFData<std::string>::WriteValue(RakNet::BitStream& packet) {
+	packet.Write<uint8_t>(this->GetValueType());
+
+	packet.Write<uint32_t>(this->value.length());
+	for (uint32_t i = 0; i < this->value.length(); ++i) {
+		packet.Write<uint8_t>(this->value[i]);
+	}
 }
 
-// MARK: String Data
-template<> inline std::string LDFData<std::u16string>::GetValueString(void) {
-    //std::string toReturn(this->value.begin(), this->value.end());
-    //return toReturn;
-
+template<> inline std::string LDFData<std::u16string>::GetValueString() {
 	return GeneralUtils::UTF16ToWTF8(this->value, this->value.size());
 }
 
-template<> inline std::string LDFData<int32_t>::GetValueString(void) { return std::to_string(this->value); }
-template<> inline std::string LDFData<float>::GetValueString(void) { return std::to_string(this->value); }
-template<> inline std::string LDFData<double>::GetValueString(void) { return std::to_string(this->value); }
-template<> inline std::string LDFData<uint32_t>::GetValueString(void) { return std::to_string(this->value); }
-template<> inline std::string LDFData<bool>::GetValueString(void) { return std::to_string(this->value); }
-template<> inline std::string LDFData<uint64_t>::GetValueString(void) { return std::to_string(this->value); }
-template<> inline std::string LDFData<LWOOBJID>::GetValueString(void) { return std::to_string(this->value); }
+template<> inline std::string LDFData<int32_t>::GetValueString() { return std::to_string(this->value); }
+template<> inline std::string LDFData<float>::GetValueString() { return std::to_string(this->value); }
+template<> inline std::string LDFData<double>::GetValueString() { return std::to_string(this->value); }
+template<> inline std::string LDFData<uint32_t>::GetValueString() { return std::to_string(this->value); }
+template<> inline std::string LDFData<bool>::GetValueString() { return std::to_string(this->value); }
+template<> inline std::string LDFData<uint64_t>::GetValueString() { return std::to_string(this->value); }
+template<> inline std::string LDFData<LWOOBJID>::GetValueString() { return std::to_string(this->value); }
 
-template<> inline std::string LDFData<std::string>::GetValueString(void) { return this->value; }
+template<> inline std::string LDFData<std::string>::GetValueString() { return this->value; }
+
+#endif  //!__LDFFORMAT__H__

dCommon/Logger.cpp

@@ -0,0 +1,98 @@
+#include "Logger.h"
+
+#include <algorithm>
+#include <ctime>
+#include <filesystem>
+#include <stdarg.h>
+
+Writer::~Writer() {
+	// Flush before we close
+	Flush();
+	// Dont try to close stdcout...
+	if (!m_Outfile || m_IsConsoleWriter) return;
+
+	fclose(m_Outfile);
+	m_Outfile = NULL;
+}
+
+void Writer::Log(const char* time, const char* message) {
+	if (!m_Outfile || !m_Enabled) return;
+
+	fputs(time, m_Outfile);
+	fputs(message, m_Outfile);
+}
+
+void Writer::Flush() {
+	if (!m_Outfile) return;
+	fflush(m_Outfile);
+}
+
+FileWriter::FileWriter(const char* outpath) {
+	m_Outfile = fopen(outpath, "wt");
+	if (!m_Outfile) printf("Couldn't open %s for writing!\n", outpath);
+	m_Outpath = outpath;
+	m_IsConsoleWriter = false;
+}
+
+ConsoleWriter::ConsoleWriter(bool enabled) {
+	m_Enabled = enabled;
+	m_Outfile = stdout;
+	m_IsConsoleWriter = true;
+}
+
+Logger::Logger(const std::string& outpath, bool logToConsole, bool logDebugStatements) {
+	m_logDebugStatements = logDebugStatements;
+	std::filesystem::path outpathPath(outpath);
+	if (!std::filesystem::exists(outpathPath.parent_path())) std::filesystem::create_directories(outpathPath.parent_path());
+	m_Writers.push_back(std::make_unique<FileWriter>(outpath));
+	m_Writers.push_back(std::make_unique<ConsoleWriter>(logToConsole));
+}
+
+void Logger::vLog(const char* format, va_list args) {
+	time_t t = time(NULL);
+	struct tm* time = localtime(&t);
+	char timeStr[70];
+	strftime(timeStr, sizeof(timeStr), "[%d-%m-%y %H:%M:%S ", time);
+	char message[2048];
+	vsnprintf(message, 2048, format, args);
+	for (const auto& writer : m_Writers) {
+		writer->Log(timeStr, message);
+	}
+}
+
+void Logger::Log(const char* className, const char* format, ...) {
+	va_list args;
+	std::string log = std::string(className) + "] " + std::string(format) + "\n";
+	va_start(args, format);
+	vLog(log.c_str(), args);
+	va_end(args);
+}
+
+void Logger::LogDebug(const char* className, const char* format, ...) {
+	if (!m_logDebugStatements) return;
+	va_list args;
+	std::string log = std::string(className) + "] " + std::string(format) + "\n";
+	va_start(args, format);
+	vLog(log.c_str(), args);
+	va_end(args);
+}
+
+void Logger::Flush() {
+	for (const auto& writer : m_Writers) {
+		writer->Flush();
+	}
+}
+
+void Logger::SetLogToConsole(bool logToConsole) {
+	for (const auto& writer : m_Writers) {
+		if (writer->IsConsoleWriter()) writer->SetEnabled(logToConsole);
+	}
+}
+
+bool Logger::GetLogToConsole() const {
+	bool toReturn = false;
+	for (const auto& writer : m_Writers) {
+		if (writer->IsConsoleWriter()) toReturn |= writer->GetEnabled();
+	}
+	return toReturn;
+}

dCommon/Logger.h

@@ -0,0 +1,89 @@
+#pragma once
+
+#include <memory>
+#include <string>
+#include <vector>
+
+#define STRINGIFY_IMPL(x) #x
+
+#define STRINGIFY(x) STRINGIFY_IMPL(x)
+
+#define GET_FILE_NAME(x, y) GetFileNameFromAbsolutePath(__FILE__ x y)
+
+#define FILENAME_AND_LINE GET_FILE_NAME(":", STRINGIFY(__LINE__))
+
+// Calculate the filename at compile time from the path.
+// We just do this by scanning the path for the last '/' or '\' character and returning the string after it.
+constexpr const char* GetFileNameFromAbsolutePath(const char* path) {
+    const char* file = path;
+    while (*path) {
+		char nextChar = *path++;
+        if (nextChar == '/' || nextChar == '\\') {
+            file = path;
+        }
+    }
+    return file;
+}
+
+// These have to have a constexpr variable to store the filename_and_line result in a local variable otherwise
+// they will not be valid constexpr and will be evaluated at runtime instead of compile time!
+// The full string is still stored in the binary, however the offset of the filename in the absolute paths
+// is used in the instruction instead of the start of the absolute path.
+#define LOG(message, ...) do { auto str = FILENAME_AND_LINE; Game::logger->Log(str, message, ##__VA_ARGS__); } while(0)
+#define LOG_DEBUG(message, ...) do { auto str = FILENAME_AND_LINE; Game::logger->LogDebug(str, message, ##__VA_ARGS__); } while(0)
+
+// Writer class for writing data to files.
+class Writer {
+public:
+	Writer(bool enabled = true) : m_Enabled(enabled) {};
+	virtual ~Writer();
+
+	virtual void Log(const char* time, const char* message);
+	virtual void Flush();
+
+	void SetEnabled(bool disabled) { m_Enabled = disabled; }
+	bool GetEnabled() const { return m_Enabled; }
+
+	bool IsConsoleWriter() { return m_IsConsoleWriter; }
+public:
+	bool m_Enabled = true;
+	bool m_IsConsoleWriter = false;
+	FILE* m_Outfile;
+};
+
+// FileWriter class for writing data to a file on a disk.
+class FileWriter : public Writer {
+public:
+	FileWriter(const char* outpath);
+	FileWriter(const std::string& outpath) : FileWriter(outpath.c_str()) {};
+private:
+	std::string m_Outpath;
+};
+
+// ConsoleWriter class for writing data to the console.
+class ConsoleWriter : public Writer {
+public:
+	ConsoleWriter(bool enabled);
+};
+
+class Logger {
+public:
+	Logger() = delete;
+	Logger(const std::string& outpath, bool logToConsole, bool logDebugStatements);
+
+	void Log(const char* filenameAndLine, const char* format, ...);
+	void LogDebug(const char* filenameAndLine, const char* format, ...);
+
+	void Flush();
+
+	bool GetLogToConsole() const;
+	void SetLogToConsole(bool logToConsole);
+
+	void SetLogDebugStatements(bool logDebugStatements) { m_logDebugStatements = logDebugStatements; }
+
+private:
+	void vLog(const char* format, va_list args);
+
+	bool m_logDebugStatements;
+	std::vector<std::unique_ptr<Writer>> m_Writers;
+};

dCommon/MD5.cpp

@@ -1,362 +0,0 @@
-/* MD5
- converted to C++ class by Frank Thilo (thilo@unix-ag.org)
- for bzflag (http://www.bzflag.org)
- 
- based on:
- 
- md5.h and md5.c
- reference implemantion of RFC 1321
- 
- Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
- rights reserved.
- 
- License to copy and use this software is granted provided that it
- is identified as the "RSA Data Security, Inc. MD5 Message-Digest
- Algorithm" in all material mentioning or referencing this software
- or this function.
- 
- License is also granted to make and use derivative works provided
- that such works are identified as "derived from the RSA Data
- Security, Inc. MD5 Message-Digest Algorithm" in all material
- mentioning or referencing the derived work.
- 
- RSA Data Security, Inc. makes no representations concerning either
- the merchantability of this software or the suitability of this
- software for any particular purpose. It is provided "as is"
- without express or implied warranty of any kind.
- 
- These notices must be retained in any copies of any part of this
- documentation and/or software.
- 
- */
-
-/* interface header */
-#include "MD5.h"
-
-/* system implementation headers */
-#include <cstdio>
-
-
-// Constants for MD5Transform routine.
-#define S11 7
-#define S12 12
-#define S13 17
-#define S14 22
-#define S21 5
-#define S22 9
-#define S23 14
-#define S24 20
-#define S31 4
-#define S32 11
-#define S33 16
-#define S34 23
-#define S41 6
-#define S42 10
-#define S43 15
-#define S44 21
-
-///////////////////////////////////////////////
-
-// F, G, H and I are basic MD5 functions.
-inline MD5::uint4 MD5::F(uint4 x, uint4 y, uint4 z) {
-    return x&y | ~x&z;
-}
-
-inline MD5::uint4 MD5::G(uint4 x, uint4 y, uint4 z) {
-    return x&z | y&~z;
-}
-
-inline MD5::uint4 MD5::H(uint4 x, uint4 y, uint4 z) {
-    return x^y^z;
-}
-
-inline MD5::uint4 MD5::I(uint4 x, uint4 y, uint4 z) {
-    return y ^ (x | ~z);
-}
-
-// rotate_left rotates x left n bits.
-inline MD5::uint4 MD5::rotate_left(uint4 x, int n) {
-    return (x << n) | (x >> (32 - n));
-}
-
-// FF, GG, HH, and II transformations for rounds 1, 2, 3, and 4.
-// Rotation is separate from addition to prevent recomputation.
-inline void MD5::FF(uint4 &a, uint4 b, uint4 c, uint4 d, uint4 x, uint4 s, uint4 ac) {
-    a = rotate_left(a + F(b, c, d) + x + ac, s) + b;
-}
-
-inline void MD5::GG(uint4 &a, uint4 b, uint4 c, uint4 d, uint4 x, uint4 s, uint4 ac) {
-    a = rotate_left(a + G(b, c, d) + x + ac, s) + b;
-}
-
-inline void MD5::HH(uint4 &a, uint4 b, uint4 c, uint4 d, uint4 x, uint4 s, uint4 ac) {
-    a = rotate_left(a + H(b, c, d) + x + ac, s) + b;
-}
-
-inline void MD5::II(uint4 &a, uint4 b, uint4 c, uint4 d, uint4 x, uint4 s, uint4 ac) {
-    a = rotate_left(a + I(b, c, d) + x + ac, s) + b;
-}
-
-//////////////////////////////////////////////
-
-// default ctor, just initailize
-MD5::MD5()
-{
-    init();
-}
-
-//////////////////////////////////////////////
-
-// nifty shortcut ctor, compute MD5 for string and finalize it right away
-MD5::MD5(const std::string &text)
-{
-    init();
-    update(text.c_str(), text.length());
-    finalize();
-}
-
-//////////////////////////////
-
-void MD5::init()
-{
-    finalized = false;
-    
-    count[0] = 0;
-    count[1] = 0;
-    
-    // load magic initialization constants.
-    state[0] = 0x67452301;
-    state[1] = 0xefcdab89;
-    state[2] = 0x98badcfe;
-    state[3] = 0x10325476;
-}
-
-//////////////////////////////
-
-// decodes input (unsigned char) into output (uint4). Assumes len is a multiple of 4.
-void MD5::decode(uint4 output[], const uint1 input[], size_type len)
-{
-    for (unsigned int i = 0, j = 0; j < len; i++, j += 4)
-        output[i] = ((uint4)input[j]) | (((uint4)input[j + 1]) << 8) |
-        (((uint4)input[j + 2]) << 16) | (((uint4)input[j + 3]) << 24);
-}
-
-//////////////////////////////
-
-// encodes input (uint4) into output (unsigned char). Assumes len is
-// a multiple of 4.
-void MD5::encode(uint1 output[], const uint4 input[], size_type len)
-{
-    for (size_type i = 0, j = 0; j < len; i++, j += 4) {
-        output[j] = input[i] & 0xff;
-        output[j + 1] = (input[i] >> 8) & 0xff;
-        output[j + 2] = (input[i] >> 16) & 0xff;
-        output[j + 3] = (input[i] >> 24) & 0xff;
-    }
-}
-
-//////////////////////////////
-
-// apply MD5 algo on a block
-void MD5::transform(const uint1 block[blocksize])
-{
-    uint4 a = state[0], b = state[1], c = state[2], d = state[3], x[16];
-    decode(x, block, blocksize);
-    
-    /* Round 1 */
-    FF(a, b, c, d, x[0], S11, 0xd76aa478); /* 1 */
-    FF(d, a, b, c, x[1], S12, 0xe8c7b756); /* 2 */
-    FF(c, d, a, b, x[2], S13, 0x242070db); /* 3 */
-    FF(b, c, d, a, x[3], S14, 0xc1bdceee); /* 4 */
-    FF(a, b, c, d, x[4], S11, 0xf57c0faf); /* 5 */
-    FF(d, a, b, c, x[5], S12, 0x4787c62a); /* 6 */
-    FF(c, d, a, b, x[6], S13, 0xa8304613); /* 7 */
-    FF(b, c, d, a, x[7], S14, 0xfd469501); /* 8 */
-    FF(a, b, c, d, x[8], S11, 0x698098d8); /* 9 */
-    FF(d, a, b, c, x[9], S12, 0x8b44f7af); /* 10 */
-    FF(c, d, a, b, x[10], S13, 0xffff5bb1); /* 11 */
-    FF(b, c, d, a, x[11], S14, 0x895cd7be); /* 12 */
-    FF(a, b, c, d, x[12], S11, 0x6b901122); /* 13 */
-    FF(d, a, b, c, x[13], S12, 0xfd987193); /* 14 */
-    FF(c, d, a, b, x[14], S13, 0xa679438e); /* 15 */
-    FF(b, c, d, a, x[15], S14, 0x49b40821); /* 16 */
-    
-    /* Round 2 */
-    GG(a, b, c, d, x[1], S21, 0xf61e2562); /* 17 */
-    GG(d, a, b, c, x[6], S22, 0xc040b340); /* 18 */
-    GG(c, d, a, b, x[11], S23, 0x265e5a51); /* 19 */
-    GG(b, c, d, a, x[0], S24, 0xe9b6c7aa); /* 20 */
-    GG(a, b, c, d, x[5], S21, 0xd62f105d); /* 21 */
-    GG(d, a, b, c, x[10], S22, 0x2441453); /* 22 */
-    GG(c, d, a, b, x[15], S23, 0xd8a1e681); /* 23 */
-    GG(b, c, d, a, x[4], S24, 0xe7d3fbc8); /* 24 */
-    GG(a, b, c, d, x[9], S21, 0x21e1cde6); /* 25 */
-    GG(d, a, b, c, x[14], S22, 0xc33707d6); /* 26 */
-    GG(c, d, a, b, x[3], S23, 0xf4d50d87); /* 27 */
-    GG(b, c, d, a, x[8], S24, 0x455a14ed); /* 28 */
-    GG(a, b, c, d, x[13], S21, 0xa9e3e905); /* 29 */
-    GG(d, a, b, c, x[2], S22, 0xfcefa3f8); /* 30 */
-    GG(c, d, a, b, x[7], S23, 0x676f02d9); /* 31 */
-    GG(b, c, d, a, x[12], S24, 0x8d2a4c8a); /* 32 */
-    
-    /* Round 3 */
-    HH(a, b, c, d, x[5], S31, 0xfffa3942); /* 33 */
-    HH(d, a, b, c, x[8], S32, 0x8771f681); /* 34 */
-    HH(c, d, a, b, x[11], S33, 0x6d9d6122); /* 35 */
-    HH(b, c, d, a, x[14], S34, 0xfde5380c); /* 36 */
-    HH(a, b, c, d, x[1], S31, 0xa4beea44); /* 37 */
-    HH(d, a, b, c, x[4], S32, 0x4bdecfa9); /* 38 */
-    HH(c, d, a, b, x[7], S33, 0xf6bb4b60); /* 39 */
-    HH(b, c, d, a, x[10], S34, 0xbebfbc70); /* 40 */
-    HH(a, b, c, d, x[13], S31, 0x289b7ec6); /* 41 */
-    HH(d, a, b, c, x[0], S32, 0xeaa127fa); /* 42 */
-    HH(c, d, a, b, x[3], S33, 0xd4ef3085); /* 43 */
-    HH(b, c, d, a, x[6], S34, 0x4881d05); /* 44 */
-    HH(a, b, c, d, x[9], S31, 0xd9d4d039); /* 45 */
-    HH(d, a, b, c, x[12], S32, 0xe6db99e5); /* 46 */
-    HH(c, d, a, b, x[15], S33, 0x1fa27cf8); /* 47 */
-    HH(b, c, d, a, x[2], S34, 0xc4ac5665); /* 48 */
-    
-    /* Round 4 */
-    II(a, b, c, d, x[0], S41, 0xf4292244); /* 49 */
-    II(d, a, b, c, x[7], S42, 0x432aff97); /* 50 */
-    II(c, d, a, b, x[14], S43, 0xab9423a7); /* 51 */
-    II(b, c, d, a, x[5], S44, 0xfc93a039); /* 52 */
-    II(a, b, c, d, x[12], S41, 0x655b59c3); /* 53 */
-    II(d, a, b, c, x[3], S42, 0x8f0ccc92); /* 54 */
-    II(c, d, a, b, x[10], S43, 0xffeff47d); /* 55 */
-    II(b, c, d, a, x[1], S44, 0x85845dd1); /* 56 */
-    II(a, b, c, d, x[8], S41, 0x6fa87e4f); /* 57 */
-    II(d, a, b, c, x[15], S42, 0xfe2ce6e0); /* 58 */
-    II(c, d, a, b, x[6], S43, 0xa3014314); /* 59 */
-    II(b, c, d, a, x[13], S44, 0x4e0811a1); /* 60 */
-    II(a, b, c, d, x[4], S41, 0xf7537e82); /* 61 */
-    II(d, a, b, c, x[11], S42, 0xbd3af235); /* 62 */
-    II(c, d, a, b, x[2], S43, 0x2ad7d2bb); /* 63 */
-    II(b, c, d, a, x[9], S44, 0xeb86d391); /* 64 */
-    
-    state[0] += a;
-    state[1] += b;
-    state[2] += c;
-    state[3] += d;
-    
-    // Zeroize sensitive information.
-    memset(x, 0, sizeof x);
-}
-
-//////////////////////////////
-
-// MD5 block update operation. Continues an MD5 message-digest
-// operation, processing another message block
-void MD5::update(const unsigned char input[], size_type length)
-{
-    // compute number of bytes mod 64
-    size_type index = count[0] / 8 % blocksize;
-    
-    // Update number of bits
-    if ((count[0] += (length << 3)) < (length << 3))
-        count[1]++;
-    count[1] += (length >> 29);
-    
-    // number of bytes we need to fill in buffer
-    size_type firstpart = 64 - index;
-    
-    size_type i;
-    
-    // transform as many times as possible.
-    if (length >= firstpart)
-    {
-        // fill buffer first, transform
-        memcpy(&buffer[index], input, firstpart);
-        transform(buffer);
-        
-        // transform chunks of blocksize (64 bytes)
-        for (i = firstpart; i + blocksize <= length; i += blocksize)
-            transform(&input[i]);
-        
-        index = 0;
-    }
-    else
-        i = 0;
-    
-    // buffer remaining input
-    memcpy(&buffer[index], &input[i], length - i);
-}
-
-//////////////////////////////
-
-// for convenience provide a verson with signed char
-void MD5::update(const char input[], size_type length)
-{
-    update((const unsigned char*)input, length);
-}
-
-//////////////////////////////
-
-// MD5 finalization. Ends an MD5 message-digest operation, writing the
-// the message digest and zeroizing the context.
-MD5& MD5::finalize()
-{
-    static unsigned char padding[64] = {
-        0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-    };
-    
-    if (!finalized) {
-        // Save number of bits
-        unsigned char bits[8];
-        encode(bits, count, 8);
-        
-        // pad out to 56 mod 64.
-        size_type index = count[0] / 8 % 64;
-        size_type padLen = (index < 56) ? (56 - index) : (120 - index);
-        update(padding, padLen);
-        
-        // Append length (before padding)
-        update(bits, 8);
-        
-        // Store state in digest
-        encode(digest, state, 16);
-        
-        // Zeroize sensitive information.
-        memset(buffer, 0, sizeof buffer);
-        memset(count, 0, sizeof count);
-        
-        finalized = true;
-    }
-    
-    return *this;
-}
-
-//////////////////////////////
-
-// return hex representation of digest as string
-std::string MD5::hexdigest() const
-{
-    if (!finalized)
-        return "";
-    
-    char buf[33];
-    for (int i = 0; i<16; i++)
-        sprintf(buf + i * 2, "%02x", digest[i]);
-    buf[32] = 0;
-    
-    return std::string(buf);
-}
-
-//////////////////////////////
-
-std::ostream& operator<<(std::ostream& out, MD5 md5)
-{
-    return out << md5.hexdigest();
-}
-
-//////////////////////////////
-
-std::string md5(const std::string str)
-{
-    MD5 md5 = MD5(str);
-    
-    return md5.hexdigest();
-}

dCommon/MD5.h

@@ -1,93 +0,0 @@
-/* MD5
- converted to C++ class by Frank Thilo (thilo@unix-ag.org)
- for bzflag (http://www.bzflag.org)
- 
- based on:
- 
- md5.h and md5.c
- reference implementation of RFC 1321
- 
- Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
- rights reserved.
- 
- License to copy and use this software is granted provided that it
- is identified as the "RSA Data Security, Inc. MD5 Message-Digest
- Algorithm" in all material mentioning or referencing this software
- or this function.
- 
- License is also granted to make and use derivative works provided
- that such works are identified as "derived from the RSA Data
- Security, Inc. MD5 Message-Digest Algorithm" in all material
- mentioning or referencing the derived work.
- 
- RSA Data Security, Inc. makes no representations concerning either
- the merchantability of this software or the suitability of this
- software for any particular purpose. It is provided "as is"
- without express or implied warranty of any kind.
- 
- These notices must be retained in any copies of any part of this
- documentation and/or software.
- 
- */
-
-#ifndef BZF_MD5_H
-#define BZF_MD5_H
-
-#include <cstring>
-#include <iostream>
-
-
-// a small class for calculating MD5 hashes of strings or byte arrays
-// it is not meant to be fast or secure
-//
-// usage: 1) feed it blocks of uchars with update()
-//      2) finalize()
-//      3) get hexdigest() string
-//      or
-//      MD5(std::string).hexdigest()
-//
-// assumes that char is 8 bit and int is 32 bit
-class MD5
-{
-public:
-    typedef unsigned int size_type; // must be 32bit
-    
-    MD5();
-    MD5(const std::string& text);
-    void update(const unsigned char *buf, size_type length);
-    void update(const char *buf, size_type length);
-    MD5& finalize();
-    std::string hexdigest() const;
-    friend std::ostream& operator<<(std::ostream&, MD5 md5);
-    
-private:
-    void init();
-    typedef unsigned char uint1; //  8bit
-    typedef unsigned int uint4;  // 32bit
-    enum { blocksize = 64 }; // VC6 won't eat a const static int here
-    
-    void transform(const uint1 block[blocksize]);
-    static void decode(uint4 output[], const uint1 input[], size_type len);
-    static void encode(uint1 output[], const uint4 input[], size_type len);
-    
-    bool finalized;
-    uint1 buffer[blocksize]; // bytes that didn't fit in last 64 byte chunk
-    uint4 count[2];   // 64bit counter for number of bits (lo, hi)
-    uint4 state[4];   // digest so far
-    uint1 digest[16]; // the result
-    
-    // low level logic operations
-    static inline uint4 F(uint4 x, uint4 y, uint4 z);
-    static inline uint4 G(uint4 x, uint4 y, uint4 z);
-    static inline uint4 H(uint4 x, uint4 y, uint4 z);
-    static inline uint4 I(uint4 x, uint4 y, uint4 z);
-    static inline uint4 rotate_left(uint4 x, int n);
-    static inline void FF(uint4 &a, uint4 b, uint4 c, uint4 d, uint4 x, uint4 s, uint4 ac);
-    static inline void GG(uint4 &a, uint4 b, uint4 c, uint4 d, uint4 x, uint4 s, uint4 ac);
-    static inline void HH(uint4 &a, uint4 b, uint4 c, uint4 d, uint4 x, uint4 s, uint4 ac);
-    static inline void II(uint4 &a, uint4 b, uint4 c, uint4 d, uint4 x, uint4 s, uint4 ac);
-};
-
-std::string md5(const std::string str);
-
-#endif

dCommon/Metrics.cpp

@@ -4,174 +4,150 @@
 
 std::unordered_map<MetricVariable, Metric*> Metrics::m_Metrics = {};
 std::vector<MetricVariable> Metrics::m_Variables = {
-    MetricVariable::GameLoop,
-    MetricVariable::PacketHandling,
-    MetricVariable::UpdateEntities,
-    MetricVariable::UpdateSpawners,
-    MetricVariable::Physics,
-    MetricVariable::UpdateReplica,
-    MetricVariable::Ghosting,
-    MetricVariable::CPUTime,
-    MetricVariable::Sleep,
-    MetricVariable::Frame,
+	MetricVariable::GameLoop,
+	MetricVariable::PacketHandling,
+	MetricVariable::UpdateEntities,
+	MetricVariable::UpdateSpawners,
+	MetricVariable::Physics,
+	MetricVariable::UpdateReplica,
+	MetricVariable::Ghosting,
+	MetricVariable::CPUTime,
+	MetricVariable::Sleep,
+	MetricVariable::Frame,
 };
 
-void Metrics::AddMeasurement(MetricVariable variable, int64_t value) 
-{   
-    const auto& iter = m_Metrics.find(variable);
+void Metrics::AddMeasurement(MetricVariable variable, int64_t value) {
+	const auto& iter = m_Metrics.find(variable);
 
-    Metric* metric;
+	Metric* metric;
 
-    if (iter == m_Metrics.end())
-    {
-        metric = new Metric();
+	if (iter == m_Metrics.end()) {
+		metric = new Metric();
 
-        m_Metrics[variable] = metric;
-    }
-    else
-    {
-        metric = iter->second;
-    }
+		m_Metrics[variable] = metric;
+	} else {
+		metric = iter->second;
+	}
 
-    AddMeasurement(metric, value);
+	AddMeasurement(metric, value);
 }
 
-void Metrics::AddMeasurement(Metric* metric, int64_t value) 
-{
-    const auto index = metric->measurementIndex;
+void Metrics::AddMeasurement(Metric* metric, int64_t value) {
+	const auto index = metric->measurementIndex;
 
-    metric->measurements[index] = value;
+	metric->measurements[index] = value;
 
-    if (metric->max == -1 || value > metric->max)
-    {
-        metric->max = value;
-    }
-    else if (metric->min == -1 || metric->min > value)
-    {
-        metric->min = value;
-    }
+	if (metric->max == -1 || value > metric->max) {
+		metric->max = value;
+	} else if (metric->min == -1 || metric->min > value) {
+		metric->min = value;
+	}
 
-    if (metric->measurementSize < MAX_MEASURMENT_POINTS)
-    {
-        metric->measurementSize++;
-    }
+	if (metric->measurementSize < MAX_MEASURMENT_POINTS) {
+		metric->measurementSize++;
+	}
 
-    metric->measurementIndex = (index + 1) % MAX_MEASURMENT_POINTS;
+	metric->measurementIndex = (index + 1) % MAX_MEASURMENT_POINTS;
 }
 
-const Metric* Metrics::GetMetric(MetricVariable variable)
-{
-    const auto& iter = m_Metrics.find(variable);
+const Metric* Metrics::GetMetric(MetricVariable variable) {
+	const auto& iter = m_Metrics.find(variable);
 
-    if (iter == m_Metrics.end())
-    {
-        return nullptr;
-    }
+	if (iter == m_Metrics.end()) {
+		return nullptr;
+	}
 
-    Metric* metric = iter->second;
+	Metric* metric = iter->second;
 
-    int64_t average = 0;
+	int64_t average = 0;
 
-    for (size_t i = 0; i < metric->measurementSize; i++)
-    {
-        average += metric->measurements[i];
-    }
+	for (size_t i = 0; i < metric->measurementSize; i++) {
+		average += metric->measurements[i];
+	}
 
-    average /= metric->measurementSize;
+	average /= metric->measurementSize;
 
-    metric->average = average;
-    
-    return metric;
+	metric->average = average;
+
+	return metric;
 }
 
-void Metrics::StartMeasurement(MetricVariable variable) 
-{
-    const auto& iter = m_Metrics.find(variable);
+void Metrics::StartMeasurement(MetricVariable variable) {
+	const auto& iter = m_Metrics.find(variable);
 
-    Metric* metric;
+	Metric* metric;
 
-    if (iter == m_Metrics.end())
-    {
-        metric = new Metric();
+	if (iter == m_Metrics.end()) {
+		metric = new Metric();
 
-        m_Metrics[variable] = metric;
-    }
-    else
-    {
-        metric = iter->second;
-    }
+		m_Metrics[variable] = metric;
+	} else {
+		metric = iter->second;
+	}
 
-    metric->activeMeasurement = std::chrono::high_resolution_clock::now();
+	metric->activeMeasurement = std::chrono::high_resolution_clock::now();
 }
 
-void Metrics::EndMeasurement(MetricVariable variable) 
-{
-    const auto end = std::chrono::high_resolution_clock::now();
+void Metrics::EndMeasurement(MetricVariable variable) {
+	const auto end = std::chrono::high_resolution_clock::now();
 
-    const auto& iter = m_Metrics.find(variable);
+	const auto& iter = m_Metrics.find(variable);
 
-    if (iter == m_Metrics.end())
-    {
-        return;
-    }
+	if (iter == m_Metrics.end()) {
+		return;
+	}
 
-    Metric* metric = iter->second;
+	Metric* metric = iter->second;
 
-    const auto elapsed = end - metric->activeMeasurement;
+	const auto elapsed = end - metric->activeMeasurement;
 
-    const auto nanoseconds = std::chrono::duration_cast<std::chrono::nanoseconds>(elapsed).count();
+	const auto nanoseconds = std::chrono::duration_cast<std::chrono::nanoseconds>(elapsed).count();
 
-    AddMeasurement(metric, nanoseconds);
+	AddMeasurement(metric, nanoseconds);
 }
 
-float Metrics::ToMiliseconds(int64_t nanoseconds) 
-{
-    return (float) nanoseconds / 1e6;
+float Metrics::ToMiliseconds(int64_t nanoseconds) {
+	return static_cast<float>(nanoseconds) / 1e6;
 }
 
-std::string Metrics::MetricVariableToString(MetricVariable variable) 
-{
-    switch (variable)
-    {
-    case MetricVariable::GameLoop:
-        return "GameLoop";
-    case MetricVariable::PacketHandling:
-        return "PacketHandling";
-    case MetricVariable::UpdateEntities:
-        return "UpdateEntities";
-    case MetricVariable::UpdateSpawners:
-        return "UpdateSpawners";
-    case MetricVariable::Physics:
-        return "Physics";
-    case MetricVariable::UpdateReplica:
-        return "UpdateReplica";
-    case MetricVariable::Sleep:
-        return "Sleep";
-    case MetricVariable::CPUTime:
-        return "CPUTime";
-    case MetricVariable::Frame:
-        return "Frame";
-    case MetricVariable::Ghosting:
-        return "Ghosting";
-    
-    default:
-        return "Invalid";
-    }
+std::string Metrics::MetricVariableToString(MetricVariable variable) {
+	switch (variable) {
+	case MetricVariable::GameLoop:
+		return "GameLoop";
+	case MetricVariable::PacketHandling:
+		return "PacketHandling";
+	case MetricVariable::UpdateEntities:
+		return "UpdateEntities";
+	case MetricVariable::UpdateSpawners:
+		return "UpdateSpawners";
+	case MetricVariable::Physics:
+		return "Physics";
+	case MetricVariable::UpdateReplica:
+		return "UpdateReplica";
+	case MetricVariable::Sleep:
+		return "Sleep";
+	case MetricVariable::CPUTime:
+		return "CPUTime";
+	case MetricVariable::Frame:
+		return "Frame";
+	case MetricVariable::Ghosting:
+		return "Ghosting";
+
+	default:
+		return "Invalid";
+	}
 }
 
-const std::vector<MetricVariable>& Metrics::GetAllMetrics() 
-{
-    return m_Variables;
+const std::vector<MetricVariable>& Metrics::GetAllMetrics() {
+	return m_Variables;
 }
 
-void Metrics::Clear() 
-{
-    for (const auto& pair : m_Metrics)
-    {
-        delete pair.second;
-    }
-    
-    m_Metrics.clear();
+void Metrics::Clear() {
+	for (const auto& pair : m_Metrics) {
+		delete pair.second;
+	}
+
+	m_Metrics.clear();
 }
 
 /* RSS Memory utilities
@@ -207,46 +183,44 @@ void Metrics::Clear()
 #error "Cannot define getPeakRSS( ) or getCurrentRSS( ) for an unknown OS."
 #endif
 
-/**
- * Returns the peak (maximum so far) resident set size (physical
- * memory use) measured in bytes, or zero if the value cannot be
- * determined on this OS.
- */
-size_t Metrics::GetPeakRSS()
-{
+ /**
+  * Returns the peak (maximum so far) resident set size (physical
+  * memory use) measured in bytes, or zero if the value cannot be
+  * determined on this OS.
+  */
+size_t Metrics::GetPeakRSS() {
 #if defined(_WIN32)
-    /* Windows -------------------------------------------------- */
-    PROCESS_MEMORY_COUNTERS info;
-    GetProcessMemoryInfo( GetCurrentProcess( ), &info, sizeof(info) );
-    return (size_t)info.PeakWorkingSetSize;
+	/* Windows -------------------------------------------------- */
+	PROCESS_MEMORY_COUNTERS info;
+	GetProcessMemoryInfo(GetCurrentProcess(), &info, sizeof(info));
+	return static_cast<size_t>(info.PeakWorkingSetSize);
 
 #elif (defined(_AIX) || defined(__TOS__AIX__)) || (defined(__sun__) || defined(__sun) || defined(sun) && (defined(__SVR4) || defined(__svr4__)))
-    /* AIX and Solaris ------------------------------------------ */
-    struct psinfo psinfo;
-    int fd = -1;
-    if ( (fd = open( "/proc/self/psinfo", O_RDONLY )) == -1 )
-        return (size_t)0L;      /* Can't open? */
-    if ( read( fd, &psinfo, sizeof(psinfo) ) != sizeof(psinfo) )
-    {
-        close( fd );
-        return (size_t)0L;      /* Can't read? */
-    }
-    close( fd );
-    return (size_t)(psinfo.pr_rssize * 1024L);
+	/* AIX and Solaris ------------------------------------------ */
+	struct psinfo psinfo;
+	int fd = -1;
+	if ((fd = open("/proc/self/psinfo", O_RDONLY)) == -1)
+		return static_cast<size_t>(0L);      /* Can't open? */
+	if (read(fd, &psinfo, sizeof(psinfo)) != sizeof(psinfo)) {
+		close(fd);
+		return static_cast<size_t>(0L);      /* Can't read? */
+	}
+	close(fd);
+	return static_cast<size_t>(psinfo.pr_rssize * 1024L);
 
 #elif defined(__unix__) || defined(__unix) || defined(unix) || (defined(__APPLE__) && defined(__MACH__))
-    /* BSD, Linux, and OSX -------------------------------------- */
-    struct rusage rusage;
-    getrusage( RUSAGE_SELF, &rusage );
+	/* BSD, Linux, and OSX -------------------------------------- */
+	struct rusage rusage;
+	getrusage(RUSAGE_SELF, &rusage);
 #if defined(__APPLE__) && defined(__MACH__)
-    return (size_t)rusage.ru_maxrss;
+	return static_cast<size_t>(rusage.ru_maxrss);
 #else
-    return (size_t)(rusage.ru_maxrss * 1024L);
+	return static_cast<size_t>(rusage.ru_maxrss * 1024L);
 #endif
 
 #else
-    /* Unknown OS ----------------------------------------------- */
-    return (size_t)0L;          /* Unsupported. */
+	/* Unknown OS ----------------------------------------------- */
+	return static_cast<size_t>(0L);          /* Unsupported. */
 #endif
 
 }
@@ -255,49 +229,46 @@ size_t Metrics::GetPeakRSS()
  * Returns the current resident set size (physical memory use) measured
  * in bytes, or zero if the value cannot be determined on this OS.
  */
-size_t Metrics::GetCurrentRSS()
-{
+size_t Metrics::GetCurrentRSS() {
 #if defined(_WIN32)
-    /* Windows -------------------------------------------------- */
-    PROCESS_MEMORY_COUNTERS info;
-    GetProcessMemoryInfo( GetCurrentProcess( ), &info, sizeof(info) );
-    return (size_t)info.WorkingSetSize;
+	/* Windows -------------------------------------------------- */
+	PROCESS_MEMORY_COUNTERS info;
+	GetProcessMemoryInfo(GetCurrentProcess(), &info, sizeof(info));
+	return static_cast<size_t>(info.WorkingSetSize);
 
 #elif defined(__APPLE__) && defined(__MACH__)
-    /* OSX ------------------------------------------------------ */
-    struct mach_task_basic_info info;
-    mach_msg_type_number_t infoCount = MACH_TASK_BASIC_INFO_COUNT;
-    if ( task_info( mach_task_self( ), MACH_TASK_BASIC_INFO,
-        (task_info_t)&info, &infoCount ) != KERN_SUCCESS )
-        return (size_t)0L;      /* Can't access? */
-    return (size_t)info.resident_size;
+	/* OSX ------------------------------------------------------ */
+	struct mach_task_basic_info info;
+	mach_msg_type_number_t infoCount = MACH_TASK_BASIC_INFO_COUNT;
+	if (task_info(mach_task_self(), MACH_TASK_BASIC_INFO,
+		reinterpret_cast<task_info_t>(&info), &infoCount) != KERN_SUCCESS)
+		return static_cast<size_t>(0L);      /* Can't access? */
+	return static_cast<size_t>(info.resident_size);
 
 #elif defined(__linux__) || defined(__linux) || defined(linux) || defined(__gnu_linux__)
-    /* Linux ---------------------------------------------------- */
-    long rss = 0L;
-    FILE* fp = NULL;
-    if ( (fp = fopen( "/proc/self/statm", "r" )) == NULL )
-        return (size_t)0L;      /* Can't open? */
-    if ( fscanf( fp, "%*s%ld", &rss ) != 1 )
-    {
-        fclose( fp );
-        return (size_t)0L;      /* Can't read? */
-    }
-    fclose( fp );
-    return (size_t)rss * (size_t)sysconf( _SC_PAGESIZE);
+	/* Linux ---------------------------------------------------- */
+	long rss = 0L;
+	FILE* fp = NULL;
+	if ((fp = fopen("/proc/self/statm", "r")) == NULL)
+		return static_cast<size_t>(0L);      /* Can't open? */
+	if (fscanf(fp, "%*s%ld", &rss) != 1) {
+		fclose(fp);
+		return static_cast<size_t>(0L);      /* Can't read? */
+	}
+	fclose(fp);
+	return static_cast<size_t>(rss) * static_cast<size_t>(sysconf(_SC_PAGESIZE));
 
 #else
-    /* AIX, BSD, Solaris, and Unknown OS ------------------------ */
-    return (size_t)0L;          /* Unsupported. */
+	/* AIX, BSD, Solaris, and Unknown OS ------------------------ */
+	return static_cast<size_t>(0L);          /* Unsupported. */
 #endif
 
 }
 
-size_t Metrics::GetProcessID() 
-{
+size_t Metrics::GetProcessID() {
 #if defined(_WIN32)
-    return GetCurrentProcessId();
+	return GetCurrentProcessId();
 #else
-    return getpid();
+	return getpid();
 #endif
 }

dCommon/Metrics.hpp

@@ -10,52 +10,52 @@
 
 enum class MetricVariable : int32_t
 {
-    GameLoop,
-    PacketHandling,
-    UpdateEntities,
-    UpdateSpawners,
-    Physics,
-    UpdateReplica,
-    Ghosting,
-    CPUTime,
-    Sleep,
-    Frame,
+	GameLoop,
+	PacketHandling,
+	UpdateEntities,
+	UpdateSpawners,
+	Physics,
+	UpdateReplica,
+	Ghosting,
+	CPUTime,
+	Sleep,
+	Frame,
 };
 
 struct Metric
 {
-    int64_t measurements[MAX_MEASURMENT_POINTS] = {};
-    size_t measurementIndex = 0;
-    size_t measurementSize = 0;
-    int64_t max = -1;
-    int64_t min = -1;
-    int64_t average = 0;
-    std::chrono::time_point<std::chrono::high_resolution_clock> activeMeasurement;
+	int64_t measurements[MAX_MEASURMENT_POINTS] = {};
+	size_t measurementIndex = 0;
+	size_t measurementSize = 0;
+	int64_t max = -1;
+	int64_t min = -1;
+	int64_t average = 0;
+	std::chrono::time_point<std::chrono::high_resolution_clock> activeMeasurement;
 };
 
 class Metrics
 {
 public:
-    ~Metrics();
+	~Metrics();
 
-    static void AddMeasurement(MetricVariable variable, int64_t value);
-    static void AddMeasurement(Metric* metric, int64_t value);
-    static const Metric* GetMetric(MetricVariable variable);
-    static void StartMeasurement(MetricVariable variable);
-    static void EndMeasurement(MetricVariable variable);
-    static float ToMiliseconds(int64_t nanoseconds);
-    static std::string MetricVariableToString(MetricVariable variable);
-    static const std::vector<MetricVariable>& GetAllMetrics();
+	static void AddMeasurement(MetricVariable variable, int64_t value);
+	static void AddMeasurement(Metric* metric, int64_t value);
+	static const Metric* GetMetric(MetricVariable variable);
+	static void StartMeasurement(MetricVariable variable);
+	static void EndMeasurement(MetricVariable variable);
+	static float ToMiliseconds(int64_t nanoseconds);
+	static std::string MetricVariableToString(MetricVariable variable);
+	static const std::vector<MetricVariable>& GetAllMetrics();
 
-    static size_t GetPeakRSS();
-    static size_t GetCurrentRSS();
-    static size_t GetProcessID();
+	static size_t GetPeakRSS();
+	static size_t GetCurrentRSS();
+	static size_t GetProcessID();
 
-    static void Clear();
+	static void Clear();
 
 private:
-    Metrics();
+	Metrics();
 
-    static std::unordered_map<MetricVariable, Metric*> m_Metrics;
-    static std::vector<MetricVariable> m_Variables;
+	static std::unordered_map<MetricVariable, Metric*> m_Metrics;
+	static std::vector<MetricVariable> m_Variables;
 };

dCommon/NiPoint3.cpp

@@ -1,261 +1,57 @@
 #include "NiPoint3.h"
-#include "NiQuaternion.h"
 
 // C++
 #include <cmath>
 
-// Static Variables
-const NiPoint3 NiPoint3::ZERO(0.0f, 0.0f, 0.0f);
-const NiPoint3 NiPoint3::UNIT_X(1.0f, 0.0f, 0.0f);
-const NiPoint3 NiPoint3::UNIT_Y(0.0f, 1.0f, 0.0f);
-const NiPoint3 NiPoint3::UNIT_Z(0.0f, 0.0f, 1.0f);
-const NiPoint3 NiPoint3::UNIT_ALL(1.0f, 1.0f, 1.0f);
-
-//! Initializer
-NiPoint3::NiPoint3(void) {
-    this->x = 0;
-    this->y = 0;
-    this->z = 0;
-}
-
-//! Initializer
-NiPoint3::NiPoint3(float x, float y, float z) {
-    this->x = x;
-    this->y = y;
-    this->z = z;
-}
-
-//! Copy Constructor
-NiPoint3::NiPoint3(const NiPoint3& point) {
-    this->x = point.x;
-    this->y = point.y;
-    this->z = point.z;
-}
-
-//! Destructor
-NiPoint3::~NiPoint3(void) {}
-
-// MARK: Getters / Setters
-
-//! Gets the X coordinate
-float NiPoint3::GetX(void) const {
-    return this->x;
-}
-
-//! Sets the X coordinate
-void NiPoint3::SetX(float x) {
-    this->x = x;
-}
-
-//! Gets the Y coordinate
-float NiPoint3::GetY(void) const {
-    return this->y;
-}
-
-//! Sets the Y coordinate
-void NiPoint3::SetY(float y) {
-    this->y = y;
-}
-
-//! Gets the Z coordinate
-float NiPoint3::GetZ(void) const {
-    return this->z;
-}
-
-//! Sets the Z coordinate
-void NiPoint3::SetZ(float z) {
-    this->z = z;
-}
-
-// MARK: Functions
+// MARK: Member Functions
 
 //! Gets the length of the vector
-float NiPoint3::Length(void) const {
-    return sqrt(x*x + y*y + z*z);
-}
-
-//! Gets the squared length of a vector
-float NiPoint3::SquaredLength(void) const {
-    return (x*x + y*y + z*z);
-}
-
-//! Returns the dot product of the vector dotted with another vector
-float NiPoint3::DotProduct(const Vector3& vec) const {
-    return ((this->x * vec.x) + (this->y * vec.y) + (this->z * vec.z));
-}
-
-//! Returns the cross product of the vector crossed with another vector
-Vector3 NiPoint3::CrossProduct(const Vector3& vec) const {
-    return Vector3(((this->y * vec.z) - (this->z * vec.y)),
-                   ((this->z * vec.x) - (this->x * vec.z)),
-                   ((this->x * vec.y) - (this->y * vec.x)));
+float NiPoint3::Length() const {
+	return std::sqrt(x * x + y * y + z * z);
 }
 
 //! Unitize the vector
-NiPoint3 NiPoint3::Unitize(void) const {
-    NiPoint3 unitVec;
-    float length = this->Length();
+NiPoint3 NiPoint3::Unitize() const {
+	float length = this->Length();
 
-    unitVec.x = length != 0 ? this->x / length : 0;
-    unitVec.y = length != 0 ? this->y / length : 0;
-    unitVec.z = length != 0 ? this->z / length : 0;
-
-    return unitVec;
+	return length != 0 ? *this / length : NiPoint3Constant::ZERO;
 }
 
-
-// MARK: Operators
-
-//! Operator to check for equality
-bool NiPoint3::operator==(const NiPoint3& point) const {
-    return point.x == this->x && point.y == this->y && point.z == this->z;
-}
-
-//! Operator to check for inequality
-bool NiPoint3::operator!=(const NiPoint3& point) const {
-    return !(*this == point);
-}
-
-//! Operator for subscripting
-float& NiPoint3::operator[](int i) {
-    float * base = &x;
-    return (float&)base[i];
-}
-
-//! Operator for subscripting
-const float& NiPoint3::operator[](int i) const {
-    const float * base = &x;
-    return (float&)base[i];
-}
-
-//! Operator for addition of vectors
-NiPoint3 NiPoint3::operator+(const NiPoint3& point) const {
-    return NiPoint3(this->x + point.x, this->y + point.y, this->z + point.z);
-}
-
-//! Operator for subtraction of vectors
-NiPoint3 NiPoint3::operator-(const NiPoint3& point) const {
-    return NiPoint3(this->x - point.x, this->y - point.y, this->z - point.z);
-}
-
-//! Operator for addition of a scalar on all vector components
-NiPoint3 NiPoint3::operator+(float fScalar) const {
-    return NiPoint3(this->x + fScalar, this->y + fScalar, this->z + fScalar);
-}
-
-//! Operator for subtraction of a scalar on all vector components
-NiPoint3 NiPoint3::operator-(float fScalar) const {
-    return NiPoint3(this->x - fScalar, this->y - fScalar, this->z - fScalar);
-}
-
-//! Operator for scalar multiplication of a vector
-NiPoint3 NiPoint3::operator*(float fScalar) const {
-    return NiPoint3(this->x * fScalar, this->y * fScalar, this->z * fScalar);
-}
-
-//! Operator for scalar division of a vector
-NiPoint3 NiPoint3::operator/(float fScalar) const {
-    float retX = this->x != 0 ? this->x / fScalar : 0;
-    float retY = this->y != 0 ? this->y / fScalar : 0;
-    float retZ = this->z != 0 ? this->z / fScalar : 0;
-    return NiPoint3(retX, retY, retZ);
-}
-
-
 // MARK: Helper Functions
 
-//! Checks to see if the point (or vector) is with an Axis-Aligned Bounding Box
-bool NiPoint3::IsWithinAxisAlignedBox(const NiPoint3& minPoint, const NiPoint3& maxPoint) {
-    if (this->x < minPoint.x) return false;
-    if (this->x > maxPoint.x) return false;
-    if (this->y < minPoint.y) return false;
-    if (this->y > maxPoint.y) return false;
-
-    return (this->z < maxPoint.z && this->z > minPoint.z);
+float NiPoint3::Angle(const NiPoint3& a, const NiPoint3& b) {
+	const auto dot = a.DotProduct(b);
+	const auto lenA = a.SquaredLength();
+	const auto lenB = a.SquaredLength();
+	return acos(dot / sqrt(lenA * lenB));
 }
 
-//! Checks to see if the point (or vector) is within a sphere
-bool NiPoint3::IsWithinSpehere(const NiPoint3& sphereCenter, float radius) {
-    Vector3 diffVec = Vector3(x - sphereCenter.GetX(), y - sphereCenter.GetY(), z - sphereCenter.GetZ());
-    return (diffVec.SquaredLength() <= (radius * radius));
+float NiPoint3::Distance(const NiPoint3& a, const NiPoint3& b) {
+	const auto dx = a.x - b.x;
+	const auto dy = a.y - b.y;
+	const auto dz = a.z - b.z;
+
+	return std::sqrt(dx * dx + dy * dy + dz * dz);
 }
 
-NiPoint3 NiPoint3::ClosestPointOnLine(const NiPoint3& a, const NiPoint3& b, const NiPoint3& p) 
-{
-    if (a == b) return a;
+NiPoint3 NiPoint3::MoveTowards(const NiPoint3& current, const NiPoint3& target, const float maxDistanceDelta) {
+	float dx = target.x - current.x;
+	float dy = target.y - current.y;
+	float dz = target.z - current.z;
 
-    const auto pa = p - a;
-    const auto ab = b - a;
+	float lengthSquared = static_cast<float>(
+		static_cast<double>(dx) * static_cast<double>(dx) +
+		static_cast<double>(dy) * static_cast<double>(dy) +
+		static_cast<double>(dz) * static_cast<double>(dz)
+		);
 
-    const auto t = pa.DotProduct(ab) / ab.SquaredLength();
+	if (static_cast<double>(lengthSquared) == 0.0
+		|| static_cast<double>(maxDistanceDelta) >= 0.0
+		&& static_cast<double>(lengthSquared)
+		<= static_cast<double>(maxDistanceDelta) * static_cast<double>(maxDistanceDelta)) {
+		return target;
+	}
 
-    if (t <= 0.0f) return a;
-    
-    if (t >= 1.0f) return b;
-    
-    return a + ab * t;
+	float length = std::sqrt(lengthSquared);
+	return NiPoint3(current.x + dx / length * maxDistanceDelta, current.y + dy / length * maxDistanceDelta, current.z + dz / length * maxDistanceDelta);
 }
-
-float NiPoint3::Angle(const NiPoint3& a, const NiPoint3& b)
-{
-    const auto dot = a.DotProduct(b);
-    const auto lenA = a.SquaredLength();
-    const auto lenB = a.SquaredLength();
-    return acos(dot / sqrt(lenA * lenB));
-}
-
-float NiPoint3::Distance(const NiPoint3& a, const NiPoint3& b)
-{
-    const auto dx = a.x - b.x;
-    const auto dy = a.y - b.y;
-    const auto dz = a.z - b.z;
-
-    return std::sqrt(dx * dx + dy * dy + dz * dz);
-}
-
-float NiPoint3::DistanceSquared(const NiPoint3& a, const NiPoint3& b)
-{
-    const auto dx = a.x - b.x;
-    const auto dy = a.y - b.y;
-    const auto dz = a.z - b.z;
-
-    return dx * dx + dy * dy + dz * dz;
-}
-
-NiPoint3 NiPoint3::MoveTowards(const NiPoint3& current, const NiPoint3& target, float maxDistanceDelta) 
-{
-    float dx = target.x - current.x;
-    float dy = target.y - current.y;
-    float dz = target.z - current.z;
-    float lengthSquared = (float) ((double) dx * (double) dx + (double) dy * (double) dy + (double) dz * (double) dz);
-    if ((double) lengthSquared == 0.0 || (double) maxDistanceDelta >= 0.0 && (double) lengthSquared <= (double) maxDistanceDelta * (double) maxDistanceDelta)
-        return target;
-    float length = (float) std::sqrt((double) lengthSquared);
-    return NiPoint3(current.x + dx / length * maxDistanceDelta, current.y + dy / length * maxDistanceDelta, current.z + dz / length * maxDistanceDelta);
-}
-
-//This code is yoinked from the MS XNA code, so it should be right, even if it's horrible.
-NiPoint3 NiPoint3::RotateByQuaternion(const NiQuaternion& rotation) {
-    Vector3 vector;
-    float num12 = rotation.x + rotation.x;
-    float num2 = rotation.y + rotation.y;
-    float num = rotation.z + rotation.z;
-    float num11 = rotation.w * num12;
-    float num10 = rotation.w * num2;
-    float num9 = rotation.w * num;
-    float num8 = rotation.x * num12;
-    float num7 = rotation.x * num2;
-    float num6 = rotation.x * num;
-    float num5 = rotation.y * num2;
-    float num4 = rotation.y * num;
-    float num3 = rotation.z * num;
-
-    NiPoint3 value = *this;
-    float num15 = ((value.x * ((1.0f - num5) - num3)) + (value.y * (num7 - num9))) + (value.z * (num6 + num10));
-    float num14 = ((value.x * (num7 + num9)) + (value.y * ((1.0f - num8) - num3))) + (value.z * (num4 - num11));
-    float num13 = ((value.x * (num6 - num10)) + (value.y * (num4 + num11))) + (value.z * ((1.0f - num8) - num5));
-    vector.x = num15;
-    vector.y = num14;
-    vector.z = num13;
-    return vector;
-}

dCommon/NiPoint3.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __NIPOINT3_H__
+#define __NIPOINT3_H__
 
 /*!
   \file NiPoint3.hpp
@@ -12,177 +13,192 @@ typedef NiPoint3 Vector3;       //!< The Vector3 class is technically the NiPoin
 //! A custom class the defines a point in space
 class NiPoint3 {
 public:
-    float x;            //!< The x position
-    float y;            //!< The y position
-    float z;            //!< The z position
+	float x{ 0 };            //!< The x position
+	float y{ 0 };            //!< The y position
+	float z{ 0 };            //!< The z position
 
 
-    //! Initializer
-    NiPoint3(void);
+	//! Initializer
+	constexpr NiPoint3() = default;
 
-    //! Initializer
-    /*!
-      \param x The x coordinate
-      \param y The y coordinate
-      \param z The z coordinate
-     */
-    NiPoint3(float x, float y, float z);
+	//! Initializer
+	/*!
+	  \param x The x coordinate
+	  \param y The y coordinate
+	  \param z The z coordinate
+	 */
+	constexpr NiPoint3(const float x, const float y, const float z) noexcept
+		: x{ x }
+		, y{ y }
+		, z{ z } {
+	}
 
-    //! Copy Constructor
-    /*!
-      \param point The point to copy
-     */
-    NiPoint3(const NiPoint3& point);
+	//! Copy Constructor
+	/*!
+	  \param point The point to copy
+	 */
+	constexpr NiPoint3(const NiPoint3& point) noexcept
+		: x{ point.x }
+		, y{ point.y }
+		, z{ point.z } {
+	}
 
-    //! Destructor
-    ~NiPoint3(void);
+	// MARK: Getters / Setters
 
-    // MARK: Constants
-    static const NiPoint3 ZERO;         //!< Point(0, 0, 0)
-    static const NiPoint3 UNIT_X;       //!< Point(1, 0, 0)
-    static const NiPoint3 UNIT_Y;       //!< Point(0, 1, 0)
-    static const NiPoint3 UNIT_Z;       //!< Point(0, 0, 1)
-    static const NiPoint3 UNIT_ALL;     //!< Point(1, 1, 1)
+	//! Gets the X coordinate
+	/*!
+	  \return The x coordinate
+	 */
+	[[nodiscard]] constexpr float GetX() const noexcept;
 
-    // MARK: Getters / Setters
+	//! Sets the X coordinate
+	/*!
+	  \param x The x coordinate
+	 */
+	constexpr void SetX(const float x) noexcept;
 
-    //! Gets the X coordinate
-    /*!
-      \return The x coordinate
-     */
-    float GetX(void) const;
+	//! Gets the Y coordinate
+	/*!
+	  \return The y coordinate
+	 */
+	[[nodiscard]] constexpr float GetY() const noexcept;
 
-    //! Sets the X coordinate
-    /*!
-      \param x The x coordinate
-     */
-    void SetX(float x);
+	//! Sets the Y coordinate
+	/*!
+	  \param y The y coordinate
+	 */
+	constexpr void SetY(const float y) noexcept;
 
-    //! Gets the Y coordinate
-    /*!
-      \return The y coordinate
-     */
-    float GetY(void) const;
+	//! Gets the Z coordinate
+	/*!
+	  \return The z coordinate
+	 */
+	[[nodiscard]] constexpr float GetZ() const noexcept;
 
-    //! Sets the Y coordinate
-    /*!
-      \param y The y coordinate
-     */
-    void SetY(float y);
+	//! Sets the Z coordinate
+	/*!
+	  \param z The z coordinate
+	 */
+	constexpr void SetZ(const float z) noexcept;
 
-    //! Gets the Z coordinate
-    /*!
-      \return The z coordinate
-     */
-    float GetZ(void) const;
+	// MARK: Member Functions
 
-    //! Sets the Z coordinate
-    /*!
-      \param z The z coordinate
-     */
-    void SetZ(float z);
+	//! Gets the length of the vector
+	/*!
+	  \return The scalar length of the vector
+	 */
+	[[nodiscard]] float Length() const;
 
+	//! Gets the squared length of a vector
+	/*!
+	  \return The squared length of a vector
+	 */
+	[[nodiscard]] constexpr float SquaredLength() const noexcept;
 
-    // MARK: Member Functions
+	//! Returns the dot product of the vector dotted with another vector
+	/*!
+	  \param vec The second vector
+	  \return The dot product of the two vectors
+	 */
+	[[nodiscard]] constexpr float DotProduct(const Vector3& vec) const noexcept;
 
-    //! Gets the length of the vector
-    /*!
-      \return The scalar length of the vector
-     */
-    float Length(void) const;
+	//! Returns the cross product of the vector crossed with another vector
+	/*!
+	  \param vec The second vector
+	  \return The cross product of the two vectors
+	 */
+	[[nodiscard]] constexpr Vector3 CrossProduct(const Vector3& vec) const noexcept;
 
-    //! Gets the squared length of a vector
-    /*!
-      \return The squared length of a vector
-     */
-    float SquaredLength(void) const;
+	//! Unitize the vector
+	/*!
+	  \returns The current vector
+	 */
+	[[nodiscard]] NiPoint3 Unitize() const;
 
-    //! Returns the dot product of the vector dotted with another vector
-    /*!
-      \param vec The second vector
-      \return The dot product of the two vectors
-     */
-    float DotProduct(const Vector3& vec) const;
+	// MARK: Operators
 
-    //! Returns the cross product of the vector crossed with another vector
-    /*!
-      \param vec The second vector
-      \return The cross product of the two vectors
-     */
-    Vector3 CrossProduct(const Vector3& vec) const;
+	//! Operator to check for equality
+	constexpr bool operator==(const NiPoint3& point) const noexcept;
 
-    //! Unitize the vector
-    /*!
-      \returns The current vector
-     */
-    NiPoint3 Unitize(void) const;
+	//! Operator to check for inequality
+	constexpr bool operator!=(const NiPoint3& point) const noexcept;
 
+	//! Operator for subscripting
+	constexpr float& operator[](const int i) noexcept;
 
-    // MARK: Operators
+	//! Operator for subscripting
+	constexpr const float& operator[](const int i) const noexcept;
 
-    //! Operator to check for equality
-    bool operator==(const NiPoint3& point) const;
+	//! Operator for addition of vectors
+	constexpr NiPoint3 operator+(const NiPoint3& point) const noexcept;
 
-    //! Operator to check for inequality
-    bool operator!=(const NiPoint3& point) const;
+	//! Operator for addition of vectors
+	constexpr NiPoint3& operator+=(const NiPoint3& point) noexcept;
 
-    //! Operator for subscripting
-    float& operator[](int i);
+	constexpr NiPoint3& operator*=(const float scalar) noexcept;
 
-    //! Operator for subscripting
-    const float& operator[](int i) const;
+	//! Operator for subtraction of vectors
+	constexpr NiPoint3 operator-(const NiPoint3& point) const noexcept;
 
-    //! Operator for addition of vectors
-    NiPoint3 operator+(const NiPoint3& point) const;
+	//! Operator for addition of a scalar on all vector components
+	constexpr NiPoint3 operator+(const float fScalar) const noexcept;
 
-    //! Operator for subtraction of vectors
-    NiPoint3 operator-(const NiPoint3& point) const;
+	//! Operator for subtraction of a scalar on all vector components
+	constexpr NiPoint3 operator-(const float fScalar) const noexcept;
 
-    //! Operator for addition of a scalar on all vector components
-    NiPoint3 operator+(float fScalar) const;
+	//! Operator for scalar multiplication of a vector
+	constexpr NiPoint3 operator*(const float fScalar) const noexcept;
 
-    //! Operator for subtraction of a scalar on all vector components
-    NiPoint3 operator-(float fScalar) const;
+	//! Operator for scalar division of a vector
+	constexpr NiPoint3 operator/(const float fScalar) const noexcept;
 
-    //! Operator for scalar multiplication of a vector
-    NiPoint3 operator*(float fScalar) const;
+	// MARK: Helper Functions
 
-    //! Operator for scalar division of a vector
-    NiPoint3 operator/(float fScalar) const;
+	//! Checks to see if the point (or vector) is with an Axis-Aligned Bounding Box
+	/*!
+	  \param minPoint The minimum point of the bounding box
+	  \param maxPoint The maximum point of the bounding box
+	  \return Whether or not this point lies within the box
+	 */
+	[[nodiscard]] constexpr bool IsWithinAxisAlignedBox(const NiPoint3& minPoint, const NiPoint3& maxPoint) noexcept;
 
+	//! Checks to see if the point (or vector) is within a sphere
+	/*!
+	  \param sphereCenter The sphere center
+	  \param radius The radius
+	 */
+	[[nodiscard]] constexpr bool IsWithinSphere(const NiPoint3& sphereCenter, const float radius) noexcept;
 
-    // MARK: Helper Functions
+	/*!
+	  \param a Start of line
+	  \param b End of line
+	  \param p Refrence point
+	  \return The point of line AB which is closest to P
+	*/
+	[[nodiscard]] static constexpr NiPoint3 ClosestPointOnLine(const NiPoint3& a, const NiPoint3& b, const NiPoint3& p) noexcept;
 
-    //! Checks to see if the point (or vector) is with an Axis-Aligned Bounding Box
-    /*!
-      \param minPoint The minimum point of the bounding box
-      \param maxPoint The maximum point of the bounding box
-      \return Whether or not this point lies within the box
-     */
-    bool IsWithinAxisAlignedBox(const NiPoint3& minPoint, const NiPoint3& maxPoint);
+	[[nodiscard]] static float Angle(const NiPoint3& a, const NiPoint3& b);
 
-    //! Checks to see if the point (or vector) is within a sphere
-    /*!
-      \param sphereCenter The sphere center
-      \param radius The radius
-     */
-    bool IsWithinSpehere(const NiPoint3& sphereCenter, float radius);
+	[[nodiscard]] static float Distance(const NiPoint3& a, const NiPoint3& b);
 
-    /*!
-      \param a Start of line
-      \param b End of line
-      \param p Refrence point
-      \return The point of line AB which is closest to P
-    */
-    static NiPoint3 ClosestPointOnLine(const NiPoint3& a, const NiPoint3& b, const NiPoint3& p);
+	[[nodiscard]] static constexpr float DistanceSquared(const NiPoint3& a, const NiPoint3& b) noexcept;
 
-	  static float Angle(const NiPoint3& a, const NiPoint3& b);
+	[[nodiscard]] static NiPoint3 MoveTowards(const NiPoint3& current, const NiPoint3& target, const float maxDistanceDelta);
 
-    static float Distance(const NiPoint3& a, const NiPoint3& b);
-    
-    static float DistanceSquared(const NiPoint3& a, const NiPoint3& b);
-
-    static NiPoint3 MoveTowards(const NiPoint3& current, const NiPoint3& target, float maxDistanceDelta);
-
-    NiPoint3 RotateByQuaternion(const NiQuaternion& rotation);
+	//This code is yoinked from the MS XNA code, so it should be right, even if it's horrible.
+	[[nodiscard]] constexpr NiPoint3 RotateByQuaternion(const NiQuaternion& rotation) noexcept;
 };
+
+// Static Variables
+namespace NiPoint3Constant {
+	constexpr NiPoint3 ZERO(0.0f, 0.0f, 0.0f);
+	constexpr NiPoint3 UNIT_X(1.0f, 0.0f, 0.0f);
+	constexpr NiPoint3 UNIT_Y(0.0f, 1.0f, 0.0f);
+	constexpr NiPoint3 UNIT_Z(0.0f, 0.0f, 1.0f);
+	constexpr NiPoint3 UNIT_ALL(1.0f, 1.0f, 1.0f);
+}
+
+// .inl file needed for code organization and to circumvent circular dependency issues
+#include "NiPoint3.inl"
+
+#endif // !__NIPOINT3_H__

dCommon/NiPoint3.inl

@@ -0,0 +1,196 @@
+#pragma once
+#ifndef __NIPOINT3_H__
+#error "This should only be included inline in NiPoint3.h: Do not include directly!"
+#endif
+
+#include "NiQuaternion.h"
+
+// MARK: Getters / Setters
+
+//! Gets the X coordinate
+constexpr float NiPoint3::GetX() const noexcept {
+	return this->x;
+}
+
+//! Sets the X coordinate
+constexpr void NiPoint3::SetX(const float x) noexcept {
+	this->x = x;
+}
+
+//! Gets the Y coordinate
+constexpr float NiPoint3::GetY() const noexcept {
+	return this->y;
+}
+
+//! Sets the Y coordinate
+constexpr void NiPoint3::SetY(const float y) noexcept {
+	this->y = y;
+}
+
+//! Gets the Z coordinate
+constexpr float NiPoint3::GetZ() const noexcept {
+	return this->z;
+}
+
+//! Sets the Z coordinate
+constexpr void NiPoint3::SetZ(const float z) noexcept {
+	this->z = z;
+}
+
+// MARK: Member Functions
+
+//! Gets the squared length of a vector
+constexpr float NiPoint3::SquaredLength() const noexcept {
+	return (x * x + y * y + z * z);
+}
+
+//! Returns the dot product of the vector dotted with another vector
+constexpr float NiPoint3::DotProduct(const Vector3& vec) const noexcept {
+	return ((this->x * vec.x) + (this->y * vec.y) + (this->z * vec.z));
+}
+
+//! Returns the cross product of the vector crossed with another vector
+constexpr Vector3 NiPoint3::CrossProduct(const Vector3& vec) const noexcept {
+	return Vector3(((this->y * vec.z) - (this->z * vec.y)),
+		((this->z * vec.x) - (this->x * vec.z)),
+		((this->x * vec.y) - (this->y * vec.x)));
+}
+
+// MARK: Operators
+
+//! Operator to check for equality
+constexpr bool NiPoint3::operator==(const NiPoint3& point) const noexcept {
+	return point.x == this->x && point.y == this->y && point.z == this->z;
+}
+
+//! Operator to check for inequality
+constexpr bool NiPoint3::operator!=(const NiPoint3& point) const noexcept {
+	return !(*this == point);
+}
+
+//! Operator for subscripting
+constexpr float& NiPoint3::operator[](const int i) noexcept {
+	float* base = &x;
+	return base[i];
+}
+
+//! Operator for subscripting
+constexpr const float& NiPoint3::operator[](const int i) const noexcept {
+	const float* base = &x;
+	return base[i];
+}
+
+//! Operator for addition of vectors
+constexpr NiPoint3 NiPoint3::operator+(const NiPoint3& point) const noexcept {
+	return NiPoint3(this->x + point.x, this->y + point.y, this->z + point.z);
+}
+
+//! Operator for addition of vectors
+constexpr NiPoint3& NiPoint3::operator+=(const NiPoint3& point) noexcept {
+	this->x += point.x;
+	this->y += point.y;
+	this->z += point.z;
+	return *this;
+}
+
+constexpr NiPoint3& NiPoint3::operator*=(const float scalar) noexcept {
+	this->x *= scalar;
+	this->y *= scalar;
+	this->z *= scalar;
+	return *this;
+}
+
+//! Operator for subtraction of vectors
+constexpr NiPoint3 NiPoint3::operator-(const NiPoint3& point) const noexcept {
+	return NiPoint3(this->x - point.x, this->y - point.y, this->z - point.z);
+}
+
+//! Operator for addition of a scalar on all vector components
+constexpr NiPoint3 NiPoint3::operator+(const float fScalar) const noexcept {
+	return NiPoint3(this->x + fScalar, this->y + fScalar, this->z + fScalar);
+}
+
+//! Operator for subtraction of a scalar on all vector components
+constexpr NiPoint3 NiPoint3::operator-(const float fScalar) const noexcept {
+	return NiPoint3(this->x - fScalar, this->y - fScalar, this->z - fScalar);
+}
+
+//! Operator for scalar multiplication of a vector
+constexpr NiPoint3 NiPoint3::operator*(const float fScalar) const noexcept {
+	return NiPoint3(this->x * fScalar, this->y * fScalar, this->z * fScalar);
+}
+
+//! Operator for scalar division of a vector
+constexpr NiPoint3 NiPoint3::operator/(const float fScalar) const noexcept {
+	float retX = this->x != 0 ? this->x / fScalar : 0;
+	float retY = this->y != 0 ? this->y / fScalar : 0;
+	float retZ = this->z != 0 ? this->z / fScalar : 0;
+	return NiPoint3(retX, retY, retZ);
+}
+
+// MARK: Helper Functions
+
+//! Checks to see if the point (or vector) is with an Axis-Aligned Bounding Box
+constexpr bool NiPoint3::IsWithinAxisAlignedBox(const NiPoint3& minPoint, const NiPoint3& maxPoint) noexcept {
+	if (this->x < minPoint.x) return false;
+	if (this->x > maxPoint.x) return false;
+	if (this->y < minPoint.y) return false;
+	if (this->y > maxPoint.y) return false;
+
+	return (this->z < maxPoint.z && this->z > minPoint.z);
+}
+
+//! Checks to see if the point (or vector) is within a sphere
+constexpr bool NiPoint3::IsWithinSphere(const NiPoint3& sphereCenter, const float radius) noexcept {
+	Vector3 diffVec = Vector3(x - sphereCenter.GetX(), y - sphereCenter.GetY(), z - sphereCenter.GetZ());
+	return (diffVec.SquaredLength() <= (radius * radius));
+}
+
+constexpr NiPoint3 NiPoint3::ClosestPointOnLine(const NiPoint3& a, const NiPoint3& b, const NiPoint3& p) noexcept {
+	if (a == b) return a;
+
+	const auto pa = p - a;
+	const auto ab = b - a;
+
+	const auto t = pa.DotProduct(ab) / ab.SquaredLength();
+
+	if (t <= 0.0f) return a;
+
+	if (t >= 1.0f) return b;
+
+	return a + ab * t;
+}
+
+constexpr float NiPoint3::DistanceSquared(const NiPoint3& a, const NiPoint3& b) noexcept {
+	const auto dx = a.x - b.x;
+	const auto dy = a.y - b.y;
+	const auto dz = a.z - b.z;
+
+	return dx * dx + dy * dy + dz * dz;
+}
+
+//This code is yoinked from the MS XNA code, so it should be right, even if it's horrible.
+constexpr NiPoint3 NiPoint3::RotateByQuaternion(const NiQuaternion& rotation) noexcept {
+	Vector3 vector;
+	float num12 = rotation.x + rotation.x;
+	float num2 = rotation.y + rotation.y;
+	float num = rotation.z + rotation.z;
+	float num11 = rotation.w * num12;
+	float num10 = rotation.w * num2;
+	float num9 = rotation.w * num;
+	float num8 = rotation.x * num12;
+	float num7 = rotation.x * num2;
+	float num6 = rotation.x * num;
+	float num5 = rotation.y * num2;
+	float num4 = rotation.y * num;
+	float num3 = rotation.z * num;
+
+	NiPoint3 value = *this;
+	float num15 = ((value.x * ((1.0f - num5) - num3)) + (value.y * (num7 - num9))) + (value.z * (num6 + num10));
+	float num14 = ((value.x * (num7 + num9)) + (value.y * ((1.0f - num8) - num3))) + (value.z * (num4 - num11));
+	float num13 = ((value.x * (num6 - num10)) + (value.y * (num4 + num11))) + (value.z * ((1.0f - num8) - num5));
+	vector.x = num15;
+	vector.y = num14;
+	vector.z = num13;
+	return vector;
+}

dCommon/NiQuaternion.cpp

@@ -3,131 +3,36 @@
 // C++
 #include <cmath>
 
-// Static Variables
-const NiQuaternion NiQuaternion::IDENTITY(1, 0, 0, 0);
-
-//! The initializer
-NiQuaternion::NiQuaternion(void) {
-    this->w = 1;
-    this->x = 0;
-    this->y = 0;
-    this->z = 0;
-}
-
-//! The initializer
-NiQuaternion::NiQuaternion(float w, float x, float y, float z) {
-    this->w = w;
-    this->x = x;
-    this->y = y;
-    this->z = z;
-}
-
-//! Destructor
-NiQuaternion::~NiQuaternion(void) {}
-
-
-// MARK: Setters / Getters
-
-//! Gets the W coordinate
-float NiQuaternion::GetW(void) const {
-    return this->w;
-}
-
-//! Sets the W coordinate
-void NiQuaternion::SetW(float w) {
-    this->w = w;
-}
-
-//! Gets the X coordinate
-float NiQuaternion::GetX(void) const {
-    return this->x;
-}
-
-//! Sets the X coordinate
-void NiQuaternion::SetX(float x) {
-    this->x = x;
-}
-
-//! Gets the Y coordinate
-float NiQuaternion::GetY(void) const {
-    return this->y;
-}
-
-//! Sets the Y coordinate
-void NiQuaternion::SetY(float y) {
-    this->y = y;
-}
-
-//! Gets the Z coordinate
-float NiQuaternion::GetZ(void) const {
-    return this->z;
-}
-
-//! Sets the Z coordinate
-void NiQuaternion::SetZ(float z) {
-    this->z = z;
-}
-
-
 // MARK: Member Functions
 
-//! Returns the forward vector from the quaternion
-Vector3 NiQuaternion::GetForwardVector(void) const {
-    return Vector3(2 * (x * z + w * y), 2 * (y * z - w * x), 1 - 2 * (x * x + y * y));
-}
-
-//! Returns the up vector from the quaternion
-Vector3 NiQuaternion::GetUpVector(void) const {
-    return Vector3(2 * (x * y - w * z), 1 - 2 * (x * x + z * z), 2 * (y * z + w * x));
-}
-
-//! Returns the right vector from the quaternion
-Vector3 NiQuaternion::GetRightVector(void) const {
-    return Vector3(1 - 2 * (y * y + z * z), 2 * (x * y + w * z), 2 * (x * z - w * y));
-}
-
 Vector3 NiQuaternion::GetEulerAngles() const {
-    Vector3 angles;
+	Vector3 angles;
 
-    // roll (x-axis rotation)
-    const float sinr_cosp = 2 * (w * x + y * z);
-    const float cosr_cosp = 1 - 2 * (x * x + y * y);
-    angles.x = std::atan2(sinr_cosp, cosr_cosp);
+	// roll (x-axis rotation)
+	const float sinr_cosp = 2 * (w * x + y * z);
+	const float cosr_cosp = 1 - 2 * (x * x + y * y);
+	angles.x = std::atan2(sinr_cosp, cosr_cosp);
 
-    // pitch (y-axis rotation)
-    const float sinp = 2 * (w * y - z * x);
-	
-    if (std::abs(sinp) >= 1) {
-        angles.y = std::copysign(3.14 / 2, sinp); // use 90 degrees if out of range
-    }
-    else {
-        angles.y = std::asin(sinp);
-    }
+	// pitch (y-axis rotation)
+	const float sinp = 2 * (w * y - z * x);
 
-    // yaw (z-axis rotation)
-    const float siny_cosp = 2 * (w * z + x * y);
-    const float cosy_cosp = 1 - 2 * (y * y + z * z);
-    angles.z = std::atan2(siny_cosp, cosy_cosp);
+	if (std::abs(sinp) >= 1) {
+		angles.y = std::copysign(3.14 / 2, sinp); // use 90 degrees if out of range
+	} else {
+		angles.y = std::asin(sinp);
+	}
 
-    return angles;
+	// yaw (z-axis rotation)
+	const float siny_cosp = 2 * (w * z + x * y);
+	const float cosy_cosp = 1 - 2 * (y * y + z * z);
+	angles.z = std::atan2(siny_cosp, cosy_cosp);
+
+	return angles;
 }
 
-// MARK: Operators
-
-//! Operator to check for equality
-bool NiQuaternion::operator==(const NiQuaternion& rot) const {
-    return rot.x == this->x && rot.y == this->y && rot.z == this->z && rot.w == this->w;
-}
-
-//! Operator to check for inequality
-bool NiQuaternion::operator!=(const NiQuaternion& rot) const {
-    return !(*this == rot);
-}
-
-
 // MARK: Helper Functions
 
-//! Look from a specific point in space to another point in space
+//! Look from a specific point in space to another point in space (Y-locked)
 NiQuaternion NiQuaternion::LookAt(const NiPoint3& sourcePoint, const NiPoint3& destPoint) {
 	//To make sure we don't orient around the X/Z axis:
 	NiPoint3 source = sourcePoint;
@@ -135,65 +40,64 @@ NiQuaternion NiQuaternion::LookAt(const NiPoint3& sourcePoint, const NiPoint3& d
 	source.y = 0.0f;
 	dest.y = 0.0f;
 
-    NiPoint3 forwardVector = NiPoint3(dest - source).Unitize();
-    
-    NiPoint3 posZ = NiPoint3::UNIT_Z;
-    NiPoint3 vecA = posZ.CrossProduct(forwardVector).Unitize();
-    
-    float dot = posZ.DotProduct(forwardVector);
-    float rotAngle = static_cast<float>(acos(dot));
-    
-    NiPoint3 vecB = vecA.CrossProduct(posZ);
-    
-    if (vecB.DotProduct(forwardVector) < 0) rotAngle = -rotAngle;
-    return NiQuaternion::CreateFromAxisAngle(vecA, rotAngle);
+	NiPoint3 forwardVector = NiPoint3(dest - source).Unitize();
+
+	NiPoint3 posZ = NiPoint3Constant::UNIT_Z;
+	NiPoint3 vecA = posZ.CrossProduct(forwardVector).Unitize();
+
+	float dot = posZ.DotProduct(forwardVector);
+	float rotAngle = static_cast<float>(acos(dot));
+
+	NiPoint3 vecB = vecA.CrossProduct(posZ);
+
+	if (vecB.DotProduct(forwardVector) < 0) rotAngle = -rotAngle;
+	return NiQuaternion::CreateFromAxisAngle(vecA, rotAngle);
 }
 
-NiQuaternion NiQuaternion::LookAtUnlocked(const NiPoint3& sourcePoint, const NiPoint3& destPoint) 
-{
-    NiPoint3 forwardVector = NiPoint3(destPoint - sourcePoint).Unitize();
-    
-    NiPoint3 posZ = NiPoint3::UNIT_Z;
-    NiPoint3 vecA = posZ.CrossProduct(forwardVector).Unitize();
-    
-    float dot = posZ.DotProduct(forwardVector);
-    float rotAngle = static_cast<float>(acos(dot));
-    
-    NiPoint3 vecB = vecA.CrossProduct(posZ);
-    
-    if (vecB.DotProduct(forwardVector) < 0) rotAngle = -rotAngle;
-    return NiQuaternion::CreateFromAxisAngle(vecA, rotAngle);
+//! Look from a specific point in space to another point in space
+NiQuaternion NiQuaternion::LookAtUnlocked(const NiPoint3& sourcePoint, const NiPoint3& destPoint) {
+	NiPoint3 forwardVector = NiPoint3(destPoint - sourcePoint).Unitize();
+
+	NiPoint3 posZ = NiPoint3Constant::UNIT_Z;
+	NiPoint3 vecA = posZ.CrossProduct(forwardVector).Unitize();
+
+	float dot = posZ.DotProduct(forwardVector);
+	float rotAngle = static_cast<float>(acos(dot));
+
+	NiPoint3 vecB = vecA.CrossProduct(posZ);
+
+	if (vecB.DotProduct(forwardVector) < 0) rotAngle = -rotAngle;
+	return NiQuaternion::CreateFromAxisAngle(vecA, rotAngle);
 }
 
 //! Creates a Quaternion from a specific axis and angle relative to that axis
 NiQuaternion NiQuaternion::CreateFromAxisAngle(const Vector3& axis, float angle) {
-    float halfAngle = angle * 0.5f;
-    float s = static_cast<float>(sin(halfAngle));
-    
-    NiQuaternion q;
-    q.x = axis.GetX() * s;
-    q.y = axis.GetY() * s;
-    q.z = axis.GetZ() * s;
-    q.w = static_cast<float>(cos(halfAngle));
-    
-    return q;
+	float halfAngle = angle * 0.5f;
+	float s = static_cast<float>(sin(halfAngle));
+
+	NiQuaternion q;
+	q.x = axis.GetX() * s;
+	q.y = axis.GetY() * s;
+	q.z = axis.GetZ() * s;
+	q.w = static_cast<float>(cos(halfAngle));
+
+	return q;
 }
 
-NiQuaternion NiQuaternion::FromEulerAngles(const NiPoint3& eulerAngles) 
-{
-    // Abbreviations for the various angular functions
-    float cy = cos(eulerAngles.z * 0.5);
-    float sy = sin(eulerAngles.z * 0.5);
-    float cp = cos(eulerAngles.y * 0.5);
-    float sp = sin(eulerAngles.y * 0.5);
-    float cr = cos(eulerAngles.x * 0.5);
-    float sr = sin(eulerAngles.x * 0.5);
+NiQuaternion NiQuaternion::FromEulerAngles(const NiPoint3& eulerAngles) {
+	// Abbreviations for the various angular functions
+	float cy = cos(eulerAngles.z * 0.5);
+	float sy = sin(eulerAngles.z * 0.5);
+	float cp = cos(eulerAngles.y * 0.5);
+	float sp = sin(eulerAngles.y * 0.5);
+	float cr = cos(eulerAngles.x * 0.5);
+	float sr = sin(eulerAngles.x * 0.5);
 
-    NiQuaternion q;
-    q.w = cr * cp * cy + sr * sp * sy;
-    q.x = sr * cp * cy - cr * sp * sy;
-    q.y = cr * sp * cy + sr * cp * sy;
-    q.z = cr * cp * sy - sr * sp * cy;
+	NiQuaternion q;
+	q.w = cr * cp * cy + sr * sp * sy;
+	q.x = sr * cp * cy - cr * sp * sy;
+	q.y = cr * sp * cy + sr * cp * sy;
+	q.z = cr * cp * sy - sr * sp * cy;
 
-    return q;
+	return q;
 }

dCommon/NiQuaternion.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __NIQUATERNION_H__
+#define __NIQUATERNION_H__
 
 // Custom Classes
 #include "NiPoint3.h"
@@ -14,138 +15,144 @@ typedef NiQuaternion Quaternion;        //!< A typedef for a shorthand version o
 //! A class that defines a rotation in space
 class NiQuaternion {
 public:
-    float w;            //!< The w coordinate
-    float x;            //!< The x coordinate
-    float y;            //!< The y coordinate
-    float z;            //!< The z coordinate
-    
-    
-    //! The initializer
-    NiQuaternion(void);
-    
-    //! The initializer
-    /*!
-      \param w The w coordinate
-      \param x The x coordinate
-      \param y The y coordinate
-      \param z The z coordinate
-     */
-    NiQuaternion(float w, float x, float y, float z);
-    
-    //! Destructor
-    ~NiQuaternion(void);
-    
-    // MARK: Constants
-    static const NiQuaternion IDENTITY;         //!< Quaternion(1, 0, 0, 0)
-    
-    // MARK: Setters / Getters
-    
-    //! Gets the W coordinate
-    /*!
-      \return The w coordinate
-     */
-    float GetW(void) const;
-    
-    //! Sets the W coordinate
-    /*!
-      \param w The w coordinate
-     */
-    void SetW(float w);
-    
-    //! Gets the X coordinate
-    /*!
-      \return The x coordinate
-     */
-    float GetX(void) const;
-    
-    //! Sets the X coordinate
-    /*!
-      \param x The x coordinate
-     */
-    void SetX(float x);
-    
-    //! Gets the Y coordinate
-    /*!
-      \return The y coordinate
-     */
-    float GetY(void) const;
-    
-    //! Sets the Y coordinate
-    /*!
-      \param y The y coordinate
-     */
-    void SetY(float y);
-    
-    //! Gets the Z coordinate
-    /*!
-      \return The z coordinate
-     */
-    float GetZ(void) const;
-    
-    //! Sets the Z coordinate
-    /*!
-      \param z The z coordinate
-     */
-    void SetZ(float z);
-    
-    
-    // MARK: Member Functions
-    
-    //! Returns the forward vector from the quaternion
-    /*!
-      \return The forward vector of the quaternion
-     */
-    Vector3 GetForwardVector(void) const;
-    
-    //! Returns the up vector from the quaternion
-    /*!
-      \return The up vector fo the quaternion
-     */
-    Vector3 GetUpVector(void) const;
-    
-    //! Returns the right vector from the quaternion
-    /*!
-      \return The right vector of the quaternion
-     */
-    Vector3 GetRightVector(void) const;
+	float w{ 1 };            //!< The w coordinate
+	float x{ 0 };            //!< The x coordinate
+	float y{ 0 };            //!< The y coordinate
+	float z{ 0 };            //!< The z coordinate
 
-    Vector3 GetEulerAngles() const;
-    
-    
-    // MARK: Operators
-    
-    //! Operator to check for equality
-    bool operator==(const NiQuaternion& rot) const;
-    
-    //! Operator to check for inequality
-    bool operator!=(const NiQuaternion& rot) const;
-    
-    
-    // MARK: Helper Functions
-    
-    //! Look from a specific point in space to another point in space (Y-locked)
-    /*!
-      \param sourcePoint The source location
-      \param destPoint The destination location
-      \return The Quaternion with the rotation towards the destination
-     */
-    static NiQuaternion LookAt(const NiPoint3& sourcePoint, const NiPoint3& destPoint);
-    
-    //! Look from a specific point in space to another point in space
-    /*!
-      \param sourcePoint The source location
-      \param destPoint The destination location
-      \return The Quaternion with the rotation towards the destination
-     */
-    static NiQuaternion LookAtUnlocked(const NiPoint3& sourcePoint, const NiPoint3& destPoint);
-    
-    //! Creates a Quaternion from a specific axis and angle relative to that axis
-    /*!
-      \param axis The axis that is used
-      \param angle The angle relative to this axis
-      \return A quaternion created from the axis and angle
-     */
-    static NiQuaternion CreateFromAxisAngle(const Vector3& axis, float angle);
 
-    static NiQuaternion FromEulerAngles(const NiPoint3& eulerAngles);
+	//! The initializer
+	constexpr NiQuaternion() = default;
+
+	//! The initializer
+	/*!
+	  \param w The w coordinate
+	  \param x The x coordinate
+	  \param y The y coordinate
+	  \param z The z coordinate
+	 */
+	constexpr NiQuaternion(const float w, const float x, const float y, const float z) noexcept
+		: w{ w }
+		, x{ x }
+		, y{ y }
+		, z{ z } {
+	}
+
+	// MARK: Setters / Getters
+
+	//! Gets the W coordinate
+	/*!
+	  \return The w coordinate
+	 */
+	[[nodiscard]] constexpr float GetW() const noexcept;
+
+	//! Sets the W coordinate
+	/*!
+	  \param w The w coordinate
+	 */
+	constexpr void SetW(const float w) noexcept;
+
+	//! Gets the X coordinate
+	/*!
+	  \return The x coordinate
+	 */
+	[[nodiscard]] constexpr float GetX() const noexcept;
+
+	//! Sets the X coordinate
+	/*!
+	  \param x The x coordinate
+	 */
+	constexpr void SetX(const float x) noexcept;
+
+	//! Gets the Y coordinate
+	/*!
+	  \return The y coordinate
+	 */
+	[[nodiscard]] constexpr float GetY() const noexcept;
+
+	//! Sets the Y coordinate
+	/*!
+	  \param y The y coordinate
+	 */
+	constexpr void SetY(const float y) noexcept;
+
+	//! Gets the Z coordinate
+	/*!
+	  \return The z coordinate
+	 */
+	[[nodiscard]] constexpr float GetZ() const noexcept;
+
+	//! Sets the Z coordinate
+	/*!
+	  \param z The z coordinate
+	 */
+	constexpr void SetZ(const float z) noexcept;
+
+	// MARK: Member Functions
+
+	//! Returns the forward vector from the quaternion
+	/*!
+	  \return The forward vector of the quaternion
+	 */
+	[[nodiscard]] constexpr Vector3 GetForwardVector() const noexcept;
+
+	//! Returns the up vector from the quaternion
+	/*!
+	  \return The up vector fo the quaternion
+	 */
+	[[nodiscard]] constexpr Vector3 GetUpVector() const noexcept;
+
+	//! Returns the right vector from the quaternion
+	/*!
+	  \return The right vector of the quaternion
+	 */
+	[[nodiscard]] constexpr Vector3 GetRightVector() const noexcept;
+
+	[[nodiscard]] Vector3 GetEulerAngles() const;
+
+	// MARK: Operators
+
+	//! Operator to check for equality
+	constexpr bool operator==(const NiQuaternion& rot) const noexcept;
+
+	//! Operator to check for inequality
+	constexpr bool operator!=(const NiQuaternion& rot) const noexcept;
+
+	// MARK: Helper Functions
+
+	//! Look from a specific point in space to another point in space (Y-locked)
+	/*!
+	  \param sourcePoint The source location
+	  \param destPoint The destination location
+	  \return The Quaternion with the rotation towards the destination
+	 */
+	[[nodiscard]] static NiQuaternion LookAt(const NiPoint3& sourcePoint, const NiPoint3& destPoint);
+
+	//! Look from a specific point in space to another point in space
+	/*!
+	  \param sourcePoint The source location
+	  \param destPoint The destination location
+	  \return The Quaternion with the rotation towards the destination
+	 */
+	[[nodiscard]] static NiQuaternion LookAtUnlocked(const NiPoint3& sourcePoint, const NiPoint3& destPoint);
+
+	//! Creates a Quaternion from a specific axis and angle relative to that axis
+	/*!
+	  \param axis The axis that is used
+	  \param angle The angle relative to this axis
+	  \return A quaternion created from the axis and angle
+	 */
+	[[nodiscard]] static NiQuaternion CreateFromAxisAngle(const Vector3& axis, float angle);
+
+	[[nodiscard]] static NiQuaternion FromEulerAngles(const NiPoint3& eulerAngles);
 };
+
+// Static Variables
+namespace NiQuaternionConstant {
+	constexpr NiQuaternion IDENTITY(1, 0, 0, 0);
+}
+
+// Include constexpr and inline function definitions in a seperate file for readability
+#include "NiQuaternion.inl"
+
+#endif // !__NIQUATERNION_H__

dCommon/NiQuaternion.inl

@@ -0,0 +1,75 @@
+#pragma once
+#ifndef __NIQUATERNION_H__
+#error "This should only be included inline in NiQuaternion.h: Do not include directly!"
+#endif
+
+// MARK: Setters / Getters
+
+//! Gets the W coordinate
+constexpr float NiQuaternion::GetW() const noexcept {
+	return this->w;
+}
+
+//! Sets the W coordinate
+constexpr void NiQuaternion::SetW(const float w) noexcept {
+	this->w = w;
+}
+
+//! Gets the X coordinate
+constexpr float NiQuaternion::GetX() const noexcept {
+	return this->x;
+}
+
+//! Sets the X coordinate
+constexpr void NiQuaternion::SetX(const float x) noexcept {
+	this->x = x;
+}
+
+//! Gets the Y coordinate
+constexpr float NiQuaternion::GetY() const noexcept {
+	return this->y;
+}
+
+//! Sets the Y coordinate
+constexpr void NiQuaternion::SetY(const float y) noexcept {
+	this->y = y;
+}
+
+//! Gets the Z coordinate
+constexpr float NiQuaternion::GetZ() const noexcept {
+	return this->z;
+}
+
+//! Sets the Z coordinate
+constexpr void NiQuaternion::SetZ(const float z) noexcept {
+	this->z = z;
+}
+
+// MARK: Member Functions
+
+//! Returns the forward vector from the quaternion
+constexpr Vector3 NiQuaternion::GetForwardVector() const noexcept {
+	return Vector3(2 * (x * z + w * y), 2 * (y * z - w * x), 1 - 2 * (x * x + y * y));
+}
+
+//! Returns the up vector from the quaternion
+constexpr Vector3 NiQuaternion::GetUpVector() const noexcept {
+	return Vector3(2 * (x * y - w * z), 1 - 2 * (x * x + z * z), 2 * (y * z + w * x));
+}
+
+//! Returns the right vector from the quaternion
+constexpr Vector3 NiQuaternion::GetRightVector() const noexcept {
+	return Vector3(1 - 2 * (y * y + z * z), 2 * (x * y + w * z), 2 * (x * z - w * y));
+}
+
+// MARK: Operators
+
+//! Operator to check for equality
+constexpr bool NiQuaternion::operator==(const NiQuaternion& rot) const noexcept {
+	return rot.x == this->x && rot.y == this->y && rot.z == this->z && rot.w == this->w;
+}
+
+//! Operator to check for inequality
+constexpr bool NiQuaternion::operator!=(const NiQuaternion& rot) const noexcept {
+	return !(*this == rot);
+}

dCommon/PermissionMap.h

@@ -1,42 +0,0 @@
-#pragma once
-
-#include <cstdint>
-
-/**
- * Bitmap of permissions and restrictions for characters.
- */
-enum class PermissionMap : uint64_t
-{
-    /**
-     * Reserved for future use, bit 0-3.
-     */
-
-    /**
-     * The character has restricted trade acccess, bit 4.
-     */
-    RestrictedTradeAccess = 0x1 << 4,
-
-    /**
-     * The character has restricted mail access, bit 5.
-     */
-    RestrictedMailAccess = 0x1 << 5,
-
-    /**
-     * The character has restricted chat access, bit 6.
-     */
-    RestrictedChatAccess = 0x1 << 6,
-
-    //
-    // Combined permissions
-    //
-
-    /**
-     * The character is marked as 'old', restricted from trade and mail.
-     */
-    Old = RestrictedTradeAccess | RestrictedMailAccess,
-
-    /**
-     * The character is soft banned, restricted from trade, mail, and chat.
-     */
-    SoftBanned = RestrictedTradeAccess | RestrictedMailAccess | RestrictedChatAccess,
-};

dCommon/PositionUpdate.h

@@ -0,0 +1,36 @@
+#ifndef __POSITIONUPDATE__H__
+#define __POSITIONUPDATE__H__
+
+#include "NiPoint3.h"
+#include "NiQuaternion.h"
+
+
+struct RemoteInputInfo {
+	bool operator==(const RemoteInputInfo& other) {
+		return m_RemoteInputX == other.m_RemoteInputX && m_RemoteInputY == other.m_RemoteInputY && m_IsPowersliding == other.m_IsPowersliding && m_IsModified == other.m_IsModified;
+	}
+
+	float m_RemoteInputX = 0;
+	float m_RemoteInputY = 0;
+	bool m_IsPowersliding = false;
+	bool m_IsModified = false;
+};
+
+struct LocalSpaceInfo {
+	LWOOBJID objectId = LWOOBJID_EMPTY;
+	NiPoint3 position = NiPoint3Constant::ZERO;
+	NiPoint3 linearVelocity = NiPoint3Constant::ZERO;
+};
+
+struct PositionUpdate {
+	NiPoint3 position = NiPoint3Constant::ZERO;
+	NiQuaternion rotation = NiQuaternionConstant::IDENTITY;
+	bool onGround = false;
+	bool onRail = false;
+	NiPoint3 velocity = NiPoint3Constant::ZERO;
+	NiPoint3 angularVelocity = NiPoint3Constant::ZERO;
+	LocalSpaceInfo localSpaceInfo;
+	RemoteInputInfo remoteInputInfo;
+};
+
+#endif  //!__POSITIONUPDATE__H__

dCommon/SHA512.cpp

@@ -1,157 +0,0 @@
-#include "SHA512.h"
-
-#include <cstring>
-#include <fstream>
-
-const unsigned long long SHA512::sha512_k[80] = //ULL = uint64
-{ 0x428a2f98d728ae22ULL, 0x7137449123ef65cdULL,
-    0xb5c0fbcfec4d3b2fULL, 0xe9b5dba58189dbbcULL,
-    0x3956c25bf348b538ULL, 0x59f111f1b605d019ULL,
-    0x923f82a4af194f9bULL, 0xab1c5ed5da6d8118ULL,
-    0xd807aa98a3030242ULL, 0x12835b0145706fbeULL,
-    0x243185be4ee4b28cULL, 0x550c7dc3d5ffb4e2ULL,
-    0x72be5d74f27b896fULL, 0x80deb1fe3b1696b1ULL,
-    0x9bdc06a725c71235ULL, 0xc19bf174cf692694ULL,
-    0xe49b69c19ef14ad2ULL, 0xefbe4786384f25e3ULL,
-    0x0fc19dc68b8cd5b5ULL, 0x240ca1cc77ac9c65ULL,
-    0x2de92c6f592b0275ULL, 0x4a7484aa6ea6e483ULL,
-    0x5cb0a9dcbd41fbd4ULL, 0x76f988da831153b5ULL,
-    0x983e5152ee66dfabULL, 0xa831c66d2db43210ULL,
-    0xb00327c898fb213fULL, 0xbf597fc7beef0ee4ULL,
-    0xc6e00bf33da88fc2ULL, 0xd5a79147930aa725ULL,
-    0x06ca6351e003826fULL, 0x142929670a0e6e70ULL,
-    0x27b70a8546d22ffcULL, 0x2e1b21385c26c926ULL,
-    0x4d2c6dfc5ac42aedULL, 0x53380d139d95b3dfULL,
-    0x650a73548baf63deULL, 0x766a0abb3c77b2a8ULL,
-    0x81c2c92e47edaee6ULL, 0x92722c851482353bULL,
-    0xa2bfe8a14cf10364ULL, 0xa81a664bbc423001ULL,
-    0xc24b8b70d0f89791ULL, 0xc76c51a30654be30ULL,
-    0xd192e819d6ef5218ULL, 0xd69906245565a910ULL,
-    0xf40e35855771202aULL, 0x106aa07032bbd1b8ULL,
-    0x19a4c116b8d2d0c8ULL, 0x1e376c085141ab53ULL,
-    0x2748774cdf8eeb99ULL, 0x34b0bcb5e19b48a8ULL,
-    0x391c0cb3c5c95a63ULL, 0x4ed8aa4ae3418acbULL,
-    0x5b9cca4f7763e373ULL, 0x682e6ff3d6b2b8a3ULL,
-    0x748f82ee5defb2fcULL, 0x78a5636f43172f60ULL,
-    0x84c87814a1f0ab72ULL, 0x8cc702081a6439ecULL,
-    0x90befffa23631e28ULL, 0xa4506cebde82bde9ULL,
-    0xbef9a3f7b2c67915ULL, 0xc67178f2e372532bULL,
-    0xca273eceea26619cULL, 0xd186b8c721c0c207ULL,
-    0xeada7dd6cde0eb1eULL, 0xf57d4f7fee6ed178ULL,
-    0x06f067aa72176fbaULL, 0x0a637dc5a2c898a6ULL,
-    0x113f9804bef90daeULL, 0x1b710b35131c471bULL,
-    0x28db77f523047d84ULL, 0x32caab7b40c72493ULL,
-    0x3c9ebe0a15c9bebcULL, 0x431d67c49c100d4cULL,
-    0x4cc5d4becb3e42b6ULL, 0x597f299cfc657e2aULL,
-    0x5fcb6fab3ad6faecULL, 0x6c44198c4a475817ULL };
-
-void SHA512::transform(const unsigned char *message, unsigned int block_nb)
-{
-    uint64 w[80];
-    uint64 wv[8];
-    uint64 t1, t2;
-    const unsigned char *sub_block;
-    int i, j;
-    for (i = 0; i < (int)block_nb; i++) {
-        sub_block = message + (i << 7);
-        for (j = 0; j < 16; j++) {
-            SHA2_PACK64(&sub_block[j << 3], &w[j]);
-        }
-        for (j = 16; j < 80; j++) {
-            w[j] = SHA512_F4(w[j - 2]) + w[j - 7] + SHA512_F3(w[j - 15]) + w[j - 16];
-        }
-        for (j = 0; j < 8; j++) {
-            wv[j] = m_h[j];
-        }
-        for (j = 0; j < 80; j++) {
-            t1 = wv[7] + SHA512_F2(wv[4]) + SHA2_CH(wv[4], wv[5], wv[6])
-            + sha512_k[j] + w[j];
-            t2 = SHA512_F1(wv[0]) + SHA2_MAJ(wv[0], wv[1], wv[2]);
-            wv[7] = wv[6];
-            wv[6] = wv[5];
-            wv[5] = wv[4];
-            wv[4] = wv[3] + t1;
-            wv[3] = wv[2];
-            wv[2] = wv[1];
-            wv[1] = wv[0];
-            wv[0] = t1 + t2;
-        }
-        for (j = 0; j < 8; j++) {
-            m_h[j] += wv[j];
-        }
-        
-    }
-}
-
-void SHA512::init()
-{
-    m_h[0] = 0x6a09e667f3bcc908ULL;
-    m_h[1] = 0xbb67ae8584caa73bULL;
-    m_h[2] = 0x3c6ef372fe94f82bULL;
-    m_h[3] = 0xa54ff53a5f1d36f1ULL;
-    m_h[4] = 0x510e527fade682d1ULL;
-    m_h[5] = 0x9b05688c2b3e6c1fULL;
-    m_h[6] = 0x1f83d9abfb41bd6bULL;
-    m_h[7] = 0x5be0cd19137e2179ULL;
-    m_len = 0;
-    m_tot_len = 0;
-}
-
-void SHA512::update(const unsigned char *message, unsigned int len)
-{
-    unsigned int block_nb;
-    unsigned int new_len, rem_len, tmp_len;
-    const unsigned char *shifted_message;
-    tmp_len = SHA384_512_BLOCK_SIZE - m_len;
-    rem_len = len < tmp_len ? len : tmp_len;
-    memcpy(&m_block[m_len], message, rem_len);
-    if (m_len + len < SHA384_512_BLOCK_SIZE) {
-        m_len += len;
-        return;
-    }
-    new_len = len - rem_len;
-    block_nb = new_len / SHA384_512_BLOCK_SIZE;
-    shifted_message = message + rem_len;
-    transform(m_block, 1);
-    transform(shifted_message, block_nb);
-    rem_len = new_len % SHA384_512_BLOCK_SIZE;
-    memcpy(m_block, &shifted_message[block_nb << 7], rem_len);
-    m_len = rem_len;
-    m_tot_len += (block_nb + 1) << 7;
-}
-
-void SHA512::final(unsigned char *digest)
-{
-    unsigned int block_nb;
-    unsigned int pm_len;
-    unsigned int len_b;
-    int i;
-    block_nb = 1 + ((SHA384_512_BLOCK_SIZE - 17)
-                    < (m_len % SHA384_512_BLOCK_SIZE));
-    len_b = (m_tot_len + m_len) << 3;
-    pm_len = block_nb << 7;
-    memset(m_block + m_len, 0, pm_len - m_len);
-    m_block[m_len] = 0x80;
-    SHA2_UNPACK32(len_b, m_block + pm_len - 4);
-    transform(m_block, block_nb);
-    for (i = 0; i < 8; i++) {
-        SHA2_UNPACK64(m_h[i], &digest[i << 3]);
-    }
-}
-
-std::string sha512(std::string input)
-{
-    unsigned char digest[SHA512::DIGEST_SIZE];
-    memset(digest, 0, SHA512::DIGEST_SIZE);
-    class SHA512 ctx;
-    ctx.init();
-    ctx.update((unsigned char*)input.c_str(), input.length());
-    ctx.final(digest);
-
-    char buf[2 * SHA512::DIGEST_SIZE + 1];
-    buf[2 * SHA512::DIGEST_SIZE] = 0;
-    for (int i = 0; i < SHA512::DIGEST_SIZE; i++)
-        sprintf(buf + i * 2, "%02x", digest[i]);
-
-    return std::string(buf);
-}

dCommon/SHA512.h

@@ -1,68 +0,0 @@
-#pragma once
-
-// C++
-#include <string>
-
-class SHA512 {
-protected:
-    typedef unsigned char uint8;
-    typedef unsigned int uint32;
-    typedef unsigned long long uint64;
-    
-    const static uint64 sha512_k[];
-    static const unsigned int SHA384_512_BLOCK_SIZE = (1024 / 8);
-    
-public:
-    void init();
-    void update(const unsigned char *message, unsigned int len);
-    void final(unsigned char *digest);
-    static const unsigned int DIGEST_SIZE = (512 / 8);
-    
-protected:
-    void transform(const unsigned char *message, unsigned int block_nb);
-    unsigned int m_tot_len;
-    unsigned int m_len;
-    unsigned char m_block[2 * SHA384_512_BLOCK_SIZE];
-    uint64 m_h[8];
-};
-
-std::string sha512(std::string input);
-
-#define SHA2_SHFR(x, n)    (x >> n)
-#define SHA2_ROTR(x, n)   ((x >> n) | (x << ((sizeof(x) << 3) - n)))
-#define SHA2_ROTL(x, n)   ((x << n) | (x >> ((sizeof(x) << 3) - n)))
-#define SHA2_CH(x, y, z)  ((x & y) ^ (~x & z))
-#define SHA2_MAJ(x, y, z) ((x & y) ^ (x & z) ^ (y & z))
-#define SHA512_F1(x) (SHA2_ROTR(x, 28) ^ SHA2_ROTR(x, 34) ^ SHA2_ROTR(x, 39))
-#define SHA512_F2(x) (SHA2_ROTR(x, 14) ^ SHA2_ROTR(x, 18) ^ SHA2_ROTR(x, 41))
-#define SHA512_F3(x) (SHA2_ROTR(x,  1) ^ SHA2_ROTR(x,  8) ^ SHA2_SHFR(x,  7))
-#define SHA512_F4(x) (SHA2_ROTR(x, 19) ^ SHA2_ROTR(x, 61) ^ SHA2_SHFR(x,  6))
-#define SHA2_UNPACK32(x, str)                 \
-{                                             \
-*((str) + 3) = (uint8) ((x)      );       \
-*((str) + 2) = (uint8) ((x) >>  8);       \
-*((str) + 1) = (uint8) ((x) >> 16);       \
-*((str) + 0) = (uint8) ((x) >> 24);       \
-}
-#define SHA2_UNPACK64(x, str)                 \
-{                                             \
-*((str) + 7) = (uint8) ((x)      );       \
-*((str) + 6) = (uint8) ((x) >>  8);       \
-*((str) + 5) = (uint8) ((x) >> 16);       \
-*((str) + 4) = (uint8) ((x) >> 24);       \
-*((str) + 3) = (uint8) ((x) >> 32);       \
-*((str) + 2) = (uint8) ((x) >> 40);       \
-*((str) + 1) = (uint8) ((x) >> 48);       \
-*((str) + 0) = (uint8) ((x) >> 56);       \
-}
-#define SHA2_PACK64(str, x)                   \
-{                                             \
-*(x) =   ((uint64) *((str) + 7)      )    \
-| ((uint64) *((str) + 6) <<  8)    \
-| ((uint64) *((str) + 5) << 16)    \
-| ((uint64) *((str) + 4) << 24)    \
-| ((uint64) *((str) + 3) << 32)    \
-| ((uint64) *((str) + 2) << 40)    \
-| ((uint64) *((str) + 1) << 48)    \
-| ((uint64) *((str) + 0) << 56);   \
-}

dCommon/Singleton.h

@@ -16,4 +16,4 @@ public:
 
 protected:
 	Singleton() = default;
-};
+};

dCommon/Type.cpp

@@ -1,27 +0,0 @@
-#include "Type.h"
-#ifdef __GNUG__
-#include <cstdlib>
-#include <memory>
-#include <cxxabi.h>
-
-std::string demangle(const char* name) {
-
-    int status = -4; // some arbitrary value to eliminate the compiler warning
-
-    // enable c++11 by passing the flag -std=c++11 to g++
-    std::unique_ptr<char, void(*)(void*)> res {
-        abi::__cxa_demangle(name, NULL, NULL, &status),
-        std::free
-    };
-
-    return (status==0) ? res.get() : name ;
-}
-
-#else
-
-// does nothing if not g++
-std::string demangle(const char* name) {
-    return name;
-}
-
-#endif

dCommon/Type.h

@@ -1,12 +0,0 @@
-#pragma once
-
-#include <string>
-#include <typeinfo>
-
-std::string demangle(const char* name);
-
-template <class T>
-std::string type(const T& t) {
-
-    return demangle(typeid(t).name());
-}

dCommon/ZCompression.cpp

@@ -1,73 +1,50 @@
-#include "ZCompression.h"
+#include "ZCompression.h"
 
-#include <zlib.h>
+#include "zlib.h"
 
-namespace ZCompression
-{
-    int32_t GetMaxCompressedLength(int32_t nLenSrc)
-    {
-        int32_t n16kBlocks = (nLenSrc + 16383) / 16384; // round up any fraction of a block
-        return (nLenSrc + 6 + (n16kBlocks * 5));
-    }
+namespace ZCompression {
+	int32_t GetMaxCompressedLength(int32_t nLenSrc) {
+		int32_t n16kBlocks = (nLenSrc + 16383) / 16384; // round up any fraction of a block
+		return (nLenSrc + 6 + (n16kBlocks * 5));
+	}
 
-    int32_t Compress(const uint8_t* abSrc, int32_t nLenSrc, uint8_t* abDst, int32_t nLenDst)
-    {
-        z_stream zInfo = { 0 };
-        zInfo.total_in = zInfo.avail_in = nLenSrc;
-        zInfo.total_out = zInfo.avail_out = nLenDst;
-        zInfo.next_in = const_cast<Bytef*>(abSrc);
-        zInfo.next_out = abDst;
+	int32_t Compress(const uint8_t* abSrc, int32_t nLenSrc, uint8_t* abDst, int32_t nLenDst) {
+		z_stream zInfo = { 0 };
+		zInfo.total_in = zInfo.avail_in = nLenSrc;
+		zInfo.total_out = zInfo.avail_out = nLenDst;
+		zInfo.next_in = const_cast<Bytef*>(abSrc);
+		zInfo.next_out = abDst;
 
-        int nErr, nRet = -1;
-        nErr = deflateInit(&zInfo, Z_DEFAULT_COMPRESSION); // zlib function
-        if (nErr == Z_OK) {
-            nErr = deflate(&zInfo, Z_FINISH);              // zlib function
-            if (nErr == Z_STREAM_END) {
-                nRet = zInfo.total_out;
-            }
-        }
-        deflateEnd(&zInfo);    // zlib function
-        return(nRet);
+		int nErr, nRet = -1;
+		nErr = deflateInit(&zInfo, Z_DEFAULT_COMPRESSION); // zlib function
+		if (nErr == Z_OK) {
+			nErr = deflate(&zInfo, Z_FINISH);              // zlib function
+			if (nErr == Z_STREAM_END) {
+				nRet = zInfo.total_out;
+			}
+		}
+		deflateEnd(&zInfo);    // zlib function
+		return(nRet);
+	}
 
-    }
+	int32_t Decompress(const uint8_t* abSrc, int32_t nLenSrc, uint8_t* abDst, int32_t nLenDst, int32_t& nErr) {
+		// Get the size of the decompressed data
+		z_stream zInfo = { 0 };
+		zInfo.total_in = zInfo.avail_in = nLenSrc;
+		zInfo.total_out = zInfo.avail_out = nLenDst;
+		zInfo.next_in = const_cast<Bytef*>(abSrc);
+		zInfo.next_out = abDst;
 
-    int32_t Decompress(const uint8_t* abSrc, int32_t nLenSrc, uint8_t* abDst, int32_t nLenDst, int32_t& nErr)
-    {
-        // Get the size of the decompressed data
-        z_stream zInfo = { 0 };
-        zInfo.total_in = zInfo.avail_in = nLenSrc;
-        zInfo.total_out = zInfo.avail_out = nLenDst;
-        zInfo.next_in = const_cast<Bytef*>(abSrc);
-        zInfo.next_out = abDst;
+		int nRet = -1;
+		nErr = inflateInit(&zInfo); // zlib function
+		if (nErr == Z_OK) {
+			nErr = inflate(&zInfo, Z_FINISH); // zlib function
+			if (nErr == Z_STREAM_END) {
+				nRet = zInfo.total_out;
+			}
+		}
+		inflateEnd(&zInfo); // zlib function
+		return(nRet);
+	}
+}
 
-        int nRet = -1;
-        nErr = inflateInit(&zInfo); // zlib function
-        if (nErr == Z_OK) {
-            nErr = inflate(&zInfo, Z_FINISH); // zlib function
-            if (nErr == Z_STREAM_END) {
-                nRet = zInfo.total_out;
-            }
-        }
-        inflateEnd(&zInfo); // zlib function
-        return(nRet);
-        
-        /*
-        z_stream zInfo = { 0 };
-        zInfo.total_in = zInfo.avail_in = nLenSrc;
-        zInfo.total_out = zInfo.avail_out = nLenDst;
-        zInfo.next_in = const_cast<Bytef*>(abSrc);
-        zInfo.next_out = const_cast<Bytef*>(abDst);
-
-        int nRet = -1;
-        nErr = inflateInit(&zInfo);               // zlib function
-        if (nErr == Z_OK) {
-            nErr = inflate(&zInfo, Z_FINISH);     // zlib function
-            if (nErr == Z_STREAM_END) {
-                nRet = zInfo.total_out;
-            }
-        }
-        inflateEnd(&zInfo);   // zlib function
-        return(nRet); // -1 or len of output
-        */
-    }
-}

dCommon/ZCompression.h

@@ -1,12 +1,18 @@
-#pragma once
+#pragma once
 
 #include <cstdint>
 
-namespace ZCompression
-{
+namespace ZCompression {
 	int32_t GetMaxCompressedLength(int32_t nLenSrc);
 
 	int32_t Compress(const uint8_t* abSrc, int32_t nLenSrc, uint8_t* abDst, int32_t nLenDst);
 
 	int32_t Decompress(const uint8_t* abSrc, int32_t nLenSrc, uint8_t* abDst, int32_t nLenDst, int32_t& nErr);
+
+	/**
+	 * @brief Max size of an inflated sd0 zlib chunk
+	 *
+	 */
+	constexpr uint32_t MAX_SD0_CHUNK_SIZE = 1024 * 256;
 }
+

dCommon/dClient/AssetManager.cpp

@@ -0,0 +1,182 @@
+#include <filesystem>
+
+#include "AssetManager.h"
+#include "Game.h"
+#include "Logger.h"
+
+#include "zlib.h"
+
+AssetManager::AssetManager(const std::filesystem::path& path) {
+	if (!std::filesystem::is_directory(path)) {
+		throw std::runtime_error("Attempted to load asset bundle (" + path.string() + ") however it is not a valid directory.");
+	}
+
+	m_Path = path;
+
+	if (std::filesystem::exists(m_Path / "client") && std::filesystem::exists(m_Path / "versions")) {
+		m_AssetBundleType = eAssetBundleType::Packed;
+
+		m_RootPath = m_Path;
+		m_ResPath = (m_Path / "client" / "res");
+	} else if (std::filesystem::exists(m_Path / ".." / "versions") && std::filesystem::exists(m_Path / "res")) {
+		m_AssetBundleType = eAssetBundleType::Packed;
+
+		m_RootPath = (m_Path / "..");
+		m_ResPath = (m_Path / "res");
+	} else if (std::filesystem::exists(m_Path / "pack") && std::filesystem::exists(m_Path / ".." / ".." / "versions")) {
+		m_AssetBundleType = eAssetBundleType::Packed;
+
+		m_RootPath = (m_Path / ".." / "..");
+		m_ResPath = m_Path;
+	} else if ((std::filesystem::exists(m_Path / "res" / "cdclient.fdb") || std::filesystem::exists(m_Path / "res" / "CDServer.sqlite")) && !std::filesystem::exists(m_Path / "res" / "pack")) {
+		m_AssetBundleType = eAssetBundleType::Unpacked;
+
+		m_ResPath = (m_Path / "res");
+	} else if ((std::filesystem::exists(m_Path / "cdclient.fdb") || std::filesystem::exists(m_Path / "CDServer.sqlite")) && !std::filesystem::exists(m_Path / "pack")) {
+		m_AssetBundleType = eAssetBundleType::Unpacked;
+
+		m_ResPath = m_Path;
+	}
+
+	if (m_AssetBundleType == eAssetBundleType::None) {
+		throw std::runtime_error("Failed to identify client type, cannot read client data.");
+	}
+
+	switch (m_AssetBundleType) {
+		case eAssetBundleType::Packed: {
+			this->LoadPackIndex();
+			break;
+		}
+		case eAssetBundleType::None:
+		case eAssetBundleType::Unpacked: {
+			break;
+		}
+	}
+}
+
+void AssetManager::LoadPackIndex() {
+	m_PackIndex = new PackIndex(m_RootPath);
+}
+
+std::filesystem::path AssetManager::GetResPath() {
+	return m_ResPath;
+}
+
+eAssetBundleType AssetManager::GetAssetBundleType() {
+	return m_AssetBundleType;
+}
+
+bool AssetManager::HasFile(const char* name) {
+	auto fixedName = std::string(name);
+	std::transform(fixedName.begin(), fixedName.end(), fixedName.begin(), [](uint8_t c) { return std::tolower(c); });
+
+	// Special case for unpacked client have BrickModels in upper case
+	if (this->m_AssetBundleType == eAssetBundleType::Unpacked) GeneralUtils::ReplaceInString(fixedName, "brickmodels", "BrickModels");
+
+	std::replace(fixedName.begin(), fixedName.end(), '\\', '/');
+	if (std::filesystem::exists(m_ResPath / fixedName)) return true;
+
+	if (this->m_AssetBundleType == eAssetBundleType::Unpacked) return false;
+
+	std::replace(fixedName.begin(), fixedName.end(), '/', '\\');
+	if (fixedName.rfind("client\\res\\", 0) != 0) fixedName = "client\\res\\" + fixedName;
+
+	uint32_t crc = crc32b(0xFFFFFFFF, reinterpret_cast<uint8_t*>(const_cast<char*>(fixedName.c_str())), fixedName.size());
+	crc = crc32b(crc, reinterpret_cast<Bytef*>(const_cast<char*>("\0\0\0\0")), 4);
+
+	for (const auto& item : this->m_PackIndex->GetPackFileIndices()) {
+		if (item.m_Crc == crc) {
+			return true;
+		}
+	}
+
+	return false;
+}
+
+bool AssetManager::GetFile(const char* name, char** data, uint32_t* len) {
+	auto fixedName = std::string(name);
+	std::transform(fixedName.begin(), fixedName.end(), fixedName.begin(), [](uint8_t c) { return std::tolower(c); });
+	std::replace(fixedName.begin(), fixedName.end(), '\\', '/'); // On the off chance someone has the wrong slashes, force forward slashes
+
+	// Special case for unpacked client have BrickModels in upper case
+	if (this->m_AssetBundleType == eAssetBundleType::Unpacked) GeneralUtils::ReplaceInString(fixedName, "brickmodels", "BrickModels");
+
+	if (std::filesystem::exists(m_ResPath / fixedName)) {
+		FILE* file;
+#ifdef _WIN32
+		fopen_s(&file, (m_ResPath / fixedName).string().c_str(), "rb");
+#elif __APPLE__
+		// macOS has 64bit file IO by default
+		file = fopen((m_ResPath / fixedName).string().c_str(), "rb");
+#else
+		file = fopen64((m_ResPath / fixedName).string().c_str(), "rb");
+#endif
+		fseek(file, 0, SEEK_END);
+		*len = ftell(file);
+		*data = static_cast<char*>(malloc(*len));
+		fseek(file, 0, SEEK_SET);
+		int32_t readInData = fread(*data, sizeof(uint8_t), *len, file);
+		fclose(file);
+
+		return true;
+	}
+
+	if (this->m_AssetBundleType == eAssetBundleType::Unpacked) return false;
+
+	// The crc in side of the pack always uses backslashes, so we need to convert them again...
+	std::replace(fixedName.begin(), fixedName.end(), '/', '\\');
+	if (fixedName.rfind("client\\res\\", 0) != 0) {
+		fixedName = "client\\res\\" + fixedName;
+	}
+	int32_t packIndex = -1;
+	uint32_t crc = crc32b(0xFFFFFFFF, reinterpret_cast<uint8_t*>(const_cast<char*>(fixedName.c_str())), fixedName.size());
+	crc = crc32b(crc, reinterpret_cast<Bytef*>(const_cast<char*>("\0\0\0\0")), 4);
+
+	for (const auto& item : this->m_PackIndex->GetPackFileIndices()) {
+		if (item.m_Crc == crc) {
+			packIndex = item.m_PackFileIndex;
+			crc = item.m_Crc;
+			break;
+		}
+	}
+
+	if (packIndex == -1 || !crc) {
+		return false;
+	}
+
+	auto packs = this->m_PackIndex->GetPacks();
+	auto* pack = packs.at(packIndex);
+
+	bool success = pack->ReadFileFromPack(crc, data, len);
+
+	return success;
+}
+
+AssetStream AssetManager::GetFile(const char* name) {
+	char* buf; uint32_t len;
+
+	bool success = this->GetFile(name, &buf, &len);
+
+	return AssetStream(buf, len, success);
+}
+
+uint32_t AssetManager::crc32b(uint32_t base, uint8_t* message, size_t l) {
+	size_t i, j;
+	uint32_t crc, msb;
+
+	crc = base;
+	for (i = 0; i < l; i++) {
+		// xor next byte to upper bits of crc
+		crc ^= (static_cast<unsigned int>(message[i]) << 24);
+		for (j = 0; j < 8; j++) { // Do eight times.
+			msb = crc >> 31;
+			crc <<= 1;
+			crc ^= (0 - msb) & 0x04C11DB7;
+		}
+	}
+	return crc; // don't complement crc on output
+}
+
+AssetManager::~AssetManager() {
+	delete m_PackIndex;
+}

dCommon/dClient/AssetManager.h

@@ -0,0 +1,89 @@
+#pragma once
+
+#include <string>
+#include <vector>
+#include <unordered_map>
+#include <filesystem>
+
+#include "Pack.h"
+#include "PackIndex.h"
+
+enum class eAssetBundleType {
+	None,
+	Unpacked,
+	Packed
+};
+
+struct AssetMemoryBuffer : std::streambuf {
+	char* m_Base;
+	bool m_Success;
+
+	AssetMemoryBuffer(char* base, std::ptrdiff_t n, bool success) {
+		m_Base = base;
+		m_Success = success;
+		if (!m_Success) return;
+		this->setg(base, base, base + n);
+	}
+
+	~AssetMemoryBuffer() {
+		if (m_Success) free(m_Base);
+	}
+
+	pos_type seekpos(pos_type sp, std::ios_base::openmode which) override {
+		return seekoff(sp - pos_type(off_type(0)), std::ios_base::beg, which);
+	}
+
+	pos_type seekoff(off_type off,
+		std::ios_base::seekdir dir,
+		std::ios_base::openmode which = std::ios_base::in) override {
+		if (dir == std::ios_base::cur)
+			gbump(off);
+		else if (dir == std::ios_base::end)
+			setg(eback(), egptr() + off, egptr());
+		else if (dir == std::ios_base::beg)
+			setg(eback(), eback() + off, egptr());
+		return gptr() - eback();
+	}
+};
+
+struct AssetStream : std::istream {
+	AssetStream(char* base, std::ptrdiff_t n, bool success) : std::istream(new AssetMemoryBuffer(base, n, success)) {}
+
+	~AssetStream() {
+		delete rdbuf();
+	}
+
+	operator bool() {
+		return reinterpret_cast<AssetMemoryBuffer*>(rdbuf())->m_Success;
+	}
+};
+
+class AssetManager {
+public:
+	AssetManager(const std::filesystem::path& path);
+	~AssetManager();
+
+	std::filesystem::path GetResPath();
+	eAssetBundleType GetAssetBundleType();
+
+	bool HasFile(const char* name);
+	bool GetFile(const char* name, char** data, uint32_t* len);
+	AssetStream GetFile(const char* name);
+
+private:
+	void LoadPackIndex();
+
+	// Modified crc algorithm (mpeg2)
+	// Reference: https://stackoverflow.com/questions/54339800/how-to-modify-crc-32-to-crc-32-mpeg-2
+	inline uint32_t crc32b(uint32_t base, uint8_t* message, size_t l);
+
+	bool m_SuccessfullyLoaded;
+
+	std::filesystem::path m_Path;
+	std::filesystem::path m_RootPath;
+	std::filesystem::path m_ResPath;
+
+	eAssetBundleType m_AssetBundleType = eAssetBundleType::None;
+
+	PackIndex* m_PackIndex;
+};

dCommon/dClient/CMakeLists.txt

@@ -0,0 +1,6 @@
+set(DCOMMON_DCLIENT_SOURCES
+	"AssetManager.cpp"
+	"PackIndex.cpp"
+	"Pack.cpp"
+	PARENT_SCOPE
+)

dCommon/dClient/ClientVersion.h

@@ -0,0 +1,12 @@
+#ifndef __CLIENTVERSION_H__
+#define __CLIENTVERSION_H__
+
+#include <cstdint>
+
+namespace ClientVersion {
+	constexpr uint16_t major = 1;
+	constexpr uint16_t current = 10;
+	constexpr uint16_t minor = 64;
+}
+
+#endif // !__CLIENTVERSION_H__

dCommon/dClient/Pack.cpp

@@ -0,0 +1,119 @@
+#include "Pack.h"
+
+#include "BinaryIO.h"
+#include "ZCompression.h"
+
+Pack::Pack(const std::filesystem::path& filePath) {
+	m_FilePath = filePath;
+
+	if (!std::filesystem::exists(filePath)) {
+		return;
+	}
+
+	m_FileStream = std::ifstream(filePath, std::ios::in | std::ios::binary);
+
+	m_FileStream.read(m_Version, 7);
+
+	m_FileStream.seekg(-8, std::ios::end); // move file pointer to 8 bytes before the end (location of the address of the record count)
+
+	uint32_t recordCountPos = 0;
+	BinaryIO::BinaryRead<uint32_t>(m_FileStream, recordCountPos);
+
+	m_FileStream.seekg(recordCountPos, std::ios::beg);
+
+	BinaryIO::BinaryRead<uint32_t>(m_FileStream, m_RecordCount);
+
+	for (int i = 0; i < m_RecordCount; i++) {
+		PackRecord record;
+		BinaryIO::BinaryRead<PackRecord>(m_FileStream, record);
+
+		m_Records.push_back(record);
+	}
+
+	m_FileStream.close();
+}
+
+bool Pack::HasFile(uint32_t crc) {
+	for (const auto& record : m_Records) {
+		if (record.m_Crc == crc) {
+			return true;
+		}
+	}
+
+	return false;
+}
+
+bool Pack::ReadFileFromPack(uint32_t crc, char** data, uint32_t* len) {
+	// Time for some wacky C file reading for speed reasons
+
+	PackRecord pkRecord{};
+
+	for (const auto& record : m_Records) {
+		if (record.m_Crc == crc) {
+			pkRecord = record;
+			break;
+		}
+	}
+
+	if (pkRecord.m_Crc == 0) return false;
+
+	size_t pos = 0;
+	pos += pkRecord.m_FilePointer;
+
+	bool isCompressed = (pkRecord.m_IsCompressed & 0xff) > 0;
+	auto inPackSize = isCompressed ? pkRecord.m_CompressedSize : pkRecord.m_UncompressedSize;
+
+	FILE* file;
+#ifdef _WIN32
+	fopen_s(&file, m_FilePath.string().c_str(), "rb");
+#elif __APPLE__
+	// macOS has 64bit file IO by default
+	file = fopen(m_FilePath.string().c_str(), "rb");
+#else
+	file = fopen64(m_FilePath.string().c_str(), "rb");
+#endif
+
+	fseek(file, pos, SEEK_SET);
+
+	if (!isCompressed) {
+		char* tempData = static_cast<char*>(malloc(pkRecord.m_UncompressedSize));
+		int32_t readInData = fread(tempData, sizeof(uint8_t), pkRecord.m_UncompressedSize, file);
+
+		*data = tempData;
+		*len = pkRecord.m_UncompressedSize;
+		fclose(file);
+
+		return true;
+	}
+
+	pos += 5; // skip header
+
+	fseek(file, pos, SEEK_SET);
+
+	char* decompressedData = static_cast<char*>(malloc(pkRecord.m_UncompressedSize));
+	uint32_t currentReadPos = 0;
+
+	while (true) {
+		if (currentReadPos >= pkRecord.m_UncompressedSize) break;
+
+		uint32_t size;
+		int32_t readInData = fread(&size, sizeof(uint32_t), 1, file);
+		pos += 4; // Move pointer position 4 to the right
+
+		char* chunk = static_cast<char*>(malloc(size));
+		int32_t readInData2 = fread(chunk, sizeof(int8_t), size, file);
+		pos += size; // Move pointer position the amount of bytes read to the right
+
+		int32_t err;
+		currentReadPos += ZCompression::Decompress(reinterpret_cast<uint8_t*>(chunk), size, reinterpret_cast<uint8_t*>(decompressedData + currentReadPos), ZCompression::MAX_SD0_CHUNK_SIZE, err);
+
+		free(chunk);
+	}
+
+	*data = decompressedData;
+	*len = pkRecord.m_UncompressedSize;
+
+	fclose(file);
+
+	return true;
+}

dCommon/dClient/Pack.h

@@ -0,0 +1,39 @@
+#pragma once
+
+#include <vector>
+#include <string>
+#include <filesystem>
+#include <fstream>
+
+#pragma pack(push, 1)
+struct PackRecord {
+	uint32_t m_Crc;
+	int32_t m_LowerCrc;
+	int32_t m_UpperCrc;
+	uint32_t m_UncompressedSize;
+	char m_UncompressedHash[32];
+	uint32_t m_Padding1;
+	uint32_t m_CompressedSize;
+	char m_CompressedHash[32];
+	uint32_t m_Padding2;
+	uint32_t m_FilePointer;
+	uint32_t m_IsCompressed; // u32 bool
+};
+#pragma pack(pop)
+
+class Pack {
+public:
+	Pack(const std::filesystem::path& filePath);
+	~Pack() = default;
+
+	bool HasFile(uint32_t crc);
+	bool ReadFileFromPack(uint32_t crc, char** data, uint32_t* len);
+private:
+	std::ifstream m_FileStream;
+	std::filesystem::path m_FilePath;
+
+	char m_Version[7];
+
+	uint32_t m_RecordCount;
+	std::vector<PackRecord> m_Records;
+};

dCommon/dClient/PackIndex.cpp

@@ -0,0 +1,43 @@
+#include "PackIndex.h"
+#include "BinaryIO.h"
+#include "Game.h"
+#include "Logger.h"
+
+PackIndex::PackIndex(const std::filesystem::path& filePath) {
+	m_FileStream = std::ifstream(filePath / "versions" / "primary.pki", std::ios::in | std::ios::binary);
+
+	BinaryIO::BinaryRead<uint32_t>(m_FileStream, m_Version);
+	BinaryIO::BinaryRead<uint32_t>(m_FileStream, m_PackPathCount);
+	
+	m_PackPaths.resize(m_PackPathCount);
+	for (auto& item : m_PackPaths) {
+		BinaryIO::ReadString<uint32_t>(m_FileStream, item, BinaryIO::ReadType::String);
+	}
+
+	BinaryIO::BinaryRead<uint32_t>(m_FileStream, m_PackFileIndexCount);
+
+	for (int i = 0; i < m_PackFileIndexCount; i++) {
+		PackFileIndex packFileIndex;
+		BinaryIO::BinaryRead<PackFileIndex>(m_FileStream, packFileIndex);
+
+		m_PackFileIndices.push_back(packFileIndex);
+	}
+
+	LOG("Loaded pack catalog with %i pack files and %i files", m_PackPaths.size(), m_PackFileIndices.size());
+
+	for (auto& item : m_PackPaths) {
+		std::replace(item.begin(), item.end(), '\\', '/');
+
+		auto* pack = new Pack(filePath / item);
+
+		m_Packs.push_back(pack);
+	}
+
+	m_FileStream.close();
+}
+
+PackIndex::~PackIndex() {
+	for (const auto* item : m_Packs) {
+		delete item;
+	}
+}

dCommon/dClient/PackIndex.h

@@ -0,0 +1,40 @@
+#pragma once
+
+#include <cstdint>
+
+#include <string>
+#include <vector>
+#include <filesystem>
+
+#include "Pack.h"
+
+#pragma pack(push, 1)
+struct PackFileIndex {
+	uint32_t m_Crc;
+	int32_t m_LowerCrc;
+	int32_t m_UpperCrc;
+	uint32_t m_PackFileIndex;
+	uint32_t m_IsCompressed; // u32 bool?
+};
+#pragma pack(pop)
+
+class PackIndex {
+public:
+	PackIndex(const std::filesystem::path& filePath);
+	~PackIndex();
+
+	const std::vector<std::string>& GetPackPaths() { return m_PackPaths; }
+	const std::vector<PackFileIndex>& GetPackFileIndices() { return m_PackFileIndices; }
+	const std::vector<Pack*>& GetPacks() { return m_Packs; }
+private:
+	std::ifstream m_FileStream;
+
+	uint32_t m_Version;
+
+	uint32_t m_PackPathCount;
+	std::vector<std::string> m_PackPaths;
+	uint32_t m_PackFileIndexCount;
+	std::vector<PackFileIndex> m_PackFileIndices;
+
+	std::vector<Pack*> m_Packs;
+};

dCommon/dCommonVars.h

@@ -1,642 +0,0 @@
-#pragma once
-
-#include <cstdint>
-#include <string>
-#include <set>
-#include "../thirdparty/raknet/Source/BitStream.h"
-
-#pragma warning (disable:4251) //Disables SQL warnings
-
-typedef int RESTICKET;
-
-const int highFrameRate = 16;	//60fps
-const int mediumFramerate = 33;	//30fps
-const int lowFramerate = 66;	//15fps
-
-//========== MACROS ===========
-
-#define CBITSTREAM RakNet::BitStream bitStream;
-#define CINSTREAM RakNet::BitStream inStream(packet->data, packet->length, false);
-#define CMSGHEADER PacketUtils::WriteHeader(bitStream, CLIENT, MSG_CLIENT_GAME_MSG);
-#define SEND_PACKET Game::server->Send(&bitStream, sysAddr, false);
-#define SEND_PACKET_BROADCAST Game::server->Send(&bitStream, UNASSIGNED_SYSTEM_ADDRESS, true);
-
-//=========== TYPEDEFS ==========
-
-typedef int32_t LOT;                        //!< A LOT
-typedef int64_t LWOOBJID;                   //!< An object ID (should be unsigned actually but ok)
-typedef int32_t TSkillID;                   //!< A skill ID
-typedef uint32_t LWOCLONEID;                 //!< Used for Clone IDs
-typedef uint16_t LWOMAPID;                   //!< Used for Map IDs
-typedef uint16_t LWOINSTANCEID;              //!< Used for Instance IDs
-typedef uint32_t PROPERTYCLONELIST;          //!< Used for Property Clone IDs
-
-typedef int32_t PetTamingPiece;             //!< Pet Taming Pieces
-
-const LWOOBJID LWOOBJID_EMPTY = 0;          //!< An empty object ID
-const LOT LOT_NULL = -1;                    //!< A null LOT
-const int32_t LOOTTYPE_NONE = 0;            //!< No loot type available
-const float SECONDARY_PRIORITY = 1.0f;      //!< Secondary Priority
-const uint32_t INVENTORY_INVALID = -1;      //!< Invalid Inventory
-const uint32_t INVENTORY_DEFAULT = -1;      //!< Default Inventory
-const uint32_t StatusChangeInfo = 0;        //!< Status Change Info (???)
-const uint32_t INVENTORY_MAX = 9999999;     //!< The Maximum Inventory Size
-const uint32_t LWOCLONEID_INVALID = -1;     //!< Invalid LWOCLONEID
-const uint16_t LWOINSTANCEID_INVALID = -1;  //!< Invalid LWOINSTANCEID
-const uint16_t LWOMAPID_INVALID = -1;       //!< Invalid LWOMAPID
-const uint64_t LWOZONEID_INVALID = 0;       //!< Invalid LWOZONEID
-
-typedef std::set<LWOOBJID> TSetObjID;
-
-const float PI = 3.14159f;
-
-#if defined(__unix) || defined(__APPLE__)
-//For Linux:
-typedef __int64_t __int64;
-#endif
-
-//============ STRUCTS ==============
-
-struct LWOSCENEID {
-public:
-	LWOSCENEID() { m_sceneID = -1; m_layerID = 0; }
-	LWOSCENEID(int sceneID) { m_sceneID = sceneID; m_layerID = 0; }
-	LWOSCENEID(int sceneID, unsigned int layerID) { m_sceneID = sceneID; m_layerID = layerID; }
-
-	LWOSCENEID& operator=(const LWOSCENEID& rhs) { m_sceneID = rhs.m_sceneID; m_layerID = rhs.m_layerID; return *this; }
-	LWOSCENEID& operator=(const int rhs) { m_sceneID = rhs; m_layerID = 0; return *this; }
-
-	bool operator<(const LWOSCENEID& rhs) const { return (m_sceneID < rhs.m_sceneID || (m_sceneID == rhs.m_sceneID && m_layerID < rhs.m_layerID)); }
-	bool operator<(const int rhs) const { return m_sceneID < rhs; }
-
-	bool operator==(const LWOSCENEID& rhs) const { return (m_sceneID == rhs.m_sceneID && m_layerID == rhs.m_layerID); }
-	bool operator==(const int rhs) const { return m_sceneID == rhs; }
-
-	const int GetSceneID() const { return m_sceneID; }
-	const unsigned int GetLayerID() const { return m_layerID; }
-
-	void SetSceneID(const int sceneID) { m_sceneID = sceneID; }
-	void SetLayerID(const unsigned int layerID) { m_layerID = layerID; }
-
-private:
-	int m_sceneID;
-	unsigned int m_layerID;
-};
-
-struct LWOZONEID {
-public:
-	const LWOMAPID& GetMapID() const { return m_MapID; }
-	const LWOINSTANCEID& GetInstanceID() const { return m_InstanceID; }
-	const LWOCLONEID& GetCloneID() const { return m_CloneID; }
-
-	//In order: def constr, constr, assign op
-	LWOZONEID() { m_MapID = LWOMAPID_INVALID; m_InstanceID = LWOINSTANCEID_INVALID; m_CloneID = LWOCLONEID_INVALID; }
-	LWOZONEID(const LWOMAPID& mapID, const LWOINSTANCEID& instanceID, const LWOCLONEID& cloneID) { m_MapID = mapID; m_InstanceID = instanceID; m_CloneID = cloneID; }
-	LWOZONEID(const LWOZONEID& replacement) { *this = replacement; }
-
-private:
-	LWOMAPID m_MapID; //1000 for VE, 1100 for AG, etc...
-	LWOINSTANCEID m_InstanceID; //Instances host the same world, but on a different dWorld process.
-	LWOCLONEID m_CloneID; //To differentiate between "your property" and "my property". Always 0 for non-prop worlds.
-};
-
-const LWOSCENEID LWOSCENEID_INVALID = -1;
-
-struct LWONameValue {
-    uint32_t length = 0;        //!< The length of the name
-    std::u16string name;			//!< The name
-    
-    LWONameValue(void) {}
- 
-    LWONameValue(const std::u16string& name) {
-        this->name = name;
-        this->length = static_cast<uint32_t>(name.length());
-    }
-    
-    ~LWONameValue(void) {}
-};
-
-struct FriendData {
-public:
-    bool isOnline = false;
-    bool isBestFriend = false;
-    bool isFTP = false;
-    LWOZONEID zoneID;
-    LWOOBJID friendID;
-    std::string friendName;
-
-    void Serialize(RakNet::BitStream& bitStream) {
-        bitStream.Write<uint8_t>(isOnline);
-        bitStream.Write<uint8_t>(isBestFriend);
-        bitStream.Write<uint8_t>(isFTP);
-        bitStream.Write<uint32_t>(0); //???
-        bitStream.Write<uint8_t>(0);  //???
-        bitStream.Write(zoneID.GetMapID());
-        bitStream.Write(zoneID.GetInstanceID());
-        bitStream.Write(zoneID.GetCloneID());
-        bitStream.Write(friendID);
-        
-        uint32_t maxSize = 33;
-        uint32_t size = static_cast<uint32_t>(friendName.length());
-        uint32_t remSize = static_cast<uint32_t>(maxSize - size);
-
-        if (size > maxSize) size = maxSize;
-
-        for (uint32_t i = 0; i < size; ++i) {
-            bitStream.Write(static_cast<uint16_t>(friendName[i]));
-        }
-
-        for (uint32_t j = 0; j < remSize; ++j) {
-            bitStream.Write(static_cast<uint16_t>(0));
-        }
-
-        bitStream.Write<uint32_t>(0); //???
-        bitStream.Write<uint16_t>(0); //???
-    }
-};
-
-struct Brick {
-    uint32_t designerID;
-    uint32_t materialID;
-};
-
-//This union is used by the behavior system
-union suchar {
-	unsigned char usigned;
-	char svalue;
-};
-
-//=========== DLU ENUMS ============
-
-enum eGameMasterLevel : int32_t {
-    GAME_MASTER_LEVEL_CIVILIAN = 0,             // Normal player.
-    GAME_MASTER_LEVEL_FORUM_MODERATOR = 1,      // No permissions on live servers.
-    GAME_MASTER_LEVEL_JUNIOR_MODERATOR = 2,     // Can kick/mute and pull chat logs.
-    GAME_MASTER_LEVEL_MODERATOR = 3,            // Can return lost items.
-    GAME_MASTER_LEVEL_SENIOR_MODERATOR = 4,     // Can ban.
-    GAME_MASTER_LEVEL_LEAD_MODERATOR = 5,       // Can approve properties.
-    GAME_MASTER_LEVEL_JUNIOR_DEVELOPER = 6,     // Junior developer & future content team. Civilan on live.
-    GAME_MASTER_LEVEL_INACTIVE_DEVELOPER = 7,   // Inactive developer, limited permissions.
-    GAME_MASTER_LEVEL_DEVELOPER = 8,            // Active developer, full permissions on live.
-    GAME_MASTER_LEVEL_OPERATOR = 9              // Can shutdown server for restarts & updates.
-};
-
-//=========== LU ENUMS ============
-
-//! An enum for object ID bits
-enum eObjectBits : int32_t {
-    OBJECT_BIT_PERSISTENT = 32,     //!< The 32 bit index
-    OBJECT_BIT_CLIENT = 46,         //!< The 46 bit index
-    OBJECT_BIT_SPAWNED = 58,        //!< The 58 bit index
-    OBJECT_BIT_CHARACTER = 60       //!< The 60 bit index
-};
-
-//! An enum for MatchUpdate types
-enum eMatchUpdate : int {
-	MATCH_UPDATE_PLAYER_JOINED = 0,
-	MATCH_UPDATE_PLAYER_LEFT = 1,
-	MATCH_UPDATE_TIME = 3,
-	MATCH_UPDATE_TIME_START_DELAY = 4,
-	MATCH_UPDATE_PLAYER_READY = 5,
-	MATCH_UPDATE_PLAYER_UNREADY = 6
-};
-
-//! An enum for camera cycling modes
-enum eCyclingMode : uint32_t {
-	ALLOW_CYCLE_TEAMMATES,
-	DISALLOW_CYCLING
-};
-
-enum eCinematicEvent : uint32_t {
-    STARTED,
-    WAYPOINT,
-    ENDED,
-};
-
-//! An enum for character creation responses
-enum eCreationResponse : uint8_t {
-    CREATION_RESPONSE_SUCCESS = 0,                  //!< The creation was successful
-    CREATION_RESPONSE_OBJECT_ID_UNAVAILABLE,        //!< The Object ID can't be used
-    CREATION_RESPONSE_NAME_NOT_ALLOWED,             //!< The name is not allowed
-    CREATION_RESPONSE_PREDEFINED_NAME_IN_USE,       //!< The predefined name is already in use
-    CREATION_RESPONSE_CUSTOM_NAME_IN_USE            //!< The custom name is already in use
-};
-
-//! An enum for login responses
-enum eLoginResponse : uint8_t {
-	LOGIN_RESPONSE_GENERAL_FAILED = 0,
-	LOGIN_RESPONSE_SUCCESS = 1,
-	LOGIN_RESPONSE_BANNED = 2,
-	LOGIN_RESPONSE_PERMISSIONS_NOT_HIGH_ENOUGH = 5,
-	LOGIN_RESPONSE_WRONG_PASS_OR_USER = 6,
-	LOGIN_RESPONSE_ACCOUNT_LOCKED = 7
-};
-
-//! An enum for character rename responses
-enum eRenameResponse : uint8_t {
-    RENAME_RESPONSE_SUCCESS = 0,                    //!< The renaming was successful
-    RENAME_RESPONSE_UNKNOWN_ERROR,                  //!< There was an unknown error
-    RENAME_RESPONSE_NAME_UNAVAILABLE,               //!< The name is unavailable
-    RENAME_RESPONSE_NAME_IN_USE                     //!< The name is already in use
-};
-
-//! A replica packet type
-enum eReplicaPacketType {
-    PACKET_TYPE_CONSTRUCTION,                       //!< A construction packet
-    PACKET_TYPE_SERIALIZATION,                      //!< A serialization packet
-    PACKET_TYPE_DESTRUCTION                         //!< A destruction packet
-};
-
-enum ServerDisconnectIdentifiers {
-    SERVER_DISCON_UNKNOWN_SERVER_ERROR = 0,               //!< Unknown server error
-	SERVER_DISCON_DUPLICATE_LOGIN = 4,                    //!< Used when another user with the same username is logged in (duplicate login)
-	SERVER_DISCON_SERVER_SHUTDOWN = 5,                    //!< Used when the server is shutdown
-	SERVER_DISCON_SERVER_MAP_LOAD_FAILURE = 6,            //!< Used when the server cannot load a map
-	SERVER_DISCON_INVALID_SESSION_KEY = 7,                //!< Used if the session is invalid
-	SERVER_DISCON_ACCOUNT_NOT_IN_PENDING_LIST = 8,        //!< ???
-	SERVER_DISCON_CHARACTER_NOT_FOUND = 9,                //!< Used if a character that the server has is not found (i.e, corruption with user-player data)
-	SERVER_DISCON_CHARACTER_CORRUPTED = 10,               //!< Similar to abovce
-	SERVER_DISCON_KICK = 11,                              //!< Used if the user is kicked from the server
-	SERVER_DISCON_FREE_TRIAL_EXPIRED = 12,                //!< Used if the user's free trial expired
-	SERVER_DISCON_PLAY_SCHEDULE_TIME_DONE = 13            //!< Used if the user's play time is used up
-};
-
-//! The Behavior Types for use with the AI system
-enum eCombatBehaviorTypes : uint32_t {
-    PASSIVE = 0,                    //!< The object is passive
-    AGGRESSIVE = 1,                 //!< The object is aggressive
-    PASSIVE_TURRET = 2,             //!< The object is a passive turret
-    AGGRESSIVE_TURRET = 3           //!< The object is an aggressive turret
-};
-
-//! The Combat Role Type for use with the AI system
-enum eCombatRoleType : uint32_t {
-    MELEE = 0,                      //!< Used for melee attacks
-    RANGED = 1,                     //!< Used for range attacks
-    SUPPORT = 2                     //!< Used for support
-};
-
-//! The kill types for the Die packet
-enum eKillType : uint32_t {
-    VIOLENT,
-    SILENT
-};
-
-//! The various world states used throughout the server
-enum eObjectWorldState {
-    WORLDSTATE_INWORLD,             //!< Probably used when the object is in the world
-    WORLDSTATE_ATTACHED,            //!< Probably used when the object is attached to another object
-    WORLDSTATE_INVENTORY            //!< Probably used when the object is in an inventory
-};
-
-//! The trigger stats (???)
-enum eTriggerStat {
-    INVALID_STAT,                   //!< ???
-    HEALTH,                         //!< Probably used for health
-    ARMOR,                          //!< Probably used for armor
-    IMAGINATION                     //!< Probably used for imagination
-};
-
-//! The trigger operations (???)
-enum eTriggerOperator {
-    INVALID_OPER,                   //!< ???
-    EQUAL,                          //!< ???
-    NOT_EQUAL,                      //!< ???
-    GREATER,                        //!< ???
-    GREATER_EQUAL,                  //!< ???
-    LESS,                           //!< ???
-    LESS_EQUAL                      //!< ???
-};
-
-//! The various build types
-enum eBuildType {
-    BUILD_NOWHERE,                  //!< Used if something can't be built anywhere
-    BUILD_IN_WORLD,                 //!< Used if something can be built in the world
-    BUILD_ON_PROPERTY               //!< Used if something can be build on a property
-};
-
-//! Quickbuild fail reasons
-enum eFailReason : uint32_t {
-    REASON_NOT_GIVEN,
-    REASON_OUT_OF_IMAGINATION,
-    REASON_CANCELED_EARLY,
-    REASON_BUILD_ENDED
-};
-
-//! Terminate interaction type
-enum eTerminateType : uint32_t {
-    RANGE,
-    USER,
-    FROM_INTERACTION
-};
-
-//! The combat state
-enum eCombatState {
-    IDLE,                           //!< The AI is in an idle state
-    AGGRO,                          //!< The AI is in an aggressive state
-    TETHER,                         //!< The AI is being redrawn back to tether point
-    SPAWN,                          //!< The AI is spawning
-    DEAD                            //!< The AI is dead
-};
-
-enum eControlSceme {
-	SCHEME_A,
-	SCHEME_D,
-	SCHEME_GAMEPAD,
-	SCHEME_E,
-	SCHEME_FPS,
-	SCHEME_DRIVING,
-	SCHEME_TAMING,
-	SCHEME_MODULAR_BUILD,
-	SCHEME_WEAR_A_ROBOT //== freecam? 
-};
-
-enum eStunState {
-	PUSH,
-	POP
-};
-
-enum eNotifyType {
-    NOTIFY_TYPE_SUCCESS,
-    NOTIFY_TYPE_QUIT,
-    NOTIFY_TYPE_FAILED,
-    NOTIFY_TYPE_BEGIN,
-    NOTIFY_TYPE_READY,
-    NOTIFY_TYPE_NAMINGPET
-};
-
-enum eReplicaComponentType : int32_t {
-    COMPONENT_TYPE_CONTROLLABLE_PHYSICS     = 1,            //!< The ControllablePhysics Component
-    COMPONENT_TYPE_RENDER                   = 2,            //!< The Render Component
-    COMPONENT_TYPE_SIMPLE_PHYSICS           = 3,            //!< The SimplePhysics Component
-    COMPONENT_TYPE_CHARACTER                = 4,            //!< The Character Component
-    COMPONENT_TYPE_SCRIPT                   = 5,            //!< The Script Component
-    COMPONENT_TYPE_BOUNCER                  = 6,            //!< The Bouncer Component
-    COMPONENT_TYPE_BUFF                     = 7,            //!< The Buff Component
-    COMPONENT_TYPE_SKILL                    = 9,            //!< The Skill Component
-	COMPONENT_TYPE_ITEM                     = 11,           //!< The Item Component
-    COMPONENT_TYPE_VENDOR                   = 16,           //!< The Vendor Component
-    COMPONENT_TYPE_INVENTORY                = 17,           //!< The Inventory Component
-    COMPONENT_TYPE_SHOOTING_GALLERY         = 19,           //!< The Shooting Gallery Component
-    COMPONENT_TYPE_RIGID_BODY_PHANTOM_PHYSICS   = 20,       //!< The RigidBodyPhantomPhysics Component
-    COMPONENT_TYPE_COLLECTIBLE              = 23,           //!< The Collectible Component
-    COMPONENT_TYPE_MOVING_PLATFORM          = 25,           //!< The MovingPlatform Component
-    COMPONENT_TYPE_PET                      = 26,           //!< The Pet Component
-    COMPONENT_TYPE_VEHICLE_PHYSICS          = 30,           //!< The VehiclePhysics Component
-	COMPONENT_TYPE_MOVEMENT_AI              = 31,           //!< The MovementAI Component
-	COMPONENT_TYPE_PROPERTY                 = 36,           //!< The Property Component
-    COMPONENT_TYPE_SCRIPTED_ACTIVITY        = 39,           //!< The ScriptedActivity Component
-    COMPONENT_TYPE_PHANTOM_PHYSICS          = 40,           //!< The PhantomPhysics Component
-    COMPONENT_TYPE_PROPERTY_ENTRANCE        = 43,           //!< The PhantomPhysics Component
-	COMPONENT_TYPE_PROPERTY_MANAGEMENT      = 45,           //!< The PropertyManagement Component
-    COMPONENT_TYPE_REBUILD                  = 48,           //!< The Rebuild Component
-    COMPONENT_TYPE_SWITCH                   = 49,           //!< The Switch Component
-    COMPONENT_TYPE_ZONE_CONTROL             = 50,           //!< The ZoneControl Component
-	COMPONENT_TYPE_PACKAGE                  = 53,           //!< The Package Component
-    COMPONENT_TYPE_PLAYER_FLAG              = 58,           //!< The PlayerFlag Component
-    COMPONENT_TYPE_BASE_COMBAT_AI           = 60,           //!< The BaseCombatAI Component
-    COMPONENT_TYPE_MODULE_ASSEMBLY          = 61,           //!< The ModuleAssembly Component
-	COMPONENT_TYPE_PROPERTY_VENDOR          = 65,           //!< The PropertyVendor Component
-    COMPONENT_TYPE_ROCKET_LAUNCH            = 67,           //!< The RocketLaunch Component
-    COMPONENT_TYPE_RACING_CONTROL           = 71,           //!< The RacingControl Component
-    COMPONENT_TYPE_MISSION_OFFER            = 73,           //!< The MissionOffer Component
-    COMPONENT_TYPE_EXHIBIT                  = 75,           //!< The Exhibit Component
-    COMPONENT_TYPE_RACING_STATS             = 74,           //!< The Exhibit Component
-    COMPONENT_TYPE_SOUND_TRIGGER            = 77,           //!< The Sound Trigger Component
-	COMPONENT_TYPE_PROXIMITY_MONITOR        = 78,           //!< The Proximity Monitor Component
-    COMPONENT_TYPE_MISSION                  = 84,           //!< The Mission Component
-    COMPONENT_TYPE_ROCKET_LAUNCH_LUP        = 97,           //!< The LUP Launchpad Componen
-    COMPONENT_TYPE_RAIL_ACTIVATOR           = 104,
-    COMPONENT_TYPE_POSSESSOR                = 107,          //!< The Component 107
-    COMPONENT_TYPE_POSSESSABLE              = 108,          //!< The Component 108
-	COMPONENT_TYPE_BUILD_BORDER             = 114,          //!< The Build Border Component
-    COMPONENT_TYPE_DESTROYABLE              = 1000,         //!< The Destroyable Component
-
-    COMPONENT_TYPE_MODEL = 5398484 //look man idk
-};
-
-/**
- * Represents the different types of inventories an entity may have
- */
-enum eInventoryType : uint32_t {
-    ITEMS = 0,
-    VAULT_ITEMS,
-    BRICKS,
-    TEMP_ITEMS = 4,
-    MODELS,
-    TEMP_MODELS,
-    BEHAVIORS,
-    PROPERTY_DEEDS,
-	VENDOR_BUYBACK = 11,
-    HIDDEN = 12, //Used for missional items
-    VAULT_MODELS = 14,
-	ITEM_SETS, //internal
-	INVALID // made up, for internal use!!!
-};
-
-enum eItemType : int32_t {
-    ITEM_TYPE_UNKNOWN = -1,                 //!< An unknown item type
-    ITEM_TYPE_BRICK = 1,                    //!< A brick
-    ITEM_TYPE_HAT = 2,                      //!< A hat / head item
-    ITEM_TYPE_HAIR = 3,                     //!< A hair item
-    ITEM_TYPE_NECK = 4,                     //!< A neck item
-    ITEM_TYPE_LEFT_HAND = 5,                //!< A left handed item
-    ITEM_TYPE_RIGHT_HAND = 6,               //!< A right handed item
-    ITEM_TYPE_LEGS = 7,                     //!< A pants item
-    ITEM_TYPE_LEFT_TRINKET = 8,             //!< A left handled trinket item
-    ITEM_TYPE_RIGHT_TRINKET = 9,            //!< A right handed trinket item
-    ITEM_TYPE_BEHAVIOR = 10,                //!< A behavior
-    ITEM_TYPE_PROPERTY = 11,                //!< A property
-    ITEM_TYPE_MODEL = 12,                   //!< A model
-    ITEM_TYPE_COLLECTIBLE = 13,             //!< A collectible item
-    ITEM_TYPE_CONSUMABLE = 14,              //!< A consumable item
-    ITEM_TYPE_CHEST = 15,                   //!< A chest item
-    ITEM_TYPE_EGG = 16,                     //!< An egg
-    ITEM_TYPE_PET_FOOD = 17,                //!< A pet food item
-    ITEM_TYPE_QUEST_OBJECT = 18,            //!< A quest item
-    ITEM_TYPE_PET_INVENTORY_ITEM = 19,      //!< A pet inventory item
-    ITEM_TYPE_PACKAGE = 20,                 //!< A package
-    ITEM_TYPE_LOOT_MODEL = 21,              //!< A loot model
-    ITEM_TYPE_VEHICLE = 22,                 //!< A vehicle
-    ITEM_TYPE_CURRENCY = 23                 //!< Currency
-};
-
-enum eRebuildState : uint32_t {
-	REBUILD_OPEN,
-	REBUILD_COMPLETED = 2,
-	REBUILD_RESETTING = 4,
-	REBUILD_BUILDING,
-	REBUILD_INCOMPLETE
-};
-
-enum eGameActivities : uint32_t {
-	ACTIVITY_NONE,
-	ACTIVITY_QUICKBUILDING,
-	ACTIVITY_SHOOTING_GALLERY,
-	ACTIVITY_RACING,
-	ACTIVITY_PINBALL,
-	ACTIVITY_PET_TAMING
-};
-
-enum ePlayerFlags {
-	BTARR_TESTING = 0,
-	PLAYER_HAS_ENTERED_PET_RANCH = 1,
-	MINIMAP_UNLOCKED = 2,
-	ACTIVITY_REBUILDING_FAIL_TIME = 3,
-	ACTIVITY_REBUILDING_FAIL_RANGE = 4,
-	ACTIVITY_SHOOTING_GALLERY_HELP = 5,
-	HELP_WALKING_CONTROLS = 6,
-	FIRST_SMASHABLE = 7,
-	FIRST_IMAGINATION_PICKUP = 8,
-	FIRST_DAMAGE = 9,
-	FIRST_ITEM = 10,
-	FIRST_BRICK = 11,
-	FIRST_CONSUMABLE = 12,
-	FIRST_EQUIPPABLE = 13,
-	CHAT_HELP = 14,
-	FIRST_PET_TAMING_MINIGAME = 15,
-	FIRST_PET_ON_SWITCH = 16,
-	FIRST_PET_JUMPED_ON_SWITCH = 17,
-	FIRST_PET_FOUND_TREASURE = 18,
-	FIRST_PET_DUG_TREASURE = 19,
-	FIRST_PET_OWNER_ON_PET_BOUNCER = 20,
-	FIRST_PET_DESPAWN_NO_IMAGINATION = 21,
-	FIRST_PET_SELECTED_ENOUGH_BRICKS = 22,
-	FIRST_EMOTE_UNLOCKED = 23,
-	GF_PIRATE_REP = 24,
-	AG_BOB_CINEMATIC_EVENT = 25,
-	HELP_JUMPING_CONTROLS = 26,
-	HELP_DOUBLE_JUMP_CONTROLS = 27,
-	HELP_CAMERA_CONTROLS = 28,
-	HELP_ROTATE_CONTROLS = 29,
-	HELP_SMASH = 30,
-	MONUMENT_INTRO_MUSIC_PLAYED = 31,
-	BEGINNING_ZONE_SUMMARY_DISPLAYED = 32,
-	AG_FINISH_LINE_BUILT = 33,
-	AG_BOSS_AREA_FOUND = 34,
-	AG_LANDED_IN_BATTLEFIELD = 35,
-	GF_PLAYER_HAS_BEEN_TO_THE_RAVINE = 36,
-	MODULAR_BUILD_STARTED = 37,
-	MODULAR_BUILD_FINISHED_CLICK_BUTTON = 38,
-	THINKING_HAT_RECEIVED_GO_TO_MODULAR_BUILD_AREA = 39,
-	BUILD_AREA_ENTERED_MOD_NOT_ACTIVATED_PUT_ON_HAT = 40,
-	HAT_ON_INSIDE_OF_MOD_BUILD_EQUIP_A_MODULE_FROM_LEG = 41,
-	MODULE_EQUIPPED_PLACE_ON_GLOWING_BLUE_SPOT = 42,
-	FIRST_MODULE_PLACED_CORRECTLY_NOW_DO_THE_REST = 43,
-	ROCKET_COMPLETE_NOW_LAUNCH_FROM_PAD = 44,
-	JOINED_A_FACTION = 45,
-	VENTURE_FACTION = 46,
-	ASSEMBLY_FACTION = 47,
-	PARADOX_FACTION = 48,
-	SENTINEL_FACTION = 49,
-	LUP_WORLD_ACCESS = 50,
-	AG_FIRST_FLAG_COLLECTED = 51,
-	TOOLTIP_TALK_TO_SKYLAND_TO_GET_HAT = 52,
-	MODULAR_BUILD_PLAYER_PLACES_FIRST_MODEL_IN_SCRATCH = 53,
-	MODULAR_BUILD_FIRST_ARROW_DISPLAY_FOR_MODULE = 54,
-	AG_BEACON_QB,_SO_THE_PLAYER_CAN_ALWAYS_BUILD_THEM = 55,
-	GF_PET_DIG_FLAG_1 = 56,
-	GF_PET_DIG_FLAG_2 = 57,
-	GF_PET_DIG_FLAG_3 = 58,
-	SUPPRESS_SPACESHIP_CINEMATIC_FLYTHROUGH = 59,
-	GF_PLAYER_FALL_DEATH = 60,
-	GF_PLAYER_CAN_GET_FLAG_1 = 61,
-	GF_PLAYER_CAN_GET_FLAG_2 = 62,
-	GF_PLAYER_CAN_GET_FLAG_3 = 63,
-	ENTER_BBB_FROM_PROPERTY_EDIT_CONFIRMATION_DIALOG = 64,
-	AG_FIRST_COMBAT_COMPLETE = 65,
-	AG_COMPLETE_BOB_MISSION = 66,
-    NJ_GARMADON_CINEMATIC_SEEN = 125,
-	ELEPHANT_PET_3050 = 801,
-	CAT_PET_3054 = 802,
-	TRICERATOPS_PET_3195 = 803,
-	TERRIER_PET_3254 = 804,
-	SKUNK_PET_3261 = 805,
-	LION_PET_3520 = 806,
-	BUNNY_PET_3672 = 807,
-	CROCODILE_PET_3994 = 808,
-	DOBERMAN_PET_5635 = 809,
-	BUFFALO_PET_5636 = 810,
-	ROBOT_DOG_PET_5637 = 811,
-	EUROPEAN_DRAGON_PET_5639 = 812,
-	TORTOISE_PET_5640 = 813,
-	ASIAN_DRAGON_PET_5641 = 814,
-	MANTIS_PET_5642 = 815,
-	PANDA_PET_5643 = 816,
-	WARTHOG_PET_6720 = 817,
-	GOAT_PET_7638 = 818,
-	CRAB_PET_7694 = 819,
-	AG_SPACE_SHIP_BINOC_AT_LAUNCH = 1001,
-	AG_SPACE_SHIP_BINOC_AT_LAUNCH_PLATFORM = 1002,
-	AG_SPACE_SHIP_BINOC_ON_PLATFORM_TO_LEFT_OF_START = 1003,
-	AG_SPACE_SHIP_BINOC_ON_PLATFORM_TO_RIGHT_OF_START = 1004,
-	AG_SPACE_SHIP_BINOC_AT_BOB = 1005,
-	AG_BATTLE_BINOC_FOR_TRICERETOPS = 1101,
-	AG_BATTLE_BINOC_AT_PARADOX = 1102,
-	AG_BATTLE_BINOC_AT_MISSION_GIVER = 1103,
-	AG_BATTLE_BINOC_AT_BECK = 1104,
-	AG_MONUMENT_BINOC_INTRO = 1105,
-	AG_MONUMENT_BINOC_OUTRO = 1106,
-	AG_LAUNCH_BINOC_INTRO = 1107,
-	AG_LAUNCH_BINOC_BISON = 1108,
-	AG_LAUNCH_BINOC_SHARK = 1109,
-	NS_BINOC_CONCERT_TRANSITION = 1201,
-	NS_BINOC_RACE_PLACE_TRANSITION = 1202,
-	NS_BINOC_BRICK_ANNEX_TRANSITION = 1203,
-	NS_BINOC_GF_LAUNCH = 1204,
-	NS_BINOC_FV_LAUNCH = 1205,
-	NS_BINOC_BRICK_ANNEX_WATER = 1206,
-	NS_BINOC_AG_LAUNCH_AT_RACE_PLACE = 1207,
-	NS_BINOC_AG_LAUNCH_AT_BRICK_ANNEX = 1208,
-	NS_BINOC_AG_LAUNCH_AT_PLAZA = 1209,
-	NS_BINOC_TBA = 1210,
-	NS_FLAG_COLLECTABLE_1_BY_JONNY_THUNDER = 1211,
-	NS_FLAG_COLLECTABLE_2_UNDER_CONCERT_BRIDGE = 1212,
-	NS_FLAG_COLLECTABLE_3_BY_FV_LAUNCH = 1213,
-	NS_FLAG_COLLECTABLE_4_IN_PLAZA_BEHIND_BUILDING = 1214,
-	NS_FLAG_COLLECTABLE_5_BY_GF_LAUNCH = 1215,
-	NS_FLAG_COLLECTABLE_6_BY_DUCK_SG = 1216,
-	NS_FLAG_COLLECTABLE_7_BY_LUP_LAUNCH = 1217,
-	NS_FLAG_COLLECTABLE_8_BY_NT_LUANCH = 1218,
-	NS_FLAG_COLLECTABLE_9_BY_RACE_BUILD = 1219,
-	NS_FLAG_COLLECTABLE_10_ON_AG_LAUNCH_PATH = 1220,
-	PR_BINOC_AT_LAUNCH_PAD = 1251,
-	PR_BINOC_AT_BEGINNING_OF_ISLAND_B = 1252,
-	PR_BINOC_AT_FIRST_PET_BOUNCER = 1253,
-	PR_BINOC_ON_BY_CROWS_NEST = 1254,
-	PR_PET_DIG_AT_BEGINNING_OF_ISLAND_B = 1261,
-	PR_PET_DIG_AT_THE_LOCATION_OF_OLD_BOUNCE_BACK = 1262,
-	PR_PET_DIG_UNDER_QB_BRIDGE = 1263,
-	PR_PET_DIG_BACK_SIDE_BY_PARTNER_BOUNCE = 1264,
-	PR_PET_DIG_BY_LAUNCH_PAD = 1265,
-	PR_PET_DIG_BY_FIRST_PET_BOUNCER = 1266,
-	GF_BINOC_ON_LANDING_PAD = 1301,
-	GF_BINOC_AT_RAVINE_START = 1302,
-	GF_BINOC_ON_TOP_OF_RAVINE_HEAD = 1303,
-	GF_BINOC_AT_TURTLE_AREA = 1304,
-	GF_BINOC_IN_TUNNEL_TO_ELEPHANTS = 1305,
-	GF_BINOC_IN_ELEPHANTS_AREA = 1306,
-	GF_BINOC_IN_RACING_AREA = 1307,
-	GF_BINOC_IN_CROC_AREA = 1308,
-	GF_BINOC_IN_JAIL_AREA = 1309,
-	GF_BINOC_TELESCOPE_NEXT_TO_CAPTAIN_JACK = 1310,
-	NT_FACTION_SPY_DUKE = 1974,
-	NT_FACTION_SPY_OVERBUILD = 1976,
-	NT_FACTION_SPY_HAEL = 1977,
-    NJ_EARTH_SPINJITZU = 2030,
-    NJ_LIGHTNING_SPINJITZU = 2031,
-    NJ_ICE_SPINJITZU = 2032,
-    NJ_FIRE_SPINJITZU = 2033,
-    NJ_WU_SHOW_DAILY_CHEST = 2099
-};
-
-
-//======== FUNC ===========
-
-template<typename T>
-inline T const& clamp(const T& val, const T& low, const T& high) {
-    if (val < low) return low;
-    else if (val > high) return high;
-    
-    return val;
-}