update from main

.github/FUNDING.yml

@@ -0,0 +1,15 @@
+# These are supported funding model platforms
+
+github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+patreon: # Replace with a single Patreon username
+open_collective: # Replace with a single Open Collective username
+ko_fi: flarialmc
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: # Replace with a single Liberapay username
+issuehunt: # Replace with a single IssueHunt username
+lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
+polar: # Replace with a single Polar username
+buy_me_a_coffee: # Replace with a single Buy Me a Coffee username
+thanks_dev: # Replace with a single thanks.dev username
+custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -0,0 +1,96 @@
+name: Bug Report
+description: Report a bug in Flarial
+title: "[BUG] "
+labels: ["dll","launcher"]
+
+body:
+  # - type: Markdown
+  #   attributes:
+  #     value: |
+  #       **Before you submit a bug report, please make sure you have done the following:**
+  - type: checkboxes
+    id: checklist
+    attributes: 
+      label: Checklist
+      description: |
+        **Before you submit a bug report, please make sure you have done the following:**
+      options:
+        - label: |
+            I have checked the [FAQ](https://ptb.discord.com/channels/1049946152092586054/1135112998453788672)
+          required: true
+        - label: |
+            I have searched the [issues](https://github.com/flarialmc/dll/issues?q=is%3Aissue+is%3Aopen) of this repository and believe that this is not a duplicate
+          required: true
+  - type: textarea
+    id: bug
+    attributes:
+      # render: Markdown
+      label: Bug description
+      description: A clear and concise description of what the bug is.
+      placeholder: I was trying to [...] but [...]
+
+  - type: textarea
+    id: expected
+    attributes:
+      # render: Markdown
+      label: Expected behavior
+      description: A clear and concise description of what you expected to happen.
+      placeholder: I expected [...]
+
+  - type: textarea
+    id: actual
+    attributes:
+      # render: Markdown
+      label: Actual behavior
+      description: A clear and concise description of what actually happened.
+      placeholder: Instead [...]
+
+  - type: textarea
+    id: steps
+    attributes:
+      # render: Markdown
+      label: Steps to reproduce
+      description: |
+        Please provide detailed steps for reproducing the issue.
+        1. Go to '...'
+        2. Click on '....'
+        3. Scroll down to '....'
+        4. See error
+      placeholder: |
+        1. Go to '...'
+        2. Click on '....'
+        3. Scroll down to '....'
+        4. See error
+
+  - type: dropdown
+    id: os
+    attributes:
+      label: Operating System
+      description: Which operating system are you using?
+      options:
+        - Windows 10
+        - Windows 11
+
+  - type: textarea
+    id: osversion
+    attributes:
+      # render: Markdown
+      label: OS Version
+      description: What version of the operating system are you using?
+      placeholder: 21H1, 21H2, 22H1, etc.
+
+  - type: textarea
+    id: additional
+    attributes:
+      label: Additional notes
+      # render: Markdown
+      description: |
+        Add any other context about the problem here.
+        If applicable, add screenshots to help explain your problem.
+      placeholder: |
+        - Screenshots
+        - Logs
+        - etc.
+
+
+

.github/ISSUE_TEMPLATE/feature_request.yaml

@@ -0,0 +1,45 @@
+name: Feature Request
+description: Suggest a new feature for Flarial
+title: "[FEATURE REQUEST] "
+labels: ["enhancement"]
+
+body:
+  - type: textarea
+    id: feature
+    attributes:
+      label: Feature description
+      description: A clear and concise description of what the feature is.
+      placeholder: I would like to see [...]
+
+  - type: textarea
+    id: reason
+    attributes:
+      label: Reason
+      # render: Markdown
+      description: Why do you think this feature should be added?
+      placeholder: I think this feature should be added because [...]
+
+  - type: textarea
+    id: usecase
+    attributes:
+      label: Use case
+      # render: Markdown
+      description: How would you use this feature?
+      placeholder: I would use this feature to [...]
+
+  - type: textarea
+    id: alternatives
+    attributes:
+      label: Alternatives
+      # render: Markdown
+      description: Have you considered any alternative solutions or features?
+      placeholder: An alternative solution could be [...]
+
+  - type: textarea
+    id: additional
+    attributes:
+      label: Additional context
+      # render: Markdown
+      description: Add any other context or screenshots about the feature request here.
+      placeholder: |
+        Add any other context or screenshots about the feature request here.

.gitignore

@@ -25,4 +25,10 @@ cmake-build-minsizerel-visual-studio/
 cmake-build-visual-profile/
 clion/
 clion-ninja/
-*.zip
+*.zip
+localextras/
+_deps/
+*.pdb
+*.dll
+*.ilk
+Makefile

CMakeLists.txt

@@ -5,9 +5,25 @@ include(FetchContent)
 
 set(CMAKE_CXX_STANDARD 23)
 
+execute_process(
+        COMMAND git rev-parse --short HEAD
+        OUTPUT_VARIABLE COMMIT_HASH
+        OUTPUT_STRIP_TRAILING_WHITESPACE
+)
+
+configure_file(
+        ${CMAKE_CURRENT_SOURCE_DIR}/commit_hash.h.in
+        ${CMAKE_CURRENT_BINARY_DIR}/commit_hash.h
+        @ONLY
+)
+
+add_definitions(-DCOMMIT_HASH="${COMMIT_HASH}")
+
 if(MSVC)
     add_compile_options(/MT)
 
+    add_compile_options(/bigobj)
+
     # Optimize for speed
     add_compile_options($<$<CONFIG:Release>:/O2>)
     add_compile_options($<$<CONFIG:Release>:/Ot>)
@@ -71,9 +87,9 @@ if("${MSVC_RUNTIME}" STREQUAL "")
 endif()
 
 
-file(GLOB_RECURSE sources "main.cpp" "src/**/*.cpp" "src/**/*.hpp" "lib/**/*.cpp")
+file(GLOB_RECURSE sources "src/**/*.cpp" "src/**/*.hpp" "lib/**/*.cpp" "src/Client/GUI/Engine/*.cpp")
 
-add_library(${PROJECT_NAME} SHARED ${sources} src/SDK/Client/Render/Matrix.cpp src/Assets/Assets.rc)
+add_library(${PROJECT_NAME} SHARED ${sources} main.cpp src/Assets/Assets.rc)
 
 target_include_directories(${PROJECT_NAME} PRIVATE "${CMAKE_CURRENT_LIST_DIR}/lib/include/" "${CMAKE_CURRENT_LIST_DIR}/lib/glm/" "${CMAKE_CURRENT_LIST_DIR}/lib/ImGui")
 
@@ -87,15 +103,27 @@ endif()
 add_library(MinHook SHARED IMPORTED GLOBAL)
 set_target_properties(MinHook PROPERTIES IMPORTED_IMPLIB "${CMAKE_CURRENT_SOURCE_DIR}/lib/minhook/minhook.lib")
 
+FetchContent_Declare(
+        entt
+        GIT_REPOSITORY https://github.com/skypjack/entt.git
+        GIT_TAG f931687ff04d435871ac9664bb299f71f2a8fafc
+)
+
+FetchContent_Declare(
+        nes
+        GIT_REPOSITORY https://github.com/DisabledMallis/NuvolaEventSystem.git
+        GIT_TAG main
+)
+
 FetchContent_Declare(
         libhat
         GIT_REPOSITORY  https://github.com/BasedInc/libhat.git
         GIT_TAG         9ef05d6961ce37a4c801f11159de895aa21878a9
 )
+set(ENTT_BUILD_TESTING OFF)  # Disable building tests
+FetchContent_MakeAvailable(libhat entt nes)
 
-FetchContent_MakeAvailable(libhat)
-
-
+target_link_libraries(${PROJECT_NAME} PRIVATE libhat EnTT::EnTT NES windowscodecs.lib urlmon.lib dwrite.lib d3d12.lib dxgi.lib d3d11.lib d2d1.lib wininet.lib version)
+target_link_libraries(${PROJECT_NAME} PUBLIC MinHook)
 
-target_link_libraries(${PROJECT_NAME} PRIVATE libhat windowscodecs.lib urlmon.lib dwrite.lib d3d12.lib dxgi.lib d3d11.lib d2d1.lib wininet.lib version)
-target_link_libraries(${PROJECT_NAME} PUBLIC MinHook)
+target_precompile_headers(Flarial PRIVATE "src/PCH.cpp")

CMakeSettings.json

@@ -14,7 +14,7 @@
     {
       "name": "x64-Release",
       "generator": "Ninja",
-      "configurationType": "Release",
+      "configurationType": "RelWithDebInfo",
       "buildRoot": "${projectDir}\\out\\build\\${name}",
       "installRoot": "${projectDir}\\out\\install\\${name}",
       "cmakeCommandArgs": "",

README.md

@@ -1,5 +1,71 @@
-This base is really shit and contains a lot of shit code as a result of being me, Shane, and Anshul's first C++ project. Thank you for everyone who has joined me and my friends on this journey, it has been great! Maybe the readme will be updated in the future. Pull requests are welcomed.
+# Flarial Client
+Welcome to **Flarial Client**, the ultimate modded client designed specifically for Minecraft Bedrock Edition (MCBE). Flarial Client enhances your gameplay with a suite of tools and features that optimize performance, improve visual quality, and provide a smoother gaming experience.
+## Support us on Ko-Fi! https://ko-fi.com/flarialmc
 
-Make sure to read the license terms before modifying or distributing, though i don't really care, shame on you if you skid from this shitass base
 
-Building the DLL should be easy. Just clone, set up your IDE and make sure you have the necessary tools ready to build with CMAKE, watch a tutorial or two if you don't know and there you have it. In theory, debug and release builds both should work.
+## Installation Options
+
+Flarial Client is available in two forms:
+
+### Flarial Launcher (Recommended)
+- A user-friendly launcher that manages Flarial and other MCBE clients.
+- Includes Discord integration for community and support.
+- Offers additional Minecraft management features.
+
+### Standalone DLL
+- A minimal, lightweight version for advanced users.
+- Requires an external injector to set up and run.
+
+## Supported Platforms
+
+- **Operating System:** Windows 10/11 (64-bit processors only)
+- **Minecraft Version:** Compatible with MCBE versions 1.20 and above.
+
+## Troubleshooting
+
+If you encounter issues, check out our [FAQ](https://discord.gg/flarial-community-1049946152092586054) or join our community on [Discord](https://discord.gg/flarial-community-1049946152092586054). We’re here to help!
+
+---
+## Build Guide
+
+### Prerequisites:
+1. **CMake**: Ensure CMake is installed on your system. You can download it from [cmake.org](https://cmake.org/download/) and follow the installation instructions for your operating system.
+
+2. **Git**: Install Git if you haven't already. You can download Git from [git-scm.com](https://git-scm.com/downloads) and follow the installation instructions.
+
+### Steps to Clone and Build the Project:
+
+1. **Clone the Repository**:
+   Open a terminal or command prompt and clone the repository using Git:
+   ```bash
+   git clone https://github.com/flarialmc/dll.git
+   ```
+
+2. **Navigate to the Project Directory**:
+   Change into the directory of the cloned repository:
+   ```bash
+   cd dll
+   ```
+
+3. **Create a Build Directory**:
+   It's a good practice to create a separate directory for out-of-source builds. This keeps your source directory clean and allows for easier management of builds:
+   ```bash
+   mkdir build
+   cd build
+   ```
+
+4. **Configure with CMake**:
+   Run CMake to configure the build environment. Specify the path to the CMakeLists.txt file in the root of the cloned repository:
+   ```bash
+   cmake ..
+   ```
+   This command generates the necessary build files based on the CMake configuration.
+
+5. **Build the Project**:
+   Once CMake has configured the build files successfully, you can build the project using a suitable build tool (like `make` on Unix-like systems or Visual Studio on Windows):
+   ```bash
+   cmake --build .
+   ```
+   This command compiles the project according to the generated build files.
+
+By following these steps, you should be able to clone and build the project using CMake successfully.

commit_hash.h.in

@@ -0,0 +1,6 @@
+#ifndef COMMIT_HASH_H
+#define COMMIT_HASH_H
+
+#define COMMIT_HASH "@COMMIT_HASH@"
+
+#endif  // COMMIT_HASH_H