Update to malilib boolean toggle message changes

geoporalis · Apr 1, 2022 · f71d457 · f71d457
1 parent d1d8822
commit f71d457
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 10 deletions.
diff --git a/src/main/java/fi/dy/masa/minihud/config/ConfigCallbacks.java b/src/main/java/fi/dy/masa/minihud/config/ConfigCallbacks.java
@@ -2,14 +2,15 @@
 
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Vec3d;
-import fi.dy.masa.malilib.config.option.BooleanConfig;
+import fi.dy.masa.malilib.config.option.BaseGenericConfig;
 import fi.dy.masa.malilib.input.callback.AdjustableValueHotkeyCallback;
 import fi.dy.masa.malilib.listener.EventListener;
 import fi.dy.masa.malilib.overlay.message.MessageHelpers;
 import fi.dy.masa.malilib.overlay.message.MessageUtils;
 import fi.dy.masa.malilib.render.overlay.OverlayRendererContainer;
 import fi.dy.masa.malilib.util.EntityUtils;
 import fi.dy.masa.malilib.util.StringUtils;
+import fi.dy.masa.malilib.util.data.BooleanStorage;
 import fi.dy.masa.minihud.data.DataStorage;
 import fi.dy.masa.minihud.feature.Actions;
 import fi.dy.masa.minihud.network.CarpetPubsubPacketHandler;
@@ -89,7 +90,8 @@ private static void onChunkUnloadBucketOverlayEnabled()
         Configs.Internal.CHUNK_UNLOAD_BUCKET_OVERLAY_Y.setDoubleValue(pos.y - 2);
     }
 
-    private static String getSpawnChunksMessage(BooleanConfig config)
+    private static<CFG extends BaseGenericConfig<?> & BooleanStorage>
+    String getSpawnChunksMessage(CFG config)
     {
         if (config.getBooleanValue())
         {
@@ -103,7 +105,8 @@ private static String getSpawnChunksMessage(BooleanConfig config)
         return MessageHelpers.getBooleanConfigToggleMessage(config, null);
     }
 
-    private static String getSpawnableChunksMessage(BooleanConfig config)
+    private static <CFG extends BaseGenericConfig<?> & BooleanStorage>
+    String getSpawnableChunksMessage(CFG config)
     {
         if (config.getBooleanValue())
         {
@@ -118,7 +121,8 @@ private static String getSpawnableChunksMessage(BooleanConfig config)
         return MessageHelpers.getBooleanConfigToggleMessage(config, null);
     }
 
-    private static String getRandomTicksMessage(BooleanConfig config)
+    private static <CFG extends BaseGenericConfig<?> & BooleanStorage>
+    String getRandomTicksMessage(CFG config)
     {
         if (config.getBooleanValue())
         {

diff --git a/src/main/java/fi/dy/masa/minihud/config/InfoLine.java b/src/main/java/fi/dy/masa/minihud/config/InfoLine.java
@@ -93,7 +93,7 @@ public enum InfoLine implements ConfigInfo
         this.toggleHotkey.setNameTranslationKey(nameKey);
         this.toggleHotkey.setPrettyNameTranslationKey(nameKey);
         this.toggleHotkey.setCommentTranslationKey(commentKey);
-        this.toggleHotkey.getKeyBind().setCallback(new ToggleBooleanWithMessageKeyCallback(this.toggleStatus));
+        this.toggleHotkey.getKeyBind().setCallback(new ToggleBooleanWithMessageKeyCallback<>(this.toggleStatus));
     }
 
     public void addValueChangeListener(EventListener listener)

diff --git a/src/main/java/fi/dy/masa/minihud/config/RendererToggle.java b/src/main/java/fi/dy/masa/minihud/config/RendererToggle.java
@@ -2,7 +2,6 @@
 
 import java.util.Locale;
 import java.util.Optional;
-import java.util.function.Function;
 import java.util.stream.Collectors;
 import javax.annotation.Nullable;
 import com.google.common.collect.ImmutableList;
@@ -13,6 +12,7 @@
 import fi.dy.masa.malilib.input.KeyBindSettings;
 import fi.dy.masa.malilib.input.callback.ToggleBooleanWithMessageKeyCallback;
 import fi.dy.masa.malilib.listener.EventListener;
+import fi.dy.masa.malilib.overlay.message.MessageHelpers.BooleanConfigMessageFactory;
 import fi.dy.masa.malilib.util.data.ModInfo;
 import fi.dy.masa.minihud.Reference;
 
@@ -72,7 +72,7 @@ public enum RendererToggle implements ConfigInfo
         this.toggleHotkey.setPrettyNameTranslationKey(nameKey);
         this.toggleHotkey.setCommentTranslationKey(commentKey);
 
-        this.toggleHotkey.getKeyBind().setCallback(new ToggleBooleanWithMessageKeyCallback(this.booleanConfig));
+        this.toggleHotkey.getKeyBind().setCallback(new ToggleBooleanWithMessageKeyCallback<>(this.booleanConfig));
     }
 
     public boolean isRendererEnabled()
@@ -90,9 +90,9 @@ public void addEnableListener(EventListener listener)
         this.booleanConfig.addEnableListener(listener);
     }
 
-    public void setToggleMessageFactory(@Nullable Function<BooleanConfig, String> messageFactory)
+    public void setToggleMessageFactory(@Nullable BooleanConfigMessageFactory messageFactory)
     {
-        this.toggleHotkey.getKeyBind().setCallback(new ToggleBooleanWithMessageKeyCallback(this.booleanConfig, messageFactory));
+        this.toggleHotkey.getKeyBind().setCallback(new ToggleBooleanWithMessageKeyCallback<>(this.booleanConfig, messageFactory));
     }
 
     public BooleanConfig getBooleanConfig()

diff --git a/src/main/java/fi/dy/masa/minihud/config/StructureToggle.java b/src/main/java/fi/dy/masa/minihud/config/StructureToggle.java
@@ -61,7 +61,7 @@ public enum StructureToggle implements ConfigInfo
 
         this.toggleHotkey.setNameTranslationKey(nameKey);
         this.toggleHotkey.setCommentTranslationKey(commentKey);
-        this.toggleHotkey.getKeyBind().setCallback(new ToggleBooleanWithMessageKeyCallback(this.toggleStatus));
+        this.toggleHotkey.getKeyBind().setCallback(new ToggleBooleanWithMessageKeyCallback<>(this.toggleStatus));
         this.toggleStatus.addValueChangeListener(DataStorage.getInstance().getStructureStorage()::requestStructureDataUpdates);
     }