Merge remote-tracking branch 'runelite/master' into 1808-merge

runelite-api/src/main/java/net/runelite/api/Client.java

@@ -131,11 +131,11 @@ public interface Client extends GameShell
 	GameState getGameState();
 
 	/**
-	 * Sets the current game state.
+	 * Sets the current game state
 	 *
-	 * @param gameState new game state
+	 * @param gameState
 	 */
-	void setGameState(int gameState);
+	void setGameState(GameState gameState);
 
 	/**
 	 * Gets the current logged in username.

runelite-api/src/main/java/net/runelite/api/GameState.java

@@ -28,10 +28,12 @@ import java.util.Arrays;
 import java.util.Map;
 import java.util.function.Function;
 import java.util.stream.Collectors;
+import lombok.Getter;
 
 /**
  * An enumeration of game states the client is in.
  */
+@Getter
 public enum GameState
 {
 	/**