diff --git a/README.md b/README.md index 8a3d5de5d4e8e766cbbbb42653c99bab09f4a801..10404ac08e384b1051faa0e9ea32669441aa0f0c 100644 --- a/README.md +++ b/README.md @@ -6,9 +6,6 @@ A repository containing a simulation of two armies attacking each other. The pro ## Running the program To run the program you need jdk-17 and maven 3.8.5. -If you need to use another jdk over 11, you can change the version in the pom.xml file. - -Change instances of 17, except javafx version, to your required version. (11 or above) Install the program by zip, tar or `git clone git@gitlab.stud.idi.ntnu.no:carljgu/Wargames.git` @@ -22,7 +19,6 @@ Install the program by zip, tar or `git clone git@gitlab.stud.idi.ntnu.no:carljg Gitlab Pages: [Wargames javadoc](https://carljgu.pages.stud.idi.ntnu.no/Wargames) - ## Release 1.0 Added classes @@ -58,5 +54,14 @@ Added classes - UnitFactory: A class to simply and elegantly create units. Either one by one or many at once. - UnitFactoryTest: A test class to test the unit factory -Added enums +Added enum - Terrain: An enum that represents the different terrains + +## Release 4.0 + +Added classes +- EditArmyController: Controller class handling events in the edit-army fxml file. +- BattleSimulationSingleton: Class which holds model information for controllers. + +Added enum +- UnitType: Represents the different unit types diff --git a/src/main/java/edu/ntnu/idatt2001/carljgu/client/App.java b/src/main/java/edu/ntnu/idatt2001/carljgu/client/App.java index f6a7ae554943a08f2fa3b73f0cd228e157330506..7a164d8fbbe35fdf99ebec7702fbc126cf490434 100644 --- a/src/main/java/edu/ntnu/idatt2001/carljgu/client/App.java +++ b/src/main/java/edu/ntnu/idatt2001/carljgu/client/App.java @@ -1,8 +1,6 @@ package edu.ntnu.idatt2001.carljgu.client; import java.io.IOException; -import java.nio.file.Path; -import java.nio.file.Paths; import java.util.Arrays; import edu.ntnu.idatt2001.carljgu.client.dialogs.DialogBoxBuilder; diff --git a/src/main/java/edu/ntnu/idatt2001/carljgu/client/controllers/BattleController.java b/src/main/java/edu/ntnu/idatt2001/carljgu/client/controllers/BattleController.java index 952ef2a637bc0aa95413bce394f97ab1ce6bdce7..0bedd7758ed6a0416230d45707766467ec2e3ae8 100644 --- a/src/main/java/edu/ntnu/idatt2001/carljgu/client/controllers/BattleController.java +++ b/src/main/java/edu/ntnu/idatt2001/carljgu/client/controllers/BattleController.java @@ -14,8 +14,6 @@ import edu.ntnu.idatt2001.carljgu.battle.units.UnitFactory; import java.io.IOException; import java.net.URL; -import java.nio.file.Path; -import java.nio.file.Paths; import java.util.*; import java.util.stream.IntStream;