Safecall all player recorder functions

Author: jaszlo

src/main/java/net/jasper/mod/automation/Commands.java

@@ -8,6 +8,7 @@
 import net.jasper.mod.gui.PlayerAutomaMenuScreen;
 import net.jasper.mod.gui.RecordingSelectorScreen;
 import net.jasper.mod.gui.RecordingStorerScreen;
+import net.jasper.mod.util.PlayerAutomaExceptionHandler;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.text.Text;
@@ -31,19 +32,19 @@ public static void register() {
             literal("record")
                 .then(literal("start")
                     .executes(context -> {
-                        PlayerRecorder.startRecord();
+                        PlayerAutomaExceptionHandler.callSafe(PlayerRecorder::startRecord);
                         return 1;
                     })
                 )
                 .then(literal("stop")
                     .executes(context -> {
-                        PlayerRecorder.stopRecord();
+                        PlayerAutomaExceptionHandler.callSafe(PlayerRecorder::stopRecord);
                         return 1;
                     })
                 )
                 .then(literal("clear")
                     .executes(context -> {
-                        PlayerRecorder.clearRecord();
+                        PlayerAutomaExceptionHandler.callSafe(PlayerRecorder::clearRecord);
                         return 1;
                     })
                 )
@@ -98,7 +99,7 @@ public static void register() {
                         })
                         .executes(context -> {
                             String name = StringArgumentType.getString(context, "name");
-                            PlayerRecorder.loadRecord(name);
+                            PlayerAutomaExceptionHandler.callSafe(() -> PlayerRecorder.loadRecord(name));
                             return 1;
                         })
                     )
