Revert "Revert "fixed global state of GameController.java variables""

This reverts commit d1bf327.

.vscode/launch.json

@@ -0,0 +1,48 @@
+{
+ // Use IntelliSense to learn about possible attributes.
+ // Hover to view descriptions of existing attributes.
+ // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+ "version": "0.2.0",
+ "configurations": [
+ {
+ "name": "Java",
+ "type": "java",
+ "request": "launch",
+ "stopOnEntry": true,
+ "jdkPath": "${env:JAVA_HOME}/bin",
+ "cwd": "${fileDirname}",
+ "startupClass": "${fileBasenameNoExtension}",
+ "classpath": [
+ ".",
+ "${fileDirname}"
+ ]
+ },
+ {
+ "name": "Java Console App",
+ "type": "java",
+ "request": "launch",
+ "stopOnEntry": true,
+ "jdkPath": "${env:JAVA_HOME}/bin",
+ "cwd": "${fileDirname}",
+ "startupClass": "${fileBasenameNoExtension}",
+ "classpath": [
+ ".",
+ "${fileDirname}"
+ ],
+ "externalConsole": true
+ },
+ {
+ "type": "java",
+ "name": "Current File",
+ "request": "launch",
+ "mainClass": "${file}"
+ },
+ {
+ "type": "java",
+ "name": "DesktopLauncher",
+ "request": "launch",
+ "mainClass": "de.sesu8642.feudaltactics.desktop.DesktopLauncher",
+ "projectName": "Feudal Tactics-desktop"
+ }
+ ]
+}

core/src/main/java/de/sesu8642/feudaltactics/lib/ingame/GameController.java

@@ -39,8 +39,8 @@ public class GameController {
  public static final Color white = new Color(1F, 1F, 1F, 1);
  public static final Color green = new Color(0F, 1F, 0F, 1);
 
- public static final Color[] colorBank = { blue, orange, pink, yellow, white, green };
- public Color[] playerColors = new Color[colorBank.length];
+ public static Color[] colorBank = { orange, blue, pink, yellow, white, green };
+ public static Color[] PLAYER_COLORS = new Color[colorBank.length];
 
  private final EventBus eventBus;
  private final ExecutorService botTurnExecutor;
@@ -112,7 +112,7 @@ public void generateGameState(Intelligence botIntelligence, MapParameters mapPar
  int remainingBotPlayers = mapParams.getBotPlayerNo();
 
  Color userColor = mapParams.getUserColor();
- playerColors = setColors(colorBank, userColor);
+ PLAYER_COLORS = setColors(colorBank, userColor);
 
  for (Color color : playerColors) {
  if (remainingHumanPlayers > 0) {
@@ -136,7 +136,7 @@ public void generateGameState(Intelligence botIntelligence, MapParameters mapPar
  * @param userColor The color the user has chosen for their kingdom.
  * @return Array with the user color in the zero index.
  */
- public static Color[] setColors(Color[] colorBankColors, Color userColor) {
+ public Color[] setPlayerColors(Color[] colorBankColors, Color userColor) {
  Color[] colors = new Color[colorBankColors.length];
  Queue<Color> colorQueue = new Queue<Color>();