Skip to content

Commit cc478ba

Browse files
leaftail1880leaftail1880
committed
fix: properly import sendTelegramMEssage
1 parent 6b3a512 commit cc478ba

File tree

1 file changed

+100
-97
lines changed

1 file changed

+100
-97
lines changed

‎src/script_api_rpc/Entry.cpp‎

Lines changed: 100 additions & 97 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
#include <mc/world/actor/state/PropertySyncData.h>
44

55

6+
#include "ll/api/base/StdInt.h"
67
#include "ll/api/event/player/PlayerDisconnectEvent.h"
78
#include "ll/api/io/LoggerRegistry.h"
89
#include "ll/api/mod/RegisterHelper.h"
@@ -29,13 +30,13 @@
2930
#include <ll/api/mod/NativeMod.h>
3031
#include <ll/api/service/Bedrock.h>
3132
#include <mc/entity/components/SynchedActorDataComponent.h>
33+
#include <mc/network/LoopbackPacketSender.h>
3234
#include <mc/network/MinecraftPackets.h>
35+
#include <mc/network/NetworkIdentifierWithSubId.h>
3336
#include <mc/network/PacketSender.h>
3437
#include <mc/network/packet/AddActorPacket.h>
35-
#include <mc/network/packet/BookEditPacket.h>
3638
#include <mc/network/packet/InventoryContentPacket.h>
37-
#include <mc/network/packet/LegacyTelemetryEventPacket.h>
38-
#include <mc/network/packet/LoginPacket.h>
39+
#include <mc/network/packet/PlayerListPacket.h>
3940
#include <mc/network/packet/SetActorDataPacket.h>
4041
#include <mc/network/packet/SyncedAttribute.h>
4142
#include <mc/scripting/ServerScriptManager.h>
@@ -49,160 +50,162 @@
4950
#include <mc/world/actor/DataItemType.h>
5051
#include <mc/world/actor/SynchedActorData.h>
5152
#include <mc/world/actor/player/Player.h>
53+
#include <mc/world/actor/player/PlayerListEntry.h>
5254
#include <mc/world/actor/state/PropertySyncData.h>
5355
#include <mc/world/attribute/AttributeInstanceHandle.h>
5456
#include <mc/world/item/NetworkItemStackDescriptor.h>
5557
#include <memory>
5658
#include <stdexcept>
5759

5860

61+
5962
#include <string>
6063

6164

6265
// Bossbar: https://github.com/GroupMountain/GMLIB-Release/blob/develop/src/Server/PlayerAPI.cc#L485-L566
6366

6467
auto dedicatedServerLogger = ll::io::LoggerRegistry::getInstance().getOrCreate("DedicatedServer");
6568

