Merge pull request #770 from FTBTeam/1.20.1/dev

1.20.1/dev

Author: desht

CHANGELOG.md

@@ -4,6 +4,15 @@ 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.12]
+
+### Fixed
+* Fixed `/ftbquests import_reward_table_from_chest` command not correctly updating quest book id mappings for new reward table
+* Fixed some quest button alignment issues depending on the zoom level of the quest panel* Fixed autoclaim rewards being given to entire team even when marked as team reward
+  * Also added tooltip to team reward setting in the reward properties GUI to clarify: team reward means one reward for the whole team
+* Fixed multiline quest editor "L" (insert link) button sometimes inserting a spurious comma, depending on current text selection
+* Leading/trailing whitespace is now silently trimmed from command text in command rewards (trailing whitespace could cause confusing failures to execute commands)
+
 ## [2001.4.11]
 
 ### Fixed

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

@@ -219,8 +219,8 @@ private void doLinkInsertion(long questID) {
 
 				StringBuilder builder = new StringBuilder("[ ");
 				if (!parts.get(0).isEmpty()) builder.append("\"").append(parts.get(0)).append("\", ");
-				builder.append(String.format(LINK_TEXT_TEMPLATE, parts.get(1), questID)).append(", ");
-				if (!parts.get(2).isEmpty()) builder.append("\"").append(parts.get(2)).append("\"");
+				builder.append(String.format(LINK_TEXT_TEMPLATE, parts.get(1), questID));
+				if (!parts.get(2).isEmpty()) builder.append(", ").append("\"").append(parts.get(2)).append("\"");
 				builder.append(" ]");
 
 				textBox.selectCurrentLine();

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

@@ -149,7 +149,7 @@ public void alignWidgets() {
 
 				double x = (qx - questMinX - qw / 2D) * (bs + bp) + bp / 2D + bp * (qw - 1D) / 2D;
 				double y = (qy - questMinY - qh / 2D) * (bs + bp) + bp / 2D + bp * (qh - 1D) / 2D;
-				w.setPosAndSize((int) x, (int) y, (int) (bs * qw), (int) (bs * qh));
+				w.setPosAndSize((int) Math.round(x), (int) Math.round(y), (int) Math.round(bs * qw), (int) Math.round(bs * qh));
 			}
 		}
 
@@ -249,10 +249,10 @@ public void drawOffsetBackground(GuiGraphics graphics, Theme theme, int x, int y
 	}
 
 	private void renderConnection(Widget widget, QuestButton button, PoseStack poseStack, BufferBuilder buffer, float s, int r, int g, int b, int a, int a1, float mu, Tesselator tesselator) {
-		int sx = widget.getX() + widget.width / 2;
-		int sy = widget.getY() + widget.height / 2;
-		int ex = button.getX() + button.width / 2;
-		int ey = button.getY() + button.height / 2;
+		double sx = widget.getX() + widget.width / 2.0;
+		double sy = widget.getY() + widget.height / 2.0;
+		double ex = button.getX() + button.width / 2.0;
+		double ey = button.getY() + button.height / 2.0;
 		float len = (float) MathUtils.dist(sx, sy, ex, ey);
 
 		poseStack.pushPose();
@@ -340,7 +340,7 @@ public void draw(GuiGraphics graphics, Theme theme, int x, int y, int w, int h)
 
 						poseStack.pushPose();
 						poseStack.translate(0, 0, 200);
-						GuiHelper.drawHollowRect(graphics, (int) boxX, (int) boxY, (int) boxW, (int) boxH, Color4I.WHITE.withAlpha(30), false);
+						GuiHelper.drawHollowRect(graphics, (int) Math.round(boxX), (int) Math.round(boxY), (int) Math.round(boxW), (int) Math.round(boxH), Color4I.WHITE.withAlpha(30), false);
 						poseStack.popPose();
 					}
 				} else if (!questScreen.isViewingQuest() || !questScreen.viewQuestPanel.isMouseOver()) {
@@ -361,9 +361,9 @@ public void draw(GuiGraphics graphics, Theme theme, int x, int y, int w, int h)
 					if (QuestScreen.grid && !questScreen.isViewingQuest()) {
 						poseStack.pushPose();
 						poseStack.translate(0, 0, 1000);
-						Color4I.WHITE.draw(graphics, (int) sx, (int) sy, 1, 1);
+						Color4I.WHITE.draw(graphics, (int) Math.round(sx), (int) Math.round(sy), 1, 1);
 						Color4I.WHITE.withAlpha(30).draw(graphics, getX(), (int) sy, width, 1);
-						Color4I.WHITE.withAlpha(30).draw(graphics, (int) sx, getY(), 1, height);
+						Color4I.WHITE.withAlpha(30).draw(graphics, (int) Math.round(sx), getY(), 1, height);
 						poseStack.popPose();
 					}
 				}

