From a957a3f0ca6defa30ada524691f0c86f09687411 Mon Sep 17 00:00:00 2001 From: austin Date: Tue, 17 May 2022 16:21:24 -0400 Subject: [PATCH] Logger changes --- src/main/java/electrosphere/engine/LoadingThread.java | 2 +- .../electrosphere/entity/state/movement/SprintTree.java | 2 +- .../electrosphere/game/server/ai/creature/MillAbout.java | 2 +- .../java/electrosphere/game/server/db/DatabaseUtils.java | 2 +- .../game/server/pathfinding/NavMeshPathfinder.java | 6 +++--- .../java/electrosphere/game/server/saves/SaveUtils.java | 3 ++- src/main/java/electrosphere/logger/LoggerInterface.java | 4 +++- .../java/electrosphere/menu/MenuGeneratorsInventory.java | 1 - src/main/java/electrosphere/util/FileUtils.java | 1 - 9 files changed, 12 insertions(+), 11 deletions(-) diff --git a/src/main/java/electrosphere/engine/LoadingThread.java b/src/main/java/electrosphere/engine/LoadingThread.java index a04a6e95..06950b2a 100644 --- a/src/main/java/electrosphere/engine/LoadingThread.java +++ b/src/main/java/electrosphere/engine/LoadingThread.java @@ -476,7 +476,7 @@ public class LoadingThread extends Thread { } } } - System.out.println("Draw Cell Manager ready"); + // System.out.println("Draw Cell Manager ready"); } diff --git a/src/main/java/electrosphere/entity/state/movement/SprintTree.java b/src/main/java/electrosphere/entity/state/movement/SprintTree.java index 8e908a57..0998c3b6 100644 --- a/src/main/java/electrosphere/entity/state/movement/SprintTree.java +++ b/src/main/java/electrosphere/entity/state/movement/SprintTree.java @@ -38,7 +38,7 @@ public class SprintTree { public void start(){ if(staminaCurrent > 0){ - System.out.println("Starting sprinting"); + // System.out.println("Starting sprinting"); state = SprintTreeState.SPRINTING; } } diff --git a/src/main/java/electrosphere/game/server/ai/creature/MillAbout.java b/src/main/java/electrosphere/game/server/ai/creature/MillAbout.java index 6cd233e8..d1ea441b 100644 --- a/src/main/java/electrosphere/game/server/ai/creature/MillAbout.java +++ b/src/main/java/electrosphere/game/server/ai/creature/MillAbout.java @@ -85,7 +85,7 @@ public class MillAbout extends AI { } else { GroundMovementTree characterMoveTree = CreatureUtils.getEntityMovementTree(character); characterMoveTree.slowdown(); - System.out.println("Made it to destination"); + // System.out.println("Made it to destination"); moveToTarget = false; millAbout = true; } diff --git a/src/main/java/electrosphere/game/server/db/DatabaseUtils.java b/src/main/java/electrosphere/game/server/db/DatabaseUtils.java index 963e846c..858142cc 100644 --- a/src/main/java/electrosphere/game/server/db/DatabaseUtils.java +++ b/src/main/java/electrosphere/game/server/db/DatabaseUtils.java @@ -54,7 +54,7 @@ public class DatabaseUtils { if(line.length() > 1 && !line.startsWith("--")){ if(line.contains(";")){ accumulatorString = accumulatorString + line; - System.out.println("EXECUTE: " + accumulatorString); + LoggerInterface.loggerDB.INFO("EXECUTE: " + accumulatorString); controller.executePreparedStatement(accumulatorString); accumulatorString = ""; } else { diff --git a/src/main/java/electrosphere/game/server/pathfinding/NavMeshPathfinder.java b/src/main/java/electrosphere/game/server/pathfinding/NavMeshPathfinder.java index d8d16213..27c11cfd 100644 --- a/src/main/java/electrosphere/game/server/pathfinding/NavMeshPathfinder.java +++ b/src/main/java/electrosphere/game/server/pathfinding/NavMeshPathfinder.java @@ -65,17 +65,17 @@ public class NavMeshPathfinder { //return path if found end if(currentNode == endNode){ - System.out.println("Found path!"); + // System.out.println("Found path!"); //TODO: return path while(currentItem != null){ if(currentItem.node == endNode){ Entity waypoint = EntityUtils.spawnDrawableEntity("Models/waypoint1.fbx"); - System.out.println(end); + // System.out.println(end); EntityUtils.getPosition(waypoint).set(end.x,end.y + 1,end.z); EntityUtils.getRotation(waypoint).rotateLocalX(-(float)Math.PI/2.0f); } else { Entity waypoint = EntityUtils.spawnDrawableEntity("Models/waypoint1.fbx"); - System.out.println(currentItem.currentPos); + // System.out.println(currentItem.currentPos); EntityUtils.getPosition(waypoint).set(currentItem.currentPos.x,currentItem.currentPos.y + 1,currentItem.currentPos.z); EntityUtils.getRotation(waypoint).rotateLocalX(-(float)Math.PI/2.0f); } diff --git a/src/main/java/electrosphere/game/server/saves/SaveUtils.java b/src/main/java/electrosphere/game/server/saves/SaveUtils.java index 56bef734..0a638282 100644 --- a/src/main/java/electrosphere/game/server/saves/SaveUtils.java +++ b/src/main/java/electrosphere/game/server/saves/SaveUtils.java @@ -3,6 +3,7 @@ package electrosphere.game.server.saves; import electrosphere.game.server.db.DatabaseUtils; import electrosphere.game.server.terrain.manager.ServerTerrainManager; import electrosphere.game.server.world.ServerWorldData; +import electrosphere.logger.LoggerInterface; import electrosphere.game.server.datacell.DataCellManager; import electrosphere.main.Globals; import electrosphere.util.FileUtils; @@ -75,7 +76,7 @@ public class SaveUtils { public static boolean worldHasSave(String saveName){ String dirPath = deriveSaveDirectoryPath(saveName) + "/world.json"; - System.out.println("Exists? " + dirPath); + LoggerInterface.loggerEngine.DEBUG("Exists? " + dirPath); return FileUtils.checkFileExists(dirPath); } diff --git a/src/main/java/electrosphere/logger/LoggerInterface.java b/src/main/java/electrosphere/logger/LoggerInterface.java index a8367808..655814e2 100644 --- a/src/main/java/electrosphere/logger/LoggerInterface.java +++ b/src/main/java/electrosphere/logger/LoggerInterface.java @@ -17,6 +17,7 @@ public class LoggerInterface { public static Logger loggerEngine; public static Logger loggerStartup; public static Logger loggerAuth; + public static Logger loggerDB; public static void initLoggers(){ loggerStartup = new Logger(LogLevel.WARNING); @@ -24,8 +25,9 @@ public class LoggerInterface { loggerFileIO = new Logger(LogLevel.WARNING); loggerGameLogic = new Logger(LogLevel.WARNING); loggerRenderer = new Logger(LogLevel.WARNING); - loggerEngine = new Logger(LogLevel.DEBUG); + loggerEngine = new Logger(LogLevel.WARNING); loggerAuth = new Logger(LogLevel.INFO); + loggerDB = new Logger(LogLevel.INFO); loggerStartup.INFO("Initialized loggers"); } } diff --git a/src/main/java/electrosphere/menu/MenuGeneratorsInventory.java b/src/main/java/electrosphere/menu/MenuGeneratorsInventory.java index 8aa65085..849a626e 100644 --- a/src/main/java/electrosphere/menu/MenuGeneratorsInventory.java +++ b/src/main/java/electrosphere/menu/MenuGeneratorsInventory.java @@ -145,7 +145,6 @@ public class MenuGeneratorsInventory { Entity item = Globals.draggedItem; //destroy real world item if(ItemUtils.getRealWorldEntity(item) != null){ - System.out.println("Destroy real world item"); ItemUtils.destroyInWorldItem(ItemUtils.getRealWorldEntity(item)); } //eject from equip state diff --git a/src/main/java/electrosphere/util/FileUtils.java b/src/main/java/electrosphere/util/FileUtils.java index 2c641024..d96b595b 100644 --- a/src/main/java/electrosphere/util/FileUtils.java +++ b/src/main/java/electrosphere/util/FileUtils.java @@ -156,7 +156,6 @@ public class FileUtils { public static File getSaveFile(String saveName, String pathName){ String sanitizedFilePath = sanitizeFilePath(pathName); String fullPath = "./saves/" + saveName + "/" + sanitizedFilePath; - System.out.println(fullPath); File targetFile = new File(fullPath); return targetFile; }