From 5a2895f9fd76d403c03c8b7fb82536462ac1d4d5 Mon Sep 17 00:00:00 2001 From: austin Date: Sat, 13 Jul 2024 15:28:53 -0400 Subject: [PATCH] cleanup --- .../engine/loadingthreads/LevelEditorLoading.java | 2 -- src/main/java/electrosphere/server/saves/SaveUtils.java | 6 +++++- .../server/terrain/manager/ServerTerrainManager.java | 6 ------ 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/main/java/electrosphere/engine/loadingthreads/LevelEditorLoading.java b/src/main/java/electrosphere/engine/loadingthreads/LevelEditorLoading.java index da87a552..2fd6f471 100644 --- a/src/main/java/electrosphere/engine/loadingthreads/LevelEditorLoading.java +++ b/src/main/java/electrosphere/engine/loadingthreads/LevelEditorLoading.java @@ -13,8 +13,6 @@ import electrosphere.net.server.ServerConnectionHandler; import electrosphere.renderer.ui.elements.Window; import electrosphere.server.content.ServerContentManager; import electrosphere.server.saves.SaveUtils; -import electrosphere.server.terrain.generation.ArenaChunkGenerator; -import electrosphere.server.terrain.manager.ServerTerrainManager; /** * Loads the level editor diff --git a/src/main/java/electrosphere/server/saves/SaveUtils.java b/src/main/java/electrosphere/server/saves/SaveUtils.java index 2971bc52..46f11c4d 100644 --- a/src/main/java/electrosphere/server/saves/SaveUtils.java +++ b/src/main/java/electrosphere/server/saves/SaveUtils.java @@ -3,7 +3,6 @@ package electrosphere.server.saves; import java.util.List; import electrosphere.engine.Globals; -import electrosphere.entity.scene.SceneLoader; import electrosphere.game.server.world.ServerWorldData; import electrosphere.logger.LoggerInterface; import electrosphere.server.content.ServerContentManager; @@ -123,6 +122,11 @@ public class SaveUtils { * @param saveName The name of the save */ public static void overwriteSave(String saveName){ + + //write save file + FileUtils.serializeObjectToSavePath(saveName, "/save.json", Globals.currentSave); + + //write server structures if(Globals.serverTerrainManager != null){ Globals.serverTerrainManager.save(saveName); Globals.realmManager.save(saveName); diff --git a/src/main/java/electrosphere/server/terrain/manager/ServerTerrainManager.java b/src/main/java/electrosphere/server/terrain/manager/ServerTerrainManager.java index ab68a776..3d1eaae1 100644 --- a/src/main/java/electrosphere/server/terrain/manager/ServerTerrainManager.java +++ b/src/main/java/electrosphere/server/terrain/manager/ServerTerrainManager.java @@ -1,9 +1,6 @@ package electrosphere.server.terrain.manager; -import com.google.gson.Gson; - import electrosphere.engine.Globals; -import electrosphere.game.terrain.processing.TerrainInterpolator; import electrosphere.server.terrain.diskmap.ChunkDiskMap; import electrosphere.server.terrain.generation.ArenaChunkGenerator; import electrosphere.server.terrain.generation.continentphase.TerrainGenerator; @@ -11,11 +8,8 @@ import electrosphere.server.terrain.generation.interfaces.ChunkGenerator; import electrosphere.server.terrain.models.TerrainModel; import electrosphere.server.terrain.models.TerrainModification; import electrosphere.util.FileUtils; -import java.io.File; -import java.io.IOException; import java.nio.ByteBuffer; import java.nio.FloatBuffer; -import java.nio.file.Files; import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap;