Merge pull request #777 from FTBTeam/dev

Dev

Author: desht

CHANGELOG.md

@@ -4,6 +4,17 @@ 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).
 
+## [2101.1.8]
+
+### Added
+* If all tasks in a quest are marked optional, now require at least one to be completed to complete the quest
+  * Previously quest would just auto-complete, which is less useful (if that behaviour is really needed, use a quest with no tasks at all)
+  * This allows for quests with a choice of two or more tasks, where completing any of the tasks will complete the quest
+
+### Fixed
+* Hotfix: fix player login exception related to exclusive quest branching feature added in 2101.1.7
+* Tooltip on optional tasks now reads "Optional Task" instead of "Optional Quest"
+
 ## [2101.1.7]
 
 ### Added

common/src/main/java/dev/ftb/mods/ftbquests/client/gui/quests/QuestScreen.java

@@ -469,13 +469,10 @@ public boolean keyPressed(Key key) {
 		List<Chapter> visibleChapters = file.getVisibleChapters(file.selfTeamData);
 
 		if (key.is(GLFW.GLFW_KEY_TAB)) {
-			if (selectedChapter != null && file.getVisibleChapters(file.selfTeamData).size() > 1) {
-
-				if (!visibleChapters.isEmpty()) {
-					selectChapter(visibleChapters.get(MathUtils.mod(visibleChapters.indexOf(selectedChapter) + (isShiftKeyDown() ? -1 : 1), visibleChapters.size())));
-					selectedChapter.getAutofocus().ifPresent(this::scrollTo);
-				}
-			}
+			if (selectedChapter != null && visibleChapters.size() > 1) {
+                selectChapter(visibleChapters.get(MathUtils.mod(visibleChapters.indexOf(selectedChapter) + (isShiftKeyDown() ? -1 : 1), visibleChapters.size())));
+                selectedChapter.getAutofocus().ifPresent(this::scrollTo);
+            }
 
 			return true;
 		}

common/src/main/java/dev/ftb/mods/ftbquests/client/gui/quests/TaskButton.java

@@ -60,10 +60,14 @@ public boolean mousePressed(MouseButton button) {
 	@Override
 	public void onClicked(MouseButton button) {
 		if (button.isLeft()) {
-			boolean canClick = task.isValid()
-					&& questScreen.file.selfTeamData.canStartTasks(task.getQuest())
-					&& !questScreen.file.selfTeamData.isCompleted(task);
-			task.onButtonClicked(this, canClick);
+			if (task.getQuestFile().canEdit() && ScreenWrapper.hasAltDown()) {
+				task.onEditButtonClicked(questScreen);
+			} else {
+				boolean canClick = task.isValid()
+						&& questScreen.file.selfTeamData.canStartTasks(task.getQuest())
+						&& !questScreen.file.selfTeamData.isCompleted(task);
+				task.onButtonClicked(this, canClick);
+			}
 		} else if (button.isRight() && questScreen.file.canEdit()) {
 			playClickSound();
 
@@ -168,7 +172,7 @@ public void addMouseOverText(TooltipList list) {
 		}
 
 		if (task.isOptionalForProgression()) {
-			list.add(Component.translatable("ftbquests.quest.misc.optional").withStyle(ChatFormatting.GRAY));
+			list.add(Component.translatable("ftbquests.quest.misc.optional_task").withStyle(ChatFormatting.GRAY));
 		}
 
 		task.addMouseOverText(list, questScreen.file.selfTeamData);

common/src/main/java/dev/ftb/mods/ftbquests/quest/QuestObject.java

@@ -126,12 +126,23 @@ public Collection<? extends QuestObject> getChildren() {
 	}
 
 	public boolean isCompletedRaw(TeamData data) {
+		int nOptional = 0;
+		int nCompleted = 0;
         for (QuestObject child : getChildren()) {
-            if (!child.isOptionalForProgression() && !data.isExcludedByOtherQuestline(child) && !data.isCompleted(child)) {
-				return false;
+			boolean uncompleted = !data.isCompleted(child) && !data.isExcludedByOtherQuestline(child);
+			if (uncompleted) {
+				if (child.isOptionalForProgression()) {
+					nOptional++;
+				} else {
+					return false;
+				}
+			} else {
+				nCompleted++;
 			}
         }
-        return true;
+		// if there are no children at all, it's auto-completed (degenerate case)
+		// if ALL children are optional, require at least one to be completed (e.g. quests with either/or tasks)
+        return getChildren().isEmpty() || nOptional < getChildren().size() || nCompleted > 0;
 	}
 
 	public boolean isOptionalForProgression() {

common/src/main/java/dev/ftb/mods/ftbquests/quest/TeamData.java

@@ -547,8 +547,8 @@ public boolean areDependenciesVisible(Quest quest) {
 	}
 
 	public boolean canStartTasks(Quest quest) {
-		return !isExcludedByOtherQuestline(quest) &&
-				(quest.getProgressionMode() == ProgressionMode.FLEXIBLE || areDependenciesComplete(quest));
+		return (quest.getProgressionMode() == ProgressionMode.FLEXIBLE || areDependenciesComplete(quest))
+				&& !isExcludedByOtherQuestline(quest);
 	}
 
 	public void claimReward(ServerPlayer player, Reward reward, boolean notify) {
@@ -778,7 +778,18 @@ public LongSet getPinnedQuestIds(Player player) {
 	}
 
 	public boolean isExcludedByOtherQuestline(QuestObject qo) {
-		return qo instanceof Excludable e && exclusionCache.computeIfAbsent(e.getId(), k -> e.isQuestObjectExcluded(this));
+		if (qo instanceof Excludable e) {
+			// note: computeIfAbsent() won't work well here due to indirect recursion
+			//   (can throw exception with both standard and fastutil maps)
+			if (exclusionCache.containsKey(e.getId())) {
+				return exclusionCache.get(e.getId());
+			}
+			boolean excluded = e.isQuestObjectExcluded(this);
+			exclusionCache.put(e.getId(), excluded);
+			return excluded;
+
+		}
+		return false;
 	}
 
 	private static class PerPlayerData {

common/src/main/java/dev/ftb/mods/ftbquests/quest/task/Task.java

@@ -337,7 +337,7 @@ public void readNetData(RegistryFriendlyByteBuf buffer) {
 	public void fillConfigGroup(ConfigGroup config) {
 		super.fillConfigGroup(config);
 
-		config.addBool("optional_task", optionalTask, v -> optionalTask = v, false).setNameKey("ftbquests.quest.misc.optional");
+		config.addBool("optional_task", optionalTask, v -> optionalTask = v, false).setNameKey("ftbquests.quest.misc.optional_task");
 	}
 
 	protected ResourceLocation safeResourceLocation(String str, ResourceLocation fallback) {

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

@@ -216,6 +216,7 @@
 	"ftbquests.quest.visibility.hide_lock_icon.tooltip": "Hide the lock icon that is normally shown when quest is locked due to a dependency",
 	"ftbquests.quest.misc.disable_jei": "Disable JEI Recipe",
 	"ftbquests.quest.misc.optional": "Optional Quest",
+	"ftbquests.quest.misc.optional_task": "Optional Task",
 	"ftbquests.quest.locked": "Locked: uncompleted dependencies",
 	"ftbquests.quest.appearance.min_width": "Min Opened Quest Window Width",
 	"ftbquests.quest.misc.ignore_reward_blocking": "Ignore reward blocking",

gradle.properties

@@ -9,7 +9,7 @@ maven_group=dev.ftb.mods
 mod_author=FTB Team
 
 # Build time
-mod_version=2101.1.7
+mod_version=2101.1.8
 minecraft_version=1.21.1
 
 # Cross env