Optimize and cleanup various classes

Reformatted several classes for optimization purposes. This includes removing unnecessary try-catch blocks, redundant initializers and imports, and condensing confirmation checks. Additionally, updated the `Database` class's `createUserPointsTable` and `createQuestLogTable` methods to use try-with-resources to ensure proper resource management.
This commit is contained in:
2024-04-13 20:43:37 +02:00
parent c6b186e2c6
commit 3bb822b41c
16 changed files with 85 additions and 113 deletions
@@ -27,13 +27,12 @@ public class BreedMobsQuest extends Quest {
public BreedMobsQuest(Player player) throws Exception {
super(player, 0, 0,
QuestsConfig.BREED_MOB_QUEST.get(Utilities.randomOr0(QuestsConfig.BREED_MOB_QUEST.size() - 1)), -1, false);
if (getVariant() instanceof BreedMobsQuestObject breedMobsQuestObject)
this.breedMobsQuestObject = breedMobsQuestObject;
if (getVariant() instanceof BreedMobsQuestObject questObject)
this.breedMobsQuestObject = questObject;
else
this.breedMobsQuestObject = null;
if (breedMobsQuestObject == null) {
Logger.warning("Tried to create breedMobQuest but unable to find variant: %.", "unknown");
return;
if (this.breedMobsQuestObject == null) {
Logger.warning("Tried to create breedMobQuest but unable to find variant: %s.", "unknown");
}
}
@@ -41,8 +40,8 @@ public class BreedMobsQuest extends Quest {
super(player, step1, step2, QuestsConfig.BREED_MOB_QUEST.stream()
.filter(object -> variant.equals(object.getInternalName()))
.findAny().orElse(null), amount, rewardReceived);
if (getVariant() instanceof BreedMobsQuestObject breedMobsQuestObject)
this.breedMobsQuestObject = breedMobsQuestObject;
if (getVariant() instanceof BreedMobsQuestObject questObject)
this.breedMobsQuestObject = questObject;
else
this.breedMobsQuestObject = null;
if (breedMobsQuestObject == null) {
@@ -60,8 +59,7 @@ public class BreedMobsQuest extends Quest {
"VALUES (?, ?, ?, ?, ?, ?, ?, ?) " +
"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);
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));
@@ -107,14 +105,13 @@ public class BreedMobsQuest extends Quest {
}
@Override
public int turnIn(Player player) {
public void turnIn(Player player) {
int maxToTurnIn = getMaxToTurnIn();
if (maxToTurnIn == 0)
return 0;
return;
addStep2(maxToTurnIn);
checkDone(player);
return maxToTurnIn;
}
@Override