Use new input action system

Author: FrederoxDev

src/dllmain.cpp

@@ -6,6 +6,7 @@
 
 #include <amethyst/Log.h>
 #include <amethyst/HookManager.h>
+#include <amethyst/InputManager.h>
 
 #include <minecraft/src/common/world/item/Item.h>
 #include <minecraft/src-client/common/client/renderer/screen/MinecraftUIRenderContext.h>
@@ -19,7 +20,6 @@
 #include "F3Screen.h"
 
 HookManager hookManager;
-
 Item::_appendFormattedHovertext _Item_appendFormattedHovertext;
 
 static void Item_appendFormattedHovertext(Item* self, const ItemStackBase& itemStack, Level& level, std::string& text, uint8_t a5) {
@@ -49,60 +49,23 @@ extern "C" __declspec(dllexport) void OnRenderUI(ScreenView * screenView, Minecr
     if (shouldRenderF3) f3Screen.Render(ctx);
 }
 
-extern "C" __declspec(dllexport) void Shutdown() {
-    hookManager.Shutdown();
-}
-
-VanillaClientInputMappingFactory::__createBaseNormalGamePlayKeyboardAndMouseMapping __createBaseNormalGamePlayKeyboardAndMouseMapping;
-
-std::string testButtonId = "button.test";
-int32_t keyNum = 0x72;
-bool addedAlready = false;
-
-static void* _createBaseNormalGamePlayKeyboardAndMouseMapping(VanillaClientInputMappingFactory* self, KeyboardInputMapping* keyboardMap, MouseInputMapping* mouseMap) {
-    void* ret = __createBaseNormalGamePlayKeyboardAndMouseMapping(self, keyboardMap, mouseMap);
-    //self->_bindActionToKeyboardAndMouseInput(keyboardMap, mouseMap, &testButtonId, (Remapping::ActionEnum)100, FocusImpact::Neutral);
-
-    //Log::Info("\n_createBaseNormalGamePlayKeyboardAndMouseMapping");
-
-    //Keymapping newKeymapping = { "key.test", { keyNum }, true };
-
-    //if (!addedAlready) {
-    //    self->mLayout->mDefaultMappings.push_back(newKeymapping); // key...
-    //    self->mLayout->mKeymappings.push_back(newKeymapping);
-    //    addedAlready = true;
-    //}
-
-    /*for (auto it = self->mActiveInputMappings.begin(); it != self->mActiveInputMappings.end(); ++it) {
-        const std::string mappingName = it->first;
-        KeyboardKeyBinding key = { testButtonId, keyNum, FocusImpact::Neutral };
-
-        InputMapping inputMapping = it->second;
-        inputMapping.keyboardMapping.keyBindings.push_back(key);
-    }*/
-
-    return ret;
+extern "C" __declspec(dllexport) void RegisterInputs(InputManager * inputManager) {
+    inputManager->RegisterInput("f3", 0x72, false); 
 }
 
-extern "C" __declspec(dllexport) void OnStartJoinGame(ClientInstance * clientInstance) {
-    /*InputHandler* handler = clientInstance->inputHandler->mInputHandler;
+extern "C" __declspec(dllexport) void Initialize(const char* gameVersion, InputManager * inputManager) {
+    MH_Initialize();
 
-    handler->registerButtonDownHandler(testButtonId, [](FocusImpact impact, IClientInstance& instance) {
-        Log::Info("{} pressed!!", testButtonId);
+    inputManager->AddButtonDownHandler("f3", [](FocusImpact focus, IClientInstance client) {
         shouldRenderF3 = !shouldRenderF3;
-    }, false);*/
-}
-
-extern "C" __declspec(dllexport) void Initialize(const char* gameVersion) {
-    MH_Initialize();
+    });
 
     hookManager.CreateHook(
         SigScan("40 55 53 56 57 41 54 41 55 41 56 41 57 48 8D 6C 24 ? 48 81 EC ? ? ? ? 48 8B 05 ? ? ? ? 48 33 C4 48 89 45 ? 49 8B F1 4C 89 44 24 ? 4C 8B F2 48 8B D9"),
         &Item_appendFormattedHovertext, reinterpret_cast<void**>(&_Item_appendFormattedHovertext)
     );
+}
 
-    /*hookManager.CreateHook(
-        SigScan("48 89 5C 24 ? 55 56 57 48 8B EC 48 83 EC ? 49 8B F0 48 8B DA 48 8B F9 E8"),
-        &_createBaseNormalGamePlayKeyboardAndMouseMapping, reinterpret_cast<void**>(&__createBaseNormalGamePlayKeyboardAndMouseMapping)
-    );*/
+extern "C" __declspec(dllexport) void Shutdown() {
+    hookManager.Shutdown();
 }