diff --git a/core/src/main/java/com/seibel/lod/core/api/internal/ClientApi.java b/core/src/main/java/com/seibel/lod/core/api/internal/ClientApi.java index 48ce43cf7..2dcd27b15 100644 --- a/core/src/main/java/com/seibel/lod/core/api/internal/ClientApi.java +++ b/core/src/main/java/com/seibel/lod/core/api/internal/ClientApi.java @@ -38,7 +38,7 @@ import com.seibel.lod.core.render.renderer.TestRenderer; import com.seibel.lod.core.util.RenderUtil; import com.seibel.lod.core.world.DhClientWorld; import com.seibel.lod.core.world.DhWorld; -import com.seibel.lod.core.world.IClientWorld; +import com.seibel.lod.core.world.IDhClientWorld; import com.seibel.lod.core.world.WorldEnvironment; import com.seibel.lod.core.wrapperInterfaces.chunk.IChunkWrapper; import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper; @@ -216,9 +216,9 @@ public class ClientApi ConfigBasedLogger.updateAll(); ConfigBasedSpamLogger.updateAll(doFlush); - if (SharedApi.currentWorld instanceof IClientWorld) + if (SharedApi.currentWorld instanceof IDhClientWorld) { - ((IClientWorld) SharedApi.currentWorld).clientTick(); + ((IDhClientWorld) SharedApi.currentWorld).clientTick(); } profiler.pop(); } diff --git a/core/src/main/java/com/seibel/lod/core/api/internal/ServerApi.java b/core/src/main/java/com/seibel/lod/core/api/internal/ServerApi.java index 9db91739d..c4e44d60c 100644 --- a/core/src/main/java/com/seibel/lod/core/api/internal/ServerApi.java +++ b/core/src/main/java/com/seibel/lod/core/api/internal/ServerApi.java @@ -26,7 +26,7 @@ import com.seibel.lod.core.DependencyInjection.DhApiEventInjector; import com.seibel.lod.core.level.IDhLevel; import com.seibel.lod.core.world.DhClientServerWorld; import com.seibel.lod.core.world.DhServerWorld; -import com.seibel.lod.core.world.IServerWorld; +import com.seibel.lod.core.world.IDhServerWorld; import com.seibel.lod.core.dependencyInjection.SingletonInjector; import com.seibel.lod.core.logging.DhLoggerBuilder; import com.seibel.lod.core.wrapperInterfaces.IVersionConstants; @@ -66,8 +66,8 @@ public class ServerApi private int lastWorldGenTickDelta = 0; public void serverTickEvent() { - if (SharedApi.currentWorld instanceof IServerWorld) { - IServerWorld serverWorld = (IServerWorld) SharedApi.currentWorld; + if (SharedApi.currentWorld instanceof IDhServerWorld) { + IDhServerWorld serverWorld = (IDhServerWorld) SharedApi.currentWorld; serverWorld.serverTick(); lastWorldGenTickDelta--; if (lastWorldGenTickDelta <= 0) { @@ -117,7 +117,7 @@ public class ServerApi @Deprecated public void serverSaveEvent() { if (ENABLE_EVENT_LOGGING) LOGGER.info("Server world {} saving", SharedApi.currentWorld); - if (SharedApi.currentWorld instanceof IServerWorld) + if (SharedApi.currentWorld instanceof IDhServerWorld) { SharedApi.currentWorld.saveAndFlush(); diff --git a/core/src/main/java/com/seibel/lod/core/util/RenderUtil.java b/core/src/main/java/com/seibel/lod/core/util/RenderUtil.java index 52a34ab17..dde05321d 100644 --- a/core/src/main/java/com/seibel/lod/core/util/RenderUtil.java +++ b/core/src/main/java/com/seibel/lod/core/util/RenderUtil.java @@ -21,7 +21,7 @@ package com.seibel.lod.core.util; import com.seibel.lod.core.level.IDhClientLevel; import com.seibel.lod.core.world.DhWorld; -import com.seibel.lod.core.world.IClientWorld; +import com.seibel.lod.core.world.IDhClientWorld; import com.seibel.lod.core.api.internal.SharedApi; import com.seibel.lod.core.config.Config; import com.seibel.lod.core.dependencyInjection.SingletonInjector; @@ -213,7 +213,7 @@ public class RenderUtil if (dhWorld == null) return false; - if (!(SharedApi.currentWorld instanceof IClientWorld)) + if (!(SharedApi.currentWorld instanceof IDhClientWorld)) return false; // don't attempt to render server worlds //FIXME: Improve class hierarchy of DhWorld, IClientWorld, IServerWorld to fix all this hard casting diff --git a/core/src/main/java/com/seibel/lod/core/world/DhClientServerWorld.java b/core/src/main/java/com/seibel/lod/core/world/DhClientServerWorld.java index 9e0a0383a..5bae78615 100644 --- a/core/src/main/java/com/seibel/lod/core/world/DhClientServerWorld.java +++ b/core/src/main/java/com/seibel/lod/core/world/DhClientServerWorld.java @@ -16,7 +16,7 @@ import java.util.HashSet; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutorService; -public class DhClientServerWorld extends DhWorld implements IClientWorld, IServerWorld +public class DhClientServerWorld extends DhWorld implements IDhClientWorld, IDhServerWorld { private final HashMap levelObjMap; private final HashSet dhLevels; diff --git a/core/src/main/java/com/seibel/lod/core/world/DhClientWorld.java b/core/src/main/java/com/seibel/lod/core/world/DhClientWorld.java index 1c536c130..85086a43d 100644 --- a/core/src/main/java/com/seibel/lod/core/world/DhClientWorld.java +++ b/core/src/main/java/com/seibel/lod/core/world/DhClientWorld.java @@ -16,7 +16,7 @@ import java.util.Iterator; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutorService; -public class DhClientWorld extends DhWorld implements IClientWorld +public class DhClientWorld extends DhWorld implements IDhClientWorld { private final HashMap levels; public final ClientOnlySaveStructure saveStructure; diff --git a/core/src/main/java/com/seibel/lod/core/world/DhServerWorld.java b/core/src/main/java/com/seibel/lod/core/world/DhServerWorld.java index 0cc480e5f..858d47546 100644 --- a/core/src/main/java/com/seibel/lod/core/world/DhServerWorld.java +++ b/core/src/main/java/com/seibel/lod/core/world/DhServerWorld.java @@ -11,7 +11,7 @@ import java.io.File; import java.util.HashMap; import java.util.concurrent.CompletableFuture; -public class DhServerWorld extends DhWorld implements IServerWorld +public class DhServerWorld extends DhWorld implements IDhServerWorld { private final HashMap levels; public final LocalSaveStructure saveStructure; diff --git a/core/src/main/java/com/seibel/lod/core/world/IClientWorld.java b/core/src/main/java/com/seibel/lod/core/world/IDhClientWorld.java similarity index 64% rename from core/src/main/java/com/seibel/lod/core/world/IClientWorld.java rename to core/src/main/java/com/seibel/lod/core/world/IDhClientWorld.java index 20bc05bb6..9d64552ac 100644 --- a/core/src/main/java/com/seibel/lod/core/world/IClientWorld.java +++ b/core/src/main/java/com/seibel/lod/core/world/IDhClientWorld.java @@ -1,5 +1,6 @@ package com.seibel.lod.core.world; -public interface IClientWorld { +public interface IDhClientWorld +{ void clientTick(); } diff --git a/core/src/main/java/com/seibel/lod/core/world/IServerWorld.java b/core/src/main/java/com/seibel/lod/core/world/IDhServerWorld.java similarity index 71% rename from core/src/main/java/com/seibel/lod/core/world/IServerWorld.java rename to core/src/main/java/com/seibel/lod/core/world/IDhServerWorld.java index 630c510dc..995018ebc 100644 --- a/core/src/main/java/com/seibel/lod/core/world/IServerWorld.java +++ b/core/src/main/java/com/seibel/lod/core/world/IDhServerWorld.java @@ -1,6 +1,7 @@ package com.seibel.lod.core.world; -public interface IServerWorld { +public interface IDhServerWorld +{ void serverTick(); void doWorldGen(); }