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

add ILevelWrapper.onUnload()

Browse Source
This commit is contained in:
James Seibel
2023-08-20 14:47:22 -05:00
parent 3113263012
commit f57c52b2d0
4 changed files with 39 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/seibel/distanthorizons/core/world/DhClientServerWorld.java
+24 -16
View File
@@ -19,9 +19,9 @@ import java.util.concurrent.ExecutorService;
public class DhClientServerWorld extends AbstractDhWorld implements IDhClientWorld, IDhServerWorld
{
private final HashMap<ILevelWrapper, DhClientServerLevel> levelObjMap;
private final HashSet<DhClientServerLevel> dhLevels;
public final LocalSaveStructure saveStructure;
private final HashMap<ILevelWrapper, DhClientServerLevel> levelWrapperByDhLevel = new HashMap<>();
private final HashSet<DhClientServerLevel> dhLevels = new HashSet<>();
public final LocalSaveStructure saveStructure = new LocalSaveStructure();
public ExecutorService dhTickerThread = ThreadUtil.makeSingleThreadPool("DH Client Server World Ticker Thread", 2);
public EventLoop eventLoop = new EventLoop(this.dhTickerThread, this::_clientTick); //TODO: Rate-limit the loop
@@ -30,12 +30,13 @@ public class DhClientServerWorld extends AbstractDhWorld implements IDhClientWor
//=============//
// constructor //
//=============//
public DhClientServerWorld()
{
super(EWorldEnvironment.Client_Server);
this.saveStructure = new LocalSaveStructure();
this.levelObjMap = new HashMap<>();
this.dhLevels = new HashSet<>();
LOGGER.info("Started DhWorld of type " + this.environment);
@@ -44,12 +45,16 @@ public class DhClientServerWorld extends AbstractDhWorld implements IDhClientWor
//=========//
// methods //
//=========//
@Override
public DhClientServerLevel getOrLoadLevel(ILevelWrapper wrapper)
{
if (wrapper instanceof IServerLevelWrapper)
{
return this.levelObjMap.computeIfAbsent(wrapper, (levelWrapper) ->
return this.levelWrapperByDhLevel.computeIfAbsent(wrapper, (levelWrapper) ->
{
File levelFile = this.saveStructure.getLevelFolder(levelWrapper);
LodUtil.assertTrue(levelFile != null);
@@ -60,7 +65,7 @@ public class DhClientServerWorld extends AbstractDhWorld implements IDhClientWor
}
else
{
return this.levelObjMap.computeIfAbsent(wrapper, (levelWrapper) ->
return this.levelWrapperByDhLevel.computeIfAbsent(wrapper, (levelWrapper) ->
{
IClientLevelWrapper clientLevelWrapper = (IClientLevelWrapper) levelWrapper;
IServerLevelWrapper serverLevelWrapper = clientLevelWrapper.tryGetServerSideWrapper();
@@ -68,7 +73,7 @@ public class DhClientServerWorld extends AbstractDhWorld implements IDhClientWor
LodUtil.assertTrue(clientLevelWrapper.getDimensionType().equals(serverLevelWrapper.getDimensionType()), "tryGetServerSideWrapper returned a level for a different dimension. ClientLevelWrapper dim: " + clientLevelWrapper.getDimensionType().getDimensionName() + " ServerLevelWrapper dim: " + serverLevelWrapper.getDimensionType().getDimensionName());
DhClientServerLevel level = this.levelObjMap.get(serverLevelWrapper);
DhClientServerLevel level = this.levelWrapperByDhLevel.get(serverLevelWrapper);
if (level == null)
{
return null;
@@ -81,7 +86,7 @@ public class DhClientServerWorld extends AbstractDhWorld implements IDhClientWor
}
@Override
public DhClientServerLevel getLevel(ILevelWrapper wrapper) { return this.levelObjMap.get(wrapper); }
public DhClientServerLevel getLevel(ILevelWrapper wrapper) { return this.levelWrapperByDhLevel.get(wrapper); }
@Override
public Iterable<? extends IDhLevel> getAllLoadedLevels() { return this.dhLevels; }
@@ -89,21 +94,23 @@ public class DhClientServerWorld extends AbstractDhWorld implements IDhClientWor
@Override
public void unloadLevel(ILevelWrapper wrapper)
{
if (this.levelObjMap.containsKey(wrapper))
if (this.levelWrapperByDhLevel.containsKey(wrapper))
{
if (wrapper instanceof IServerLevelWrapper)
{
LOGGER.info("Unloading level " + this.levelObjMap.get(wrapper));
DhClientServerLevel clientServerLevel = this.levelObjMap.remove(wrapper);
this.dhLevels.remove(clientServerLevel);
LOGGER.info("Unloading level " + this.levelWrapperByDhLevel.get(wrapper));
wrapper.onUnload();
DhClientServerLevel clientServerLevel = this.levelWrapperByDhLevel.remove(wrapper);
clientServerLevel.close();
this.dhLevels.remove(clientServerLevel);
}
else
{
// If the level wrapper is a Client Level Wrapper, then that means the client side leaves the level,
// but note that the server side still has the level loaded. So, we don't want to unload the level,
// we just want to stop rendering it.
this.levelObjMap.remove(wrapper).stopRenderer(); // Ignore resource warning. The level obj is referenced elsewhere.
this.levelWrapperByDhLevel.remove(wrapper).stopRenderer(); // Ignore resource warning. The level obj is referenced elsewhere.
}
}
}
@@ -137,10 +144,11 @@ public class DhClientServerWorld extends AbstractDhWorld implements IDhClientWor
for (DhClientServerLevel level : this.dhLevels)
{
LOGGER.info("Unloading level " + level.getServerLevelWrapper().getDimensionType().getDimensionName());
level.clientLevelWrapper.onUnload();
level.close();
}
this.levelObjMap.clear();
this.levelWrapperByDhLevel.clear();
this.eventLoop.close();
LOGGER.info("Closed DhWorld of type " + this.environment);
}
core/src/main/java/com/seibel/distanthorizons/core/world/DhClientWorld.java
+2 -2
View File
@@ -30,8 +30,7 @@ public class DhClientWorld extends AbstractDhWorld implements IDhClientWorld
// private final NetworkClient networkClient;
// TODO why does this executor have 2 threads?
public ExecutorService dhTickerThread = ThreadUtil.makeSingleThreadPool("DH Client World Ticker Thread", 2);
public ExecutorService dhTickerThread = ThreadUtil.makeSingleThreadPool("DH Client World Ticker Thread");
public EventLoop eventLoop = new EventLoop(this.dhTickerThread, this::_clientTick);
@@ -137,6 +136,7 @@ public class DhClientWorld extends AbstractDhWorld implements IDhClientWorld
if (this.levels.containsKey(wrapper))
{
LOGGER.info("Unloading level " + this.levels.get(wrapper));
wrapper.onUnload();
this.levels.remove(wrapper).close();
}
}
core/src/main/java/com/seibel/distanthorizons/core/world/DhServerWorld.java
+11
View File
@@ -31,6 +31,10 @@ public class DhServerWorld extends AbstractDhWorld implements IDhServerWorld
//==============//
// constructors //
//==============//
public DhServerWorld()
{
super(EWorldEnvironment.Server_Only);
@@ -94,6 +98,12 @@ public class DhServerWorld extends AbstractDhWorld implements IDhServerWorld
// });
}
//=========//
// methods //
//=========//
public void addPlayer(IServerPlayerWrapper serverPlayer)
{
//this.playersByUUID.put(serverPlayer.getUUID(), new RemotePlayer(serverPlayer));
@@ -149,6 +159,7 @@ public class DhServerWorld extends AbstractDhWorld implements IDhServerWorld
if (this.levels.containsKey(wrapper))
{
LOGGER.info("Unloading level {} ", this.levels.get(wrapper));
wrapper.onUnload();
this.levels.remove(wrapper).close();
}
}
core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/world/ILevelWrapper.java
+2 -6
View File
@@ -39,10 +39,6 @@ public interface ILevelWrapper extends IDhApiLevelWrapper, IBindable
@Override
IDhApiDimensionTypeWrapper getDimensionType();
int getBlockLight(int x, int y, int z);
int getSkyLight(int x, int y, int z);
@Override
boolean hasCeiling();
@@ -65,7 +61,7 @@ public interface ILevelWrapper extends IDhApiLevelWrapper, IBindable
@Deprecated
IBiomeWrapper getBiome(DhBlockPos pos);
// TODO implement onUnload
// necessary so ChunkToLodBuilder can have its cache cleared after the level closes
/** Fired when the level is being unloaded. Doesn't unload the level. */
void onUnload();
}