From cf48671315653016794a28d0981cbc4ba78e2a40 Mon Sep 17 00:00:00 2001 From: Kam Date: Tue, 12 Mar 2024 15:20:49 -0400 Subject: [PATCH] Fix Variable Names in QuestCat and DialogCat --- .../npcs/controllers/data/DialogCategory.java | 16 ++++++------ .../npcs/controllers/data/QuestCategory.java | 25 ++++++++++--------- 2 files changed, 21 insertions(+), 20 deletions(-) diff --git a/src/main/java/noppes/npcs/controllers/data/DialogCategory.java b/src/main/java/noppes/npcs/controllers/data/DialogCategory.java index 3c6267ee8..27e02684e 100644 --- a/src/main/java/noppes/npcs/controllers/data/DialogCategory.java +++ b/src/main/java/noppes/npcs/controllers/data/DialogCategory.java @@ -14,15 +14,15 @@ public class DialogCategory implements IDialogCategory { public int id = -1; public String title = ""; public HashMap dialogs; - + public DialogCategory(){ dialogs = new HashMap(); } - + public void readNBT(NBTTagCompound compound){ id = compound.getInteger("Slot"); title = compound.getString("Title"); - + NBTTagList dialogsList = compound.getTagList("Dialogs", 10); if(dialogsList != null){ for(int ii = 0; ii < dialogsList.tagCount(); ii++) @@ -37,15 +37,15 @@ public class DialogCategory implements IDialogCategory { } } - public NBTTagCompound writeNBT(NBTTagCompound nbtfactions) { - nbtfactions.setInteger("Slot", id); - nbtfactions.setString("Title", title); + public NBTTagCompound writeNBT(NBTTagCompound dialogCat) { + dialogCat.setInteger("Slot", id); + dialogCat.setString("Title", title); NBTTagList dialogs = new NBTTagList(); for(Dialog dialog : this.dialogs.values()){ dialogs.appendTag(dialog.writeToNBT(new NBTTagCompound())); } - nbtfactions.setTag("Dialogs", dialogs); - return nbtfactions; + dialogCat.setTag("Dialogs", dialogs); + return dialogCat; } public List dialogs() { diff --git a/src/main/java/noppes/npcs/controllers/data/QuestCategory.java b/src/main/java/noppes/npcs/controllers/data/QuestCategory.java index 05d0806b1..a9086efb2 100644 --- a/src/main/java/noppes/npcs/controllers/data/QuestCategory.java +++ b/src/main/java/noppes/npcs/controllers/data/QuestCategory.java @@ -13,7 +13,7 @@ public class QuestCategory implements IQuestCategory { public HashMap quests; public int id = -1; public String title = ""; - + public QuestCategory(){ quests = new HashMap(); } @@ -21,11 +21,11 @@ public class QuestCategory implements IQuestCategory { public void readNBT(NBTTagCompound nbttagcompound) { id = nbttagcompound.getInteger("Slot"); title = nbttagcompound.getString("Title"); - NBTTagList dialogsList = nbttagcompound.getTagList("Dialogs", 10); - if(dialogsList != null){ - for(int ii = 0; ii < dialogsList.tagCount(); ii++) + NBTTagList questList = nbttagcompound.getTagList("Quests", 10); + if(questList != null){ + for(int ii = 0; ii < questList.tagCount(); ii++) { - NBTTagCompound nbttagcompound2 = dialogsList.getCompoundTagAt(ii); + NBTTagCompound nbttagcompound2 = questList.getCompoundTagAt(ii); Quest quest = new Quest(); quest.readNBT(nbttagcompound2); quest.category = this; @@ -37,16 +37,17 @@ public class QuestCategory implements IQuestCategory { public NBTTagCompound writeNBT(NBTTagCompound nbttagcompound) { nbttagcompound.setInteger("Slot", id); nbttagcompound.setString("Title", title); - NBTTagList dialogs = new NBTTagList(); - for(int dialogId : quests.keySet()){ - Quest quest = quests.get(dialogId); - dialogs.appendTag(quest.writeToNBT(new NBTTagCompound())); + NBTTagList quests = new NBTTagList(); + for(int questID : this.quests.keySet()){ + Quest quest = this.quests.get(questID); + quests.appendTag(quest.writeToNBT(new NBTTagCompound())); } - - nbttagcompound.setTag("Dialogs", dialogs); - + + nbttagcompound.setTag("Quests", quests); + return nbttagcompound; } + public List quests() { return new ArrayList(this.quests.values());