wisplite/distant-horizons-core-sharded
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix generation

Browse Source
This commit is contained in:
s809
2024-01-13 19:44:48 +05:00
parent 310c890474
commit 573a284580
2 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/seibel/distanthorizons/core/level/DhClientLevel.java
+4
View File
@@ -85,6 +85,10 @@ public class DhClientLevel extends DhLevel implements IDhClientLevel
public DhClientLevel(AbstractSaveStructure saveStructure, IClientLevelWrapper clientLevelWrapper, @Nullable ClientNetworkState networkState) { this(saveStructure, clientLevelWrapper, null, true, networkState); }
public DhClientLevel(AbstractSaveStructure saveStructure, IClientLevelWrapper clientLevelWrapper, @Nullable File fullDataSaveDirOverride, boolean enableRendering, @Nullable ClientNetworkState networkState)
{
if (saveStructure.getFullDataFolder(clientLevelWrapper).mkdirs())
{
LOGGER.warn("unable to create data folder.");
}
this.levelWrapper = clientLevelWrapper;
this.saveStructure = saveStructure;
this.dataFileHandler = new RemoteFullDataFileHandler(this, saveStructure, fullDataSaveDirOverride);
core/src/main/java/com/seibel/distanthorizons/core/level/DhServerLevel.java
+16 -13
View File
@@ -104,9 +104,7 @@ public class DhServerLevel extends DhLevel implements IDhServerLevel
{
IncompleteDataSourceEntry entry = incompleteDataSources.computeIfAbsent(msg.dhSectionPos, pos -> {
IncompleteDataSourceEntry newEntry = new IncompleteDataSourceEntry();
serverside.dataFileHandler.getAsync(msg.dhSectionPos).thenAccept(fullDataSource -> {
newEntry.fullDataSource = fullDataSource;
});
this.trySetGeneratedDataSourceToEntry(newEntry, pos);
return newEntry;
});
// If this fails, current entry is being drained and need to create another one
@@ -169,17 +167,9 @@ public class DhServerLevel extends DhLevel implements IDhServerLevel
{
IncompleteDataSourceEntry entry = mapEntry.getValue();
if (entry.fullDataSource == null)
if (entry.fullDataSource == null || entry.fullDataSource instanceof IIncompleteFullDataSource)
continue;
if (entry.fullDataSource instanceof IIncompleteFullDataSource)
{
IIncompleteFullDataSource incompleteSource = (IIncompleteFullDataSource) entry.fullDataSource;
if (!incompleteSource.hasBeenPromoted())
continue;
entry.fullDataSource = incompleteSource.tryPromotingToCompleteDataSource();
}
LodUtil.assertTrue(entry.fullDataSource instanceof CompleteFullDataSource, "Invalid full data source");
incompleteDataSources.remove(mapEntry.getKey());
@@ -310,10 +300,23 @@ public class DhServerLevel extends DhLevel implements IDhServerLevel
@Override
public boolean hasSkyLight() { return this.serverLevelWrapper.hasSkyLight(); }
private void trySetGeneratedDataSourceToEntry(IncompleteDataSourceEntry entry, DhSectionPos pos)
{
this.serverside.dataFileHandler.getAsync(pos).thenAccept(fullDataSource -> {
if (fullDataSource instanceof IIncompleteFullDataSource)
fullDataSource = ((IIncompleteFullDataSource) fullDataSource).tryPromotingToCompleteDataSource();
if (fullDataSource instanceof CompleteFullDataSource)
entry.fullDataSource = fullDataSource;
});
}
@Override
public void onWorldGenTaskComplete(DhSectionPos pos)
{
//TODO: Send packet to client
IncompleteDataSourceEntry entry = this.incompleteDataSources.get(pos);
if (entry == null) return;
this.trySetGeneratedDataSourceToEntry(entry, pos);
}
private static class IncompleteDataSourceEntry