studiorailgun/Renderer
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cleanup
Some checks failed
studiorailgun/Renderer/pipeline/head There was a failure building this commit
Details

Browse Source
This commit is contained in:
austin 2024-07-13 15:28:53 -04:00
parent 67bdc8ec67
commit 5a2895f9fd
3 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/electrosphere/engine/loadingthreads/LevelEditorLoading.java
View File

@ -13,8 +13,6 @@ import electrosphere.net.server.ServerConnectionHandler;
import electrosphere.renderer.ui.elements.Window; import electrosphere.renderer.ui.elements.Window;
import electrosphere.server.content.ServerContentManager; import electrosphere.server.content.ServerContentManager;
import electrosphere.server.saves.SaveUtils; import electrosphere.server.saves.SaveUtils;
import electrosphere.server.terrain.generation.ArenaChunkGenerator;
import electrosphere.server.terrain.manager.ServerTerrainManager;
/** /**
* Loads the level editor * Loads the level editor

6
src/main/java/electrosphere/server/saves/SaveUtils.java
View File

@ -3,7 +3,6 @@ package electrosphere.server.saves;
import java.util.List; import java.util.List;
import electrosphere.engine.Globals; import electrosphere.engine.Globals;
import electrosphere.entity.scene.SceneLoader;
import electrosphere.game.server.world.ServerWorldData; import electrosphere.game.server.world.ServerWorldData;
import electrosphere.logger.LoggerInterface; import electrosphere.logger.LoggerInterface;
import electrosphere.server.content.ServerContentManager; import electrosphere.server.content.ServerContentManager;
@ -123,6 +122,11 @@ public class SaveUtils {
* @param saveName The name of the save * @param saveName The name of the save
*/ */
public static void overwriteSave(String saveName){ public static void overwriteSave(String saveName){
//write save file
FileUtils.serializeObjectToSavePath(saveName, "/save.json", Globals.currentSave);
//write server structures
if(Globals.serverTerrainManager != null){ if(Globals.serverTerrainManager != null){
Globals.serverTerrainManager.save(saveName); Globals.serverTerrainManager.save(saveName);
Globals.realmManager.save(saveName); Globals.realmManager.save(saveName);

6
src/main/java/electrosphere/server/terrain/manager/ServerTerrainManager.java
View File

@ -1,9 +1,6 @@
package electrosphere.server.terrain.manager; package electrosphere.server.terrain.manager;
import com.google.gson.Gson;
import electrosphere.engine.Globals; import electrosphere.engine.Globals;
import electrosphere.game.terrain.processing.TerrainInterpolator;
import electrosphere.server.terrain.diskmap.ChunkDiskMap; import electrosphere.server.terrain.diskmap.ChunkDiskMap;
import electrosphere.server.terrain.generation.ArenaChunkGenerator; import electrosphere.server.terrain.generation.ArenaChunkGenerator;
import electrosphere.server.terrain.generation.continentphase.TerrainGenerator; 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.TerrainModel;
import electrosphere.server.terrain.models.TerrainModification; import electrosphere.server.terrain.models.TerrainModification;
import electrosphere.util.FileUtils; import electrosphere.util.FileUtils;
import java.io.File;
import java.io.IOException;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.nio.FloatBuffer; import java.nio.FloatBuffer;
import java.nio.file.Files;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;