From 696bc20c7ef6d9ce6369936411c771469fa2eac5 Mon Sep 17 00:00:00 2001 From: Teriuihi Date: Fri, 3 Jun 2022 01:06:24 +0200 Subject: [PATCH] Made the book more configurable --- .../alttd/altitudequests/config/Config.java | 10 +++---- .../altitudequests/config/QuestsConfig.java | 29 +++++++++++++++++-- .../altitudequests/database/Database.java | 2 +- .../objects/quests/BreedMobsQuest.java | 11 +++++-- .../objects/quests/CollectDropsQuest.java | 12 ++++++-- .../objects/quests/KillMobsQuest.java | 11 +++++-- .../objects/quests/MineQuest.java | 13 +++++++-- 7 files changed, 70 insertions(+), 18 deletions(-) diff --git a/src/main/java/com/alttd/altitudequests/config/Config.java b/src/main/java/com/alttd/altitudequests/config/Config.java index 985d1a2..bf06dd3 100644 --- a/src/main/java/com/alttd/altitudequests/config/Config.java +++ b/src/main/java/com/alttd/altitudequests/config/Config.java @@ -24,13 +24,13 @@ public final class Config extends AbstractConfig { public static List QUEST_PAGES = List.of(""" Hey - Here is a quick summary of your quest progress so far! + Active quest summary: * Quest: - * Variant: - * Items obtained: / - * Items turned in: / + * Type: + * : / + * : / - Click here to turn in more items + """); private static void loadBook() { QUEST_BOOK_AUTHOR = config.getString("book.author", QUEST_BOOK_AUTHOR); diff --git a/src/main/java/com/alttd/altitudequests/config/QuestsConfig.java b/src/main/java/com/alttd/altitudequests/config/QuestsConfig.java index c84b273..9d3a2aa 100644 --- a/src/main/java/com/alttd/altitudequests/config/QuestsConfig.java +++ b/src/main/java/com/alttd/altitudequests/config/QuestsConfig.java @@ -1,6 +1,5 @@ package com.alttd.altitudequests.config;; -import com.alttd.altitudequests.objects.quests.CollectDropsQuest; import com.alttd.altitudequests.objects.variants.BreedMobsQuestObject; import com.alttd.altitudequests.objects.variants.CollectDropsQuestObject; import com.alttd.altitudequests.objects.variants.KillMobsQuestObject; @@ -29,7 +28,10 @@ public class QuestsConfig extends AbstractConfig { } public static List MINE_QUESTS = new ArrayList<>(); - public static String MINE_QUEST_NAME = "Mine quest"; + public static String MINE_QUEST_NAME = "Mining"; + public static String MINE_STEP_1 = "Mined"; + public static String MINE_STEP_2 = "Turned in"; + public static String MINE_TURN_IN = "Click here to turn in your "; private static void loadMineQuests() { MINE_QUESTS.clear(); @@ -54,10 +56,16 @@ public class QuestsConfig extends AbstractConfig { } } MINE_QUEST_NAME = config.getString("mining.name", MINE_QUEST_NAME); + MINE_STEP_1 = config.getString("mining.step-1", MINE_STEP_1); + MINE_STEP_2 = config.getString("mining.step-2", MINE_STEP_2); + MINE_TURN_IN = config.getString("mining.turn-in", MINE_TURN_IN); } public static List KILL_MOB_QUEST = new ArrayList<>(); - public static String KILL_MOB_QUEST_NAME = "Kill mobs quest"; + public static String KILL_MOB_QUEST_NAME = "Kill mobs"; + public static String KILL_MOB_STEP_1 = "Killed"; + public static String KILL_MOB_STEP_2 = "Confirmed"; + public static String KILL_MOB_TURN_IN = "Click here to confirm the killed s"; private static void loadKillMobQuests() { KILL_MOB_QUEST.clear(); ConfigurationSection configurationSection = config.getConfigurationSection("kill_mobs.possible_tasks"); @@ -81,10 +89,16 @@ public class QuestsConfig extends AbstractConfig { } } KILL_MOB_QUEST_NAME = config.getString("kill_mobs.name", KILL_MOB_QUEST_NAME); + KILL_MOB_STEP_1 = config.getString("kill_mobs.step-1", KILL_MOB_STEP_1); + KILL_MOB_STEP_2 = config.getString("kill_mobs.step-2", KILL_MOB_STEP_2); + KILL_MOB_TURN_IN = config.getString("kill_mobs.turn-in", KILL_MOB_TURN_IN); } public static List COLLECT_DROPS_QUEST = new ArrayList<>(); public static String COLLECT_DROPS_QUEST_NAME = "Collect drops quest"; + public static String COLLECT_DROPS_STEP_1 = "Obtained"; + public static String COLLECT_DROPS_STEP_2 = "Turned in"; + public static String COLLECT_DROPS_TURN_IN = "Click here to turn in your "; private static void loadCollectQuests() { COLLECT_DROPS_QUEST.clear(); ConfigurationSection configurationSection = config.getConfigurationSection("collect_drops.possible_tasks"); @@ -108,10 +122,16 @@ public class QuestsConfig extends AbstractConfig { } } COLLECT_DROPS_QUEST_NAME = config.getString("collect_drops.name", COLLECT_DROPS_QUEST_NAME); + COLLECT_DROPS_STEP_1 = config.getString("collect_drops.step-1", COLLECT_DROPS_STEP_1); + COLLECT_DROPS_STEP_2 = config.getString("collect_drops.step-2", COLLECT_DROPS_STEP_2); + COLLECT_DROPS_TURN_IN = config.getString("collect_drops.turn-in", COLLECT_DROPS_TURN_IN); } public static List BREED_MOB_QUEST = new ArrayList<>(); public static String BREED_MOB_QUEST_NAME = "Breed mobs quest"; + public static String BREED_STEP_1 = "Bred"; + public static String BREED_STEP_2 = "Confirmed"; + public static String BREED_TURN_IN = "Click here to confirm the baby s"; private static void loadBreedMobQuests() { BREED_MOB_QUEST.clear(); ConfigurationSection configurationSection = config.getConfigurationSection("breed_mobs.possible_tasks"); @@ -135,5 +155,8 @@ public class QuestsConfig extends AbstractConfig { } } BREED_MOB_QUEST_NAME = config.getString("breed_mobs.name", BREED_MOB_QUEST_NAME); + BREED_STEP_1 = config.getString("breed_mobs.step-1", BREED_STEP_1); + BREED_STEP_2 = config.getString("breed_mobs.step-2", BREED_STEP_2); + BREED_TURN_IN = config.getString("breed_mobs.turn-in", BREED_TURN_IN); } } diff --git a/src/main/java/com/alttd/altitudequests/database/Database.java b/src/main/java/com/alttd/altitudequests/database/Database.java index 250bebf..aba546d 100644 --- a/src/main/java/com/alttd/altitudequests/database/Database.java +++ b/src/main/java/com/alttd/altitudequests/database/Database.java @@ -97,7 +97,7 @@ public class Database { "quest_variant VARCHAR(36) NOT NULL, " + "step_1_progress INT NOT NULL, " + "step_2_progress INT NOT NULL, " + - "PRIMARY KEY (UUID, quest)" + + "PRIMARY KEY (UUID)" + ")"; getDatabase().getConnection().prepareStatement(sql).executeUpdate(); } catch (SQLException e) { diff --git a/src/main/java/com/alttd/altitudequests/objects/quests/BreedMobsQuest.java b/src/main/java/com/alttd/altitudequests/objects/quests/BreedMobsQuest.java index 7001a24..4d60c04 100644 --- a/src/main/java/com/alttd/altitudequests/objects/quests/BreedMobsQuest.java +++ b/src/main/java/com/alttd/altitudequests/objects/quests/BreedMobsQuest.java @@ -81,14 +81,21 @@ public class BreedMobsQuest extends Quest { @Override public TagResolver getTagResolvers() { - return TagResolver.resolver( + TagResolver resolver = TagResolver.resolver( Placeholder.unparsed("mob", breedMobsQuestObject.getEntityType().name()), Placeholder.parsed("step_1_progress", getStep1() == breedMobsQuestObject.getAmount() ? "" + getStep1() + "" : "" + getStep1() + ""), Placeholder.parsed("step_1_total", String.valueOf(breedMobsQuestObject.getAmount())), Placeholder.parsed("step_2_progress", getStep2() == breedMobsQuestObject.getAmount() ? "" + getStep2() + "" : "" + getStep2() + ""), - Placeholder.parsed("step_2_total", String.valueOf(breedMobsQuestObject.getAmount())) + Placeholder.parsed("step_2_total", String.valueOf(breedMobsQuestObject.getAmount())), + Placeholder.unparsed("step_1", QuestsConfig.BREED_STEP_1), + Placeholder.unparsed("step_2", QuestsConfig.BREED_STEP_2) + ); + Component turnInText = MiniMessage.miniMessage().deserialize(QuestsConfig.BREED_TURN_IN, resolver); + return TagResolver.resolver( + resolver, + Placeholder.component("turn_in_text", turnInText) ); } diff --git a/src/main/java/com/alttd/altitudequests/objects/quests/CollectDropsQuest.java b/src/main/java/com/alttd/altitudequests/objects/quests/CollectDropsQuest.java index 58aadaa..a35c6eb 100644 --- a/src/main/java/com/alttd/altitudequests/objects/quests/CollectDropsQuest.java +++ b/src/main/java/com/alttd/altitudequests/objects/quests/CollectDropsQuest.java @@ -85,14 +85,22 @@ public class CollectDropsQuest extends Quest { @Override public TagResolver getTagResolvers() { - return TagResolver.resolver( + TagResolver resolver = TagResolver.resolver( Placeholder.unparsed("item", collectDropsQuestObject.getMaterial().name()), Placeholder.parsed("step_1_progress", getStep1() == collectDropsQuestObject.getAmount() ? "" + getStep1() + "" : "" + getStep1() + ""), Placeholder.parsed("step_1_total", String.valueOf(collectDropsQuestObject.getAmount())), Placeholder.parsed("step_2_progress", getStep2() == collectDropsQuestObject.getAmount() ? "" + getStep2() + "" : "" + getStep2() + ""), - Placeholder.parsed("step_2_total", String.valueOf(collectDropsQuestObject.getAmount())) + Placeholder.parsed("step_2_total", String.valueOf(collectDropsQuestObject.getAmount())), + Placeholder.unparsed("step_1", QuestsConfig.COLLECT_DROPS_STEP_1), + Placeholder.unparsed("step_2", QuestsConfig.COLLECT_DROPS_STEP_2), + Placeholder.unparsed("turn_in_text", QuestsConfig.COLLECT_DROPS_TURN_IN) + ); + Component turnInText = MiniMessage.miniMessage().deserialize(QuestsConfig.COLLECT_DROPS_TURN_IN, resolver); + return TagResolver.resolver( + resolver, + Placeholder.component("turn_in_text", turnInText) ); } diff --git a/src/main/java/com/alttd/altitudequests/objects/quests/KillMobsQuest.java b/src/main/java/com/alttd/altitudequests/objects/quests/KillMobsQuest.java index 87c0473..4de6a7b 100644 --- a/src/main/java/com/alttd/altitudequests/objects/quests/KillMobsQuest.java +++ b/src/main/java/com/alttd/altitudequests/objects/quests/KillMobsQuest.java @@ -81,14 +81,21 @@ public class KillMobsQuest extends Quest { @Override public TagResolver getTagResolvers() { - return TagResolver.resolver( + TagResolver resolver = TagResolver.resolver( Placeholder.unparsed("mob", killMobsQuestObject.getEntityType().name()), Placeholder.parsed("step_1_progress", getStep1() == killMobsQuestObject.getAmount() ? "" + getStep1() + "" : "" + getStep1() + ""), Placeholder.parsed("step_1_total", String.valueOf(killMobsQuestObject.getAmount())), Placeholder.parsed("step_2_progress", getStep2() == killMobsQuestObject.getAmount() ? "" + getStep2() + "" : "" + getStep2() + ""), - Placeholder.parsed("step_2_total", String.valueOf(killMobsQuestObject.getAmount())) + Placeholder.parsed("step_2_total", String.valueOf(killMobsQuestObject.getAmount())), + Placeholder.unparsed("step_1", QuestsConfig.KILL_MOB_STEP_1), + Placeholder.unparsed("step_2", QuestsConfig.KILL_MOB_STEP_2) + ); + Component turnInText = MiniMessage.miniMessage().deserialize(QuestsConfig.KILL_MOB_TURN_IN, resolver); + return TagResolver.resolver( + resolver, + Placeholder.component("turn_in_text", turnInText) ); } diff --git a/src/main/java/com/alttd/altitudequests/objects/quests/MineQuest.java b/src/main/java/com/alttd/altitudequests/objects/quests/MineQuest.java index 0b2e377..9780245 100644 --- a/src/main/java/com/alttd/altitudequests/objects/quests/MineQuest.java +++ b/src/main/java/com/alttd/altitudequests/objects/quests/MineQuest.java @@ -82,15 +82,22 @@ public class MineQuest extends Quest { @Override public TagResolver getTagResolvers() { - return TagResolver.resolver( + TagResolver resolver = TagResolver.resolver( Placeholder.unparsed("block", mineQuestObject.getMaterial().name()), Placeholder.parsed("step_1_progress", getStep1() == mineQuestObject.getAmount() ? "" + getStep1() + "" : "" + getStep1() + ""), Placeholder.parsed("step_1_total", String.valueOf(mineQuestObject.getAmount())), Placeholder.parsed("step_2_progress", getStep2() == mineQuestObject.getAmount() ? "" + getStep2() + "" : "" + getStep2() + ""), - Placeholder.parsed("step_2_total", String.valueOf(mineQuestObject.getAmount())) - ); + Placeholder.parsed("step_2_total", String.valueOf(mineQuestObject.getAmount())), + Placeholder.unparsed("step_1", QuestsConfig.MINE_STEP_1), + Placeholder.unparsed("step_2", QuestsConfig.MINE_STEP_2) + ); + Component turnInText = MiniMessage.miniMessage().deserialize(QuestsConfig.MINE_TURN_IN, resolver); + return TagResolver.resolver( + resolver, + Placeholder.component("turn_in_text", turnInText) + ); } @Override