From 3e0a2d29a3c861088874517e58ae39fbf612e07f Mon Sep 17 00:00:00 2001 From: Kam Date: Sat, 2 Mar 2024 04:09:36 -0500 Subject: [PATCH] Party Quests Variable rename --- src/main/java/noppes/npcs/QuestLogData.java | 12 ++++++------ .../client/gui/player/inventory/GuiQuestLog.java | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/noppes/npcs/QuestLogData.java b/src/main/java/noppes/npcs/QuestLogData.java index a0c084f73..3f7dd8fed 100644 --- a/src/main/java/noppes/npcs/QuestLogData.java +++ b/src/main/java/noppes/npcs/QuestLogData.java @@ -21,8 +21,8 @@ public class QuestLogData { public HashMap questAlerts = new HashMap<>(); public HashMap> questStatus = new HashMap<>(); public HashMap finish = new HashMap<>(); - public HashSet partyAbleQuests = new HashSet<>(); - + public HashSet partyQuests = new HashSet<>(); + public NBTTagCompound writeNBT(){ NBTTagCompound compound = new NBTTagCompound(); compound.setTag("Categories", NBTTags.nbtVectorMap(categories)); @@ -31,7 +31,7 @@ public class QuestLogData { compound.setTag("Status", NBTTags.nbtVectorMap(questStatus)); compound.setTag("QuestFinisher", NBTTags.nbtStringStringMap(finish)); compound.setString("TrackedQuestID", trackedQuestKey); - compound.setTag("PartyQuests", NBTTags.nbtStringSet(partyAbleQuests)); + compound.setTag("PartyQuests", NBTTags.nbtStringSet(partyQuests)); return compound; } @@ -42,7 +42,7 @@ public class QuestLogData { questStatus = NBTTags.getVectorMap(compound.getTagList("Status", 10)); finish = NBTTags.getStringStringMap(compound.getTagList("QuestFinisher", 10)); trackedQuestKey = compound.getString("TrackedQuestID"); - partyAbleQuests = NBTTags.getStringSet(compound.getTagList("PartyQuests", 10)); + partyQuests = NBTTags.getStringSet(compound.getTagList("PartyQuests", 10)); } public void setData(EntityPlayer player){ PlayerData playerData = PlayerDataController.Instance.getPlayerData(player); @@ -54,7 +54,7 @@ public class QuestLogData { categories.put(category, new Vector()); Vector list = categories.get(category); list.add(quest.title); - + questText.put(category + ":" + quest.title, quest.logText); questAlerts.put(category + ":" + quest.title, String.valueOf(playerData.questData.activeQuests.get(quest.id).sendAlerts)); questStatus.put(category + ":" + quest.title, quest.questInterface.getQuestLogStatus(player)); @@ -68,7 +68,7 @@ public class QuestLogData { } if (quest.partyOptions.allowParty) { - partyAbleQuests.add(category + ":" + quest.title); + partyQuests.add(category + ":" + quest.title); } } } diff --git a/src/main/java/noppes/npcs/client/gui/player/inventory/GuiQuestLog.java b/src/main/java/noppes/npcs/client/gui/player/inventory/GuiQuestLog.java index 7911e5e76..510daefca 100644 --- a/src/main/java/noppes/npcs/client/gui/player/inventory/GuiQuestLog.java +++ b/src/main/java/noppes/npcs/client/gui/player/inventory/GuiQuestLog.java @@ -88,7 +88,7 @@ public class GuiQuestLog extends GuiCNPCInventory implements ITopButtonListener, addButton(new GuiButtonNextPage(1, guiLeft + 286, guiTop + 176, true)); addButton(new GuiButtonNextPage(2, guiLeft + 144, guiTop + 176, false)); - if (data.partyAbleQuests.contains(data.selectedCategory + ":" + data.selectedQuest)) { + if (data.partyQuests.contains(data.selectedCategory + ":" + data.selectedQuest)) { String questName = ClientCacheHandler.party != null ? ClientCacheHandler.party.getCurrentQuestName() : null; GuiNpcButton partyButton = new GuiNpcButton(3, guiLeft + 150, guiTop + 151, 50, 20, new String[]{"party.party", "party.partying"}, Objects.equals(questName, data.selectedQuest) ? 1 : 0); addButton(partyButton);