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

Fix Api client level not containing the generic renderer

Browse Source
This commit is contained in:
James Seibel
2024-07-04 16:14:32 -05:00
parent ca711bbc72
commit 120dddf844
5 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/seibel/distanthorizons/core/level/DhClientLevel.java
+2 -2
View File
@@ -60,7 +60,7 @@ public class DhClientLevel extends AbstractDhLevel implements IDhClientLevel
public DhClientLevel(AbstractSaveStructure saveStructure, IClientLevelWrapper clientLevelWrapper, @Nullable File fullDataSaveDirOverride, boolean enableRendering)
{
this.levelWrapper = clientLevelWrapper;
this.levelWrapper.setParentClientLevel(this);
this.levelWrapper.setParentLevel(this);
this.saveStructure = saveStructure;
this.dataFileHandler = new RemoteFullDataSourceProvider(this, saveStructure, fullDataSaveDirOverride);
this.clientside = new ClientLevelModule(this);
@@ -157,7 +157,7 @@ public class DhClientLevel extends AbstractDhLevel implements IDhClientLevel
@Override
public void close()
{
this.levelWrapper.setParentClientLevel(null);
this.levelWrapper.setParentLevel(null);
this.clientside.close();
super.close();
this.dataFileHandler.close();
core/src/main/java/com/seibel/distanthorizons/core/level/DhClientServerLevel.java
+1
View File
@@ -68,6 +68,7 @@ public class DhClientServerLevel extends AbstractDhLevel implements IDhClientLev
LOGGER.warn("unable to create data folder.");
}
this.serverLevelWrapper = serverLevelWrapper;
this.serverLevelWrapper.setParentLevel(this);
this.serverside = new ServerLevelModule(this, saveStructure);
this.clientside = new ClientLevelModule(this);
this.createAndSetSupportingRepos(this.serverside.fullDataFileHandler.repo.databaseFile);
core/src/main/java/com/seibel/distanthorizons/core/world/DhClientServerWorld.java
+1
View File
@@ -98,6 +98,7 @@ public class DhClientServerWorld extends AbstractDhWorld implements IDhClientWor
}
level.startRenderer(clientLevelWrapper);
clientLevelWrapper.setParentLevel(level);
return level;
});
}
core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/world/IClientLevelWrapper.java
+2 -3
View File
@@ -19,7 +19,8 @@
package com.seibel.distanthorizons.core.wrapperInterfaces.world;
import com.seibel.distanthorizons.core.level.DhClientLevel;
import com.seibel.distanthorizons.core.level.IDhClientLevel;
import com.seibel.distanthorizons.core.level.IDhLevel;
import com.seibel.distanthorizons.core.pos.DhBlockPos;
import com.seibel.distanthorizons.core.wrapperInterfaces.block.IBlockStateWrapper;
import org.jetbrains.annotations.Nullable;
@@ -42,6 +43,4 @@ public interface IClientLevelWrapper extends ILevelWrapper
@Nullable
IBiomeWrapper getPlainsBiomeWrapper();
void setParentClientLevel(DhClientLevel parentClientLevel);
}
core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/world/ILevelWrapper.java
+4
View File
@@ -21,6 +21,7 @@ package com.seibel.distanthorizons.core.wrapperInterfaces.world;
import com.seibel.distanthorizons.api.interfaces.world.IDhApiDimensionTypeWrapper;
import com.seibel.distanthorizons.api.interfaces.world.IDhApiLevelWrapper;
import com.seibel.distanthorizons.core.level.IDhLevel;
import com.seibel.distanthorizons.core.pos.DhBlockPos;
import com.seibel.distanthorizons.core.pos.DhChunkPos;
import com.seibel.distanthorizons.core.wrapperInterfaces.block.IBlockStateWrapper;
@@ -64,4 +65,7 @@ public interface ILevelWrapper extends IDhApiLevelWrapper, IBindable
/** Fired when the level is being unloaded. Doesn't unload the level. */
void onUnload();
@Deprecated
void setParentLevel(IDhLevel parentLevel);
}