502647092/Residence
1
0
Fork 0
mirror of https://e.coding.net/circlecloud/Residence.git synced 2024-10-31 22:38:48 +00:00
Code Releases Activity

refactor: 修改包名 兼容部分老版本插件

Browse Source
This commit is contained in:
502647092 2016-05-01 00:22:10 +08:00
parent dd9bb32c32
commit 619ced15e6
21 changed files with 27 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pom.xml
View File

@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>pw.yumc</groupId>
<artifactId>Residence</artifactId>
<version>2.8.2.2</version>
<version>2.8.2.3</version>
<name>Residence</name>
<description>重制版本的领地插件 - 喵♂呜</description>
<build>
@ -60,6 +60,7 @@
<properties>
<update.description>&amp;6更新预告!!! GUI菜单即将上线(&amp;7菜单再等几天= =&amp;6)...</update.description>
<update.changes>
&amp;b2.8.2.3 - &amp;b修改包名 兼容部分老版本插件...;
&amp;b2.8.2.2 - &amp;e自动转换UUID版本Residence的数据(部分版本)...;
&amp;c修复上个版本命令失效的问题(库文件忘了更新了);
&amp;b2.8.2.1 - &amp;c修复一个可能被熊孩子利用导致插件奔溃的BUG...;

2
src/main/java/com/bekvon/bukkit/residence/Residence.java
View File

@ -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;

2
src/main/java/pw/yumc/Residence/permissions/PermissionGroup.java → src/main/java/com/bekvon/bukkit/residence/permissions/PermissionGroup.java
View File

@ -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;

2
src/main/java/pw/yumc/Residence/permissions/PermissionManager.java → src/main/java/com/bekvon/bukkit/residence/permissions/PermissionManager.java
View File

@ -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;

2
src/main/java/pw/yumc/Residence/permissions/PermissionsInterface.java → src/main/java/com/bekvon/bukkit/residence/permissions/PermissionsInterface.java
View File

@ -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;

2
src/main/java/com/bekvon/bukkit/residence/protection/ClaimedResidence.java
View File

@ -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;
/**

2
src/main/java/com/bekvon/bukkit/residence/protection/LeaseManager.java
View File

@ -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;
/**
*

2
src/main/java/com/bekvon/bukkit/residence/protection/ResidenceManager.java
View File

@ -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;

4
src/main/java/com/bekvon/bukkit/residence/protection/ResidencePermissions.java
View File

@ -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;
/**
*

2
src/main/java/pw/yumc/Residence/ResidenceMain.java
View File

@ -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;

2
src/main/java/pw/yumc/Residence/commandsub/CommandKick.java
View File

@ -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 {

3
src/main/java/pw/yumc/Residence/commandsub/CommandLimits.java
View File

@ -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;

2
src/main/java/pw/yumc/Residence/commandsub/CommandMarket.java
View File

@ -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;

2
src/main/java/pw/yumc/Residence/commandsub/CommandSelect.java
View File

@ -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;

4
src/main/java/pw/yumc/Residence/commandsub/CommandUnStuck.java
View File

@ -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 {

4
src/main/java/pw/yumc/Residence/economy/TransactionManager.java
View File

@ -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;
/**
*

2
src/main/java/pw/yumc/Residence/economy/rent/RentManager.java
View File

@ -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;
/**
*

2
src/main/java/pw/yumc/Residence/itemlist/ResidenceItemList.java
View File

@ -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;
/**
*

2
src/main/java/pw/yumc/Residence/listeners/ResidencePlayerListener.java
View File

@ -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;
/**
*

2
src/main/java/pw/yumc/Residence/selection/SelectionManager.java
View File

@ -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;
/**
*

3
src/main/java/pw/yumc/Residence/vaultinterface/ResidenceVaultAdapter.java
View File

@ -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;
/**
*