From 5805b47e888628857dbef7f6d93ea46d22c58f7e Mon Sep 17 00:00:00 2001 From: PikaMug <2267126+PikaMug@users.noreply.github.com> Date: Wed, 6 Dec 2023 18:47:54 -0500 Subject: [PATCH] New quest IDs use leading zeros --- .../java/me/pikamug/quests/BukkitQuestsPlugin.java | 8 ++++---- .../quests/convo/quests/main/QuestMainPrompt.java | 11 +++++++---- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/core/src/main/java/me/pikamug/quests/BukkitQuestsPlugin.java b/core/src/main/java/me/pikamug/quests/BukkitQuestsPlugin.java index cdd61acf7..c3d6aea29 100644 --- a/core/src/main/java/me/pikamug/quests/BukkitQuestsPlugin.java +++ b/core/src/main/java/me/pikamug/quests/BukkitQuestsPlugin.java @@ -562,7 +562,7 @@ public class BukkitQuestsPlugin extends JavaPlugin implements Quests { * @param fileName Name of file to attempt move */ private void moveStorageResource(String fileName) { - File storageFile = new File(getDataFolder(), fileName); + final File storageFile = new File(getDataFolder(), fileName); if (!storageFile.isFile()) { return; } @@ -575,9 +575,9 @@ public class BukkitQuestsPlugin extends JavaPlugin implements Quests { + outDir.canWrite() + ")"); } } - boolean q = storageFile.renameTo(outFile); - if (!q) { - getLogger().severe("Unable to move " + fileName + " file. Check folder permissions and restart."); + final boolean moved = storageFile.renameTo(outFile); + if (!moved) { + getLogger().severe("Unable to move " + fileName + " file. Check folder permissions and restart server."); getServer().getPluginManager().disablePlugin(this); setEnabled(false); } diff --git a/core/src/main/java/me/pikamug/quests/convo/quests/main/QuestMainPrompt.java b/core/src/main/java/me/pikamug/quests/convo/quests/main/QuestMainPrompt.java index 7501dcfcf..77bebd208 100644 --- a/core/src/main/java/me/pikamug/quests/convo/quests/main/QuestMainPrompt.java +++ b/core/src/main/java/me/pikamug/quests/convo/quests/main/QuestMainPrompt.java @@ -45,6 +45,7 @@ import org.jetbrains.annotations.NotNull; import java.io.File; import java.io.IOException; import java.util.List; +import java.util.Locale; import java.util.Map; import java.util.Objects; import java.util.Set; @@ -866,15 +867,17 @@ public class QuestMainPrompt extends QuestsEditorNumericPrompt { ConfigurationSection newSection = null; if (context.getSessionData(Key.Q_ID) == null) { // Creating - int customNum = 1; + int num = 1; + final int padding = 6; + final String customNum = String.format(Locale.US, "%0" + padding + "d", num); while (true) { - if (questSection.contains("custom" + customNum)) { - customNum++; + if (questSection.contains(customNum)) { + num++; } else { break; } } - newSection = questSection.createSection("custom" + customNum); + newSection = questSection.createSection(customNum); } else { // Editing final String qid = (String)context.getSessionData(Key.Q_ID);