Skip to content

Commit 591811c

Browse files
deshtdesht
authored
Merge pull request #317 from FTBTeam/dev
Dev
2 parents aebb832 + e7ec25f commit 591811c

File tree

10 files changed

+63
-37
lines changed

10 files changed

+63
-37
lines changed

Diff for: ‎CHANGELOG.md

+15-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,21 @@ 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.1.1]
7+
## [2101.1.0]
8+
9+
### Changed
10+
* Minecraft 1.21.1 is now required; this no longer supports Minecraft 1.21
11+
* Vanilla Cherry Trees now show up pink on the map
12+
13+
### Added
14+
* Sidebar buttons for this and other FTB mods can now be enabled/disabled/rearranged (new functionality in FTB Library 2101.1.0)
15+
16+
### Fixed
17+
* Fixed expand/collapse buttons on waypoint editor screen being flipped
18+
* New minimap info components (TPS/game time/real time) are now hidden by default
19+
* Can be toggled on via info settings on the large map screen
20+
21+
## [2100.1.1]
822

923
### Added
1024
* The waypoint manager screen has had a facelift

Diff for: ‎build.gradle

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
plugins {
22
id "architectury-plugin" version "3.4-SNAPSHOT"
3-
id "dev.architectury.loom" version "1.6-SNAPSHOT" apply false
3+
id "dev.architectury.loom" version "1.7-SNAPSHOT" apply false
44
id "me.modmuss50.mod-publish-plugin" version "0.5.1"
55
}
66

@@ -19,10 +19,6 @@ subprojects {
1919
minecraft "com.mojang:minecraft:${rootProject.minecraft_version}"
2020
mappings loom.officialMojangMappings()
2121
}
22-
23-
configurations.configureEach {
24-
resolutionStrategy.cacheChangingModulesFor 0, 'seconds'
25-
}
2622
}
2723

