From 7d6a49c8b035cd8717737528abf6037c846f9c3e Mon Sep 17 00:00:00 2001 From: tom lee Date: Wed, 29 Dec 2021 22:21:52 +0800 Subject: [PATCH] Update core and fix it to work --- core | 2 +- src/main/java/com/seibel/lod/forge/ForgeConfig.java | 8 ++++---- .../forge/wrappers/config/LodConfigWrapperSingleton.java | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/core b/core index 96be86cac..8b3404e5f 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 96be86cacf250088141a853308e0da2f3045e081 +Subproject commit 8b3404e5f8683c849de9d173911da943480bd388 diff --git a/src/main/java/com/seibel/lod/forge/ForgeConfig.java b/src/main/java/com/seibel/lod/forge/ForgeConfig.java index 6bdd0ff1e..b63702e3f 100644 --- a/src/main/java/com/seibel/lod/forge/ForgeConfig.java +++ b/src/main/java/com/seibel/lod/forge/ForgeConfig.java @@ -382,7 +382,7 @@ public class ForgeConfig { public final ForgeConfigSpec.EnumValue gpuUploadMethod; - public final ForgeConfigSpec.IntValue gpuUploadTimeoutInMilleseconds; + public final ForgeConfigSpec.IntValue gpuUploadPerMegabyteInMilliseconds; public final ForgeConfigSpec.EnumValue rebuildTimes; Buffers(ForgeConfigSpec.Builder builder) @@ -394,10 +394,10 @@ public class ForgeConfig + IBuffers.GPU_UPLOAD_METHOD_DESC) .defineEnum("GPU Upload Method", IBuffers.GPU_UPLOAD_METHOD_DEFAULT); - MinDefaultMax minDefaultMax = IBuffers.GPU_UPLOAD_TIMEOUT_IN_MILLISECONDS_DEFAULT; - gpuUploadTimeoutInMilleseconds = builder + MinDefaultMax minDefaultMax = IBuffers.GPU_UPLOAD_PER_MEGABYTE_IN_MILLISECONDS_DEFAULT; + gpuUploadPerMegabyteInMilliseconds = builder .comment("\n\n" - + IBuffers.GPU_UPLOAD_TIMEOUT_IN_MILLISECONDS_DESC) + + IBuffers.GPU_UPLOAD_PER_MEGABYTE_IN_MILLISECONDS_DESC) .defineInRange("GPU Upload Timeout in Milleseconds", minDefaultMax.defaultValue, minDefaultMax.minValue, minDefaultMax.maxValue); 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 09b498048..75c6284b9 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 @@ -474,14 +474,14 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton @Override - public int getGpuUploadTimeoutInMilliseconds() + public int getGpuUploadPerMegabyteInMilliseconds() { - return ForgeConfig.CLIENT.advanced.buffers.gpuUploadTimeoutInMilleseconds.get(); + return ForgeConfig.CLIENT.advanced.buffers.gpuUploadPerMegabyteInMilliseconds.get(); } @Override - public void setGpuUploadTimeoutInMilliseconds(int newTimeoutInMilliseconds) + public void setGpuUploadPerMegabyteInMilliseconds(int newTimeoutInMilliseconds) { - ForgeConfig.CLIENT.advanced.buffers.gpuUploadTimeoutInMilleseconds.set(newTimeoutInMilliseconds); + ForgeConfig.CLIENT.advanced.buffers.gpuUploadPerMegabyteInMilliseconds.set(newTimeoutInMilliseconds); }