* SavingWorldScreen: Only save what's necessary

source/GUI/Screen/SavingWorldScreen.cpp

@@ -19,7 +19,7 @@ void SavingWorldScreen::render(int mouseX, int mouseY, float f)
 	int yPos = x_height / 2;
 
 	int width = m_pFont->width("Saving chunks");
-	m_pFont->drawShadow("Saving chunks", (x_width - width) / 2, yPos + 4, 0xFFFFFF);
+	m_pFont->drawShadow("Saving chunks", (x_width - width) / 2, yPos, 0xFFFFFF);
 }
 
 void SavingWorldScreen::tick()
@@ -36,7 +36,7 @@ void SavingWorldScreen::tick()
 		Level* pLevel = m_pMinecraft->m_pLevel;
 		if (pLevel)
 		{
-			pLevel->saveAllChunks();
+			pLevel->saveUnsavedChunks();
 			pLevel->saveLevelData();
 			pLevel->savePlayerData();
 

source/World/Generator/ChunkCache.cpp

@@ -179,6 +179,27 @@ void ChunkCache::saveAll()
 	m_pChunkStorage->saveAll(m_pLevel, chunksToSave);
 }
 
+void ChunkCache::saveUnsaved()
+{
+	if (!m_pChunkStorage) return;
+
+	std::vector<LevelChunk*> chunksToSave;
+
+	for (int i = 0; i < C_MAX_CHUNKS_Z; i++)
+	{
+		for (int j = 0; j < C_MAX_CHUNKS_X; j++)
+		{
+			LevelChunk* pChunk = m_pLevel->getChunk(j, i);
+			if (!pChunk->m_bUnsaved)
+				continue;
+
+			chunksToSave.push_back(pChunk);
+		}
+	}
+
+	m_pChunkStorage->saveAll(m_pLevel, chunksToSave);
+}
+
 bool ChunkCache::shouldSave()
 {
 	return true;

source/World/Generator/ChunkCache.hpp

@@ -27,6 +27,9 @@ public:
 	bool shouldSave() override;
 	void saveAll() override;
 	int tick() override;
+#ifdef ENH_IMPROVED_SAVING
+	void saveUnsaved() override;
+#endif
 
 	LevelChunk* load(int, int);
 	void save(LevelChunk*);

source/World/Generator/ChunkSource.cpp

@@ -9,11 +9,18 @@
 #include "ChunkSource.hpp"
 #include "Level.hpp"
 
+ChunkSource::~ChunkSource()
+{
+}
+
 void ChunkSource::saveAll()
 {
 
 }
 
-ChunkSource::~ChunkSource()
+#ifdef ENH_IMPROVED_SAVING
+void ChunkSource::saveUnsaved()
 {
+
 }
+#endif

source/World/Generator/ChunkSource.hpp

@@ -8,6 +8,7 @@
 
 #pragma once
 #include <string>
+#include "GameMods.hpp"
 class Level;
 class LevelChunk;
 
@@ -23,5 +24,8 @@ public:
 	virtual bool shouldSave() = 0;
 	virtual void saveAll();
 	virtual std::string gatherStats() = 0;
+#ifdef ENH_IMPROVED_SAVING
+	virtual void saveUnsaved();
+#endif
 };
 

source/World/Level.cpp

@@ -1095,6 +1095,13 @@ void Level::saveAllChunks()
 	m_pChunkSource->saveAll();
 }
 
+#ifdef ENH_IMPROVED_SAVING
+void Level::saveUnsavedChunks()
+{
+	m_pChunkSource->saveUnsaved();
+}
+#endif
+
 void Level::setInitialSpawn()
 {
 	field_A00 = true;

source/World/Level.hpp

@@ -161,6 +161,10 @@ public:
 	bool hasDirectSignal(int x, int y, int z);
 	bool hasNeighborSignal(int x, int y, int z);
 
+#ifdef ENH_IMPROVED_SAVING
+	void saveUnsavedChunks();
+#endif
+
 public:
 	AABBVector m_aabbs;
 	uint8_t field_10 = 0;