From 77a564b0e595e843f3e56c92ab9fdcb1342b1b95 Mon Sep 17 00:00:00 2001 From: austin Date: Mon, 5 May 2025 22:21:19 -0400 Subject: [PATCH] more code cleanupi --- docs/src/progress/renderertodo.md | 1 + .../client/ui/menu/dialog/DialogMenuGenerator.java | 4 ++-- .../java/electrosphere/entity/state/attack/ShooterTree.java | 1 - .../entity/state/stance/ClientStanceComponent.java | 1 - .../entity/state/stance/ServerStanceComponent.java | 1 - src/main/java/electrosphere/net/config/NetConfig.java | 4 ++-- .../renderer/actor/instance/HomogenousInstanceData.java | 1 - src/main/java/electrosphere/renderer/ui/font/FontUtils.java | 1 - src/main/java/electrosphere/script/ScriptEngine.java | 3 +-- .../physics/block/diskmap/ServerBlockChunkDiskMap.java | 6 ++---- .../server/physics/fluid/diskmap/FluidDiskMap.java | 6 ++---- .../physics/fluid/generation/DefaultFluidGenerator.java | 1 - .../server/physics/terrain/diskmap/ChunkDiskMap.java | 6 ++---- src/main/java/electrosphere/util/FileUtils.java | 6 ++---- .../electrosphere/test/testutils/TestRenderingUtils.java | 1 - 15 files changed, 14 insertions(+), 29 deletions(-) diff --git a/docs/src/progress/renderertodo.md b/docs/src/progress/renderertodo.md index 0558f81d..6db037ac 100644 --- a/docs/src/progress/renderertodo.md +++ b/docs/src/progress/renderertodo.md @@ -1687,6 +1687,7 @@ Dynamic html-defined menus support button elements that call a client hook when Dynamic menu navigation between windows Starting formatting npc intro page Code cleanup +More code cleanup diff --git a/src/main/java/electrosphere/client/ui/menu/dialog/DialogMenuGenerator.java b/src/main/java/electrosphere/client/ui/menu/dialog/DialogMenuGenerator.java index 4fa2028b..6c05669b 100644 --- a/src/main/java/electrosphere/client/ui/menu/dialog/DialogMenuGenerator.java +++ b/src/main/java/electrosphere/client/ui/menu/dialog/DialogMenuGenerator.java @@ -13,6 +13,7 @@ import electrosphere.controls.ControlHandler.ControlsState; import electrosphere.engine.Globals; import electrosphere.engine.signal.Signal.SignalType; import electrosphere.entity.Entity; +import electrosphere.logger.LoggerInterface; import electrosphere.renderer.ui.elements.Div; import electrosphere.renderer.ui.elements.Window; import electrosphere.renderer.ui.elementtypes.ContainerElement.YogaAlignment; @@ -79,8 +80,7 @@ public class DialogMenuGenerator { Node bodyNode = doc.getElementsByTag("body").first(); container.addChild(HtmlParser.parseJSoup(bodyNode)); } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); + LoggerInterface.loggerFileIO.ERROR(e); } rVal.addChild(container); diff --git a/src/main/java/electrosphere/entity/state/attack/ShooterTree.java b/src/main/java/electrosphere/entity/state/attack/ShooterTree.java index 3ecd12c5..bb9a3e74 100644 --- a/src/main/java/electrosphere/entity/state/attack/ShooterTree.java +++ b/src/main/java/electrosphere/entity/state/attack/ShooterTree.java @@ -37,7 +37,6 @@ public class ShooterTree implements BehaviorTree { @Override public void simulate(float deltaTime) { - // TODO Auto-generated method stub switch(state){ case ATTACK: { // diff --git a/src/main/java/electrosphere/entity/state/stance/ClientStanceComponent.java b/src/main/java/electrosphere/entity/state/stance/ClientStanceComponent.java index 5cf6ef92..9b5d181b 100644 --- a/src/main/java/electrosphere/entity/state/stance/ClientStanceComponent.java +++ b/src/main/java/electrosphere/entity/state/stance/ClientStanceComponent.java @@ -189,7 +189,6 @@ public class ClientStanceComponent implements BehaviorTree { @Override public void simulate(float deltaTime) { - // TODO Auto-generated method stub throw new UnsupportedOperationException("Unimplemented method 'simulate'"); } diff --git a/src/main/java/electrosphere/entity/state/stance/ServerStanceComponent.java b/src/main/java/electrosphere/entity/state/stance/ServerStanceComponent.java index 9eb6eb80..a8cf5160 100644 --- a/src/main/java/electrosphere/entity/state/stance/ServerStanceComponent.java +++ b/src/main/java/electrosphere/entity/state/stance/ServerStanceComponent.java @@ -104,7 +104,6 @@ public class ServerStanceComponent implements BehaviorTree { @Override public void simulate(float deltaTime) { - // TODO Auto-generated method stub throw new UnsupportedOperationException("Unimplemented method 'simulate'"); } diff --git a/src/main/java/electrosphere/net/config/NetConfig.java b/src/main/java/electrosphere/net/config/NetConfig.java index db99816c..d9c452ac 100644 --- a/src/main/java/electrosphere/net/config/NetConfig.java +++ b/src/main/java/electrosphere/net/config/NetConfig.java @@ -5,6 +5,7 @@ import java.io.IOException; import java.nio.file.Files; import electrosphere.engine.Globals; +import electrosphere.logger.LoggerInterface; import electrosphere.util.Utilities; /** @@ -75,8 +76,7 @@ public class NetConfig { try { Globals.netConfig = Utilities.deserialize(Files.readString(file.toPath()), NetConfig.class); } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); + LoggerInterface.loggerFileIO.ERROR(e); } } } diff --git a/src/main/java/electrosphere/renderer/actor/instance/HomogenousInstanceData.java b/src/main/java/electrosphere/renderer/actor/instance/HomogenousInstanceData.java index 33d85bb1..8915561a 100644 --- a/src/main/java/electrosphere/renderer/actor/instance/HomogenousInstanceData.java +++ b/src/main/java/electrosphere/renderer/actor/instance/HomogenousInstanceData.java @@ -392,7 +392,6 @@ public class HomogenousInstanceData implements InstanceData { @Override public void destroy() { - // TODO Auto-generated method stub throw new UnsupportedOperationException("Unimplemented method 'destroy'"); } diff --git a/src/main/java/electrosphere/renderer/ui/font/FontUtils.java b/src/main/java/electrosphere/renderer/ui/font/FontUtils.java index c3c6c994..5ef91203 100644 --- a/src/main/java/electrosphere/renderer/ui/font/FontUtils.java +++ b/src/main/java/electrosphere/renderer/ui/font/FontUtils.java @@ -179,7 +179,6 @@ public class FontUtils { // imgFile.getParentFile().mkdirs(); // ImageIO.write(image, "png", Files.newOutputStream(imgFile.toPath())); // } catch (IOException e) { - // // TODO Auto-generated catch block // e.printStackTrace(); // } diff --git a/src/main/java/electrosphere/script/ScriptEngine.java b/src/main/java/electrosphere/script/ScriptEngine.java index e11952ca..1a7aa686 100644 --- a/src/main/java/electrosphere/script/ScriptEngine.java +++ b/src/main/java/electrosphere/script/ScriptEngine.java @@ -291,8 +291,7 @@ public class ScriptEngine extends SignalServiceImpl { try { fileChecksumMap.put(normalizedPath,FileUtils.getChecksum(fileContent)); } catch (NoSuchAlgorithmException e) { - // TODO Auto-generated catch block - e.printStackTrace(); + LoggerInterface.loggerScripts.ERROR(e); } //store on script side diff --git a/src/main/java/electrosphere/server/physics/block/diskmap/ServerBlockChunkDiskMap.java b/src/main/java/electrosphere/server/physics/block/diskmap/ServerBlockChunkDiskMap.java index 62a87061..82ae9048 100644 --- a/src/main/java/electrosphere/server/physics/block/diskmap/ServerBlockChunkDiskMap.java +++ b/src/main/java/electrosphere/server/physics/block/diskmap/ServerBlockChunkDiskMap.java @@ -147,8 +147,7 @@ public class ServerBlockChunkDiskMap { inflaterInputStream.close(); rawData = out.toByteArray(); } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); + LoggerInterface.loggerFileIO.ERROR(e); } //parse if(rawData != null){ @@ -256,8 +255,7 @@ public class ServerBlockChunkDiskMap { //save to the map of filenames worldPosFileMap.put(chunkKey,fileName); } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); + LoggerInterface.loggerFileIO.ERROR(e); } lock.unlock(); } diff --git a/src/main/java/electrosphere/server/physics/fluid/diskmap/FluidDiskMap.java b/src/main/java/electrosphere/server/physics/fluid/diskmap/FluidDiskMap.java index 19ecba44..de48d899 100644 --- a/src/main/java/electrosphere/server/physics/fluid/diskmap/FluidDiskMap.java +++ b/src/main/java/electrosphere/server/physics/fluid/diskmap/FluidDiskMap.java @@ -97,8 +97,7 @@ public class FluidDiskMap { inflaterInputStream.close(); rawData = out.toByteArray(); } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); + LoggerInterface.loggerFileIO.ERROR(e); } //parse if(rawData != null){ @@ -197,8 +196,7 @@ public class FluidDiskMap { //save to the map of filenames worldPosFileMap.put(chunkKey,fileName); } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); + LoggerInterface.loggerFileIO.ERROR(e); } } diff --git a/src/main/java/electrosphere/server/physics/fluid/generation/DefaultFluidGenerator.java b/src/main/java/electrosphere/server/physics/fluid/generation/DefaultFluidGenerator.java index 61b267a9..3340b06b 100644 --- a/src/main/java/electrosphere/server/physics/fluid/generation/DefaultFluidGenerator.java +++ b/src/main/java/electrosphere/server/physics/fluid/generation/DefaultFluidGenerator.java @@ -14,7 +14,6 @@ public class DefaultFluidGenerator implements FluidGenerator { @Override public void setModel(FluidModel model) { - // TODO Auto-generated method stub throw new UnsupportedOperationException("Unimplemented method 'setModel'"); } diff --git a/src/main/java/electrosphere/server/physics/terrain/diskmap/ChunkDiskMap.java b/src/main/java/electrosphere/server/physics/terrain/diskmap/ChunkDiskMap.java index 2004b4eb..cda2a9a0 100644 --- a/src/main/java/electrosphere/server/physics/terrain/diskmap/ChunkDiskMap.java +++ b/src/main/java/electrosphere/server/physics/terrain/diskmap/ChunkDiskMap.java @@ -178,8 +178,7 @@ public class ChunkDiskMap { inflaterInputStream.close(); rawData = out.toByteArray(); } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); + LoggerInterface.loggerFileIO.ERROR(e); } //parse if(rawData != null){ @@ -267,8 +266,7 @@ public class ChunkDiskMap { //save to the map of filenames worldPosFileMap.put(chunkKey,fileName); } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); + LoggerInterface.loggerFileIO.ERROR(e); } lock.unlock(); } diff --git a/src/main/java/electrosphere/util/FileUtils.java b/src/main/java/electrosphere/util/FileUtils.java index 22fd35de..605494a2 100644 --- a/src/main/java/electrosphere/util/FileUtils.java +++ b/src/main/java/electrosphere/util/FileUtils.java @@ -379,8 +379,7 @@ public class FileUtils { try { rVal = Files.readAllBytes(FileUtils.getSaveFile(saveName,sanitizedFilePath).toPath()); } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); + LoggerInterface.loggerFileIO.ERROR(e); } return rVal; } @@ -474,8 +473,7 @@ public class FileUtils { try { Files.delete(file.toPath()); } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); + LoggerInterface.loggerFileIO.ERROR(e); } } } diff --git a/src/test/java/electrosphere/test/testutils/TestRenderingUtils.java b/src/test/java/electrosphere/test/testutils/TestRenderingUtils.java index a1121981..0a669429 100644 --- a/src/test/java/electrosphere/test/testutils/TestRenderingUtils.java +++ b/src/test/java/electrosphere/test/testutils/TestRenderingUtils.java @@ -24,7 +24,6 @@ public class TestRenderingUtils { Files.createDirectories(new File(existingRenderPath).toPath()); ImageIO.write(screenshot, "png", new File(existingRenderPath)); } catch (IOException e) { - // TODO Auto-generated catch block e.printStackTrace(); } }