From 00fd033b613cae647831caeddc11ea6c4aac36e2 Mon Sep 17 00:00:00 2001 From: Yannik Bretschneider Date: Thu, 3 Jun 2021 16:20:23 +0200 Subject: [PATCH] fix: changed visibility of message vars to public --- .../gamelibrary/messages/BasicMessage.java | 8 ++++---- .../messages/CharacterSelectionMessage.java | 2 +- .../messages/ConfirmSelectionMessage.java | 2 +- .../gamelibrary/messages/ErrorMessage.java | 4 ++-- .../messages/GameAssignmentMessage.java | 4 ++-- .../gamelibrary/messages/GameStructureMessage.java | 14 +++++++------- .../messages/GeneralAssignmentMessage.java | 2 +- .../gamelibrary/messages/GoodbyeClientMessage.java | 2 +- .../gamelibrary/messages/HelloClientMessage.java | 2 +- .../gamelibrary/messages/HelloServerMessage.java | 4 ++-- .../gamelibrary/messages/PlayerReadyMessage.java | 4 ++-- .../gamelibrary/messages/ReconnectMessage.java | 2 +- 12 files changed, 25 insertions(+), 25 deletions(-) diff --git a/src/main/java/uulm/teamname/marvelous/gamelibrary/messages/BasicMessage.java b/src/main/java/uulm/teamname/marvelous/gamelibrary/messages/BasicMessage.java index c5025d0..04d81c3 100644 --- a/src/main/java/uulm/teamname/marvelous/gamelibrary/messages/BasicMessage.java +++ b/src/main/java/uulm/teamname/marvelous/gamelibrary/messages/BasicMessage.java @@ -8,20 +8,20 @@ package uulm.teamname.marvelous.gamelibrary.messages; public class BasicMessage { /** The messageType describes the type of message that might be sent */ - MessageType messageType; + public MessageType messageType; /** I have no idea what this might be used for, even less the boolean in the answer */ - String optionals; + public String optionals; /** * Exists only in a HelloClient message. * Describes whether the user was in a running game before reconnecting. */ - boolean runningGame; + public Boolean runningGame; /** * Exists only in GameAssignment and GeneralAssignment messages. * Used for notifying the player of which party they have been assigned to */ - String gameID; + public String gameID; } diff --git a/src/main/java/uulm/teamname/marvelous/gamelibrary/messages/CharacterSelectionMessage.java b/src/main/java/uulm/teamname/marvelous/gamelibrary/messages/CharacterSelectionMessage.java index e7b12a7..42e0b93 100644 --- a/src/main/java/uulm/teamname/marvelous/gamelibrary/messages/CharacterSelectionMessage.java +++ b/src/main/java/uulm/teamname/marvelous/gamelibrary/messages/CharacterSelectionMessage.java @@ -6,5 +6,5 @@ public class CharacterSelectionMessage extends BasicMessage { * Boolean array that conveys information about what characters (6) * of the given characters (12) have been selected */ - Boolean[] characters; + public Boolean[] characters; } diff --git a/src/main/java/uulm/teamname/marvelous/gamelibrary/messages/ConfirmSelectionMessage.java b/src/main/java/uulm/teamname/marvelous/gamelibrary/messages/ConfirmSelectionMessage.java index 499bf05..bce9962 100644 --- a/src/main/java/uulm/teamname/marvelous/gamelibrary/messages/ConfirmSelectionMessage.java +++ b/src/main/java/uulm/teamname/marvelous/gamelibrary/messages/ConfirmSelectionMessage.java @@ -3,5 +3,5 @@ package uulm.teamname.marvelous.gamelibrary.messages; public class ConfirmSelectionMessage extends BasicMessage { /** Whether the other player is also done with the selection already */ - Boolean selectionComplete; + public Boolean selectionComplete; } diff --git a/src/main/java/uulm/teamname/marvelous/gamelibrary/messages/ErrorMessage.java b/src/main/java/uulm/teamname/marvelous/gamelibrary/messages/ErrorMessage.java index e745d41..b9ad7fd 100644 --- a/src/main/java/uulm/teamname/marvelous/gamelibrary/messages/ErrorMessage.java +++ b/src/main/java/uulm/teamname/marvelous/gamelibrary/messages/ErrorMessage.java @@ -3,8 +3,8 @@ package uulm.teamname.marvelous.gamelibrary.messages; public class ErrorMessage extends BasicMessage{ /** Some message telling the client what went wrong */ - String message; + public String message; /** The type of the error that happened */ - int type; + public int type; } diff --git a/src/main/java/uulm/teamname/marvelous/gamelibrary/messages/GameAssignmentMessage.java b/src/main/java/uulm/teamname/marvelous/gamelibrary/messages/GameAssignmentMessage.java index 0bb74de..a5e6a4c 100644 --- a/src/main/java/uulm/teamname/marvelous/gamelibrary/messages/GameAssignmentMessage.java +++ b/src/main/java/uulm/teamname/marvelous/gamelibrary/messages/GameAssignmentMessage.java @@ -5,8 +5,8 @@ import uulm.teamname.marvelous.gamelibrary.config.CharacterConfig; public class GameAssignmentMessage extends BasicMessage { /** The ID of the game that the client is connected to. What this is used for is kind of unknown. */ - String gameID; + public String gameID; /** The characters the player can choose from */ - CharacterConfig[] characterSelection; + public CharacterConfig[] characterSelection; } diff --git a/src/main/java/uulm/teamname/marvelous/gamelibrary/messages/GameStructureMessage.java b/src/main/java/uulm/teamname/marvelous/gamelibrary/messages/GameStructureMessage.java index 94cb1f0..4cf8396 100644 --- a/src/main/java/uulm/teamname/marvelous/gamelibrary/messages/GameStructureMessage.java +++ b/src/main/java/uulm/teamname/marvelous/gamelibrary/messages/GameStructureMessage.java @@ -12,26 +12,26 @@ import java.util.stream.Stream; public class GameStructureMessage extends BasicMessage { // TODO: ADD ENUM FOR THIS - String assignment; + public String assignment; /** The name of the first player */ - String playerOneName; + public String playerOneName; /** The name of the second player */ - String playerTwoName; + public String playerTwoName; /** The characters that the first player has chosen (and is therefore playing with in this match) */ - CharacterProperties[] playerOneCharacters; + public CharacterProperties[] playerOneCharacters; /** The characters that the second player has chosen (and is therefore playing with in this match) */ - CharacterProperties[] playerTwoCharacters; + public CharacterProperties[] playerTwoCharacters; /** The {@link PartyConfig Party Configuration} of the current match */ - PartyConfig matchconfig; + public PartyConfig matchconfig; /** The {@link ScenarioConfig Scenario Configuration} of the current scenario */ - ScenarioConfig scenarioconfig; + public ScenarioConfig scenarioconfig; @JsonIgnore public CharacterConfig getCharacterConfig() { CharacterConfig characterConfig = new CharacterConfig(); diff --git a/src/main/java/uulm/teamname/marvelous/gamelibrary/messages/GeneralAssignmentMessage.java b/src/main/java/uulm/teamname/marvelous/gamelibrary/messages/GeneralAssignmentMessage.java index 3ad844e..358b2e2 100644 --- a/src/main/java/uulm/teamname/marvelous/gamelibrary/messages/GeneralAssignmentMessage.java +++ b/src/main/java/uulm/teamname/marvelous/gamelibrary/messages/GeneralAssignmentMessage.java @@ -3,5 +3,5 @@ package uulm.teamname.marvelous.gamelibrary.messages; public class GeneralAssignmentMessage extends BasicMessage { /** The ID of the game that the client is connected to. What this is used for is kind of unknown. */ - String gameID; + public String gameID; } diff --git a/src/main/java/uulm/teamname/marvelous/gamelibrary/messages/GoodbyeClientMessage.java b/src/main/java/uulm/teamname/marvelous/gamelibrary/messages/GoodbyeClientMessage.java index 33ed3f2..0428157 100644 --- a/src/main/java/uulm/teamname/marvelous/gamelibrary/messages/GoodbyeClientMessage.java +++ b/src/main/java/uulm/teamname/marvelous/gamelibrary/messages/GoodbyeClientMessage.java @@ -3,5 +3,5 @@ package uulm.teamname.marvelous.gamelibrary.messages; public class GoodbyeClientMessage extends BasicMessage { /** A message sent to the client on disconnect */ - String message; + public String message; } diff --git a/src/main/java/uulm/teamname/marvelous/gamelibrary/messages/HelloClientMessage.java b/src/main/java/uulm/teamname/marvelous/gamelibrary/messages/HelloClientMessage.java index 60c1a7f..482fad7 100644 --- a/src/main/java/uulm/teamname/marvelous/gamelibrary/messages/HelloClientMessage.java +++ b/src/main/java/uulm/teamname/marvelous/gamelibrary/messages/HelloClientMessage.java @@ -2,5 +2,5 @@ package uulm.teamname.marvelous.gamelibrary.messages; public class HelloClientMessage extends BasicMessage { /** Whether there is a running game that the player disconnected from */ - Boolean runningGame; + public Boolean runningGame; } diff --git a/src/main/java/uulm/teamname/marvelous/gamelibrary/messages/HelloServerMessage.java b/src/main/java/uulm/teamname/marvelous/gamelibrary/messages/HelloServerMessage.java index 49fb49c..2586aaa 100644 --- a/src/main/java/uulm/teamname/marvelous/gamelibrary/messages/HelloServerMessage.java +++ b/src/main/java/uulm/teamname/marvelous/gamelibrary/messages/HelloServerMessage.java @@ -3,8 +3,8 @@ package uulm.teamname.marvelous.gamelibrary.messages; public class HelloServerMessage extends BasicMessage{ /** User-chosen name, basically a PlayerName */ - String name; + public String name; /** Device ID sent by the Client, might be anything, but used together with name to uniquely identify the client */ - String deviceID; + public String deviceID; } diff --git a/src/main/java/uulm/teamname/marvelous/gamelibrary/messages/PlayerReadyMessage.java b/src/main/java/uulm/teamname/marvelous/gamelibrary/messages/PlayerReadyMessage.java index ff99f38..9a99e43 100644 --- a/src/main/java/uulm/teamname/marvelous/gamelibrary/messages/PlayerReadyMessage.java +++ b/src/main/java/uulm/teamname/marvelous/gamelibrary/messages/PlayerReadyMessage.java @@ -3,8 +3,8 @@ package uulm.teamname.marvelous.gamelibrary.messages; public class PlayerReadyMessage extends BasicMessage { /** Whether the client wants to start the game. If this is false, the client gets disconnected. */ - Boolean startGame; + public Boolean startGame; /** The {@link RoleEnum Role} the client wants to take */ - RoleEnum role; + public RoleEnum role; } diff --git a/src/main/java/uulm/teamname/marvelous/gamelibrary/messages/ReconnectMessage.java b/src/main/java/uulm/teamname/marvelous/gamelibrary/messages/ReconnectMessage.java index 1b6210b..a6c745c 100644 --- a/src/main/java/uulm/teamname/marvelous/gamelibrary/messages/ReconnectMessage.java +++ b/src/main/java/uulm/teamname/marvelous/gamelibrary/messages/ReconnectMessage.java @@ -3,5 +3,5 @@ package uulm.teamname.marvelous.gamelibrary.messages; public class ReconnectMessage { /** Whether the client wants to reconnect to the previously running game */ - Boolean reconnect; + public Boolean reconnect; }