From 26e7294cac761f293eeec419f6ddd78b47782d6d Mon Sep 17 00:00:00 2001 From: SkyDynamic Date: Sun, 3 Aug 2025 21:31:11 +0800 Subject: [PATCH 1/2] =?UTF-8?q?perf:=20suggest=E6=94=B9=E4=B8=BA=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=E5=8F=AF=E4=BB=A5=E4=BB=8E=E7=BC=93=E5=AD=98=E8=8E=B7?= =?UTF-8?q?=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../skydynamic/quickbakcupmulti/command/DeleteCommand.java | 2 +- .../skydynamic/quickbakcupmulti/command/RestoreCommand.java | 3 ++- .../skydynamic/quickbakcupmulti/command/ShowCommand.java | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/common/src/main/java/io/github/skydynamic/quickbakcupmulti/command/DeleteCommand.java b/common/src/main/java/io/github/skydynamic/quickbakcupmulti/command/DeleteCommand.java index 839530f..cb919ce 100644 --- a/common/src/main/java/io/github/skydynamic/quickbakcupmulti/command/DeleteCommand.java +++ b/common/src/main/java/io/github/skydynamic/quickbakcupmulti/command/DeleteCommand.java @@ -19,7 +19,7 @@ public class DeleteCommand { .requires(it -> PermissionManager.hasPermission(it, 2, PermissionType.HELPER)) .then(Commands.argument("name", StringArgumentType.string()) .suggests(((context, builder) -> { - for (StorageInfo info : QuickbakcupmultiReforged.getDatabase().getAllStorageInfo()) { + for (StorageInfo info : BackupManager.getBackupsList()) { if (info.getName().contains(builder.getRemaining())) { builder.suggest(info.getName()); } diff --git a/common/src/main/java/io/github/skydynamic/quickbakcupmulti/command/RestoreCommand.java b/common/src/main/java/io/github/skydynamic/quickbakcupmulti/command/RestoreCommand.java index 7f031f1..d25f6c8 100644 --- a/common/src/main/java/io/github/skydynamic/quickbakcupmulti/command/RestoreCommand.java +++ b/common/src/main/java/io/github/skydynamic/quickbakcupmulti/command/RestoreCommand.java @@ -5,6 +5,7 @@ import io.github.skydynamic.increment.storage.lib.database.StorageInfo; import io.github.skydynamic.quickbakcupmulti.QuickbakcupmultiReforged; import io.github.skydynamic.quickbakcupmulti.restore.RestoreTimer; +import io.github.skydynamic.quickbakcupmulti.utils.BackupManager; import io.github.skydynamic.quickbakcupmulti.utils.permission.PermissionManager; import io.github.skydynamic.quickbakcupmulti.utils.permission.PermissionType; import lombok.Getter; @@ -32,7 +33,7 @@ public class RestoreCommand { .requires(it -> PermissionManager.hasPermission(it, 4, PermissionType.ADMIN)) .then(Commands.argument("name", StringArgumentType.string()) .suggests(((context, builder) -> { - for (StorageInfo info : QuickbakcupmultiReforged.getDatabase().getAllStorageInfo()) { + for (StorageInfo info : BackupManager.getBackupsList()) { if (info.getName().contains(builder.getRemaining())) { builder.suggest(info.getName()); } diff --git a/common/src/main/java/io/github/skydynamic/quickbakcupmulti/command/ShowCommand.java b/common/src/main/java/io/github/skydynamic/quickbakcupmulti/command/ShowCommand.java index 6a95834..03df89a 100644 --- a/common/src/main/java/io/github/skydynamic/quickbakcupmulti/command/ShowCommand.java +++ b/common/src/main/java/io/github/skydynamic/quickbakcupmulti/command/ShowCommand.java @@ -4,6 +4,7 @@ import com.mojang.brigadier.builder.LiteralArgumentBuilder; import io.github.skydynamic.increment.storage.lib.database.StorageInfo; import io.github.skydynamic.quickbakcupmulti.QuickbakcupmultiReforged; +import io.github.skydynamic.quickbakcupmulti.utils.BackupManager; import net.minecraft.commands.CommandSourceStack; import net.minecraft.commands.Commands; @@ -13,7 +14,7 @@ public class ShowCommand { public static final LiteralArgumentBuilder cmd = Commands.literal("show") .then(Commands.argument("name", StringArgumentType.string()) .suggests(((context, builder) -> { - for (StorageInfo info : QuickbakcupmultiReforged.getDatabase().getAllStorageInfo()) { + for (StorageInfo info : BackupManager.getBackupsList()) { if (info.getName().contains(builder.getRemaining())) { builder.suggest(info.getName()); } From edb102351946b4d370185dceb2a511bae195dbf8 Mon Sep 17 00:00:00 2001 From: SkyDynamic Date: Thu, 18 Sep 2025 11:57:09 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8DscheduleBackup?= =?UTF-8?q?=E7=9A=84interval=E8=A2=AB=E9=94=99=E8=AF=AF=E7=9A=84=E8=AF=86?= =?UTF-8?q?=E5=88=AB=E4=B8=BACron=E8=A1=A8=E8=BE=BE=E5=BC=8F=E5=AF=BC?= =?UTF-8?q?=E8=87=B4=E6=97=A0=E6=B3=95=E5=90=AF=E5=8A=A8=E8=AE=A1=E5=88=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../skydynamic/quickbakcupmulti/QuickbakcupmultiReforged.java | 2 +- .../quickbakcupmulti/event/OnLoadedWorldHandler.java | 2 +- .../quickbakcupmulti/schedule/impl/ModSchedule.java | 4 ++-- gradle.properties | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/common/src/main/java/io/github/skydynamic/quickbakcupmulti/QuickbakcupmultiReforged.java b/common/src/main/java/io/github/skydynamic/quickbakcupmulti/QuickbakcupmultiReforged.java index 119fb2d..230ecca 100644 --- a/common/src/main/java/io/github/skydynamic/quickbakcupmulti/QuickbakcupmultiReforged.java +++ b/common/src/main/java/io/github/skydynamic/quickbakcupmulti/QuickbakcupmultiReforged.java @@ -74,7 +74,7 @@ public static void setNewDataBase(String collectionName) { String appendFolder = (QuickbakcupmultiReforged.getModContainer().getEnvType() == ModEnvType.CLIENT) ? "/" + collectionName : ""; DatabaseManager databaseManager = new DatabaseManager( - "QuickBakcupMulti", + "QuickBackupMulti", QuickbakcupmultiReforged.getModConfig().getStoragePath(), UUID.nameUUIDFromBytes(collectionName.getBytes()) ); diff --git a/common/src/main/java/io/github/skydynamic/quickbakcupmulti/event/OnLoadedWorldHandler.java b/common/src/main/java/io/github/skydynamic/quickbakcupmulti/event/OnLoadedWorldHandler.java index ac86758..2935d9b 100644 --- a/common/src/main/java/io/github/skydynamic/quickbakcupmulti/event/OnLoadedWorldHandler.java +++ b/common/src/main/java/io/github/skydynamic/quickbakcupmulti/event/OnLoadedWorldHandler.java @@ -30,7 +30,7 @@ public static void handler() { Runnable scheduleBackupRunnable = new DefaultScheduleBackupRunnable(); if (scheduleBackupConfig.interval != null) { int interval = (int) DurationUtils.parseDurationToSeconds(scheduleBackupConfig.interval); - ScheduleManager.registerSchedule("scheduleBackup", databaseBackupConfig.interval, scheduleBackupRunnable); + ScheduleManager.registerSchedule("scheduleBackup", interval, scheduleBackupRunnable); } else if (scheduleBackupConfig.crontab != null) { ScheduleManager.registerSchedule("scheduleBackup", scheduleBackupConfig.crontab, scheduleBackupRunnable); } diff --git a/common/src/main/java/io/github/skydynamic/quickbakcupmulti/schedule/impl/ModSchedule.java b/common/src/main/java/io/github/skydynamic/quickbakcupmulti/schedule/impl/ModSchedule.java index 0f50e7a..b159081 100644 --- a/common/src/main/java/io/github/skydynamic/quickbakcupmulti/schedule/impl/ModSchedule.java +++ b/common/src/main/java/io/github/skydynamic/quickbakcupmulti/schedule/impl/ModSchedule.java @@ -46,9 +46,9 @@ public boolean startSchedule() { jobDetail = JobBuilder.newJob(this.getClass()).withIdentity(identity).build(); StdSchedulerFactory sf = new StdSchedulerFactory(); - if (crontab != null && !crontab.isEmpty() && interval == null) { + if (crontab != null && !crontab.isEmpty()) { trigger = buildTrigger(identity, CronUtils.ScheduleMode.CRONTAB, crontab); - } else if (interval != null && interval > 0 && crontab == null) { + } else if (interval != null && interval > 0) { trigger = buildTrigger(identity, CronUtils.ScheduleMode.INTERVAL, interval); } else { return false; diff --git a/gradle.properties b/gradle.properties index fe013c6..d569075 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ org.gradle.jvmargs = -Xmx2G org.gradle.parallel = true # Mod properties -mod_version = 3.2.0 +mod_version = 3.2.2 maven_group = io.github.skydynamic mod_id = quickbakcupmulti_reforged archives_name = QuickBakcupMulti-Reforged