backups/4jcraft
2
0
Fork 0
mirror of https://github.com/4jcraft/4jcraft.git synced 2026-08-20 09:57:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor: unglob std::unordered_set

Browse source
This commit is contained in:
Tropical 2026-03-06 12:13:01 -06:00
parent 49d02788c0
commit 0855e6ddf4
21 changed files with 34 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Minecraft.Client/Level/MultiPlayerLevel.h
View file

@ -55,8 +55,8 @@ public:
private: private:
std::unordered_map<int, std::shared_ptr<Entity>, IntKeyHash2, IntKeyEq> entitiesById; // 4J - was IntHashMap std::unordered_map<int, std::shared_ptr<Entity>, IntKeyHash2, IntKeyEq> entitiesById; // 4J - was IntHashMap
unordered_set<std::shared_ptr<Entity> > forced; std::unordered_set<std::shared_ptr<Entity> > forced;
unordered_set<std::shared_ptr<Entity> > reEntries; std::unordered_set<std::shared_ptr<Entity> > reEntries;
public: public:
virtual bool addEntity(std::shared_ptr<Entity> e); virtual bool addEntity(std::shared_ptr<Entity> e);
@ -82,7 +82,7 @@ protected:
public: public:
void animateTickDoWork(); // 4J added void animateTickDoWork(); // 4J added
unordered_set<int> chunksToAnimate; // 4J added std::unordered_set<int> chunksToAnimate; // 4J added
public: public:
void removeAllPendingEntityRemovals(); void removeAllPendingEntityRemovals();

2
Minecraft.Client/Level/ServerLevel.h
View file

@ -19,7 +19,7 @@ private:
CRITICAL_SECTION m_tickNextTickCS; // 4J added CRITICAL_SECTION m_tickNextTickCS; // 4J added
set<TickNextTickData, TickNextTickDataKeyCompare> tickNextTickList; // 4J Was TreeSet set<TickNextTickData, TickNextTickDataKeyCompare> tickNextTickList; // 4J Was TreeSet
unordered_set<TickNextTickData, TickNextTickDataKeyHash, TickNextTickDataKeyEq> tickNextTickSet; // 4J Was HashSet std::unordered_set<TickNextTickData, TickNextTickDataKeyHash, TickNextTickDataKeyEq> tickNextTickSet; // 4J Was HashSet
std::vector<Pos *> m_queuedSendTileUpdates; // 4J added std::vector<Pos *> m_queuedSendTileUpdates; // 4J added
CRITICAL_SECTION m_csQueueSendTileUpdates; CRITICAL_SECTION m_csQueueSendTileUpdates;

2
Minecraft.Client/Network/ServerChunkCache.h
View file

