refactor: unglob std::deque

Minecraft.Client/Network/PlayerList.h

@@ -30,9 +30,9 @@ private:
 
 	// 4J Added
 	std::vector<PlayerUID> m_bannedXuids;
-	deque<BYTE> m_smallIdsToKick;
+	std::deque<BYTE> m_smallIdsToKick;
 	CRITICAL_SECTION m_kickPlayersCS;
-	deque<BYTE> m_smallIdsToClose;
+	std::deque<BYTE> m_smallIdsToClose;
 	CRITICAL_SECTION m_closePlayersCS;
 /* 4J - removed
 	Set<String> bans = new HashSet<String>();

Minecraft.Client/Network/ServerChunkCache.h

@@ -25,7 +25,7 @@ private:
     ServerLevel *level;
 
 #ifdef _LARGE_WORLDS
-	deque<LevelChunk *> m_toDrop;
+	std::deque<LevelChunk *> m_toDrop;
 	LevelChunk **m_unloadedCache;
 #endif
 

Minecraft.Client/Rendering/Particles/ParticleEngine.h

@@ -26,7 +26,7 @@ public:
 protected:
 	Level *level;
 private:
-	deque<std::shared_ptr<Particle> > particles[3][TEXTURE_COUNT];		// 4J made two arrays to cope with simultaneous two dimensions
+	std::deque<std::shared_ptr<Particle> > particles[3][TEXTURE_COUNT];		// 4J made two arrays to cope with simultaneous two dimensions
     Textures *textures;
     Random *random;
 

Minecraft.World/Blocks/LiquidTileDynamic.h

@@ -18,7 +18,7 @@ private:
 		{
 		}
 	} LiquidTickData;
-	deque<LiquidTickData> m_tilesToTick; // For an iterative version of instatick
+	std::deque<LiquidTickData> m_tilesToTick; // For an iterative version of instatick
 	bool m_iterativeInstatick;
 protected:
 	LiquidTileDynamic(int id, Material *material);

Minecraft.World/Blocks/NotGateTile.cpp

@@ -4,7 +4,7 @@
 #include "../Util/SoundTypes.h"
 #include "../Headers/net.minecraft.world.h"
 
-std::unordered_map<Level *, deque<NotGateTile::Toggle> *> NotGateTile::recentToggles = std::unordered_map<Level *, deque<NotGateTile::Toggle> *>();
+std::unordered_map<Level *, std::deque<NotGateTile::Toggle> *> NotGateTile::recentToggles = std::unordered_map<Level *, std::deque<NotGateTile::Toggle> *>();
 
 // 4J - added, to tie in with other changes brought forward from 1.3.2 to associate toggles with a level. In addition to what the java
 // version does, we are also removing any references to levels that we are storing when they hit their dtor.
@@ -22,7 +22,7 @@ bool NotGateTile::isToggledTooFrequently(Level *level, int x, int y, int z, bool
 	// 4J - brought forward changes to associate toggles with a level from 1.3.2
 	if( recentToggles.find(level) == recentToggles.end() )
 	{
-		recentToggles[level] = new deque<Toggle>;
+		recentToggles[level] = new std::deque<Toggle>;
 	}
     if (add) recentToggles[level]->push_back(Toggle(x, y, z, level->getTime()));
     int count = 0;
@@ -114,7 +114,7 @@ void NotGateTile::tick(Level *level, int x, int y, int z, Random *random)
 	// 4J - brought forward changes from 1.3.2 to associate toggles with level
 	if( recentToggles.find(level) != recentToggles.end() )
 	{
-		deque<Toggle> *toggles = recentToggles[level];
+		std::deque<Toggle> *toggles = recentToggles[level];
 		while (!toggles->empty() && level->getTime() - toggles->front().when > RECENT_TOGGLE_TIMER)
 		{
 			toggles->pop_front();
@@ -223,7 +223,7 @@ int NotGateTile::cloneTileId(Level *level, int x, int y, int z)
 
 void NotGateTile::levelTimeChanged(Level *level, __int64 delta, __int64 newTime)
 {
-	deque<Toggle> *toggles = recentToggles[level];
+	std::deque<Toggle> *toggles = recentToggles[level];
 
 	if (toggles != NULL)
 	{

Minecraft.World/Blocks/NotGateTile.h

@@ -31,7 +31,7 @@ public:
     };
 
 private:
-	static std::unordered_map<Level *, deque<Toggle> *> recentToggles;		// 4J - brought forward change from 1.3.2
+	static std::unordered_map<Level *, std::deque<Toggle> *> recentToggles;		// 4J - brought forward change from 1.3.2
 public:
 	static void removeLevelReferences(Level *level);				// 4J added
 private:

Minecraft.World/Entities/Mob.h

@@ -112,7 +112,7 @@ public:
 	int removeArrowTime;
 
 protected:
-	map<int, MobEffectInstance *> activeEffects;
+	std::map<int, MobEffectInstance *> activeEffects;
 
 private:
 	bool effectsDirty;

Minecraft.World/WorldGen/Structures/Villages.h

@@ -11,7 +11,7 @@ public:
 
 private:
 	Level *level;
-	deque<Pos *> queries;
+	std::deque<Pos *> queries;
 	std::vector<std::shared_ptr<DoorInfo> > unclustered;
 	std::vector<std::shared_ptr<Village> > villages;
 	int _tick;