From 55f39996cbd2f0aa4e4b30166e445acff00c77ee Mon Sep 17 00:00:00 2001 From: Cailin Smith Date: Sun, 2 Jul 2023 22:34:47 +0200 Subject: [PATCH] Rename class --- .../core/api/internal/ClientApi.java | 17 ++++++++--------- ...Manager.java => IEnhancedServerManager.java} | 2 +- 2 files changed, 9 insertions(+), 10 deletions(-) rename core/src/main/java/com/seibel/distanthorizons/core/level/{IServerEnhancedManager.java => IEnhancedServerManager.java} (93%) diff --git a/core/src/main/java/com/seibel/distanthorizons/core/api/internal/ClientApi.java b/core/src/main/java/com/seibel/distanthorizons/core/api/internal/ClientApi.java index a0695cbb3..aeabb36c8 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/api/internal/ClientApi.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/api/internal/ClientApi.java @@ -22,10 +22,9 @@ package com.seibel.distanthorizons.core.api.internal; import com.seibel.distanthorizons.api.methods.events.abstractEvents.*; import com.seibel.distanthorizons.api.methods.events.sharedParameterObjects.DhApiRenderParam; import com.seibel.distanthorizons.core.level.IServerEnhancedClientLevel; -import com.seibel.distanthorizons.core.level.IServerEnhancedManager; +import com.seibel.distanthorizons.core.level.IEnhancedServerManager; import com.seibel.distanthorizons.core.world.*; import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IFriendlyByteBuf; -import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper; import com.seibel.distanthorizons.coreapi.DependencyInjection.ApiEventInjector; import com.seibel.distanthorizons.core.level.IDhClientLevel; import com.seibel.distanthorizons.core.config.Config; @@ -71,8 +70,8 @@ public class ClientApi public static TestRenderer testRenderer = new TestRenderer(); private static final IMinecraftClientWrapper MC = SingletonInjector.INSTANCE.get(IMinecraftClientWrapper.class); private static final IMinecraftRenderWrapper MC_RENDER = SingletonInjector.INSTANCE.get(IMinecraftRenderWrapper.class); - private static final IServerEnhancedManager SERVER_ENHANCED_MANAGER - = SingletonInjector.INSTANCE.get(IServerEnhancedManager.class); + private static final IEnhancedServerManager ENHANCED_SERVER_MANAGER + = SingletonInjector.INSTANCE.get(IEnhancedServerManager.class); public static final long SPAM_LOGGER_FLUSH_NS = TimeUnit.NANOSECONDS.convert(1, TimeUnit.SECONDS); @@ -132,8 +131,8 @@ public class ClientApi } this.isServerCommunicationEnabled = false; this.serverIsMalformed = false; - SERVER_ENHANCED_MANAGER.setUseOverrideWrapper(false); - SERVER_ENHANCED_MANAGER.registerServerEnhancedLevel(null); + ENHANCED_SERVER_MANAGER.setUseOverrideWrapper(false); + ENHANCED_SERVER_MANAGER.registerServerEnhancedLevel(null); } } @@ -277,7 +276,7 @@ public class ClientApi case "ServerCommsEnabled": LOGGER.info("Server supports DH protocol."); ClientApi.INSTANCE.isServerCommunicationEnabled = true; - SERVER_ENHANCED_MANAGER.setUseOverrideWrapper(true); + ENHANCED_SERVER_MANAGER.setUseOverrideWrapper(true); MC.execute(() -> { // Go ahead and unload the current world, because it may be wrong. We expect // a followup WorldChanged event from the server soon anyways. @@ -304,8 +303,8 @@ public class ClientApi clientLevelUnloadEvent((IClientLevelWrapper) MC.getWrappedClientWorld()); } IServerEnhancedClientLevel clientLevel - = SERVER_ENHANCED_MANAGER.getServerEnhancedLevel(MC.getWrappedClientWorld(), worldKey); - SERVER_ENHANCED_MANAGER.registerServerEnhancedLevel(clientLevel); + = ENHANCED_SERVER_MANAGER.getServerEnhancedLevel(MC.getWrappedClientWorld(), worldKey); + ENHANCED_SERVER_MANAGER.registerServerEnhancedLevel(clientLevel); serverLevelLoadEvent(clientLevel); }); break; diff --git a/core/src/main/java/com/seibel/distanthorizons/core/level/IServerEnhancedManager.java b/core/src/main/java/com/seibel/distanthorizons/core/level/IEnhancedServerManager.java similarity index 93% rename from core/src/main/java/com/seibel/distanthorizons/core/level/IServerEnhancedManager.java rename to core/src/main/java/com/seibel/distanthorizons/core/level/IEnhancedServerManager.java index bd252e959..b24cdaf5b 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/level/IServerEnhancedManager.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/level/IEnhancedServerManager.java @@ -3,7 +3,7 @@ package com.seibel.distanthorizons.core.level; import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper; import com.seibel.distanthorizons.coreapi.interfaces.dependencyInjection.IBindable; -public interface IServerEnhancedManager extends IBindable { +public interface IEnhancedServerManager extends IBindable { /** * Called when a client level is wrapped by a ServerEnhancedClientLevel, for integration into mod internals. * @param clientLevel