Move method

core/src/main/java/me/filoghost/holographicdisplays/core/api/current/APIClickableHologramLine.java

@@ -19,14 +19,10 @@ interface APIClickableHologramLine extends ClickableHologramLine, APIHologramLin
 
     @Override
     default void invokeClickCallback(Player player) {
-        try {
         HologramLineClickListener clickListener = getClickListener();
         if (clickListener != null) {
             clickListener.onClick(new SimpleHologramLineClickEvent(player));
         }
-        } catch (Throwable t) {
-            logClickCallbackException(getCreatorPlugin(), player, t);
-        }
     }
 
 }

core/src/main/java/me/filoghost/holographicdisplays/core/api/current/APIItemHologramLine.java

@@ -53,13 +53,9 @@ class APIItemHologramLine extends BaseItemHologramLine implements ItemHologramLi
 
     @Override
     public void invokePickupCallback(Player player) {
-        try {
         if (pickupListener != null) {
             pickupListener.onPickup(new SimpleHologramLinePickupEvent(player));
         }
-        } catch (Throwable t) {
-            logPickupCallbackException(getCreatorPlugin(), player, t);
-        }
     }
 
 }

core/src/main/java/me/filoghost/holographicdisplays/core/api/v2/V2CollectableLine.java

@@ -19,14 +19,10 @@ interface V2CollectableLine extends CollectableLine, V2HologramLine, PickupCallb
 
     @Override
     default void invokePickupCallback(Player player) {
-        try {
         PickupHandler pickupListener = getPickupHandler();
         if (pickupListener != null) {
             pickupListener.onPickup(player);
         }
-        } catch (Throwable t) {
-            logPickupCallbackException(getCreatorPlugin(), player, t);
-        }
     }
 
 }

core/src/main/java/me/filoghost/holographicdisplays/core/api/v2/V2TouchableLine.java

@@ -19,14 +19,10 @@ interface V2TouchableLine extends TouchableLine, V2HologramLine, ClickCallbackPr
 
     @Override
     default void invokeClickCallback(Player player) {
-        try {
         TouchHandler touchHandler = getTouchHandler();
         if (touchHandler != null) {
             touchHandler.onTouch(player);
         }
-        } catch (Throwable t) {
-            logClickCallbackException(getCreatorPlugin(), player, t);
-        }
     }
 
 }

core/src/main/java/me/filoghost/holographicdisplays/core/base/BaseClickableHologramLine.java

@@ -5,6 +5,7 @@
  */
 package me.filoghost.holographicdisplays.core.base;
 
+import me.filoghost.fcommons.logging.Log;
 import me.filoghost.holographicdisplays.common.PositionCoordinates;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
@@ -17,7 +18,12 @@ public abstract class BaseClickableHologramLine extends BaseHologramLine impleme
 
     public void onClick(Player player) {
         if (hasClickCallback() && canInteract(player) && isInClickRange(player)) {
+            try {
                 invokeClickCallback(player);
+            } catch (Throwable t) {
+                Log.warning("The plugin " + getCreatorPlugin().getName() + " generated an exception"
+                        + " when the player " + player.getName() + " clicked a hologram.", t);
+            }
         }
     }
 

core/src/main/java/me/filoghost/holographicdisplays/core/base/BaseItemHologramLine.java

@@ -6,6 +6,7 @@
 package me.filoghost.holographicdisplays.core.base;
 
 import me.filoghost.fcommons.Preconditions;
+import me.filoghost.fcommons.logging.Log;
 import me.filoghost.holographicdisplays.nms.common.entity.ItemNMSPacketEntity;
 import me.filoghost.holographicdisplays.core.tracking.ItemLineTracker;
 import me.filoghost.holographicdisplays.core.tracking.LineTrackerManager;
@@ -29,7 +30,12 @@ public abstract class BaseItemHologramLine extends BaseClickableHologramLine imp
 
     public void onPickup(Player player) {
         if (hasPickupCallback() && canInteract(player)) {
+            try {
                 invokePickupCallback(player);
+            } catch (Throwable t) {
+                Log.warning("The plugin " + getCreatorPlugin().getName() + " generated an exception"
+                        + " when the player " + player.getName() + " picked up an item from a hologram.", t);
+            }
         }
     }
 

core/src/main/java/me/filoghost/holographicdisplays/core/base/ClickCallbackProvider.java

@@ -5,9 +5,7 @@
  */
 package me.filoghost.holographicdisplays.core.base;
 
-import me.filoghost.fcommons.logging.Log;
 import org.bukkit.entity.Player;
-import org.bukkit.plugin.Plugin;
 
 public interface ClickCallbackProvider {
 
@@ -15,9 +13,4 @@ public interface ClickCallbackProvider {
 
     void invokeClickCallback(Player player);
 
-    default void logClickCallbackException(Plugin plugin, Player player, Throwable t) {
-        Log.warning("The plugin " + plugin.getName() + " generated an exception"
-                + " when the player " + player.getName() + " clicked a hologram.", t);
-    }
-
 }

core/src/main/java/me/filoghost/holographicdisplays/core/base/PickupCallbackProvider.java

@@ -5,9 +5,7 @@
  */
 package me.filoghost.holographicdisplays.core.base;
 
-import me.filoghost.fcommons.logging.Log;
 import org.bukkit.entity.Player;
-import org.bukkit.plugin.Plugin;
 
 public interface PickupCallbackProvider {
 
@@ -15,9 +13,4 @@ public interface PickupCallbackProvider {
 
     void invokePickupCallback(Player player);
 
-    default void logPickupCallbackException(Plugin plugin, Player player, Throwable t) {
-        Log.warning("The plugin " + plugin.getName() + " generated an exception"
-                + " when the player " + player.getName() + " picked up an item from a hologram.", t);
-    }
-
 }