Small changes

pom.xml

@@ -112,7 +112,6 @@
                     <include>plugin.yml</include>
                     <include>events.yml</include>
                     <include>quests.yml</include>
-                    <include>items.txt</include>
                 </includes>
             </resource>
             <resource>

src/main/java/me/blackvein/quests/Quest.java

@@ -136,8 +136,6 @@ public class Quest {
         Stage currentStage = quester.getCurrentStage(this);
         quester.hardQuit(this);
         
-        System.out.println("Going to hard put Quest " + getName() + " to Stage " + stage);
-        System.out.println("Stages: " + this.orderedStages.size());
         quester.hardStagePut(this, stage);
         
         quester.addEmptiesFor(this, stage);
@@ -149,9 +147,6 @@ public class Quest {
         /*if (quester.getCurrentStage(this).finishEvent != null) {
          quester.getCurrentStage(this).finishEvent.fire(quester);
          }*/
-        System.out.println("vvv  Current Stage");
-        System.out.print(quester.getCurrentStage(this));
-        System.out.print("\n");
         if (quester.getCurrentStage(this).startEvent != null) {
             quester.getCurrentStage(this).startEvent.fire(quester, this);
         }
@@ -556,9 +551,6 @@ public class Quest {
 
             Quest other = (Quest) o;
             
-            System.out.println("COMPARING OTHER=" + other.name + " AGAINST SELF=" + name);
-
-            System.out.println("Here 1");
             if (other.blockStart != null && blockStart != null) {
                 if (other.blockStart.equals(blockStart) == false) {
                     return false;
@@ -569,7 +561,6 @@ public class Quest {
                 return false;
             }
 
-            System.out.println("Here 2");
             if (commands.size() == other.commands.size()) {
 
                 for (int i = 0; i < commands.size(); i++) {
@@ -581,7 +572,7 @@ public class Quest {
             } else {
                 return false;
             }
-System.out.println("Here 3");
+
             if (other.description.equals(description) == false) {
                 return false;
             }
@@ -599,7 +590,7 @@ System.out.println("Here 3");
             if (other.exp != exp) {
                 return false;
             }
-System.out.println("Here 4");
+
             if (other.failRequirements != null && failRequirements != null) {
                 if (other.failRequirements.equals(failRequirements) == false) {
                     return false;
@@ -621,7 +612,7 @@ System.out.println("Here 4");
             if (other.itemRewards.equals(itemRewards) == false) {
                 return false;
             }
-System.out.println("Here 5");
+
             if (other.rpgItemRewardIDs.equals(rpgItemRewardIDs) == false) {
                 return false;
             }
@@ -641,7 +632,7 @@ System.out.println("Here 5");
             if (other.heroesClasses.equals(heroesClasses) == false) {
                 return false;
             }
-System.out.println("Here 6");
+
             if (other.heroesAmounts.equals(heroesAmounts) == false) {
                 return false;
             }
@@ -661,7 +652,7 @@ System.out.println("Here 6");
             if (other.name.equals(name) == false) {
                 return false;
             }
-System.out.println("Here 7");
+
             if (other.neededQuests.equals(neededQuests) == false) {
                 return false;
             }
@@ -683,7 +674,7 @@ System.out.println("Here 7");
             if (other.permissionReqs.equals(permissionReqs) == false) {
                 return false;
             }
-System.out.println("Here 8");
+
             if (other.heroesPrimaryClassReq != null && heroesPrimaryClassReq != null) {
                 if (other.heroesPrimaryClassReq.equals(heroesPrimaryClassReq) == false) {
                     return false;

src/main/java/me/blackvein/quests/Quester.java

@@ -280,8 +280,6 @@ public class Quester {
                 String page = "";
                 
                 for(Quest quest : currentQuests.keySet()) {
-
-                    System.out.println("ADDING QUEST: " + quest.getName());
                     
                     if((currentLength + quest.name.length() > 240) || (currentLines + ((quest.name.length() % 19) == 0 ? (quest.name.length() / 19) : ((quest.name.length() / 19) + 1))) > 13) {
                         
@@ -346,17 +344,11 @@ public class Quester {
 
         Player player = getPlayer();
 
-        System.out.println("Hereeeeeee");
         if (q.testRequirements(player) == true || override) {
 
-            System.out.println("What?");
             addEmpties(q);
-            System.out.println("Okay");
             currentQuests.put(q, 0);
-            System.out.println("Done");
             Stage stage = q.getStage(0);
-            System.out.println("Going to add empties for: " + q.name);
-            
 
             if (!override) {
 
@@ -412,9 +404,6 @@ public class Quester {
 
         } else {
 
-            System.out.println("Problem");
-            System.out.println(q.testRequirements(player));
-            System.out.println(override);
             player.sendMessage(q.failRequirements);
 
         }
@@ -680,18 +669,6 @@ public class Quester {
         }
 
         for (ItemStack is : getCurrentStage(quest).itemsToDeliver) {
-
-            System.out.print("Quest data:  ");
-            System.out.print(getQuestData(quest));
-            System.out.println();
-            
-            System.out.print("Items delivered: ");
-            System.out.print(getQuestData(quest).itemsDelivered);
-            System.out.println();
-            
-            System.out.print("IS: ");
-            System.out.print(is);
-            System.out.println();
             
             int delivered = getQuestData(quest).itemsDelivered.get(is);
             int amt = is.getAmount();
@@ -1589,8 +1566,6 @@ public class Quester {
 
         QuestData data = new QuestData(this);
         data.setDoJournalUpdate(false);
-        
-        System.out.println("Put quest data for: " + quest.name);
 
         if (quest.getStage(0).blocksToDamage.isEmpty() == false) {
             for (Material m : quest.getStage(0).blocksToDamage.keySet()) {
@@ -1719,11 +1694,8 @@ public class Quester {
             }
         }
 
-        System.out.println("huehuehue");
         if (quest.getStage(0).passwordDisplays.isEmpty() == false) {
-            System.out.println("jajaja");
             for (String display : quest.getStage(0).passwordDisplays) {
-                System.out.println("display: " + display);
                 data.passwordsSaid.put(display, false);
             }
         }
@@ -1743,8 +1715,6 @@ public class Quester {
 
         QuestData data = new QuestData(this);
         data.setDoJournalUpdate(false);
-        
-        System.out.println("Put quest data for: " + quest.name);
 
         if (quest.getStage(stage).blocksToDamage.isEmpty() == false) {
             for (Material m : quest.getStage(stage).blocksToDamage.keySet()) {
@@ -1873,11 +1843,8 @@ public class Quester {
             }
         }
 
-        System.out.println("huehuehue");
         if (quest.getStage(stage).passwordDisplays.isEmpty() == false) {
-            System.out.println("jajaja");
             for (String display : quest.getStage(stage).passwordDisplays) {
-                System.out.println("display: " + display);
                 data.passwordsSaid.put(display, false);
             }
         }
@@ -2118,12 +2085,7 @@ public class Quester {
             for (Quest quest : currentQuests.keySet()) {
 
                 ConfigurationSection questSec = dataSec.createSection(quest.name);
-
-                if(getQuestData(quest) == null)
-                    System.out.println("Quest data is null for " + quest.name);
                 
-                System.out.println(getQuestData(quest));
-                System.out.println(getQuestData(quest).blocksDamaged);
                 if (getQuestData(quest).blocksDamaged.isEmpty() == false) {
 
                     LinkedList<Integer> blockIds = new LinkedList<Integer>();
@@ -2617,7 +2579,7 @@ public class Quester {
                 ConfigurationSection questSec = dataSec.getConfigurationSection(key);
 
                 Quest quest = plugin.getQuest(key);
-                Stage stage = null;
+                Stage stage;
 
                 if (quest == null || currentQuests.containsKey(quest) == false) {
                     continue;
@@ -2725,13 +2687,14 @@ public class Quester {
 
                     List<String> enchantNames = questSec.getStringList("enchantments");
                     List<Integer> ids = questSec.getIntegerList("enchantment-item-ids");
+                    List<Integer> times = questSec.getIntegerList("times-enchanted");
 
                     for (String s : enchantNames) {
 
                         enchantments.add(Quests.getEnchantment(s));
 
                         materials.add(Material.getMaterial(ids.get(enchantNames.indexOf(s))));
-                        amounts.add(enchantNames.indexOf(s));
+                        amounts.add(times.get(enchantNames.indexOf(s)));
 
                     }
 
@@ -2972,101 +2935,308 @@ public class Quester {
 
     }
 
-    public void startStageTimer(Quest quest) {
+public static ConfigurationSection getLegacyQuestData(FileConfiguration questSec, String questName) {
+        
+    ConfigurationSection newData = questSec.createSection("questData");
 
-        if (getQuestData(quest).delayTimeLeft > -1) {
+    if (questSec.contains("blocks-damaged-ids")) {
-            plugin.getServer().getScheduler().scheduleSyncDelayedTask(plugin, new StageTimer(plugin, this, quest), (long) (getQuestData(quest).delayTimeLeft * 0.02));
-        } else {
-            plugin.getServer().getScheduler().scheduleSyncDelayedTask(plugin, new StageTimer(plugin, this, quest), (long) (getCurrentStage(quest).delay * 0.02));
-            if (getCurrentStage(quest).delayMessage != null) {
-                plugin.getServer().getPlayer(id).sendMessage(Quests.parseString((getCurrentStage(quest).delayMessage), quest));
-            }
-        }
 
-        getQuestData(quest).delayStartTime = System.currentTimeMillis();
+        List<Integer> ids = questSec.getIntegerList("blocks-damaged-ids");
+        List<Integer> amounts = questSec.getIntegerList("blocks-damaged-amounts");
+
+        newData.set(questName + ".blocks-damaged-ids", ids);
+        newData.set(questName + ".blocks-damaged-amounts", amounts);
+    }
+
+    if (questSec.contains("blocks-broken-ids")) {
+
+        List<Integer> ids = questSec.getIntegerList("blocks-broken-ids");
+        List<Integer> amounts = questSec.getIntegerList("blocks-broken-amounts");
+
+        newData.set(questName + ".blocks-broken-ids", ids);
+        newData.set(questName + ".blocks-broken-amounts", amounts);
 
     }
 
-    public void stopStageTimer(Quest quest) {
+    if (questSec.contains("blocks-placed-ids")) {
 
-        if (getQuestData(quest).delayTimeLeft > -1) {
+        List<Integer> ids = questSec.getIntegerList("blocks-placed-ids");
-            getQuestData(quest).delayTimeLeft = getQuestData(quest).delayTimeLeft - (System.currentTimeMillis() - getQuestData(quest).delayStartTime);
+        List<Integer> amounts = questSec.getIntegerList("blocks-placed-amounts");
-        } else {
-            getQuestData(quest).delayTimeLeft = getCurrentStage(quest).delay - (System.currentTimeMillis() - getQuestData(quest).delayStartTime);
-        }
 
-        getQuestData(quest).delayOver = false;
+        newData.set(questName + ".blocks-placed-ids", ids);
+        newData.set(questName + ".blocks-placed-amounts", amounts);
 
     }
 
-    public long getStageTime(Quest quest) {
+    if (questSec.contains("blocks-used-ids")) {
 
-        if (getQuestData(quest).delayTimeLeft > -1) {
+        List<Integer> ids = questSec.getIntegerList("blocks-used-ids");
-            return getQuestData(quest).delayTimeLeft - (System.currentTimeMillis() - getQuestData(quest).delayStartTime);
+        List<Integer> amounts = questSec.getIntegerList("blocks-used-amounts");
-        } else {
+
-            return getCurrentStage(quest).delay - (System.currentTimeMillis() - getQuestData(quest).delayStartTime);
+        newData.set(questName + ".blocks-used-ids", ids);
+        newData.set(questName + ".blocks-used-amounts", amounts);
+
+    }
+
+    if (questSec.contains("blocks-cut-ids")) {
+
+        List<Integer> ids = questSec.getIntegerList("blocks-cut-ids");
+        List<Integer> amounts = questSec.getIntegerList("blocks-cut-amounts");
+
+        newData.set(questName + ".blocks-cut-ids", ids);
+        newData.set(questName + ".blocks-cut-amounts", amounts);
+
+    }
+
+    if (questSec.contains("fish-caught")) {
+        newData.set(questName + ".fish-caught", questSec.getInt("fish-caught"));
+    }
+
+    if (questSec.contains("players-killed")) {
+
+        List<String> playerNames = questSec.getStringList("player-killed-names");
+        List<Long> killTimes = questSec.getLongList("kill-times");
+
+        newData.set(questName + ".players-killed", questSec.getInt("players-killed"));
+        newData.set(questName + ".player-killed-names", playerNames);
+        newData.set(questName + ".kill-times", killTimes);
+
+    }
+
+    if (questSec.contains("enchantments")) {
+
+        List<String> enchantNames = questSec.getStringList("enchantments");
+        List<Integer> ids = questSec.getIntegerList("enchantment-item-ids");
+        List<Integer> times = questSec.getIntegerList("times-enchanted");
+
+        newData.set(questName + ".enchantments", enchantNames);
+        newData.set(questName + ".enchantment-item-ids", ids);
+        newData.set(questName + ".times-enchanted", times);
+
+    }
+
+    if (questSec.contains("mobs-killed")) {
+
+        List<String> mobs = questSec.getStringList("mobs-killed");
+        List<Integer> amounts = questSec.getIntegerList("mobs-killed-amounts");
+
+        newData.set(questName + ".mobs-killed", mobs);
+        newData.set(questName + ".mobs-killed-amounts", amounts);
+        
+        if (questSec.contains("mob-kill-locations")) {
+
+            List<String> locations = questSec.getStringList("mob-kill-locations");
+            List<Integer> radii = questSec.getIntegerList("mob-kill-location-radii");
+
+            newData.set(questName + ".mob-kill-locations", locations);
+            newData.set(questName + ".mob-kill-location-radii", radii);
+            
         }
 
     }
 
-    public boolean hasData() {
+    if (questSec.contains("item-delivery-amounts")) {
 
-        if (currentQuests.isEmpty() == false || questData.isEmpty() == false) {
+        List<Integer> deliveryAmounts = questSec.getIntegerList("item-delivery-amounts");
-            return true;
-        }
 
-        if (questPoints > 1) {
+        newData.set(questName + ".item-delivery-amounts", deliveryAmounts);
-            return true;
-        }
-
-        return completedQuests.isEmpty() == false;
 
     }
 
-    public void checkQuest(Quest quest) {
+    if (questSec.contains("citizen-ids-to-talk-to")) {
 
-        if (quest != null) {
+        List<Integer> ids = questSec.getIntegerList("citizen-ids-to-talk-to");
+        List<Boolean> has = questSec.getBooleanList("has-talked-to");
 
-            boolean exists = false;
+        newData.set(questName + ".citizen-ids-to-talk-to", ids);
+        newData.set(questName + ".has-talked-to", has);
 
-            for (Quest q : plugin.quests) {
+    }
 
-                if (q.name.equalsIgnoreCase(quest.name)) {
+    if (questSec.contains("citizen-ids-killed")) {
 
-                    exists = true;
+        List<Integer> ids = questSec.getIntegerList("citizen-ids-killed");
-                    if (q.equals(quest) == false) {
+        List<Integer> num = questSec.getIntegerList("citizen-amounts-killed");
 
-                        hardQuit(quest);
+        newData.set(questName + ".citizen-ids-killed", ids);
+        newData.set(questName + ".citizen-amounts-killed", num);
 
-                        if (plugin.getServer().getPlayer(id) != null) {
+    }
-                            String error = Lang.get("questModified");
-                            error = error.replaceAll("<quest>", ChatColor.DARK_PURPLE + quest.name + ChatColor.RED);
-                            plugin.getServer().getPlayer(id).sendMessage(ChatColor.GOLD + "[Quests] " + ChatColor.RED + error);
-                            updateJournal();
-                        }
 
-                    }
+    if (questSec.contains("locations-to-reach")) {
 
-                    break;
+        List<String> locations = questSec.getStringList("locations-to-reach");
+        List<Boolean> has = questSec.getBooleanList("has-reached-location");
+        List<Integer> radii = questSec.getIntegerList("radii-to-reach-within");
 
-                }
+        newData.set(questName + ".locations-to-reach", locations);
+        newData.set(questName + ".has-reached-location", has);
+        newData.set(questName + ".radii-to-reach-within", radii);
 
-            }
+    }
 
-            if (exists == false) {
+    if (questSec.contains("potions-brewed-ids")) {
+
+        List<Integer> ids = questSec.getIntegerList("potions-brewed-ids");
+        List<Integer> amounts = questSec.getIntegerList("potions-brewed-amounts");
+
+        newData.set(questName + ".potions-brewed-ids", ids);
+        newData.set(questName + ".potions-brewed-amounts", amounts);
+
+    }
+
+    if (questSec.contains("mobs-to-tame")) {
+
+        List<String> mobs = questSec.getStringList("mobs-to-tame");
+        List<Integer> amounts = questSec.getIntegerList("mob-tame-amounts");
+
+        newData.set(questName + ".mobs-to-tame", mobs);
+        newData.set(questName + ".mob-tame-amounts", amounts);
+
+    }
+
+    if (questSec.contains("sheep-to-shear")) {
+
+        List<String> colors = questSec.getStringList("sheep-to-shear");
+        List<Integer> amounts = questSec.getIntegerList("sheep-sheared");
+
+        newData.set(questName + ".sheep-to-shear", colors);
+        newData.set(questName + ".sheep-sheared", amounts);
+
+    }
+
+    if (questSec.contains("passwords")) {
+
+        List<String> passwords = questSec.getStringList("passwords");
+        List<Boolean> said = questSec.getBooleanList("passwords-said");
+        
+        newData.set(questName + ".passwords", passwords);
+        newData.set(questName + ".passwords-said", said);
+
+    }
+
+    if (questSec.contains("custom-objectives")) {
+
+        List<String> customObj = questSec.getStringList("custom-objectives");
+        List<Integer> customObjCount = questSec.getIntegerList("custom-objective-counts");
+
+        newData.set(questName + ".custom-objectives", customObj);
+        newData.set(questName + ".custom-objective-counts", customObjCount);
+
+    }
+
+    if (questSec.contains("stage-delay")) {
+
+        newData.set(questName + ".stage-delay", questSec.getLong("stage-delay"));
+
+    }
+
+    if (questSec.contains("chat-triggers")) {
+
+        List<String> triggers = questSec.getStringList("chat-triggers");
+        newData.set(questName + ".chat-triggers", triggers);
+
+    }
+    
+    return newData;
+
+}
+
+public void startStageTimer(Quest quest) {
+
+if (getQuestData(quest).delayTimeLeft > -1) {
+    plugin.getServer().getScheduler().scheduleSyncDelayedTask(plugin, new StageTimer(plugin, this, quest), (long) (getQuestData(quest).delayTimeLeft * 0.02));
+} else {
+    plugin.getServer().getScheduler().scheduleSyncDelayedTask(plugin, new StageTimer(plugin, this, quest), (long) (getCurrentStage(quest).delay * 0.02));
+    if (getCurrentStage(quest).delayMessage != null) {
+        plugin.getServer().getPlayer(id).sendMessage(Quests.parseString((getCurrentStage(quest).delayMessage), quest));
+    }
+}
+
+getQuestData(quest).delayStartTime = System.currentTimeMillis();
+
+}
+
+public void stopStageTimer(Quest quest) {
+
+if (getQuestData(quest).delayTimeLeft > -1) {
+    getQuestData(quest).delayTimeLeft = getQuestData(quest).delayTimeLeft - (System.currentTimeMillis() - getQuestData(quest).delayStartTime);
+} else {
+    getQuestData(quest).delayTimeLeft = getCurrentStage(quest).delay - (System.currentTimeMillis() - getQuestData(quest).delayStartTime);
+}
+
+getQuestData(quest).delayOver = false;
+
+}
+
+public long getStageTime(Quest quest) {
+
+if (getQuestData(quest).delayTimeLeft > -1) {
+    return getQuestData(quest).delayTimeLeft - (System.currentTimeMillis() - getQuestData(quest).delayStartTime);
+} else {
+    return getCurrentStage(quest).delay - (System.currentTimeMillis() - getQuestData(quest).delayStartTime);
+}
+
+}
+
+public boolean hasData() {
+
+if (currentQuests.isEmpty() == false || questData.isEmpty() == false) {
+    return true;
+}
+
+if (questPoints > 1) {
+    return true;
+}
+
+return completedQuests.isEmpty() == false;
+
+}
+
+public void checkQuest(Quest quest) {
+
+if (quest != null) {
+
+    boolean exists = false;
+
+    for (Quest q : plugin.quests) {
+
+        if (q.name.equalsIgnoreCase(quest.name)) {
+
+            exists = true;
+            if (q.equals(quest) == false) {
+
+                hardQuit(quest);
 
                 if (plugin.getServer().getPlayer(id) != null) {
-                    String error = Lang.get("questNotExist");
+                    String error = Lang.get("questModified");
                     error = error.replaceAll("<quest>", ChatColor.DARK_PURPLE + quest.name + ChatColor.RED);
                     plugin.getServer().getPlayer(id).sendMessage(ChatColor.GOLD + "[Quests] " + ChatColor.RED + error);
+                    updateJournal();
                 }
 
             }
 
+            break;
+
         }
 
     }
 
+    if (exists == false) {
+
+        if (plugin.getServer().getPlayer(id) != null) {
+            String error = Lang.get("questNotExist");
+            error = error.replaceAll("<quest>", ChatColor.DARK_PURPLE + quest.name + ChatColor.RED);
+            plugin.getServer().getPlayer(id).sendMessage(ChatColor.GOLD + "[Quests] " + ChatColor.RED + error);
+        }
+
+    }
+
+}
+
+    }
+
     public static String checkPlacement(Inventory inv, int rawSlot) {
 
         if (rawSlot < 0) {

src/main/java/me/blackvein/quests/Quests.java

@@ -135,6 +135,7 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener,
     public boolean showQuestReqs = true;
     public boolean allowQuitting = true;
     public boolean debug = false;
+    public boolean convertData = false;
     public boolean load = false;
     public int killDelay = 0;
     public int totalQuestPoints = 0;
@@ -229,6 +230,21 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener,
                 log.log(Level.INFO, "[Quests] " + events.size() + " Event(s) loaded.");
                 log.log(Level.INFO, "[Quests] " + Lang.getPhrases() + " Phrase(s) loaded.");
                 questers.putAll(getOnlineQuesters());
+                
+                if(convertData) {
+                    
+                    convertQuesters();
+                    
+                    FileConfiguration config = getConfig();
+                    config.set("convert-data-on-startup", false);
+                    
+                    try {
+                        config.save(new File(Quests.this.getDataFolder(), "config.yml"));
+                    } catch (IOException e) {
+                        e.printStackTrace();
+                    }
+                }
+                
                 if (snoop) {
                     snoop();
                 }
@@ -529,6 +545,7 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener,
         debug = config.getBoolean("debug-mode", false);
         killDelay = config.getInt("kill-delay", 600);
         acceptTimeout = config.getInt("accept-timeout", 20);
+        convertData = config.getBoolean("convert-data-on-startup", false);
 
         if (config.contains("language")) {
             Lang.lang = config.getString("language");
@@ -5286,7 +5303,8 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener,
                                 final File copy = new File(dataFolder, entry.getValue() + ".yml");
 
                                 final FileConfiguration config = new YamlConfiguration();
-
+                                final FileConfiguration newConfig = new YamlConfiguration();
+                                
                                 config.load(found);
                                 
                                 if(config.contains("currentQuest")) {
@@ -5296,12 +5314,17 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener,
                                     LinkedList<Integer> currentStages = new LinkedList<Integer>();
                                     currentStages.add(config.getInt("currentStage"));
                                     
-                                    config.set("currentQuests", currentQuests);
+                                    newConfig.set("currentQuests", currentQuests);
-                                    config.set("currentStages", currentStages);
+                                    newConfig.set("currentStages", currentStages);
+                                    newConfig.set("hasJournal", false);
+                                    newConfig.set("lastKnownName", entry.getKey());
+                                    
+                                    ConfigurationSection dataSec = Quester.getLegacyQuestData(config, config.getString("currentQuest"));
+                                    newConfig.set("questData", dataSec);
                                     
                                 }
                                 
-                                config.save(copy);
+                                newConfig.save(copy);
 
                                 found.delete();
 

src/main/java/me/blackvein/quests/lang_modified

@@ -1,35 +0,0 @@
-
--MODIFIED-
-
-COMMAND_QUIT_HELP
-COMMAND_QUESTADMIN_NEXTSTAGE_HELP
-COMMAND_QUESTADMIN_SETSTAGE_HELP
-COMMAND_QUESTADMIN_SETSTAGE_USAGE
-COMMAND_QUESTADMIN_QUIT_HELP
-
-questsUnknownAdminCommand
-
-currentQuest
-noCurrentQuest
-noActiveQuest
-
-questObjectivesTitle
-
--REMOVED-
-
-questOneActive
-
--ADDED-
-
-COMMAND_JOURNAL
-COMMAND_JOURNAL_HELP
-
-questMaxAllowed
-questAlreadyOn
-questsPlayerHasQuestAlready
-journalTitle
-journalTaken
-journalPutAway
-journalAlreadyHave
-journalNoRoom
-usage

src/main/resources/config.yml

@@ -3,6 +3,7 @@ allow-command-questing: true
 allow-command-quests-with-npcs: false
 show-requirements: true
 allow-quitting: true
+ignore-locked-quests: false
 debug-mode: false
 generate-files-on-join: true
 kill-delay: 600
@@ -11,6 +12,7 @@ snoop: true
 show-npc-effects: true
 npc-effect: "note"
 max-quests: 0
+convert-data-on-startup: false
 quester-blacklist:
   - "SomeGuy12345"
   - "somePrefix*"

src/main/resources/items.txt

@@ -1,215 +0,0 @@
-Stone=1
-Grass=2
-Dirt=3
-Cobblestone,Cobble=4
-WoodenPlank=5,0
-RedwoodPlank=5,1
-BirchPlank=5,2
-Sapling=6
-Bedrock=7
-Water=8
-StationaryWater=9
-Lava=10
-StationaryLava=11
-Sand=12
-Gravel=13
-GoldOre=14
-IronOre=15
-CoalOre=16
-Wood=17
-Leaves=18,0
-RedwoodLeaves=18,1
-BirchLeaves=18,2
-Sponge=19
-Glass=20
-LapisLazuliOre=21
-LapisLazuliBlock=22
-Dispenser=23
-Sandstone=24
-NoteBlock=25
-Wool=35,0
-OrangeWool=35,1
-MagentaWool=35,2
-LightBlueWool=35,3
-YellowWool=35,4
-LightGreenWool=35,5
-PinkWool=35,6
-GrayWool=35,7
-LightGrayWool=35,8
-CyanWool=35,9
-PurpleWool=35,10
-BlueWool=35,11
-BrownWool=35,12
-DarkGreenWool=35,13
-RedWool=35,14
-BlackWool=35,15
-YellowFlower=37
-RedRose=38
-BrownMushroom=39
-RedMushroom=40
-GoldBlock=41
-IronBlock=42
-DoubleSlab=43
-StoneSlab=44,0
-SandstoneSlab=44,1
-WoodenSlab=44,2
-CobblestoneSlab=44,3
-BrickBlock=45
-TNT=46
-Bookshelf=47
-MossStone=48
-Obsidian=49
-Torch=50
-MonsterSpawner=52
-WoodenStairs=53
-Chest=54
-DiamondOre=56
-DiamondBlock=57
-CraftingTable=58
-Crops=59
-Farmland=60
-Furnace=61
-Ladder=65
-Rails=66
-CobblestoneStairs=67
-Lever=69
-StonePressurePlate=70
-WoodenPressurePlate=72
-RedstoneOre=73
-GlowingRedstoneOre=74
-RedstoneTorch=76
-StoneButton=77
-Snow=78
-Ice=79
-SnowBlock=80
-Cactus=81
-ClayBlock=82
-Jukebox=84
-Fence=85
-Pumpkin=86
-Netherrack=87
-SoulSand=88
-GlowstoneBlock=89
-Portal=90
-Jack-O-Lantern=91
-CakeBlock=92
-IronShovel=256
-IronPickaxe=257
-IronAxe=258
-FlintandSteel=259
-Apple=260
-Bow=261
-Arrow=262
-Coal=263,0
-Charcoal=263,1
-Diamond=264
-IronIngot=265
-GoldIngot=266
-IronSword=267
-WoodenSword=268
-WoodenShovel=269
-WoodenPickaxe=270
-WoodenAxe=271
-StoneSword=272
-StoneShovel=273
-StonePickaxe=274
-StoneAxe=275
-DiamondSword=276
-DiamondShovel=277
-DiamondPickaxe=278
-DiamondAxe=279
-Stick=280
-Bowl=281
-MushroomSoup=282
-GoldSword=283
-GoldShovel=284
-GoldPickaxe=285
-GoldAxe=286
-String=287
-Feather=288
-Gunpowder=289
-WoodenHoe=290
-StoneHoe=291
-IronHoe=292
-DiamondHoe=293
-GoldHoe=294
-Seeds=295
-Wheat=296
-Bread=297
-LeatherHelmet=298
-LeatherChestplate=299
-LeatherLeggings=300
-LeatherBoots=301
-ChainmailHelmet=302
-ChainmailChestplate=303
-ChainmailLeggings=304
-ChainmailBoots=305
-IronHelmet=306
-IronChestplate=307
-IronLeggings=308
-IronBoots=309
-DiamondHelmet=310
-DiamondChestplate=311
-DiamondLeggings=312
-DiamondBoots=313
-GoldHelmet=314
-GoldChestplate=315
-GoldLeggings=316
-GoldBoots=317
-Flint=318
-RawPorkchop=319
-CookedPorkchop=320
-Paintings=321
-Goldenapple=322
-Sign=323
-Woodendoor=324
-Bucket=325
-Waterbucket=326
-Lavabucket=327
-Minecart=328
-Saddle=329
-Irondoor=330
-Redstone=331
-Snowball=332
-Boat=333
-Leather=334
-Milk=335
-ClayBrick=336
-ClayBalls=337
-SugarCane=338
-Paper=339
-Book=340
-Slimeball=341
-StorageMinecart=342
-PoweredMinecart=343
-Egg=344
-Compass=345
-FishingRod=346
-Clock=347
-GlowstoneDust=348
-RawFish=349
-CookedFish=350
-InkSac=351,0
-RoseRed=351,1
-CactusGreen=351,2
-CocoaBeans=351,3
-LapisLazuliDye=351,4
-PurpleDye=351,5
-CyanDye=351,6
-LightGrayDye=351,7
-GrayDye=351,8
-PinkDye=351,9
-LimeDye=351,10
-DandelionYellow=351,11
-LightBlueDye=351,12
-MagentaDye=351,13
-OrangeDye=351,14
-BoneMeal=351,15
-Bone=352
-Sugar=353
-Cake=354
-Bed=355
-RedstoneRepeater=356
-Cookie=357
-GoldMusicDisc=2256
-GreenMusicDisc=2257

src/main/resources/quests.yml

@@ -4,7 +4,6 @@ quests:
     ask-message: '<yellow>Could you mine <purple>10<yellow> blocks of <purple>Stone<yellow>, and deliver the <purple>10<yellow> pieces of <purple>Cobblestone<yellow> to me?.'
     finish-message: '<yellow>Well done. Here is your reward.'
     redo-delay: 1800000
-    parties: 0
     requirements:
       items:
         - id-270:amount-1
@@ -18,17 +17,13 @@ quests:
             - 1
           break-block-amounts:
             - 10
-
     rewards:
       money: 1000
       quest-points: 1
-
-
   Hunter:
     name: 'Mob Hunter'
     ask-message: '<yellow>Kill an assortment of Mobs.'
     finish-message: '<yellow>Excellent. Here is a <purple>Diamond Sword<yellow>.'
-    parties: 2
     requirements:
       quests:
         - Stone Miner
@@ -55,7 +50,6 @@ quests:
             - Skeleton
           mob-amounts:
             - 1
-
     rewards:
       items:
         - id-276:amount-1
@@ -67,7 +61,6 @@ quests:
     name: 'Catch Fish'
     ask-message: '<yellow>Catch some fish!'
     finish-message: '<yellow>Excellent. Here is some <green>experience<yellow>.'
-    parties: 2
     requirements:
       quests:
         - Stone Miner
@@ -82,6 +75,5 @@ quests:
           chat-event-triggers:
             - "rod"
           fish-to-catch: 5
-
     rewards:
       exp: 250