Merge pull request #22 from marioCST/feat/1.21.70

Plextora · web-flow · commit 5f741041aa27 · 2025-03-26T18:02:12.000-04:00
Initial 1.21.70 update
diff --git a/src/client/Latite.cpp b/src/client/Latite.cpp
@@ -143,9 +143,10 @@ DWORD __stdcall startThread(HINSTANCE dll) {
     int deadCount = 0;
 
     std::unordered_map<std::string, SDK::Version> versNumMap = {
-        { "1.21.62", SDK::VLATEST },
-        { "1.21.61", SDK::VLATEST },
-        { "1.21.60", SDK::VLATEST },
+        { "1.21.70", SDK::V1_21_70 },
+        //{ "1.21.62", SDK::V1_21_60 },
+        //{ "1.21.61", SDK::V1_21_60 },
+        //{ "1.21.60", SDK::V1_21_60 },
         //{ "1.21.51", SDK::V1_21_50 },
         //{ "1.21.50", SDK::V1_21_50 },
         //{ "1.21.44", SDK::V1_21_40 },
diff --git a/src/client/feature/module/impl/game/TextHotkey.cpp b/src/client/feature/module/impl/game/TextHotkey.cpp
@@ -38,7 +38,7 @@ void TextHotkey::onKey(Event& evG) {
 				auto pkt = SDK::MinecraftPackets::createPacket(SDK::PacketID::TEXT);
 				SDK::TextPacket* tp = reinterpret_cast<SDK::TextPacket*>(pkt.get());
 				
-				tp->chat(util::WStrToStr(std::get<TextValue>(this->textMessage).str));
+				tp->chat(msg);
 
 				SDK::ClientInstance::get()->getLocalPlayer()->packetSender->sendToServer(pkt.get());
 
diff --git a/src/sdk/Util.h b/src/sdk/Util.h
@@ -29,8 +29,38 @@ namespace util {
 }
 
 namespace SDK {
+	template <int offs_1_21_70, int offs_1_21_60, int offs_1_21_50, int offs_1_21_40, int offs_1_21_30, int offs_1_21_20, int offs_1_20_50, int offs_1_20_40, int offs_1_20_30, int offs_1_18_12, int offs_1_19_51>
+	extern inline const int mvGetOffset() {
+		switch (SDK::internalVers) {
+		case SDK::V1_21_70:
+		default:
+			return offs_1_21_70;
+		case SDK::V1_21_60:
+			return offs_1_21_60;
+		case SDK::V1_21_50:
+			return offs_1_21_50;
+		case SDK::V1_21_40:
+			return offs_1_21_40;
+		case SDK::V1_21_30:
+			return offs_1_21_30;
+		case SDK::V1_21_20:
+			return offs_1_21_20;
+		case SDK::V1_20_50:
+			return offs_1_20_50;
+		case SDK::V1_20_40:
+			return offs_1_20_40;
+		case SDK::V1_20_30:
+			return offs_1_20_30;
+		case SDK::V1_19_51:
+			return offs_1_19_51;
+			break;
+		case SDK::V1_18_12:
+			return offs_1_18_12;
+		}
+	}
+	
 	template <int offs_1_21_60, int offs_1_21_50, int offs_1_21_40, int offs_1_21_30, int offs_1_21_20, int offs_1_20_50, int offs_1_20_40, int offs_1_20_30, int offs_1_18_12, int offs_1_19_51>
-		extern inline const int mvGetOffset() {
+	extern inline const int mvGetOffset() {
 		switch (SDK::internalVers) {
 		case SDK::V1_21_60:
 		default:
diff --git a/src/sdk/Version.h b/src/sdk/Version.h
@@ -20,7 +20,8 @@ namespace SDK {
 		V1_21_40 = 12140,
 		V1_21_50 = 12150,
 		V1_21_60 = 12160,
-		VLATEST = V1_21_60,
+		V1_21_70 = 12170,
+		VLATEST = V1_21_70,
 	};
 
 	extern int internalVers;
diff --git a/src/sdk/common/client/game/ClientInstance.cpp b/src/sdk/common/client/game/ClientInstance.cpp
@@ -70,6 +70,9 @@ SDK::GuiData* SDK::ClientInstance::getGuiData() {
         {
             return util::directAccess<GuiData*>(this, 0x558);
         }
+        if (internalVers >= V1_21_70) {
+            return util::directAccess<GuiData*>(this, 0x5B0);
+        }
         if (internalVers >= V1_21_40) {
             return util::directAccess<GuiData*>(this, 0x590);
         }
@@ -79,7 +82,7 @@ SDK::GuiData* SDK::ClientInstance::getGuiData() {
 }
 
 SDK::Options* SDK::ClientInstance::getOptions() {
-    return memory::callVirtual<Options*>(this, 0xC4);
+    return memory::callVirtual<Options*>(this, 0xC7);
 }
 
 void SDK::ClientInstance::grabCursor() {
diff --git a/src/sdk/common/client/game/ClientInstance.h b/src/sdk/common/client/game/ClientInstance.h
@@ -9,7 +9,7 @@ namespace SDK {
 		MVCLASS_FIELD(class Minecraft*, minecraft, 0xD8, 0xD0, 0xD0, 0xD0, 0xD0, 0xD0, 0xC0, 0xC0);
 		MVCLASS_FIELD(class LevelRenderer*, levelRenderer, 0xE8, 0xE0, 0xE0, 0xE0, 0xE0, 0xE0, 0xD0, 0xD0);
 		MVCLASS_FIELD(class ClientInputHandler*, inputHandler, 0x118, 0x110, 0x110, 0x110, 0x110, 0x110, 0x100, 0x100);
-		MVCLASS_FIELD(struct Vec2, cursorPos, 0x4D0, 0x4C8, 0x4C8, 0x4C8, 0x4C8, 0x498, 0x458, 0x458);
+		MVCLASS_FIELD(struct Vec2, cursorPos, 0x4F0, 0x4D0, 0x4D0, 0x4D0, 0x4C8, 0x4C8, 0x4C8, 0x4C8, 0x498, 0x458, 0x458);
 
 		static ClientInstance* get();
 		class BlockSource* getRegion();
diff --git a/src/sdk/common/client/game/MinecraftGame.cpp b/src/sdk/common/client/game/MinecraftGame.cpp
@@ -12,7 +12,7 @@ bool SDK::MinecraftGame::isCursorGrabbed() {
 
 SDK::ClientInstance* SDK::MinecraftGame::getPrimaryClientInstance() {
     if (SDK::internalVers >= V1_21_40) {
-        const auto map = reinterpret_cast<std::map<unsigned char, std::shared_ptr<SDK::ClientInstance>>*>(reinterpret_cast<uintptr_t>(this) + 0x898);
+        const auto map = reinterpret_cast<std::map<unsigned char, std::shared_ptr<SDK::ClientInstance>>*>(reinterpret_cast<uintptr_t>(this) + 0x8D8);
         return map->at(0).get();
     }
     //19AAAB62768
diff --git a/src/sdk/common/client/game/MinecraftGame.h b/src/sdk/common/client/game/MinecraftGame.h
@@ -8,11 +8,11 @@ namespace SDK {
 	public:
 		bool isCursorGrabbed();
 
-		MVCLASS_FIELD(std::string, xuid, 0x310, 0x320, 0x318, 0x318, 0x2F8, 0x618, 0x228);
+		MVCLASS_FIELD(std::string, xuid, 0x320, 0x310, 0x310, 0x310, 0x310, 0x320, 0x318, 0x318, 0x2F8, 0x618, 0x228);
 	private:
-		MVCLASS_FIELD(class FontRepository**, fontRepo, 0xE08, 0xEB0, 0xDE0, 0xE08, 0xE00, 0xF60, 0xF30, 0xF20, 0x110, 0xF88);
+		MVCLASS_FIELD(class FontRepository**, fontRepo, 0xE38, 0xE08, 0xEB0, 0xDE0, 0xE08, 0xE00, 0xF60, 0xF30, 0xF20, 0x110, 0xF88);
 	public:
-		MVCLASS_FIELD(class Font*, minecraftFont, 0xE10, 0xEB8, 0xDE8, 0xE18, 0xE10, 0xF70, 0xF40, 0xF30, 0x120, 0xF78);
+		MVCLASS_FIELD(class Font*, minecraftFont, 0xE40, 0xE10, 0xEB8, 0xDE8, 0xE18, 0xE10, 0xF70, 0xF40, 0xF30, 0x120, 0xF78);
 
 		class FontRepository* getFontRepository() {
 			if (internalVers >= V1_21_40) {
diff --git a/src/sdk/common/client/renderer/game/LevelRendererPlayer.cpp b/src/sdk/common/client/renderer/game/LevelRendererPlayer.cpp
@@ -10,6 +10,7 @@ Vec3& SDK::LevelRendererPlayer::getOrigin() {
 }
 
 float& SDK::LevelRendererPlayer::getFovX() {
+    if (SDK::internalVers >= SDK::V1_21_70) return util::directAccess<float>(this, 0xF30);
     if (SDK::internalVers >= SDK::V1_21_60) return util::directAccess<float>(this, 0xEC8);
     if (SDK::internalVers >= SDK::V1_21_50) return util::directAccess<float>(this, 0xED0);
     if (SDK::internalVers >= SDK::V1_21_40) return util::directAccess<float>(this, 0xED8);
@@ -24,6 +25,7 @@ float& SDK::LevelRendererPlayer::getFovX() {
 }
 
 float& SDK::LevelRendererPlayer::getFovY() {
+    if (SDK::internalVers >= SDK::V1_21_70) return util::directAccess<float>(this, 0xF44);
     if (SDK::internalVers >= SDK::V1_21_60) return util::directAccess<float>(this, 0xEDC);
     if (SDK::internalVers >= SDK::V1_21_50) return util::directAccess<float>(this, 0xEE4);
     if (SDK::internalVers >= SDK::V1_21_40) return util::directAccess<float>(this, 0xEEC);
diff --git a/src/sdk/common/network/PacketSender.h b/src/sdk/common/network/PacketSender.h
@@ -5,7 +5,9 @@ namespace SDK {
 	class PacketSender {
 		virtual ~PacketSender() = 0;
 	public:
+		virtual bool isInitialized() = 0;
 		virtual void send(Packet*) = 0;
+		virtual void sendTo(void* networkIdentifier, uint8_t subClientId, Packet* pkt);
 		virtual void sendToServer(Packet* pkt) = 0;
 	};
 }
diff --git a/src/sdk/common/world/actor/player/Player.h b/src/sdk/common/world/actor/player/Player.h
@@ -15,12 +15,12 @@ namespace SDK {
 		std::string getXUID();
 
 		// @dump-wbds Player::getSupplies, 3
-		MVCLASS_FIELD(PlayerInventory*, supplies, 0x5C8, 0x5D0, 0x5D0, 0x5D0, 0x628, 0x760, 0x7C0, 0x7C0, 0xB70, 0xDB8); // xref: getSupplies
+		MVCLASS_FIELD(PlayerInventory*, supplies, 0x5C0, 0x5C8, 0x5D0, 0x5D0, 0x5D0, 0x628, 0x760, 0x7C0, 0x7C0, 0xB70, 0xDB8); // xref: getSupplies
 		// @dump-wbds Player::getGameMode, 3
-		MVCLASS_FIELD(GameMode*, gameMode, 0xAD8, 0xB18, 0xB28, 0xB18, 0xB00, 0xEC8, 0xEB0, 0xE70, 0x1238, 0x1670); // xref: getGameMode
+		MVCLASS_FIELD(GameMode*, gameMode, 0xAD0, 0xAD8, 0xB18, 0xB28, 0xB18, 0xB00, 0xEC8, 0xEB0, 0xE70, 0x1238, 0x1670); // xref: getGameMode
 		// @dump-wbds Player::getName, 3
-		MVCLASS_FIELD(std::string, playerName, 0xC58, 0xCA0, 0xCB0, 0xCA0, 0xC88, 0x1D30, 0x1CB8, 0x1C78, 0x8C0, 0x2478); // xref: getName
+		MVCLASS_FIELD(std::string, playerName, 0xC50, 0xC58, 0xCA0, 0xCB0, 0xCA0, 0xC88, 0x1D30, 0x1CB8, 0x1C78, 0x8C0, 0x2478); // xref: getName
 		// @dump-wbds ServerPlayer::sendNetworkPacket, 18
-		MVCLASS_FIELD(PacketSender*, packetSender, 0x7E0, 0x848, 0x898, 0x890, 0x890, 0xC48, 0xC70, 0xC70, 0x1020, 0x1438); // xref: Player::Player a3
+		MVCLASS_FIELD(PacketSender*, packetSender, 0x7D8, 0x7E0, 0x848, 0x898, 0x890, 0x890, 0xC48, 0xC70, 0xC70, 0x1020, 0x1438); // xref: Player::Player a3
 	};
 }
diff --git a/src/sdk/common/world/level/Level.cpp b/src/sdk/common/world/level/Level.cpp
@@ -8,7 +8,7 @@ void SDK::Level::playSoundEvent(std::string const& text, Vec3 const& pos, float
 
 std::vector<SDK::Actor*> SDK::Level::getRuntimeActorList() {
 	std::vector<Actor*> list;
-	static int index = mvGetOffset<0x134, 0x132, 0x134, 0x117, 0x117, 0x116, 0x125, 0x125, 0x12D, 0x13C>();
+	static int index = mvGetOffset<0x136, 0x134, 0x132, 0x134, 0x117, 0x117, 0x116, 0x125, 0x125, 0x12D, 0x13C>();
 
 	// TODO: this might return a vector too?
 	memory::callVirtual<void, std::vector<Actor*>&>(this, index, list);
@@ -17,25 +17,25 @@ std::vector<SDK::Actor*> SDK::Level::getRuntimeActorList() {
 
 std::unordered_map<UUID, SDK::PlayerListEntry>* SDK::Level::getPlayerList() {
 	if (internalVers >= SDK::V1_21_40) {
-		return *reinterpret_cast<std::unordered_map<UUID, SDK::PlayerListEntry>**>(reinterpret_cast<uintptr_t>(this) + 0xB68);
+		return *reinterpret_cast<std::unordered_map<UUID, SDK::PlayerListEntry>**>(reinterpret_cast<uintptr_t>(this) + 0xB98);
 	}
 	
 	static int index = SDK::mvGetOffset<0x112, 0x111, 0x120, 0x120, 0x128, 0x137>();
 	return memory::callVirtual<std::unordered_map<UUID, SDK::PlayerListEntry>*>(this, index);
 }
 
 SDK::HitResult* SDK::Level::getHitResult() {
-	static int index = mvGetOffset<0x13E, 0x13C, 0x13E, 0x121, 0x121, 0x120, 0x12E, 0x12E, 0x139, 0x148>();
+	static int index = mvGetOffset<0x140, 0x13E, 0x13C, 0x13E, 0x121, 0x121, 0x120, 0x12E, 0x12E, 0x139, 0x148>();
 	return memory::callVirtual<HitResult*>(this, index);
 }
 
 SDK::HitResult* SDK::Level::getLiquidHitResult() {
-	static int index = mvGetOffset<0x13F, 0x13D, 0x13F, 0x122, 0x122, 0x121, 0x12F, 0x12F, 0x13A, 0x149>();
+	static int index = mvGetOffset<0x141, 0x13F, 0x13D, 0x13F, 0x122, 0x122, 0x121, 0x12F, 0x12F, 0x13A, 0x149>();
 	return reinterpret_cast<SDK::HitResult*>(memory::callVirtual<uintptr_t>(this, index)) /*sizeof hitResult (0x60) / 8*/;
 }
 
 bool SDK::Level::isClientSide() {
-	return memory::callVirtual<bool>(this, SDK::mvGetOffset<0x12D, 0x12B, 0x12C, 0x111, 0x111, 0x110, 0x11F, 0x11F, 0x12B, 0x127>());
+	return memory::callVirtual<bool>(this, SDK::mvGetOffset<0x12F, 0x12D, 0x12B, 0x12C, 0x111, 0x111, 0x110, 0x11F, 0x11F, 0x12B, 0x127>());
 }
 
 const std::string& SDK::Level::getLevelName() {
diff --git a/src/sdk/common/world/level/Level.h b/src/sdk/common/world/level/Level.h
@@ -24,7 +24,7 @@ namespace SDK {
 		class HitResult* getLiquidHitResult();
 		bool isClientSide();
 
-		MVCLASS_FIELD(std::shared_ptr<LevelData>, levelData, 0x110, 0xF8, 0xF8, 0xF8, 0xF8, 0xF8, 0xF8, 0xF8);
+		MVCLASS_FIELD(std::shared_ptr<LevelData>, levelData, 0x100, 0x110, 0x110, 0x110, 0xF8, 0xF8, 0xF8, 0xF8, 0xF8, 0xF8, 0xF8);
 		MVCLASS_FIELD(std::string, name, 0x290, 0x6C8, 0x698, 0x678, 0x5B8, 0x548);
 
 		const std::string& getLevelName();
diff --git a/src/sdk/signature/storage_latest.h b/src/sdk/signature/storage_latest.h
@@ -15,7 +15,7 @@ class Signatures {
 		//89 86 ? ? ? ? 8b 43 ? 89 86 ? ? ? ? 8b 43 ? 89 86 ? ? ? ? 8b 43 ? 89 86 ? ? ? ? 8b 43 ? f3 0f 10 0d
 
 		inline static SigImpl LevelRendererPlayer_origin{[](memory::signature_store& store, uintptr_t) { return store.ref(4); },
-			"F3 0F 58 BB ? ? ? ? 45 0F 57 C9"_sig,
+			"F3 0F 58 BB ? ? ? ? 48 8B 8B"_sig,
 			"LevelRendererPlayer->origin"};
 
 	};
@@ -208,7 +208,7 @@ class Signatures {
 		"CameraViewBob"};
 
 	inline static SigImpl ItemStackBase_getHoverName{[](memory::signature_store&, uintptr_t res) { return res; },
-		"48 89 5C 24 ? 55 56 57 41 56 41 57 48 8D 6C 24 ? 48 81 EC ? ? ? ? 48 8B FA 48 8B D9"_sig,
+		"48 89 5C 24 ? 48 89 6C 24 ? 56 57 41 56 48 81 EC ? ? ? ? 48 8B FA 48 8B F1 48 89 54 24 ? 33 DB"_sig,
 		"ItemStackBase::getHoverName"};
 
 
@@ -237,7 +237,7 @@ class Signatures {
 		"ItemRenderer::renderGuiItemNew"};
 
 	inline static SigImpl BaseAttributeMap_getInstance{[](memory::signature_store& store, uintptr_t) { return store.deref(1); },
-		"E8 ? ? ? ? 4C 8B F8 48 89 45 ? 48 8B 56"_sig,
+		"E8 ? ? ? ? 4C 8B E8 48 89 45 ? 48 8D 55 ? 48 8B 4C 24"_sig,
 		"BaseAttributeMap::getInstance"};
 
 	inline static SigImpl UIControl_getPosition{[](memory::signature_store& store, uintptr_t) { return store.deref(1); },
@@ -277,7 +277,7 @@ class Signatures {
 		"MinecraftPackets::createPacket" };
 
 	inline static SigImpl Actor_attack{ [](memory::signature_store&, uintptr_t res) { return res; },
-		"48 8B C4 48 89 58 ? 55 56 57 41 54 41 55 41 56 41 57 48 8D A8 ? ? ? ? 48 81 EC ? ? ? ? 0F 29 70 ? 0F 29 78 ? 44 0F 29 40 ? 44 0F 29 48 ? 48 8B 05 ? ? ? ? 48 33 C4 48 89 85 ? ? ? ? 41 0F B6 D9 4D 8B E0"_sig,
+		"48 8B C4 48 89 58 ? 55 56 57 41 54 41 55 41 56 41 57 48 8D A8 ? ? ? ? 48 81 EC ? ? ? ? 0F 29 70 ? 0F 29 78 ? 44 0F 29 40 ? 44 0F 29 48 ? 48 8B 05 ? ? ? ? 48 33 C4 48 89 85 ? ? ? ? 41 0F B6 F1"_sig,
 		"Actor::attack" };
 
 	inline static SigImpl GuiData__addMessage{ [](memory::signature_store&, uintptr_t res) { return res; },
@@ -289,7 +289,7 @@ class Signatures {
 		"Actor::getArmor" };
 
 	inline static SigImpl _updatePlayer{ [](memory::signature_store&, uintptr_t res) { return res; },
-		"4C 8B DC 49 89 5B ? 49 89 7B ? 55 41 56"_sig,
+		"4C 8B DC 49 89 7B"_sig,
 		"UpdatePlayerFromCameraSystemUtil::_updatePlayer" };
 
 	inline static SigImpl GameArguments__onUri{ [](memory::signature_store&, uintptr_t res) { return res; },

Original file line number	Diff line number	Diff line change
`@@ -70,6 +70,9 @@ SDK::GuiData* SDK::ClientInstance::getGuiData() {`
`70`	`70`	`{`
`71`	`71`	`return util::directAccess<GuiData*>(this, 0x558);`
`72`	`72`	`}`
	`73`	`+ if (internalVers >= V1_21_70) {`
	`74`	`+ return util::directAccess<GuiData*>(this, 0x5B0);`
	`75`	`+ }`
`73`	`76`	`if (internalVers >= V1_21_40) {`
`74`	`77`	`return util::directAccess<GuiData*>(this, 0x590);`
`75`	`78`	`}`
`@@ -79,7 +82,7 @@ SDK::GuiData* SDK::ClientInstance::getGuiData() {`
`79`	`82`	`}`
`80`	`83`
`81`	`84`	`SDK::Options* SDK::ClientInstance::getOptions() {`
`82`		`- return memory::callVirtual<Options*>(this, 0xC4);`
	`85`	`+ return memory::callVirtual<Options*>(this, 0xC7);`
`83`	`86`	`}`
`84`	`87`
`85`	`88`	`void SDK::ClientInstance::grabCursor() {`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ bool SDK::MinecraftGame::isCursorGrabbed() {`
`12`	`12`
`13`	`13`	`SDK::ClientInstance* SDK::MinecraftGame::getPrimaryClientInstance() {`
`14`	`14`	`if (SDK::internalVers >= V1_21_40) {`
`15`		`- const auto map = reinterpret_cast<std::map<unsigned char, std::shared_ptr<SDK::ClientInstance>>*>(reinterpret_cast<uintptr_t>(this) + 0x898);`
	`15`	`+ const auto map = reinterpret_cast<std::map<unsigned char, std::shared_ptr<SDK::ClientInstance>>*>(reinterpret_cast<uintptr_t>(this) + 0x8D8);`
`16`	`16`	`return map->at(0).get();`
`17`	`17`	`}`
`18`	`18`	`//19AAAB62768`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@ Vec3& SDK::LevelRendererPlayer::getOrigin() {`
`10`	`10`	`}`
`11`	`11`
`12`	`12`	`float& SDK::LevelRendererPlayer::getFovX() {`
	`13`	`+ if (SDK::internalVers >= SDK::V1_21_70) return util::directAccess<float>(this, 0xF30);`
`13`	`14`	`if (SDK::internalVers >= SDK::V1_21_60) return util::directAccess<float>(this, 0xEC8);`
`14`	`15`	`if (SDK::internalVers >= SDK::V1_21_50) return util::directAccess<float>(this, 0xED0);`
`15`	`16`	`if (SDK::internalVers >= SDK::V1_21_40) return util::directAccess<float>(this, 0xED8);`
`@@ -24,6 +25,7 @@ float& SDK::LevelRendererPlayer::getFovX() {`
`24`	`25`	`}`
`25`	`26`
`26`	`27`	`float& SDK::LevelRendererPlayer::getFovY() {`
	`28`	`+ if (SDK::internalVers >= SDK::V1_21_70) return util::directAccess<float>(this, 0xF44);`
`27`	`29`	`if (SDK::internalVers >= SDK::V1_21_60) return util::directAccess<float>(this, 0xEDC);`
`28`	`30`	`if (SDK::internalVers >= SDK::V1_21_50) return util::directAccess<float>(this, 0xEE4);`
`29`	`31`	`if (SDK::internalVers >= SDK::V1_21_40) return util::directAccess<float>(this, 0xEEC);`