@@ -111,24 +112,24 @@ public static void register() {
             dispatcher.register(literal("replay")
                 .then(literal("start")
                     .executes(context -> {
-                        PlayerRecorder.startReplay(false);
+                        PlayerAutomaExceptionHandler.callSafe(() -> PlayerRecorder.startReplay(false));
                         return 1;
                     })
                 )
                 .then(literal("stop")
                     .executes(context -> {
-                        PlayerRecorder.stopReplay();
+                        PlayerAutomaExceptionHandler.callSafe(PlayerRecorder::stopReplay);
                         return 1;
                     })
                 )
                 .then(literal("togglepause")
                     .executes(context -> {
-                        PlayerRecorder.togglePauseReplay();
+                        PlayerAutomaExceptionHandler.callSafe(PlayerRecorder::togglePauseReplay);
                         return 1;
                     })
                 ).then(literal("loop")
                     .executes(context -> {
-                        PlayerRecorder.startReplay(true);
+                        PlayerAutomaExceptionHandler.callSafe(PlayerRecorder::startReplay);
                         return 1;
                     })
                 )

src/main/java/net/jasper/mod/automation/PlayerRecorder.java

@@ -128,8 +128,6 @@ public static void reset() {
     }
 
     public static void startRecord() {
-        int i = 0;
-        System.out.println(10 / i);
         if (state.isReplaying() || state.isPausedReplaying()) {
             ClientHelpers.writeToActionBar(Text.translatable("playerautoma.messages.error.cannotStartRecordingWhileReplaying"));
             return;

src/main/java/net/jasper/mod/gui/PlayerAutomaMenuScreen.java

@@ -2,6 +2,7 @@
 
 import net.jasper.mod.automation.PlayerRecorder;
 import net.jasper.mod.gui.option.PlayerAutomaOptionsScreen;
+import net.jasper.mod.util.PlayerAutomaExceptionHandler;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.tooltip.Tooltip;
@@ -30,22 +31,22 @@ public PlayerAutomaMenuScreen(Screen parent) {
     // Player Recorder
     public ButtonWidget START_RECORDING = ButtonWidget.builder(Text.translatable("playerautoma.screens.menu.startRecording"), button -> {
             Objects.requireNonNull(MinecraftClient.getInstance().currentScreen).close();
-            PlayerRecorder.startRecord();
+            PlayerAutomaExceptionHandler.callSafe(PlayerRecorder::startRecord);
         }).tooltip(Tooltip.of(Text.translatable("playerautoma.screens.menu.tooltip.startRecording"))).build();
 
     public ButtonWidget STOP_RECORDING = ButtonWidget.builder(Text.translatable("playerautoma.screens.menu.stopRecording"), button -> {
             Objects.requireNonNull(MinecraftClient.getInstance().currentScreen).close();
-            PlayerRecorder.stopRecord();
+            PlayerAutomaExceptionHandler.callSafe(PlayerRecorder::stopRecord);
         }).tooltip(Tooltip.of(Text.translatable("playerautoma.screens.menu.tooltip.stopRecording"))).build();
 
     public ButtonWidget START_REPLAY = ButtonWidget.builder(Text.translatable("playerautoma.screens.menu.startReplay"), button -> {
             Objects.requireNonNull(MinecraftClient.getInstance().currentScreen).close();
-            PlayerRecorder.startReplay(false);
+            PlayerAutomaExceptionHandler.callSafe(() -> PlayerRecorder.startReplay(false));
         }).tooltip(Tooltip.of(Text.translatable("playerautoma.screens.menu.tooltip.startReplay"))).build();
 
     public ButtonWidget START_LOOP = ButtonWidget.builder(Text.translatable("playerautoma.screens.menu.startLoop"), button -> {
             Objects.requireNonNull(MinecraftClient.getInstance().currentScreen).close();
-            PlayerRecorder.startLoop();
+            PlayerAutomaExceptionHandler.callSafe(PlayerRecorder::startLoop);
         }).tooltip(Tooltip.of(Text.translatable("playerautoma.screens.menu.tooltip.startLoop"))).build();
 
     public ButtonWidget STORE_RECORDING = ButtonWidget.builder(Text.translatable("playerautoma.screens.menu.storeRecording"),

src/main/java/net/jasper/mod/gui/QuickMenu.java

@@ -5,6 +5,7 @@
 import net.jasper.mod.gui.option.PlayerAutomaOptionsScreen;
 import net.jasper.mod.mixins.accessors.ScreenAccessor;
 import net.jasper.mod.util.ColorHelpers;
+import net.jasper.mod.util.PlayerAutomaExceptionHandler;
 import net.jasper.mod.util.Textures;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.DrawContext;
@@ -64,7 +65,7 @@ public class QuickMenu extends Screen {
                 if (PlayerRecorder.state.isRecording() || PlayerRecorder.state.isPausedRecording()) {
                     PlayerRecorder.togglePauseRecord();
                 } else {
-                    PlayerRecorder.startRecord();
+                    PlayerAutomaExceptionHandler.callSafe(PlayerRecorder::startRecord);
                 }
             }
     ).size(BUTTON_DIMENSIONS, BUTTON_DIMENSIONS).build();
@@ -73,7 +74,7 @@ public class QuickMenu extends Screen {
             Text.of(""),
             b -> {
                 loopCount = 0;
-                PlayerRecorder.stopRecord();
+                PlayerAutomaExceptionHandler.callSafe(PlayerRecorder::stopRecord);
             }
     ).size(BUTTON_DIMENSIONS, BUTTON_DIMENSIONS).build();
 
@@ -83,9 +84,9 @@ public class QuickMenu extends Screen {
             b -> {
                 loopCount = 0;
                 if (PlayerRecorder.state.isReplaying() || PlayerRecorder.state.isPausedReplaying()) {
-                    PlayerRecorder.togglePauseReplay();
+                    PlayerAutomaExceptionHandler.callSafe(PlayerRecorder::togglePauseReplay);
                 } else {
-                    PlayerRecorder.startReplay(false);
+                    PlayerAutomaExceptionHandler.callSafe(() -> PlayerRecorder.startReplay(false));
                 }
             }
     ).size(BUTTON_DIMENSIONS, BUTTON_DIMENSIONS).build();
@@ -94,7 +95,7 @@ public class QuickMenu extends Screen {
             Text.of(""),
             b -> {
                 loopCount = 0;
-                PlayerRecorder.stopReplay();
+                PlayerAutomaExceptionHandler.callSafe(PlayerRecorder::stopReplay);
             }
     ).size(BUTTON_DIMENSIONS, BUTTON_DIMENSIONS).build();
 
@@ -134,9 +135,9 @@ public void close() {
         wasClosed = true;
         // -1 == Infinity
         if (loopCount < 0) {
-            PlayerRecorder.startLoop();
+            PlayerAutomaExceptionHandler.callSafe(PlayerRecorder::startLoop);
         } else if (loopCount > 0) {
-            PlayerRecorder.startReplay(loopCount);
+            PlayerAutomaExceptionHandler.callSafe(() -> PlayerRecorder.startReplay(loopCount));
         }
         loopCount = 0;
 

src/main/java/net/jasper/mod/gui/RecordingSelectorScreen.java

@@ -144,7 +144,7 @@ private void onRefresh() {
     private void onDone() {
         RecordingSelectionListWidget.RecordingEntry recEntry = this.recordingSelectionList.getSelectedOrNull();
         if (recEntry != null) {
-            PlayerRecorder.loadRecord(recEntry.file);
+            PlayerAutomaExceptionHandler.callSafe(() -> PlayerRecorder.loadRecord(recEntry.file));
         }
         this.client.setScreen(null);
     }

src/main/java/net/jasper/mod/gui/RecordingStorerScreen.java

@@ -4,6 +4,7 @@
 import net.jasper.mod.gui.components.FilteredTextFieldWidget;
 import net.jasper.mod.gui.option.OptionButton;
 import net.jasper.mod.util.IOHelpers;
+import net.jasper.mod.util.PlayerAutomaExceptionHandler;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.screen.Screen;
@@ -84,7 +85,8 @@ protected void init() {
                   // Append correct file ending if necessary
                   String file_ending = useJSON.getValue() ? ".json" : ".rec";
                   name += file_ending;
-                  PlayerRecorder.storeRecord(name);
+                  String finalName = name;
+                  PlayerAutomaExceptionHandler.callSafe(() -> PlayerRecorder.storeRecord(finalName));
                   this.close();
               }).dimensions(this.width / 2 - 100, this.height / 2 + 10, 150, 20)
                 .tooltip(Tooltip.of(Text.translatable("playerautoma.screens.fileSelector.tooltip.save")))

src/main/java/net/jasper/mod/mixins/KeyboardMixin.java

@@ -4,6 +4,7 @@
 import net.jasper.mod.automation.PlayerRecorder;
 import net.jasper.mod.mixins.accessors.KeyBindingAccessor;
 import net.jasper.mod.util.ClientHelpers;
+import net.jasper.mod.util.PlayerAutomaExceptionHandler;
 import net.jasper.mod.util.keybinds.Constants;
 import net.minecraft.client.Keyboard;
 import net.minecraft.text.Text;
@@ -27,7 +28,7 @@ private void injected(long window, int key, int scancode, int action, int modifi
 
         int startReplayKeyCode = ((KeyBindingAccessor) Constants.START_REPLAY).getBoundKey().getCode();
         if (PlayerRecorder.state.isReplaying() && key != startReplayKeyCode) {
-            PlayerRecorder.stopReplay();
+            PlayerAutomaExceptionHandler.callSafe(PlayerRecorder::stopReplay);
             ClientHelpers.writeToActionBar(Text.literal("Replay stopped due to manual input"));
         }
     }

src/main/java/net/jasper/mod/mixins/ScreenMixin.java

@@ -3,6 +3,7 @@
 import net.jasper.mod.automation.MenuPrevention;
 import net.jasper.mod.automation.PlayerRecorder;
 import net.jasper.mod.mixins.accessors.KeyBindingAccessor;
+import net.jasper.mod.util.PlayerAutomaExceptionHandler;
 import net.jasper.mod.util.keybinds.Constants;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.screen.Screen;
@@ -38,7 +39,7 @@ private void renderPlayerRecorderIcon(DrawContext context, int mouseX, int mouse
     @Inject(method="keyPressed", at=@At("HEAD"))
     private void stopReplay(int keyCode, int scanCode, int modifiers, CallbackInfoReturnable<Boolean> cir) {
         if (STOP_REPLAY.matchesKey(keyCode, scanCode)) {
-            PlayerRecorder.stopReplay();
+            PlayerAutomaExceptionHandler.callSafe(PlayerRecorder::stopReplay);
         }
     }
 

src/main/java/net/jasper/mod/util/PlayerAutomaExceptionHandler.java

@@ -84,4 +84,23 @@ public static void handleException(Exception exception)  {
         // Reset into functional state
         PlayerRecorder.reset();
     }
+
+    public static void callSafe(Runnable action) {
+        try {
+            action.run();
+        } catch (Exception e) {
+            handleException(e);
+        }
+    }
+
+    public static Runnable produceSafeCall(Runnable run) {
+        return () -> {
+            try {
+                run.run();
+            } catch (Exception exception) {
+                handleException(exception);
+            }
+        };
+    }
+
 }

src/main/java/net/jasper/mod/util/keybinds/Constants.java

@@ -61,27 +61,17 @@ public class Constants {
     public static final KeyBinding QUICK_MENU = BINDINGS[10];
     public static final KeyBinding START_REPLAY = BINDINGS[2];
 
-    private static Runnable exceptionSaveKeybindCallback(Runnable run) {
-        return () -> {
-            try {
-                run.run();
-            } catch (Exception exception) {
-                PlayerAutomaExceptionHandler.handleException(exception);
-            }
-        };
-    }
-
     private static final Runnable[] callbackMethods = {
-            exceptionSaveKeybindCallback(PlayerRecorder::startRecord),
-            exceptionSaveKeybindCallback(PlayerRecorder::stopRecord),
-            exceptionSaveKeybindCallback(PlayerRecorder::startReplay),
-            exceptionSaveKeybindCallback(PlayerRecorder::stopReplay),
-            exceptionSaveKeybindCallback(PlayerRecorder::startLoop),
-            exceptionSaveKeybindCallback(RecordingStorerScreen::open),
-            exceptionSaveKeybindCallback(RecordingSelectorScreen::open),
-            exceptionSaveKeybindCallback(PlayerRecorder::togglePause),
-            exceptionSaveKeybindCallback(PlayerAutomaMenuScreen::open),
-            exceptionSaveKeybindCallback(MenuPrevention::toggleBackgroundPrevention),
+            PlayerAutomaExceptionHandler.produceSafeCall(PlayerRecorder::startRecord),
+            PlayerAutomaExceptionHandler.produceSafeCall(PlayerRecorder::stopRecord),
+            PlayerAutomaExceptionHandler.produceSafeCall(PlayerRecorder::startReplay),
+            PlayerAutomaExceptionHandler.produceSafeCall(PlayerRecorder::stopReplay),
+            PlayerAutomaExceptionHandler.produceSafeCall(PlayerRecorder::startLoop),
+            PlayerAutomaExceptionHandler.produceSafeCall(RecordingStorerScreen::open),
+            PlayerAutomaExceptionHandler.produceSafeCall(RecordingSelectorScreen::open),
+            PlayerAutomaExceptionHandler.produceSafeCall(PlayerRecorder::togglePause),
+            PlayerAutomaExceptionHandler.produceSafeCall(PlayerAutomaMenuScreen::open),
+            PlayerAutomaExceptionHandler.produceSafeCall(MenuPrevention::toggleBackgroundPrevention),
             () -> {} // Do nothing! The quickMenu opens onPress and closes onRelease and needs to be handled differently
     };