1.20.1/dev

CHANGELOG.md

@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2001.3.4]
+
+### Fixed
+* Fixed minimap info text not being correctly configurable
+
 ## [2001.3.3]
 
 ### Fixed

common/src/main/java/dev/ftb/mods/ftbchunks/client/FTBChunksClientConfig.java

@@ -6,13 +6,25 @@
 import dev.ftb.mods.ftbchunks.client.map.BiomeBlendMode;
 import dev.ftb.mods.ftbchunks.client.map.MapManager;
 import dev.ftb.mods.ftbchunks.client.map.MapMode;
-import dev.ftb.mods.ftbchunks.client.minimap.components.*;
+import dev.ftb.mods.ftbchunks.client.minimap.MinimapComponentConfig;
+import dev.ftb.mods.ftbchunks.client.minimap.components.BiomeComponent;
+import dev.ftb.mods.ftbchunks.client.minimap.components.DebugComponent;
+import dev.ftb.mods.ftbchunks.client.minimap.components.FPSComponent;
+import dev.ftb.mods.ftbchunks.client.minimap.components.GameTimeComponent;
+import dev.ftb.mods.ftbchunks.client.minimap.components.PlayerPosInfoComponent;
+import dev.ftb.mods.ftbchunks.client.minimap.components.RealTimeComponent;
+import dev.ftb.mods.ftbchunks.client.minimap.components.ZoneInfoComponent;
 import dev.ftb.mods.ftbchunks.net.ServerConfigRequestPacket;
 import dev.ftb.mods.ftblibrary.config.ConfigGroup;
 import dev.ftb.mods.ftblibrary.config.StringMapValue;
 import dev.ftb.mods.ftblibrary.config.ui.EditConfigScreen;
 import dev.ftb.mods.ftblibrary.snbt.SNBTCompoundTag;
