diff --git a/lib/Tools.jar b/lib/Tools.jar
index 5a145f32bcf870288793acaf2dfabedb41cd3c1f..b20579b6bd1d63d4c7f625d048e65eb33e3839e1 100644
Binary files a/lib/Tools.jar and b/lib/Tools.jar differ
diff --git a/src/de/bricked/game/Game.java b/src/de/bricked/game/Game.java
index 69c6adb97078bdff6a31640329bceb2cd1925a35..193b2e81b21c48373669ebd7f10f219c46331228 100644
--- a/src/de/bricked/game/Game.java
+++ b/src/de/bricked/game/Game.java
@@ -12,7 +12,6 @@ import de.bricked.game.sound.SoundHandler;
import de.bricked.game.sound.SoundType;
import de.bricked.ui.LevelController;
import javafx.geometry.Point2D;
-import logger.LogLevel;
import logger.Logger;
public class Game
@@ -159,7 +158,7 @@ public class Game
if(multiplicator > 1)
{
totalPoints += pointsSinceLastMultiplicatorReset * multiplicator;
- Logger.log(LogLevel.DEBUG, "Applied multiplicator: " + pointsSinceLastMultiplicatorReset + " x" + multiplicator + " = " + totalPoints);
+ Logger.debug("Applied multiplicator: " + pointsSinceLastMultiplicatorReset + " x" + multiplicator + " = " + totalPoints);
soundHandler.play(SoundType.MULTIPLICATOR);
}
}
@@ -247,7 +246,7 @@ public class Game
if((ballLayoutX + ballTranslateX + ball.getBallRadius() * 2) >= gamePaneWidth && (ballLayoutY + ballTranslateY) <= 0)
{
wallCollision = true;
- Logger.log(LogLevel.DEBUG, "TOP-RIGHT-CORNER");
+ Logger.debug("TOP-RIGHT-CORNER");
return HitLocation.CORNER;
}
@@ -255,7 +254,7 @@ public class Game
if((ballLayoutX + ballTranslateX) <= 0 && (ballLayoutY + ballTranslateY) <= 0)
{
wallCollision = true;
- Logger.log(LogLevel.DEBUG, "TOP-LEFT-CORNER");
+ Logger.debug("TOP-LEFT-CORNER");
return HitLocation.CORNER;
}
@@ -263,7 +262,7 @@ public class Game
if((ballLayoutX + ballTranslateX + ball.getBallRadius() * 2) >= gamePaneWidth)
{
wallCollision = true;
- Logger.log(LogLevel.DEBUG, "RIGHT-WALL");
+ Logger.debug("RIGHT-WALL");
return HitLocation.LEFT;
}
@@ -271,7 +270,7 @@ public class Game
if((ballLayoutX + ballTranslateX) <= 0)
{
wallCollision = true;
- Logger.log(LogLevel.DEBUG, "LEFT-WALL");
+ Logger.debug("LEFT-WALL");
return HitLocation.RIGHT;
}
@@ -279,7 +278,7 @@ public class Game
if((ballLayoutY + ballTranslateY + ball.getBallRadius() * 2) >= gamePaneHeight)
{
wallCollision = true;
- Logger.log(LogLevel.DEBUG, "BOTTOM-WALL");
+ Logger.debug("BOTTOM-WALL");
return HitLocation.LIFE_LOST;
}
@@ -287,7 +286,7 @@ public class Game
if((ballLayoutY + ballTranslateY) <= 0)
{
wallCollision = true;
- Logger.log(LogLevel.DEBUG, "TOP-WALL");
+ Logger.debug("TOP-WALL");
return HitLocation.BOTTOM;
}
@@ -317,19 +316,19 @@ public class Game
{
if(crossWidth > (-crossHeight))
{
- Logger.log(LogLevel.DEBUG, "BOTTOM");
+ Logger.debug("BOTTOM");
return HitLocation.BOTTOM;
}
else
{
if(isPaddle)
{
- Logger.log(LogLevel.DEBUG, "PADDLE-LEFT");
+ Logger.debug("PADDLE-LEFT");
return HitLocation.CORNER;
}
else
{
- Logger.log(LogLevel.DEBUG, "LEFT");
+ Logger.debug("LEFT");
return HitLocation.LEFT;
}
}
@@ -340,12 +339,12 @@ public class Game
{
if(isPaddle)
{
- Logger.log(LogLevel.DEBUG, "PADDLE-RIGHT");
+ Logger.debug("PADDLE-RIGHT");
return HitLocation.CORNER;
}
else
{
- Logger.log(LogLevel.DEBUG, "RIGHT");
+ Logger.debug("RIGHT");
return HitLocation.RIGHT;
}
}
@@ -353,12 +352,12 @@ public class Game
{
if(isPaddle)
{
- Logger.log(LogLevel.DEBUG, "PADDLE");
+ Logger.debug("PADDLE");
return HitLocation.PADDLE;
}
else
{
- Logger.log(LogLevel.DEBUG, "TOP");
+ Logger.debug("TOP");
return HitLocation.TOP;
}
}
diff --git a/src/de/bricked/game/levels/LevelPackParser.java b/src/de/bricked/game/levels/LevelPackParser.java
index b68aaa3a7930c51b0525a26b114f133ec4cc3418..776e8f1ac4e755fb345a7453a0c745a2859927ff 100644
--- a/src/de/bricked/game/levels/LevelPackParser.java
+++ b/src/de/bricked/game/levels/LevelPackParser.java
@@ -1,14 +1,15 @@
package de.bricked.game.levels;
+import java.util.ArrayList;
+import java.util.Comparator;
+
import com.google.gson.JsonArray;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
+
import de.bricked.game.paddle.PaddleSize;
-import logger.LogLevel;
import logger.Logger;
-import java.util.ArrayList;
-import java.util.Comparator;
public class LevelPackParser
{
@@ -86,7 +87,7 @@ public class LevelPackParser
}
catch(Exception e)
{
- Logger.log(LogLevel.ERROR, Logger.exceptionToString(e));
+ Logger.error(e);
}
}
diff --git a/src/de/bricked/game/settings/Settings.java b/src/de/bricked/game/settings/Settings.java
index b88cd0c52c0fae63b67f154a748d0eb2bdd93bc5..e418b6273643151c38c08ad78ae5907611582dc3 100644
--- a/src/de/bricked/game/settings/Settings.java
+++ b/src/de/bricked/game/settings/Settings.java
@@ -1,17 +1,17 @@
package de.bricked.game.settings;
+import java.io.File;
+import java.io.FileWriter;
+import java.nio.file.FileSystems;
+import java.nio.file.Files;
+
import com.google.gson.Gson;
+
import de.bricked.game.Config;
import de.bricked.ui.LanguageType;
-import logger.LogLevel;
import logger.Logger;
import tools.PathUtils;
-import java.io.File;
-import java.io.FileWriter;
-import java.nio.file.FileSystems;
-import java.nio.file.Files;
-
public class Settings
{
private GameSize gameSize;
@@ -64,7 +64,7 @@ public class Settings
}
catch(Exception e)
{
- Logger.log(LogLevel.ERROR, Logger.exceptionToString(e));
+ Logger.error(e);
}
}
@@ -82,7 +82,7 @@ public class Settings
}
catch(Exception e)
{
- Logger.log(LogLevel.ERROR, Logger.exceptionToString(e));
+ Logger.error(e);
}
}
diff --git a/src/de/bricked/game/sound/SoundHandler.java b/src/de/bricked/game/sound/SoundHandler.java
index 34419b33f5468dcacfdfb70e750be64ad73398b4..2f78d483491c39c364afe956082dd1ae54f32930 100644
--- a/src/de/bricked/game/sound/SoundHandler.java
+++ b/src/de/bricked/game/sound/SoundHandler.java
@@ -8,7 +8,6 @@ import java.util.HashMap;
import de.bricked.game.Config;
import kuusisto.tinysound.Sound;
import kuusisto.tinysound.TinySound;
-import logger.LogLevel;
import logger.Logger;
public class SoundHandler
@@ -42,7 +41,7 @@ public class SoundHandler
}
catch(MalformedURLException | URISyntaxException e)
{
- Logger.log(LogLevel.ERROR, Logger.exceptionToString(e));
+ Logger.error(e);
}
}
}
diff --git a/src/de/bricked/main/Main.java b/src/de/bricked/main/Main.java
index f9f87fb66ae2cf476432cc5b928f6bf9aa5189cc..078a9554f45bab043d91620e5ae67b04e05c954f 100644
--- a/src/de/bricked/main/Main.java
+++ b/src/de/bricked/main/Main.java
@@ -51,7 +51,7 @@ public class Main extends Application
}
catch(Exception e)
{
- Logger.log(LogLevel.ERROR, Logger.exceptionToString(e));
+ Logger.error(e);
}
}
@@ -60,8 +60,8 @@ public class Main extends Application
if(Arrays.asList(args).contains("debug"))
{
Logger.setLevel(LogLevel.ALL);
- Logger.log(LogLevel.INFO, "Running in Debug Mode");
- Logger.log(LogLevel.INFO, bundle.getString("app.name") + " - v" + bundle.getString("version.name") + " - (versioncode: " + bundle.getString("version.code") + ") from " + bundle.getString("version.date"));
+ Logger.info("Running in Debug Mode");
+ Logger.info(bundle.getString("app.name") + " - v" + bundle.getString("version.name") + " - (versioncode: " + bundle.getString("version.code") + ") from " + bundle.getString("version.date"));
}
else
{
diff --git a/src/de/bricked/ui/Controller.java b/src/de/bricked/ui/Controller.java
index 0e9cd9962cc7c1603efe41f5176f3e88275e8ab8..e8e37bea4792a927c920ee7ed919cde7bb872b91 100644
--- a/src/de/bricked/ui/Controller.java
+++ b/src/de/bricked/ui/Controller.java
@@ -21,7 +21,6 @@ import javafx.stage.Modality;
import javafx.stage.Stage;
import javafx.stage.WindowEvent;
import kuusisto.tinysound.TinySound;
-import logger.LogLevel;
import logger.Logger;
import tools.AlertGenerator;
@@ -54,7 +53,7 @@ public class Controller
if(event.getCode().toString().equals(bundle.getObject("shortcut.debug.console")))
{
showCommandLine();
- Logger.log(LogLevel.INFO, "openend debug console");
+ Logger.info("opened debug console");
event.consume();
}
}
@@ -77,7 +76,7 @@ public class Controller
buttonAchievements.setStyle("-fx-base: " + bundle.getString("color.button"));
buttonAbout.setStyle("-fx-base: " + bundle.getString("color.button"));
- Logger.log(LogLevel.INFO, "successfully started");
+ Logger.info("successfully started");
}
public void showLevelSelect()
@@ -149,7 +148,7 @@ public class Controller
catch(IOException e)
{
//TODO: errorhandling
- Logger.log(LogLevel.ERROR, Logger.exceptionToString(e));
+ Logger.error(e);;
}
}
diff --git a/src/de/bricked/ui/LevelController.java b/src/de/bricked/ui/LevelController.java
index 93e4eb14df028252242e578affedf82f3bf754a4..c56f3a1c68dc7b4f926995f00d247f13907b14c0 100644
--- a/src/de/bricked/ui/LevelController.java
+++ b/src/de/bricked/ui/LevelController.java
@@ -66,7 +66,6 @@ import javafx.stage.Stage;
import javafx.stage.WindowEvent;
import javafx.util.Duration;
import kuusisto.tinysound.TinySound;
-import logger.LogLevel;
import logger.Logger;
import tools.AlertGenerator;
import tools.Worker;
@@ -137,7 +136,7 @@ public class LevelController
}
timer.start();
- Logger.log(LogLevel.INFO, "ball start");
+ Logger.info("ball start");
gameState = GameState.RUNNING;
}
@@ -178,7 +177,7 @@ public class LevelController
if(event.getCode().toString().equals(bundle.getString("shortcut.debug.console")))
{
showCommandLine();
- Logger.log(LogLevel.INFO, "openend debug console");
+ Logger.info("openend debug console");
event.consume();
return;
}
@@ -224,7 +223,7 @@ public class LevelController
}
catch(IOException e1)
{
- Logger.log(LogLevel.ERROR, Logger.exceptionToString(e1));
+ Logger.error(e1);
}
}
@@ -446,7 +445,7 @@ public class LevelController
if(secondsElapsedSinceLastFpsUpdate >= 1000000000)
{
labelFPS.setText(String.valueOf(fps));
- Logger.log(LogLevel.DEBUG, "current FPS: " + fps);
+ Logger.debug("current FPS: " + fps);
secondsElapsedSinceLastFpsUpdate = 0;
fps = 0;
}
@@ -468,7 +467,7 @@ public class LevelController
if(hitLocation.equals(HitLocation.LIFE_LOST))
{
game.setLivesRemaining(game.getLivesRemaining() - 1);
- Logger.log(LogLevel.DEBUG, "Life lost (" + game.getLivesRemaining() + " lives remaining)");
+ Logger.debug("Life lost (" + game.getLivesRemaining() + " lives remaining)");
refreshLiveCounter();
resetPowerUps();
if(game.getLivesRemaining() <= 0)
@@ -917,7 +916,7 @@ public class LevelController
HitLocation hitLocation = game.collides(labelPosition, paddlePosition, paddle.getWidth(), paddle.getHeight(), true);
if(hitLocation != null && (hitLocation.equals(HitLocation.PADDLE) || hitLocation.equals(HitLocation.CORNER)))
{
- Logger.log(LogLevel.DEBUG, "Collected PowerUp with ID = " + currentPowerUp.getID());
+ Logger.debug("Collected PowerUp with ID = " + currentPowerUp.getID());
game.getSoundHandler().play(SoundType.POWERUP_ACTIVATED);
if(!currentPowerUp.isPermanent())
@@ -1042,7 +1041,7 @@ public class LevelController
catch(IOException e)
{
// TODO: errorhandling
- Logger.log(LogLevel.ERROR, Logger.exceptionToString(e));
+ Logger.error(e);
}
}
diff --git a/src/de/bricked/ui/LevelPackSelectController.java b/src/de/bricked/ui/LevelPackSelectController.java
index 2f869f70ef7bee15389dce029fbe109e62b62429..172c0f7cf29e820d31372f2ac52c512ba453f96d 100644
--- a/src/de/bricked/ui/LevelPackSelectController.java
+++ b/src/de/bricked/ui/LevelPackSelectController.java
@@ -18,8 +18,13 @@ import javafx.fxml.FXML;
import javafx.fxml.FXMLLoader;
import javafx.scene.Parent;
import javafx.scene.Scene;
-import javafx.scene.control.*;
+import javafx.scene.control.Button;
+import javafx.scene.control.Label;
+import javafx.scene.control.ListCell;
+import javafx.scene.control.ListView;
+import javafx.scene.control.ScrollPane;
import javafx.scene.control.ScrollPane.ScrollBarPolicy;
+import javafx.scene.control.TextInputDialog;
import javafx.scene.image.Image;
import javafx.scene.input.KeyEvent;
import javafx.scene.input.MouseEvent;
@@ -29,7 +34,6 @@ import javafx.stage.Stage;
import javafx.stage.WindowEvent;
import javafx.util.Callback;
import kuusisto.tinysound.TinySound;
-import logger.LogLevel;
import logger.Logger;
public class LevelPackSelectController
@@ -67,7 +71,7 @@ public class LevelPackSelectController
if(event.getCode().toString().equals(controller.bundle.getObject("shortcut.debug.console")))
{
showCommandLine();
- Logger.log(LogLevel.INFO, "openend debug console");
+ Logger.info("openend debug console");
event.consume();
}
@@ -168,7 +172,7 @@ public class LevelPackSelectController
}
catch(IOException e1)
{
- Logger.log(LogLevel.ERROR, Logger.exceptionToString(e1));
+ Logger.error(e1);
}
}
}
@@ -197,7 +201,7 @@ public class LevelPackSelectController
catch(IOException e)
{
// TODO: errorhandling
- Logger.log(LogLevel.ERROR, Logger.exceptionToString(e));
+ Logger.error(e);
}
}
}
\ No newline at end of file
diff --git a/src/de/bricked/ui/LevelSelectController.java b/src/de/bricked/ui/LevelSelectController.java
index 05ff9d1a227b948daef35d188cb6f5baae41e51a..85bdc7e826c9f24d50d0a5847e613d6534bdc61b 100644
--- a/src/de/bricked/ui/LevelSelectController.java
+++ b/src/de/bricked/ui/LevelSelectController.java
@@ -29,7 +29,6 @@ import javafx.stage.Stage;
import javafx.stage.WindowEvent;
import javafx.util.Callback;
import kuusisto.tinysound.TinySound;
-import logger.LogLevel;
import logger.Logger;
public class LevelSelectController
@@ -67,7 +66,7 @@ public class LevelSelectController
if(event.getCode().toString().equals(controller.bundle.getObject("shortcut.debug.console")))
{
showCommandLine();
- Logger.log(LogLevel.INFO, "openend debug console");
+ Logger.info("openend debug console");
event.consume();
}
@@ -164,7 +163,7 @@ public class LevelSelectController
}
catch(IOException e1)
{
- Logger.log(LogLevel.ERROR, Logger.exceptionToString(e1));
+ Logger.error(e1);
}
}
@@ -183,7 +182,7 @@ public class LevelSelectController
catch(IOException e)
{
// TODO: errorhandling
- Logger.log(LogLevel.ERROR, Logger.exceptionToString(e));
+ Logger.error(e);
}
}
}
\ No newline at end of file
diff --git a/src/de/bricked/ui/SettingsController.java b/src/de/bricked/ui/SettingsController.java
index c84bcfd6e9647e048b73b078ea9a428831f53525..3fb70b9d6822c55e61661922acbd9874c29b2398 100644
--- a/src/de/bricked/ui/SettingsController.java
+++ b/src/de/bricked/ui/SettingsController.java
@@ -27,7 +27,6 @@ import javafx.scene.image.Image;
import javafx.scene.layout.AnchorPane;
import javafx.stage.Stage;
import javafx.util.Callback;
-import logger.LogLevel;
import logger.Logger;
public class SettingsController
@@ -183,7 +182,7 @@ public class SettingsController
catch(IOException e)
{
// TODO: errorhandling
- Logger.log(LogLevel.ERROR, Logger.exceptionToString(e));
+ Logger.error(e);
}
}
}
\ No newline at end of file
diff --git a/src/de/bricked/utils/Downloader.java b/src/de/bricked/utils/Downloader.java
index dd2ab21fdf6664e9f0f6231a028fa22067b2f1f7..fce9161388c05dc67486a7585ff60d99f873a739 100644
--- a/src/de/bricked/utils/Downloader.java
+++ b/src/de/bricked/utils/Downloader.java
@@ -1,13 +1,12 @@
package de.bricked.utils;
+import java.io.FileWriter;
+
import de.bricked.game.Config;
import de.bricked.game.levels.LevelPack;
import de.bricked.game.levels.LevelPackParser;
-import logger.LogLevel;
import logger.Logger;
-import java.io.FileWriter;
-
public class Downloader
{
private LevelPack levelPack;
@@ -27,7 +26,7 @@ public class Downloader
}
catch (Exception e)
{
- Logger.log(LogLevel.ERROR, Logger.exceptionToString(e));
+ Logger.error(e);
}
}
}
@@ -43,7 +42,7 @@ public class Downloader
}
catch (Exception e)
{
- e.printStackTrace();
+ Logger.error(e);
}
}
diff --git a/src/de/bricked/utils/FileUtils.java b/src/de/bricked/utils/FileUtils.java
index 6fe9aacfab693513db030a52311a65dfb8ab9f81..cc69ce25780f61bf6db15c7cbbc87c6b37f53a14 100644
--- a/src/de/bricked/utils/FileUtils.java
+++ b/src/de/bricked/utils/FileUtils.java
@@ -7,7 +7,6 @@ import java.io.InputStream;
import java.io.InputStreamReader;
import java.net.URL;
-import logger.LogLevel;
import logger.Logger;
public class FileUtils
@@ -37,7 +36,7 @@ public class FileUtils
}
catch (Exception e)
{
- Logger.log(LogLevel.ERROR, Logger.exceptionToString(e));
+ Logger.error(e);
}
return null;
}
@@ -51,7 +50,7 @@ public class FileUtils
}
catch (Exception e)
{
- Logger.log(LogLevel.ERROR, Logger.exceptionToString(e));
+ Logger.error(e);
}
return null;
}
diff --git a/src/de/brickedleveleditor/main/Main.java b/src/de/brickedleveleditor/main/Main.java
index a946ae6057bb2913258df1f796e5cd03f274cf0f..7571f85107f77b78c92593b1ee885cead865453f 100644
--- a/src/de/brickedleveleditor/main/Main.java
+++ b/src/de/brickedleveleditor/main/Main.java
@@ -46,7 +46,7 @@ public class Main extends Application
}
catch(Exception e)
{
- Logger.log(LogLevel.ERROR, Logger.exceptionToString(e));
+ Logger.error(e);
}
}
@@ -55,8 +55,8 @@ public class Main extends Application
if(Arrays.asList(args).contains("debug"))
{
Logger.setLevel(LogLevel.ALL);
- Logger.log(LogLevel.INFO, "Running in Debug Mode");
- Logger.log(LogLevel.INFO, bundle.getString("app.name") + " - v" + bundle.getString("version.name") + " - (versioncode: " + bundle.getString("version.code") + ") from " + bundle.getString("version.date"));
+ Logger.info("Running in Debug Mode");
+ Logger.info(bundle.getString("app.name") + " - v" + bundle.getString("version.name") + " - (versioncode: " + bundle.getString("version.code") + ") from " + bundle.getString("version.date"));
}
else
{
diff --git a/src/de/brickedleveleditor/ui/controller/MainController.java b/src/de/brickedleveleditor/ui/controller/MainController.java
index 84ea30ceef0eff97235f3275c04b306d0116cff0..8bbdac97d75d6a2b57381e46c376edb8d1320c04 100644
--- a/src/de/brickedleveleditor/ui/controller/MainController.java
+++ b/src/de/brickedleveleditor/ui/controller/MainController.java
@@ -1,5 +1,11 @@
package de.brickedleveleditor.ui.controller;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.ResourceBundle;
+
import de.bricked.game.bricks.Brick;
import de.bricked.game.bricks.BrickType;
import de.bricked.game.powerups.PowerUpType;
@@ -18,20 +24,23 @@ import javafx.scene.control.Label;
import javafx.scene.control.MenuItem;
import javafx.scene.image.Image;
import javafx.scene.input.MouseEvent;
-import javafx.scene.layout.*;
+import javafx.scene.layout.AnchorPane;
+import javafx.scene.layout.Background;
+import javafx.scene.layout.BackgroundImage;
+import javafx.scene.layout.BackgroundPosition;
+import javafx.scene.layout.BackgroundRepeat;
+import javafx.scene.layout.BackgroundSize;
+import javafx.scene.layout.ColumnConstraints;
+import javafx.scene.layout.GridPane;
+import javafx.scene.layout.HBox;
+import javafx.scene.layout.RowConstraints;
+import javafx.scene.layout.VBox;
import javafx.scene.paint.Paint;
import javafx.stage.Stage;
import javafx.stage.WindowEvent;
-import logger.LogLevel;
import logger.Logger;
import tools.Worker;
-import java.io.File;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.ResourceBundle;
-
public class MainController extends AbstractController
{
@FXML
@@ -96,7 +105,7 @@ public class MainController extends AbstractController
}
catch (Exception e)
{
- Logger.log(LogLevel.ERROR, Logger.exceptionToString(e));
+ Logger.error(e);
}
}
@@ -116,7 +125,7 @@ public class MainController extends AbstractController
}
catch (Exception e)
{
- Logger.log(LogLevel.ERROR, Logger.exceptionToString(e));
+ Logger.error(e);
}
}
}
@@ -136,7 +145,7 @@ public class MainController extends AbstractController
}
catch (Exception e)
{
- Logger.log(LogLevel.ERROR, Logger.exceptionToString(e));
+ Logger.error(e);
}
}
}
@@ -180,7 +189,7 @@ public class MainController extends AbstractController
public void handle(MouseEvent event)
{
currentlySelectedBrickImage = bricksTextures.get(brickType);
- Logger.log(LogLevel.DEBUG, brickType.toString() + " selected");
+ Logger.debug(brickType.toString() + " selected");
}
});
HBox brickHBox = new HBox(brickLabel);