Merge pull request #3 from thetrueoneshots/re-callbacks

gijsgroenewegen · web-flow · commit e1c1299f8634 · 2021-10-25T22:29:00.000+02:00
Reversed engineered callbacks and start menu
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,2 @@
+.vs
+out
diff --git a/CubeModLauncher/CMakeSettings.json b/CubeModLauncher/CMakeSettings.json
@@ -0,0 +1,16 @@
+﻿{
+  "configurations": [
+    {
+      "name": "x64-Clang-Release",
+      "generator": "Ninja",
+      "configurationType": "RelWithDebInfo",
+      "buildRoot": "${projectDir}\\out\\build\\${name}",
+      "installRoot": "${projectDir}\\out\\install\\${name}",
+      "cmakeCommandArgs": "",
+      "buildCommandArgs": "",
+      "ctestCommandArgs": "",
+      "inheritEnvironments": [ "clang_cl_x64_x64" ],
+      "variables": []
+    }
+  ]
+}
diff --git a/CubeModLoader/CMakeLists.txt b/CubeModLoader/CMakeLists.txt
@@ -1,7 +1,9 @@
 cmake_minimum_required (VERSION 3.8)
 project(project_CubeModLoader)
+add_subdirectory(CWSDK)
 add_library (CubeModLoader SHARED 
     crc.cpp
     DLL.cpp
     main.cpp
-    mutex.cpp)
+    mutex.cpp "macros.h" "callbacks/gui/cube__StartMenuWidget__Draw.h" "callbacks/game/cube__Game__MouseUp.h")
+target_link_libraries (CubeModLoader LINK_PUBLIC CWSDK)
diff --git a/CubeModLoader/CMakeSettings.json b/CubeModLoader/CMakeSettings.json
@@ -0,0 +1,16 @@
+﻿{
+  "configurations": [
+    {
+      "name": "x64-Clang-Release",
+      "generator": "Ninja",
+      "configurationType": "RelWithDebInfo",
+      "buildRoot": "${projectDir}\\out\\build\\${name}",
+      "installRoot": "${projectDir}\\out\\install\\${name}",
+      "cmakeCommandArgs": "",
+      "buildCommandArgs": "",
+      "ctestCommandArgs": "",
+      "inheritEnvironments": [ "clang_cl_x64_x64" ],
+      "variables": []
+    }
+  ]
+}
diff --git a/CubeModLoader/CWSDK b/CubeModLoader/CWSDK
@@ -0,0 +1 @@
+Subproject commit 6c3c518adec22d591721b96e1d38db5490f6010e
diff --git a/CubeModLoader/DLL.h b/CubeModLoader/DLL.h
@@ -2,7 +2,9 @@
 #define DLL_H
 #include <iostream>
 #include <windows.h>
