From b75eebd0dc49f4ce7e172480bf1d4300f9c2815d Mon Sep 17 00:00:00 2001 From: coolGi2007 Date: Sun, 13 Feb 2022 14:48:56 +1030 Subject: [PATCH] Getting more stuff ready for new config --- .../com/seibel/lod/common/LodCommonMain.java | 7 +- .../common/{Config.java => OldConfig.java} | 2 +- .../config/LodConfigWrapperSingleton.java | 52 +- .../config/NewLodConfigWrapperSingleton.java | 505 ++++++++++++++++++ core | 2 +- .../lod/fabric/wrappers/DependencySetup.java | 7 +- .../forge/wrappers/ForgeDependencySetup.java | 7 +- 7 files changed, 551 insertions(+), 31 deletions(-) rename common/src/main/java/com/seibel/lod/common/{Config.java => OldConfig.java} (99%) create mode 100644 common/src/main/java/com/seibel/lod/common/wrappers/config/NewLodConfigWrapperSingleton.java diff --git a/common/src/main/java/com/seibel/lod/common/LodCommonMain.java b/common/src/main/java/com/seibel/lod/common/LodCommonMain.java index 4b10fea4d..da3cd4c8d 100644 --- a/common/src/main/java/com/seibel/lod/common/LodCommonMain.java +++ b/common/src/main/java/com/seibel/lod/common/LodCommonMain.java @@ -4,6 +4,8 @@ import com.seibel.lod.common.forge.LodForgeMethodCaller; import com.seibel.lod.common.networking.NetworkInterface; import com.seibel.lod.common.wrappers.DependencySetup; import com.seibel.lod.common.wrappers.config.ConfigGui; +import com.seibel.lod.core.Config; +import com.seibel.lod.core.config.ConfigBase; /** * This is the common main class @@ -15,6 +17,8 @@ public class LodCommonMain { public static LodForgeMethodCaller forgeMethodCaller; public static NetworkInterface networkInterface; + public static final boolean IsNewConfig = false; + public static void startup(LodForgeMethodCaller caller, boolean serverSided) { LodCommonMain.serverSided = serverSided; if (caller != null) { @@ -27,7 +31,8 @@ public class LodCommonMain { public static void initConfig() { - ConfigGui.init(Config.class); + if (!IsNewConfig) + ConfigGui.init(OldConfig.class); } public static void registerNetworking(NetworkInterface networkInterface) { diff --git a/common/src/main/java/com/seibel/lod/common/Config.java b/common/src/main/java/com/seibel/lod/common/OldConfig.java similarity index 99% rename from common/src/main/java/com/seibel/lod/common/Config.java rename to common/src/main/java/com/seibel/lod/common/OldConfig.java index efe772252..33c3ddf61 100644 --- a/common/src/main/java/com/seibel/lod/common/Config.java +++ b/common/src/main/java/com/seibel/lod/common/OldConfig.java @@ -33,7 +33,7 @@ import com.seibel.lod.core.wrapperInterfaces.config.ILodConfigWrapperSingleton.I * @author coolGi2007 * @version 12-12-2021 */ -public class Config extends ConfigGui +public class OldConfig //public class Config extends TinyConfig { // CONFIG STRUCTURE diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/config/LodConfigWrapperSingleton.java b/common/src/main/java/com/seibel/lod/common/wrappers/config/LodConfigWrapperSingleton.java index f9993c7d6..c72e4cef8 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/config/LodConfigWrapperSingleton.java +++ b/common/src/main/java/com/seibel/lod/common/wrappers/config/LodConfigWrapperSingleton.java @@ -3,7 +3,7 @@ package com.seibel.lod.common.wrappers.config; import com.seibel.lod.core.enums.config.*; import com.seibel.lod.core.enums.rendering.*; import com.seibel.lod.core.wrapperInterfaces.config.ILodConfigWrapperSingleton; -import com.seibel.lod.common.Config; +import com.seibel.lod.common.OldConfig; /** * This holds the config defaults and setters/getters @@ -53,7 +53,7 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton @Override public boolean getOptionsButton() { - return Config.optionsButton; + return OldConfig.optionsButton; } @Override public void setOptionsButton(boolean newOptionsButton) @@ -117,7 +117,7 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton @Override public HorizontalResolution getDrawResolution() { - return Config.Client.Graphics.Quality.drawResolution; + return OldConfig.Client.Graphics.Quality.drawResolution; } @Override public void setDrawResolution(HorizontalResolution newHorizontalResolution) @@ -130,7 +130,7 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton @Override public int getLodChunkRenderDistance() { - return Config.Client.Graphics.Quality.lodChunkRenderDistance; + return OldConfig.Client.Graphics.Quality.lodChunkRenderDistance; } @Override public void setLodChunkRenderDistance(int newLodChunkRenderDistance) @@ -143,7 +143,7 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton @Override public VerticalQuality getVerticalQuality() { - return Config.Client.Graphics.Quality.verticalQuality; + return OldConfig.Client.Graphics.Quality.verticalQuality; } @Override public void setVerticalQuality(VerticalQuality newVerticalQuality) @@ -156,7 +156,7 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton @Override public int getHorizontalScale() { - return Config.Client.Graphics.Quality.horizontalScale; + return OldConfig.Client.Graphics.Quality.horizontalScale; } @Override public void setHorizontalScale(int newHorizontalScale) @@ -169,7 +169,7 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton @Override public HorizontalQuality getHorizontalQuality() { - return Config.Client.Graphics.Quality.horizontalQuality; + return OldConfig.Client.Graphics.Quality.horizontalQuality; } @Override public void setHorizontalQuality(HorizontalQuality newHorizontalQuality) @@ -180,7 +180,7 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton @Override public DropoffQuality getDropoffQuality() { - return Config.Client.Graphics.Quality.dropoffQuality; + return OldConfig.Client.Graphics.Quality.dropoffQuality; } @Override public void setDropoffQuality(DropoffQuality newDropoffQuality) { @@ -195,7 +195,7 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton @Override public FogDistance getFogDistance() { - return Config.Client.Graphics.FogQuality.fogDistance; + return OldConfig.Client.Graphics.FogQuality.fogDistance; } @Override public void setFogDistance(FogDistance newFogDistance) @@ -208,7 +208,7 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton @Override public FogDrawMode getFogDrawMode() { - return Config.Client.Graphics.FogQuality.fogDrawMode; + return OldConfig.Client.Graphics.FogQuality.fogDrawMode; } @Override @@ -222,7 +222,7 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton @Override public FogColorMode getFogColorMode() { - return Config.Client.Graphics.FogQuality.fogColorMode; + return OldConfig.Client.Graphics.FogQuality.fogColorMode; } @Override @@ -236,7 +236,7 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton @Override public boolean getDisableVanillaFog() { - return Config.Client.Graphics.FogQuality.disableVanillaFog; + return OldConfig.Client.Graphics.FogQuality.disableVanillaFog; } @Override public void setDisableVanillaFog(boolean newDisableVanillaFog) @@ -252,7 +252,7 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton @Override public boolean getDisableDirectionalCulling() { - return Config.Client.Graphics.AdvancedGraphics.disableDirectionalCulling; + return OldConfig.Client.Graphics.AdvancedGraphics.disableDirectionalCulling; } @Override public void setDisableDirectionalCulling(boolean newDisableDirectionalCulling) @@ -265,7 +265,7 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton @Override public VanillaOverdraw getVanillaOverdraw() { - return Config.Client.Graphics.AdvancedGraphics.vanillaOverdraw; + return OldConfig.Client.Graphics.AdvancedGraphics.vanillaOverdraw; } @Override public void setVanillaOverdraw(VanillaOverdraw newVanillaOverdraw) @@ -277,7 +277,7 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton @Override public int getBacksideCullingRange() { - return Config.Client.Graphics.AdvancedGraphics.backsideCullingRange; + return OldConfig.Client.Graphics.AdvancedGraphics.backsideCullingRange; } @Override public void setBacksideCullingRange(int newBacksideCullingRange) @@ -289,7 +289,7 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton @Override public boolean getUseExtendedNearClipPlane() { - return Config.Client.Graphics.AdvancedGraphics.useExtendedNearClipPlane; + return OldConfig.Client.Graphics.AdvancedGraphics.useExtendedNearClipPlane; } @Override public void setUseExtendedNearClipPlane(boolean newUseExtendedNearClipPlane) @@ -311,7 +311,7 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton @Override public GenerationPriority getGenerationPriority() { - return Config.Client.WorldGenerator.generationPriority; + return OldConfig.Client.WorldGenerator.generationPriority; } @Override public void setGenerationPriority(GenerationPriority newGenerationPriority) @@ -324,7 +324,7 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton @Override public DistanceGenerationMode getDistanceGenerationMode() { - return Config.Client.WorldGenerator.distanceGenerationMode; + return OldConfig.Client.WorldGenerator.distanceGenerationMode; } @Override public void setDistanceGenerationMode(DistanceGenerationMode newDistanceGenerationMode) @@ -337,7 +337,7 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton @Override public boolean getAllowUnstableFeatureGeneration() { - return Config.Client.WorldGenerator.allowUnstableFeatureGeneration; + return OldConfig.Client.WorldGenerator.allowUnstableFeatureGeneration; } @Override public void setAllowUnstableFeatureGeneration(boolean newAllowUnstableFeatureGeneration) @@ -350,7 +350,7 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton @Override public BlocksToAvoid getBlocksToAvoid() { - return Config.Client.WorldGenerator.blocksToAvoid; + return OldConfig.Client.WorldGenerator.blocksToAvoid; } @Override public void setBlockToAvoid(BlocksToAvoid newBlockToAvoid) @@ -372,7 +372,7 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton @Override public LightGenerationMode getLightGenerationMode() { - return Config.Client.WorldGenerator.lightGenerationMode; + return OldConfig.Client.WorldGenerator.lightGenerationMode; } @Override public void setLightGenerationMode(LightGenerationMode newLightGenerationMode) @@ -428,7 +428,7 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton @Override public int getNumberOfWorldGenerationThreads() { - return Config.Client.Advanced.Threading.numberOfWorldGenerationThreads; + return OldConfig.Client.Advanced.Threading.numberOfWorldGenerationThreads; } @Override public void setNumberOfWorldGenerationThreads(int newNumberOfWorldGenerationThreads) @@ -441,7 +441,7 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton @Override public int getNumberOfBufferBuilderThreads() { - return Config.Client.Advanced.Threading.numberOfBufferBuilderThreads; + return OldConfig.Client.Advanced.Threading.numberOfBufferBuilderThreads; } @Override public void setNumberOfBufferBuilderThreads(int newNumberOfWorldBuilderThreads) @@ -505,7 +505,7 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton @Override public GpuUploadMethod getGpuUploadMethod() { - return Config.Client.Advanced.Buffers.gpuUploadMethod; + return OldConfig.Client.Advanced.Buffers.gpuUploadMethod; } @Override public void setGpuUploadMethod(GpuUploadMethod newDisableVanillaFog) @@ -518,7 +518,7 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton @Override public int getGpuUploadPerMegabyteInMilliseconds() { - return Config.Client.Advanced.Buffers.gpuUploadPerMegabyteInMilliseconds; + return OldConfig.Client.Advanced.Buffers.gpuUploadPerMegabyteInMilliseconds; } @Override public void setGpuUploadPerMegabyteInMilliseconds(int newMilliseconds) { @@ -530,7 +530,7 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton @Override public BufferRebuildTimes getRebuildTimes() { - return Config.Client.Advanced.Buffers.rebuildTimes; + return OldConfig.Client.Advanced.Buffers.rebuildTimes; } @Override public void setRebuildTimes(BufferRebuildTimes newBufferRebuildTimes) diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/config/NewLodConfigWrapperSingleton.java b/common/src/main/java/com/seibel/lod/common/wrappers/config/NewLodConfigWrapperSingleton.java new file mode 100644 index 000000000..d7112ef78 --- /dev/null +++ b/common/src/main/java/com/seibel/lod/common/wrappers/config/NewLodConfigWrapperSingleton.java @@ -0,0 +1,505 @@ +package com.seibel.lod.common.wrappers.config; + +import com.seibel.lod.core.enums.config.*; +import com.seibel.lod.core.enums.rendering.*; +import com.seibel.lod.core.wrapperInterfaces.config.ILodConfigWrapperSingleton; +import com.seibel.lod.core.Config; + +/** + * This is temporary for testing the new config + * + * @author coolGi2007 + * @version 02-13-2022 + */ +public class NewLodConfigWrapperSingleton implements ILodConfigWrapperSingleton +{ + public static final NewLodConfigWrapperSingleton INSTANCE = new NewLodConfigWrapperSingleton(); + + + private static final Client client = new Client(); + @Override + public IClient client() + { + return client; + } + + public static class Client implements IClient + { + public final IGraphics graphics; + public final IWorldGenerator worldGenerator; + public final IAdvanced advanced; + + + @Override + public IGraphics graphics() + { + return graphics; + } + + @Override + public IWorldGenerator worldGenerator() + { + return worldGenerator; + } + + @Override + public IAdvanced advanced() + { + return advanced; + } + + + @Override + public boolean getOptionsButton() + { + return Config.client.optionsButton.get(); + } + @Override + public void setOptionsButton(boolean newOptionsButton) + { + Config.client.optionsButton.set(newOptionsButton); + } + + + //================// + // Client Configs // + //================// + public Client() + { + graphics = new Graphics(); + worldGenerator = new WorldGenerator(); + advanced = new Advanced(); + } + + + //==================// + // Graphics Configs // + //==================// + public static class Graphics implements IGraphics + { + public final IQuality quality; + public final IFogQuality fogQuality; + public final IAdvancedGraphics advancedGraphics; + + + + @Override + public IQuality quality() + { + return quality; + } + + @Override + public IFogQuality fogQuality() + { + return fogQuality; + } + + @Override + public IAdvancedGraphics advancedGraphics() + { + return advancedGraphics; + } + + + Graphics() + { + quality = new Quality(); + fogQuality = new FogQuality(); + advancedGraphics = new AdvancedGraphics(); + } + + + public static class Quality implements IQuality + { + @Override + public HorizontalResolution getDrawResolution() + { + return Config.Client.Graphics.Quality.drawResolution.get(); + } + @Override + public void setDrawResolution(HorizontalResolution newHorizontalResolution) + { + Config.Client.Graphics.Quality.drawResolution.set(newHorizontalResolution); + } + + + @Override + public int getLodChunkRenderDistance() + { + return Config.Client.Graphics.Quality.lodChunkRenderDistance.get(); + } + @Override + public void setLodChunkRenderDistance(int newLodChunkRenderDistance) + { + Config.Client.Graphics.Quality.lodChunkRenderDistance.set(newLodChunkRenderDistance); + } + + + @Override + public VerticalQuality getVerticalQuality() + { + return Config.Client.Graphics.Quality.verticalQuality.get(); + } + @Override + public void setVerticalQuality(VerticalQuality newVerticalQuality) + { + Config.Client.Graphics.Quality.verticalQuality.set(newVerticalQuality); + } + + + @Override + public int getHorizontalScale() + { + return Config.Client.Graphics.Quality.horizontalScale.get(); + } + @Override + public void setHorizontalScale(int newHorizontalScale) + { + Config.Client.Graphics.Quality.horizontalScale.set(newHorizontalScale); + } + + + @Override + public HorizontalQuality getHorizontalQuality() + { + return Config.Client.Graphics.Quality.horizontalQuality.get(); + } + @Override + public void setHorizontalQuality(HorizontalQuality newHorizontalQuality) + { + Config.Client.Graphics.Quality.horizontalQuality.set(newHorizontalQuality); + } + + @Override + public DropoffQuality getDropoffQuality() { + return Config.Client.Graphics.Quality.dropoffQuality.get(); + } + @Override + public void setDropoffQuality(DropoffQuality newDropoffQuality) { + Config.Client.Graphics.Quality.dropoffQuality.set(newDropoffQuality); + } + } + + + public static class FogQuality implements IFogQuality + { + @Override + public FogDistance getFogDistance() + { + return Config.Client.Graphics.FogQuality.fogDistance.get(); + } + @Override + public void setFogDistance(FogDistance newFogDistance) + { + Config.Client.Graphics.FogQuality.fogDistance.set(newFogDistance); + } + + + @Override + public FogDrawMode getFogDrawMode() + { + return Config.Client.Graphics.FogQuality.fogDrawMode.get(); + } + + @Override + public void setFogDrawMode(FogDrawMode setFogDrawMode) + { + Config.Client.Graphics.FogQuality.fogDrawMode.set(setFogDrawMode); + } + + + @Override + public FogColorMode getFogColorMode() + { + return Config.Client.Graphics.FogQuality.fogColorMode.get(); + } + + @Override + public void setFogColorMode(FogColorMode newFogColorMode) + { + Config.Client.Graphics.FogQuality.fogColorMode.set(newFogColorMode); + } + + + @Override + public boolean getDisableVanillaFog() + { + return Config.Client.Graphics.FogQuality.disableVanillaFog.get(); + } + @Override + public void setDisableVanillaFog(boolean newDisableVanillaFog) + { + Config.Client.Graphics.FogQuality.disableVanillaFog.set(newDisableVanillaFog); + } + } + + + public static class AdvancedGraphics implements IAdvancedGraphics + { + @Override + public boolean getDisableDirectionalCulling() + { + return Config.Client.Graphics.AdvancedGraphics.disableDirectionalCulling.get(); + } + @Override + public void setDisableDirectionalCulling(boolean newDisableDirectionalCulling) + { + Config.Client.Graphics.AdvancedGraphics.disableDirectionalCulling.set(newDisableDirectionalCulling); + } + + + @Override + public VanillaOverdraw getVanillaOverdraw() + { + return Config.Client.Graphics.AdvancedGraphics.vanillaOverdraw.get(); + } + @Override + public void setVanillaOverdraw(VanillaOverdraw newVanillaOverdraw) + { + Config.Client.Graphics.AdvancedGraphics.vanillaOverdraw.set(newVanillaOverdraw); + } + + + @Override + public boolean getUseExtendedNearClipPlane() + { + return Config.Client.Graphics.AdvancedGraphics.useExtendedNearClipPlane.get(); + } + @Override + public void setUseExtendedNearClipPlane(boolean newUseExtendedNearClipPlane) + { + Config.Client.Graphics.AdvancedGraphics.useExtendedNearClipPlane.set(newUseExtendedNearClipPlane); + } + } + } + + + + + //========================// + // WorldGenerator Configs // + //========================// + public static class WorldGenerator implements IWorldGenerator + { + @Override + public GenerationPriority getGenerationPriority() + { + return Config.Client.WorldGenerator.generationPriority.get(); + } + @Override + public void setGenerationPriority(GenerationPriority newGenerationPriority) + { + Config.Client.WorldGenerator.generationPriority.set(newGenerationPriority); + } + + + @Override + public DistanceGenerationMode getDistanceGenerationMode() + { + return Config.Client.WorldGenerator.distanceGenerationMode.get(); + } + @Override + public void setDistanceGenerationMode(DistanceGenerationMode newDistanceGenerationMode) + { + Config.Client.WorldGenerator.distanceGenerationMode.set(newDistanceGenerationMode); + } + + /* + @Override + public boolean getAllowUnstableFeatureGeneration() + { + return Config.Client.WorldGenerator.allowUnstableFeatureGeneration; + } + @Override + public void setAllowUnstableFeatureGeneration(boolean newAllowUnstableFeatureGeneration) + { + ConfigGui.editSingleOption.getEntry("client.worldGenerator.allowUnstableFeatureGeneration").value = newAllowUnstableFeatureGeneration; + ConfigGui.editSingleOption.saveOption("client.worldGenerator.allowUnstableFeatureGeneration"); + }*/ + + + @Override + public BlocksToAvoid getBlocksToAvoid() + { + return Config.Client.WorldGenerator.blocksToAvoid.get(); + } + @Override + public void setBlockToAvoid(BlocksToAvoid newBlockToAvoid) + { + Config.Client.WorldGenerator.blocksToAvoid.set(newBlockToAvoid); + } + @Override + public boolean getEnableDistantGeneration() + { + return Config.Client.WorldGenerator.enableDistantGeneration.get(); + } + @Override + public void setEnableDistantGeneration(boolean newEnableDistantGeneration) + { + Config.Client.WorldGenerator.enableDistantGeneration.set(newEnableDistantGeneration); + } + @Override + public LightGenerationMode getLightGenerationMode() + { + return Config.Client.WorldGenerator.lightGenerationMode.get(); + } + @Override + public void setLightGenerationMode(LightGenerationMode newLightGenerationMode) + { + Config.Client.WorldGenerator.lightGenerationMode.set(newLightGenerationMode); + } + } + + + + + //============================// + // AdvancedModOptions Configs // + //============================// + public static class Advanced implements IAdvanced + { + public final IThreading threading; + public final IDebugging debugging; + public final IBuffers buffers; + + + @Override + public IThreading threading() + { + return threading; + } + + + @Override + public IDebugging debugging() + { + return debugging; + } + + + @Override + public IBuffers buffers() + { + return buffers; + } + + + public Advanced() + { + threading = new Threading(); + debugging = new Debugging(); + buffers = new Buffers(); + } + + public static class Threading implements IThreading + { + @Override + public int getNumberOfWorldGenerationThreads() + { + return Config.Client.Advanced.Threading.numberOfWorldGenerationThreads.get(); + } + @Override + public void setNumberOfWorldGenerationThreads(int newNumberOfWorldGenerationThreads) + { + Config.Client.Advanced.Threading.numberOfWorldGenerationThreads.set(newNumberOfWorldGenerationThreads); + } + + + @Override + public int getNumberOfBufferBuilderThreads() + { + return Config.Client.Advanced.Threading.numberOfBufferBuilderThreads.get(); + } + @Override + public void setNumberOfBufferBuilderThreads(int newNumberOfWorldBuilderThreads) + { + Config.Client.Advanced.Threading.numberOfBufferBuilderThreads.set(newNumberOfWorldBuilderThreads); + } + } + + + + + //===============// + // Debug Options // + //===============// + public static class Debugging implements IDebugging + { + @Override + public boolean getDrawLods() + { + return Config.Client.Advanced.Debugging.drawLods.get(); + } + @Override + public void setDrawLods(boolean newDrawLods) + { + Config.Client.Advanced.Debugging.drawLods.set(newDrawLods); + } + + + @Override + public DebugMode getDebugMode() + { + return Config.Client.Advanced.Debugging.debugMode.get(); + } + @Override + public void setDebugMode(DebugMode newDebugMode) + { + Config.Client.Advanced.Debugging.debugMode.set(newDebugMode); + } + + + @Override + public boolean getDebugKeybindingsEnabled() + { + return Config.Client.Advanced.Debugging.enableDebugKeybindings.get(); + } + @Override + public void setDebugKeybindingsEnabled(boolean newEnableDebugKeybindings) + { + Config.Client.Advanced.Debugging.enableDebugKeybindings.set(newEnableDebugKeybindings); + } + } + + + public static class Buffers implements IBuffers + { + + @Override + public GpuUploadMethod getGpuUploadMethod() + { + return Config.Client.Advanced.Buffers.gpuUploadMethod.get(); + } + @Override + public void setGpuUploadMethod(GpuUploadMethod newDisableVanillaFog) + { + Config.Client.Advanced.Buffers.gpuUploadMethod.set(newDisableVanillaFog); + } + + + @Override + public int getGpuUploadPerMegabyteInMilliseconds() + { + return Config.Client.Advanced.Buffers.gpuUploadPerMegabyteInMilliseconds.get(); + } + @Override + public void setGpuUploadPerMegabyteInMilliseconds(int newMilliseconds) { + Config.Client.Advanced.Buffers.gpuUploadPerMegabyteInMilliseconds.set(newMilliseconds); + } + + + @Override + public BufferRebuildTimes getRebuildTimes() + { + return Config.Client.Advanced.Buffers.rebuildTimes.get(); + } + @Override + public void setRebuildTimes(BufferRebuildTimes newBufferRebuildTimes) + { + Config.Client.Advanced.Buffers.rebuildTimes.set(newBufferRebuildTimes); + } + } + } + } +} diff --git a/core b/core index ae752c6f6..77492a8ab 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit ae752c6f630ba844736074e84e97722a450d29f8 +Subproject commit 77492a8abfb21f7e807bbb9ad59ca7a632045d23 diff --git a/fabric/src/main/java/com/seibel/lod/fabric/wrappers/DependencySetup.java b/fabric/src/main/java/com/seibel/lod/fabric/wrappers/DependencySetup.java index 91587bb06..e837255b1 100644 --- a/fabric/src/main/java/com/seibel/lod/fabric/wrappers/DependencySetup.java +++ b/fabric/src/main/java/com/seibel/lod/fabric/wrappers/DependencySetup.java @@ -1,5 +1,7 @@ package com.seibel.lod.fabric.wrappers; +import com.seibel.lod.common.LodCommonMain; +import com.seibel.lod.common.wrappers.config.NewLodConfigWrapperSingleton; import com.seibel.lod.core.util.SingletonHandler; import com.seibel.lod.core.wrapperInterfaces.config.ILodConfigWrapperSingleton; import com.seibel.lod.common.wrappers.config.LodConfigWrapperSingleton; @@ -18,6 +20,9 @@ public class DependencySetup { public static void createInitialBindings() { - SingletonHandler.bind(ILodConfigWrapperSingleton.class, LodConfigWrapperSingleton.INSTANCE); + if (!LodCommonMain.IsNewConfig) + SingletonHandler.bind(ILodConfigWrapperSingleton.class, LodConfigWrapperSingleton.INSTANCE); + else + SingletonHandler.bind(ILodConfigWrapperSingleton.class, NewLodConfigWrapperSingleton.INSTANCE); } } diff --git a/forge/src/main/java/com/seibel/lod/forge/wrappers/ForgeDependencySetup.java b/forge/src/main/java/com/seibel/lod/forge/wrappers/ForgeDependencySetup.java index 6c18706e7..c9d28bd26 100644 --- a/forge/src/main/java/com/seibel/lod/forge/wrappers/ForgeDependencySetup.java +++ b/forge/src/main/java/com/seibel/lod/forge/wrappers/ForgeDependencySetup.java @@ -1,6 +1,8 @@ package com.seibel.lod.forge.wrappers; +import com.seibel.lod.common.LodCommonMain; import com.seibel.lod.common.wrappers.config.LodConfigWrapperSingleton; +import com.seibel.lod.common.wrappers.config.NewLodConfigWrapperSingleton; import com.seibel.lod.core.util.SingletonHandler; import com.seibel.lod.core.wrapperInterfaces.config.ILodConfigWrapperSingleton; @@ -18,6 +20,9 @@ public class ForgeDependencySetup { public static void createInitialBindings() { - SingletonHandler.bind(ILodConfigWrapperSingleton.class, LodConfigWrapperSingleton.INSTANCE); + if (!LodCommonMain.IsNewConfig) + SingletonHandler.bind(ILodConfigWrapperSingleton.class, LodConfigWrapperSingleton.INSTANCE); + else + SingletonHandler.bind(ILodConfigWrapperSingleton.class, NewLodConfigWrapperSingleton.INSTANCE); } }