From 6d83ec1606562bdeb3f2f337e71526151b7ee0e5 Mon Sep 17 00:00:00 2001 From: tom lee Date: Fri, 7 Jan 2022 13:28:58 +0800 Subject: [PATCH] Updated core and wrapper --- core | 2 +- .../java/com/seibel/lod/forge/ForgeClientProxy.java | 2 +- src/main/java/com/seibel/lod/forge/ForgeConfig.java | 6 ++++++ .../wrappers/config/LodConfigWrapperSingleton.java | 13 +++++++++++-- 4 files changed, 19 insertions(+), 4 deletions(-) diff --git a/core b/core index 816c4fa76..5ac51dd2a 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 816c4fa76aaa8d5afca09fadcfb190a30fb32e13 +Subproject commit 5ac51dd2a5fd24be6203d22004a760ad9d696fa6 diff --git a/src/main/java/com/seibel/lod/forge/ForgeClientProxy.java b/src/main/java/com/seibel/lod/forge/ForgeClientProxy.java index 4ddf72131..78f9bd2a4 100644 --- a/src/main/java/com/seibel/lod/forge/ForgeClientProxy.java +++ b/src/main/java/com/seibel/lod/forge/ForgeClientProxy.java @@ -73,7 +73,7 @@ public class ForgeClientProxy @SubscribeEvent public void worldUnloadEvent(WorldEvent.Unload event) { - eventApi.worldUnloadEvent(); + eventApi.worldUnloadEvent(WorldWrapper.getWorldWrapper(event.getWorld())); } @SubscribeEvent diff --git a/src/main/java/com/seibel/lod/forge/ForgeConfig.java b/src/main/java/com/seibel/lod/forge/ForgeConfig.java index 493140885..35709df91 100644 --- a/src/main/java/com/seibel/lod/forge/ForgeConfig.java +++ b/src/main/java/com/seibel/lod/forge/ForgeConfig.java @@ -42,6 +42,7 @@ import com.seibel.lod.core.enums.rendering.FogColorMode; import com.seibel.lod.core.enums.rendering.FogDistance; import com.seibel.lod.core.enums.rendering.FogDrawMode; import com.seibel.lod.core.objects.MinDefaultMax; +import com.seibel.lod.core.wrapperInterfaces.config.ILodConfigWrapperSingleton.IClient; import com.seibel.lod.core.wrapperInterfaces.config.ILodConfigWrapperSingleton.IClient.IAdvanced; import com.seibel.lod.core.wrapperInterfaces.config.ILodConfigWrapperSingleton.IClient.IAdvanced.IBuffers; import com.seibel.lod.core.wrapperInterfaces.config.ILodConfigWrapperSingleton.IClient.IAdvanced.IDebugging; @@ -90,6 +91,7 @@ public class ForgeConfig public final Graphics graphics; public final WorldGenerator worldGenerator; public final Advanced advanced; + public final ForgeConfigSpec.BooleanValue optionsButton; //================// @@ -99,6 +101,10 @@ public class ForgeConfig { builder.push(this.getClass().getSimpleName()); { + optionsButton = builder + .comment("\n\n" + + IClient.OPTIONS_BUTTON_DESC) + .define("Options Button", IClient.OPTIONS_BUTTON_DEFAULT); graphics = new Graphics(builder); worldGenerator = new WorldGenerator(builder); advanced = new Advanced(builder); diff --git a/src/main/java/com/seibel/lod/forge/wrappers/config/LodConfigWrapperSingleton.java b/src/main/java/com/seibel/lod/forge/wrappers/config/LodConfigWrapperSingleton.java index b7f916bf1..bc799d7f9 100644 --- a/src/main/java/com/seibel/lod/forge/wrappers/config/LodConfigWrapperSingleton.java +++ b/src/main/java/com/seibel/lod/forge/wrappers/config/LodConfigWrapperSingleton.java @@ -56,7 +56,16 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton public final IGraphics graphics; public final IWorldGenerator worldGenerator; public final IAdvanced advanced; - + + @Override + public boolean getOptionsButton() { + return ForgeConfig.CLIENT.optionsButton.get(); + } + + @Override + public void setOptionsButton(boolean newOptionsButton) { + ForgeConfig.CLIENT.optionsButton.set(newOptionsButton); + } @Override public IGraphics graphics() @@ -556,6 +565,6 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton ForgeConfig.CLIENT.advanced.buffers.rebuildTimes.set(newBufferRebuildTimes); } } - } + } } }