Merge pull request #732 from FTBTeam/1.20.1/dev

1.20.1/dev
FTBTeam · Jun 11, 2024 · d22566e · d22566e
2 parents a47b1af + c145c7d
commit d22566e
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 4 deletions.
diff --git 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.4.6]
+
+### Fixed
+* Fixed right-clicking a quest (outside edit mode) ignoring the "Hide Details Until Startable" property
+
 ## [2001.4.5]
 
 ### Fixed

diff --git a/common/src/main/java/dev/ftb/mods/ftbquests/client/gui/quests/QuestButton.java b/common/src/main/java/dev/ftb/mods/ftbquests/client/gui/quests/QuestButton.java
@@ -189,7 +189,7 @@ public void onClicked(MouseButton button) {
 				questScreen.toggleSelected(moveAndDeleteFocus());
 			} else if (!quest.getGuidePage().isEmpty() && quest.getTasks().isEmpty() && quest.getRewards().isEmpty() && quest.getDescription().isEmpty()) {
 				handleClick("guide", quest.getGuidePage());
-			} else if (questScreen.file.canEdit() || !quest.hideDetailsUntilStartable() || questScreen.file.selfTeamData.canStartTasks(quest)) {
+			} else {
 				questScreen.open(theQuestObject(), false);
 			}
 		} else if (questScreen.file.canEdit() && button.isMiddle()) {

diff --git a/common/src/main/java/dev/ftb/mods/ftbquests/client/gui/quests/QuestScreen.java b/common/src/main/java/dev/ftb/mods/ftbquests/client/gui/quests/QuestScreen.java
@@ -151,7 +151,11 @@ public void scrollTo(Movable movable) {
 		questPanel.scrollTo(movable.getX(), movable.getY());
 	}
 
-	public void viewQuest(Quest quest) {
+	public void viewQuest(@Nullable Quest quest) {
+		if (quest != null && !file.canEdit() && quest.hideDetailsUntilStartable() && !file.selfTeamData.canStartTasks(quest)) {
+			return;
+		}
+
 		Quest current = viewQuestPanel.getViewedQuest();
 		if (current != quest) {
 			viewQuestPanel.setViewedQuest(quest);
@@ -365,7 +369,7 @@ private boolean copyObjectsToClipboard() {
 		}
 
 		return false;
-    }
+	}
 
 	private boolean pasteSelectedQuest(boolean withDeps) {
 		if (ChapterImage.isImageInClipboard()) {

diff --git a/gradle.properties b/gradle.properties
@@ -5,7 +5,7 @@ mod_id=ftbquests
 archives_base_name=ftb-quests
 minecraft_version=1.20.1
 # Build time
-mod_version=2001.4.5
+mod_version=2001.4.6
 maven_group=dev.ftb.mods
 mod_author=FTB Team
 # Curse release