mirror of
https://github.com/Coloryr/AllMusic.git
synced 2026-11-21 22:02:12 +00:00
1.8.0
This commit is contained in:
1 parent
1c5fc458a0
commit
dfbad6eee9
22 files changed
+170
-103
No files matched your search
@@ -8,7 +8,7 @@ import java.util.logging.Logger;
|
||||
|
||||
public class ALLMusic {
|
||||
public static final String channel = "allmusic:channel";
|
||||
public static final String Version = "1.7.0";
|
||||
public static final String Version = "1.8.0";
|
||||
public static ConfigOBJ Config;
|
||||
public static Logger log;
|
||||
public static File ConfigFile;
|
||||
|
||||
@@ -80,18 +80,18 @@ public class ALLMusicBC extends Plugin {
|
||||
ALLMusic.log = ProxyServer.getInstance().getLogger();
|
||||
ALLMusic.log.info("§d[ALLMusic]§e正在启动,感谢使用,本插件交流群:571239090");
|
||||
setConfig();
|
||||
PlayMusic.Start();
|
||||
ALLMusic.Side = new SideBC();
|
||||
ProxyServer.getInstance().getPluginManager().registerCommand(this, new CommandBC());
|
||||
ProxyServer.getInstance().getPluginManager().registerListener(this, new EventBC());
|
||||
PlayMusic.start();
|
||||
ALLMusic.log.info("§d[ALLMusic]§e已启动-" + ALLMusic.Version);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onDisable() {
|
||||
PlayMusic.stop();
|
||||
PlayMusic.PlayList.clear();
|
||||
PlayMusic.Vote.clear();
|
||||
PlayMusic.clear();
|
||||
PlayMusic.VotePlayer.clear();
|
||||
ALLMusic.Side.Send("[Stop]", false);
|
||||
ALLMusic.log.info("§d[ALLMusic]§e已停止,感谢使用");
|
||||
}
|
||||
|
||||
@@ -84,7 +84,6 @@ public class ALLMusicBukkit extends JavaPlugin {
|
||||
ALLMusic.log = getLogger();
|
||||
ALLMusic.log.info("§d[ALLMusic]§e正在启动,感谢使用,本插件交流群:571239090");
|
||||
setConfig();
|
||||
PlayMusic.Start();
|
||||
String Version = Bukkit.getBukkitVersion();
|
||||
if (Version.startsWith("1.12"))
|
||||
ALLMusic.Side = new SideBukkit1_12();
|
||||
@@ -102,14 +101,15 @@ public class ALLMusicBukkit extends JavaPlugin {
|
||||
ALLMusic.VV = new VVGet();
|
||||
VVEnable = true;
|
||||
}
|
||||
PlayMusic.start();
|
||||
ALLMusic.log.info("§d[ALLMusic]§e已启动-" + ALLMusic.Version);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onDisable() {
|
||||
PlayMusic.stop();
|
||||
PlayMusic.PlayList.clear();
|
||||
PlayMusic.Vote.clear();
|
||||
PlayMusic.clear();
|
||||
PlayMusic.VotePlayer.clear();
|
||||
if (ALLMusic.VV != null) {
|
||||
ALLMusic.VV.clear();
|
||||
}
|
||||
|
||||
@@ -26,7 +26,7 @@ public class CommandEX {
|
||||
} else
|
||||
MusicID = args[0];
|
||||
if (Function.isInteger(MusicID)) {
|
||||
if (PlayMusic.PlayList.size() == ALLMusic.Config.getMaxList()) {
|
||||
if (PlayMusic.getSize() == ALLMusic.Config.getMaxList()) {
|
||||
ALLMusic.Side.SendMessage(sender, "§d[ALLMusic]§c错误,队列已满");
|
||||
} else if (ALLMusic.Config.getBanMusic().contains(MusicID)) {
|
||||
ALLMusic.Side.SendMessage(sender, "§d[ALLMusic]§c错误,这首歌被禁点了");
|
||||
@@ -35,10 +35,10 @@ public class CommandEX {
|
||||
} else {
|
||||
ALLMusic.Config.RemoveNoMusicPlayer(Name);
|
||||
if (ALLMusic.Side.NeedPlay()) {
|
||||
PlayMusic.AddMusic(MusicID, Name);
|
||||
if (PlayMusic.isList && ALLMusic.Config.isPlayListSwitch()) {
|
||||
ALLMusic.Side.RunTask(() -> PlayMusic.addMusic(MusicID, Name, false));
|
||||
if (ALLMusic.Config.isPlayListSwitch() && PlayMusic.NowPlayMusic.isList()) {
|
||||
PlayMusic.MusicAllTime = 1;
|
||||
PlayMusic.isList = false;
|
||||
ALLMusic.Side.SendMessage(sender, "§d[ALLMusic]§2切换到玩家歌曲");
|
||||
}
|
||||
ALLMusic.Side.SendMessage(sender, "§d[ALLMusic]§2点歌成功");
|
||||
} else
|
||||
@@ -51,7 +51,7 @@ public class CommandEX {
|
||||
private static void ShowSearch(Object sender, Search search) {
|
||||
int index = search.getIndex();
|
||||
SearchOBJ item;
|
||||
for (int a = 0; a< index; a++) {
|
||||
for (int a = 0; a < index; a++) {
|
||||
item = search.getRes(a + search.getPage());
|
||||
ALLMusic.Side.SendMessage(sender, "§b[点我选择]§2" +
|
||||
a + "->"
|
||||
@@ -60,11 +60,11 @@ public class CommandEX {
|
||||
+ item.getAila(),
|
||||
ClickEvent.Action.RUN_COMMAND, "/music select " + (a + 1));
|
||||
}
|
||||
if(search.haveNextPage()) {
|
||||
if (search.haveNextPage()) {
|
||||
ALLMusic.Side.SendMessage(sender, "§d[ALLMusic]§e[点我下一页]",
|
||||
ClickEvent.Action.RUN_COMMAND, "/music nextpage");
|
||||
}
|
||||
if(search.haveLastPage()) {
|
||||
if (search.haveLastPage()) {
|
||||
ALLMusic.Side.SendMessage(sender, "§d[ALLMusic]§e[点我上一页]",
|
||||
ClickEvent.Action.RUN_COMMAND, "/music lastpage");
|
||||
}
|
||||
@@ -102,7 +102,7 @@ public class CommandEX {
|
||||
if (ALLMusic.VV != null) {
|
||||
ALLMusic.VV.clear(Name);
|
||||
}
|
||||
PlayMusic.NowPlay.remove(Name);
|
||||
PlayMusic.NowPlayPlayer.remove(Name);
|
||||
ALLMusic.Side.SendMessage(sender, "§d[ALLMusic]§2已停止" + Name + "的音乐播放");
|
||||
} else if (args[0].equalsIgnoreCase("list")) {
|
||||
if (PlayMusic.NowPlayMusic == null) {
|
||||
@@ -110,27 +110,27 @@ public class CommandEX {
|
||||
} else {
|
||||
ALLMusic.Side.SendMessage(sender, "§d[ALLMusic]§2正在播放:" + PlayMusic.NowPlayMusic.getInfo());
|
||||
}
|
||||
if (PlayMusic.PlayList.size() == 0) {
|
||||
if (PlayMusic.getSize() == 0) {
|
||||
ALLMusic.Side.SendMessage(sender, "§d[ALLMusic]§2队列中无歌曲");
|
||||
} else {
|
||||
ALLMusic.Side.SendMessage(sender, "§d[ALLMusic]§2队列中有歌曲数:" + PlayMusic.PlayList.size());
|
||||
ALLMusic.Side.SendMessage(sender, PlayMusic.getList());
|
||||
ALLMusic.Side.SendMessage(sender, "§d[ALLMusic]§2队列中有歌曲数:" + PlayMusic.getSize());
|
||||
ALLMusic.Side.SendMessage(sender, PlayMusic.getAllList());
|
||||
}
|
||||
} else if (args[0].equalsIgnoreCase("vote")) {
|
||||
if (PlayMusic.PlayList.size() == 0) {
|
||||
if (PlayMusic.getSize() == 0) {
|
||||
ALLMusic.Side.SendMessage(sender, "§d[ALLMusic]§2队列中无歌曲");
|
||||
} else if (PlayMusic.Vote_time == 0) {
|
||||
PlayMusic.Vote_time = 30;
|
||||
PlayMusic.Vote.add(Name);
|
||||
} else if (PlayMusic.VoteTime == 0) {
|
||||
PlayMusic.VoteTime = 30;
|
||||
PlayMusic.VotePlayer.add(Name);
|
||||
ALLMusic.Side.SendMessage(sender, "§d[ALLMusic]§2已发起切歌投票");
|
||||
ALLMusic.Side.bq("§d[ALLMusic]§2" + Name +
|
||||
"发起了切歌投票,30秒后结束,输入/music vote 同意切歌。");
|
||||
} else if (PlayMusic.Vote_time > 0) {
|
||||
if (!PlayMusic.Vote.contains(Name)) {
|
||||
PlayMusic.Vote.add(Name);
|
||||
} else if (PlayMusic.VoteTime > 0) {
|
||||
if (!PlayMusic.VotePlayer.contains(Name)) {
|
||||
PlayMusic.VotePlayer.add(Name);
|
||||
ALLMusic.Side.SendMessage(sender, "§d[ALLMusic]§2你已同意");
|
||||
ALLMusic.Side.bq("§d[ALLMusic]§2" + Name + "同意切歌,共有" +
|
||||
PlayMusic.Vote.size() + "名玩家同意切歌。");
|
||||
PlayMusic.VotePlayer.size() + "名玩家同意切歌。");
|
||||
} else {
|
||||
ALLMusic.Side.bq("§d[ALLMusic]§2你已申请切歌");
|
||||
}
|
||||
@@ -161,9 +161,9 @@ public class CommandEX {
|
||||
}
|
||||
} else if (args[0].equalsIgnoreCase("delete") && args.length == 2
|
||||
&& ALLMusic.Config.getAdmin().contains(Name)) {
|
||||
if (Function.isInteger(args[1])) {
|
||||
if (!args[1].isEmpty() && Function.isInteger(args[1])) {
|
||||
int music = Integer.parseInt(args[1]);
|
||||
PlayMusic.PlayList.remove(music);
|
||||
PlayMusic.remove(music);
|
||||
ALLMusic.Side.SendMessage(sender, "§d[ALLMusic]§2已删除序列" + music);
|
||||
} else {
|
||||
ALLMusic.Side.SendMessage(sender, "§d[ALLMusic]§2请输入有效的序列ID");
|
||||
@@ -205,25 +205,25 @@ public class CommandEX {
|
||||
} else {
|
||||
ALLMusic.Side.SendMessage(sender, "§d[ALLMusic]§c请输入正确的序号");
|
||||
}
|
||||
} else if(args[0].equalsIgnoreCase("nextpage")) {
|
||||
} else if (args[0].equalsIgnoreCase("nextpage")) {
|
||||
Search obj = PlayerSearch.SearchSave.get(Name);
|
||||
if (obj == null) {
|
||||
ALLMusic.Side.SendMessage(sender, "§d[ALLMusic]§c你没有搜索音乐");
|
||||
} else if(obj.nextPage()){
|
||||
} else if (obj.nextPage()) {
|
||||
ShowSearch(sender, obj);
|
||||
} else{
|
||||
} else {
|
||||
ALLMusic.Side.SendMessage(sender, "§d[ALLMusic]§c无法下一页");
|
||||
}
|
||||
}else if(args[0].equalsIgnoreCase("lastpage")) {
|
||||
} else if (args[0].equalsIgnoreCase("lastpage")) {
|
||||
Search obj = PlayerSearch.SearchSave.get(Name);
|
||||
if (obj == null) {
|
||||
ALLMusic.Side.SendMessage(sender, "§d[ALLMusic]§c你没有搜索音乐");
|
||||
} else if(obj.lastPage()){
|
||||
} else if (obj.lastPage()) {
|
||||
ShowSearch(sender, obj);
|
||||
} else{
|
||||
} else {
|
||||
ALLMusic.Side.SendMessage(sender, "§d[ALLMusic]§c无法上一页");
|
||||
}
|
||||
}else if (ALLMusic.VV != null && args[0].equalsIgnoreCase("vv")) {
|
||||
} else if (ALLMusic.VV != null && args[0].equalsIgnoreCase("vv")) {
|
||||
if (args[1].equalsIgnoreCase("enable")) {
|
||||
ALLMusic.VV.SetEnable(Name);
|
||||
} else if (args.length != 4) {
|
||||
@@ -240,7 +240,9 @@ public class CommandEX {
|
||||
}
|
||||
});
|
||||
}
|
||||
} else
|
||||
} else if (ALLMusic.Side.checkPermission(Name, "ALLMusic.addmusic"))
|
||||
AddMusic(sender, Name, args);
|
||||
else
|
||||
ALLMusic.Side.SendMessage(sender, "§d[ALLMusic]§c你没有权限点歌");
|
||||
}
|
||||
}
|
||||
@@ -26,6 +26,8 @@ public class ConfigOBJ {
|
||||
|
||||
private boolean PlayListSwitch;
|
||||
private boolean PlayListRandom;
|
||||
private boolean SendLyric;
|
||||
private boolean NeedPermission;
|
||||
|
||||
private boolean VexView;
|
||||
private Map<String, VVSaveOBJ> VVSave;
|
||||
@@ -48,12 +50,22 @@ public class ConfigOBJ {
|
||||
PlayList = new ArrayList<>();
|
||||
PlayListSwitch = true;
|
||||
PlayListRandom = true;
|
||||
SendLyric = true;
|
||||
NeedPermission = false;
|
||||
VexView = false;
|
||||
VVSave = new HashMap<>();
|
||||
|
||||
Version = ALLMusic.Version;
|
||||
}
|
||||
|
||||
public boolean isNeedPermission() {
|
||||
return NeedPermission;
|
||||
}
|
||||
|
||||
public boolean isSendLyric() {
|
||||
return SendLyric;
|
||||
}
|
||||
|
||||
public VVSaveOBJ getVVSave(String player) {
|
||||
return VVSave.get(player);
|
||||
}
|
||||
|
||||
@@ -8,6 +8,6 @@ import net.md_5.bungee.event.EventHandler;
|
||||
public class EventBC implements Listener {
|
||||
@EventHandler
|
||||
public void onPlayerquit(final PlayerDisconnectEvent event) {
|
||||
PlayMusic.NowPlay.remove(event.getPlayer().getName());
|
||||
PlayMusic.NowPlayPlayer.remove(event.getPlayer().getName());
|
||||
}
|
||||
}
|
||||
@@ -8,6 +8,6 @@ import org.bukkit.event.player.PlayerQuitEvent;
|
||||
public class EventBukkit implements Listener {
|
||||
@EventHandler
|
||||
public void onPlayerQuit(final PlayerQuitEvent e) {
|
||||
PlayMusic.NowPlay.remove(e.getPlayer().getName());
|
||||
PlayMusic.NowPlayPlayer.remove(e.getPlayer().getName());
|
||||
}
|
||||
}
|
||||
@@ -6,7 +6,6 @@ import Color_yr.ALLMusic.Http.Get;
|
||||
import Color_yr.ALLMusic.Lyric.LyricDo;
|
||||
import Color_yr.ALLMusic.Lyric.ShowOBJ;
|
||||
import Color_yr.ALLMusic.PlayList.GetList;
|
||||
import org.bukkit.entity.Player;
|
||||
|
||||
import java.util.concurrent.Executors;
|
||||
import java.util.concurrent.ScheduledExecutorService;
|
||||
@@ -14,9 +13,9 @@ import java.util.concurrent.TimeUnit;
|
||||
|
||||
class PlayGo extends Thread {
|
||||
|
||||
Runnable runnable = () -> PlayMusic.MusicNowTime += 10;
|
||||
private final Runnable runnable = () -> PlayMusic.MusicNowTime += 10;
|
||||
private int times = 0;
|
||||
Runnable runnable1 = () -> {
|
||||
private final Runnable runnable1 = () -> {
|
||||
ShowOBJ show = PlayMusic.Lyric.checkTime(PlayMusic.MusicNowTime);
|
||||
if (show != null) {
|
||||
times = 0;
|
||||
@@ -49,7 +48,7 @@ class PlayGo extends Thread {
|
||||
}
|
||||
}
|
||||
|
||||
private void startTime() {
|
||||
private void startTimer() {
|
||||
service = Executors.newSingleThreadScheduledExecutor();
|
||||
service.scheduleAtFixedRate(runnable, 0, 10, TimeUnit.MILLISECONDS);
|
||||
service1 = Executors.newSingleThreadScheduledExecutor();
|
||||
@@ -59,35 +58,36 @@ class PlayGo extends Thread {
|
||||
@Override
|
||||
public synchronized void run() {
|
||||
while (true) {
|
||||
if (PlayMusic.PlayList.size() == 0) {
|
||||
if (PlayMusic.getSize() == 0) {
|
||||
try {
|
||||
Thread.sleep(2000);
|
||||
if (ALLMusic.Side.NeedPlay()) {
|
||||
String obj = GetList.GetMusic();
|
||||
if (obj != null) {
|
||||
PlayMusic.isList = true;
|
||||
PlayMusic.AddMusic(obj, "空闲列表");
|
||||
PlayMusic.addMusic(obj, "空闲列表", true);
|
||||
}
|
||||
}
|
||||
} catch (InterruptedException ignored) {
|
||||
ignored.printStackTrace();
|
||||
Thread.sleep(3000);
|
||||
} catch (InterruptedException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
} else {
|
||||
PlayMusic.NowPlayMusic = PlayMusic.PlayList.get(0);
|
||||
PlayMusic.PlayList.remove(0);
|
||||
PlayMusic.NowPlayMusic = PlayMusic.getMusic(0);
|
||||
PlayMusic.remove(0);
|
||||
PlayMusic.MusicNowTime = 0;
|
||||
PlayMusic.MusicAllTime = 0;
|
||||
PlayMusic.Lyric = null;
|
||||
PlayMusic.nowLyric = "";
|
||||
PlayMusic.haveLyric = false;
|
||||
ALLMusic.Side.SendLyric("");
|
||||
String songURL = Get.realURL(ALLMusic.Config.getMusic_Api1() + PlayMusic.NowPlayMusic.getID());
|
||||
String songURL = Get.realURL(ALLMusic.Config.getMusic_Api1() +
|
||||
PlayMusic.NowPlayMusic.getID());
|
||||
String Lyric = Get.realData(ALLMusic.Config.getLyric_Api1(), PlayMusic.NowPlayMusic.getID());
|
||||
if (Lyric != null) {
|
||||
try {
|
||||
PlayMusic.Lyric = new LyricDo(Lyric);
|
||||
PlayMusic.Lyric.Check();
|
||||
PlayMusic.haveLyric = true;
|
||||
if (ALLMusic.Config.isSendLyric() || ALLMusic.VV != null)
|
||||
PlayMusic.haveLyric = true;
|
||||
} catch (Exception e) {
|
||||
ALLMusic.log.warning("§d[ALLMusic]§c歌词解析错误");
|
||||
e.printStackTrace();
|
||||
@@ -97,7 +97,7 @@ class PlayGo extends Thread {
|
||||
PlayMusic.MusicAllTime = Get.getMusicTime(songURL);
|
||||
ALLMusic.Side.bq("§d[ALLMusic]§2" + "正在播放歌曲" + PlayMusic.NowPlayMusic.getInfo());
|
||||
if (PlayMusic.haveLyric)
|
||||
startTime();
|
||||
startTimer();
|
||||
ALLMusic.Side.Send("[Play]" + songURL, true);
|
||||
try {
|
||||
while (PlayMusic.MusicAllTime > 0) {
|
||||
@@ -108,23 +108,23 @@ class PlayGo extends Thread {
|
||||
if (!ALLMusic.Side.NeedPlay()) {
|
||||
PlayMusic.MusicAllTime = 1;
|
||||
}
|
||||
if (PlayMusic.Vote_time > 0) {
|
||||
PlayMusic.Vote_time--;
|
||||
if (PlayMusic.Vote_time == 0) {
|
||||
PlayMusic.Vote.clear();
|
||||
if (PlayMusic.VoteTime > 0) {
|
||||
PlayMusic.VoteTime--;
|
||||
if (PlayMusic.VoteTime == 0) {
|
||||
PlayMusic.VotePlayer.clear();
|
||||
ALLMusic.Side.bq("§d[ALLMusic]§2" + "切歌时间结束");
|
||||
} else {
|
||||
int players = ALLMusic.Side.GetAllPlayer();
|
||||
if (PlayMusic.Vote.size() >= ALLMusic.Config.getMinVote() ||
|
||||
(players <= ALLMusic.Config.getMinVote() && players <= PlayMusic.Vote.size())) {
|
||||
if (PlayMusic.VotePlayer.size() >= ALLMusic.Config.getMinVote() ||
|
||||
(players <= ALLMusic.Config.getMinVote() && players <= PlayMusic.VotePlayer.size())) {
|
||||
ALLMusic.Side.bq("§d[ALLMusic]§2" + "已切歌");
|
||||
ALLMusic.Side.Send("[Stop]", false);
|
||||
PlayMusic.Vote.clear();
|
||||
PlayMusic.VotePlayer.clear();
|
||||
PlayMusic.MusicAllTime = 1;
|
||||
if (PlayMusic.PlayList.size() == 0) {
|
||||
if (PlayMusic.getSize() == 0) {
|
||||
ALLMusic.Side.bq("§d[ALLMusic]§2" + "队列中无歌曲");
|
||||
}
|
||||
PlayMusic.Vote_time = 0;
|
||||
PlayMusic.VoteTime = 0;
|
||||
PlayMusic.NowPlayMusic = null;
|
||||
}
|
||||
}
|
||||
@@ -142,7 +142,7 @@ class PlayGo extends Thread {
|
||||
ALLMusic.Side.bq("§d[ALLMusic]§2" + "无效歌曲" + PlayMusic.NowPlayMusic.getID());
|
||||
}
|
||||
PlayMusic.NowPlayMusic = null;
|
||||
if (ALLMusic.VV != null && PlayMusic.PlayList.size() == 0) {
|
||||
if (ALLMusic.VV != null && PlayMusic.getSize() == 0) {
|
||||
ALLMusic.VV.clear();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -11,11 +11,10 @@ import java.util.List;
|
||||
|
||||
public class PlayMusic {
|
||||
|
||||
public static List<SongInfo> PlayList = new ArrayList<>();
|
||||
public static List<String> Vote = new ArrayList<>();
|
||||
public static List<String> NowPlay = new ArrayList<>();
|
||||
|
||||
public static int Vote_time = 0;
|
||||
public static final List<String> VotePlayer = new ArrayList<>();
|
||||
public static final List<String> NowPlayPlayer = new ArrayList<>();
|
||||
private static final List<SongInfo> PlayList = new ArrayList<>();
|
||||
public static int VoteTime = 0;
|
||||
public static int MusicAllTime = 0;
|
||||
public static int MusicNowTime = 0;
|
||||
public static SongInfo NowPlayMusic;
|
||||
@@ -23,7 +22,6 @@ public class PlayMusic {
|
||||
public static LyricDo Lyric;
|
||||
public static boolean haveLyric;
|
||||
public static String nowLyric = "";
|
||||
public static boolean isList = false;
|
||||
private static PlayGo PlayGo;
|
||||
|
||||
public static void stop() {
|
||||
@@ -33,31 +31,56 @@ public class PlayMusic {
|
||||
}
|
||||
}
|
||||
|
||||
public static void Start() {
|
||||
public static void start() {
|
||||
PlayGo = new PlayGo();
|
||||
PlayGo.start();
|
||||
}
|
||||
|
||||
public static void AddMusic(String ID, String player) {
|
||||
if (isHave(ID))
|
||||
return;
|
||||
ALLMusic.Side.RunTask(() ->
|
||||
{
|
||||
public static void addMusic(String ID, String player, boolean isList) {
|
||||
synchronized (PlayList) {
|
||||
if (isHave(ID))
|
||||
return;
|
||||
ALLMusic.Side.bq("§d[ALLMusic]§2" + player +
|
||||
"点歌" + ID);
|
||||
logs.log_write("玩家:" + player + " 点歌:" + ID);
|
||||
SongInfo info = new SongInfo(null, null, ID, null, player, null);
|
||||
SongInfo info = new SongInfo(null, null, ID, null, player, null, isList);
|
||||
try {
|
||||
info = GetInfo.Get(ID, player);
|
||||
info = GetInfo.Get(ID, player, isList);
|
||||
} catch (Exception e) {
|
||||
ALLMusic.log.warning("§d[ALLMusic]§c歌曲信息解析错误");
|
||||
e.printStackTrace();
|
||||
}
|
||||
PlayList.add(info);
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
public static String getList() {
|
||||
public static SongInfo getMusic(int index) {
|
||||
synchronized (PlayList) {
|
||||
return PlayList.get(index);
|
||||
}
|
||||
}
|
||||
|
||||
public static int getSize() {
|
||||
synchronized (PlayList) {
|
||||
return PlayList.size();
|
||||
}
|
||||
}
|
||||
|
||||
public static List<SongInfo> getList() {
|
||||
return new ArrayList<>(PlayList);
|
||||
}
|
||||
|
||||
public static void clear() {
|
||||
PlayList.clear();
|
||||
}
|
||||
|
||||
public static void remove(int index) {
|
||||
synchronized (PlayList) {
|
||||
PlayList.remove(index);
|
||||
}
|
||||
}
|
||||
|
||||
public static String getAllList() {
|
||||
StringBuilder list = new StringBuilder();
|
||||
for (int i = 0; i < PlayList.size(); i++) {
|
||||
SongInfo info = PlayList.get(i);
|
||||
|
||||
@@ -32,7 +32,7 @@ public class GetList {
|
||||
|
||||
public static String GetMusic() {
|
||||
if (!isUpdata && ALLMusic.Config.getPlayList().size() != 0) {
|
||||
String obj = null;
|
||||
String obj;
|
||||
if (ALLMusic.Config.isPlayListRandom()) {
|
||||
obj = ALLMusic.Config.getPlayList().get(new Random().nextInt(ALLMusic.Config.getPlayList().size() - 1));
|
||||
} else {
|
||||
|
||||
@@ -24,4 +24,6 @@ public interface ISide {
|
||||
void RunTask(Runnable run);
|
||||
|
||||
void reload();
|
||||
|
||||
boolean checkPermission(String player, String permission);
|
||||
}
|
||||
@@ -15,7 +15,7 @@ import net.md_5.bungee.api.connection.ProxiedPlayer;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
import java.util.Collection;
|
||||
|
||||
import static Color_yr.ALLMusic.Play.PlayMusic.NowPlay;
|
||||
import static Color_yr.ALLMusic.Play.PlayMusic.NowPlayPlayer;
|
||||
|
||||
public class SideBC implements ISide {
|
||||
@Override
|
||||
@@ -56,7 +56,7 @@ public class SideBC implements ISide {
|
||||
continue;
|
||||
if (!ALLMusic.Config.getNoMusicServer().contains(players.getServer().getInfo().getName())) {
|
||||
if (!ALLMusic.Config.getNoMusicPlayer().contains(players.getName()))
|
||||
if (NowPlay.contains(players.getName()))
|
||||
if (NowPlayPlayer.contains(players.getName()))
|
||||
players.sendMessage(ChatMessageType.ACTION_BAR, new TextComponent(data));
|
||||
}
|
||||
}
|
||||
@@ -118,6 +118,14 @@ public class SideBC implements ISide {
|
||||
ALLMusicBC.setConfig();
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean checkPermission(String player, String permission) {
|
||||
ProxiedPlayer player1 = ProxyServer.getInstance().getPlayer(player);
|
||||
if (player1 == null)
|
||||
return false;
|
||||
return player1.hasPermission(permission);
|
||||
}
|
||||
|
||||
private void Send(ProxiedPlayer players, String data, Boolean isplay) {
|
||||
try {
|
||||
byte[] bytes = data.getBytes(StandardCharsets.UTF_8);
|
||||
@@ -127,9 +135,9 @@ public class SideBC implements ISide {
|
||||
players.sendData(ALLMusic.channel, buf.array());
|
||||
if (isplay != null) {
|
||||
if (isplay) {
|
||||
NowPlay.add(players.getName());
|
||||
NowPlayPlayer.add(players.getName());
|
||||
} else {
|
||||
NowPlay.remove(players.getName());
|
||||
NowPlayPlayer.remove(players.getName());
|
||||
}
|
||||
}
|
||||
} catch (Exception e) {
|
||||
|
||||
@@ -13,7 +13,7 @@ import org.bukkit.entity.Player;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
|
||||
import static Color_yr.ALLMusic.ALLMusicBukkit.ALLMusicP;
|
||||
import static Color_yr.ALLMusic.Play.PlayMusic.NowPlay;
|
||||
import static Color_yr.ALLMusic.Play.PlayMusic.NowPlayPlayer;
|
||||
|
||||
public class SideBukkit implements ISide {
|
||||
|
||||
@@ -86,6 +86,14 @@ public class SideBukkit implements ISide {
|
||||
ALLMusicBukkit.setConfig();
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean checkPermission(String player, String permission) {
|
||||
Player player1 = Bukkit.getPlayer(player);
|
||||
if (player1 == null)
|
||||
return false;
|
||||
return player1.hasPermission(permission);
|
||||
}
|
||||
|
||||
private void Send(Player players, String data, Boolean isplay) {
|
||||
try {
|
||||
byte[] bytes = data.getBytes(StandardCharsets.UTF_8);
|
||||
@@ -95,9 +103,9 @@ public class SideBukkit implements ISide {
|
||||
players.sendPluginMessage(ALLMusicP, ALLMusic.channel, buf.array());
|
||||
if (isplay != null) {
|
||||
if (isplay) {
|
||||
NowPlay.add(players.getName());
|
||||
NowPlayPlayer.add(players.getName());
|
||||
} else {
|
||||
NowPlay.remove(players.getName());
|
||||
NowPlayPlayer.remove(players.getName());
|
||||
}
|
||||
}
|
||||
} catch (Exception e) {
|
||||
|
||||
@@ -6,14 +6,14 @@ import org.bukkit.Bukkit;
|
||||
import org.bukkit.craftbukkit.v1_12_R1.entity.CraftPlayer;
|
||||
import org.bukkit.entity.Player;
|
||||
|
||||
import static Color_yr.ALLMusic.Play.PlayMusic.NowPlay;
|
||||
import static Color_yr.ALLMusic.Play.PlayMusic.NowPlayPlayer;
|
||||
|
||||
public class SideBukkit1_12 extends SideBukkit {
|
||||
@Override
|
||||
public void SendLyric(String data) {
|
||||
for (Player players : Bukkit.getOnlinePlayers()) {
|
||||
if (!ALLMusic.Config.getNoMusicPlayer().contains(players.getName())) {
|
||||
if (NowPlay.contains(players.getName())) {
|
||||
if (NowPlayPlayer.contains(players.getName())) {
|
||||
if (ALLMusic.VV == null || !ALLMusic.Config.getVVSave(players.getName()).isEnable()) {
|
||||
ChatComponentText chat = new ChatComponentText(data);
|
||||
PacketPlayOutChat pack = new PacketPlayOutChat(chat, ChatMessageType.GAME_INFO);
|
||||
|
||||
@@ -6,14 +6,14 @@ import org.bukkit.Bukkit;
|
||||
import org.bukkit.craftbukkit.v1_14_R1.entity.CraftPlayer;
|
||||
import org.bukkit.entity.Player;
|
||||
|
||||
import static Color_yr.ALLMusic.Play.PlayMusic.NowPlay;
|
||||
import static Color_yr.ALLMusic.Play.PlayMusic.NowPlayPlayer;
|
||||
|
||||
public class SideBukkit1_14 extends SideBukkit {
|
||||
@Override
|
||||
public void SendLyric(String data) {
|
||||
for (Player players : Bukkit.getOnlinePlayers()) {
|
||||
if (!ALLMusic.Config.getNoMusicPlayer().contains(players.getName())) {
|
||||
if (NowPlay.contains(players.getName())) {
|
||||
if (NowPlayPlayer.contains(players.getName())) {
|
||||
if (ALLMusic.VV == null || !ALLMusic.Config.getVVSave(players.getName()).isEnable()) {
|
||||
ChatComponentText chat = new ChatComponentText(data);
|
||||
PacketPlayOutChat pack = new PacketPlayOutChat(chat, ChatMessageType.GAME_INFO);
|
||||
|
||||
@@ -6,14 +6,14 @@ import org.bukkit.Bukkit;
|
||||
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftPlayer;
|
||||
import org.bukkit.entity.Player;
|
||||
|
||||
import static Color_yr.ALLMusic.Play.PlayMusic.NowPlay;
|
||||
import static Color_yr.ALLMusic.Play.PlayMusic.NowPlayPlayer;
|
||||
|
||||
public class SideBukkit1_15 extends SideBukkit {
|
||||
@Override
|
||||
public void SendLyric(String data) {
|
||||
for (Player players : Bukkit.getOnlinePlayers()) {
|
||||
if (!ALLMusic.Config.getNoMusicPlayer().contains(players.getName())) {
|
||||
if (NowPlay.contains(players.getName())) {
|
||||
if (NowPlayPlayer.contains(players.getName())) {
|
||||
if (ALLMusic.VV == null || !ALLMusic.Config.getVVSave(players.getName()).isEnable()) {
|
||||
ChatComponentText chat = new ChatComponentText(data);
|
||||
PacketPlayOutChat pack = new PacketPlayOutChat(chat, ChatMessageType.GAME_INFO);
|
||||
|
||||
@@ -5,12 +5,14 @@ import Color_yr.ALLMusic.Http.Get;
|
||||
import com.google.gson.Gson;
|
||||
|
||||
public class GetInfo {
|
||||
public static SongInfo Get(String ID, String player) {
|
||||
public static SongInfo Get(String ID, String player, boolean isList) {
|
||||
String data = Get.realData(ALLMusic.Config.getInfo_Api1(), ID);
|
||||
SongInfo info = new SongInfo(null, null, ID, null, player, null);
|
||||
SongInfo info = new SongInfo(null, null,
|
||||
ID, null, player, null, isList);
|
||||
if (data != null) {
|
||||
InfoOBJ temp = new Gson().fromJson(data, InfoOBJ.class);
|
||||
info = new SongInfo(temp.getAuthor(), temp.getName(), ID, temp.getAlia(), player, temp.getAl());
|
||||
info = new SongInfo(temp.getAuthor(), temp.getName(),
|
||||
ID, temp.getAlia(), player, temp.getAl(), isList);
|
||||
}
|
||||
return info;
|
||||
}
|
||||
|
||||
@@ -8,13 +8,21 @@ public class SongInfo {
|
||||
private String Call;
|
||||
private String Al;
|
||||
|
||||
public SongInfo(String Author, String Name, String ID, String Alia, String Call, String Al) {
|
||||
private boolean isList;
|
||||
|
||||
public SongInfo(String Author, String Name, String ID, String Alia, String Call, String Al, boolean isList) {
|
||||
this.Author = Author;
|
||||
this.Name = Name;
|
||||
this.ID = ID;
|
||||
this.Alia = Alia;
|
||||
this.Call = Call;
|
||||
this.Al = Al;
|
||||
|
||||
this.isList = isList;
|
||||
}
|
||||
|
||||
public boolean isList() {
|
||||
return isList;
|
||||
}
|
||||
|
||||
public String getAuthor() {
|
||||
|
||||
@@ -72,11 +72,11 @@ public class VVGet {
|
||||
VexTextShow show;
|
||||
List<String> list = new ArrayList<>();
|
||||
boolean save = false;
|
||||
if (PlayMusic.PlayList.size() == 0) {
|
||||
if (PlayMusic.getSize() == 0) {
|
||||
list.add("队列中无歌曲");
|
||||
} else {
|
||||
String now;
|
||||
for (SongInfo info : PlayMusic.PlayList) {
|
||||
for (SongInfo info : PlayMusic.getList()) {
|
||||
now = info.getInfo();
|
||||
if (now.length() > 30)
|
||||
now = now.substring(0, 29) + "...";
|
||||
@@ -149,7 +149,7 @@ public class VVGet {
|
||||
list.add(showobj.getTlyric());
|
||||
}
|
||||
for (Player player : Bukkit.getOnlinePlayers()) {
|
||||
if (!PlayMusic.NowPlay.contains(player.getName()))
|
||||
if (!PlayMusic.NowPlayPlayer.contains(player.getName()))
|
||||
continue;
|
||||
if (ALLMusic.Config.getNoMusicPlayer().contains(player.getName()))
|
||||
continue;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
name: ALLMusic
|
||||
main: Color_yr.ALLMusic.ALLMusicBC
|
||||
author: Color_yr
|
||||
version: 1.7.0
|
||||
version: 1.8.0
|
||||
@@ -14,7 +14,9 @@
|
||||
"PlayList": [],
|
||||
"PlayListSwitch": true,
|
||||
"PlayListRandom": true,
|
||||
"SendLyric": true,
|
||||
"NeedPermission": false,
|
||||
"VexView": false,
|
||||
"VVSave": {},
|
||||
"Version": "1.7.0"
|
||||
"Version": "1.8.0"
|
||||
}
|
||||
@@ -1,7 +1,7 @@
|
||||
name: ALLMusic
|
||||
main: Color_yr.ALLMusic.ALLMusicBukkit
|
||||
author: Color_yr
|
||||
version: 1.7.0
|
||||
version: 1.8.0
|
||||
loadbefore:
|
||||
- vexview
|
||||
softdepend:
|
||||
|
||||
Reference in new issue
Block a user