Merge pull request #3345 from Multiverse/chore/non-public-listener

Cleanup listener methods to be non-public

Author: benwoo1110

src/main/java/org/mvplugins/multiverse/core/listeners/MVEntityListener.java

@@ -11,7 +11,6 @@
 import jakarta.inject.Inject;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.entity.CreatureSpawnEvent;
 import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason;
@@ -43,7 +42,7 @@ final class MVEntityListener implements CoreListener {
      * @param event The Event that was fired.
      */
     @EventMethod
-    public void foodLevelChange(FoodLevelChangeEvent event) {
+    void foodLevelChange(FoodLevelChangeEvent event) {
         if (event.isCancelled()) {
             return;
         }
@@ -65,7 +64,7 @@ public void foodLevelChange(FoodLevelChangeEvent event) {
      * @param event The Event that was fired.
      */
     @EventMethod
-    public void entityRegainHealth(EntityRegainHealthEvent event) {
+    void entityRegainHealth(EntityRegainHealthEvent event) {
         if (event.isCancelled() || event.getRegainReason() != RegainReason.REGEN) {
             return;
         }
@@ -84,7 +83,7 @@ public void entityRegainHealth(EntityRegainHealthEvent event) {
      * @param event The event.
      */
     @EventMethod
-    public void creatureSpawn(CreatureSpawnEvent event) {
+    void creatureSpawn(CreatureSpawnEvent event) {
         if (event.isCancelled()) {
             return;
         }
@@ -110,7 +109,7 @@ public void creatureSpawn(CreatureSpawnEvent event) {
      * Handle Spawn Category settings for non-creature entities.
      */
     @EventMethod
-    public void entitySpawn(EntitySpawnEvent event) {
+    void entitySpawn(EntitySpawnEvent event) {
         if (event.getEntity() instanceof LivingEntity) {
             // Handled by CreatureSpawnEvent
             return;

src/main/java/org/mvplugins/multiverse/core/listeners/MVPlayerListener.java

@@ -113,7 +113,7 @@ private MVCommandManager getCommandManager() {
         return commandManagerProvider.get();
     }
 
-    public PluginLocales getLocales() {
+    private PluginLocales getLocales() {
         return getCommandManager().getLocales();
     }
 
@@ -122,7 +122,7 @@ public PluginLocales getLocales() {
      *
      * @return the playerWorld-map
      */
-    public Map<String, String> getPlayerWorld() {
+    Map<String, String> getPlayerWorld() {
         return playerWorld;
     }
 
@@ -134,7 +134,7 @@ public Map<String, String> getPlayerWorld() {
     @EventMethod
     @EventPriorityKey("mvcore-player-respawn")
     @DefaultEventPriority(EventPriority.LOW)
-    public void playerRespawn(PlayerRespawnEvent event) {
+    void playerRespawn(PlayerRespawnEvent event) {
         Player player = event.getPlayer();
         LoadedMultiverseWorld mvWorld = getWorldManager().getLoadedWorld(player.getWorld()).getOrNull();
         if (mvWorld == null) {
@@ -271,7 +271,7 @@ private void handleJoinLocation(PlayerSpawnLocationEvent event) {
      */
     @EventMethod
     @DefaultEventPriority(EventPriority.MONITOR)
-    public void playerChangedWorld(PlayerChangedWorldEvent event) {
+    void playerChangedWorld(PlayerChangedWorldEvent event) {
         // Permissions now determine whether or not to handle a gamemode.
         this.handleGameModeAndFlight(event.getPlayer(), event.getPlayer().getWorld());
         playerWorld.put(event.getPlayer().getName(), event.getPlayer().getWorld().getName());
@@ -284,7 +284,7 @@ public void playerChangedWorld(PlayerChangedWorldEvent event) {
     @EventMethod
     @EventPriorityKey("mvcore-player-teleport")
     @DefaultEventPriority(EventPriority.HIGHEST)
-    public void playerTeleport(PlayerTeleportEvent event) {
+    void playerTeleport(PlayerTeleportEvent event) {
         Logging.finer("Got teleport event for player '"
                 + event.getPlayer().getName() + "' with cause '" + event.getCause() + "'");
         if (event.isCancelled()) {
@@ -355,7 +355,7 @@ private void stateSuccess(String playerName, String worldName) {
      */
     @EventMethod
     @DefaultEventPriority(EventPriority.LOWEST)
-    public void playerPortalCheck(PlayerPortalEvent event) {
+    void playerPortalCheck(PlayerPortalEvent event) {
         if (event.isCancelled()) {
             return;
         }
@@ -381,7 +381,7 @@ public void playerPortalCheck(PlayerPortalEvent event) {
     @EventMethod
     @EventPriorityKey("mvcore-player-portal")
     @DefaultEventPriority(EventPriority.HIGH)
-    public void playerPortal(PlayerPortalEvent event) {
+    void playerPortal(PlayerPortalEvent event) {
         if (event.isCancelled()) {
             return;
         }

src/main/java/org/mvplugins/multiverse/core/listeners/MVPortalListener.java

@@ -12,7 +12,6 @@
 import org.bukkit.Material;
 import org.bukkit.PortalType;
 import org.bukkit.block.BlockState;
-import org.bukkit.event.EventHandler;
 import org.bukkit.event.block.Action;
 import org.bukkit.event.entity.EntityPortalEvent;
 import org.bukkit.event.player.PlayerInteractEvent;
@@ -48,7 +47,7 @@ final class MVPortalListener implements CoreListener {
      */
     @EventMethod
     @IgnoreIfCancelled
-    public void portalCreate(PortalCreateEvent event) {
+    void portalCreate(PortalCreateEvent event) {
         Logging.fine("Attempting to create portal at '%s' with reason: %s",
                 event.getWorld().getName(), event.getReason());
 
@@ -93,7 +92,7 @@ private PortalType getPortalType(PortalCreateEvent event) {
      */
     @EventMethod
     @IgnoreIfCancelled
-    public void playerInteract(PlayerInteractEvent event) {
+    void playerInteract(PlayerInteractEvent event) {
         if (isCreateEndPortalInteraction(event)) {
             return;
         }
@@ -122,7 +121,7 @@ private boolean isCreateEndPortalInteraction(PlayerInteractEvent event) {
      * @param event The Event that was fired.
      */
     @EventMethod
-    public void entityPortal(EntityPortalEvent event) {
+    void entityPortal(EntityPortalEvent event) {
         if (event.isCancelled() || event.getTo() == null) {
             return;
         }

src/main/java/org/mvplugins/multiverse/core/listeners/MVWeatherListener.java

@@ -9,7 +9,6 @@
 
 import com.dumptruckman.minecraft.util.Logging;
 import jakarta.inject.Inject;
-import org.bukkit.event.EventHandler;
 import org.bukkit.event.weather.ThunderChangeEvent;
 import org.bukkit.event.weather.WeatherChangeEvent;
 import org.jvnet.hk2.annotations.Service;
@@ -35,7 +34,7 @@ final class MVWeatherListener implements CoreListener {
      * @param event The Event that was fired.
      */
     @EventMethod
-    public void weatherChange(WeatherChangeEvent event) {
+    void weatherChange(WeatherChangeEvent event) {
         if (event.isCancelled() || !event.toWeatherState()) {
             return;
         }
@@ -54,7 +53,7 @@ public void weatherChange(WeatherChangeEvent event) {
      * @param event The Event that was fired.
      */
     @EventMethod
-    public void thunderChange(ThunderChangeEvent event) {
+    void thunderChange(ThunderChangeEvent event) {
         if (event.isCancelled() || !event.toThunderState()) {
             return;
         }