66-
void translateEntityNameTag(std::vector<std::unique_ptr<DataItem>>& mData, Player* player) {
69+
using MData = std::vector<std::unique_ptr<DataItem>>&;
70+
71+
int64 findNameTagDataItem(MData mData) {
6772
auto it = std::find_if(mData.begin(), mData.end(), [&](const std::unique_ptr<DataItem>& item) {
6873
return item && item->getId() == (ushort)ActorDataIDs::Name;
6974
});
7075

7176
if (it != mData.end()) {
72-
size_t index = std::distance(mData.begin(), it);
77+
return std::distance(mData.begin(), it);
78+
} else {
79+
return -1;
80+
}
81+
}
82+
83+
bool isNameTagTranslatable(MData mData, int64 index) {
84+
if (index == (-1)) return false;
85+
86+
auto& item = *mData[index];
87+
auto nameTag = *item.getData<std::string>();
88+
if (nameTag == "notrans") return false;
89+
return true;
90+
}
91+
92+
void translateEntityNameTag(MData mData, int64 index, Player* player) {
93+
if (isNameTagTranslatable(mData, index)) {
94+
auto nameTag = mData[index]->getData<std::string>();
95+
dedicatedServerLogger->info("Translating name tag from {} for {}", nameTag->data(), player->getRealName());
96+
7397
(mData)[index] = DataItem::create(
7498
ActorDataIDs::Name,
75-
std::string("Custom entity name for " + player->getRealName() + " " + player->getLocaleCode())
99+
std::string("For " + player->getRealName() + " " + player->getLocaleCode())
76100
);
77101
} else {
78102
dedicatedServerLogger->info("Not found name tag for data with size {}", mData.size());
79103
}
80104
}
81105

106+
std::string translatePlayerNameTag(const std::string& nameTag, Player* forPlayer) {
107+
return nameTag + " For " + forPlayer->getRealName();
108+
}
82109

83-
LL_AUTO_TYPE_INSTANCE_HOOK(
84-
PacketSenderHook,
85-
ll::memory::HookPriority::High,
86-
NetworkSystem,
87-
&NetworkSystem::send,
88-
void,
89-
const ::NetworkIdentifier& id,
90-
const Packet& packet,
91-
::SubClientId subClientId
92-
) {
110+
111+
ServerPlayer* getPlayerFromNetworkId(::NetworkIdentifier const& id, ::SubClientId recipientSubId) {
93112
auto serverNetworkHandler = ll::service::getServerNetworkHandler();
94113
if (!serverNetworkHandler) {
95-
return origin(id, packet, subClientId);
114+
return nullptr;
96115
}
97116

98-
ServerPlayer* player = serverNetworkHandler->_getServerPlayer(id, subClientId);
117+
ServerPlayer* player = serverNetworkHandler->_getServerPlayer(id, recipientSubId);
99118
if (!player) {
100-
return origin(id, packet, subClientId);
119+
return nullptr;
101120
}
102121

103-
auto packetId = packet.getId();
104-
dedicatedServerLogger->info("Sending {} to {}", packet.getName(), player->getRealName());
105-
106-
if (packetId == MinecraftPacketIds::AddActor || packetId == MinecraftPacketIds::LegacyTelemetryEvent
107-
|| packetId == MinecraftPacketIds::CommandOutput) {
108-
BinaryStream bs;
109-
packet.write(bs);
110-
dedicatedServerLogger->info("Text data {}", bs.mBuffer.data());
111-
}
112-
113-
if (packetId == MinecraftPacketIds::SetActorData || packetId == MinecraftPacketIds::AddActor
114-
|| packetId == MinecraftPacketIds::InventoryContent || packetId == MinecraftPacketIds::ActorEvent
115-
|| packetId == MinecraftPacketIds::SyncActorProperty) {
116-
122+
return player;
123+
}
117124

118-
if (packetId == MinecraftPacketIds::SetActorData) {
119-
auto& casted = static_cast<const SetActorDataPacket&>(packet);
125+
LL_AUTO_TYPE_INSTANCE_HOOK(
126+
SetActorDataPacketSendHook,
127+
ll::memory::HookPriority::High,
128+
LoopbackPacketSender,
129+
&LoopbackPacketSender::$sendToClients,
130+
void,
131+
::std::vector<::NetworkIdentifierWithSubId> const& ids,
132+
::Packet const& packet
133+
) {
134+
auto packetId = packet.getId();
120135

121-
// BinaryStream bs;
122-
// packet.write(bs);
123-
// SetActorDataPacket newPacket{casted.mId, casted.mPackedItems, casted.mSynchedProperties, casted.mTick,
124-
// false};
136+
if (packetId == MinecraftPacketIds::SetActorData) {
125137

126-
// BinaryStream bs2;
127-
// newPacket.write(bs2);
128-
// dedicatedServerLogger->info("Text data {}", bs2.mBuffer.data());
138+
auto& casted = static_cast<const SetActorDataPacket&>(packet);
139+
auto& mData = const_cast<MData>(casted.mPackedItems);
140+
auto index = findNameTagDataItem(mData);
129141

130-
// newPacket._read(bs);
142+
if (isNameTagTranslatable(mData, index)) {
143+
dedicatedServerLogger->info("SetActorDataHook: Sending {} ", packet.getName());
131144

132-
for (auto& item : casted.mPackedItems) {
133-
if (item) {
134-
auto itemDataId = item->getId();
135-
if (itemDataId == (ushort)ActorDataIDs::Name) {
136-
item->setData<std::string>("Translate and set name here");
137-
dedicatedServerLogger->info(
138-
"Text nameTag data with content {}",
139-
item->getData<std::string>()->data()
140-
);
141-
}
145+
for (auto& id : ids) {
146+
auto player = getPlayerFromNetworkId(id.id, id.subClientId);
147+
if (player) {
148+
translateEntityNameTag(mData, index, player);
149+
this->sendTo(id.id, id.subClientId, const_cast<Packet&>(packet));
150+
} else {
151+
dedicatedServerLogger->info("SetActorDataHook: Unable to find player, skipping");
142152
}
143153
}
154+
return;
155+
}
156+
}
157+
return origin(ids, packet);
158+
}
144159

145-
dedicatedServerLogger->info("Data size {}", casted.mPackedItems.size());
146160

147-
return origin(id, casted, subClientId);
148-
}
161+
LL_AUTO_TYPE_INSTANCE_HOOK(
162+
PacketSenderHook,
163+
ll::memory::HookPriority::High,
164+
NetworkSystem,
165+
&NetworkSystem::send,
166+
void,
167+
const ::NetworkIdentifier& id,
168+
const Packet& packet,
169+
::SubClientId subId
170+
) {
171+
auto packetId = packet.getId();
149172

150-
// if (packetId == MinecraftPacketIds::AddActor) {
151-
// BinaryStream bs;
152-
// packet.write(bs);
153-
// AddActorPacket newPacket{};
154-
// newPacket.read(bs);
155-
156-
// for (auto& item : *newPacket.mData) {
157-
// if (item) {
158-
// auto itemDataId = item->getId();
159-
// if (itemDataId == (ushort)ActorDataIDs::Name) {
160-
// // item->setData<std::string>("Custom name HAAH LL");
161-
// dedicatedServerLogger->info(
162-
// "Text nameTag data with id {} and content {}",
163-
// itemDataId,
164-
// item->getData<std::string>()->data()
165-
// );
166-
// }
167-
// }
168-
// }
173+
if (packetId == MinecraftPacketIds::AddActor || packetId == MinecraftPacketIds::InventoryContent
174+
|| packetId == MinecraftPacketIds::PlayerList) {
175+
auto player = getPlayerFromNetworkId(id, subId);
176+
if (!player) return origin(id, packet, subId);
169177

170-
// BinaryStream bs2;
171-
// newPacket.write(bs2);
178+
dedicatedServerLogger->info("Sending {} to {}", packet.getName(), player->getRealName());
172179

173-
// dedicatedServerLogger->info("Buffer1 '{}' '{}' ", bs.mBuffer.data(), bs2.mBuffer.data());
180+
// if (packetId == MinecraftPacketIds::PlayerList) {
181+
// auto& casted = static_cast<const PlayerListPacket&>(packet);
174182

175-
// return origin(id, packet, subClientId);
183+
// for (auto& entry : *casted.mEntries) {
184+
// (*entry.mName) = translatePlayerNameTag(*entry.mName, player);
185+
// }
176186
// }
177187

178188
if (packetId == MinecraftPacketIds::AddActor) {
179189
auto& casted = static_cast<const AddActorPacket&>(packet);
180190
auto& mData = casted.mEntityData->mData.get()->mData->mItemsArray;
191+
auto index = findNameTagDataItem(mData);
181192

182-
translateEntityNameTag(mData, player);
193+
translateEntityNameTag(mData, index, player);
183194

184-
return origin(id, casted, subClientId);
195+
return origin(id, casted, subId);
185196
}
186197

187-
// if (packetId == MinecraftPacketIds::BookEdit) {
188-
// BookEditPacket actorData(static_cast<const BookEditPacket&>(packet));
189-
// dedicatedServerLogger->info("Got properties");
190-
// }
191-
198+
if (packetId == MinecraftPacketIds::InventoryContent) {
199+
auto& casted = (static_cast<const InventoryContentPacket&>(packet));
192200

193-
// if (packetId == MinecraftPacketIds::Login) {
194-
// LoginPacket actorData(static_cast<const LoginPacket&>(packet));
195-
// dedicatedServerLogger->info("Got properties");
196-
// }
201+
for (auto& slot : *casted.mSlots) {
202+
slot.mImpl;
203+
}
197204

198-
// if (packetId == MinecraftPacketIds::InventoryContent) {
199-
// InventoryContentPacket casted = (static_cast<const InventoryContentPacket&>(packet));
200-
// InventoryContentPacket copiedAndCasted(casted);
201-
// // Modify inventory content
202-
// return origin(id, copiedAndCasted, subClientId);
203-
// }
205+
return origin(id, casted, subId);
206+
}
204207
}
205-
return origin(id, packet, subClientId);
208+
return origin(id, packet, subId);
206209
}
207210

208211

0 commit comments

Comments
 (0)