Spigot和CraftBukkit分开支持
This commit is contained in:
coloryr committed 2020-12-26 17:47:40 +08:00
1 parent 954e193a03
commit bb62c7fe3b
14 files changed
+133 -24

No files matched your search

+3 -3
View File
@@ -5,7 +5,7 @@
## 使用方法
>1. 安装AllMusic插件
>支持CraftBukkit/Spigot/Bungeecord服务器
>复制`AllMusic-2.6.1.jar`到你的`plugins`文件夹
>复制`AllMusic-2.8.0-all.jar`到你的`plugins`文件夹
>2. 安装客户端mod
>目前只支持
>`forge:1.12.2 1.14 1.15 1.16`
@@ -23,8 +23,8 @@
>为启动成功
## 播放VIP歌曲
1. 使用外置AIP
2. 在配置文件的`LoginUser`和`LoginPass`填写账户密码
1. 使用外置API
2. 在插件配置文件的`LoginUser`和`LoginPass`填写账户密码
3. 重载插件或者重启服务器
## PAPI变量
+2 -2
View File
@@ -3,7 +3,7 @@ plugins {
id 'maven-publish'
id 'com.github.johnrengelman.shadow' version '6.1.0'
}
version = "2.7.0"
version = "2.8.0"
repositories {
jcenter()
@@ -21,7 +21,7 @@ repositories {
}
dependencies {
compileOnly 'org.spigotmc:spigot-api:1.16.1-R0.1-SNAPSHOT'
compileOnly 'org.spigotmc:spigot-api:1.16.4-R0.1-SNAPSHOT'
compileOnly 'net.md-5:bungeecord-api:1.16-R0.4-SNAPSHOT'
compileOnly "com.github.MilkBowl:VaultAPI:1.7"
dependencies { compile fileTree(dir:'lib',include:['*.jar'])}
@@ -29,6 +29,10 @@ public interface ISide {
void SendMessage(Object obj, String Message);
void SendMessageRun(Object obj, String Message, String end, String command);
void SendMessageSuggest(Object obj, String Message, String end, String command);
void RunTask(Runnable run);
void reload();
@@ -23,7 +23,7 @@ import java.util.logging.Logger;
public class AllMusic {
public static final String channel = "allmusic:channel";
public static final String Version = "2.7.0";
public static final String Version = "2.8.0";
private static final Map<String, SearchPage> SearchSave = new HashMap<>();
private static final List<String> VotePlayer = new ArrayList<>();
@@ -13,6 +13,7 @@ import org.bukkit.plugin.java.JavaPlugin;
public class AllMusicBukkit extends JavaPlugin {
public static Plugin plugin;
public static PAPI PAPI;
public static boolean SpigotSet;
@Override
public void onEnable() {
@@ -20,6 +21,13 @@ public class AllMusicBukkit extends JavaPlugin {
AllMusic.log = getLogger();
AllMusic.Side = new SideBukkit();
try {
SpigotSet = null != Class.forName("net.md_5.bungee.api.chat.BaseComponent");
AllMusic.log.info("§2Spigot已支持");
} catch (Exception e) {
AllMusic.log.info("§2Spigot不支持");
}
new AllMusic().init(plugin.getDataFolder());
if (!AllMusic.isRun) {
Bukkit.getPluginManager().disablePlugin(this);
@@ -73,7 +73,8 @@ public class CommandEX {
String info;
AllMusic.Side.SendMessage(sender, "");
if (search.haveLastPage()) {
AllMusic.Side.SendMessage(sender, AllMusic.getMessage().getPage().getLast());
AllMusic.Side.SendMessageRun(sender, "§d[AllMusic]§2输入/music lastpage上一页",
AllMusic.getMessage().getPage().getLast(), "/music lastpage");
}
for (int a = 0; a < index; a++) {
item = search.getRes(a + search.getPage() * 10);
@@ -82,10 +83,12 @@ public class CommandEX {
.replace("%MusicName%", item.getName())
.replace("%MusicAuthor%", item.getAuthor())
.replace("%MusicAl%", item.getAl());
AllMusic.Side.SendMessage(sender, info);
AllMusic.Side.SendMessageRun(sender, info,
AllMusic.getMessage().getClick().This, "/music select " + (a + 1));
}
if (search.haveNextPage()) {
AllMusic.Side.SendMessage(sender, AllMusic.getMessage().getPage().getNext());
AllMusic.Side.SendMessageRun(sender, "§d[AllMusic]§2输入/music nextpage下一页",
AllMusic.getMessage().getPage().getNext(), "/music nextpage");
}
AllMusic.Side.SendMessage(sender, "");
}
@@ -95,15 +98,24 @@ public class CommandEX {
AllMusic.Side.SendMessage(sender, AllMusic.getMessage().getCommand().getError());
} else if (args[0].equalsIgnoreCase("help")) {
AllMusic.Side.SendMessage(sender, "§d[AllMusic]§2帮助手册");
AllMusic.Side.SendMessage(sender, "§d[AllMusic]§2使用/music [音乐ID] 来点歌");
AllMusic.Side.SendMessage(sender, "§d[AllMusic]§2使用/music stop 停止播放歌曲");
AllMusic.Side.SendMessage(sender, "§d[AllMusic]§2使用/music list 查看歌曲队列");
AllMusic.Side.SendMessage(sender, "§d[AllMusic]§2使用/music vote 投票切歌");
AllMusic.Side.SendMessage(sender, "§d[AllMusic]§2使用/music nomusic 不再参与点歌");
AllMusic.Side.SendMessage(sender, "§d[AllMusic]§2使用/music search [歌名] 搜索歌曲");
AllMusic.Side.SendMessage(sender, "§d[AllMusic]§2使用/music select [序列] 选择歌曲");
AllMusic.Side.SendMessage(sender, "§d[AllMusic]§2使用/music hud enable [位置] 启用关闭Hud");
AllMusic.Side.SendMessage(sender, "§d[AllMusic]§2使用/music hud [位置] [x] [y] 设置某个Hud的位置");
AllMusic.Side.SendMessageSuggest(sender, "§d[AllMusic]§2使用/music [音乐ID] 来点歌",
AllMusic.getMessage().getClick().Check, "/music ");
AllMusic.Side.SendMessageRun(sender, "§d[AllMusic]§2使用/music stop 停止播放歌曲",
AllMusic.getMessage().getClick().This, "/music stop");
AllMusic.Side.SendMessageRun(sender, "§d[AllMusic]§2使用/music list 查看歌曲队列",
AllMusic.getMessage().getClick().This, "/music list");
AllMusic.Side.SendMessageRun(sender, "§d[AllMusic]§2使用/music vote 投票切歌",
AllMusic.getMessage().getClick().This, "/music vote");
AllMusic.Side.SendMessageRun(sender, "§d[AllMusic]§2使用/music nomusic 不再参与点歌",
AllMusic.getMessage().getClick().This, "/music nomusic");
AllMusic.Side.SendMessageSuggest(sender, "§d[AllMusic]§2使用/music search [歌名] 搜索歌曲",
AllMusic.getMessage().getClick().Check, "/music search ");
AllMusic.Side.SendMessageSuggest(sender, "§d[AllMusic]§2使用/music select [序列] 选择歌曲",
AllMusic.getMessage().getClick().Check, "/music select ");
AllMusic.Side.SendMessageSuggest(sender, "§d[AllMusic]§2使用/music hud enable [位置] 启用关闭Hud",
AllMusic.getMessage().getClick().Check, "/music hud enable ");
AllMusic.Side.SendMessageSuggest(sender, "§d[AllMusic]§2使用/music hud [位置] [x] [y] 设置某个Hud的位置",
AllMusic.getMessage().getClick().Check, "/music hud ");
} else if (args[0].equalsIgnoreCase("stop")) {
AllMusic.Side.ClearHud(Name);
AllMusic.Side.Send("[Stop]", Name, false);
@@ -18,7 +18,9 @@ public class HttpGet {
static {
client = HttpClientBuilder.create().build();
defaultConfig = RequestConfig.custom().setCookieSpec(CookieSpecs.STANDARD).build();
defaultConfig = RequestConfig.custom().setCookieSpec(CookieSpecs.STANDARD)
.setConnectTimeout(2000).setSocketTimeout(2000)
.setConnectionRequestTimeout(2000).build();
}
public static Res realData(String path, String data) {
@@ -0,0 +1,11 @@
package Color_yr.AllMusic.Message;
public class ClickObj {
public String This;
public String Check;
public ClickObj() {
This = "§b[§n点我选择§r§b]";
Check = "§b[§n点我查看§r§b]";
}
}
@@ -13,6 +13,7 @@ public class MessageOBJ {
private CustomOBJ Custom;
private PAPIOBJ PAPI;
private CostObj Cost;
private ClickObj Click;
public MessageOBJ() {
MusicPlay = new MusicPlayOBJ();
@@ -27,6 +28,11 @@ public class MessageOBJ {
Custom = new CustomOBJ();
PAPI = new PAPIOBJ();
Cost = new CostObj();
Click = new ClickObj();
}
public ClickObj getClick() {
return Click;
}
public CostObj getCost() {
@@ -9,6 +9,7 @@ import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled;
import net.md_5.bungee.api.CommandSender;
import net.md_5.bungee.api.ProxyServer;
import net.md_5.bungee.api.chat.ClickEvent;
import net.md_5.bungee.api.chat.TextComponent;
import net.md_5.bungee.api.config.ServerInfo;
import net.md_5.bungee.api.connection.ProxiedPlayer;
@@ -206,6 +207,22 @@ public class SideBC implements ISide {
sender.sendMessage(new TextComponent(Message));
}
@Override
public void SendMessageRun(Object obj, String Message, String end, String command) {
CommandSender sender = (CommandSender) obj;
TextComponent send = new TextComponent(Message + end);
send.setClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, command));
sender.sendMessage(send);
}
@Override
public void SendMessageSuggest(Object obj, String Message, String end, String command) {
CommandSender sender = (CommandSender) obj;
TextComponent send = new TextComponent(Message + end);
send.setClickEvent(new ClickEvent(ClickEvent.Action.SUGGEST_COMMAND, command));
sender.sendMessage(send);
}
@Override
public void RunTask(Runnable run) {
ProxyServer.getInstance().getScheduler().runAsync(AllMusicBC.plugin, run);
@@ -165,6 +165,26 @@ public class SideBukkit implements ISide {
sender.sendMessage(Message);
}
@Override
public void SendMessageRun(Object obj, String Message, String end, String command) {
if (AllMusicBukkit.SpigotSet) {
SpigotApi.SendMessageRun(obj, Message + end, command);
} else {
if (!Message.isEmpty())
SendMessage(obj, Message);
}
}
@Override
public void SendMessageSuggest(Object obj, String Message, String end, String command) {
if (AllMusicBukkit.SpigotSet) {
SpigotApi.SendMessageSuggest(obj, Message + end, command);
} else {
if (!Message.isEmpty())
SendMessage(obj, Message);
}
}
@Override
public void RunTask(Runnable run) {
Bukkit.getScheduler().runTask(AllMusicBukkit.plugin, run);
@@ -0,0 +1,25 @@
package Color_yr.AllMusic.Side.SideBukkit;
import net.md_5.bungee.api.chat.ClickEvent;
import net.md_5.bungee.api.chat.TextComponent;
import org.bukkit.command.CommandSender;
public class SpigotApi {
public SpigotApi() {
new TextComponent();
}
public static void SendMessageRun(Object obj, String Message, String Command) {
CommandSender sender = (CommandSender) obj;
TextComponent send = new TextComponent(Message);
send.setClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, Command));
sender.spigot().sendMessage(send);
}
public static void SendMessageSuggest(Object obj, String Message, String Command) {
CommandSender sender = (CommandSender) obj;
TextComponent send = new TextComponent(Message);
send.setClickEvent(new ClickEvent(ClickEvent.Action.SUGGEST_COMMAND, Command));
sender.spigot().sendMessage(send);
}
}
+7 -3
View File
@@ -25,9 +25,9 @@
"NoID": "§d[ALLmusic]§c错误,请输入歌曲数字ID"
},
"Page": {
"Choice": "§b[§n点我选择§r§b]§2%index%->%MusicName% | %MusicAuthor% | %MusicAl%",
"Next": "§d[ALLMusic]§e[§n点我下一页§r§e]",
"Last": "§d[ALLMusic]§e[§n点我上一页§r§e]"
"Choice": "§2%index%->%MusicName% | %MusicAuthor% | %MusicAl%",
"Next": "§e[§n点我下一页§r§e]",
"Last": "§e[§n点我上一页§r§e]"
},
"Lyric": {
"Data": "%Lyric%",
@@ -81,5 +81,9 @@
"Search": "§d[ALLMusic]§2你搜歌花费了%Cost%",
"AddMusic": "§d[ALLMusic]§2你点歌花费了%Cost%",
"NoMoney": "§d[ALLMusic]§c你没有足够的钱"
},
"Click": {
"This": "§b[§n点我选择§r§b]",
"Check": "§b[§n点我查看§r§b]"
}
}
+2 -2
View File
@@ -7,5 +7,5 @@ softdepend: [PlaceholderAPI, Vault]
commands:
music:
description: ALLMusic
usage: §4[ALLMusic]§6/music help
description: AllMusic
usage: §4[AllMusic]§6/music help