Merge branch 'master' of https://github.com/LatiteClient/Latite

Author: Plextora

LatiteRewrite.vcxproj

@@ -618,6 +618,7 @@
     <ClInclude Include="src\client\script\PluginManager.h" />
     <ClInclude Include="src\client\ui\TextBox.h" />
     <ClInclude Include="src\sdk\common\client\game\FontRepository.h" />
+    <ClInclude Include="src\sdk\common\client\game\Option.h" />
     <ClInclude Include="src\sdk\common\client\game\Options.h" />
     <ClInclude Include="src\sdk\common\client\gui\controls\UIControl.h" />
     <ClInclude Include="src\sdk\common\client\gui\controls\VisualTree.h" />

LatiteRewrite.vcxproj.filters

@@ -484,6 +484,7 @@
     <ClInclude Include="assets\lang\zh_TW.json" />
     <ClInclude Include="src\client\script\objects\OSScriptingObject.h" />
     <ClInclude Include="src\client\feature\module\impl\hud\FrameTimeDisplay.h" />
+    <ClInclude Include="src\sdk\common\client\game\Option.h" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="LatiteRewrite.rc" />

src/client/feature/module/impl/game/AutoGG.cpp

@@ -8,7 +8,7 @@ AutoGG::AutoGG() : Module("AutoGG", LocalizeString::get("client.module.autoGG.na
     addSetting("useCustomMessage", LocalizeString::get("client.module.autoGG.useCustomMessage.name"),
                LocalizeString::get("client.module.autoGG.useCustomMessage.desc"), useCustomMessage);
     addSetting("customMessage", LocalizeString::get("client.module.autoGG.customMessage.name"),
-               LocalizeString::get("client.module.autoGG.customMessage.desc"), customMessage);
+               LocalizeString::get("client.module.autoGG.customMessage.desc"), customMessage, "useCustomMessage"_istrue);
     listen<ChatMessageEvent>(static_cast<EventListenerFunc>(&AutoGG::onText));
 }
 

src/client/feature/module/impl/hud/FrameTimeDisplay.cpp

@@ -9,32 +9,23 @@ FrameTimeDisplay::FrameTimeDisplay() : TextModule("FrameTimeDisplay",
     addSliderSetting("interval", LocalizeString::get("client.textmodule.frameTimeDisplay.interval.name"),
                      LocalizeString::get("client.textmodule.frameTimeDisplay.interval.desc"), interval, FloatValue(0.f),
                      FloatValue(1000.f), FloatValue(100.f));
+
     this->prefix = TextValue(L"Frame time: ");
     this->suffix = TextValue(L"ms");
 }
 
 std::wstringstream FrameTimeDisplay::text(bool isDefault, bool inEditor) {
-	// normal caching in the TextModule constructor didnt work so im doing this
-    static std::wstring cachedText;
-    static std::chrono::steady_clock::time_point lastUpdate;
-    static float displayedValue = -1.0f;
-
-    const float currentValue = Latite::get().getTimings().getFrameTime();
     const std::chrono::time_point<std::chrono::steady_clock> now = std::chrono::steady_clock::now();
     const long long elapsed = std::chrono::duration_cast<std::chrono::milliseconds>(now - lastUpdate).count();
 
+    std::wstringstream ss;
+
     if (elapsed >= std::get<FloatValue>(interval)) {
-        std::wstringstream ss;
-        ss << std::fixed << std::setprecision(1) << currentValue;
-        cachedText = ss.str();
-        displayedValue = currentValue;
+        displayedValue = Latite::get().getTimings().getFrameTime();
         lastUpdate = now;
     }
 
-    std::wstringstream output;
-    if (!cachedText.empty()) {
-        output.str(cachedText);
-        output.clear();
-    }
-    return output;
+    ss << std::fixed << std::setprecision(1) << displayedValue;
+
+    return ss;
 }

src/client/feature/module/impl/hud/FrameTimeDisplay.h

@@ -8,4 +8,7 @@ class FrameTimeDisplay : public TextModule {
 	std::wstringstream text(bool isDefault, bool inEditor) override;
 private:
 	ValueType interval = FloatValue(100.f);
+
+	std::chrono::steady_clock::time_point lastUpdate;
+	float displayedValue = -1.0f;
 };

src/client/hook/impl/DXHooks.cpp

@@ -13,12 +13,40 @@ namespace {
         IDXGIOutput*,
         IDXGISwapChain1**);
 
-    SDK::Options* options = new SDK::Options();
     bool tearingSupported = false;
     bool isForceDisableVSync = false;
     std::shared_ptr<Hook> PresentHook;
     std::shared_ptr<Hook> ResizeBuffersHook;
     std::shared_ptr<Hook> ExecuteCommandListsHook;
