Skip to content

Commit dc046b9

Browse files
deshtdesht
authored
Merge pull request #335 from FTBTeam/1.20.1/dev
1.20.1/dev
2 parents 1ce4026 + c1e01d5 commit dc046b9

File tree

5 files changed

+68
-6
lines changed

5 files changed

+68
-6
lines changed

‎CHANGELOG.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
44
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
55
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
66

7+
## [2001.3.4]
8+
9+
### Fixed
10+
* Fixed minimap info text not being correctly configurable
11+
712
## [2001.3.3]
813

914
### Fixed

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

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,25 @@
66
import dev.ftb.mods.ftbchunks.client.map.BiomeBlendMode;
77
import dev.ftb.mods.ftbchunks.client.map.MapManager;
88
import dev.ftb.mods.ftbchunks.client.map.MapMode;
9-
import dev.ftb.mods.ftbchunks.client.minimap.components.*;
9+
import dev.ftb.mods.ftbchunks.client.minimap.MinimapComponentConfig;
10+
import dev.ftb.mods.ftbchunks.client.minimap.components.BiomeComponent;
11+
import dev.ftb.mods.ftbchunks.client.minimap.components.DebugComponent;
12+
import dev.ftb.mods.ftbchunks.client.minimap.components.FPSComponent;
13+
import dev.ftb.mods.ftbchunks.client.minimap.components.GameTimeComponent;
14+
import dev.ftb.mods.ftbchunks.client.minimap.components.PlayerPosInfoComponent;
15+
import dev.ftb.mods.ftbchunks.client.minimap.components.RealTimeComponent;
16+
import dev.ftb.mods.ftbchunks.client.minimap.components.ZoneInfoComponent;
1017
import dev.ftb.mods.ftbchunks.net.ServerConfigRequestPacket;
1118
import dev.ftb.mods.ftblibrary.config.ConfigGroup;
1219
import dev.ftb.mods.ftblibrary.config.StringMapValue;
1320
import dev.ftb.mods.ftblibrary.config.ui.EditConfigScreen;
1421
import dev.ftb.mods.ftblibrary.snbt.SNBTCompoundTag;
15-
import dev.ftb.mods.ftblibrary.snbt.config.*;
22+
import dev.ftb.mods.ftblibrary.snbt.config.BooleanValue;
23+
import dev.ftb.mods.ftblibrary.snbt.config.DoubleValue;
24+
import dev.ftb.mods.ftblibrary.snbt.config.EnumValue;
25+
import dev.ftb.mods.ftblibrary.snbt.config.IntValue;
26+
import dev.ftb.mods.ftblibrary.snbt.config.SNBTConfig;
27+
import dev.ftb.mods.ftblibrary.snbt.config.StringListValue;
1628
import net.minecraft.client.Minecraft;
1729
import net.minecraft.client.gui.screens.Screen;
1830
import net.minecraft.resources.ResourceLocation;
@@ -74,9 +86,9 @@ public interface FTBChunksClientConfig {
7486
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");
7587
BooleanValue SQUARE_MINIMAP = MINIMAP.addBoolean("square", false).comment("Draw a square minimap instead of a circular one");
7688
BooleanValue MINIMAP_PROPORTIONAL = MINIMAP.addBoolean("proportional", true).comment("Size minimap proportional to screen width (and scale)");
77-
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");
78-
StringListValue MINIMAP_INFO_HIDDEN = MINIMAP.addStringList("info_hidden", List.of(DebugComponent.ID.toString())).comment("Info hidden under minimap");
79-
StringMapValue MINIMAP_SETTINGS = MINIMAP.add(new StringMapValue(MINIMAP, "info_settings", Collections.emptyMap())).comment("Settings for minimap info components");
89+
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");
90+
StringListValue MINIMAP_INFO_HIDDEN = MINIMAP.addStringList("info_hidden", List.of(DebugComponent.ID.toString())).excluded().comment("Info hidden under minimap");
91+
StringMapValue MINIMAP_SETTINGS = MINIMAP.add(new MinimapComponentConfig(MINIMAP, "info_settings", Collections.emptyMap())).comment("Settings for minimap info components");
8092

8193
SNBTConfig ADVANCED = CONFIG.addGroup("advanced", 3);
8294
BooleanValue DEBUG_INFO = ADVANCED.addBoolean("debug_info", false).comment("Enables debug info");

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

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
package dev.ftb.mods.ftbchunks.client.minimap;
2+
3+
import dev.ftb.mods.ftbchunks.client.gui.MinimapInfoSortScreen;
4+
import dev.ftb.mods.ftblibrary.config.ConfigCallback;
5+
import dev.ftb.mods.ftblibrary.config.ConfigGroup;
6+
import dev.ftb.mods.ftblibrary.config.ConfigValue;
7+
import dev.ftb.mods.ftblibrary.config.StringMapValue;
8+
import dev.ftb.mods.ftblibrary.snbt.config.SNBTConfig;
9+
import dev.ftb.mods.ftblibrary.ui.Widget;
10+
import dev.ftb.mods.ftblibrary.ui.input.MouseButton;
11+
import net.minecraft.network.chat.Component;
12+
import org.jetbrains.annotations.Nullable;
13+
14+
import java.util.Map;
15+
16+
public class MinimapComponentConfig extends StringMapValue {
17+
18+
public MinimapComponentConfig(@Nullable SNBTConfig c, String n, Map<String, String> def) {
19+
super(c, n, def);
20+
}
21+
22+
23+
@Override
24+
public void createClientConfig(ConfigGroup group) {
25+
group.add(key, new MinimapComponentConfigValue(), get(), stringBooleanMap -> {
26+
}, defaultValue);
27+
}
28+
29+
public static class MinimapComponentConfigValue extends ConfigValue<Map<String, String>> {
30+
31+
@Override
32+
public void onClicked(Widget clickedWidget, MouseButton button, ConfigCallback callback) {
33+
new MinimapInfoSortScreen().openGui();
34+
}
35+
36+
@Override
37+
public Component getStringForGUI(@Nullable Map<String, String> v) {
38+
if (v == null) {
39+
return super.getStringForGUI(null);
40+
}
41+
return Component.translatable("ftbchunks.gui.sort_minimap_info");
42+
}
43+
}
44+
}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -260,6 +260,7 @@
260260
"ftbchunks.gui.sort_minimap_info": "Minimap Info Settings",
261261
"ftbchunks.minimap.info_hidden": "Hidden Minimap Info",
262262
"ftbchunks.minimap.info_order": "Minimap info order",
263+
"ftbchunks.minimap.info_settings": "Info Settings",
263264
"ftbchunks.show_wilderness.show_wilderness": "Show Wilderness",
264265
"ftbchunks.show_wilderness.just_claimed": "Show only Claimed Chunks",
265266
"tag.item.ftbchunks.right_click_blacklist": "Right Click Blacklist",

‎gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ org.gradle.daemon=false
55
mod_id=ftbchunks
66
archives_base_name=ftb-chunks
77
maven_group=dev.ftb.mods
8-
mod_version=2001.3.3
8+
mod_version=2001.3.4
99
mod_author=FTB Team
1010

1111
minecraft_version=1.20.1

0 commit comments

Comments
 (0)