-import dev.ftb.mods.ftblibrary.snbt.config.*;
+import dev.ftb.mods.ftblibrary.snbt.config.BooleanValue;
+import dev.ftb.mods.ftblibrary.snbt.config.DoubleValue;
+import dev.ftb.mods.ftblibrary.snbt.config.EnumValue;
+import dev.ftb.mods.ftblibrary.snbt.config.IntValue;
+import dev.ftb.mods.ftblibrary.snbt.config.SNBTConfig;
+import dev.ftb.mods.ftblibrary.snbt.config.StringListValue;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.resources.ResourceLocation;
@@ -74,9 +86,9 @@ public interface FTBChunksClientConfig {
 	EnumValue<MinimapPosition.MinimapOffsetConditional> MINIMAP_POSITION_OFFSET_CONDITION = MINIMAP.addEnum("position_offset_condition", MinimapPosition.MinimapOffsetConditional.NAME_MAP).comment("Applied a conditional check to the offset. When set to anything other that None, the offset will apply only to the selected minimap position.", "When set to none and the maps offset is greater than 0, the offset will apply to all directions");
 	BooleanValue SQUARE_MINIMAP = MINIMAP.addBoolean("square", false).comment("Draw a square minimap instead of a circular one");
 	BooleanValue MINIMAP_PROPORTIONAL = MINIMAP.addBoolean("proportional", true).comment("Size minimap proportional to screen width (and scale)");
-	StringListValue MINIMAP_INFO_ORDER = MINIMAP.addStringList("info_order", Stream.of(PlayerPosInfoComponent.ID, BiomeComponent.ID, ZoneInfoComponent.ID, FPSComponent.ID, GameTimeComponent.ID, RealTimeComponent.ID, DebugComponent.ID).map(ResourceLocation::toString).toList()).comment("Info displayed under minimap");
-	StringListValue MINIMAP_INFO_HIDDEN = MINIMAP.addStringList("info_hidden", List.of(DebugComponent.ID.toString())).comment("Info hidden under minimap");
-	StringMapValue MINIMAP_SETTINGS = MINIMAP.add(new StringMapValue(MINIMAP, "info_settings", Collections.emptyMap())).comment("Settings for minimap info components");
+	StringListValue MINIMAP_INFO_ORDER = MINIMAP.addStringList("info_order", Stream.of(PlayerPosInfoComponent.ID, BiomeComponent.ID, ZoneInfoComponent.ID, FPSComponent.ID, GameTimeComponent.ID, RealTimeComponent.ID, DebugComponent.ID).map(ResourceLocation::toString).toList()).excluded().comment("Info displayed under minimap");
+	StringListValue MINIMAP_INFO_HIDDEN = MINIMAP.addStringList("info_hidden", List.of(DebugComponent.ID.toString())).excluded().comment("Info hidden under minimap");
+	StringMapValue MINIMAP_SETTINGS = MINIMAP.add(new MinimapComponentConfig(MINIMAP, "info_settings", Collections.emptyMap())).comment("Settings for minimap info components");
 
 	SNBTConfig ADVANCED = CONFIG.addGroup("advanced", 3);
 	BooleanValue DEBUG_INFO = ADVANCED.addBoolean("debug_info", false).comment("Enables debug info");

common/src/main/java/dev/ftb/mods/ftbchunks/client/minimap/MinimapComponentConfig.java

@@ -0,0 +1,44 @@
+package dev.ftb.mods.ftbchunks.client.minimap;
+
+import dev.ftb.mods.ftbchunks.client.gui.MinimapInfoSortScreen;
+import dev.ftb.mods.ftblibrary.config.ConfigCallback;
+import dev.ftb.mods.ftblibrary.config.ConfigGroup;
+import dev.ftb.mods.ftblibrary.config.ConfigValue;
+import dev.ftb.mods.ftblibrary.config.StringMapValue;
+import dev.ftb.mods.ftblibrary.snbt.config.SNBTConfig;
+import dev.ftb.mods.ftblibrary.ui.Widget;
+import dev.ftb.mods.ftblibrary.ui.input.MouseButton;
+import net.minecraft.network.chat.Component;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Map;
+
+public class MinimapComponentConfig extends StringMapValue {
+
+    public MinimapComponentConfig(@Nullable SNBTConfig c, String n, Map<String, String> def) {
+        super(c, n, def);
+    }
+
+
+    @Override
+    public void createClientConfig(ConfigGroup group) {
+        group.add(key, new MinimapComponentConfigValue(), get(), stringBooleanMap -> {
+        }, defaultValue);
+    }
+
+    public static class MinimapComponentConfigValue extends ConfigValue<Map<String, String>> {
+
+        @Override
+        public void onClicked(Widget clickedWidget, MouseButton button, ConfigCallback callback) {
+            new MinimapInfoSortScreen().openGui();
+        }
+
+        @Override
+        public Component getStringForGUI(@Nullable Map<String, String> v) {
+            if (v == null) {
+                return super.getStringForGUI(null);
+            }
+            return Component.translatable("ftbchunks.gui.sort_minimap_info");
+        }
+    }
+}

common/src/main/resources/assets/ftbchunks/lang/en_us.json

@@ -260,6 +260,7 @@
 	"ftbchunks.gui.sort_minimap_info": "Minimap Info Settings",
 	"ftbchunks.minimap.info_hidden": "Hidden Minimap Info",
 	"ftbchunks.minimap.info_order": "Minimap info order",
+	"ftbchunks.minimap.info_settings": "Info Settings",
 	"ftbchunks.show_wilderness.show_wilderness": "Show Wilderness",
 	"ftbchunks.show_wilderness.just_claimed": "Show only Claimed Chunks",
 	"tag.item.ftbchunks.right_click_blacklist": "Right Click Blacklist",

gradle.properties

@@ -5,7 +5,7 @@ org.gradle.daemon=false
 mod_id=ftbchunks
 archives_base_name=ftb-chunks
 maven_group=dev.ftb.mods
-mod_version=2001.3.3
+mod_version=2001.3.4
 mod_author=FTB Team
 
 minecraft_version=1.20.1