From 57726c4cb1054d9654a3b6d977ccffdfafdc1af7 Mon Sep 17 00:00:00 2001 From: skycatminepokie <52087591+skycatminepokie@users.noreply.github.com> Date: Tue, 3 Sep 2024 20:40:11 -0700 Subject: [PATCH] Default command for exporting last recording --- gradle.properties | 2 +- .../com/skycatdev/autocut/AutocutCommandHandler.java | 12 +++++++++++- .../java/com/skycatdev/autocut/RecordingManager.java | 1 + 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 563eb01..f24e361 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,7 +9,7 @@ yarn_mappings=1.21+build.9 loader_version=0.15.11 # Mod Properties -mod_version=0.0.2+1.21 +mod_version=0.0.3+1.21 maven_group=com.skycatdev.autocut archives_base_name=autocut diff --git a/src/client/java/com/skycatdev/autocut/AutocutCommandHandler.java b/src/client/java/com/skycatdev/autocut/AutocutCommandHandler.java index 1958d1e..4ca6bf4 100644 --- a/src/client/java/com/skycatdev/autocut/AutocutCommandHandler.java +++ b/src/client/java/com/skycatdev/autocut/AutocutCommandHandler.java @@ -82,9 +82,10 @@ public static void register(CommandDispatcher dispatc .executes(AutocutCommandHandler::makeClip) // WARN: Debug only .build(); var finish = literal("finish") + .executes(AutocutCommandHandler::finish) .build(); var finishDatabase = argument("database", StringArgumentType.string()) - .executes(AutocutCommandHandler::finish) // WARN: Debug only + .executes(AutocutCommandHandler::finishDatabase) .build(); //@formatter:off dispatcher.getRoot().addChild(autocut); @@ -97,6 +98,15 @@ public static void register(CommandDispatcher dispatc } private static int finish(CommandContext context) { + try { + AutocutClient.currentRecordingManager.export(); + } catch (SQLException e) { + throw new RuntimeException(e); // TODO: Error handling + } + return Command.SINGLE_SUCCESS; + } + + private static int finishDatabase(CommandContext context) { try { RecordingManager recordingManager = RecordingManager.fromDatabase(new File(StringArgumentType.getString(context, "database"))); recordingManager.export(); diff --git a/src/client/java/com/skycatdev/autocut/RecordingManager.java b/src/client/java/com/skycatdev/autocut/RecordingManager.java index dd6428b..ccee0a2 100644 --- a/src/client/java/com/skycatdev/autocut/RecordingManager.java +++ b/src/client/java/com/skycatdev/autocut/RecordingManager.java @@ -309,6 +309,7 @@ public void progress(Progress progress) { } }); job.run(); + MinecraftClient.getInstance().inGameHud.getChatHud().addMessage(Text.of("Preparing to cut...")); } catch (IOException e) { throw new RuntimeException(e); }