From cc7923368fa14344d0416d3ec2ab20a701b0112b Mon Sep 17 00:00:00 2001 From: Des Herriott Date: Tue, 28 May 2024 08:31:44 +0100 Subject: [PATCH 1/2] fix: opening map via sidebar button was ignoring gamestage limits https://github.com/FTBTeam/FTB-Mods-Issues/issues/185 --- .../ftb/mods/ftbchunks/client/FTBChunksClient.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/common/src/main/java/dev/ftb/mods/ftbchunks/client/FTBChunksClient.java b/common/src/main/java/dev/ftb/mods/ftbchunks/client/FTBChunksClient.java index 90b612d2..687202d6 100644 --- a/common/src/main/java/dev/ftb/mods/ftbchunks/client/FTBChunksClient.java +++ b/common/src/main/java/dev/ftb/mods/ftbchunks/client/FTBChunksClient.java @@ -321,12 +321,14 @@ public boolean skipBlock(BlockState state) { } public EventResult customClick(CustomClickEvent event) { - if (event.id().equals(BUTTON_ID_MAP)) { - openGui(); - return EventResult.interruptTrue(); - } else if (event.id().equals(BUTTON_ID_CLAIM)) { - ChunkScreen.openChunkScreen(); - return EventResult.interruptTrue(); + if (FTBChunksWorldConfig.playerHasMapStage(Minecraft.getInstance().player)) { + if (event.id().equals(BUTTON_ID_MAP)) { + openGui(); + return EventResult.interruptTrue(); + } else if (event.id().equals(BUTTON_ID_CLAIM)) { + ChunkScreen.openChunkScreen(); + return EventResult.interruptTrue(); + } } return EventResult.pass(); From f0facb43a7837d0f3f9b176d30bc9225d31811fc Mon Sep 17 00:00:00 2001 From: Des Herriott Date: Tue, 28 May 2024 08:32:51 +0100 Subject: [PATCH 2/2] build: version -> 2001.3.1, changelog updated --- CHANGELOG.md | 5 +++++ gradle.properties | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f55852b8..92d9ecd5 100644 --- a/CHANGELOG.md +++ b/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.1] + +### Fixed +* Fixed the sidebar map buttons ignoring any GameStages restrictions in force + ## [2001.3.0] ### Changed diff --git a/gradle.properties b/gradle.properties index d85f3d1e..90e3bce3 100644 --- a/gradle.properties +++ b/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.0 +mod_version=2001.3.1 mod_author=FTB Team minecraft_version=1.20.1