common/src/main/java/dev/ftb/mods/ftbquests/command/FTBQuestsCommands.java

@@ -256,15 +256,15 @@ private static int importRewards(CommandSourceStack source, String name, BlockPo
 			pos = BlockPos.containing(player.pick(10, 1F, false).getLocation());
 		}
 
-		RewardTable table = new RewardTable(file.newID(), file);
-		table.setRawTitle(name);
-		table.setRawIcon(Items.CHEST.getDefaultInstance());
-
 		BlockEntity be = level.getBlockEntity(pos);
 		if (!(be instanceof BaseContainerBlockEntity container)) {
 			throw NO_INVENTORY.create();
 		}
 
+		RewardTable table = new RewardTable(file.newID(), file);
+		table.setRawTitle(name);
+		table.setRawIcon(Items.CHEST.getDefaultInstance());
+
 		for (int i = 0; i < container.getContainerSize(); i++) {
 			ItemStack stack = container.getItem(i);
 			if (!stack.isEmpty()) {
@@ -273,6 +273,9 @@ private static int importRewards(CommandSourceStack source, String name, BlockPo
 		}
 
 		file.addRewardTable(table);
+		file.refreshIDMap();
+		file.clearCachedData();
+		file.markDirty();
 
 		new CreateObjectResponseMessage(table, null).sendToAll(level.getServer());
 

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

@@ -559,16 +559,20 @@ public void checkAutoCompletion(Quest quest) {
 			RewardAutoClaim auto = reward.getAutoClaimType();
 
 			if (auto != RewardAutoClaim.DISABLED) {
-				if (online == null) {
-					online = getOnlineMembers();
-
-					if (online.isEmpty()) {
-						return;
+				if (reward.isTeamReward() && ServerQuestFile.INSTANCE.getCurrentPlayer() != null) {
+					// only the submitting player gets the reward if it's a team reward
+					// (assuming it's possible to determine who the submitting player is)
+					claimReward(ServerQuestFile.INSTANCE.getCurrentPlayer(), reward, auto == RewardAutoClaim.ENABLED);
+				} else {
+					if (online == null) {
+						online = getOnlineMembers();
+						if (online.isEmpty()) {
+							return;
+						}
+					}
+					for (ServerPlayer player : online) {
+						claimReward(player, reward, auto == RewardAutoClaim.ENABLED);
 					}
-				}
-
-				for (ServerPlayer player : online) {
-					claimReward(player, reward, auto == RewardAutoClaim.ENABLED);
 				}
 			}
 		}

common/src/main/java/dev/ftb/mods/ftbquests/quest/reward/CommandReward.java

@@ -105,7 +105,7 @@ public void claim(ServerPlayer player, boolean notify) {
 			overrides.put("online_member_count", team.getOnlineMembers().size());
 		});
 
-		String cmd = format(command, overrides);
+		String cmd = format(command.trim(), overrides);
 
 		CommandSourceStack source = player.createCommandSourceStack();
 		if (elevatePerms) source = source.withPermission(2);

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

@@ -415,6 +415,7 @@
 	"ftbquests.reward": "Reward",
 	"ftbquests.rewards": "Rewards",
 	"ftbquests.reward.team_reward": "Team Reward",
+	"ftbquests.reward.team_reward.tooltip": "When true, this is one reward for the whole team; only the submitting player receives it\nWhen false, all online players receive the reward",
 	"ftbquests.reward.blocked": "%d reward(s) blocked for team '%s'",
 	"ftbquests.reward.this_blocked": "Reward blocked for team '%s'",
 	"ftbquests.reward.emergency": "Emergency Item",

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.11
+mod_version=2001.4.12
 maven_group=dev.ftb.mods
 mod_author=FTB Team
 # Curse release