diff --git a/build.gradle.kts b/build.gradle.kts index bfb87eb..6e29e43 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -44,6 +44,6 @@ tasks { } dependencies { - compileOnly("com.alttd:Galaxy-API:1.19-R0.1-SNAPSHOT") + compileOnly("com.alttd:Galaxy-API:1.20.4-R0.1-SNAPSHOT") compileOnly("com.alttd.datalock:api:1.1.0-SNAPSHOT") } \ No newline at end of file diff --git a/src/main/java/com/alttd/altitudequests/objects/Quest.java b/src/main/java/com/alttd/altitudequests/objects/Quest.java index 0652d44..402f179 100644 --- a/src/main/java/com/alttd/altitudequests/objects/Quest.java +++ b/src/main/java/com/alttd/altitudequests/objects/Quest.java @@ -331,4 +331,26 @@ public abstract class Quest { public int getAmount() { return amount; } + + protected void saveQuest(PreparedStatement statement, Variant variant) throws SQLException { + int yearDay = Utilities.getYearDay(); + if (Config.DEBUG) + Logger.info("Saving user for year day %.", String.valueOf(yearDay)); + statement.setInt(1, yearDay); + statement.setString(2, getUuid().toString()); + statement.setString(3, this.getClass().getSimpleName()); + statement.setString(4, variant.getInternalName()); + statement.setInt(5, getStep1()); + statement.setInt(6, getStep2()); + statement.setInt(7, getAmount()); + statement.setInt(8, isRewardReceived() ? 1 : 0); + statement.setString(9, this.getClass().getSimpleName()); + statement.setString(10, variant.getInternalName()); + statement.setInt(11, getStep1()); + statement.setInt(12, getStep2()); + statement.setInt(13, yearDay); + statement.setInt(14, getAmount()); + statement.setInt(15, isRewardReceived() ? 1 : 0); + statement.execute(); + } } 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 ba4eaf9..2049e2d 100644 --- a/src/main/java/com/alttd/altitudequests/objects/quests/BreedMobsQuest.java +++ b/src/main/java/com/alttd/altitudequests/objects/quests/BreedMobsQuest.java @@ -60,25 +60,7 @@ public class BreedMobsQuest extends Quest { "ON DUPLICATE KEY UPDATE " + "quest = ?, quest_variant = ?, step_1_progress = ?, step_2_progress = ?, year_day = ?, amount = ?, reward_received = ?"; try (PreparedStatement statement = Database.getDatabase().getConnection().prepareStatement(sql)) { - int yearDay = Utilities.getYearDay(); - if (Config.DEBUG) - Logger.info("Saving user for year day %.", String.valueOf(yearDay)); - statement.setInt(1, yearDay); - statement.setString(2, getUuid().toString()); - statement.setString(3, this.getClass().getSimpleName()); - statement.setString(4, breedMobsQuestObject.getInternalName()); - statement.setInt(5, getStep1()); - statement.setInt(6, getStep2()); - statement.setInt(7, getAmount()); - statement.setInt(8, isRewardReceived() ? 1 : 0); - statement.setString(9, this.getClass().getSimpleName()); - statement.setString(10, breedMobsQuestObject.getInternalName()); - statement.setInt(11, getStep1()); - statement.setInt(12, getStep2()); - statement.setInt(13, yearDay); - statement.setInt(14, getAmount()); - statement.setInt(15, isRewardReceived() ? 1 : 0); - statement.execute(); + saveQuest(statement, getVariant()); } catch (SQLException exception) { Logger.throwing(BreedMobsQuest.class.getName(), "save", exception); } 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 93035eb..6f922e5 100644 --- a/src/main/java/com/alttd/altitudequests/objects/quests/CollectDropsQuest.java +++ b/src/main/java/com/alttd/altitudequests/objects/quests/CollectDropsQuest.java @@ -63,25 +63,7 @@ public class CollectDropsQuest extends Quest { "ON DUPLICATE KEY UPDATE " + "quest = ?, quest_variant = ?, step_1_progress = ?, step_2_progress = ?, year_day = ?, amount = ?, reward_received = ?"; try (PreparedStatement statement = Database.getDatabase().getConnection().prepareStatement(sql)) { - int yearDay = Utilities.getYearDay(); - if (Config.DEBUG) - Logger.info("Saving user for year day %.", String.valueOf(yearDay)); - statement.setInt(1, yearDay); - statement.setString(2, getUuid().toString()); - statement.setString(3, this.getClass().getSimpleName()); - statement.setString(4, collectDropsQuestObject.getInternalName()); - statement.setInt(5, getStep1()); - statement.setInt(6, getStep2()); - statement.setInt(7, getAmount()); - statement.setInt(8, isRewardReceived() ? 1 : 0); - statement.setString(9, this.getClass().getSimpleName()); - statement.setString(10, collectDropsQuestObject.getInternalName()); - statement.setInt(11, getStep1()); - statement.setInt(12, getStep2()); - statement.setInt(13, yearDay); - statement.setInt(14, getAmount()); - statement.setInt(15, isRewardReceived() ? 1 : 0); - statement.execute(); + saveQuest(statement, getVariant()); } catch (SQLException exception) { Logger.throwing(CollectDropsQuest.class.getName(), "save", exception); } 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 0df4dca..f229442 100644 --- a/src/main/java/com/alttd/altitudequests/objects/quests/KillMobsQuest.java +++ b/src/main/java/com/alttd/altitudequests/objects/quests/KillMobsQuest.java @@ -60,25 +60,7 @@ public class KillMobsQuest extends Quest { "ON DUPLICATE KEY UPDATE " + "quest = ?, quest_variant = ?, step_1_progress = ?, step_2_progress = ?, year_day = ?, amount = ?, reward_received = ?"; try (PreparedStatement statement = Database.getDatabase().getConnection().prepareStatement(sql)) { - int yearDay = Utilities.getYearDay(); - if (Config.DEBUG) - Logger.info("Saving user for year day %.", String.valueOf(yearDay)); - statement.setInt(1, yearDay); - statement.setString(2, getUuid().toString()); - statement.setString(3, this.getClass().getSimpleName()); - statement.setString(4, killMobsQuestObject.getInternalName()); - statement.setInt(5, getStep1()); - statement.setInt(6, getStep2()); - statement.setInt(7, getAmount()); - statement.setInt(8, isRewardReceived() ? 1 : 0); - statement.setString(9, this.getClass().getSimpleName()); - statement.setString(10, killMobsQuestObject.getInternalName()); - statement.setInt(11, getStep1()); - statement.setInt(12, getStep2()); - statement.setInt(13, yearDay); - statement.setInt(14, getAmount()); - statement.setInt(15, isRewardReceived() ? 1 : 0); - statement.execute(); + saveQuest(statement, getVariant()); } catch (SQLException exception) { Logger.throwing(KillMobsQuest.class.getName(), "save", exception); } 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 2dddd69..92762bd 100644 --- a/src/main/java/com/alttd/altitudequests/objects/quests/MineQuest.java +++ b/src/main/java/com/alttd/altitudequests/objects/quests/MineQuest.java @@ -64,25 +64,7 @@ public class MineQuest extends Quest { "ON DUPLICATE KEY UPDATE " + "quest = ?, quest_variant = ?, step_1_progress = ?, step_2_progress = ?, year_day = ?, amount = ?, reward_received = ?"; try (PreparedStatement statement = Database.getDatabase().getConnection().prepareStatement(sql)) { - int yearDay = Utilities.getYearDay(); - if (Config.DEBUG) - Logger.info("Saving user for year day %.", String.valueOf(yearDay)); - statement.setInt(1, yearDay); - statement.setString(2, getUuid().toString()); - statement.setString(3, this.getClass().getSimpleName()); - statement.setString(4, mineQuestObject.getInternalName()); - statement.setInt(5, getStep1()); - statement.setInt(6, getStep2()); - statement.setInt(7, getAmount()); - statement.setInt(8, isRewardReceived() ? 1 : 0); - statement.setString(9, this.getClass().getSimpleName()); - statement.setString(10, mineQuestObject.getInternalName()); - statement.setInt(11, getStep1()); - statement.setInt(12, getStep2()); - statement.setInt(13, yearDay); - statement.setInt(14, getAmount()); - statement.setInt(15, isRewardReceived() ? 1 : 0); - statement.execute(); + saveQuest(statement, getVariant()); } catch (SQLException exception) { Logger.throwing(MineQuest.class.getName(), "save", exception); } diff --git a/src/main/java/com/alttd/altitudequests/objects/quests/OtherQuest.java b/src/main/java/com/alttd/altitudequests/objects/quests/OtherQuest.java index 749da68..9315167 100644 --- a/src/main/java/com/alttd/altitudequests/objects/quests/OtherQuest.java +++ b/src/main/java/com/alttd/altitudequests/objects/quests/OtherQuest.java @@ -67,25 +67,7 @@ public class OtherQuest extends Quest { "ON DUPLICATE KEY UPDATE " + "quest = ?, quest_variant = ?, step_1_progress = ?, step_2_progress = ?, year_day = ?, amount = ?, reward_received = ?"; try (PreparedStatement statement = Database.getDatabase().getConnection().prepareStatement(sql)) { - int yearDay = Utilities.getYearDay(); - if (Config.DEBUG) - Logger.info("Saving user for year day %.", String.valueOf(yearDay)); - statement.setInt(1, yearDay); - statement.setString(2, getUuid().toString()); - statement.setString(3, this.getClass().getSimpleName()); - statement.setString(4, otherQuestObject.getInternalName()); - statement.setInt(5, getStep1()); - statement.setInt(6, getStep2()); - statement.setInt(7, getAmount()); - statement.setInt(8, isRewardReceived() ? 1 : 0); - statement.setString(9, this.getClass().getSimpleName()); - statement.setString(10, otherQuestObject.getInternalName()); - statement.setInt(11, getStep1()); - statement.setInt(12, getStep2()); - statement.setInt(13, yearDay); - statement.setInt(14, getAmount()); - statement.setInt(15, isRewardReceived() ? 1 : 0); - statement.execute(); + saveQuest(statement, getVariant()); } catch (SQLException exception) { Logger.throwing(OtherQuest.class.getName(), "save", exception); }