Merge branch 'main' of https://github.com/outercloudstudio/Amethyst

FrederoxDev · Apr 7, 2024 · 60ef4df · 60ef4df
2 parents e6c7dd1 + 7119838
commit 60ef4df
Show file tree

Hide file tree

Showing 211 changed files with 708 additions and 335 deletions.
diff --git a/AmethystAPI/CMakeLists.txt b/AmethystAPI/CMakeLists.txt
@@ -17,7 +17,7 @@ add_compile_definitions(_ITERATOR_DEBUG_LEVEL=0)
 set_property(GLOBAL PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreadedDLL")
 
 file(GLOB_RECURSE SOURCES "src/*.cpp" "src/*.c" "src/*.asm")
-file(GLOB_RECURSE HEADERS "src/*.h" "src/*.hpp")
+file(GLOB_RECURSE HEADERS "src/*.hpp")
 
 # Create AmethystAPI as a .lib
 add_library(${PROJECT_NAME} STATIC 
@@ -26,8 +26,7 @@ add_library(${PROJECT_NAME} STATIC
     src/minecraft/src/common/world/item/Item.asm
     src/minecraft/src/common/world/level/block/BlockLegacy.asm
     src/minecraft/src-deps/minecraftrenderer/renderer/MaterialPtr.asm
-)
-
+) 
 
 # Amethyst Dependencies
 target_include_directories(${PROJECT_NAME} PUBLIC 
@@ -39,7 +38,6 @@ target_link_libraries(${PROJECT_NAME} PUBLIC
     ${CMAKE_CURRENT_SOURCE_DIR}/lib/fmt.lib
 )
 
-
 # EnTT Compile options
 target_compile_definitions(${PROJECT_NAME} PUBLIC ENTT_PACKED_PAGE=128)
 

diff --git a/AmethystAPI/src/amethyst/Config.cpp b/AmethystAPI/src/amethyst/Config.cpp
@@ -1,4 +1,4 @@
-#include "amethyst/Config.h"
+#include "amethyst/Config.hpp"
 
 Config::Config()
 {

diff --git a/AmethystAPI/src/amethyst/Config.h → AmethystAPI/src/amethyst/Config.hpp b/AmethystAPI/src/amethyst/Config.h → AmethystAPI/src/amethyst/Config.hpp
@@ -1,6 +1,6 @@
 #pragma once
 #include "Json.hpp"
-#include "amethyst/Log.h"
+#include "amethyst/Log.hpp"
 #include <string>
 #include <vector>
 using json = nlohmann::json;

diff --git a/AmethystAPI/src/amethyst/Log.cpp b/AmethystAPI/src/amethyst/Log.cpp
@@ -1,4 +1,4 @@
-#include "amethyst/Log.h"
+#include "amethyst/Log.hpp"
 
 namespace Log {
 FILE* fp;

diff --git a/AmethystAPI/src/amethyst/Log.h → AmethystAPI/src/amethyst/Log.hpp b/AmethystAPI/src/amethyst/Log.h → AmethystAPI/src/amethyst/Log.hpp
@@ -1,5 +1,5 @@
 #pragma once
-#include "Utility.h"
+#include "Utility.hpp"
 #include <Windows.h>
 #include <fmt/color.h>
 #include <fmt/core.h>

diff --git a/AmethystAPI/src/amethyst/Memory.cpp b/AmethystAPI/src/amethyst/Memory.cpp
@@ -1,4 +1,4 @@
-#include "amethyst/Memory.h"
+#include "amethyst/Memory.hpp"
 #include <libhat/Scanner.hpp>
 #include <mutex>
 #include <thread>

diff --git a/AmethystAPI/src/amethyst/Memory.h → AmethystAPI/src/amethyst/Memory.hpp b/AmethystAPI/src/amethyst/Memory.h → AmethystAPI/src/amethyst/Memory.hpp
@@ -1,5 +1,5 @@
 #pragma once
-#include "amethyst/Log.h"
+#include "amethyst/Log.hpp"
 #include <chrono>
 #include <cstdint>
 #include <psapi.h>

diff --git a/AmethystAPI/src/amethyst/MinecraftVtables.cpp b/AmethystAPI/src/amethyst/MinecraftVtables.cpp
@@ -1,6 +1,6 @@
-#include "amethyst/MinecraftVtables.h"
-#include "minecraft/src/common/world/level/block/BlockLegacy.h"
-#include "minecraft/src-client/common/client/renderer/RenderMaterialGroup.h"
+#include "amethyst/MinecraftVtables.hpp"
+#include "minecraft/src/common/world/level/block/BlockLegacy.hpp"
+#include "minecraft/src-client/common/client/renderer/RenderMaterialGroup.hpp"
 
 extern "C" void* Item_vtable = nullptr;
 

diff --git a/AmethystAPI/src/amethyst/MinecraftVtables.h → ...hystAPI/src/amethyst/MinecraftVtables.hpp b/AmethystAPI/src/amethyst/MinecraftVtables.h → ...hystAPI/src/amethyst/MinecraftVtables.hpp
@@ -1,4 +1,4 @@
 #pragma once
-#include <amethyst/Memory.h>
+#include <amethyst/Memory.hpp>
 
 void InitializeVtablePtrs();
diff --git a/AmethystAPI/src/amethyst/Utility.cpp b/AmethystAPI/src/amethyst/Utility.cpp
@@ -1,4 +1,4 @@
-#include "amethyst/Utility.h"
+#include "amethyst/Utility.hpp"
 #include <winrt/base.h>
 
 std::string GetAmethystFolder()

diff --git a/AmethystAPI/src/amethyst/Utility.h → AmethystAPI/src/amethyst/Utility.hpp b/AmethystAPI/src/amethyst/Utility.h → AmethystAPI/src/amethyst/Utility.hpp
diff --git a/...PI/src/amethyst/runtime/AmethystContext.h → .../src/amethyst/runtime/AmethystContext.hpp b/...PI/src/amethyst/runtime/AmethystContext.h → .../src/amethyst/runtime/AmethystContext.hpp
@@ -1,13 +1,13 @@
 #pragma once
-#include "amethyst/runtime/HookManager.h"
-#include "amethyst/runtime/events/EventManager.h"
-#include "amethyst/runtime/input/InputManager.h"
-#include "amethyst/runtime/minecraft/MinecraftPackageInfo.h"
-#include "amethyst/runtime/mod/Mod.h"
-#include "amethyst/runtime/patchManager/PatchManager.h"
-#include "minecraft/src-client/common/client/game/ClientInstance.h"
-#include "minecraft/src-client/common/client/input/MinecraftInputHandler.h"
-#include "minecraft/src-client/common/client/options/Options.h"
+#include "amethyst/runtime/HookManager.hpp"
+#include "amethyst/runtime/events/EventManager.hpp"
+#include "amethyst/runtime/input/InputManager.hpp"
+#include "amethyst/runtime/minecraft/MinecraftPackageInfo.hpp"
+#include "amethyst/runtime/mod/Mod.hpp"
+#include "amethyst/runtime/patchManager/PatchManager.hpp"
+#include "minecraft/src-client/common/client/game/ClientInstance.hpp"
+#include "minecraft/src-client/common/client/input/MinecraftInputHandler.hpp"
+#include "minecraft/src-client/common/client/options/Options.hpp"
 
 class AmethystContext {
 public:

diff --git a/AmethystAPI/src/amethyst/runtime/HookManager.cpp b/AmethystAPI/src/amethyst/runtime/HookManager.cpp
@@ -1,12 +1,13 @@
-#include "HookManager.h"
+#include "HookManager.hpp"
+
+#include <ranges>
 
 /*
 Disables any hooks and un-caches any stored addresses
 */
 void HookManager::Shutdown()
 {
-    for (auto it = mHooks.rbegin(); it != mHooks.rend(); ++it) {
-        auto* hook = *it;
+    for (auto hook : std::ranges::reverse_view(mHooks)) {
         *hook = {};
     }
 

diff --git a/...ystAPI/src/amethyst/runtime/HookManager.h → ...tAPI/src/amethyst/runtime/HookManager.hpp b/...ystAPI/src/amethyst/runtime/HookManager.h → ...tAPI/src/amethyst/runtime/HookManager.hpp
@@ -1,8 +1,8 @@
 #pragma once
 #include "amethyst-deps/safetyhook.hpp"
-#include "amethyst/Log.h"
-#include "amethyst/Memory.h"
-#include "minecraft/src-deps/core/string/StringHash.h"
+#include "amethyst/Log.hpp"
+#include "amethyst/Memory.hpp"
+#include "minecraft/src-deps/core/string/StringHash.hpp"
 #include <unordered_map>
 #include <vector>
 
@@ -62,8 +62,7 @@ class HookManager {
             auto result = SigScanSafe(signature);
 
             if (!result.has_value()) {
-                std::string error = fmt::format("Failed to find function: \"{}\"\nUsing signature: \"{}\"", function_id::name<Func>(), signature);
-                throw std::exception(error.c_str());
+                Assert("Failed to find function: \"{}\"\nUsing signature: \"{}\"", function_id::name<Func>(), signature);
             }
 
             mFuncHashToOriginalAddress[hash] = result.value();

diff --git a/...stAPI/src/amethyst/runtime/events/Event.h → ...API/src/amethyst/runtime/events/Event.hpp b/...stAPI/src/amethyst/runtime/events/Event.h → ...API/src/amethyst/runtime/events/Event.hpp
diff --git a/...rc/amethyst/runtime/events/EventManager.h → .../amethyst/runtime/events/EventManager.hpp b/...rc/amethyst/runtime/events/EventManager.h → .../amethyst/runtime/events/EventManager.hpp
@@ -1,11 +1,11 @@
 #pragma once
-#include "Event.h"
-#include "minecraft/src-client/common/client/game/ClientInstance.h"
-#include "minecraft/src-client/common/client/gui/ScreenView.h"
-#include "minecraft/src/common/world/item/registry/ItemRegistry.h"
-#include "minecraft/src/common/world/level/block/definition/BlockDefinitionGroup.h"
-#include "minecraft/src-client/common/client/renderer/game/LevelRenderer.h"
-#include "amethyst/runtime/input/InputManager.h"
+#include "Event.hpp"
+#include "minecraft/src-client/common/client/game/ClientInstance.hpp"
+#include "minecraft/src-client/common/client/gui/ScreenView.hpp"
+#include "minecraft/src/common/world/item/registry/ItemRegistry.hpp"
+#include "minecraft/src/common/world/level/block/definition/BlockDefinitionGroup.hpp"
+#include "minecraft/src-client/common/client/renderer/game/LevelRenderer.hpp"
+#include "amethyst/runtime/input/InputManager.hpp"
 
 class FrameRenderObject;
 
@@ -16,7 +16,8 @@ namespace Amethyst {
         Event<> onRequestLeaveGame;
 
         Event<LevelRenderer*, ScreenContext*, FrameRenderObject*> onRenderLevel;
-        Event<ScreenView*, UIRenderContext*> onRenderUI;
+        Event<ScreenView*, UIRenderContext*> beforeRenderUI;
+        Event<ScreenView*, UIRenderContext*> afterRenderUI;
         Event<> update;
 
         Event<InputManager*> registerInputs;
@@ -32,7 +33,8 @@ namespace Amethyst {
         {
             onStartJoinGame.Shutdown();
             onRequestLeaveGame.Shutdown();
-            onRenderUI.Shutdown();
+            beforeRenderUI.Shutdown();
+            afterRenderUI.Shutdown();
             onRenderLevel.Shutdown();
             update.Shutdown();
             registerInputs.Shutdown();

diff --git a/.../src/amethyst/runtime/input/InputAction.h → ...rc/amethyst/runtime/input/InputAction.hpp b/.../src/amethyst/runtime/input/InputAction.h → ...rc/amethyst/runtime/input/InputAction.hpp
diff --git a/AmethystAPI/src/amethyst/runtime/input/InputManager.cpp b/AmethystAPI/src/amethyst/runtime/input/InputManager.cpp
@@ -1,7 +1,7 @@
 #include <utility>
 
-#include "amethyst/runtime/input/InputManager.h"
-#include "amethyst/runtime/AmethystContext.h"
+#include "amethyst/runtime/input/InputManager.hpp"
+#include "amethyst/runtime/AmethystContext.hpp"
 
 Amethyst::InputManager::InputManager(AmethystContext *amethyst) {
     mAmethyst = amethyst;

diff --git a/...src/amethyst/runtime/input/InputManager.h → ...c/amethyst/runtime/input/InputManager.hpp b/...src/amethyst/runtime/input/InputManager.h → ...c/amethyst/runtime/input/InputManager.hpp
@@ -1,8 +1,8 @@
 #pragma once
 #include <vector>
-#include "minecraft/src-client/common/client/options/Options.h"
-#include "amethyst/Log.h"
-#include <minecraft/src-client/common/client/input/ClientInputHandler.h>
+#include "minecraft/src-client/common/client/options/Options.hpp"
+#include "amethyst/Log.hpp"
+#include <minecraft/src-client/common/client/input/ClientInputHandler.hpp>
 
 class AmethystContext;
 

diff --git a/AmethystAPI/src/amethyst/runtime/minecraft/MinecraftPackageInfo.cpp b/AmethystAPI/src/amethyst/runtime/minecraft/MinecraftPackageInfo.cpp
@@ -1,6 +1,6 @@
-#include "MinecraftPackageInfo.h"
-#include "amethyst/Log.h"
-#include "amethyst/Utility.h"
+#include "MinecraftPackageInfo.hpp"
+#include "amethyst/Log.hpp"
+#include "amethyst/Utility.hpp"
 
 Amethyst::MinecraftPackageInfo::MinecraftPackageInfo()
 {
@@ -18,13 +18,13 @@ Amethyst::MinecraftPackageInfo::MinecraftPackageInfo()
         package.Id().Version().Major,
         package.Id().Version().Minor,
         package.Id().Version().Build,
-        std::format(
-            "%i",
+        fmt::format(
+            "{}",
             package.Id().Version().Revision
             ),
         "",
-        std::format(
-            "%i.%i.%i.%i",
+        fmt::format(
+            "{}.{}.{}.{}",
             package.Id().Version().Major,
             package.Id().Version().Minor,
             package.Id().Version().Build,

diff --git a/.../runtime/minecraft/MinecraftPackageInfo.h → ...untime/minecraft/MinecraftPackageInfo.hpp b/.../runtime/minecraft/MinecraftPackageInfo.h → ...untime/minecraft/MinecraftPackageInfo.hpp
@@ -1,4 +1,4 @@
-#include "minecraft/src-deps/core/semVer/SemVersion.h"
+#include "minecraft/src-deps/core/semVer/SemVersion.hpp"
 #include <string>
 #include <winrt/Windows.ApplicationModel.h>
 

diff --git a/AmethystAPI/src/amethyst/runtime/mod/Mod.cpp b/AmethystAPI/src/amethyst/runtime/mod/Mod.cpp
@@ -1,4 +1,4 @@
-#include "Mod.h"
+#include "Mod.hpp"
 #include <fstream>
 
 Mod::Mod(std::string modName)

diff --git a/AmethystAPI/src/amethyst/runtime/mod/Mod.h → AmethystAPI/src/amethyst/runtime/mod/Mod.hpp b/AmethystAPI/src/amethyst/runtime/mod/Mod.h → AmethystAPI/src/amethyst/runtime/mod/Mod.hpp
@@ -1,8 +1,8 @@
 #pragma once
 #include "Json.hpp"
 #include <Windows.h>
-#include <amethyst/Log.h>
-#include <amethyst/Utility.h>
+#include <amethyst/Log.hpp>
+#include <amethyst/Utility.hpp>
 #include <filesystem>
 #include <iostream>
 #include <shlobj.h>

diff --git a/AmethystAPI/src/amethyst/runtime/patchManager/PatchManager.cpp b/AmethystAPI/src/amethyst/runtime/patchManager/PatchManager.cpp
@@ -1,6 +1,6 @@
-#include "PatchManager.h"
-#include "amethyst/Log.h"
-#include "amethyst/Memory.h"
+#include "PatchManager.hpp"
+#include "amethyst/Log.hpp"
+#include "amethyst/Memory.hpp"
 
 namespace Amethyst {
     // Returns false if the patch failed to apply

diff --git a/...thyst/runtime/patchManager/PatchManager.h → ...yst/runtime/patchManager/PatchManager.hpp b/...thyst/runtime/patchManager/PatchManager.h → ...yst/runtime/patchManager/PatchManager.hpp
diff --git a/AmethystAPI/src/amethyst/ui/NinesliceHelper.cpp b/AmethystAPI/src/amethyst/ui/NinesliceHelper.cpp
@@ -1,4 +1,4 @@
-#include "amethyst/ui/NinesliceHelper.h"
+#include "amethyst/ui/NinesliceHelper.hpp"
 
 Amethyst::NinesliceHelper::NinesliceHelper(int textureWidth, int textureHeight, int ninesliceWidth, int ninesliceHeight)
 {

diff --git a/...hystAPI/src/amethyst/ui/NinesliceHelper.h → ...stAPI/src/amethyst/ui/NinesliceHelper.hpp b/...hystAPI/src/amethyst/ui/NinesliceHelper.h → ...stAPI/src/amethyst/ui/NinesliceHelper.hpp
@@ -1,6 +1,6 @@
 #pragma once
-#include "minecraft/src/common/world/phys/Vec2.h"
-#include "minecraft/src-client/common/client/renderer/screen/MinecraftUIRenderContext.h"
+#include "minecraft/src/common/world/phys/Vec2.hpp"
+#include "minecraft/src-client/common/client/renderer/screen/MinecraftUIRenderContext.hpp"
 #include "glm/glm.hpp"
 
 namespace Amethyst {

diff --git a/AmethystAPI/src/minecraft/src-client/common/client/game/ClientInstance.cpp b/AmethystAPI/src/minecraft/src-client/common/client/game/ClientInstance.cpp
@@ -1,4 +1,4 @@
-#include "minecraft/src-client/common/client/game/ClientInstance.h"
+#include "minecraft/src-client/common/client/game/ClientInstance.hpp"
 
 // void ClientInstance::requestLeaveGame(char switchScreen, char sync) {
 //     using function = void(__thiscall*)(ClientInstance*, char, char);

diff --git a/...lient/common/client/game/ClientInstance.h → ...ent/common/client/game/ClientInstance.hpp b/...lient/common/client/game/ClientInstance.h → ...ent/common/client/game/ClientInstance.hpp
@@ -1,10 +1,10 @@
 #pragma once
-#include "minecraft/src-client/common/client/game/MinecraftGame.h"
-#include "minecraft/src-client/common/client/gui/gui/GuiData.h"
-#include "minecraft/src-client/common/client/player/LocalPlayer.h"
-#include "minecraft/src/common/world/level/BlockSource.h"
+#include "minecraft/src-client/common/client/game/MinecraftGame.hpp"
+#include "minecraft/src-client/common/client/gui/gui/GuiData.hpp"
+#include "minecraft/src-client/common/client/player/LocalPlayer.hpp"
+#include "minecraft/src/common/world/level/BlockSource.hpp"
 #include <cstdint>
-#include "minecraft/src-deps/renderer/Camera.h"
+#include "minecraft/src-deps/renderer/Camera.hpp"
 
 class Minecraft;
 class ClientInputHandler;

diff --git a/...client/common/client/game/MinecraftGame.h → ...ient/common/client/game/MinecraftGame.hpp b/...client/common/client/game/MinecraftGame.h → ...ient/common/client/game/MinecraftGame.hpp
diff --git a/AmethystAPI/src/minecraft/src-client/common/client/gui/ScreenView.cpp b/AmethystAPI/src/minecraft/src-client/common/client/gui/ScreenView.cpp
@@ -1 +1 @@
-#include "minecraft/src-client/common/client/gui/ScreenView.h"
+#include "minecraft/src-client/common/client/gui/ScreenView.hpp"
diff --git a/...src-client/common/client/gui/ScreenView.h → ...c-client/common/client/gui/ScreenView.hpp b/...src-client/common/client/gui/ScreenView.h → ...c-client/common/client/gui/ScreenView.hpp
@@ -1,6 +1,6 @@
 #pragma once
-#include "minecraft/src-client/common/client/renderer/screen/MinecraftUIRenderContext.h"
-#include "minecraft/src-client/common/client/gui/gui/VisualTree.h"
+#include "minecraft/src-client/common/client/renderer/screen/MinecraftUIRenderContext.hpp"
+#include "minecraft/src-client/common/client/gui/gui/VisualTree.hpp"
 
 // Not sure if this is correct..
 using UIRenderContext = MinecraftUIRenderContext;

diff --git a/AmethystAPI/src/minecraft/src-client/common/client/gui/controls/SliderComponent.hpp b/AmethystAPI/src/minecraft/src-client/common/client/gui/controls/SliderComponent.hpp
@@ -0,0 +1,13 @@
+#pragma once
+#include "minecraft/src-client/common/client/gui/controls/UIComponent.hpp"
+#include <cstddef>
+#include <cstdint>
+
+class SliderComponent : public UIComponent {
+public:
+    /* this + 16 */ std::byte padding16[48];
+    /* this + 64 */ float mPercentage;
+
+    // 1.20.71.1 - 40 53 48 83 EC ? 48 8B 05 ? ? ? ? 48 33 C4 48 89 44 24 ? 48 8B D9 F3 0F 11 4C 24 ? 48 8B 49
+    int64_t _updateSliderFromStepSize(int64_t a2, int64_t a3);
+};
diff --git a/AmethystAPI/src/minecraft/src-client/common/client/gui/controls/TextComponent.cpp b/AmethystAPI/src/minecraft/src-client/common/client/gui/controls/TextComponent.cpp
@@ -0,0 +1,7 @@
+#include "minecraft/src-client/common/client/gui/controls/TextComponent.hpp"
+
+void TextComponent::setText(const std::string& text) {
+    using function = decltype(&TextComponent::setText);
+    static auto func = std::bit_cast<function>(SigScan("48 89 5C 24 ? 48 89 74 24 ? 57 48 83 EC ? 48 8D B9 ? ? ? ? 48 8B DA 48 83 7F"));
+    (this->*func)(text);
+}
diff --git a/AmethystAPI/src/minecraft/src-client/common/client/gui/controls/TextComponent.hpp b/AmethystAPI/src/minecraft/src-client/common/client/gui/controls/TextComponent.hpp
@@ -0,0 +1,17 @@
+#pragma once
+#include "minecraft/src-client/common/client/gui/controls/UIComponent.hpp"
+#include <cstddef>
+#include <cstdint>
+#include <string>
+#include <amethyst/Memory.hpp>
+
+class TextComponent : public UIComponent {
+public:
+    /* this + 16  */ std::byte padding16[288];
+    /* this + 304 */ std::string mLabel;
+
+    // 1.20.71.1 - 48 89 5C 24 ? 48 89 74 24 ? 57 48 83 EC ? 48 8D B9 ? ? ? ? 48 8B DA 48 83 7F
+    void setText(const std::string& text);
+};
+
+///* this + 464 */ bool mCachedTextDirty;
diff --git a/AmethystAPI/src/minecraft/src-client/common/client/gui/controls/ToggleComponent.hpp b/AmethystAPI/src/minecraft/src-client/common/client/gui/controls/ToggleComponent.hpp
@@ -0,0 +1,14 @@
+#pragma once
+#include "minecraft/src-client/common/client/gui/controls/UIComponent.hpp"
+#include <cstddef>
+#include <cstdint>
+
+class ToggleComponent : public UIComponent {
+public:
+    /* this + 16  */ std::byte padding16[128];
+    /* this + 144 */ bool mChecked : 1;
+    /* this + 144 */ bool mHover : 1;
+
+    // 1.20.71.1 - 48 89 5C 24 ? 48 89 6C 24 ? 48 89 74 24 ? 57 48 83 EC ? 48 8B F9 0F B6 81
+    int64_t setChecked(int64_t checked, int64_t a3);
+};
diff --git a/AmethystAPI/src/minecraft/src-client/common/client/gui/controls/UIComponent.hpp b/AmethystAPI/src/minecraft/src-client/common/client/gui/controls/UIComponent.hpp
@@ -0,0 +1,10 @@
+#pragma once
+#include <cstdint>
+
+class UIControl;
+
+class UIComponent {
+public:
+    /* this + 0 */ uintptr_t** vtable;
+    /* this + 8 */ UIControl& mOwner;
+};
diff --git a/...nt/gui/controls/renderers/HoverRenderer.h → .../gui/controls/renderers/HoverRenderer.hpp b/...nt/gui/controls/renderers/HoverRenderer.h → .../gui/controls/renderers/HoverRenderer.hpp