Skip to content
This repository has been archived by the owner on Dec 26, 2021. It is now read-only.

Fix NoHurtCam 180 flip bug, fix auto totem, fix entity vtable #4465

Merged
merged 7 commits into from
Aug 26, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Horion/Command/CommandMgr.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ void CommandMgr::initCommands() {
commandList.push_back(new NbtCommand());
commandList.push_back(new WaypointCommand());
commandList.push_back(new TopCommand());

commandList.push_back(new XpCommand());
commandList.push_back(new CommandBlockExploitCommand());
commandList.push_back(new NameSpoofCommand());
commandList.push_back(new ExecuteCommand());
Expand Down
2 changes: 1 addition & 1 deletion Horion/Command/CommandMgr.h
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
#include "Commands/NbtCommand.h"
#include "Commands/ExecuteCommand.h"
#include "Commands/WaypointCommand.h"

#include"Commands/XpCommand.h"
#include "Commands/ScriptCommand.h"
#include "Commands/PathCommand.h"

Expand Down
8 changes: 5 additions & 3 deletions Horion/Module/Modules/AutoTotem.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,11 @@ void AutoTotem::onTick(C_GameMode* gm) {
if (current->item == NULL) {
for (int i = 0; i < 36; i++) {
C_ItemStack* totem = inv->getItemStack(i);
if (totem->item != NULL && (*totem->item)->itemId == 558) {
C_InventoryAction first(i, totem, nullptr);
C_InventoryAction second(37, nullptr, totem);
if (totem->item != NULL && (*totem->item)->itemId == 568) {
ItemDescriptor* desc = nullptr;
desc = new ItemDescriptor((*totem->item)->itemId, 0);
C_InventoryAction first(i, desc, nullptr, totem, nullptr, 1);
C_InventoryAction second(37, nullptr, desc, nullptr, totem, 1);
g_Data.getLocalPlayer()->setOffhandSlot(totem);
manager->addInventoryAction(first);
manager->addInventoryAction(second);
Expand Down
2 changes: 1 addition & 1 deletion Horion/Module/Modules/BowAimbot.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ void BowAimbot::onPostRender(C_MinecraftUIRenderContext* renderCtx) {
if (localPlayer == nullptr)
return;

if (localPlayer->getSelectedItemId() != 261) // Bow in hand?
if (localPlayer->getSelectedItemId() != 300) // Bow in hand?
return;

if (!(GameData::isRightClickDown() && GameData::canUseMoveKeys())) // is aiming?
Expand Down
4 changes: 2 additions & 2 deletions Horion/Module/Modules/CrystalAura.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ void CrystalAura::onTick(C_GameMode* gm) {
for (int n = 0; n < 9; n++) {
C_ItemStack* stack = inv->getItemStack(n);
if (stack->item != nullptr) {
if (stack->getItem()->itemId == 615) {
if (stack->getItem()->itemId == 629) {
if (prevSlot != n)
supplies->selectedHotbarSlot = n;
return;
Expand All @@ -145,7 +145,7 @@ void CrystalAura::onTick(C_GameMode* gm) {
return;
}
if (this->delay == 2) {
if (autoplace && g_Data.getLocalPlayer()->getSelectedItemId() == 615) { //endcrystal
if (autoplace && g_Data.getLocalPlayer()->getSelectedItemId() == 629) { //endcrystal
if (pEnhanced)
for (auto& i : targetList)
CPlace(gm, i->getPos());
Expand Down
6 changes: 3 additions & 3 deletions Memory/Hooks.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ void Hooks::Init() {
void* getGameEdition = reinterpret_cast<void*>(FindSignature("8B 91 ?? ?? ?? ?? 85 D2 74 1C 83 EA 01"));
g_Hooks.AppPlatform_getGameEditionHook = std::make_unique<FuncHook>(getGameEdition, Hooks::AppPlatform_getGameEdition);

void* autoComplete = reinterpret_cast<void*>(FindSignature("48 8B C4 55 57 41 56 48 8D 68 ?? 48 81 EC ?? ?? ?? ?? 48 C7 45 ?? FE FF FF FF 48 89 58 ?? 48 89 70 ?? 48 8B 05 ?? ?? ?? ?? 48 33 C4 48 89 45 ?? 41 8B F9"));
void* autoComplete = reinterpret_cast<void*>(FindSignature("48 8B C4 55 57 41 56 48 8D 68 ?? 48 81 EC ?? ?? ?? ?? 48 C7 45 ?? FE FF FF FF 48 89 58 ?? 48 89 70 ?? 48 8B 05 ?? ?? ?? ?? 48 33 C4 48 89 45 ?? 48 8B F9"));
g_Hooks.PleaseAutoCompleteHook = std::make_unique<FuncHook>(autoComplete, Hooks::PleaseAutoComplete);

uintptr_t** packetSenderVtable = reinterpret_cast<uintptr_t**>(*(uintptr_t*)g_Data.getClientInstance()->loopbackPacketSender);
Expand Down Expand Up @@ -266,7 +266,7 @@ void Hooks::Init() {
void* _toStyledString = reinterpret_cast<void*>(FindSignature("48 89 5C 24 ? 48 89 74 24 ? 57 48 81 EC ? ? ? ? 49 8B D8 48 8B F9"));
g_Hooks.toStyledStringHook = std::make_unique<FuncHook>(_toStyledString, Hooks::toStyledString);

void* InGamePlayScreen___renderLevel = reinterpret_cast<void*>(FindSignature("48 89 5C 24 20 55 56 57 41 54 41 55 41 56 41 57 48 8D AC 24 ?? ?? ?? ?? 48 81 EC ?? ?? ?? ?? 0F 29 B4 24 ?? ?? ?? ?? 48 8B 05 ?? ?? ?? ?? 48 33 C4 48 89 85 ?? ?? ?? ?? 49 8B D8 4C"));
void* InGamePlayScreen___renderLevel = reinterpret_cast<void*>(FindSignature("48 89 5C 24 20 55 56 57 41 54 41 55 41 56 41 57 48 8D AC 24 ?? ?? ?? ?? 48 81 EC ?? ?? ?? ?? 0F 29 B4 24 ?? ?? ?? ?? 48 8B 05 ?? ?? ?? ?? 48 33 C4 48 89 85 ?? ?? ?? ?? 41 8B D8 4C"));
g_Hooks.InGamePlayScreen___renderLevelHook = std::make_unique<FuncHook>(InGamePlayScreen___renderLevel, Hooks::InGamePlayScreen___renderLevel);

#ifdef TEST_DEBUG
Expand Down Expand Up @@ -2044,7 +2044,7 @@ void Hooks::LocalPlayer__updateFromCamera(__int64 a1, C_Camera* camera) {
rot = rot.normAngles();
}

camera->setOrientationDeg(rot.x, rot.y, 0);
camera->setOrientationDeg(rot.x, rot.y + 180, 0);
}

func(a1, camera);
Expand Down
6 changes: 2 additions & 4 deletions SDK/CEntity.h
Original file line number Diff line number Diff line change
Expand Up @@ -669,10 +669,8 @@ class C_Entity {
private:
virtual void unknown(void) const;
virtual __int64 ascendLadder(void);
virtual __int64 ascendScaffolding(void);
virtual __int64 ascendScaffolding2(void);
virtual __int64 descendScaffolding(void);
virtual __int64 canAscendCurrentBlockByJumping(void);
virtual __int64 ascendBlockByJumping(void); // 0x161
virtual __int64 descendBlockByCrouching(void); // 0x162
virtual __int64 dropContainer(void);
virtual __int64 initBodyControl(void);

Expand Down