diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Classes/RuntimeInfo.java b/src/main/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Classes/RuntimeInfo.java index ce958a0d96e57d97ddaca65a96f3fc63dcdf70e4..81dea6bcc942e7e45c1274fa54ed30b494b4b6fd 100644 --- a/src/main/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Classes/RuntimeInfo.java +++ b/src/main/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Classes/RuntimeInfo.java @@ -2,13 +2,13 @@ package de.hdm_stuttgart.battlearena.Model.DataStorage.Classes; import de.hdm_stuttgart.battlearena.Controller.Enum.GameMode; import de.hdm_stuttgart.battlearena.Controller.Enum.GameState; -import de.hdm_stuttgart.battlearena.Model.DataStorage.Classes.ENUMs.ThreadStatus; import de.hdm_stuttgart.battlearena.Model.DataStorage.Classes.Exceptions.ParserException; import de.hdm_stuttgart.battlearena.Model.DataStorage.Classes.Utilities.HashGenerator; import de.hdm_stuttgart.battlearena.Model.DataStorage.Classes.Utilities.Parser; import de.hdm_stuttgart.battlearena.Model.Entity.EntityClass; import de.hdm_stuttgart.battlearena.Model.Entity.IEntity; import de.hdm_stuttgart.battlearena.Model.Map.Biom; + import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -41,9 +41,12 @@ public class RuntimeInfo { private boolean gameWon; - private RuntimeInfo(){}; + private RuntimeInfo() { + } + + ; - public static RuntimeInfo getInstance(){ + public static RuntimeInfo getInstance() { return runtimeInfoSingleton; } @@ -52,19 +55,17 @@ public class RuntimeInfo { Parser.mapDataValid(mapData); Parser.mapNameValid(mapName); return new MapData(HashGenerator.hashAndHex(mapData), mapName, 18, 18, mapData); - } - catch(Exception e){ + } catch (Exception e) { log.error(e); throw new ParserException(e.getMessage()); } } - public void setGameMap(MapData mapSelected){ //Create Game Scene Dropdown list directly gives reference to selected map + public void setGameMap(MapData mapSelected) { //Create Game Scene Dropdown list directly gives reference to selected map try { mapGame = mapSelected; mapDataGame = mapSelected.getMapData(); - } - catch(Exception e){ + } catch (Exception e) { log.error(e); } } @@ -117,9 +118,6 @@ public class RuntimeInfo { this.gameplayObjects = gameplayObjects; } - public int gameTimeInHours(){ - return persistenceInst.getStatistics().getGameTime() / 3600; - public String getMapDataGame() { return mapDataGame; } diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/GameplayObjects/Bomb.java b/src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/GameplayObjects/Bomb.java index 148be0bcf4900af10bf02a825f6947cdc8024ca0..9d6b59908561ca3751532ec01098f44ddd549183 100644 --- a/src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/GameplayObjects/Bomb.java +++ b/src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/GameplayObjects/Bomb.java @@ -3,12 +3,11 @@ package de.hdm_stuttgart.battlearena.Model.Entity.GameplayObjects; import de.hdm_stuttgart.battlearena.Controller.GameSceneController; import de.hdm_stuttgart.battlearena.Model.Entity.EntityDirection; import de.hdm_stuttgart.battlearena.Model.Entity.IEntity; -import javafx.animation.KeyFrame; -import javafx.animation.Timeline; + import javafx.geometry.BoundingBox; import javafx.scene.canvas.GraphicsContext; import javafx.scene.image.Image; -import javafx.util.Duration; + import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/Player.java b/src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/Player.java index 34e66cdf91673dbda65c9bd92a0f6ac5dddc1298..7916d026aea1670d4bec53ea0452a7708486ad7c 100644 --- a/src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/Player.java +++ b/src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/Player.java @@ -6,9 +6,8 @@ import de.hdm_stuttgart.battlearena.Model.DataStorage.Classes.RuntimeInfo; import de.hdm_stuttgart.battlearena.Model.Entity.GameplayObjects.ObjectStatus; import de.hdm_stuttgart.battlearena.Model.Entity.GameplayObjects.ObjectType; import de.hdm_stuttgart.battlearena.Model.Inputs.InputHandler; - import de.hdm_stuttgart.battlearena.Model.Map.TileManager; -import javafx.animation.KeyValue; + import javafx.geometry.BoundingBox; import javafx.scene.canvas.GraphicsContext; import javafx.scene.image.Image; @@ -19,11 +18,6 @@ import org.apache.logging.log4j.LogManager; import java.util.List; import java.util.Objects; -import javafx.animation.KeyFrame; -import javafx.animation.Timeline; -import javafx.event.ActionEvent; -import javafx.util.Duration; - class Player implements IEntity { private static final Logger log = LogManager.getLogger(Player.class); diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java index cfa911fde77840d173e9615d57c9722435c60377..c00c6404a3761939513370db617f959fe9a36d3a 100644 --- a/src/main/java/module-info.java +++ b/src/main/java/module-info.java @@ -26,5 +26,4 @@ module gui { exports de.hdm_stuttgart.battlearena.Controller.Utilities; exports de.hdm_stuttgart.battlearena.Model.Multiplayer; exports de.hdm_stuttgart.battlearena.Model.Entity.GameplayObjects to javafx.fxml; - opens de.hdm_stuttgart.battlearena.Controller.Utilities to javafx.fxml; } \ No newline at end of file