refactor: unglob std::wstring

Minecraft.Client/Player/LocalPlayer.cpp

@@ -674,7 +674,7 @@ void LocalPlayer::take(std::shared_ptr<Entity> e, int orgCount)
 	minecraft->particleEngine->add( std::shared_ptr<TakeAnimationParticle>( new TakeAnimationParticle((Level *)minecraft->level, e, shared_from_this(), -0.5f) ) );
 }
 
-void LocalPlayer::chat(const wstring& message)
+void LocalPlayer::chat(const std::wstring& message)
 {
 }
 

Minecraft.Client/Player/LocalPlayer.h

@@ -111,7 +111,7 @@ public:
 	virtual void crit(std::shared_ptr<Entity> e);
 	virtual void magicCrit(std::shared_ptr<Entity> e);
     virtual void take(std::shared_ptr<Entity> e, int orgCount);
-    virtual void chat(const wstring& message);
+    virtual void chat(const std::wstring& message);
 	virtual bool isSneaking();
 	//virtual bool isIdle();
     virtual void hurtTo(int newHealth, ETelemetryChallenges damageSource);

Minecraft.Client/Player/MultiPlayerLocalPlayer.cpp

@@ -162,7 +162,7 @@ void MultiplayerLocalPlayer::reallyDrop(std::shared_ptr<ItemEntity> itemEntity)
 {
 }
 
-void MultiplayerLocalPlayer::chat(const wstring& message)
+void MultiplayerLocalPlayer::chat(const std::wstring& message)
 {
 	connection->send( std::shared_ptr<ChatPacket>( new ChatPacket(message) ) );
 }

Minecraft.Client/Player/MultiPlayerLocalPlayer.h

@@ -37,7 +37,7 @@ public:
 protected:
 	virtual void reallyDrop(std::shared_ptr<ItemEntity> itemEntity);
 public:
-	virtual void chat(const wstring& message);
+	virtual void chat(const std::wstring& message);
     virtual void swing();
     virtual void respawn();
 protected:

Minecraft.Client/Player/RemotePlayer.cpp

@@ -3,7 +3,7 @@
 #include "../../Minecraft.World/Headers/net.minecraft.world.item.h"
 #include "../../Minecraft.World/Util/Mth.h"
 
-RemotePlayer::RemotePlayer(Level *level, const wstring& name) : Player(level)
+RemotePlayer::RemotePlayer(Level *level, const std::wstring& name) : Player(level)
 {
 	// 4J - added initialisers
 	hasStartedUsingItem = false;

Minecraft.Client/Player/RemotePlayer.h

@@ -10,7 +10,7 @@ private:
 	bool hasStartedUsingItem;
 public:
 	Input *input;
-    RemotePlayer(Level *level, const wstring& name);
+    RemotePlayer(Level *level, const std::wstring& name);
 protected:
 	virtual void setDefaultHeadHeight();
 public:

Minecraft.Client/Player/ServerPlayer.cpp

@@ -27,7 +27,7 @@
 #include "../../Minecraft.World/Level/LevelChunk.h"
 #include "../Rendering/LevelRenderer.h"
 
-ServerPlayer::ServerPlayer(MinecraftServer *server, Level *level, const wstring& name, ServerPlayerGameMode *gameMode) : Player(level)
+ServerPlayer::ServerPlayer(MinecraftServer *server, Level *level, const std::wstring& name, ServerPlayerGameMode *gameMode) : Player(level)
 {
 	// 4J - added initialisers
 	connection = nullptr;
@@ -369,7 +369,7 @@ void ServerPlayer::doChunkSendingTick(bool dontDelayChunks)
 					okToSend = true;
 					MinecraftServer::s_slowQueuePacketSent = true;
 
-//					static std::unordered_map<wstring,__int64> mapLastTime;
+//					static std::unordered_map<std::wstring,__int64> mapLastTime;
 //					__int64 thisTime = System::currentTimeMillis();
 //					__int64 lastTime = mapLastTime[connection->getNetworkPlayer()->GetUID().toString()];
 //					app.DebugPrintf(" - OK to send (%d ms since last)\n", thisTime - lastTime);
@@ -1342,7 +1342,7 @@ void ServerPlayer::displayClientMessage(int messageId)
 	}
 
     //Language *language = Language::getInstance();
-    //wstring languageString = app.GetString(messageId);//language->getElement(messageId);
+    //std::wstring languageString = app.GetString(messageId);//language->getElement(messageId);
     //connection->send( std::shared_ptr<ChatPacket>( new ChatPacket(L"", messageType) ) );
 }
 
@@ -1423,7 +1423,7 @@ void ServerPlayer::setGameMode(GameType *mode)
 	connection->send(std::shared_ptr<GameEventPacket>(new GameEventPacket(GameEventPacket::CHANGE_GAME_MODE, mode->getId())));
 }
 
-void ServerPlayer::sendMessage(const wstring& message, ChatPacket::EChatPacketMessage type /*= e_ChatCustom*/, int customData /*= -1*/, const wstring& additionalMessage /*= L""*/)
+void ServerPlayer::sendMessage(const std::wstring& message, ChatPacket::EChatPacketMessage type /*= e_ChatCustom*/, int customData /*= -1*/, const std::wstring& additionalMessage /*= L""*/)
 {
 	connection->send(std::shared_ptr<ChatPacket>(new ChatPacket(message,type,customData,additionalMessage)));
 }

Minecraft.Client/Player/ServerPlayer.h

@@ -39,7 +39,7 @@ private:
 	int lastBrupSendTickCount; // 4J Added
 
 public:
-	ServerPlayer(MinecraftServer *server, Level *level, const wstring& name, ServerPlayerGameMode *gameMode);
+	ServerPlayer(MinecraftServer *server, Level *level, const std::wstring& name, ServerPlayerGameMode *gameMode);
 	~ServerPlayer();
 	void flagEntitiesToBeRemoved(unsigned int *flags, bool *removedFound);			// 4J added
 
@@ -137,7 +137,7 @@ public:
 	void onUpdateAbilities();
 	ServerLevel *getLevel();
 	void setGameMode(GameType *mode);
-	void sendMessage(const wstring& message, ChatPacket::EChatPacketMessage type = ChatPacket::e_ChatCustom, int customData = -1, const wstring& additionalMessage = L"");
+	void sendMessage(const std::wstring& message, ChatPacket::EChatPacketMessage type = ChatPacket::e_ChatCustom, int customData = -1, const std::wstring& additionalMessage = L"");
 	bool hasPermission(EGameCommand command);
 	// 4J - Don't use
 	//void updateOptions(std::shared_ptr<ClientInformationPacket> packet);

Minecraft.Client/Player/User.cpp

@@ -38,7 +38,7 @@ void User::staticCtor()
     allowedTiles.push_back(Tile::obsidian);
 }
 
-User::User(const wstring& name, const wstring& sessionId)
+User::User(const std::wstring& name, const std::wstring& sessionId)
 {
     this->name = name;
     this->sessionId = sessionId;

Minecraft.Client/Player/User.h

@@ -6,9 +6,9 @@ class User
 public:
 	static vector<Tile *> allowedTiles;
 	static void staticCtor();
-	wstring name;
-	wstring sessionId;
-	wstring mpPassword;
+	std::wstring name;
+	std::wstring sessionId;
+	std::wstring mpPassword;
 
-	User(const wstring& name, const wstring& sessionId);
+	User(const std::wstring& name, const std::wstring& sessionId);
 };