Rename "uncaught exception handler" to "exception handler"

Author: NichtStudioCode

invui/src/main/java/xyz/xenondevs/invui/InvUI.java

@@ -21,7 +21,7 @@ public final class InvUI implements Listener {
 
     private final List<Runnable> disableHandlers = new ArrayList<>();
     private @Nullable Plugin plugin;
-    private BiConsumer<? super String, ? super Throwable> uncaughtExceptionHandler = (msg, e) -> getPlugin().getComponentLogger().error(msg, e);
+    private BiConsumer<? super String, ? super Throwable> exceptionHandler = (msg, e) -> getPlugin().getComponentLogger().error(msg, e);
 
     private InvUI() {}
 
@@ -87,23 +87,24 @@ public void setPlugin(@Nullable Plugin plugin) {
     }
 
     /**
-     * Sets a handler for uncaught exceptions in InvUI.
+     * Sets a handler for exceptions that were thrown in user-provided code but suppressed by InvUI,
+     * such as when handling inventory events or similar.
      *
-     * @param uncaughtExceptionHandler The new uncaught exception handler.
+     * @param exceptionHandler The new exception handler.
      */
-    public void setUncaughtExceptionHandler(BiConsumer<? super String, ? super Throwable> uncaughtExceptionHandler) {
-        this.uncaughtExceptionHandler = uncaughtExceptionHandler;
+    public void setExceptionHandler(BiConsumer<? super String, ? super Throwable> exceptionHandler) {
+        this.exceptionHandler = exceptionHandler;
     }
 
     /**
-     * Handles an uncaught exception using the configured
-     * {@link #setUncaughtExceptionHandler(BiConsumer) uncaught exception handler}.
+     * Handles an exception using the configured
+     * {@link #setExceptionHandler(BiConsumer) exception handler}.
      *
      * @param msg An additional message that provides more context.
-     * @param t   The uncaught exception that was thrown.
+     * @param t   The exception that was thrown.
      */
-    public void handleUncaughtException(String msg, Throwable t) {
-        uncaughtExceptionHandler.accept(msg, t);
+    public void handleException(String msg, Throwable t) {
+        exceptionHandler.accept(msg, t);
     }
 
     /**

invui/src/main/java/xyz/xenondevs/invui/gui/SlotElement.java

@@ -65,7 +65,7 @@ record Item(xyz.xenondevs.invui.item.Item item) implements SlotElement {
             try {
                 return item.getItemProvider(player).get(Languages.getInstance().getLocale(player));
             } catch (Throwable t) {
-                InvUI.getInstance().handleUncaughtException("Failed to get item stack for item slot element", t);
+                InvUI.getInstance().handleException("Failed to get item stack for item slot element", t);
             }
 
             return null;

invui/src/main/java/xyz/xenondevs/invui/internal/menu/CustomContainerMenu.java

@@ -605,7 +605,7 @@ protected void runInInteractionContext(Runnable run) {
             interactionContext.set(true);
             run.run();
         } catch (Throwable t) {
-            InvUI.getInstance().handleUncaughtException("An exception occurred while handling a window interaction", t);
+            InvUI.getInstance().handleException("An exception occurred while handling a window interaction", t);
         } finally {
             interactionContext.set(false);
         }

invui/src/main/java/xyz/xenondevs/invui/internal/util/CollectionUtils.java

@@ -9,7 +9,6 @@
 import java.util.List;
 import java.util.function.Consumer;
 import java.util.function.Function;
-import java.util.logging.Level;
 
 public class CollectionUtils {
 
@@ -43,7 +42,7 @@ public static <T> void forEachCatching(Iterable<? extends T> iterable, Consumer<
                 action.accept(obj);
                 i++;
             } catch (Throwable t) {
-                InvUI.getInstance().handleUncaughtException(message + " (" + i + ")", t);
+                InvUI.getInstance().handleException(message + " (" + i + ")", t);
             }
         }
     }

invui/src/main/java/xyz/xenondevs/invui/internal/util/FuncUtils.java

@@ -5,7 +5,6 @@
 import xyz.xenondevs.invui.InvUI;
 
 import java.util.function.Supplier;
-import java.util.logging.Level;
 
 public class FuncUtils {
 
@@ -23,7 +22,7 @@ public static <T> T getSafely(@NonNull Supplier<? extends T> supplier, T fallbac
         try {
             return supplier.get();
         } catch (Throwable t) {
-            InvUI.getInstance().handleUncaughtException("Failed to get value from supplier", t);
+            InvUI.getInstance().handleException("Failed to get value from supplier", t);
             return fallback;
         }
     }

invui/src/main/java/xyz/xenondevs/invui/inventory/CompositeInventory.java

@@ -11,7 +11,6 @@
 import xyz.xenondevs.invui.inventory.event.UpdateReason;
 
 import java.util.Collection;
-import java.util.logging.Level;
 
 /**
  * An {@link Inventory} which is composed of multiple other {@link Inventory Inventories}.
@@ -195,7 +194,7 @@ public boolean callClickEvent(int slot, Click click) {
             try {
                 handler.accept(clickEvent);
             } catch (Throwable t) {
-                InvUI.getInstance().handleUncaughtException("An exception occurred while handling an inventory event", t);
+                InvUI.getInstance().handleException("An exception occurred while handling an inventory event", t);
             }
         }
 
@@ -216,7 +215,7 @@ public ItemPreUpdateEvent callPreUpdateEvent(@Nullable UpdateReason updateReason
             try {
                 handler.accept(event);
             } catch (Throwable t) {
-                InvUI.getInstance().handleUncaughtException("An exception occurred while handling an inventory event", t);
+                InvUI.getInstance().handleException("An exception occurred while handling an inventory event", t);
             }
         }
 

invui/src/main/java/xyz/xenondevs/invui/inventory/Inventory.java

@@ -464,7 +464,7 @@ public boolean callClickEvent(int slot, Click click) {
             try {
                 handler.accept(clickEvent);
             } catch (Throwable t) {
-                InvUI.getInstance().handleUncaughtException("An exception occurred while handling an inventory event", t);
+                InvUI.getInstance().handleException("An exception occurred while handling an inventory event", t);
             }
         }
 
@@ -491,7 +491,7 @@ public ItemPreUpdateEvent callPreUpdateEvent(@Nullable UpdateReason updateReason
             try {
                 handler.accept(event);
             } catch (Throwable t) {
-                InvUI.getInstance().handleUncaughtException("An exception occurred while handling an inventory event", t);
+                InvUI.getInstance().handleException("An exception occurred while handling an inventory event", t);
             }
         }
         return event;
@@ -516,7 +516,7 @@ public void callPostUpdateEvent(@Nullable UpdateReason updateReason, int slot, @
             try {
                 handler.accept(event);
             } catch (Throwable t) {
-                InvUI.getInstance().handleUncaughtException("An exception occurred while handling an inventory event", t);
+                InvUI.getInstance().handleException("An exception occurred while handling an inventory event", t);
             }
         }
     }

invui/src/main/java/xyz/xenondevs/invui/inventory/ObscuredInventory.java

@@ -13,7 +13,6 @@
 import java.util.EnumSet;
 import java.util.Set;
 import java.util.function.IntPredicate;
-import java.util.logging.Level;
 import java.util.stream.IntStream;
 
 /**
@@ -160,7 +159,7 @@ public boolean callClickEvent(int slot, Click click) {
             try {
                 handler.accept(clickEvent);
             } catch (Throwable t) {
-                InvUI.getInstance().handleUncaughtException("An exception occurred while handling an inventory event", t);
+                InvUI.getInstance().handleException("An exception occurred while handling an inventory event", t);
             }
         }
 
@@ -180,7 +179,7 @@ public ItemPreUpdateEvent callPreUpdateEvent(@Nullable UpdateReason updateReason
             try {
                 handler.accept(event);
             } catch (Throwable t) {
-                InvUI.getInstance().handleUncaughtException("An exception occurred while handling an inventory event", t);
+                InvUI.getInstance().handleException("An exception occurred while handling an inventory event", t);
             }
         }
 

invui/src/main/java/xyz/xenondevs/invui/inventory/VirtualInventoryManager.java

@@ -155,7 +155,7 @@ private void deserializeAll() {
                 VirtualInventory inventory = VirtualInventory.deserialize(in);
                 inventories.put(inventory.getUuid(), inventory);
             } catch (IOException e) {
-                InvUI.getInstance().handleUncaughtException(
+                InvUI.getInstance().handleException(
                     "Failed to deserialize a VirtualInventory from file " + file.getPath(),
                     e
                 );
@@ -174,7 +174,7 @@ private void serializeAll() {
             try (FileOutputStream out = new FileOutputStream(file)) {
                 inventory.serialize(out);
             } catch (IOException e) {
-                InvUI.getInstance().handleUncaughtException(
+                InvUI.getInstance().handleException(
                     "Failed to serialize a VirtualInventory to file " + file.getPath(),
                     e
                 );

invui/src/test/java/xyz/xenondevs/invui/inventory/CompositeInventoryTest.java

@@ -25,7 +25,7 @@ public class CompositeInventoryTest {
     @BeforeAll
     public static void setUp() {
         server = MockBukkit.mock();
-        InvUI.getInstance().setUncaughtExceptionHandler((msg, t) -> {
+        InvUI.getInstance().setExceptionHandler((msg, t) -> {
             throw new AssertionError(msg, t);
         });
     }