From 811ed5760fea98fe9b0ac9b3c784c552d7600af7 Mon Sep 17 00:00:00 2001 From: 502647092 Date: Fri, 25 Sep 2015 12:06:08 +0800 Subject: [PATCH] add manager package... Signed-off-by: 502647092 --- src/main/java/com/bekvon/bukkit/residence/Residence.java | 4 +++- .../bekvon/bukkit/residence/commandsub/CommandMarket.java | 2 +- .../bekvon/bukkit/residence/commandsub/CommandTool.java | 3 +-- .../residence/listeners/ResidenceEntityListener.java | 2 +- .../residence/listeners/flag/ResidenceAnimalKilling.java | 2 +- .../bukkit/residence/{ => manager}/ConfigManager.java | 3 ++- .../residence/{protection => manager}/EntityManager.java | 2 +- .../bekvon/bukkit/residence/{ => manager}/FlagManager.java | 7 ++++--- 8 files changed, 14 insertions(+), 11 deletions(-) rename src/main/java/com/bekvon/bukkit/residence/{ => manager}/ConfigManager.java (98%) rename src/main/java/com/bekvon/bukkit/residence/{protection => manager}/EntityManager.java (93%) rename src/main/java/com/bekvon/bukkit/residence/{ => manager}/FlagManager.java (74%) diff --git a/src/main/java/com/bekvon/bukkit/residence/Residence.java b/src/main/java/com/bekvon/bukkit/residence/Residence.java index 2d2c0e8..d74a5ec 100644 --- a/src/main/java/com/bekvon/bukkit/residence/Residence.java +++ b/src/main/java/com/bekvon/bukkit/residence/Residence.java @@ -47,10 +47,12 @@ import com.bekvon.bukkit.residence.listeners.ResidenceBlockListener; import com.bekvon.bukkit.residence.listeners.ResidenceEntityListener; import com.bekvon.bukkit.residence.listeners.ResidencePlayerListener; import com.bekvon.bukkit.residence.listeners.ResidencePlayerListener_1_8; +import com.bekvon.bukkit.residence.manager.ConfigManager; +import com.bekvon.bukkit.residence.manager.EntityManager; +import com.bekvon.bukkit.residence.manager.FlagManager; import com.bekvon.bukkit.residence.permissions.PermissionManager; import com.bekvon.bukkit.residence.persistance.YMLSaveHelper; import com.bekvon.bukkit.residence.protection.ClaimedResidence; -import com.bekvon.bukkit.residence.protection.EntityManager; import com.bekvon.bukkit.residence.protection.FlagPermissions; import com.bekvon.bukkit.residence.protection.LeaseManager; import com.bekvon.bukkit.residence.protection.PermissionListManager; diff --git a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandMarket.java b/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandMarket.java index b006ec0..ec36102 100644 --- a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandMarket.java +++ b/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandMarket.java @@ -6,10 +6,10 @@ import org.bukkit.command.CommandException; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import com.bekvon.bukkit.residence.ConfigManager; import com.bekvon.bukkit.residence.Residence; import com.bekvon.bukkit.residence.economy.TransactionManager; import com.bekvon.bukkit.residence.economy.rent.RentManager; +import com.bekvon.bukkit.residence.manager.ConfigManager; import com.bekvon.bukkit.residence.permissions.PermissionManager; import com.bekvon.bukkit.residence.protection.ResidenceManager; import com.bekvon.bukkit.residence.selection.SelectionManager; diff --git a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandTool.java b/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandTool.java index d261640..21cac3f 100644 --- a/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandTool.java +++ b/src/main/java/com/bekvon/bukkit/residence/commandsub/CommandTool.java @@ -7,8 +7,8 @@ import org.bukkit.command.CommandException; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import com.bekvon.bukkit.residence.ConfigManager; import com.bekvon.bukkit.residence.Residence; +import com.bekvon.bukkit.residence.manager.ConfigManager; import com.bekvon.bukkit.residence.text.Language; import cn.citycraft.PluginHelper.commands.BaseCommand; @@ -27,7 +27,6 @@ public class CommandTool extends BaseCommand { public void execute(final CommandSender sender, final Command command, final String label, final String[] args) throws CommandException { final Player player = (Player) sender; final Language language = plugin.getLanguage(); - final ConfigManager cmanager = plugin.getConfigManager(); player.sendMessage(ChatColor.YELLOW + language.getPhrase("SelectionTool") + ":" + ChatColor.GREEN + Material.getMaterial(cmanager.getSelectionTooldID())); player.sendMessage(ChatColor.YELLOW + language.getPhrase("InfoTool") + ": " + ChatColor.GREEN + Material.getMaterial(cmanager.getInfoToolID())); diff --git a/src/main/java/com/bekvon/bukkit/residence/listeners/ResidenceEntityListener.java b/src/main/java/com/bekvon/bukkit/residence/listeners/ResidenceEntityListener.java index acb52b6..e195e39 100644 --- a/src/main/java/com/bekvon/bukkit/residence/listeners/ResidenceEntityListener.java +++ b/src/main/java/com/bekvon/bukkit/residence/listeners/ResidenceEntityListener.java @@ -38,8 +38,8 @@ import org.bukkit.event.hanging.HangingBreakEvent; import org.bukkit.event.hanging.HangingPlaceEvent; import com.bekvon.bukkit.residence.Residence; +import com.bekvon.bukkit.residence.manager.EntityManager; import com.bekvon.bukkit.residence.protection.ClaimedResidence; -import com.bekvon.bukkit.residence.protection.EntityManager; import com.bekvon.bukkit.residence.protection.FlagPermissions; /** diff --git a/src/main/java/com/bekvon/bukkit/residence/listeners/flag/ResidenceAnimalKilling.java b/src/main/java/com/bekvon/bukkit/residence/listeners/flag/ResidenceAnimalKilling.java index b1fa17c..4db1f30 100644 --- a/src/main/java/com/bekvon/bukkit/residence/listeners/flag/ResidenceAnimalKilling.java +++ b/src/main/java/com/bekvon/bukkit/residence/listeners/flag/ResidenceAnimalKilling.java @@ -10,8 +10,8 @@ import org.bukkit.event.Listener; import org.bukkit.event.entity.EntityDamageByEntityEvent; import com.bekvon.bukkit.residence.Residence; +import com.bekvon.bukkit.residence.manager.EntityManager; import com.bekvon.bukkit.residence.protection.ClaimedResidence; -import com.bekvon.bukkit.residence.protection.EntityManager; import com.bekvon.bukkit.residence.protection.FlagPermissions; public class ResidenceAnimalKilling implements Listener { diff --git a/src/main/java/com/bekvon/bukkit/residence/ConfigManager.java b/src/main/java/com/bekvon/bukkit/residence/manager/ConfigManager.java similarity index 98% rename from src/main/java/com/bekvon/bukkit/residence/ConfigManager.java rename to src/main/java/com/bekvon/bukkit/residence/manager/ConfigManager.java index 54eb590..320bf79 100644 --- a/src/main/java/com/bekvon/bukkit/residence/ConfigManager.java +++ b/src/main/java/com/bekvon/bukkit/residence/manager/ConfigManager.java @@ -1,7 +1,7 @@ /* * To change this template, choose Tools | Templates and open the template in the editor. */ -package com.bekvon.bukkit.residence; +package com.bekvon.bukkit.residence.manager; import java.util.HashMap; import java.util.List; @@ -13,6 +13,7 @@ import org.bukkit.Material; import org.bukkit.configuration.ConfigurationSection; import org.bukkit.configuration.file.FileConfiguration; +import com.bekvon.bukkit.residence.Residence; import com.bekvon.bukkit.residence.protection.FlagPermissions; /** diff --git a/src/main/java/com/bekvon/bukkit/residence/protection/EntityManager.java b/src/main/java/com/bekvon/bukkit/residence/manager/EntityManager.java similarity index 93% rename from src/main/java/com/bekvon/bukkit/residence/protection/EntityManager.java rename to src/main/java/com/bekvon/bukkit/residence/manager/EntityManager.java index 6cdbedb..3f15583 100644 --- a/src/main/java/com/bekvon/bukkit/residence/protection/EntityManager.java +++ b/src/main/java/com/bekvon/bukkit/residence/manager/EntityManager.java @@ -1,4 +1,4 @@ -package com.bekvon.bukkit.residence.protection; +package com.bekvon.bukkit.residence.manager; import org.bukkit.entity.Bat; import org.bukkit.entity.Chicken; diff --git a/src/main/java/com/bekvon/bukkit/residence/FlagManager.java b/src/main/java/com/bekvon/bukkit/residence/manager/FlagManager.java similarity index 74% rename from src/main/java/com/bekvon/bukkit/residence/FlagManager.java rename to src/main/java/com/bekvon/bukkit/residence/manager/FlagManager.java index c73bfb6..4ce3994 100644 --- a/src/main/java/com/bekvon/bukkit/residence/FlagManager.java +++ b/src/main/java/com/bekvon/bukkit/residence/manager/FlagManager.java @@ -1,4 +1,4 @@ -package com.bekvon.bukkit.residence; +package com.bekvon.bukkit.residence.manager; import java.util.HashMap; import java.util.Map.Entry; @@ -6,6 +6,7 @@ import java.util.Map.Entry; import org.bukkit.event.Listener; import org.bukkit.plugin.PluginManager; +import com.bekvon.bukkit.residence.Residence; import com.bekvon.bukkit.residence.listeners.flag.ResidenceAnimalKilling; import com.bekvon.bukkit.residence.listeners.flag.ResidenceFlyListener; @@ -27,8 +28,8 @@ public class FlagManager { flagmap = new HashMap(); - flagmap.put(config.getBoolean("Flag.Fly"), new ResidenceFlyListener(plugin)); - flagmap.put(config.getBoolean("Flag.AnimalKilling"), new ResidenceAnimalKilling(plugin)); + flagmap.put(config.getBoolean("Flag.Fly", true), new ResidenceFlyListener(plugin)); + flagmap.put(config.getBoolean("Flag.AnimalKilling", true), new ResidenceAnimalKilling(plugin)); for (final Entry fm : flagmap.entrySet()) { if (fm.getKey()) {