+
+    // TODO: temporary, remove this
+    bool isGfxVsyncDisabled() {
+        wchar_t userProfile[MAX_PATH];
+        DWORD pathLen = GetEnvironmentVariableW(L"USERPROFILE", userProfile, MAX_PATH);
+        if (pathLen == 0 || pathLen >= MAX_PATH) {
+            return true;
+        }
+
+        std::wstring optionsPath(userProfile);
+        optionsPath +=
+            L"\\AppData\\Local\\Packages\\Microsoft.MinecraftUWP_8wekyb3d8bbwe\\LocalState\\games\\com.mojang\\minecraftpe\\options.txt";
+
+        std::ifstream file(optionsPath.c_str());
+        if (!file.is_open()) {
+            return true;
+        }
+
+        std::string line;
+        while (std::getline(file, line)) {
+            std::erase(line, '\r');
+            if (line.find("gfx_vsync:") == 0) {
+                return line != "gfx_vsync:0";
+            }
+        }
+
+        // default to enabled
+        return true;
+    }
 }
 
 void DXHooks::CheckForceDisableVSync() {
@@ -37,7 +65,7 @@ void DXHooks::CheckTearingSupport() {
             DXGI_FEATURE_PRESENT_ALLOW_TEARING,
             &allowTearing,
             sizeof(allowTearing)))) {
-            if (allowTearing && !options->IsGfxVSyncEnabled()) {
+            if (allowTearing && !isGfxVsyncDisabled()) {
                 tearingSupported = true;
             }
         }

src/sdk/common/client/game/ClientInstance.cpp

@@ -82,7 +82,7 @@ SDK::GuiData* SDK::ClientInstance::getGuiData() {
 }
 
 SDK::Options* SDK::ClientInstance::getOptions() {
-    return memory::callVirtual<Options*>(this, 0xC7);
+    return memory::callVirtual<Options*>(this, 0xC3);
 }
 
 void SDK::ClientInstance::grabCursor() {

src/sdk/common/client/game/Option.h

@@ -0,0 +1,29 @@
+#pragma once
+namespace SDK {
+	enum class OptionID {
+		Vsync = 54,
+	};
+
+	class Option {
+	public:
+
+		class Impl {
+		private:
+			char pad[0x124];
+		public:
+			OptionID id;
+		};
+
+
+		std::unique_ptr<Impl> impl;
+
+		virtual ~Option() = 0;
+	};
+
+	class BoolOption : public Option {
+	public:
+		bool value;
+		bool defaultValue;
+		std::function<bool(bool)> coerceValueCallback;
+	};
+}

src/sdk/common/client/game/Options.cpp

@@ -1,30 +1,2 @@
 #include "pch.h"
 #include "Options.h"
-
-bool SDK::Options::IsGfxVSyncEnabled() {
-	wchar_t userProfile[MAX_PATH];
-	DWORD pathLen = GetEnvironmentVariableW(L"USERPROFILE", userProfile, MAX_PATH);
-	if (pathLen == 0 || pathLen >= MAX_PATH) {
-		return true;
-	}
-
-	std::wstring optionsPath(userProfile);
-	optionsPath +=
-		L"\\AppData\\Local\\Packages\\Microsoft.MinecraftUWP_8wekyb3d8bbwe\\LocalState\\games\\com.mojang\\minecraftpe\\options.txt";
-
-	std::ifstream file(optionsPath.c_str());
-	if (!file.is_open()) {
-		return true;
-	}
-
-	std::string line;
-	while (std::getline(file, line)) {
-		std::erase(line, '\r');
-		if (line.find("gfx_vsync:") == 0) {
-			return line != "gfx_vsync:0";
-		}
-	}
-
-	// default to enabled
-	return true;
-}

src/sdk/common/client/game/Options.h

@@ -1,16 +1,37 @@
 #pragma once
+#include "Option.h"
+
 namespace SDK {
-	class Options {
+	
+
+	class Options : std::enable_shared_from_this<Options> {
 	public:
-		void setPlayerViewPerspective(int) {
-			// TODO: lol
+		void setPlayerViewPerspective(int perspective) {
+			memory::callVirtual<void>(this, 136, perspective);
 		}
 
 		int getPlayerViewPerspective() {
-			// TODO: lol
-			return 0;
+			return memory::callVirtual<int>(this, 137);
 		}
 
-		bool IsGfxVSyncEnabled();
+		bool getVsync() {
+			auto it = std::find_if(options.begin(), options.end(), [](std::unique_ptr<Option>& option) {
+				if (option && option->impl->id == OptionID::Vsync) {
+					return true;
+				}
+				});
+
+			if (it == options.end()) {
+				return false;
+			}
+
+			return static_cast<BoolOption*>(it->get())->value;
+		}
+
+	private:
+		void* unknown;
+		std::array<std::unique_ptr<class Option>, 788> options;
+
+		virtual ~Options() = 0;
 	};
 }