Reduce module count by moving cards into consolidated modules

Author: mikomikotaishi

CMakeLists.txt

@@ -236,11 +236,6 @@ FetchContent_Declare(
     GIT_TAG main
 )
 
-# FetchContent_Declare(
-#     asio
-#     GIT_REPOSITORY https://github.com/chriskohlhoff/asio.git
-#     GIT_TAG asio-1-38-0
-# )
 FetchContent_Declare(
     ftxui
     GIT_REPOSITORY https://github.com/ArthurSonzogni/FTXUI.git

README.md

@@ -1,6 +1,7 @@
 # openJuice
 
-## Overview:
+## Overview
+
 🍊 Open-source re-engineering of the game [*100% Orange Juice!*](https://store.steampowered.com/app/282800), written as a love letter to the original game.
 This does not aim to be a one-to-one recreation of the game but rather a port of the game as a TUI program.
 
@@ -13,27 +14,32 @@ Tested for Linux. Windows and MacOS support untested.
 [![GPLv3](https://img.shields.io/badge/license-GPLv3-green)](#)
 
 ## Notice
+
 Localisation files are not included. Users must supply localisation data in the format shown by [100-Orange-Juice-Public-Defines](https://github.com/FruitbatFactory/100-Orange-Juice-Public-Defines/).
 
 The official repository cannot be legally included in this repository, but localisation files match this format and are expected to be in a directory called `./assets/define`. This project does not distribute or endorse any specific data source.
 
 Audio files are not included either.
 
-## Build:
-Requires C++26, and a build system such as CMake (minimum version 3.30) or XMake. The project has not yet been tested for GCC or MSVC, so we recommend only compiling with Clang for now. 
+## Build
+
+Requires C++26, and a build system such as CMake (minimum version 3.30) or XMake. The project has not yet been tested for GCC or MSVC, so we recommend only compiling with Clang for now.
 
 ### CMake
+
 > **Info:** Requires CMake ≥3.30 and the Ninja build system.
 > Makefiles generated by CMake currently do not support modules.
 
-Any way of calling CMake is fine. 
+Any way of calling CMake is fine.
 
 The simplest way to build the project is using the Makefile, which calls CMake:
+
 ```sh
 make build SANITIZERS=all
 ```
 
 Or, by manually calling CMake:
+
 ```sh
 # Sets source directory to current directory, build directory to ./build/, and generates Ninja build system files
 cmake -S . -B build -G Ninja
@@ -48,7 +54,8 @@ cmake --build build
 We have also written a Python script to simplify using CMake, which can be run with `./quick_cmake_build.py`. (Simply execute the script `quick_cmake_build.py` to compile the program with CMake.) If [JBang](https://github.com/jbangdev/jbang) is installed, `QuickCMakeBuild.java` can also be executed as a script.
 
 `quick_cmake_build.py` help:
-```
+
+```text
 usage: quick_cmake_build.py [-h] [-r] [-c | -ca | -n | -pd | -rc] [-g] [-s SANITISER [SANITISER ...]] [-v]
 
 Build script for openJuice project.
@@ -68,7 +75,8 @@ options:
 ```
 
 `QuickCMakeBuild.java` help:
-```
+
+```text
 Usage: QuickCMakeBuild [-ghrvV] [-s=<sanitisers>]... [-c | -ca | -n | -pd | -rc]
 Build script for openJuice project
   -c, --clean                Clean only project source files (no building)
@@ -94,10 +102,12 @@ Build script for openJuice project
 ```
 
 ### XMake
+
 > **Warning:** Building the project with XMake is currently not working. Please use CMake instead.
 > Currently XMake is not downloading and compiling the dependencies correctly.
 
 To build the project using XMake, do the following:
+
 ```sh
 # Generate the compile_commands.json file
 xmake project -k compile_commands
@@ -109,25 +119,29 @@ xmake
 xmake run
 ```
 
-## Usage:
+## Usage
+
 To be written.
 
 ## TODO:
+
 * Resolve all `#warning` markers, if possible
 * Complete design document
 * Continue documentation (Doxygen)
 * Implement online multiplayer functionality
 * Implement a game AI
 
 ## Dependencies
+
 This project uses the following external libraries:
-- [stdlib](https://github.com/mikomikotaishi/stdlib) (`std`)
-- [Discord Social SDK](https://discord.com/developers/social-sdk) (`discordpp`)
-- [FTXUI](https://github.com/ArthurSonzogni/FTXUI) (`ftxui`)
-- [nlohmann-json](https://github.com/nlohmann/json) (`nlohmann::json`)
-- [re2](https://github.com/google/re2) (`re2`)
-- [SFML](https://github.com/SFML/SFML) (`sfml`)
-- [tomlplusplus](https://github.com/marzer/tomlplusplus) (`tomlplusplus`)
+
+* [stdlib](https://github.com/mikomikotaishi/stdlib) (`std`)
+* [Discord Social SDK](https://discord.com/developers/social-sdk) (`discordpp`)
+* [FTXUI](https://github.com/ArthurSonzogni/FTXUI) (`ftxui`)
+* [nlohmann-json](https://github.com/nlohmann/json) (`nlohmann::json`)
+* [re2](https://github.com/google/re2) (`re2`)
+* [SFML](https://github.com/SFML/SFML) (`sfml`)
+* [tomlplusplus](https://github.com/marzer/tomlplusplus) (`tomlplusplus`)
 
 ECS adapted from [kawa_ecs](https://github.com/superPuero/kawa_ecs) (`kawa::ecs`).
 

dependencies.png

@@ -2,7 +2,7 @@
  * @file discordpp.cppm
  * @module discordpp
  * @brief Module file for Discord Social SDK operations.
- * @version 1.8.14856
+ * @version 1.9.16441
  */
 
 module;

deps/discordpp/discordpp.cppm

@@ -1346,6 +1346,7 @@ Discord_Client_SetNoAudioInputCallback(Discord_Client* self,
                                        Discord_FreeFn callback__userDataFree,
                                        void* callback__userData);
 void DISCORD_API Discord_Client_SetNoAudioInputThreshold(Discord_Client* self, float dBFSThreshold);
+void DISCORD_API Discord_Client_SetNoiseCancellation(Discord_Client* self, bool on);
 void DISCORD_API Discord_Client_SetNoiseSuppression(Discord_Client* self, bool on);
 void DISCORD_API Discord_Client_SetOpusHardwareCoding(Discord_Client* self,
                                                       bool encode,