Merge branch 'main' of https://github.com/flarialmc/dll into mainRepo

flarialmc · Aug 1, 2024 · 95f4c60 · 95f4c60
2 parents a0c104d + c6b7fad
commit 95f4c60
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 18 deletions.
diff --git a/main.cpp b/main.cpp
@@ -47,8 +47,10 @@ DWORD WINAPI init(HMODULE real)
                 if(SDK::hasInstanced && SDK::clientInstance != nullptr) {
                     if (SDK::clientInstance->getLocalPlayer() != nullptr) {
                         if(elapsed >= std::chrono::seconds(60)) {
-                            ModuleManager::onlineUsers.clear();
                             std::string name = SDK::clientInstance->getLocalPlayer()->playerName;
+
+                            /*
+                            ModuleManager::onlineUsers.clear();
                             ModuleManager::onlineUsers.push_back(Utils::removeColorCodes(name));
                             std::string pp = DownloadString("https://api.flarial.synthetix.host/users");
 
@@ -71,12 +73,16 @@ DWORD WINAPI init(HMODULE real)
                                         std::cerr << "Invalid or missing 'lastbeat' for player: " << player.key() << std::endl;
                                         continue;
                                     }
-                                    ModuleManager::onlineUsers.push_back(Utils::removeNonAlphanumeric(player.key()));
+
+                                    std::string name2 = Utils::removeNonAlphanumeric(player.key());
+                                    name2 = replaceAll(name2, "�", "");
+                                    ModuleManager::onlineUsers.push_back(name2);
                                 } catch (const std::exception& e) {
                                     std::cerr << "Error processing player: " << player.key() << " - " << e.what() << std::endl;
                                     continue;
                                 }
                             }
+                            */
 
                             std::string ipToSend = SDK::getServerIP();
 
@@ -92,9 +98,11 @@ DWORD WINAPI init(HMODULE real)
                             if(SDK::clientInstance->getLocalPlayer() != nullptr)
                             if (module->isEnabled()) {
                                 name = Utils::removeNonAlphanumeric(Utils::removeColorCodes(NickListener::original));
+                                name = replaceAll(name, "�", "");
+
                             }
                             // send thing
-                            DownloadString(std::format("https://api.flarial.synthetix.host/heartbeat/{}/{}",Utils::removeColorCodes(name),ipToSend));
+                            std::cout << DownloadString(std::format("https://api.flarial.synthetix.host/heartbeat/{}/{}",Utils::removeColorCodes(name),ipToSend)) << std::endl;
 
                             lastBeatTime = now;
                         }

diff --git a/src/Client/Hook/Hooks/Render/SwapchainHook.cpp b/src/Client/Hook/Hooks/Render/SwapchainHook.cpp
@@ -93,6 +93,18 @@ HRESULT SwapchainHook::swapchainCallback(IDXGISwapChain3 *pSwapChain, UINT syncI
     std::chrono::duration<float> elapsed = std::chrono::high_resolution_clock::now() - start;
     MC::frames += 1;
 
+    if (Client::settings.getSettingByName<bool>("killdx")->value) {
+        SwapchainHook::queue = nullptr;
+        ID3D12Device5 *d3d12device3;
+
+        if (SUCCEEDED(pSwapChain->GetDevice(IID_PPV_ARGS(&d3d12device3)))) {
+            Logger::debug("[SwapChain] Removed d3d12 device");
+            pSwapChain->ResizeBuffers(0, 0, 0, DXGI_FORMAT_UNKNOWN, 0);
+            d3d12device3->RemoveDevice();
+
+            return funcOriginal(pSwapChain, syncInterval, flags);
+        }
+    }
 
     if (elapsed.count() >= 0.5f) {
         // Calculate frame rate based on elapsed time
@@ -118,17 +130,6 @@ HRESULT SwapchainHook::swapchainCallback(IDXGISwapChain3 *pSwapChain, UINT syncI
     FlarialGUI::frameFactor = std::min(FlarialGUI::frameFactor, 1.0f);
 
     if (!SwapchainHook::init) {
-        if (Client::settings.getSettingByName<bool>("killdx")->value) {
-            ID3D12Device5 *d3d12device3;
-
-            if (SUCCEEDED(pSwapChain->GetDevice(IID_PPV_ARGS(&d3d12device3)))) {
-                Logger::debug("[SwapChain] Removed d3d12 device");
-                pSwapChain->ResizeBuffers(0, 0, 0, DXGI_FORMAT_UNKNOWN, 0);
-                d3d12device3->RemoveDevice();
-
-                return funcOriginal(pSwapChain, syncInterval, flags);
-            }
-        }
 
             if(SwapchainHook::queue == nullptr) {
 
@@ -154,8 +155,7 @@ HRESULT SwapchainHook::swapchainCallback(IDXGISwapChain3 *pSwapChain, UINT syncI
                 Memory::SafeRelease(eBackBuffer);
 
                 SwapchainHook::init = true;
-            }
-             else {
+            } else {
 
             ID3D12Device5 *device;
 

diff --git a/src/Utils/Utils.cpp b/src/Utils/Utils.cpp
@@ -51,8 +51,7 @@ std::string Utils::removeColorCodes(const std::string &input) {
 std::string Utils::removeNonAlphanumeric(const std::string &input) {
     std::string result;
     std::copy_if(input.begin(), input.end(), std::back_inserter(result), [](char c) {
-        return (c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z') || (c >= '0' && c <= '9') || c == '_' || c == ' ' ||
-               c == '-';
+        return (c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z') || (c >= '0' && c <= '9') || c == '_' || c == ' ';
     });
     return result;
 }