-#include "GenericMod.h"
+#define MODLOADER 1
+#include "CWSDK/cwsdk.h"
+//#include "GenericMod.h"
 
 class DLL
 {
diff --git a/CubeModLoader/callbacks/ChatHandler.h b/CubeModLoader/callbacks/ChatHandler.h
@@ -1,4 +1,4 @@
-extern "C" int ChatHandler(void* msg) {
+extern "C" int ChatHandler(std::wstring* msg) {
 	for (uint8_t priority = 0; priority <= 4; priority += 1) {
 		for (DLL* dll : modDLLs) {
 			if (dll->mod->OnChatPriority == (GenericMod::Priority)priority) {
diff --git a/CubeModLoader/callbacks/CheckInventoryFullHandler.h b/CubeModLoader/callbacks/CheckInventoryFullHandler.h
@@ -1,4 +1,4 @@
-extern "C" int CheckInventoryFullHandler(void* player, void* item) {
+extern "C" int CheckInventoryFullHandler(cube::Creature* player, cube::Item* item) {
 	for (uint8_t priority = 0; priority <= 4; priority += 1) {
 		for (DLL* dll : modDLLs) {
 			if (dll->mod->OnCheckInventoryFullPriority == (GenericMod::Priority)priority) {
diff --git a/CubeModLoader/callbacks/ChunkRemeshHandler.h b/CubeModLoader/callbacks/ChunkRemeshHandler.h
@@ -1,4 +1,4 @@
-extern "C" int ChunkRemeshHandler(void* zone) {
+extern "C" int ChunkRemeshHandler(cube::Zone* zone) {
 	for (uint8_t priority = 0; priority <= 4; priority += 1) {
 		for (DLL* dll : modDLLs) {
 			if (dll->mod->OnChunkRemeshPriority == (GenericMod::Priority)priority) {
diff --git a/CubeModLoader/callbacks/ChunkRemeshedHandler.h b/CubeModLoader/callbacks/ChunkRemeshedHandler.h
@@ -1,4 +1,4 @@
-extern "C" int ChunkRemeshedHandler(void* zone) {
+extern "C" int ChunkRemeshedHandler(cube::Zone* zone) {
 	for (uint8_t priority = 0; priority <= 4; priority += 1) {
 		for (DLL* dll : modDLLs) {
 			if (dll->mod->OnChunkRemeshedPriority == (GenericMod::Priority)priority) {
diff --git a/CubeModLoader/callbacks/CreatureArmorCalculatedHandler.h b/CubeModLoader/callbacks/CreatureArmorCalculatedHandler.h
diff --git a/CubeModLoader/callbacks/CreatureAttackPowerCalculatedHandler.h b/CubeModLoader/callbacks/CreatureAttackPowerCalculatedHandler.h
@@ -1,4 +1,4 @@
-extern "C" int CreatureAttackPowerCalculatedHandler(void* creature, float* power) {
+extern "C" int CreatureAttackPowerCalculatedHandler(cube::Creature* creature, float* power) {
 	for (uint8_t priority = 0; priority <= 4; priority += 1) {
 		for (DLL* dll : modDLLs) {
 			if (dll->mod->OnCreatureAttackPowerCalculatedPriority == (GenericMod::Priority)priority) {
diff --git a/CubeModLoader/callbacks/CreatureCriticalCalculatedHandler.h b/CubeModLoader/callbacks/CreatureCriticalCalculatedHandler.h
@@ -1,4 +1,4 @@
-extern "C" int CreatureCriticalCalculatedHandler(void* creature, float* critical) {
+extern "C" int CreatureCriticalCalculatedHandler(cube::Creature* creature, float* critical) {
 	for (uint8_t priority = 0; priority <= 4; priority += 1) {
 		for (DLL* dll : modDLLs) {
 			if (dll->mod->OnCreatureCriticalCalculatedPriority == (GenericMod::Priority)priority) {
diff --git a/CubeModLoader/callbacks/CreatureHPCalculatedHandler.h b/CubeModLoader/callbacks/CreatureHPCalculatedHandler.h
@@ -1,4 +1,4 @@
-extern "C" int CreatureHPCalculatedHandler(void* creature, float* hp) {
+extern "C" int CreatureHPCalculatedHandler(cube::Creature* creature, float* hp) {
 	for (uint8_t priority = 0; priority <= 4; priority += 1) {
 		for (DLL* dll : modDLLs) {
 			if (dll->mod->OnCreatureHPCalculatedPriority == (GenericMod::Priority)priority) {
diff --git a/CubeModLoader/callbacks/CreatureHasteCalculatedHandler.h b/CubeModLoader/callbacks/CreatureHasteCalculatedHandler.h
@@ -1,4 +1,4 @@
-extern "C" int CreatureHasteCalculatedHandler(void* creature, float* haste) {
+extern "C" int CreatureHasteCalculatedHandler(cube::Creature* creature, float* haste) {
 	for (uint8_t priority = 0; priority <= 4; priority += 1) {
 		for (DLL* dll : modDLLs) {
 			if (dll->mod->OnCreatureHasteCalculatedPriority == (GenericMod::Priority)priority) {
diff --git a/CubeModLoader/callbacks/CreatureManaGenerationCalculatedHandler.h b/CubeModLoader/callbacks/CreatureManaGenerationCalculatedHandler.h
@@ -1,4 +1,4 @@
-extern "C" int CreatureManaGenerationCalculatedHandler(void* creature, float* regeneration) {
+extern "C" int CreatureManaGenerationCalculatedHandler(cube::Creature* creature, float* regeneration) {
 	for (uint8_t priority = 0; priority <= 4; priority += 1) {
 		for (DLL* dll : modDLLs) {
 			if (dll->mod->OnCreatureManaGenerationCalculatedPriority == (GenericMod::Priority)priority) {
diff --git a/CubeModLoader/callbacks/CreatureRegenerationCalculatedHandler.h b/CubeModLoader/callbacks/CreatureRegenerationCalculatedHandler.h
@@ -1,4 +1,4 @@
-extern "C" int CreatureRegenerationCalculatedHandler(void* creature, float* regeneration) {
+extern "C" int CreatureRegenerationCalculatedHandler(cube::Creature* creature, float* regeneration) {
 	for (uint8_t priority = 0; priority <= 4; priority += 1) {
 		for (DLL* dll : modDLLs) {
 			if (dll->mod->OnCreatureRegenerationCalculatedPriority == (GenericMod::Priority)priority) {
diff --git a/CubeModLoader/callbacks/CreatureResistanceCalculatedHandler.h b/CubeModLoader/callbacks/CreatureResistanceCalculatedHandler.h
@@ -1,4 +1,4 @@
-extern "C" int CreatureResistanceCalculatedHandler(void* creature, float* resistance) {
+extern "C" int CreatureResistanceCalculatedHandler(cube::Creature* creature, float* resistance) {
 	for (uint8_t priority = 0; priority <= 4; priority += 1) {
 		for (DLL* dll : modDLLs) {
 			if (dll->mod->OnCreatureResistanceCalculatedPriority == (GenericMod::Priority)priority) {
diff --git a/CubeModLoader/callbacks/CreatureSpellPowerCalculatedHandler.h b/CubeModLoader/callbacks/CreatureSpellPowerCalculatedHandler.h
@@ -1,4 +1,4 @@
-extern "C" int CreatureSpellPowerCalculatedHandler(void* creature, float* power) {
+extern "C" int CreatureSpellPowerCalculatedHandler(cube::Creature* creature, float* power) {
 	for (uint8_t priority = 0; priority <= 4; priority += 1) {
 		for (DLL* dll : modDLLs) {
 			if (dll->mod->OnCreatureSpellPowerCalculatedPriority == (GenericMod::Priority)priority) {
diff --git a/CubeModLoader/callbacks/GameTickHandler.h b/CubeModLoader/callbacks/GameTickHandler.h
@@ -1,4 +1,4 @@
-extern "C" void GameTickHandler(void* game) {
+extern "C" void GameTickHandler(cube::Game* game) {
 	for (uint8_t priority = 0; priority <= 4; priority += 1) {
 		for (DLL* dll : modDLLs) {
 			if (dll->mod->OnGameTickPriority == (GenericMod::Priority)priority) {
diff --git a/CubeModLoader/callbacks/GetMouseStateHandler.h b/CubeModLoader/callbacks/GetMouseStateHandler.h
@@ -1,4 +1,4 @@
-extern "C" int GetMouseStateHandler(void* diMouse) {
+extern "C" int GetMouseStateHandler(DIMOUSESTATE* diMouse) {
 	for (uint8_t priority = 0; priority <= 4; priority += 1) {
 		for (DLL* dll : modDLLs) {
 			if (dll->mod->OnGetMouseStatePriority == (GenericMod::Priority)priority) {
diff --git a/CubeModLoader/callbacks/PresentHandler.h b/CubeModLoader/callbacks/PresentHandler.h
@@ -1,4 +1,4 @@
-extern "C" int PresentHandler(void* SwapChain, UINT SyncInterval, UINT Flags) { // Note that this hooks a METHOD, so swapchain is the first argument
+extern "C" int PresentHandler(IDXGISwapChain* SwapChain, UINT SyncInterval, UINT Flags) { // Note that this hooks a METHOD, so swapchain is the first argument
 	for (uint8_t priority = 0; priority <= 4; priority += 1) {
 		for (DLL* dll : modDLLs) {
 			if (dll->mod->OnPresentPriority == (GenericMod::Priority)priority) {
diff --git a/CubeModLoader/callbacks/ZoneDestroyHandler.h b/CubeModLoader/callbacks/ZoneDestroyHandler.h
@@ -1,4 +1,4 @@
-extern "C" int ZoneDestroyHandler(void* zone) {
+extern "C" int ZoneDestroyHandler(cube::Zone* zone) {
 	for (uint8_t priority = 0; priority <= 4; priority += 1) {
 		for (DLL* dll : modDLLs) {
 			if (dll->mod->OnZoneDestroyPriority == (GenericMod::Priority)priority) {
diff --git a/CubeModLoader/callbacks/ZoneGeneratedHandler.h b/CubeModLoader/callbacks/ZoneGeneratedHandler.h
@@ -1,4 +1,4 @@
-extern "C" int ZoneGeneratedHandler(void* zone) {
+extern "C" int ZoneGeneratedHandler(cube::Zone* zone) {
 	for (uint8_t priority = 0; priority <= 4; priority += 1) {
 		for (DLL* dll : modDLLs) {
 			if (dll->mod->OnZoneGeneratedPriority == (GenericMod::Priority)priority) {
diff --git a/CubeModLoader/callbacks/creature/cube__Creature__GetArmor.h b/CubeModLoader/callbacks/creature/cube__Creature__GetArmor.h
@@ -0,0 +1,90 @@
+#pragma once
+
+bool cube__Item__ClassCanWearItem(cube::Item* item, int classType)
+{
+    return ((bool(*)(cube::Item*, int))Offset(base, 0x1094D0))(item, classType);
+}
+
+float cube__Item__GetArmor(cube::Item* item, cube::Creature* creature)
+{
+    return ((float(*)(cube::Item*, cube::Creature*))Offset(base, 0x108D50))(item, creature);
+}
+
+bool cube__Item__IsValidEquipment(cube::Item* item, int category, cube::Creature* creature)
+{
+    if (item->category != category)
+    {
+        return false;
+    }
+
+    if (creature->entity_data.hostility_type != 0 || cube__Item__ClassCanWearItem(item, creature->entity_data.classType))
+    {
+        return true;
+    }
+
+    return false;
+}
+
+extern "C" float cube__Creature__GetArmor(cube::Creature * creature)
+{
+    float armor = 0;
+
+    cube::Item* chest = &creature->entity_data.equipment.chest;
+    if (cube__Item__IsValidEquipment(chest, 4, creature))
+    {
+        armor += cube__Item__GetArmor(chest, creature);
+    }
+
+    cube::Item* feet = &creature->entity_data.equipment.feet;
+    if (cube__Item__IsValidEquipment(feet, 6, creature))
+    {
+        armor += cube__Item__GetArmor(feet, creature);
+    }
+
+    cube::Item* hands = &creature->entity_data.equipment.hands;
+    if (cube__Item__IsValidEquipment(hands, 5, creature))
+    {
+        armor += cube__Item__GetArmor(hands, creature);
+    }
+
+    cube::Item* shoulder = &creature->entity_data.equipment.shoulder;
+    if (cube__Item__IsValidEquipment(shoulder, 7, creature))
+    {
+        armor += cube__Item__GetArmor(shoulder, creature);
+    }
+
+    auto flags2 = creature->entity_data.appearance.flags2;
+    if (flags2 & 0x20200)
+    {
+        armor *= (float)0x3F99999A;
+    }
+
+    if ((flags2 >> 12) & 1)
+    {
+        armor += armor;
+    }
+
+    for (auto& buff : creature->buffs)
+    {
+        if (buff.type == 0x0E)
+        {
+            armor *= (float)0x3E800000;
+        }
+        if (buff.type == 0x18)
+        {
+            armor *= buff.unk;
+        }
+    }
+
+    for (uint8_t priority = 0; priority <= 4; priority += 1) {
+        for (DLL* dll : modDLLs) {
+            if (dll->mod->OnCreatureArmorCalculatedPriority == (GenericMod::Priority)priority) {
+                dll->mod->OnCreatureArmorCalculated(creature, &armor);
+            }
+        }
+    }
+
+    return armor;
+}
+
+overwrite_function(0x4F080, cube__Creature__GetArmor)
diff --git a/CubeModLoader/callbacks/game/cube__Game__MouseUp.h b/CubeModLoader/callbacks/game/cube__Game__MouseUp.h
@@ -0,0 +1,64 @@
+#pragma once
+#include "../../CWSDK/cwsdk.h"
+
+extern "C" void cube__Game__MouseUp(cube::Game* game, cube::MouseButton mouse_button)
+{
+	if (game->gui.startmenu_node->display->IsVisible() && game->gui.startmenu_buttons_node->display->IsVisible())
+	{
+		if (mouse_button == cube::MouseButton::LeftMouseButton)
+		{	
+			switch (game->gui.start_menu_widget->hover_state)
+			{
+			case cube::StartMenuWidget::HoverState::Exit:
+				game->shutdown = 1;
+				break;
+			case cube::StartMenuWidget::HoverState::Continue:
+				game->MaybeLoadCharacter(game->current_character_slot, game->GetPlayer());
+				game->gui.startmenu_node->display->SetVisibility(game->gui.startmenu_node->display->visibility.current_frame, 0);
+				game->target_camera_distance = 8.0f;
+
+				// Todo: Check if needed
+				game->camera_distance = 8.0f;
+
+				// Todo: Check if needed
+				game->world->CW_2E0B50();
+				break;
+			case cube::StartMenuWidget::HoverState::Options:
+				game->gui.options_widget->node->display->SetVisibility(game->gui.options_widget->node->display->visibility.current_frame, 1);
+				break;
+			case cube::StartMenuWidget::HoverState::StartGame:
+				game->gui.startmenu_node->display->SetVisibility(game->gui.startmenu_node->display->visibility.current_frame, 0);
+				game->gui.character_selection_node->display->SetVisibility(game->gui.character_selection_node->display->visibility.current_frame, 1);
+				break;
+			case cube::StartMenuWidget::HoverState::None:
+			default:
+				break;
+			}
+		}
+	}
+
+	// Calling this functions seems to crash and therefore I did only a partial hook here.
+	//game->gui.MouseUp((int)mouse_button);
+}
+
+GETTER_VAR(void*, ASM_cube__Game__MouseUp_jmpback);
+__attribute__((naked)) void ASM_cube__Game__MouseUp() {
+	asm(".intel_syntax \n"
+		PUSH_ALL
+		"push rbp \n"
+		"mov rbp, rsp \n"
+		PREPARE_STACK
+		"call cube__Game__MouseUp \n"
+		RESTORE_STACK
+		"mov rsp, rbp \n"
+		"pop rbp \n"
+		POP_ALL
+		DEREF_JMP(ASM_cube__Game__MouseUp_jmpback)
+	);
+}
+void setup_cube__Game__MouseUp() {
+		WriteFarJMP(CWOffset(0x96621), (void*)&ASM_cube__Game__MouseUp);
+		ASM_cube__Game__MouseUp_jmpback = CWOffset(0x9675D);
+}
+
+//overwrite_function(0x965E0, cube__Game__MouseUp)
diff --git a/CubeModLoader/callbacks/gui/cube__StartMenuWidget__Draw.h b/CubeModLoader/callbacks/gui/cube__StartMenuWidget__Draw.h
diff --git a/CubeModLoader/macros.h b/CubeModLoader/macros.h
diff --git a/CubeModLoader/main.cpp b/CubeModLoader/main.cpp
diff --git a/CubeModLoader/main.h b/CubeModLoader/main.h
diff --git a/cpp.hint b/cpp.hint

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Subproject commit 6c3c518adec22d591721b96e1d38db5490f6010e`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-extern "C" int ChatHandler(void* msg) {`
	`1`	`+extern "C" int ChatHandler(std::wstring* msg) {`
`2`	`2`	`for (uint8_t priority = 0; priority <= 4; priority += 1) {`
`3`	`3`	`for (DLL* dll : modDLLs) {`
`4`	`4`	`if (dll->mod->OnChatPriority == (GenericMod::Priority)priority) {`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-extern "C" int CheckInventoryFullHandler(void* player, void* item) {`
	`1`	`+extern "C" int CheckInventoryFullHandler(cube::Creature* player, cube::Item* item) {`
`2`	`2`	`for (uint8_t priority = 0; priority <= 4; priority += 1) {`
`3`	`3`	`for (DLL* dll : modDLLs) {`
`4`	`4`	`if (dll->mod->OnCheckInventoryFullPriority == (GenericMod::Priority)priority) {`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-extern "C" int ChunkRemeshHandler(void* zone) {`
	`1`	`+extern "C" int ChunkRemeshHandler(cube::Zone* zone) {`
`2`	`2`	`for (uint8_t priority = 0; priority <= 4; priority += 1) {`
`3`	`3`	`for (DLL* dll : modDLLs) {`
`4`	`4`	`if (dll->mod->OnChunkRemeshPriority == (GenericMod::Priority)priority) {`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-extern "C" int ChunkRemeshedHandler(void* zone) {`
	`1`	`+extern "C" int ChunkRemeshedHandler(cube::Zone* zone) {`
`2`	`2`	`for (uint8_t priority = 0; priority <= 4; priority += 1) {`
`3`	`3`	`for (DLL* dll : modDLLs) {`
`4`	`4`	`if (dll->mod->OnChunkRemeshedPriority == (GenericMod::Priority)priority) {`