@ -12,7 +12,7 @@ class ServerChunkCache : public ChunkSource
{ {
private: private:
// unordered_set<int,IntKeyHash, IntKeyEq> toDrop; // std::unordered_set<int,IntKeyHash, IntKeyEq> toDrop;
private: private:
LevelChunk *emptyChunk; LevelChunk *emptyChunk;
ChunkSource *source; ChunkSource *source;

2
Minecraft.Client/Platform/Orbis/Network/SQRNetworkManager_Orbis.cpp
View file

@ -717,7 +717,7 @@ bool SQRNetworkManager_Orbis::FriendRoomManagerSearch2()
if( m_aFriendSearchResults.size() > 0 ) if( m_aFriendSearchResults.size() > 0 )
{ {
// If we have some results, then we also want to make sure that we don't have any duplicate rooms here if more than one friend is playing in the same room. // If we have some results, then we also want to make sure that we don't have any duplicate rooms here if more than one friend is playing in the same room.
unordered_set<SceNpMatching2RoomId> uniqueRooms; std::unordered_set<SceNpMatching2RoomId> uniqueRooms;
for( unsigned int i = 0; i < m_aFriendSearchResults.size(); i++ ) for( unsigned int i = 0; i < m_aFriendSearchResults.size(); i++ )
{ {
if(m_aFriendSearchResults[i].m_RoomFound) if(m_aFriendSearchResults[i].m_RoomFound)

2
Minecraft.Client/Platform/PS3/Network/SQRNetworkManager_PS3.cpp
View file

@ -592,7 +592,7 @@ bool SQRNetworkManager_PS3::FriendRoomManagerSearch2()
if( m_searchResultCount ) if( m_searchResultCount )
{ {
// If we have some results, then we also want to make sure that we don't have any duplicate rooms here if more than one friend is playing in the same room. // If we have some results, then we also want to make sure that we don't have any duplicate rooms here if more than one friend is playing in the same room.
unordered_set<SceNpMatching2RoomId> uniqueRooms; std::unordered_set<SceNpMatching2RoomId> uniqueRooms;
for( unsigned int i = 0; i < m_searchResultCount; i++ ) for( unsigned int i = 0; i < m_searchResultCount; i++ )
{ {
if(m_aSearchResultRoomFound[ i ]) if(m_aSearchResultRoomFound[ i ])

2
Minecraft.Client/Platform/PSVita/Network/SQRNetworkManager_AdHoc_Vita.cpp
View file

@ -723,7 +723,7 @@ bool SQRNetworkManager_AdHoc_Vita::FriendRoomManagerSearch2()
// if( m_aFriendSearchResults.size() > 0 ) // if( m_aFriendSearchResults.size() > 0 )
// { // {
// // If we have some results, then we also want to make sure that we don't have any duplicate rooms here if more than one friend is playing in the same room. // // If we have some results, then we also want to make sure that we don't have any duplicate rooms here if more than one friend is playing in the same room.
// unordered_set<SceNpMatching2RoomId> uniqueRooms; // std::unordered_set<SceNpMatching2RoomId> uniqueRooms;
// for( unsigned int i = 0; i < m_aFriendSearchResults.size(); i++ ) // for( unsigned int i = 0; i < m_aFriendSearchResults.size(); i++ )
// { // {
// if(m_aFriendSearchResults[i].m_RoomFound) // if(m_aFriendSearchResults[i].m_RoomFound)

2
Minecraft.Client/Platform/PSVita/Network/SQRNetworkManager_Vita.cpp
View file

@ -631,7 +631,7 @@ bool SQRNetworkManager_Vita::FriendRoomManagerSearch2()
if( m_aFriendSearchResults.size() > 0 ) if( m_aFriendSearchResults.size() > 0 )
{ {
// If we have some results, then we also want to make sure that we don't have any duplicate rooms here if more than one friend is playing in the same room. // If we have some results, then we also want to make sure that we don't have any duplicate rooms here if more than one friend is playing in the same room.
unordered_set<SceNpMatching2RoomId> uniqueRooms; std::unordered_set<SceNpMatching2RoomId> uniqueRooms;
for( unsigned int i = 0; i < m_aFriendSearchResults.size(); i++ ) for( unsigned int i = 0; i < m_aFriendSearchResults.size(); i++ )
{ {
if(m_aFriendSearchResults[i].m_RoomFound) if(m_aFriendSearchResults[i].m_RoomFound)

2
Minecraft.Client/Player/EntityTracker.h
View file

@ -13,7 +13,7 @@ class EntityTracker
{ {
private: private:
ServerLevel *level; ServerLevel *level;
unordered_set<std::shared_ptr<TrackedEntity> > entities; std::unordered_set<std::shared_ptr<TrackedEntity> > entities;
std::unordered_map<int, std::shared_ptr<TrackedEntity> , IntKeyHash2, IntKeyEq> entityMap; // was IntHashMap std::unordered_map<int, std::shared_ptr<TrackedEntity> , IntKeyHash2, IntKeyEq> entityMap; // was IntHashMap
int maxRange; int maxRange;

2
Minecraft.Client/Player/ServerPlayer.h
View file

@ -23,7 +23,7 @@ public:
double lastMoveX, lastMoveZ; double lastMoveX, lastMoveZ;
list<ChunkPos> chunksToSend; list<ChunkPos> chunksToSend;
std::vector<int> entitiesToRemove; std::vector<int> entitiesToRemove;
unordered_set<ChunkPos, ChunkPosKeyHash, ChunkPosKeyEq> seenChunks; std::unordered_set<ChunkPos, ChunkPosKeyHash, ChunkPosKeyEq> seenChunks;
int spewTimer; int spewTimer;
// 4J-Added, for 'Adventure Time' achievement. // 4J-Added, for 'Adventure Time' achievement.

2
Minecraft.Client/Player/TrackedEntity.h
View file

@ -32,7 +32,7 @@ private:
public: public:
bool moved; bool moved;
unordered_set<std::shared_ptr<ServerPlayer> , PlayerKeyHash, PlayerKeyEq > seenBy; std::unordered_set<std::shared_ptr<ServerPlayer> , PlayerKeyHash, PlayerKeyEq > seenBy;
TrackedEntity(std::shared_ptr<Entity> e, int range, int updateInterval, bool trackDelta); TrackedEntity(std::shared_ptr<Entity> e, int range, int updateInterval, bool trackDelta);

16
Minecraft.Client/Rendering/Chunk.cpp
View file

@ -204,7 +204,7 @@ void Chunk::rebuild()
LevelChunk::touchedSky = false; LevelChunk::touchedSky = false;
// unordered_set<std::shared_ptr<TileEntity> > oldTileEntities(renderableTileEntities.begin(),renderableTileEntities.end()); // 4J removed this & next line // std::unordered_set<std::shared_ptr<TileEntity> > oldTileEntities(renderableTileEntities.begin(),renderableTileEntities.end()); // 4J removed this & next line
// renderableTileEntities.clear(); // renderableTileEntities.clear();
std::vector<std::shared_ptr<TileEntity> > renderableTileEntities; // 4J - added std::vector<std::shared_ptr<TileEntity> > renderableTileEntities; // 4J - added
@ -554,10 +554,10 @@ void Chunk::rebuild()
*/ */
unordered_set<std::shared_ptr<TileEntity> > newTileEntities(renderableTileEntities.begin(),renderableTileEntities.end()); std::unordered_set<std::shared_ptr<TileEntity> > newTileEntities(renderableTileEntities.begin(),renderableTileEntities.end());
AUTO_VAR(endIt, oldTileEntities.end()); AUTO_VAR(endIt, oldTileEntities.end());
for( unordered_set<std::shared_ptr<TileEntity> >::iterator it = oldTileEntities.begin(); it != endIt; it++ ) for( std::unordered_set<std::shared_ptr<TileEntity> >::iterator it = oldTileEntities.begin(); it != endIt; it++ )
{ {
newTileEntities.erase(*it); newTileEntities.erase(*it);
} }
@ -566,7 +566,7 @@ void Chunk::rebuild()
EnterCriticalSection(globalRenderableTileEntities_cs); EnterCriticalSection(globalRenderableTileEntities_cs);
endIt = newTileEntities.end(); endIt = newTileEntities.end();
for( unordered_set<std::shared_ptr<TileEntity> >::iterator it = newTileEntities.begin(); it != endIt; it++ ) for( std::unordered_set<std::shared_ptr<TileEntity> >::iterator it = newTileEntities.begin(); it != endIt; it++ )
{ {
globalRenderableTileEntities->push_back(*it); globalRenderableTileEntities->push_back(*it);
} }
@ -656,7 +656,7 @@ void Chunk::rebuild_SPU()
LevelChunk::touchedSky = false; LevelChunk::touchedSky = false;
// unordered_set<std::shared_ptr<TileEntity> > oldTileEntities(renderableTileEntities.begin(),renderableTileEntities.end()); // 4J removed this & next line // std::unordered_set<std::shared_ptr<TileEntity> > oldTileEntities(renderableTileEntities.begin(),renderableTileEntities.end()); // 4J removed this & next line
// renderableTileEntities.clear(); // renderableTileEntities.clear();
std::vector<std::shared_ptr<TileEntity> > renderableTileEntities; // 4J - added std::vector<std::shared_ptr<TileEntity> > renderableTileEntities; // 4J - added
@ -883,10 +883,10 @@ void Chunk::rebuild_SPU()
*/ */
unordered_set<std::shared_ptr<TileEntity> > newTileEntities(renderableTileEntities.begin(),renderableTileEntities.end()); std::unordered_set<std::shared_ptr<TileEntity> > newTileEntities(renderableTileEntities.begin(),renderableTileEntities.end());
AUTO_VAR(endIt, oldTileEntities.end()); AUTO_VAR(endIt, oldTileEntities.end());
for( unordered_set<std::shared_ptr<TileEntity> >::iterator it = oldTileEntities.begin(); it != endIt; it++ ) for( std::unordered_set<std::shared_ptr<TileEntity> >::iterator it = oldTileEntities.begin(); it != endIt; it++ )
{ {
newTileEntities.erase(*it); newTileEntities.erase(*it);
} }
@ -895,7 +895,7 @@ void Chunk::rebuild_SPU()
EnterCriticalSection(globalRenderableTileEntities_cs); EnterCriticalSection(globalRenderableTileEntities_cs);
endIt = newTileEntities.end(); endIt = newTileEntities.end();
for( unordered_set<std::shared_ptr<TileEntity> >::iterator it = newTileEntities.begin(); it != endIt; it++ ) for( std::unordered_set<std::shared_ptr<TileEntity> >::iterator it = newTileEntities.begin(); it != endIt; it++ )
{ {
globalRenderableTileEntities.push_back(*it); globalRenderableTileEntities.push_back(*it);
} }

2
Minecraft.World/Blocks/RedStoneDustTile.h
View file

@ -17,7 +17,7 @@ public:
static const std::wstring TEXTURE_LINE_OVERLAY; static const std::wstring TEXTURE_LINE_OVERLAY;
private: private:
bool shouldSignal; bool shouldSignal;
unordered_set<TilePos, TilePosKeyHash, TilePosKeyEq> toUpdate; std::unordered_set<TilePos, TilePosKeyHash, TilePosKeyEq> toUpdate;
Icon *iconCross; Icon *iconCross;
Icon *iconLine; Icon *iconLine;
Icon *iconCrossOver; Icon *iconCrossOver;

2
Minecraft.World/Commands/CommandDispatcher.h
View file

@ -11,7 +11,7 @@ private:
#else #else
std::unordered_map<EGameCommand, Command *> commandsById; std::unordered_map<EGameCommand, Command *> commandsById;
#endif #endif
unordered_set<Command *> commands; std::unordered_set<Command *> commands;
public: public:
void performCommand(std::shared_ptr<CommandSender> sender, EGameCommand command, byteArray commandData); void performCommand(std::shared_ptr<CommandSender> sender, EGameCommand command, byteArray commandData);

2
Minecraft.World/Containers/AbstractContainerMenu.h
View file

@ -68,7 +68,7 @@ public:
short backup(std::shared_ptr<Inventory> inventory); short backup(std::shared_ptr<Inventory> inventory);
private: private:
unordered_set<std::shared_ptr<Player> , PlayerKeyHash, PlayerKeyEq> unSynchedPlayers; std::unordered_set<std::shared_ptr<Player> , PlayerKeyHash, PlayerKeyEq> unSynchedPlayers;
public: public:
bool isSynched(std::shared_ptr<Player> player); bool isSynched(std::shared_ptr<Player> player);

2
Minecraft.World/Level/Explosion.h
View file

@ -22,7 +22,7 @@ public:
std::shared_ptr<Entity> source; std::shared_ptr<Entity> source;
float r; float r;
unordered_set<TilePos, TilePosKeyHash, TilePosKeyEq> toBlow; std::unordered_set<TilePos, TilePosKeyHash, TilePosKeyEq> toBlow;
private: private:
typedef std::unordered_map<std::shared_ptr<Player>, Vec3 * , PlayerKeyHash, PlayerKeyEq> playerVec3Map; typedef std::unordered_map<std::shared_ptr<Player>, Vec3 * , PlayerKeyHash, PlayerKeyEq> playerVec3Map;

2
Minecraft.World/Level/Level.h
View file

@ -380,7 +380,7 @@ protected:
// AP - See CustomSet.h for an explanation of this // AP - See CustomSet.h for an explanation of this
CustomSet chunksToPoll; CustomSet chunksToPoll;
#else #else
unordered_set<ChunkPos,ChunkPosKeyHash,ChunkPosKeyEq> chunksToPoll; std::unordered_set<ChunkPos,ChunkPosKeyHash,ChunkPosKeyEq> chunksToPoll;
#endif #endif
private: private:

2
Minecraft.World/Network/Packets/ExplodePacket.cpp
View file

@ -19,7 +19,7 @@ ExplodePacket::ExplodePacket()
knockbackZ = 0.0f; knockbackZ = 0.0f;
} }
ExplodePacket::ExplodePacket(double x, double y, double z, float r, unordered_set<TilePos, TilePosKeyHash, TilePosKeyEq> *toBlow, Vec3 *knockback, bool knockBackOnly) ExplodePacket::ExplodePacket(double x, double y, double z, float r, std::unordered_set<TilePos, TilePosKeyHash, TilePosKeyEq> *toBlow, Vec3 *knockback, bool knockBackOnly)
{ {
this->x = x; this->x = x;
this->y = y; this->y = y;

2
Minecraft.World/Network/Packets/ExplodePacket.h
View file

@ -20,7 +20,7 @@ public:
public: public:
ExplodePacket(); ExplodePacket();
ExplodePacket(double x, double y, double z, float r, unordered_set<TilePos, TilePosKeyHash, TilePosKeyEq> *toBlow, Vec3 *knockback, bool knockBackOnly); ExplodePacket(double x, double y, double z, float r, std::unordered_set<TilePos, TilePosKeyHash, TilePosKeyEq> *toBlow, Vec3 *knockback, bool knockBackOnly);
virtual void read(DataInputStream *dis); virtual void read(DataInputStream *dis);
virtual void write(DataOutputStream *dos); virtual void write(DataOutputStream *dos);

6
Minecraft.World/Network/Packets/Packet.cpp
View file

@ -165,9 +165,9 @@ Packet::Packet() : createTime( System::currentTimeMillis() )
std::unordered_map<int, packetCreateFn> Packet::idToCreateMap; std::unordered_map<int, packetCreateFn> Packet::idToCreateMap;
unordered_set<int> Packet::clientReceivedPackets = unordered_set<int>(); std::unordered_set<int> Packet::clientReceivedPackets = std::unordered_set<int>();
unordered_set<int> Packet::serverReceivedPackets = unordered_set<int>(); std::unordered_set<int> Packet::serverReceivedPackets = std::unordered_set<int>();
unordered_set<int> Packet::sendToAnyClientPackets = unordered_set<int>(); std::unordered_set<int> Packet::sendToAnyClientPackets = std::unordered_set<int>();
// 4J Added // 4J Added
std::unordered_map<int, Packet::PacketStatistics *> Packet::outgoingStatistics = std::unordered_map<int, Packet::PacketStatistics *>(); std::unordered_map<int, Packet::PacketStatistics *> Packet::outgoingStatistics = std::unordered_map<int, Packet::PacketStatistics *>();

6
Minecraft.World/Network/Packets/Packet.h
View file

@ -49,9 +49,9 @@ public:
public: public:
static std::unordered_map<int, packetCreateFn> idToCreateMap; // IntHashMap in 1.8.2 ... needed? // Made public in 1.0.1 static std::unordered_map<int, packetCreateFn> idToCreateMap; // IntHashMap in 1.8.2 ... needed? // Made public in 1.0.1
static unordered_set<int> clientReceivedPackets; static std::unordered_set<int> clientReceivedPackets;
static unordered_set<int> serverReceivedPackets; static std::unordered_set<int> serverReceivedPackets;
static unordered_set<int> sendToAnyClientPackets; static std::unordered_set<int> sendToAnyClientPackets;
// 4J Stu - Added the sendToAnyClient param so we can limit some packets to be only sent to one player on a system // 4J Stu - Added the sendToAnyClient param so we can limit some packets to be only sent to one player on a system
// 4J Stu - Added renderStats param for use in debugging // 4J Stu - Added renderStats param for use in debugging

2
Minecraft.World/Util/StringHelpers.h
View file

@ -28,7 +28,7 @@ template <class T> T _fromHEXString(const std::wstring& s)
return t; return t;
} }
std::wstring convStringToWstring(const string& converting); std::wstring convStringToWstring(const std::string& converting);
const char *wstringtofilename(const std::wstring& name); const char *wstringtofilename(const std::wstring& name);
std::wstring filenametowstring(const char *name); std::wstring filenametowstring(const char *name);