Renamed Listeners and their package

This commit is contained in:
Eric Biedert 2016-06-28 18:30:48 +02:00
parent 82cffd8c31
commit 4470300624
9 changed files with 24 additions and 27 deletions

View File

@ -3,7 +3,7 @@ package de.epiceric.shopchest;
import de.epiceric.shopchest.config.Config;
import de.epiceric.shopchest.config.LanguageConfiguration;
import de.epiceric.shopchest.config.Regex;
import de.epiceric.shopchest.event.*;
import de.epiceric.shopchest.listeners.*;
import de.epiceric.shopchest.interfaces.JsonBuilder;
import de.epiceric.shopchest.interfaces.jsonbuilder.*;
import de.epiceric.shopchest.language.LanguageUtils;
@ -321,15 +321,15 @@ public class ShopChest extends JavaPlugin {
initializeShops();
getServer().getPluginManager().registerEvents(new UpdateHolograms(), this);
getServer().getPluginManager().registerEvents(new RegenerateShopItem(), this);
getServer().getPluginManager().registerEvents(new InteractShop(this), this);
getServer().getPluginManager().registerEvents(new NotifyUpdate(this), this);
getServer().getPluginManager().registerEvents(new ProtectChest(), this);
getServer().getPluginManager().registerEvents(new HologramUpdateListener(), this);
getServer().getPluginManager().registerEvents(new ItemProtectListener(), this);
getServer().getPluginManager().registerEvents(new ShopInteractListener(this), this);
getServer().getPluginManager().registerEvents(new NotifyUpdateOnJoinListener(this), this);
getServer().getPluginManager().registerEvents(new ChestProtectListener(), this);
getServer().getPluginManager().registerEvents(new ItemCustomNameListener(), this);
if (getServer().getPluginManager().getPlugin("ClearLag") != null)
getServer().getPluginManager().registerEvents(new RegenerateShopItemAfterRemove(), this);
getServer().getPluginManager().registerEvents(new ClearLagListener(), this);
if (getServer().getPluginManager().getPlugin("LWC") != null)
new LWCMagnetListener(this).initializeListener();

View File

@ -1,4 +1,4 @@
package de.epiceric.shopchest.event;
package de.epiceric.shopchest.listeners;
import de.epiceric.shopchest.ShopChest;
import de.epiceric.shopchest.config.Config;
@ -23,7 +23,7 @@ import org.bukkit.inventory.InventoryHolder;
import java.util.ArrayList;
public class ProtectChest implements Listener {
public class ChestProtectListener implements Listener {
@EventHandler
public void onBlockBreak(BlockBreakEvent e) {

View File

@ -1,4 +1,4 @@
package de.epiceric.shopchest.event;
package de.epiceric.shopchest.listeners;
import me.minebuilders.clearlag.events.EntityRemoveEvent;
import org.bukkit.entity.Entity;
@ -8,7 +8,7 @@ import org.bukkit.event.Listener;
import java.util.ArrayList;
public class RegenerateShopItemAfterRemove implements Listener {
public class ClearLagListener implements Listener {
@EventHandler(priority = EventPriority.HIGH)
public void onEntityRemove(EntityRemoveEvent e) {

View File

@ -1,4 +1,4 @@
package de.epiceric.shopchest.event;
package de.epiceric.shopchest.listeners;
import de.epiceric.shopchest.config.Config;
import de.epiceric.shopchest.shop.Shop;
@ -9,9 +9,9 @@ import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.bukkit.event.player.PlayerMoveEvent;
public class UpdateHolograms implements Listener {
public class HologramUpdateListener implements Listener {
public UpdateHolograms() {
public HologramUpdateListener() {
}
@EventHandler

View File

@ -1,4 +1,4 @@
package de.epiceric.shopchest.event;
package de.epiceric.shopchest.listeners;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;

View File

@ -1,4 +1,4 @@
package de.epiceric.shopchest.event;
package de.epiceric.shopchest.listeners;
import org.bukkit.entity.Item;
@ -10,10 +10,7 @@ import org.bukkit.event.inventory.InventoryPickupItemEvent;
import org.bukkit.event.inventory.InventoryType;
import org.bukkit.event.player.PlayerPickupItemEvent;
public class RegenerateShopItem implements Listener {
public RegenerateShopItem() {
}
public class ItemProtectListener implements Listener {
@EventHandler(priority = EventPriority.HIGH)
public void onItemDespawn(ItemDespawnEvent e) {

View File

@ -1,4 +1,4 @@
package de.epiceric.shopchest.event;
package de.epiceric.shopchest.listeners;
import com.griefcraft.lwc.LWC;
import com.griefcraft.scripting.JavaModule;

View File

@ -1,4 +1,4 @@
package de.epiceric.shopchest.event;
package de.epiceric.shopchest.listeners;
import de.epiceric.shopchest.ShopChest;
import de.epiceric.shopchest.config.Regex;
@ -13,12 +13,12 @@ import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.bukkit.event.player.PlayerJoinEvent;
public class NotifyUpdate implements Listener {
public class NotifyUpdateOnJoinListener implements Listener {
private ShopChest plugin;
private Permission perm;
public NotifyUpdate(ShopChest plugin) {
public NotifyUpdateOnJoinListener(ShopChest plugin) {
this.plugin = plugin;
perm = plugin.getPermission();
}

View File

@ -1,4 +1,4 @@
package de.epiceric.shopchest.event;
package de.epiceric.shopchest.listeners;
import com.griefcraft.lwc.LWC;
import com.griefcraft.model.Protection;
@ -36,14 +36,14 @@ import org.yi.acru.bukkit.Lockette.Lockette;
import java.util.HashMap;
import java.util.Map;
public class InteractShop implements Listener {
public class ShopInteractListener implements Listener {
private ShopChest plugin;
private Permission perm;
private Economy econ;
private Database database;
public InteractShop(ShopChest plugin) {
public ShopInteractListener(ShopChest plugin) {
this.plugin = plugin;
this.perm = plugin.getPermission();
this.econ = plugin.getEconomy();