Added /gamemode command (#159)

- Other functional GameType/GameMode related cleanup

Co-authored-by: Brent Da Mage <BrentDaMage@users.noreply.github.com>

Author: BrentDaMage

source/network/ServerSideNetworkHandler.cpp

@@ -414,16 +414,17 @@ OnlinePlayer* ServerSideNetworkHandler::getPlayerByGUID(const RakNet::RakNetGUID
 
 void ServerSideNetworkHandler::setupCommands()
 {
-	m_commands["?"]      = &ServerSideNetworkHandler::commandHelp;
-	m_commands["help"]   = &ServerSideNetworkHandler::commandHelp;
-	m_commands["stats"]  = &ServerSideNetworkHandler::commandStats;
-	m_commands["time"]   = &ServerSideNetworkHandler::commandTime;
-	m_commands["seed"]   = &ServerSideNetworkHandler::commandSeed;
-	m_commands["tp"]     = &ServerSideNetworkHandler::commandTP;
-	m_commands["summon"] = &ServerSideNetworkHandler::commandSummon;
+	m_commands["?"]        = &ServerSideNetworkHandler::commandHelp;
+	m_commands["help"]     = &ServerSideNetworkHandler::commandHelp;
+	m_commands["stats"]    = &ServerSideNetworkHandler::commandStats;
+	m_commands["time"]     = &ServerSideNetworkHandler::commandTime;
+	m_commands["seed"]     = &ServerSideNetworkHandler::commandSeed;
+	m_commands["tp"]       = &ServerSideNetworkHandler::commandTP;
+	m_commands["summon"]   = &ServerSideNetworkHandler::commandSummon;
+	m_commands["gamemode"] = &ServerSideNetworkHandler::commandGamemode;
 }
 
-bool ServerSideNetworkHandler::checkPermissions(OnlinePlayer* player)
+bool ServerSideNetworkHandler::_checkPermissions(OnlinePlayer* player)
 {
 	if (player->m_pPlayer != m_pMinecraft->m_pLocalPlayer)
 	{
@@ -434,6 +435,22 @@ bool ServerSideNetworkHandler::checkPermissions(OnlinePlayer* player)
 	return true;
 }
 
+bool ServerSideNetworkHandler::_validateNum(OnlinePlayer* player, int value, int min, int max)
+{
+	if (value < min)
+	{
+		sendMessage(player, Util::format("The number you have entered (%d) is too small, it must be at least %d", value, min));
+		return false;
+	}
+	else if (value > max)
+	{
+		sendMessage(player, Util::format("The number you have entered (%d) is too big, it must be at most %d", value, max));
+		return false;
+	}
+
+	return true;
+}
+
 void ServerSideNetworkHandler::commandHelp(OnlinePlayer* player, const std::vector<std::string>& parms)
 {
 	std::stringstream ss;
@@ -479,7 +496,7 @@ void ServerSideNetworkHandler::commandTime(OnlinePlayer* player, const std::vect
 			return;
 		}
 
-		if (!checkPermissions(player)) return;
+		if (!_checkPermissions(player)) return;
 
 		m_pLevel->setTime(t);
 
@@ -517,7 +534,7 @@ void ServerSideNetworkHandler::commandTP(OnlinePlayer* player, const std::vector
 		return;
 	}
 
-	if (!checkPermissions(player)) return;
+	if (!_checkPermissions(player)) return;
 
 	Vec3 pos = player->m_pPlayer->getPos(1.0f);
 
@@ -564,7 +581,7 @@ void ServerSideNetworkHandler::commandSummon(OnlinePlayer* player, const std::ve
 		return;
 	}
 
-	if (!checkPermissions(player)) return;
+	if (!_checkPermissions(player)) return;
 
 	std::string entityName;
 	std::stringstream ss;
@@ -643,3 +660,36 @@ void ServerSideNetworkHandler::commandSummon(OnlinePlayer* player, const std::ve
 
 	sendMessage(player, ss.str());
 }
+
+void ServerSideNetworkHandler::commandGamemode(OnlinePlayer* player, const std::vector<std::string>& parms)
+{
+	if (!m_pLevel)
+		return;
+    
+	if (parms.size() != 1)
+	{
+		sendMessage(player, "Usage: /gamemode <mode>");
+		return;
+	}
+	/*if (parms.size() < 1 || parms.size() > 2)
+	{
+		sendMessage(player, "Usage: /gamemode <mode> [player]");
+		return;
+	}*/
+    
+	if (!_checkPermissions(player)) return;
+    
+	Vec3 pos = player->m_pPlayer->getPos(1.0f);
+    
+	GameType gameMode;
+	std::stringstream ss;
+	ss.str(parms[0]);
+	ss >> (int&)gameMode;
+
+	if (!_validateNum(player, gameMode, GAME_TYPES_MIN, GAME_TYPES_MAX))
+		return;
+    
+	player->m_pPlayer->setPlayerGameType(gameMode);
+    
+	sendMessage(player, "Your game mode has been updated");
+}

source/network/ServerSideNetworkHandler.hpp

@@ -33,7 +33,8 @@ typedef std::map<RakNet::RakNetGUID, OnlinePlayer*> OnlinePlayerMap;
 class ServerSideNetworkHandler : public NetEventCallback, public LevelListener
 {
 private:
-	bool checkPermissions(OnlinePlayer* player);
+	bool _checkPermissions(OnlinePlayer* player);
+	bool _validateNum(OnlinePlayer* player, int value, int min, int max);
 
 public:
 
@@ -70,12 +71,13 @@ class ServerSideNetworkHandler : public NetEventCallback, public LevelListener
 	void setupCommands();
 
 	// Commands
-	void commandHelp   (OnlinePlayer*, const std::vector<std::string>&);
-	void commandStats  (OnlinePlayer*, const std::vector<std::string>&);
-	void commandTime   (OnlinePlayer*, const std::vector<std::string>&);
-	void commandSeed   (OnlinePlayer*, const std::vector<std::string>&);
-	void commandTP     (OnlinePlayer*, const std::vector<std::string>&);
-	void commandSummon (OnlinePlayer*, const std::vector<std::string>&);
+	void commandHelp     (OnlinePlayer*, const std::vector<std::string>&);
+	void commandStats    (OnlinePlayer*, const std::vector<std::string>&);
+	void commandTime     (OnlinePlayer*, const std::vector<std::string>&);
+	void commandSeed     (OnlinePlayer*, const std::vector<std::string>&);
+	void commandTP       (OnlinePlayer*, const std::vector<std::string>&);
+	void commandSummon   (OnlinePlayer*, const std::vector<std::string>&);
+	void commandGamemode (OnlinePlayer*, const std::vector<std::string>&);
 
 public:
 	Minecraft* m_pMinecraft;

source/world/entity/LocalPlayer.cpp

@@ -87,6 +87,15 @@ bool LocalPlayer::isImmobile() const
 	return Player::isImmobile() || (m_pMinecraft->useController() && m_pMinecraft->m_pScreen); //!m_pMinecraft->m_bGrabbedMouse; // this works if we still set this when not using a mouse
 }
 
+void LocalPlayer::setPlayerGameType(GameType gameType)
+{
+	// @HACK: This info should be updated / stored in one place, and one place only.
+	// Don't know what crack Notch was smoking.
+	m_pMinecraft->setGameMode(gameType);
+
+	Player::setPlayerGameType(gameType);
+}
+
 void LocalPlayer::animateRespawn()
 {
 

source/world/entity/LocalPlayer.hpp

@@ -30,6 +30,7 @@ class LocalPlayer : public Player
 	virtual bool isLocalPlayer() const override { return true; }
 	virtual void drop(const ItemInstance* pItemInstance, bool b = false) override;
 	virtual bool isImmobile() const override;
+	virtual void setPlayerGameType(GameType gameType) override;
 
 	void calculateFlight(const Vec3& pos);
 	void closeContainer(); //@HUH: oddly enough not a virtual/override

source/world/entity/Player.hpp

@@ -56,7 +56,7 @@ class Player : public Mob
 	void drop();
 	float getDestroySpeed() const { return 1.0f; }
 	int getInventorySlot(int x) const;
-	TilePos getRespawnPosition() { return m_respawnPos; }
+	TilePos getRespawnPosition() const { return m_respawnPos; }
 	int getScore() const { return m_score; }
 	void prepareCustomTextures();
 	void reallyDrop(ItemEntity* pEnt);
@@ -68,7 +68,7 @@ class Player : public Mob
 	void take(Entity* pEnt, int x);
 	void touch(Entity* pEnt);
 	GameType getPlayerGameType() const { return _playerGameType; }
-	void setPlayerGameType(GameType playerGameType) { _playerGameType = playerGameType; }
+	virtual void setPlayerGameType(GameType playerGameType) { _playerGameType = playerGameType; }
 	bool isSurvival() const { return getPlayerGameType() == GAME_TYPE_SURVIVAL; }
 	bool isCreative() const { return getPlayerGameType() == GAME_TYPE_CREATIVE; }
 	ItemInstance* getSelectedItem() const;

source/world/gamemode/GameType.hpp

@@ -6,5 +6,6 @@ enum GameType
 	GAME_TYPE_CREATIVE,
 	GAME_TYPE_ADVENTURE,
 	GAME_TYPE_SPECTATOR,
-	GAME_TYPES_MAX
+	GAME_TYPES_MIN = GAME_TYPE_SURVIVAL,
+	GAME_TYPES_MAX = GAME_TYPE_CREATIVE
 };

source/world/item/Inventory.cpp

@@ -5,16 +5,13 @@ Inventory::Inventory(Player* pPlayer)
 {
 	m_pPlayer = pPlayer;
 	m_selectedHotbarSlot = 0;
-	m_bIsSurvival = false;
 
 	for (int i = 0; i < C_MAX_HOTBAR_ITEMS; i++)
 		m_hotbar[i] = -1;
 }
 
 void Inventory::prepareCreativeInventory()
 {
-	m_bIsSurvival = false;
-
 	m_items.clear();
 
 	// Original list of items.
@@ -86,7 +83,6 @@ void Inventory::prepareCreativeInventory()
 
 void Inventory::prepareSurvivalInventory()
 {
-	m_bIsSurvival = true;
 	m_items.clear();
 	m_items.resize(C_NUM_SURVIVAL_SLOTS);
 
@@ -105,10 +101,13 @@ void Inventory::prepareSurvivalInventory()
 
 int Inventory::getNumSlots()
 {
-	if (m_bIsSurvival)
+	switch (_getGameMode())
+	{
+	case GAME_TYPE_SURVIVAL:
 		return C_NUM_SURVIVAL_SLOTS;
-
-	return getNumItems();
+	default:
+		return getNumItems();
+	}
 }
 
 int Inventory::getNumItems()
@@ -132,7 +131,7 @@ void Inventory::clear()
 // but addResource's code is entirely different somehow. Did we write this from scratch?
 void Inventory::addItem(ItemInstance* pInst)
 {
-	if (!m_bIsSurvival)
+	if (_getGameMode() == GAME_TYPE_CREATIVE)
 	{
 		// Just get rid of the item.
 		pInst->m_count = 0;
@@ -293,7 +292,7 @@ void Inventory::setQuickSlotIndexByItemId(int slotNo, int itemID)
 	if (slotNo < 0 || slotNo >= C_MAX_HOTBAR_ITEMS)
 		return;
 
-	if (m_bIsSurvival)
+	if (_getGameMode() == GAME_TYPE_SURVIVAL)
 		return; // TODO
 
 	for (int i = 0; i < getNumItems(); i++)
@@ -344,3 +343,8 @@ void Inventory::dropAll(bool butNotReally)
 		}
 	}
 }
+
+GameType Inventory::_getGameMode() const
+{
+	return m_pPlayer->getPlayerGameType();
+}

source/world/item/Inventory.hpp

@@ -3,6 +3,7 @@
 #include <vector>
 #include "world/item/ItemInstance.hpp"
 #include "world/entity/Player.hpp"
+#include "world/gamemode/GameType.hpp"
 
 class Entity;
 class Player; // in case we're included from Player.hpp
@@ -52,12 +53,13 @@ class Inventory
 	ItemInstance* getSelected() {
 		return getSelectedItem();
 	}
+private:
+	GameType _getGameMode() const;
 
 public:
 	int m_selectedHotbarSlot;
 private:
 	Player* m_pPlayer;
-	bool m_bIsSurvival;
 
 	int m_hotbar[C_MAX_HOTBAR_ITEMS];
 	std::vector<ItemInstance> m_items;