Fix listener naming schema.

This commit is contained in:
Brianna 2020-09-23 08:50:57 -05:00
parent 1fd9732fc1
commit d194f0a525
25 changed files with 70 additions and 68 deletions

View File

@ -26,6 +26,8 @@ import com.songoda.skyblock.leaderboard.LeaderboardManager;
import com.songoda.skyblock.levelling.IslandLevelManager;
import com.songoda.skyblock.limit.LimitationInstanceHandler;
import com.songoda.skyblock.listeners.*;
import com.songoda.skyblock.listeners.hooks.EpicSpawners;
import com.songoda.skyblock.listeners.hooks.UltimateStacker;
import com.songoda.skyblock.localization.LocalizationManager;
import com.songoda.skyblock.menus.admin.Creator;
import com.songoda.skyblock.menus.admin.Generator;
@ -224,30 +226,30 @@ public class SkyBlock extends SongodaPlugin {
mobNetherWaterTask = MobNetherWaterTask.startTask(this);
PluginManager pluginManager = getServer().getPluginManager();
pluginManager.registerEvents(new Join(this), this);
pluginManager.registerEvents(new Quit(this), this);
pluginManager.registerEvents(new Block(this), this);
pluginManager.registerEvents(new Interact(this), this);
pluginManager.registerEvents(new Entity(this), this);
pluginManager.registerEvents(new Bucket(this), this);
pluginManager.registerEvents(new Projectile(this), this);
pluginManager.registerEvents(new Inventory(this), this);
pluginManager.registerEvents(new Item(this), this);
pluginManager.registerEvents(new Teleport(this), this);
pluginManager.registerEvents(new Portal(this), this);
pluginManager.registerEvents(new Move(this), this);
pluginManager.registerEvents(new Death(this), this);
pluginManager.registerEvents(new Respawn(this), this);
pluginManager.registerEvents(new Chat(this), this);
pluginManager.registerEvents(new Spawner(this), this);
pluginManager.registerEvents(new Food(this), this);
pluginManager.registerEvents(new Grow(this), this);
pluginManager.registerEvents(new Piston(this), this);
pluginManager.registerEvents(new FallBreak(this), this);
pluginManager.registerEvents(new World(this), this);
pluginManager.registerEvents(new JoinListeners(this), this);
pluginManager.registerEvents(new QuitListeners(this), this);
pluginManager.registerEvents(new BlockListeners(this), this);
pluginManager.registerEvents(new InteractListeners(this), this);
pluginManager.registerEvents(new EntityListeners(this), this);
pluginManager.registerEvents(new BucketListeners(this), this);
pluginManager.registerEvents(new ProjectileListeners(this), this);
pluginManager.registerEvents(new InventoryListeners(this), this);
pluginManager.registerEvents(new ItemListeners(this), this);
pluginManager.registerEvents(new TeleportListeners(this), this);
pluginManager.registerEvents(new PortalListeners(this), this);
pluginManager.registerEvents(new MoveListeners(this), this);
pluginManager.registerEvents(new DeathListeners(this), this);
pluginManager.registerEvents(new RespawnListeners(this), this);
pluginManager.registerEvents(new ChatListeners(this), this);
pluginManager.registerEvents(new SpawnerListeners(this), this);
pluginManager.registerEvents(new FoodListeners(this), this);
pluginManager.registerEvents(new GrowListeners(this), this);
pluginManager.registerEvents(new PistonListeners(this), this);
pluginManager.registerEvents(new FallBreakListeners(this), this);
pluginManager.registerEvents(new WorldListeners(this), this);
if(ServerVersion.isServerVersionAtLeast(ServerVersion.V1_13)) {
pluginManager.registerEvents(new Sponge(this), this);
pluginManager.registerEvents(new SpongeListeners(this), this);
}
if (pluginManager.isPluginEnabled("EpicSpawners"))

View File

@ -37,12 +37,12 @@ import org.bukkit.inventory.ItemStack;
import java.io.File;
import java.util.*;
public class Block implements Listener {
public class BlockListeners implements Listener {
private final SkyBlock plugin;
private final Set<Location> generatorWaitingLocs;
public Block(SkyBlock plugin) {
public BlockListeners(SkyBlock plugin) {
this.plugin = plugin;
this.generatorWaitingLocs = new HashSet<>();
}

View File

@ -16,11 +16,11 @@ import org.bukkit.event.player.PlayerBucketFillEvent;
import java.io.File;
public class Bucket implements Listener {
public class BucketListeners implements Listener {
private final SkyBlock plugin;
public Bucket(SkyBlock plugin) {
public BucketListeners(SkyBlock plugin) {
this.plugin = plugin;
}

View File

@ -24,11 +24,11 @@ import org.bukkit.event.player.AsyncPlayerChatEvent;
import java.io.File;
import java.util.UUID;
public class Chat implements Listener {
public class ChatListeners implements Listener {
private final SkyBlock plugin;
public Chat(SkyBlock plugin) {
public ChatListeners(SkyBlock plugin) {
this.plugin = plugin;
}

View File

@ -12,11 +12,11 @@ import org.bukkit.event.entity.PlayerDeathEvent;
import java.io.File;
public class Death implements Listener {
public class DeathListeners implements Listener {
private final SkyBlock plugin;
public Death(SkyBlock plugin) {
public DeathListeners(SkyBlock plugin) {
this.plugin = plugin;
}

View File

@ -41,13 +41,13 @@ import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.*;
public class Entity implements Listener {
public class EntityListeners implements Listener {
private final SkyBlock plugin;
private final Set<UUID> preventFireTicks = new HashSet<>();
public Entity(SkyBlock plugin) {
public EntityListeners(SkyBlock plugin) {
this.plugin = plugin;
}

View File

@ -22,13 +22,13 @@ import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;
public class FallBreak implements Listener {
public class FallBreakListeners implements Listener {
private final SkyBlock plugin;
private final Set<FallingBlock> fallingBlocks;
public FallBreak(SkyBlock plugin) {
public FallBreakListeners(SkyBlock plugin) {
this.plugin = plugin;
this.fallingBlocks = new HashSet<>();

View File

@ -6,11 +6,11 @@ import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.bukkit.event.entity.FoodLevelChangeEvent;
public class Food implements Listener {
public class FoodListeners implements Listener {
private final SkyBlock plugin;
public Food(SkyBlock plugin) {
public FoodListeners(SkyBlock plugin) {
this.plugin = plugin;
}

View File

@ -27,11 +27,11 @@ import java.util.Iterator;
import java.util.List;
@SuppressWarnings("deprecation")
public class Grow implements Listener {
public class GrowListeners implements Listener {
private final SkyBlock plugin;
public Grow(SkyBlock plugin) {
public GrowListeners(SkyBlock plugin) {
this.plugin = plugin;
}

View File

@ -42,11 +42,11 @@ import org.bukkit.permissions.PermissionAttachmentInfo;
import java.io.File;
import java.util.HashMap;
public class Interact implements Listener {
public class InteractListeners implements Listener {
private final SkyBlock plugin;
public Interact(SkyBlock plugin) {
public InteractListeners(SkyBlock plugin) {
this.plugin = plugin;
}

View File

@ -6,11 +6,11 @@ import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.bukkit.event.inventory.InventoryOpenEvent;
public class Inventory implements Listener {
public class InventoryListeners implements Listener {
private final SkyBlock plugin;
public Inventory(SkyBlock plugin) {
public InventoryListeners(SkyBlock plugin) {
this.plugin = plugin;
}

View File

@ -9,11 +9,11 @@ import org.bukkit.event.player.PlayerDropItemEvent;
import org.bukkit.event.player.PlayerPickupItemEvent;
@SuppressWarnings("deprecation")
public class Item implements Listener {
public class ItemListeners implements Listener {
private final SkyBlock plugin;
public Item(SkyBlock plugin) {
public ItemListeners(SkyBlock plugin) {
this.plugin = plugin;
}

View File

@ -27,11 +27,11 @@ import org.bukkit.event.player.PlayerJoinEvent;
import java.io.File;
import java.lang.reflect.Method;
public class Join implements Listener {
public class JoinListeners implements Listener {
private final SkyBlock plugin;
public Join(SkyBlock plugin) {
public JoinListeners(SkyBlock plugin) {
this.plugin = plugin;
}

View File

@ -31,11 +31,11 @@ import org.bukkit.potion.PotionEffect;
import java.io.File;
import java.util.Objects;
public class Move implements Listener {
public class MoveListeners implements Listener {
private final SkyBlock plugin;
public Move(SkyBlock plugin) {
public MoveListeners(SkyBlock plugin) {
this.plugin = plugin;
}

View File

@ -15,11 +15,11 @@ import org.bukkit.event.block.BlockPistonExtendEvent;
import java.io.File;
public class Piston implements Listener {
public class PistonListeners implements Listener {
private final SkyBlock plugin;
public Piston(SkyBlock plugin) {
public PistonListeners(SkyBlock plugin) {
this.plugin = plugin;
}

View File

@ -30,13 +30,13 @@ import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
public class Portal implements Listener {
public class PortalListeners implements Listener {
private final SkyBlock plugin;
private final Map<UUID, Tick> tickCounter = new HashMap<>();
public Portal(SkyBlock plugin) {
public PortalListeners(SkyBlock plugin) {
this.plugin = plugin;
}

View File

@ -7,11 +7,11 @@ import org.bukkit.event.Listener;
import org.bukkit.event.entity.ProjectileLaunchEvent;
import org.bukkit.projectiles.ProjectileSource;
public class Projectile implements Listener {
public class ProjectileListeners implements Listener {
private final SkyBlock plugin;
public Projectile(SkyBlock plugin) {
public ProjectileListeners(SkyBlock plugin) {
this.plugin = plugin;
}

View File

@ -28,11 +28,11 @@ import java.util.Date;
import java.util.Set;
import java.util.UUID;
public class Quit implements Listener {
public class QuitListeners implements Listener {
private final SkyBlock plugin;
public Quit(SkyBlock plugin) {
public QuitListeners(SkyBlock plugin) {
this.plugin = plugin;
}

View File

@ -17,11 +17,11 @@ import org.bukkit.event.player.PlayerTeleportEvent;
import java.io.File;
import java.util.logging.Level;
public class Respawn implements Listener {
public class RespawnListeners implements Listener {
private final SkyBlock plugin;
public Respawn(SkyBlock plugin) {
public RespawnListeners(SkyBlock plugin) {
this.plugin = plugin;
}

View File

@ -14,11 +14,11 @@ import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
import java.util.List;
public class Spawner implements Listener {
public class SpawnerListeners implements Listener {
private final SkyBlock plugin;
public Spawner(SkyBlock plugin) {
public SpawnerListeners(SkyBlock plugin) {
this.plugin = plugin;
}

View File

@ -14,11 +14,11 @@ import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.bukkit.event.block.SpongeAbsorbEvent;
public class Sponge implements Listener {
public class SpongeListeners implements Listener {
private final SkyBlock plugin;
public Sponge(SkyBlock plugin) {
public SpongeListeners(SkyBlock plugin) {
this.plugin = plugin;
}

View File

@ -33,11 +33,11 @@ import org.bukkit.event.player.PlayerTeleportEvent;
import java.io.File;
import java.util.UUID;
public class Teleport implements Listener {
public class TeleportListeners implements Listener {
private final SkyBlock plugin;
public Teleport(SkyBlock plugin) {
public TeleportListeners(SkyBlock plugin) {
this.plugin = plugin;
}

View File

@ -11,11 +11,11 @@ import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.bukkit.event.player.PlayerChangedWorldEvent;
public class World implements Listener {
public class WorldListeners implements Listener {
private final SkyBlock plugin;
public World(SkyBlock plugin) {
public WorldListeners(SkyBlock plugin) {
this.plugin = plugin;
}

View File

@ -1,4 +1,4 @@
package com.songoda.skyblock.listeners;
package com.songoda.skyblock.listeners.hooks;
import com.songoda.epicspawners.api.events.SpawnerBreakEvent;
import com.songoda.epicspawners.api.events.SpawnerChangeEvent;

View File

@ -1,4 +1,4 @@
package com.songoda.skyblock.listeners;
package com.songoda.skyblock.listeners.hooks;
import com.songoda.skyblock.SkyBlock;
import com.songoda.skyblock.config.FileManager;