2824
allprojects {

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ public interface FTBChunksClientConfig {
8282
BooleanValue SQUARE_MINIMAP = MINIMAP.addBoolean("square", false).comment("Draw a square minimap instead of a circular one");
8383
BooleanValue MINIMAP_PROPORTIONAL = MINIMAP.addBoolean("proportional", true).comment("Size minimap proportional to screen width (and scale)");
8484
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");
85-
StringListValue MINIMAP_INFO_HIDDEN = MINIMAP.addStringList("info_hidden", List.of(DebugComponent.ID.toString())).comment("Info hidden under minimap");
85+
StringListValue MINIMAP_INFO_HIDDEN = MINIMAP.addStringList("info_hidden", Stream.of(FPSComponent.ID, GameTimeComponent.ID, RealTimeComponent.ID, DebugComponent.ID).map(ResourceLocation::toString).toList()).comment("Info hidden under minimap");
8686
StringMapValue MINIMAP_SETTINGS = MINIMAP.add(new StringMapValue(MINIMAP, "info_settings", Collections.emptyMap())).comment("Settings for minimap info components");
8787

8888
SNBTConfig ADVANCED = CONFIG.addGroup("advanced", 3);

Diff for: ‎common/src/main/java/dev/ftb/mods/ftbchunks/client/gui/WaypointEditorScreen.java

+22-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package dev.ftb.mods.ftbchunks.client.gui;
22

3+
import com.mojang.blaze3d.platform.InputConstants;
34
import dev.architectury.networking.NetworkManager;
45
import dev.ftb.mods.ftbchunks.client.map.MapManager;
56
import dev.ftb.mods.ftbchunks.client.map.WaypointImpl;
@@ -51,12 +52,17 @@ public WaypointEditorScreen() {
5152
}
5253

5354
buttonExpandAll = new SimpleButton(topPanel, List.of(Component.translatable("gui.expand_all"), hotkeyTooltip("="), hotkeyTooltip("+")), Icons.UP,
54-
(widget, button) -> toggleAll(false));
55-
buttonCollapseAll = new SimpleButton(topPanel, List.of(Component.translatable("gui.collapse_all"), hotkeyTooltip("-")), Icons.DOWN,
5655
(widget, button) -> toggleAll(true));
56+
buttonCollapseAll = new SimpleButton(topPanel, List.of(Component.translatable("gui.collapse_all"), hotkeyTooltip("-")), Icons.DOWN,
57+
(widget, button) -> toggleAll(false));
5758
}
5859

5960
private void toggleAll(boolean collapsed) {
61+
boolean allOpen = this.collapsed.values().stream().noneMatch(b -> b);
62+
//Don't try and re-render if everything is already open
63+
if (allOpen && !collapsed) {
64+
return;
65+
}
6066
this.collapsed.keySet().forEach(levelResourceKey -> this.collapsed.put(levelResourceKey, collapsed));
6167
scrollBar.setValue(0);
6268
getGui().refreshWidgets();
@@ -77,6 +83,19 @@ public boolean onInit() {
7783
return true;
7884
}
7985

86+
@Override
87+
public boolean keyPressed(Key key) {
88+
if (super.keyPressed(key)) {
89+
return true;
90+
} else if (key.is(InputConstants.KEY_ADD) || key.is(InputConstants.KEY_EQUALS)) {
91+
toggleAll(false);
92+
} else if (key.is(InputConstants.KEY_MINUS) || key.is(GLFW.GLFW_KEY_KP_SUBTRACT)) {
93+
toggleAll(true);
94+
}
95+
return false;
96+
}
97+
98+
8099
@Override
81100
protected int getTopPanelHeight() {
82101
return 22;
@@ -238,7 +257,7 @@ public void setWidth(int newWidth) {
238257
distField.setPos(hideButton.getPosX() - 5 - distField.width, yOff);
239258

240259
nameField.setPos(5, yOff);
241-
nameField.setText(ClientTextComponentUtils.ellipsize(getTheme().getFont(), Component.literal(wp.getName()),distField.getPosX() - 5).getString());
260+
nameField.setText(ClientTextComponentUtils.ellipsize(getTheme().getFont(), Component.literal(wp.getName()), distField.getPosX() - 5).getString());
242261
nameField.setHeight(getTheme().getFontHeight() + 2);
243262
}
244263
}

Diff for: ‎common/src/main/java/dev/ftb/mods/ftbchunks/client/minimap/components/RealTimeComponent.java

+2-6
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,14 @@
44
import dev.ftb.mods.ftbchunks.api.client.minimap.TranslatedOption;
55
import dev.ftb.mods.ftbchunks.api.client.minimap.MinimapContext;
66
import dev.ftb.mods.ftbchunks.api.client.minimap.MinimapInfoComponent;
7-
import dev.ftb.mods.ftbchunks.client.FTBChunksClientConfig;
87
import dev.ftb.mods.ftblibrary.config.NameMap;
98
import net.minecraft.client.gui.Font;
109
import net.minecraft.client.gui.GuiGraphics;
1110
import net.minecraft.network.chat.Component;
1211
import net.minecraft.resources.ResourceLocation;
13-
import org.jetbrains.annotations.Nullable;
1412

15-
import java.time.LocalDateTime;
13+
import java.time.LocalTime;
1614
import java.util.Arrays;
17-
import java.util.HashMap;
18-
import java.util.Map;
1915
import java.util.Set;
2016
import java.util.stream.Collectors;
2117

@@ -31,7 +27,7 @@ public ResourceLocation id() {
3127
@Override
3228
public void render(MinimapContext context, GuiGraphics graphics, Font font) {
3329
String setting = context.getSetting(this);
34-
LocalDateTime now = LocalDateTime.now();
30+
LocalTime now = LocalTime.now();
3531
int hours = now.getHour();
3632
int minutes = now.getMinute();
3733
drawCenteredText(font, graphics, Component.literal(createTimeString(hours, minutes, setting.equals(TimeMode.TWENTY_FOUR.name()))), 0);

Diff for: ‎common/src/main/resources/assets/ftbchunks/sidebar_buttons.json

-14
This file was deleted.

Diff for: ‎common/src/main/resources/assets/ftbchunks/sidebar_buttons/chunks.json

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"icon": "ftblibrary:icons/map",
3+
"sort_index": 600,
4+
"click": [
5+
"ftbchunks:open_gui"
6+
]
7+
}

Diff for: ‎common/src/main/resources/assets/ftbchunks/sidebar_buttons/claim_chunks.json

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"icon": "ftblibrary:icons/map; tint=#FF80FFFF",
3+
"sort_index": 601,
4+
"click": [
5+
"ftbchunks:open_claim_gui"
6+
]
7+
}

Diff for: ‎common/src/main/resources/assets/minecraft/ftbchunks_block_colors.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -64,5 +64,6 @@
6464
"iron_bars": "ignored",
6565
"lily_pad": "#208030",
6666
"dead_bush": "#A89061",
67-
"glass": "#CCE5E4"
67+
"glass": "#CCE5E4",
68+
"cherry_leaves": "#b390a4"
6869
}

Diff for: ‎gradle.properties

+6-6
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,21 @@ readable_name=FTB Chunks
88
maven_group=dev.ftb.mods
99
mod_author=FTB Team
1010

11-
mod_version=2100.1.1
12-
minecraft_version=1.21
11+
mod_version=2101.1.0
12+
minecraft_version=1.21.1
1313

1414
# Deps
1515
#forge_version=50.0.9
16-
neoforge_version=21.0.157
17-
neoforge_version_range=[21.0.143,)
16+
neoforge_version=21.1.9
17+
neoforge_version_range=[21.1.0,)
1818
neoforge_loader_version=4
1919
fabric_loader_version=0.15.11
2020
fabric_api_version=0.100.8+1.21
2121
fabric_api_version_range=>=0.100.1+1.21
2222
architectury_api_version=13.0.2
2323

24-
ftb_library_version=2100.1.3
25-
ftb_teams_version=2100.1.0
24+
ftb_library_version=2101.1.0
25+
ftb_teams_version=2101.1.0
2626

2727
curseforge_id_forge=314906
2828
curseforge_id_fabric=472657

0 commit comments

Comments
 (0)