commit c26029dbbe65f55e0f83571ba47f6090c556cadf
parent 1459ec6167e7e0a3eb608dfbb25360131c083c37
Author: A Koens <[email protected]>
Date: Wed, 30 Nov 2022 23:55:34 +0100
Merge branch 'develop' of https://github.com/Akoens/ISYGameClient into develop
Diffstat:
3 files changed, 8 insertions(+), 36 deletions(-)
diff --git a/pom.xml b/pom.xml
@@ -80,14 +80,6 @@
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
-
- <!-- Lombok -->
- <dependency>
- <groupId>org.projectlombok</groupId>
- <artifactId>lombok</artifactId>
- <version>1.18.24</version>
- <scope>provided</scope>
- </dependency>
</dependencies>
<build>
@@ -105,28 +97,6 @@
<groupId>org.openjfx</groupId>
<artifactId>javafx-maven-plugin</artifactId>
<version>0.0.8</version>
- <executions>
- <execution>
- <!-- Default configuration for running with: mvn clean javafx:run -->
- <id>default-cli</id>
- <configuration>
- <mainClass>nl.isygameclient.Application</mainClass>
- <launcher>app</launcher>
- <jlinkZipName>app</jlinkZipName>
- <jlinkImageName>app</jlinkImageName>
- <noManPages>true</noManPages>
- <stripDebug>true</stripDebug>
- <noHeaderFiles>true</noHeaderFiles>
- <annotationProcessorPaths>
- <path>
- <groupId>org.projectlombok</groupId>
- <artifactId>lombok</artifactId>
- <version>1.18.24</version>
- </path>
- </annotationProcessorPaths>
- </configuration>
- </execution>
- </executions>
</plugin>
</plugins>
</build>
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
@@ -14,9 +14,6 @@ module nl.isygameclient {
// Json Class Data Saving
requires com.google.gson;
- // Data Access Generation
- requires static lombok;
-
exports nl.isygameclient;
// Controllers
exports nl.isygameclient.controllers.Games.TicTacToe;
diff --git a/src/main/java/nl/isygameclient/models/Games/Game.java b/src/main/java/nl/isygameclient/models/Games/Game.java
@@ -3,10 +3,7 @@ package nl.isygameclient.models.Games;
import java.util.Arrays;
import java.util.List;
-import lombok.Data;
-
-@Data
public abstract class Game {
int currentPlayerIndex;
String[] players;
@@ -44,4 +41,12 @@ public abstract class Game {
public void setCurrentPlayer(String player) {
currentPlayerIndex = Arrays.asList(players).indexOf(player);
}
+
+ public int getCurrentPlayerIndex() {
+ return currentPlayerIndex;
+ }
+
+ public String[] getPlayers() {
+ return players;
+ }
}
