Remove seed hash from local & server worlds, and expose DH's level identifier to API

This commit is contained in:
s809
2024-11-09 22:37:05 +05:00
parent 56684bdf4c
commit 222a008514
6 changed files with 14 additions and 18 deletions
@@ -25,8 +25,6 @@ public class ServerKeyedClientLevel extends ClientLevelWrapper implements IServe
public String getServerLevelKey() { return this.serverLevelKey; }
@Override
public String getDimensionName() { return this.getServerLevelKey(); }
@Override
public String getLevelIdString() { return this.getServerLevelKey(); }
public String getDhIdentifier() { return this.getServerLevelKey(); }
}
@@ -334,9 +334,6 @@ public class MinecraftClientWrapper implements IMinecraftClientWrapper, IMinecra
@Override
public void executeOnRenderThread(Runnable runnable) { MINECRAFT.execute(runnable); }
@Override
public boolean isWorldNew() { throw new UnsupportedOperationException("Not Implemented"); }
@Override
public int getPlayerCount()
{
@@ -43,10 +43,6 @@ public class MinecraftServerWrapper implements IMinecraftSharedWrapper
#endif
}
@Override
public boolean isWorldNew()
{ return this.dedicatedServer.getWorldData().overworldData().isInitialized(); }
@Override
public int getPlayerCount()
{
@@ -39,7 +39,6 @@ import java.util.concurrent.ConcurrentHashMap;
import net.minecraft.world.level.chunk.ChunkStatus;
#else
import net.minecraft.world.level.chunk.status.ChunkStatus;
import com.seibel.distanthorizons.core.util.ColorUtil;
#endif
public class ClientLevelWrapper implements IClientLevelWrapper
@@ -187,13 +186,16 @@ public class ClientLevelWrapper implements IClientLevelWrapper
@Override
public IDimensionTypeWrapper getDimensionType() { return DimensionTypeWrapper.getDimensionTypeWrapper(this.level.dimensionType()); }
@Override
public String getDimensionName() { return this.level.dimension().location().toString(); }
@Override
public long getHashedSeed() { return this.level.getBiomeManager().biomeZoomSeed; }
public int getHashedSeed() { return (int) this.level.getBiomeManager().biomeZoomSeed; }
@Override
public String getDhIdentifier() { return this.getHashedSeed() + "@" + this.getDimensionName(); }
@Override
public EDhApiLevelType getLevelType() { return EDhApiLevelType.CLIENT_LEVEL; }
@@ -320,7 +322,7 @@ public class ClientLevelWrapper implements IClientLevelWrapper
return "Wrapped{null}";
}
return "Wrapped{" + this.level.toString() + "@" + this.getLevelIdString() + "}";
return "Wrapped{" + this.level.toString() + "@" + this.getDhIdentifier() + "}";
}
}
@@ -96,8 +96,11 @@ public class ServerLevelWrapper implements IServerLevelWrapper
@Override
public String getDimensionName() { return this.level.dimension().location().toString(); }
@Override
public long getHashedSeed() { return this.level.getBiomeManager().biomeZoomSeed; }
@Override
public int getHashedSeed() { return (int) this.level.getBiomeManager().biomeZoomSeed; }
@Override
public String getDhIdentifier() { return this.getDimensionName(); }
@Override
public EDhApiLevelType getLevelType() { return EDhApiLevelType.SERVER_LEVEL; }
@@ -202,6 +205,6 @@ public class ServerLevelWrapper implements IServerLevelWrapper
//================//
@Override
public String toString() { return "Wrapped{" + this.level.toString() + "@" + this.getLevelIdString() + "}"; }
public String toString() { return "Wrapped{" + this.level.toString() + "@" + this.getDhIdentifier() + "}"; }
}