diff --git a/src/main/java/com/seibel/lod/core/api/external/apiObjects/enums/EDhApiRendererType.java b/src/main/java/com/seibel/lod/core/api/external/apiObjects/enums/EDhApiRendererMode.java similarity index 97% rename from src/main/java/com/seibel/lod/core/api/external/apiObjects/enums/EDhApiRendererType.java rename to src/main/java/com/seibel/lod/core/api/external/apiObjects/enums/EDhApiRendererMode.java index 005b26457..6e284eb46 100644 --- a/src/main/java/com/seibel/lod/core/api/external/apiObjects/enums/EDhApiRendererType.java +++ b/src/main/java/com/seibel/lod/core/api/external/apiObjects/enums/EDhApiRendererMode.java @@ -26,7 +26,7 @@ package com.seibel.lod.core.api.external.apiObjects.enums; * * @version 2022-6-2 */ -public enum EDhApiRendererType +public enum EDhApiRendererMode { // Reminder: // when adding items up the API minor version diff --git a/src/main/java/com/seibel/lod/core/api/internal/a7/ClientApi.java b/src/main/java/com/seibel/lod/core/api/internal/a7/ClientApi.java index 3e2ed43aa..72359aafc 100644 --- a/src/main/java/com/seibel/lod/core/api/internal/a7/ClientApi.java +++ b/src/main/java/com/seibel/lod/core/api/internal/a7/ClientApi.java @@ -24,7 +24,7 @@ import com.seibel.lod.core.a7.world.*; import com.seibel.lod.core.config.Config; import com.seibel.lod.core.ModInfo; import com.seibel.lod.core.enums.rendering.EDebugMode; -import com.seibel.lod.core.enums.rendering.ERendererType; +import com.seibel.lod.core.enums.rendering.ERendererMode; import com.seibel.lod.core.handlers.dependencyInjection.SingletonHandler; import com.seibel.lod.core.logging.ConfigBasedLogger; import com.seibel.lod.core.logging.ConfigBasedSpamLogger; @@ -198,7 +198,7 @@ public class ClientApi level.dumpRamUsage(); } - if (Config.Client.Advanced.Debugging.rendererType.get() == ERendererType.DEFAULT) { + if (Config.Client.Advanced.Debugging.rendererMode.get() == ERendererMode.DEFAULT) { if (MC_RENDER.playerHasBlindnessEffect()) { // if the player is blind, don't render LODs, // and don't change minecraft's fog @@ -224,7 +224,7 @@ public class ClientApi } } profiler.pop(); // "Render-Lods" - } else if (Config.Client.Advanced.Debugging.rendererType.get() == ERendererType.DEBUG) { + } else if (Config.Client.Advanced.Debugging.rendererMode.get() == ERendererMode.DEBUG) { profiler.push("Render-Test"); try { ClientApi.testRenderer.render(); @@ -280,8 +280,8 @@ public class ClientApi } if (glfwKey == GLFW.GLFW_KEY_F6) { - Config.Client.Advanced.Debugging.rendererType.set(ERendererType.next(Config.Client.Advanced.Debugging.rendererType.get())); - MC.sendChatMessage("F6: Set rendering to " + Config.Client.Advanced.Debugging.rendererType.get()); + Config.Client.Advanced.Debugging.rendererMode.set(ERendererMode.next(Config.Client.Advanced.Debugging.rendererMode.get())); + MC.sendChatMessage("F6: Set rendering to " + Config.Client.Advanced.Debugging.rendererMode.get()); } if (glfwKey == GLFW.GLFW_KEY_P) { diff --git a/src/main/java/com/seibel/lod/core/config/Config.java b/src/main/java/com/seibel/lod/core/config/Config.java index a85f1ad1c..e41ed1001 100644 --- a/src/main/java/com/seibel/lod/core/config/Config.java +++ b/src/main/java/com/seibel/lod/core/config/Config.java @@ -23,7 +23,7 @@ package com.seibel.lod.core.config; import com.seibel.lod.core.enums.rendering.EFogDrawMode; import com.seibel.lod.core.enums.rendering.EFogColorMode; import com.seibel.lod.core.enums.rendering.EFogDistance; -import com.seibel.lod.core.enums.rendering.ERendererType; +import com.seibel.lod.core.enums.rendering.ERendererMode; import com.seibel.lod.core.config.types.*; import com.seibel.lod.core.enums.config.*; @@ -732,14 +732,14 @@ public class Config public static class Debugging { - public static ConfigEntry rendererType = new ConfigEntry.Builder() - .set(ERendererType.DEFAULT) + public static ConfigEntry rendererMode = new ConfigEntry.Builder() + .set(ERendererMode.DEFAULT) .comment("" + "What renderer is active? \n" + "\n" - + ERendererType.DEFAULT + ": Default lod renderer \n" - + ERendererType.DEBUG + ": Debug testing renderer \n" - + ERendererType.DISABLED + ": Disable rendering") + + ERendererMode.DEFAULT + ": Default lod renderer \n" + + ERendererMode.DEBUG + ": Debug testing renderer \n" + + ERendererMode.DISABLED + ": Disable rendering") .build(); public static ConfigEntry debugMode = new ConfigEntry.Builder() diff --git a/src/main/java/com/seibel/lod/core/enums/rendering/ERendererType.java b/src/main/java/com/seibel/lod/core/enums/rendering/ERendererMode.java similarity index 91% rename from src/main/java/com/seibel/lod/core/enums/rendering/ERendererType.java rename to src/main/java/com/seibel/lod/core/enums/rendering/ERendererMode.java index b1efbfb58..c6dc73ca3 100644 --- a/src/main/java/com/seibel/lod/core/enums/rendering/ERendererType.java +++ b/src/main/java/com/seibel/lod/core/enums/rendering/ERendererMode.java @@ -26,7 +26,7 @@ package com.seibel.lod.core.enums.rendering; * * @version 2022-6-2 */ -public enum ERendererType +public enum ERendererMode { // Reminder: // when adding items up the API minor version @@ -39,7 +39,7 @@ public enum ERendererType /** Used by the config GUI to cycle through the available rendering options */ - public static ERendererType next(ERendererType type) + public static ERendererMode next(ERendererMode type) { switch (type) { @@ -50,7 +50,7 @@ public enum ERendererType } /** Used by the config GUI to cycle through the available rendering options */ - public static ERendererType previous(ERendererType type) + public static ERendererMode previous(ERendererMode type) { switch (type) { diff --git a/src/main/java/com/seibel/lod/core/wrapperInterfaces/config/ILodConfigWrapperSingleton.java b/src/main/java/com/seibel/lod/core/wrapperInterfaces/config/ILodConfigWrapperSingleton.java index edb6a2b3f..735d21e81 100644 --- a/src/main/java/com/seibel/lod/core/wrapperInterfaces/config/ILodConfigWrapperSingleton.java +++ b/src/main/java/com/seibel/lod/core/wrapperInterfaces/config/ILodConfigWrapperSingleton.java @@ -23,7 +23,7 @@ import com.seibel.lod.core.config.Config; import com.seibel.lod.core.enums.rendering.EFogDrawMode; import com.seibel.lod.core.enums.rendering.EFogColorMode; import com.seibel.lod.core.enums.rendering.EFogDistance; -import com.seibel.lod.core.enums.rendering.ERendererType; +import com.seibel.lod.core.enums.rendering.ERendererMode; import com.seibel.lod.core.enums.config.*; import com.seibel.lod.core.enums.rendering.*; import com.seibel.lod.core.handlers.dependencyInjection.IBindable; @@ -311,8 +311,8 @@ public interface ILodConfigWrapperSingleton extends IBindable @Deprecated interface IDebugging { - ERendererType getRendererType(); - void setRendererType(ERendererType newRendererType); + ERendererMode getRendererType(); + void setRendererType(ERendererMode newRendererType); EDebugMode getDebugMode(); void setDebugMode(EDebugMode newDebugMode); diff --git a/src/main/java/com/seibel/lod/core/wrapperInterfaces/config/LodConfigWrapperSingleton.java b/src/main/java/com/seibel/lod/core/wrapperInterfaces/config/LodConfigWrapperSingleton.java index f3d1ecfe2..da39cd971 100644 --- a/src/main/java/com/seibel/lod/core/wrapperInterfaces/config/LodConfigWrapperSingleton.java +++ b/src/main/java/com/seibel/lod/core/wrapperInterfaces/config/LodConfigWrapperSingleton.java @@ -3,7 +3,7 @@ package com.seibel.lod.core.wrapperInterfaces.config; import com.seibel.lod.core.enums.rendering.EFogDrawMode; import com.seibel.lod.core.enums.rendering.EFogColorMode; import com.seibel.lod.core.enums.rendering.EFogDistance; -import com.seibel.lod.core.enums.rendering.ERendererType; +import com.seibel.lod.core.enums.rendering.ERendererMode; import com.seibel.lod.core.config.Config; import com.seibel.lod.core.enums.config.*; import com.seibel.lod.core.enums.rendering.*; @@ -729,12 +729,12 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton * DISABLED * */ @Override - public ERendererType getRendererType() { - return Config.Client.Advanced.Debugging.rendererType.get(); + public ERendererMode getRendererType() { + return Config.Client.Advanced.Debugging.rendererMode.get(); } @Override - public void setRendererType(ERendererType newRenderType) { - Config.Client.Advanced.Debugging.rendererType.set(newRenderType); + public void setRendererType(ERendererMode newRenderType) { + Config.Client.Advanced.Debugging.rendererMode.set(newRenderType); } @Override