From 619ced15e61db1c9074257bc56765aaff940c4f0 Mon Sep 17 00:00:00 2001 From: 502647092 Date: Sun, 1 May 2016 00:22:10 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E4=BF=AE=E6=94=B9=E5=8C=85?= =?UTF-8?q?=E5=90=8D=20=E5=85=BC=E5=AE=B9=E9=83=A8=E5=88=86=E8=80=81?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E6=8F=92=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 3 ++- src/main/java/com/bekvon/bukkit/residence/Residence.java | 2 +- .../bekvon/bukkit/residence}/permissions/PermissionGroup.java | 2 +- .../bukkit/residence}/permissions/PermissionManager.java | 2 +- .../bukkit/residence}/permissions/PermissionsInterface.java | 2 +- .../bekvon/bukkit/residence/protection/ClaimedResidence.java | 2 +- .../com/bekvon/bukkit/residence/protection/LeaseManager.java | 2 +- .../bekvon/bukkit/residence/protection/ResidenceManager.java | 2 +- .../bukkit/residence/protection/ResidencePermissions.java | 4 ++-- src/main/java/pw/yumc/Residence/ResidenceMain.java | 2 +- src/main/java/pw/yumc/Residence/commandsub/CommandKick.java | 2 +- src/main/java/pw/yumc/Residence/commandsub/CommandLimits.java | 3 ++- src/main/java/pw/yumc/Residence/commandsub/CommandMarket.java | 2 +- src/main/java/pw/yumc/Residence/commandsub/CommandSelect.java | 2 +- .../java/pw/yumc/Residence/commandsub/CommandUnStuck.java | 4 ++-- .../java/pw/yumc/Residence/economy/TransactionManager.java | 4 ++-- src/main/java/pw/yumc/Residence/economy/rent/RentManager.java | 2 +- .../java/pw/yumc/Residence/itemlist/ResidenceItemList.java | 2 +- .../pw/yumc/Residence/listeners/ResidencePlayerListener.java | 2 +- .../java/pw/yumc/Residence/selection/SelectionManager.java | 2 +- .../yumc/Residence/vaultinterface/ResidenceVaultAdapter.java | 3 ++- 21 files changed, 27 insertions(+), 24 deletions(-) rename src/main/java/{pw/yumc/Residence => com/bekvon/bukkit/residence}/permissions/PermissionGroup.java (99%) rename src/main/java/{pw/yumc/Residence => com/bekvon/bukkit/residence}/permissions/PermissionManager.java (99%) rename src/main/java/{pw/yumc/Residence => com/bekvon/bukkit/residence}/permissions/PermissionsInterface.java (86%) diff --git a/pom.xml b/pom.xml index e25f67e..3be9dbe 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 pw.yumc Residence - 2.8.2.2 + 2.8.2.3 Residence 重制版本的领地插件 - 喵♂呜 @@ -60,6 +60,7 @@ &6更新预告!!! GUI菜单即将上线(&7菜单再等几天= =&6)... + &b2.8.2.3 - &b修改包名 兼容部分老版本插件...; &b2.8.2.2 - &e自动转换UUID版本Residence的数据(部分版本)...; &c修复上个版本命令失效的问题(库文件忘了更新了); &b2.8.2.1 - &c修复一个可能被熊孩子利用导致插件奔溃的BUG...; diff --git a/src/main/java/com/bekvon/bukkit/residence/Residence.java b/src/main/java/com/bekvon/bukkit/residence/Residence.java index 47a4e18..2d41c69 100644 --- a/src/main/java/com/bekvon/bukkit/residence/Residence.java +++ b/src/main/java/com/bekvon/bukkit/residence/Residence.java @@ -6,6 +6,7 @@ import java.util.Map; import org.bukkit.Location; import org.bukkit.entity.Player; +import com.bekvon.bukkit.residence.permissions.PermissionManager; import com.bekvon.bukkit.residence.protection.ClaimedResidence; import com.bekvon.bukkit.residence.protection.FlagPermissions; import com.bekvon.bukkit.residence.protection.LeaseManager; @@ -21,7 +22,6 @@ import pw.yumc.Residence.economy.rent.RentManager; import pw.yumc.Residence.itemlist.WorldItemManager; import pw.yumc.Residence.manager.ConfigManager; import pw.yumc.Residence.manager.EntityManager; -import pw.yumc.Residence.permissions.PermissionManager; import pw.yumc.Residence.selection.SelectionManager; import pw.yumc.Residence.text.Language; import pw.yumc.Residence.text.help.HelpEntry; diff --git a/src/main/java/pw/yumc/Residence/permissions/PermissionGroup.java b/src/main/java/com/bekvon/bukkit/residence/permissions/PermissionGroup.java similarity index 99% rename from src/main/java/pw/yumc/Residence/permissions/PermissionGroup.java rename to src/main/java/com/bekvon/bukkit/residence/permissions/PermissionGroup.java index b26f337..c627cb9 100644 --- a/src/main/java/pw/yumc/Residence/permissions/PermissionGroup.java +++ b/src/main/java/com/bekvon/bukkit/residence/permissions/PermissionGroup.java @@ -3,7 +3,7 @@ * and open the template in the editor. */ -package pw.yumc.Residence.permissions; +package com.bekvon.bukkit.residence.permissions; import java.util.HashMap; import java.util.Iterator; diff --git a/src/main/java/pw/yumc/Residence/permissions/PermissionManager.java b/src/main/java/com/bekvon/bukkit/residence/permissions/PermissionManager.java similarity index 99% rename from src/main/java/pw/yumc/Residence/permissions/PermissionManager.java rename to src/main/java/com/bekvon/bukkit/residence/permissions/PermissionManager.java index c16dbdd..f2d9f11 100644 --- a/src/main/java/pw/yumc/Residence/permissions/PermissionManager.java +++ b/src/main/java/com/bekvon/bukkit/residence/permissions/PermissionManager.java @@ -2,7 +2,7 @@ * To change this template, choose Tools | Templates and open the template in the editor. */ -package pw.yumc.Residence.permissions; +package com.bekvon.bukkit.residence.permissions; import java.util.Collections; import java.util.HashMap; diff --git a/src/main/java/pw/yumc/Residence/permissions/PermissionsInterface.java b/src/main/java/com/bekvon/bukkit/residence/permissions/PermissionsInterface.java similarity index 86% rename from src/main/java/pw/yumc/Residence/permissions/PermissionsInterface.java rename to src/main/java/com/bekvon/bukkit/residence/permissions/PermissionsInterface.java index 64a69a1..2a48da1 100644 --- a/src/main/java/pw/yumc/Residence/permissions/PermissionsInterface.java +++ b/src/main/java/com/bekvon/bukkit/residence/permissions/PermissionsInterface.java @@ -3,7 +3,7 @@ * and open the template in the editor. */ -package pw.yumc.Residence.permissions; +package com.bekvon.bukkit.residence.permissions; import org.bukkit.entity.Player; diff --git a/src/main/java/com/bekvon/bukkit/residence/protection/ClaimedResidence.java b/src/main/java/com/bekvon/bukkit/residence/protection/ClaimedResidence.java index f6366b7..f3a88ae 100644 --- a/src/main/java/com/bekvon/bukkit/residence/protection/ClaimedResidence.java +++ b/src/main/java/com/bekvon/bukkit/residence/protection/ClaimedResidence.java @@ -17,6 +17,7 @@ import org.bukkit.World; import org.bukkit.entity.Player; import com.bekvon.bukkit.residence.event.ResidenceTPEvent; +import com.bekvon.bukkit.residence.permissions.PermissionGroup; import cn.citycraft.PluginHelper.utils.CompatibleUtil; import pw.yumc.Residence.ResidenceMain; @@ -24,7 +25,6 @@ import pw.yumc.Residence.economy.ResidenceBank; import pw.yumc.Residence.economy.TransactionManager; import pw.yumc.Residence.itemlist.ResidenceItemList; import pw.yumc.Residence.itemlist.ItemList.ListType; -import pw.yumc.Residence.permissions.PermissionGroup; import pw.yumc.Residence.text.help.InformationPager; /** diff --git a/src/main/java/com/bekvon/bukkit/residence/protection/LeaseManager.java b/src/main/java/com/bekvon/bukkit/residence/protection/LeaseManager.java index d487913..fb64003 100644 --- a/src/main/java/com/bekvon/bukkit/residence/protection/LeaseManager.java +++ b/src/main/java/com/bekvon/bukkit/residence/protection/LeaseManager.java @@ -18,10 +18,10 @@ import org.bukkit.entity.Player; import com.bekvon.bukkit.residence.event.ResidenceDeleteEvent; import com.bekvon.bukkit.residence.event.ResidenceDeleteEvent.DeleteCause; +import com.bekvon.bukkit.residence.permissions.PermissionGroup; import pw.yumc.Residence.ResidenceMain; import pw.yumc.Residence.economy.EconomyInterface; -import pw.yumc.Residence.permissions.PermissionGroup; /** * diff --git a/src/main/java/com/bekvon/bukkit/residence/protection/ResidenceManager.java b/src/main/java/com/bekvon/bukkit/residence/protection/ResidenceManager.java index f4faede..deb9464 100644 --- a/src/main/java/com/bekvon/bukkit/residence/protection/ResidenceManager.java +++ b/src/main/java/com/bekvon/bukkit/residence/protection/ResidenceManager.java @@ -26,9 +26,9 @@ import org.bukkit.plugin.PluginManager; import com.bekvon.bukkit.residence.event.ResidenceCreationEvent; import com.bekvon.bukkit.residence.event.ResidenceDeleteEvent; import com.bekvon.bukkit.residence.event.ResidenceDeleteEvent.DeleteCause; +import com.bekvon.bukkit.residence.permissions.PermissionGroup; import pw.yumc.Residence.ResidenceMain; -import pw.yumc.Residence.permissions.PermissionGroup; import pw.yumc.Residence.selection.WECUI; import pw.yumc.Residence.text.help.InformationPager; diff --git a/src/main/java/com/bekvon/bukkit/residence/protection/ResidencePermissions.java b/src/main/java/com/bekvon/bukkit/residence/protection/ResidencePermissions.java index 8549838..dc1e510 100644 --- a/src/main/java/com/bekvon/bukkit/residence/protection/ResidencePermissions.java +++ b/src/main/java/com/bekvon/bukkit/residence/protection/ResidencePermissions.java @@ -19,11 +19,11 @@ import org.bukkit.plugin.PluginManager; import com.bekvon.bukkit.residence.event.ResidenceFlagChangeEvent; import com.bekvon.bukkit.residence.event.ResidenceFlagCheckEvent; import com.bekvon.bukkit.residence.event.ResidenceFlagEvent.FlagType; +import com.bekvon.bukkit.residence.permissions.PermissionGroup; +import com.bekvon.bukkit.residence.permissions.PermissionManager; import com.bekvon.bukkit.residence.event.ResidenceOwnerChangeEvent; import pw.yumc.Residence.ResidenceMain; -import pw.yumc.Residence.permissions.PermissionGroup; -import pw.yumc.Residence.permissions.PermissionManager; /** * diff --git a/src/main/java/pw/yumc/Residence/ResidenceMain.java b/src/main/java/pw/yumc/Residence/ResidenceMain.java index 8f93d2e..1e3d5a6 100644 --- a/src/main/java/pw/yumc/Residence/ResidenceMain.java +++ b/src/main/java/pw/yumc/Residence/ResidenceMain.java @@ -34,6 +34,7 @@ import org.bukkit.plugin.java.JavaPlugin; import com.bekvon.bukkit.residence.Residence; import com.bekvon.bukkit.residence.event.ResidenceCommandEvent; +import com.bekvon.bukkit.residence.permissions.PermissionManager; import com.bekvon.bukkit.residence.protection.ClaimedResidence; import com.bekvon.bukkit.residence.protection.FlagPermissions; import com.bekvon.bukkit.residence.protection.LeaseManager; @@ -64,7 +65,6 @@ import pw.yumc.Residence.listeners.ResidencePlayerListener_1_8; import pw.yumc.Residence.listeners.bugfix.ResidenceBugFix; import pw.yumc.Residence.manager.ConfigManager; import pw.yumc.Residence.manager.EntityManager; -import pw.yumc.Residence.permissions.PermissionManager; import pw.yumc.Residence.persistance.YMLSaveHelper; import pw.yumc.Residence.runnable.AutoSaveTask; import pw.yumc.Residence.runnable.HealTask; diff --git a/src/main/java/pw/yumc/Residence/commandsub/CommandKick.java b/src/main/java/pw/yumc/Residence/commandsub/CommandKick.java index dc56ed7..e9a1a07 100644 --- a/src/main/java/pw/yumc/Residence/commandsub/CommandKick.java +++ b/src/main/java/pw/yumc/Residence/commandsub/CommandKick.java @@ -7,12 +7,12 @@ import org.bukkit.command.CommandException; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; +import com.bekvon.bukkit.residence.permissions.PermissionGroup; import com.bekvon.bukkit.residence.protection.ClaimedResidence; import com.bekvon.bukkit.residence.protection.ResidenceManager; import cn.citycraft.PluginHelper.commands.BaseCommand; import pw.yumc.Residence.ResidenceMain; -import pw.yumc.Residence.permissions.PermissionGroup; import pw.yumc.Residence.text.Language; public class CommandKick extends BaseCommand { diff --git a/src/main/java/pw/yumc/Residence/commandsub/CommandLimits.java b/src/main/java/pw/yumc/Residence/commandsub/CommandLimits.java index 9772e08..da13b62 100644 --- a/src/main/java/pw/yumc/Residence/commandsub/CommandLimits.java +++ b/src/main/java/pw/yumc/Residence/commandsub/CommandLimits.java @@ -5,9 +5,10 @@ import org.bukkit.command.CommandException; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; +import com.bekvon.bukkit.residence.permissions.PermissionManager; + import cn.citycraft.PluginHelper.commands.BaseCommand; import pw.yumc.Residence.ResidenceMain; -import pw.yumc.Residence.permissions.PermissionManager; public class CommandLimits extends BaseCommand { ResidenceMain plugin; diff --git a/src/main/java/pw/yumc/Residence/commandsub/CommandMarket.java b/src/main/java/pw/yumc/Residence/commandsub/CommandMarket.java index 81e7cbc..34b9cf3 100644 --- a/src/main/java/pw/yumc/Residence/commandsub/CommandMarket.java +++ b/src/main/java/pw/yumc/Residence/commandsub/CommandMarket.java @@ -6,6 +6,7 @@ import org.bukkit.command.CommandException; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; +import com.bekvon.bukkit.residence.permissions.PermissionManager; import com.bekvon.bukkit.residence.protection.ResidenceManager; import cn.citycraft.PluginHelper.commands.BaseCommand; @@ -13,7 +14,6 @@ import pw.yumc.Residence.ResidenceMain; import pw.yumc.Residence.economy.TransactionManager; import pw.yumc.Residence.economy.rent.RentManager; import pw.yumc.Residence.manager.ConfigManager; -import pw.yumc.Residence.permissions.PermissionManager; import pw.yumc.Residence.selection.SelectionManager; import pw.yumc.Residence.text.Language; diff --git a/src/main/java/pw/yumc/Residence/commandsub/CommandSelect.java b/src/main/java/pw/yumc/Residence/commandsub/CommandSelect.java index 8ae82cb..49f9921 100644 --- a/src/main/java/pw/yumc/Residence/commandsub/CommandSelect.java +++ b/src/main/java/pw/yumc/Residence/commandsub/CommandSelect.java @@ -10,13 +10,13 @@ import org.bukkit.command.CommandException; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; +import com.bekvon.bukkit.residence.permissions.PermissionGroup; import com.bekvon.bukkit.residence.protection.ClaimedResidence; import com.bekvon.bukkit.residence.protection.CuboidArea; import com.bekvon.bukkit.residence.protection.ResidenceManager; import cn.citycraft.PluginHelper.commands.BaseCommand; import pw.yumc.Residence.ResidenceMain; -import pw.yumc.Residence.permissions.PermissionGroup; import pw.yumc.Residence.selection.SelectionManager; import pw.yumc.Residence.text.Language; diff --git a/src/main/java/pw/yumc/Residence/commandsub/CommandUnStuck.java b/src/main/java/pw/yumc/Residence/commandsub/CommandUnStuck.java index 6c5d511..e0b4b73 100644 --- a/src/main/java/pw/yumc/Residence/commandsub/CommandUnStuck.java +++ b/src/main/java/pw/yumc/Residence/commandsub/CommandUnStuck.java @@ -6,13 +6,13 @@ import org.bukkit.command.CommandException; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; +import com.bekvon.bukkit.residence.permissions.PermissionGroup; +import com.bekvon.bukkit.residence.permissions.PermissionManager; import com.bekvon.bukkit.residence.protection.ClaimedResidence; import com.bekvon.bukkit.residence.protection.ResidenceManager; import cn.citycraft.PluginHelper.commands.BaseCommand; import pw.yumc.Residence.ResidenceMain; -import pw.yumc.Residence.permissions.PermissionGroup; -import pw.yumc.Residence.permissions.PermissionManager; import pw.yumc.Residence.text.Language; public class CommandUnStuck extends BaseCommand { diff --git a/src/main/java/pw/yumc/Residence/economy/TransactionManager.java b/src/main/java/pw/yumc/Residence/economy/TransactionManager.java index 70df979..27a71e5 100644 --- a/src/main/java/pw/yumc/Residence/economy/TransactionManager.java +++ b/src/main/java/pw/yumc/Residence/economy/TransactionManager.java @@ -15,13 +15,13 @@ import java.util.Set; import org.bukkit.ChatColor; import org.bukkit.entity.Player; +import com.bekvon.bukkit.residence.permissions.PermissionGroup; +import com.bekvon.bukkit.residence.permissions.PermissionManager; import com.bekvon.bukkit.residence.protection.ClaimedResidence; import com.bekvon.bukkit.residence.protection.CuboidArea; import com.bekvon.bukkit.residence.protection.ResidenceManager; import pw.yumc.Residence.ResidenceMain; -import pw.yumc.Residence.permissions.PermissionGroup; -import pw.yumc.Residence.permissions.PermissionManager; /** * diff --git a/src/main/java/pw/yumc/Residence/economy/rent/RentManager.java b/src/main/java/pw/yumc/Residence/economy/rent/RentManager.java index 8ee3931..a94f8f3 100644 --- a/src/main/java/pw/yumc/Residence/economy/rent/RentManager.java +++ b/src/main/java/pw/yumc/Residence/economy/rent/RentManager.java @@ -18,11 +18,11 @@ import org.bukkit.plugin.PluginManager; import com.bekvon.bukkit.residence.event.ResidenceRentEvent; import com.bekvon.bukkit.residence.event.ResidenceRentEvent.RentEventType; +import com.bekvon.bukkit.residence.permissions.PermissionGroup; import com.bekvon.bukkit.residence.protection.ClaimedResidence; import com.bekvon.bukkit.residence.protection.FlagPermissions.FlagState; import pw.yumc.Residence.ResidenceMain; -import pw.yumc.Residence.permissions.PermissionGroup; /** * diff --git a/src/main/java/pw/yumc/Residence/itemlist/ResidenceItemList.java b/src/main/java/pw/yumc/Residence/itemlist/ResidenceItemList.java index 67d375d..a85981c 100644 --- a/src/main/java/pw/yumc/Residence/itemlist/ResidenceItemList.java +++ b/src/main/java/pw/yumc/Residence/itemlist/ResidenceItemList.java @@ -11,10 +11,10 @@ import org.bukkit.ChatColor; import org.bukkit.Material; import org.bukkit.entity.Player; +import com.bekvon.bukkit.residence.permissions.PermissionGroup; import com.bekvon.bukkit.residence.protection.ClaimedResidence; import pw.yumc.Residence.ResidenceMain; -import pw.yumc.Residence.permissions.PermissionGroup; /** * diff --git a/src/main/java/pw/yumc/Residence/listeners/ResidencePlayerListener.java b/src/main/java/pw/yumc/Residence/listeners/ResidencePlayerListener.java index c62acc3..a09c78c 100644 --- a/src/main/java/pw/yumc/Residence/listeners/ResidencePlayerListener.java +++ b/src/main/java/pw/yumc/Residence/listeners/ResidencePlayerListener.java @@ -37,6 +37,7 @@ import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; import org.bukkit.plugin.Plugin; import com.bekvon.bukkit.residence.event.ResidenceChangedEvent; +import com.bekvon.bukkit.residence.permissions.PermissionGroup; import com.bekvon.bukkit.residence.protection.ClaimedResidence; import com.bekvon.bukkit.residence.protection.FlagPermissions; import com.sk89q.worldedit.bukkit.WorldEditPlugin; @@ -45,7 +46,6 @@ import cn.citycraft.PluginHelper.utils.ActionBar; import cn.citycraft.PluginHelper.utils.CompatibleUtil; import pw.yumc.Residence.ResidenceMain; import pw.yumc.Residence.chat.ChatChannel; -import pw.yumc.Residence.permissions.PermissionGroup; /** * diff --git a/src/main/java/pw/yumc/Residence/selection/SelectionManager.java b/src/main/java/pw/yumc/Residence/selection/SelectionManager.java index ec84c92..bc0ed89 100644 --- a/src/main/java/pw/yumc/Residence/selection/SelectionManager.java +++ b/src/main/java/pw/yumc/Residence/selection/SelectionManager.java @@ -16,10 +16,10 @@ import org.bukkit.Location; import org.bukkit.Server; import org.bukkit.entity.Player; +import com.bekvon.bukkit.residence.permissions.PermissionGroup; import com.bekvon.bukkit.residence.protection.CuboidArea; import pw.yumc.Residence.ResidenceMain; -import pw.yumc.Residence.permissions.PermissionGroup; /** * diff --git a/src/main/java/pw/yumc/Residence/vaultinterface/ResidenceVaultAdapter.java b/src/main/java/pw/yumc/Residence/vaultinterface/ResidenceVaultAdapter.java index b360e6b..c606f33 100644 --- a/src/main/java/pw/yumc/Residence/vaultinterface/ResidenceVaultAdapter.java +++ b/src/main/java/pw/yumc/Residence/vaultinterface/ResidenceVaultAdapter.java @@ -9,11 +9,12 @@ import org.bukkit.Server; import org.bukkit.entity.Player; import org.bukkit.plugin.RegisteredServiceProvider; +import com.bekvon.bukkit.residence.permissions.PermissionsInterface; + import net.milkbowl.vault.chat.Chat; import net.milkbowl.vault.economy.Economy; import net.milkbowl.vault.permission.Permission; import pw.yumc.Residence.economy.EconomyInterface; -import pw.yumc.Residence.permissions.PermissionsInterface; /** *