Merge pull request #771 from FTBTeam/1.20.1/dev

1.20.1/dev

Author: desht

CHANGELOG.md

@@ -6,6 +6,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [2001.4.12]
 
+### Added
+* Added new "Drop FTB Quests Book on Death" setting in quest book properties (default false, as before)
+
 ### 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

common/src/main/java/dev/ftb/mods/ftbquests/FTBQuestsEventHandler.java

@@ -192,11 +192,14 @@ private void cloned(ServerPlayer oldPlayer, ServerPlayer newPlayer, boolean wonG
 			return;
 		}
 
-		for (int i = 0; i < oldPlayer.getInventory().items.size(); i++) {
-			ItemStack stack = oldPlayer.getInventory().items.get(i);
+		if (!ServerQuestFile.INSTANCE.dropBookOnDeath()) {
+			for (int i = 0; i < oldPlayer.getInventory().items.size(); i++) {
+				ItemStack stack = oldPlayer.getInventory().items.get(i);
 
-			if (stack.getItem() == FTBQuestsItems.BOOK.get() && newPlayer.addItem(stack)) {
-				oldPlayer.getInventory().items.set(i, ItemStack.EMPTY);
+				if (stack.getItem() == FTBQuestsItems.BOOK.get() && newPlayer.addItem(stack)) {
+					oldPlayer.getInventory().items.set(i, ItemStack.EMPTY);
+
+				}
 			}
 		}
 	}

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

@@ -84,6 +84,7 @@ public abstract class BaseQuestFile extends QuestObject implements QuestFile {
 	protected String lockMessage;
 	private ProgressionMode progressionMode;
 	private int detectionDelay;
+	private boolean dropBookOnDeath;
 
 	private List<Task> allTasks;
 	private List<Task> submitTasks;
@@ -122,6 +123,7 @@ public BaseQuestFile() {
 		lockMessage = "";
 		progressionMode = ProgressionMode.LINEAR;
 		detectionDelay = 20;
+		dropBookOnDeath = false;
 
 		allTasks = null;
 	}
@@ -400,6 +402,7 @@ public final void writeData(CompoundTag nbt) {
 		nbt.putString("lock_message", lockMessage);
 		nbt.putString("progression_mode", progressionMode.getId());
 		nbt.putInt("detection_delay", detectionDelay);
+		nbt.putBoolean("drop_book_on_death", dropBookOnDeath);
 	}
 
 	@Override
@@ -442,6 +445,7 @@ public final void readData(CompoundTag nbt) {
 		if (nbt.contains("detection_delay")) {
 			detectionDelay = nbt.getInt("detection_delay");
 		}
+		dropBookOnDeath = nbt.getBoolean("drop_book_on_death");
 	}
 
 	public final void writeDataFull(Path folder) {
@@ -751,6 +755,7 @@ public final void writeNetData(FriendlyByteBuf buffer) {
 		buffer.writeUtf(lockMessage, Short.MAX_VALUE);
 		ProgressionMode.NAME_MAP_NO_DEFAULT.write(buffer, progressionMode);
 		buffer.writeVarInt(detectionDelay);
+		buffer.writeBoolean(dropBookOnDeath);
 	}
 
 	@Override
@@ -771,6 +776,7 @@ public final void readNetData(FriendlyByteBuf buffer) {
 		lockMessage = buffer.readUtf(Short.MAX_VALUE);
 		progressionMode = ProgressionMode.NAME_MAP_NO_DEFAULT.read(buffer);
 		detectionDelay = buffer.readVarInt();
+		dropBookOnDeath = buffer.readBoolean();
 	}
 
 	public final void writeNetDataFull(FriendlyByteBuf buffer) {
@@ -1046,6 +1052,7 @@ public void fillConfigGroup(ConfigGroup config) {
 		config.addEnum("progression_mode", progressionMode, v -> progressionMode = v, ProgressionMode.NAME_MAP_NO_DEFAULT);
 		config.addInt("detection_delay", detectionDelay, v -> detectionDelay = v, 20, 0, 200);
 		config.addBool("pause_game", pauseGame, v -> pauseGame = v, false);
+		config.addBool("drop_book_on_death", dropBookOnDeath, v -> dropBookOnDeath = v, true);
 
 		ConfigGroup defaultsGroup = config.getOrCreateSubgroup("defaults");
 		defaultsGroup.addBool("reward_team", defaultPerTeamReward, v -> defaultPerTeamReward = v, false);
@@ -1434,4 +1441,8 @@ public boolean moveChapterGroup(long id, boolean movingUp) {
 	public EntityWeight getLootCrateNoDrop() {
 		return lootCrateNoDrop;
 	}
+
+	public boolean dropBookOnDeath() {
+		return dropBookOnDeath;
+	}
 }

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

@@ -110,6 +110,7 @@
 	"ftbquests.file.pause_game": "Quest Screen Pauses SSP Game",
 	"ftbquests.file.pause_game.tooltip": "Does not apply to multiplayer games",
 	"ftbquests.file.detection_delay": "Item Auto-Detection Minimum Interval",
+	"ftbquests.file.drop_book_on_death": "Drop FTB Quests Book on Death",
 	"ftbquests.file.detection_delay.tooltip": "Minimum interval (in ticks) between checks of a player's inventory when it changes\nHigher values are kinder on server TPS, especially if players inventories change frequently, but mean longer delays for quest auto-completion messages.",
 	"ftbquests.chapter.misc.progression_mode": "Default 'Progression Mode'",
 	"ftbquests.chapter.misc.default_repeatable": "Default 'Repeatable Quest'",

forge/src/main/java/dev/ftb/mods/ftbquests/forge/FTBQuestsForge.java

@@ -78,11 +78,10 @@ private static void livingDrops(LivingDropsEvent event) {
 	}
 
 	private static void dropsEvent(LivingDropsEvent event) {
-		if (!(event.getEntity() instanceof ServerPlayer player)) {
-			return;
-		}
-
-		if (player instanceof FakePlayer || player.level().getGameRules().getBoolean(GameRules.RULE_KEEPINVENTORY)) {
+		if (!(event.getEntity() instanceof ServerPlayer player)
+				|| player instanceof FakePlayer
+				|| player.level().getGameRules().getBoolean(GameRules.RULE_KEEPINVENTORY)
+				|| ServerQuestFile.INSTANCE.dropBookOnDeath()) {
 			return;
 		}