diff --git a/pom.xml b/pom.xml
index 1fadd3b..2bd9971 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,73 +1,26 @@
4.0.0
- pw.yumc
+
MiaoLobby
2.0
+
+
+ pw.yumc
+ minecraft-plugin-parent
+ 1.0
+
+
+
- ${project.name}
-
-
- src/main/resources
- true
-
-
-
- org.apache.maven.plugins
- maven-shade-plugin
- 2.4.3
-
- false
- true
-
-
- pw.yumc:YumCore
-
-
-
-
- pw.yumc.YumCore
- ${project.groupId}.${project.artifactId}
-
-
-
-
-
- package
-
- shade
-
-
-
-
com.github.wvengen
proguard-maven-plugin
-
-
- package
-
- proguard
-
-
-
-
-
-
-
- ${java.home}/lib/rt.jar
-
-
-
-
-
- Jenkins
- http://ci.yumc.pw/job/${project.artifactId}/
-
+
§a正式版本 §bv${project.version}
@@ -78,40 +31,19 @@
DEV
- UTF-8
- 1.8
- 1.8
yumc-repo
- http://repo.yumc.pw/content/groups/public/
+ https://repo.yumc.pw/repository/maven-public/
-
-
- jtb
- YUMC
- http://repo.yumc.pw/content/repositories/yumcenter/
-
-
- pw.yumc
- YumCore
- jar
- [1.7,)
-
-
- cn.citycraft
- AuthMe
- jar
- 6.1
-
-
- cn.citycraft
- VBossAuth
- 1.5.2
+ fr.xephi
+ authme
+ 5.6.0-SNAPSHOT
+ provided
\ No newline at end of file
diff --git a/src/main/java/pw/yumc/MiaoLobby/MiaoLobby.java b/src/main/java/pw/yumc/MiaoLobby/MiaoLobby.java
index 00ea1fd..6363330 100644
--- a/src/main/java/pw/yumc/MiaoLobby/MiaoLobby.java
+++ b/src/main/java/pw/yumc/MiaoLobby/MiaoLobby.java
@@ -8,11 +8,9 @@ import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.bukkit.event.player.PlayerQuitEvent;
import org.bukkit.plugin.java.JavaPlugin;
-
import pw.yumc.MiaoLobby.config.Config;
import pw.yumc.MiaoLobby.hook.AuthMeHook;
import pw.yumc.MiaoLobby.hook.LoginHook;
-import pw.yumc.MiaoLobby.hook.VBossAuthHook;
import pw.yumc.YumCore.bukkit.Log;
import pw.yumc.YumCore.commands.CommandSub;
import pw.yumc.YumCore.commands.annotation.Cmd;
@@ -54,10 +52,6 @@ public class MiaoLobby extends JavaPlugin implements Executor, Listener {
new AuthMeHook();
Log.i("已配置为AuthMe登录传送模式!");
}
- if (Bukkit.getPluginManager().isPluginEnabled("VBossAuth")) {
- new VBossAuthHook();
- Log.i("已配置为VBossAuth登录传送模式!");
- }
}
new Statistics();
new SubscribeTask(true, SubscribeTask.UpdateType.MAVEN);
diff --git a/src/main/java/pw/yumc/MiaoLobby/Util.java b/src/main/java/pw/yumc/MiaoLobby/Util.java
index 72bd727..3f59745 100644
--- a/src/main/java/pw/yumc/MiaoLobby/Util.java
+++ b/src/main/java/pw/yumc/MiaoLobby/Util.java
@@ -1,24 +1,22 @@
package pw.yumc.MiaoLobby;
+import com.google.common.io.ByteArrayDataOutput;
+import com.google.common.io.ByteStreams;
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
+import org.bukkit.scheduler.BukkitRunnable;
+import org.bukkit.scheduler.BukkitTask;
+import pw.yumc.MiaoLobby.config.Config;
+import pw.yumc.MiaoLobby.event.PreLobbyTpEvent;
+import pw.yumc.YumCore.bukkit.P;
+import pw.yumc.YumCore.bukkit.compatible.C;
+
import java.security.SecureRandom;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.bukkit.Bukkit;
-import org.bukkit.entity.Player;
-import org.bukkit.scheduler.BukkitRunnable;
-import org.bukkit.scheduler.BukkitTask;
-
-import com.google.common.io.ByteArrayDataOutput;
-import com.google.common.io.ByteStreams;
-
-import pw.yumc.MiaoLobby.config.Config;
-import pw.yumc.MiaoLobby.event.PreLobbyTpEvent;
-import pw.yumc.YumCore.bukkit.P;
-import pw.yumc.YumCore.bukkit.compatible.C;
-
/**
* @author 喵♂呜
* @since 2016/12/25 0025
@@ -77,7 +75,7 @@ public class Util {
public static void random(final Player player) {
new BukkitRunnable() {
- List servers = new ArrayList<>(config.Servers);
+ final List servers = new ArrayList<>(config.Servers);
int i = 0;
@Override
@@ -90,9 +88,9 @@ public class Util {
C.ActionBar.send(player, config.Unavailable);
player.sendMessage(config.Unavailable);
} else if (player.isOnline()) {
- final String sname = servers.remove(random.nextInt(servers.size()));
- C.ActionBar.send(player, String.format(i > 0 ? config.TimeOut : config.Message, sname));
- connect(player, sname);
+ final String serverName = servers.remove(random.nextInt(servers.size()));
+ C.ActionBar.send(player, String.format(i > 0 ? config.TimeOut : config.Message, serverName));
+ connect(player, serverName);
i++;
return;
}
diff --git a/src/main/java/pw/yumc/MiaoLobby/hook/VBossAuthHook.java b/src/main/java/pw/yumc/MiaoLobby/hook/VBossAuthHook.java
deleted file mode 100644
index 0ca1d60..0000000
--- a/src/main/java/pw/yumc/MiaoLobby/hook/VBossAuthHook.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package pw.yumc.MiaoLobby.hook;
-
-import org.bukkit.event.EventHandler;
-
-import cn.citycraft.VBossAuth.event.LoginEvent;
-import cn.citycraft.VBossAuth.event.RegisterEvent;
-import pw.yumc.MiaoLobby.Util;
-
-public class VBossAuthHook extends Hook {
- @EventHandler
- public void onLogin(LoginEvent e) {
- if (e.isLogin()) {
- Util.delayTpTargetEvent(e.getPlayer());
- }
- }
-
- @EventHandler
- public void onRegister(RegisterEvent e) {
- Util.delayTpTargetEvent(e.getPlayer());
- }
-}
diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
index 7daaf43..a0fa635 100644
--- a/src/main/resources/config.yml
+++ b/src/main/resources/config.yml
@@ -1,22 +1,22 @@
-#配置文件版本 请勿修改
-Version: 1.4
-
-#服务器列表
-Servers:
-- lobby1
-- lobby2
-#传送超时时间(单位: Tick)
-WaitTime: 35
-#自带传送(如果开启 则Login自动传送失效)
-AutoTP: false
-#登录自动传送(暂时支持AuthMe和VBossAuth)
-LoginAutoTP: true
-#传送延时(单位: 秒)
-AutoTPDelay: 10
-#尝试完毕后是否继续重试
-ReTry: true
-#传送提示
-Message: '&a请稍候 正在传送至服务器 %s ...'
-TimeOut: '&c传送超时 正在切换到服务器 %s ...'
-TPDelay: '&a登陆成功 正在为您匹配服务器 剩余 %s 秒...'
+#配置文件版本 请勿修改
+Version: 1.5
+
+#服务器列表
+Servers:
+- lobby1
+- lobby2
+#传送超时时间(单位: Tick)
+WaitTime: 35
+#自带传送(如果开启 则Login自动传送失效)
+AutoTP: false
+#登录自动传送(暂时支持AuthMe)
+LoginAutoTP: true
+#传送延时(单位: 秒)
+AutoTPDelay: 10
+#尝试完毕后是否继续重试
+ReTry: true
+#传送提示
+Message: '&a请稍候 正在传送至服务器 %s ...'
+TimeOut: '&c传送超时 正在切换到服务器 %s ...'
+TPDelay: '&a登陆成功 正在为您匹配服务器 剩余 %s 秒...'
Unavailable: '&4已尝试所有可用服务器 传送失败!'
\ No newline at end of file