From cddf27be45dda7139cb4f2a42be6b3f86fb3228e Mon Sep 17 00:00:00 2001 From: James Seibel Date: Mon, 31 Oct 2022 20:28:58 -0500 Subject: [PATCH] Rename DhWorld -> AbstractDhWorld and WorldEnv -> EWorldEnv --- .../com/seibel/lod/core/api/internal/ClientApi.java | 10 +++++----- .../com/seibel/lod/core/api/internal/SharedApi.java | 8 ++++---- .../main/java/com/seibel/lod/core/util/RenderUtil.java | 4 ++-- .../core/world/{DhWorld.java => AbstractDhWorld.java} | 7 ++++--- .../com/seibel/lod/core/world/DhClientServerWorld.java | 4 ++-- .../java/com/seibel/lod/core/world/DhClientWorld.java | 4 ++-- .../java/com/seibel/lod/core/world/DhServerWorld.java | 4 ++-- .../{WorldEnvironment.java => EWorldEnvironment.java} | 3 ++- 8 files changed, 23 insertions(+), 21 deletions(-) rename core/src/main/java/com/seibel/lod/core/world/{DhWorld.java => AbstractDhWorld.java} (82%) rename core/src/main/java/com/seibel/lod/core/world/{WorldEnvironment.java => EWorldEnvironment.java} (73%) 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 2dcd27b15..6e4aec89e 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 @@ -37,9 +37,9 @@ import com.seibel.lod.core.render.glObject.GLProxy; 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.AbstractDhWorld; import com.seibel.lod.core.world.IDhClientWorld; -import com.seibel.lod.core.world.WorldEnvironment; +import com.seibel.lod.core.world.EWorldEnvironment; import com.seibel.lod.core.wrapperInterfaces.chunk.IChunkWrapper; import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper; import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper; @@ -138,7 +138,7 @@ public class ClientApi public void clientChunkLoadEvent(IChunkWrapper chunk, IClientLevelWrapper level) { - if (SharedApi.getEnvironment() == WorldEnvironment.Client_Only) + if (SharedApi.getEnvironment() == EWorldEnvironment.Client_Only) { IDhLevel dhLevel = SharedApi.currentWorld.getLevel(level); if (dhLevel != null) @@ -150,7 +150,7 @@ public class ClientApi public void clientChunkSaveEvent(IChunkWrapper chunk, IClientLevelWrapper level) { - if (SharedApi.getEnvironment() == WorldEnvironment.Client_Only) + if (SharedApi.getEnvironment() == EWorldEnvironment.Client_Only) { //TODO: Implement @@ -251,7 +251,7 @@ public class ClientApi //FIXME: Improve class hierarchy of DhWorld, IClientWorld, IServerWorld to fix all this hard casting // (also in RenderUtil) - DhWorld dhWorld = SharedApi.currentWorld; + AbstractDhWorld dhWorld = SharedApi.currentWorld; IDhClientLevel level = (IDhClientLevel) dhWorld.getOrLoadLevel(levelWrapper); if (prefLoggerEnabled) diff --git a/core/src/main/java/com/seibel/lod/core/api/internal/SharedApi.java b/core/src/main/java/com/seibel/lod/core/api/internal/SharedApi.java index dadce5712..daaf53a5c 100644 --- a/core/src/main/java/com/seibel/lod/core/api/internal/SharedApi.java +++ b/core/src/main/java/com/seibel/lod/core/api/internal/SharedApi.java @@ -1,15 +1,15 @@ package com.seibel.lod.core.api.internal; import com.seibel.lod.core.Initializer; -import com.seibel.lod.core.world.WorldEnvironment; -import com.seibel.lod.core.world.DhWorld; +import com.seibel.lod.core.world.EWorldEnvironment; +import com.seibel.lod.core.world.AbstractDhWorld; import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftSharedWrapper; public class SharedApi { public static IMinecraftSharedWrapper MC; - public static DhWorld currentWorld; - public static WorldEnvironment getEnvironment() { return currentWorld==null ? null : currentWorld.environment; } + public static AbstractDhWorld currentWorld; + public static EWorldEnvironment getEnvironment() { return currentWorld==null ? null : currentWorld.environment; } public static void init() { Initializer.init(); } 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 dde05321d..79420e6d3 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 @@ -20,7 +20,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.AbstractDhWorld; import com.seibel.lod.core.world.IDhClientWorld; import com.seibel.lod.core.api.internal.SharedApi; import com.seibel.lod.core.config.Config; @@ -209,7 +209,7 @@ public class RenderUtil if (levelWrapper == null) return false; - DhWorld dhWorld = SharedApi.currentWorld; + AbstractDhWorld dhWorld = SharedApi.currentWorld; if (dhWorld == null) return false; diff --git a/core/src/main/java/com/seibel/lod/core/world/DhWorld.java b/core/src/main/java/com/seibel/lod/core/world/AbstractDhWorld.java similarity index 82% rename from core/src/main/java/com/seibel/lod/core/world/DhWorld.java rename to core/src/main/java/com/seibel/lod/core/world/AbstractDhWorld.java index 8fb206b6c..8c94d8f36 100644 --- a/core/src/main/java/com/seibel/lod/core/world/DhWorld.java +++ b/core/src/main/java/com/seibel/lod/core/world/AbstractDhWorld.java @@ -8,13 +8,13 @@ import org.apache.logging.log4j.Logger; import java.io.Closeable; import java.util.concurrent.CompletableFuture; -public abstract class DhWorld implements Closeable +public abstract class AbstractDhWorld implements Closeable { protected static final Logger LOGGER = DhLoggerBuilder.getLogger(); - public final WorldEnvironment environment; + public final EWorldEnvironment environment; - protected DhWorld(WorldEnvironment environment) { + protected AbstractDhWorld(EWorldEnvironment environment) { this.environment = environment; } public abstract IDhLevel getOrLoadLevel(ILevelWrapper wrapper); @@ -27,4 +27,5 @@ public abstract class DhWorld implements Closeable @Override public abstract void close(); + } 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 5bae78615..0250fb5c3 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 IDhClientWorld, IDhServerWorld +public class DhClientServerWorld extends AbstractDhWorld implements IDhClientWorld, IDhServerWorld { private final HashMap levelObjMap; private final HashSet dhLevels; @@ -26,7 +26,7 @@ public class DhClientServerWorld extends DhWorld implements IDhClientWorld, IDhS public F3Screen.DynamicMessage f3Msg; public DhClientServerWorld() { - super(WorldEnvironment.Client_Server); + super(EWorldEnvironment.Client_Server); saveStructure = new LocalSaveStructure(); levelObjMap = new HashMap<>(); dhLevels = new HashSet<>(); 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 85086a43d..f0f3d3279 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 IDhClientWorld +public class DhClientWorld extends AbstractDhWorld implements IDhClientWorld { private final HashMap levels; public final ClientOnlySaveStructure saveStructure; @@ -24,7 +24,7 @@ public class DhClientWorld extends DhWorld implements IDhClientWorld public EventLoop eventLoop = new EventLoop(dhTickerThread, this::_clientTick); public DhClientWorld() { - super(WorldEnvironment.Client_Only); + super(EWorldEnvironment.Client_Only); saveStructure = new ClientOnlySaveStructure(); levels = new HashMap<>(); LOGGER.info("Started DhWorld of type {}", environment); 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 858d47546..b2381de7a 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,13 +11,13 @@ import java.io.File; import java.util.HashMap; import java.util.concurrent.CompletableFuture; -public class DhServerWorld extends DhWorld implements IDhServerWorld +public class DhServerWorld extends AbstractDhWorld implements IDhServerWorld { private final HashMap levels; public final LocalSaveStructure saveStructure; public DhServerWorld() { - super(WorldEnvironment.Server_Only); + super(EWorldEnvironment.Server_Only); saveStructure = new LocalSaveStructure(); levels = new HashMap<>(); LOGGER.info("Started DhWorld of type {}", environment); diff --git a/core/src/main/java/com/seibel/lod/core/world/WorldEnvironment.java b/core/src/main/java/com/seibel/lod/core/world/EWorldEnvironment.java similarity index 73% rename from core/src/main/java/com/seibel/lod/core/world/WorldEnvironment.java rename to core/src/main/java/com/seibel/lod/core/world/EWorldEnvironment.java index 2a01962ae..ebb7dc2ca 100644 --- a/core/src/main/java/com/seibel/lod/core/world/WorldEnvironment.java +++ b/core/src/main/java/com/seibel/lod/core/world/EWorldEnvironment.java @@ -1,6 +1,7 @@ package com.seibel.lod.core.world; -public enum WorldEnvironment { +public enum EWorldEnvironment +{ Client_Only, Client_Server, Server_Only