Merge branch '1.21' into 1.21.3

rfresh2 · Feb 19, 2025 · dd46afe · dd46afe
2 parents cb4b6b2 + d219151
commit dd46afe
Show file tree

Hide file tree

Showing 5 changed files with 276 additions and 186 deletions.
diff --git a/common/src/main/java/xaeroplus/feature/render/highlights/ChunkHighlightSavingCache.java b/common/src/main/java/xaeroplus/feature/render/highlights/ChunkHighlightSavingCache.java
@@ -16,7 +16,6 @@
 import xaeroplus.Globals;
 import xaeroplus.XaeroPlus;
 import xaeroplus.event.XaeroWorldChangeEvent;
-import xaeroplus.settings.Settings;
 import xaeroplus.util.ChunkUtils;
 
 import java.io.Closeable;
@@ -323,7 +322,7 @@ public void handleTick() {
         // this does make the update interval setting kind of a lie, but its for the best
         int jitter = ThreadLocalRandom.current().nextInt(0, 10);
         // only update window on an interval
-        if (++tickCounter < Settings.REGISTRY.cacheWindowUpdateInterval.getAsInt() + jitter) {
+        if (++tickCounter < 10 + jitter) {
             return;
         }
         tickCounter = 0;

diff --git a/common/src/main/java/xaeroplus/mixin/client/MixinMinimapModSettings.java b/common/src/main/java/xaeroplus/mixin/client/MixinMinimapModSettings.java
@@ -19,13 +19,15 @@
 
 
 @Mixin(value = ModSettings.class, remap = false)
-public class MixinMinimapModSettings {
+public abstract class MixinMinimapModSettings {
 
     @Shadow
     public int caveMaps;
     @Shadow
     protected IXaeroMinimap modMain;
 
+    @Shadow protected abstract void refreshScreen();
+
     @Inject(method = "<init>", at = @At(value = "RETURN"))
     private void init(CallbackInfo ci) {
         // don't show cave maps on minimap by default
@@ -73,6 +75,7 @@ public void getClientBooleanValue(ModOptions o, CallbackInfoReturnable<Boolean>
     @Inject(method = "setOptionValue", at = @At("HEAD"))
     public void setOptionValue(ModOptions o, Object value, final CallbackInfo ci) {
         SettingHooks.setOptionValue(o.getEnumString(), value);
+        refreshScreen();
     }
 
     @Inject(method = "getOptionValue", at = @At("HEAD"), cancellable = true)
@@ -83,6 +86,7 @@ public void getOptionValue(final ModOptions o, final CallbackInfoReturnable<Obje
     @Inject(method = "setOptionDoubleValue", at = @At("HEAD"))
     public void setOptionFloatValue(ModOptions o, double f, CallbackInfo ci) {
         SettingHooks.setOptionDoubleValue(o.getEnumString(), f);
+        refreshScreen();
     }
 
     @Inject(method = "getOptionDoubleValue", at = @At("HEAD"), cancellable = true)

diff --git a/common/src/main/java/xaeroplus/settings/DoubleSetting.java b/common/src/main/java/xaeroplus/settings/DoubleSetting.java
@@ -68,6 +68,22 @@ public static DoubleSetting create(String settingName,
         );
     }
 
+    public static DoubleSetting create(String settingName,
+                                       String settingNameTranslationKey,
+                                       double valueMin,
+                                       double valueMax,
+                                       double valueStep,
+                                       double defaultValue,
+                                       BooleanSupplier visibilitySupplier) {
+        return new DoubleSetting(
+            SETTING_PREFIX + settingName,
+            settingNameTranslationKey,
+            buildTooltipTranslationKey(settingNameTranslationKey),
+            null,
+            valueMin, valueMax, valueStep, defaultValue, null, visibilitySupplier
+        );
+    }
+
     public static DoubleSetting create(String settingName,
                                        String settingNameTranslationKey,
                                        double valueMin,