ouou

誠 遺憾 · 誠 遺憾 · commit 5614c7cb9fdc · 2024-09-22T22:36:31.000+09:00
diff --git a/ForceEnchant/Force/Hooks/CommandHook/CommandHook.cpp b/ForceEnchant/Force/Hooks/CommandHook/CommandHook.cpp
@@ -1,6 +1,6 @@
 #include "CommandHook.h"
 
 bool CommandHook::ValidRange::handle(int input, int low, int high, __int64 out) {
-	static auto oFunc = funcPtr->GetFastcall<bool, unsigned char, bool>();
+	static auto oFunc = funcPtr->GetFastcall<bool, int, int, int, __int64>();
 	return true;
 }
diff --git a/ForceEnchant/Force/Hooks/ItemEnchants/ItemEnchants.cpp b/ForceEnchant/Force/Hooks/ItemEnchants/ItemEnchants.cpp
@@ -1,6 +1,6 @@
 #include "ItemEnchants.h"
 
-EnchantResult* ItemEnchantsHook::canEnchant::handle(__int64 _this, EnchantResult* result, EnchantMentInstance en, bool allowNonVanilla) {
-	static auto oFunc = funcPtr->GetFastcall<EnchantResult*, __int64, EnchantResult*, EnchantMentInstance, bool>();
+EnchantResult* ItemEnchantsHook::canEnchant::handle(__int64 _this, EnchantResult* result, __int64 en, bool allowNonVanilla) {
+	static auto oFunc = funcPtr->GetFastcall<EnchantResult*, __int64, EnchantResult*, __int64, bool>();
 	return oFunc(_this, result, en, true);
 }
diff --git a/ForceEnchant/Force/Hooks/ItemEnchants/ItemEnchants.h b/ForceEnchant/Force/Hooks/ItemEnchants/ItemEnchants.h
@@ -9,7 +9,7 @@ namespace ItemEnchantsHook {
 		static inline std::unique_ptr<FuncHook> funcPtr;
 	public:
 		canEnchant() : Hook("ItemEnchants::canEnchant") {};
-		static EnchantResult* handle(__int64 _this, EnchantResult* result, EnchantMentInstance en, bool allowNonVanilla);
+		static EnchantResult* handle(__int64 _this, EnchantResult* result, __int64 en, bool allowNonVanilla);
 		bool Initialize() override {
 			uintptr_t address = SigScan("4C 89 44 24 ?? 53 55 57 41");
 			return CreateHook(funcPtr, address, handle);

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`#include "CommandHook.h"`
`2`	`2`
`3`	`3`	`bool CommandHook::ValidRange::handle(int input, int low, int high, __int64 out) {`
`4`		`- static auto oFunc = funcPtr->GetFastcall<bool, unsigned char, bool>();`
	`4`	`+ static auto oFunc = funcPtr->GetFastcall<bool, int, int, int, __int64>();`
`5`	`5`	`return true;`
`6`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`#include "ItemEnchants.h"`
`2`	`2`
`3`		`-EnchantResult* ItemEnchantsHook::canEnchant::handle(__int64 _this, EnchantResult* result, EnchantMentInstance en, bool allowNonVanilla) {`
`4`		`- static auto oFunc = funcPtr->GetFastcall<EnchantResult, __int64, EnchantResult, EnchantMentInstance, bool>();`
	`3`	`+EnchantResult* ItemEnchantsHook::canEnchant::handle(__int64 _this, EnchantResult* result, __int64 en, bool allowNonVanilla) {`
	`4`	`+ static auto oFunc = funcPtr->GetFastcall<EnchantResult, __int64, EnchantResult, __int64, bool>();`
`5`	`5`	`return oFunc(_this, result, en, true);`
`6`	`6`	`}`