mirror of
https://github.com/Coloryr/AllMusic.git
synced 2026-11-22 06:12:14 +00:00
1 parent
6967318e92
commit
5830e2c4f9
33 files changed
+156
-141
No files matched your search
+8
-8
@@ -2,8 +2,8 @@ package com.coloryr.allmusic.server.core;
|
||||
|
||||
import com.coloryr.allmusic.server.core.music.api.APIMain;
|
||||
import com.coloryr.allmusic.server.core.music.play.MusicSearch;
|
||||
import com.coloryr.allmusic.server.core.music.play.PlayGo;
|
||||
import com.coloryr.allmusic.server.core.music.play.PlayMusic;
|
||||
import com.coloryr.allmusic.server.core.music.play.PlayRuntime;
|
||||
import com.coloryr.allmusic.server.core.objs.CookieObj;
|
||||
import com.coloryr.allmusic.server.core.objs.config.ConfigObj;
|
||||
import com.coloryr.allmusic.server.core.objs.message.MessageObj;
|
||||
@@ -36,15 +36,15 @@ public class AllMusic {
|
||||
/**
|
||||
* 插件版本号
|
||||
*/
|
||||
public static final String version = "3.1.9";
|
||||
public static final String version = "3.2.0";
|
||||
/**
|
||||
* 配置文件版本号
|
||||
*/
|
||||
public static final String configVersion = "202";
|
||||
public static final String configVersion = "203";
|
||||
/**
|
||||
* 语言文件配置版本号
|
||||
*/
|
||||
public static final String messageVersion = "204";
|
||||
public static final String messageVersion = "205";
|
||||
/**
|
||||
* 搜歌结果
|
||||
* 玩家名 结果
|
||||
@@ -363,7 +363,7 @@ public class AllMusic {
|
||||
public static void start() {
|
||||
AllMusic.apiMusic = new APIMain();
|
||||
PlayMusic.start();
|
||||
PlayGo.start();
|
||||
PlayRuntime.start();
|
||||
MusicSearch.start();
|
||||
DataSql.start();
|
||||
|
||||
@@ -380,7 +380,7 @@ public class AllMusic {
|
||||
side.sendStop();
|
||||
MusicSearch.stop();
|
||||
PlayMusic.stop();
|
||||
PlayGo.stop();
|
||||
PlayRuntime.stop();
|
||||
DataSql.stop();
|
||||
} catch (IOException e) {
|
||||
e.printStackTrace();
|
||||
@@ -460,9 +460,9 @@ public class AllMusic {
|
||||
String finalPlayer = player;
|
||||
AllMusic.side.runTask(() -> {
|
||||
SongInfoObj music = PlayMusic.nowPlayMusic;
|
||||
if (music != null && PlayGo.url != null) {
|
||||
if (music != null && PlayMusic.url != null) {
|
||||
AllMusic.side.sendHudPos(finalPlayer);
|
||||
AllMusic.side.sendMusic(finalPlayer, PlayGo.url);
|
||||
AllMusic.side.sendMusic(finalPlayer, PlayMusic.url);
|
||||
if (!music.isUrl()) {
|
||||
AllMusic.side.sendPic(finalPlayer, music.getPicUrl());
|
||||
}
|
||||
|
||||
@@ -17,6 +17,7 @@ import com.coloryr.allmusic.server.core.objs.enums.EncryptType;
|
||||
import com.coloryr.allmusic.server.core.objs.message.PAL;
|
||||
import com.coloryr.allmusic.server.core.objs.music.SearchPageObj;
|
||||
import com.coloryr.allmusic.server.core.objs.music.SongInfoObj;
|
||||
import com.coloryr.allmusic.server.core.sql.DataSql;
|
||||
import com.coloryr.allmusic.server.core.utils.Logs;
|
||||
import com.google.gson.JsonObject;
|
||||
import okhttp3.Cookie;
|
||||
@@ -224,6 +225,7 @@ public class APIMain {
|
||||
try {
|
||||
isUpdate = true;
|
||||
DataObj obj = AllMusic.gson.fromJson(res.data, DataObj.class);
|
||||
DataSql.addIdleList(obj.getPlaylist());
|
||||
PlayMusic.addIdleList(obj.getPlaylist());
|
||||
AllMusic.side.sendMessageTask(sender, AllMusic.getMessage().musicPlay.listMusic.get.replace(PAL.name, obj.getName()));
|
||||
} catch (Exception e) {
|
||||
|
||||
@@ -8,16 +8,14 @@ import com.coloryr.allmusic.server.core.objs.message.PAL;
|
||||
import com.coloryr.allmusic.server.core.objs.music.MusicObj;
|
||||
import com.coloryr.allmusic.server.core.objs.music.SongInfoObj;
|
||||
import com.coloryr.allmusic.server.core.sql.DataSql;
|
||||
import com.coloryr.allmusic.server.core.utils.HudUtils;
|
||||
import com.coloryr.allmusic.server.core.utils.Logs;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
|
||||
import java.io.BufferedInputStream;
|
||||
import java.net.URL;
|
||||
import java.net.URLConnection;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Queue;
|
||||
import java.util.Random;
|
||||
import java.util.*;
|
||||
import java.util.concurrent.ConcurrentLinkedQueue;
|
||||
|
||||
public class PlayMusic {
|
||||
@@ -28,6 +26,7 @@ public class PlayMusic {
|
||||
private static final List<SongInfoObj> playList = new ArrayList<>();
|
||||
private static final Queue<MusicObj> tasks = new ConcurrentLinkedQueue<>();
|
||||
private static final List<String> playIdleList = new ArrayList<>();
|
||||
private static final Queue<String> deep = new PriorityQueue<>();
|
||||
/**
|
||||
* 投票时间
|
||||
*/
|
||||
@@ -55,6 +54,10 @@ public class PlayMusic {
|
||||
* 当前歌词信息
|
||||
*/
|
||||
public static LyricSave lyric;
|
||||
/**
|
||||
* 播放链接
|
||||
*/
|
||||
public static String url;
|
||||
/**
|
||||
* 错误次数
|
||||
*/
|
||||
@@ -75,7 +78,7 @@ public class PlayMusic {
|
||||
* 开始歌曲逻辑
|
||||
*/
|
||||
public static void start() {
|
||||
Thread addT = new Thread(PlayMusic::task, "AllMusic_list");
|
||||
Thread addT = new Thread(PlayMusic::task, "AllMusicList");
|
||||
isRun = true;
|
||||
addT.start();
|
||||
}
|
||||
@@ -141,10 +144,21 @@ public class PlayMusic {
|
||||
}
|
||||
playList.add(info);
|
||||
if (!AllMusic.getConfig().muteAddMessage) {
|
||||
String data = getData(info);
|
||||
if (AllMusic.getConfig().showInBar) {
|
||||
String data = AllMusic.getMessage().musicPlay.addMusic
|
||||
.replace(PAL.musicName, HudUtils.messageLimit(info.getName()))
|
||||
.replace(PAL.musicAuthor, HudUtils.messageLimit(info.getAuthor()))
|
||||
.replace(PAL.musicAl, HudUtils.messageLimit(info.getAl()))
|
||||
.replace(PAL.musicAlia, HudUtils.messageLimit(info.getAlia()))
|
||||
.replace(PAL.player, info.getCall());
|
||||
AllMusic.side.sendBar(data);
|
||||
} else {
|
||||
String data = AllMusic.getMessage().musicPlay.addMusic
|
||||
.replace(PAL.musicName, info.getName())
|
||||
.replace(PAL.musicAuthor, info.getAuthor())
|
||||
.replace(PAL.musicAl, info.getAl())
|
||||
.replace(PAL.musicAlia, info.getAlia())
|
||||
.replace(PAL.player, info.getCall());
|
||||
AllMusic.side.bqTask(data);
|
||||
}
|
||||
}
|
||||
@@ -164,26 +178,6 @@ public class PlayMusic {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 构建字符串
|
||||
*
|
||||
* @param info 歌曲信息
|
||||
* @return 信息
|
||||
*/
|
||||
private static @NotNull String getData(SongInfoObj info) {
|
||||
LimitObj limit = AllMusic.getConfig().limit;
|
||||
String message = AllMusic.getMessage().musicPlay.addMusic
|
||||
.replace(PAL.musicName, info.getName())
|
||||
.replace(PAL.musicAuthor, info.getAuthor())
|
||||
.replace(PAL.musicAl, info.getAl())
|
||||
.replace(PAL.musicAlia, info.getAlia());
|
||||
if (limit.messageLimit
|
||||
&& message.length() > limit.messageLimitSize) {
|
||||
message = message.substring(0, limit.messageLimitSize) + limit.limitText;
|
||||
}
|
||||
return message;
|
||||
}
|
||||
|
||||
/**
|
||||
* 将歌曲移动到队列头
|
||||
*
|
||||
@@ -362,21 +356,36 @@ public class PlayMusic {
|
||||
if (AllMusic.getMusicApi().isUpdate()) {
|
||||
return null;
|
||||
}
|
||||
String ID;
|
||||
String id;
|
||||
if (playIdleList.isEmpty())
|
||||
return null;
|
||||
if (AllMusic.getConfig().playListRandom) {
|
||||
if (playIdleList.size() == 1)
|
||||
return playIdleList.get(0);
|
||||
ID = playIdleList.get(new Random().nextInt(playIdleList.size()));
|
||||
if (playIdleList.size() > 10) {
|
||||
int size = AllMusic.getConfig().playListEscapeDeep;
|
||||
if (size > playIdleList.size() / 2) {
|
||||
size = playIdleList.size() / 2;
|
||||
}
|
||||
if (deep.size() >= size) {
|
||||
deep.poll();
|
||||
}
|
||||
do {
|
||||
id = playIdleList.get(new Random().nextInt(playIdleList.size()));
|
||||
}
|
||||
while (deep.contains(id));
|
||||
deep.add(id);
|
||||
} else {
|
||||
id = playIdleList.get(new Random().nextInt(playIdleList.size()));
|
||||
}
|
||||
} else {
|
||||
ID = playIdleList.get(idleNow);
|
||||
id = playIdleList.get(idleNow);
|
||||
idleNow++;
|
||||
if (idleNow >= playIdleList.size()) {
|
||||
idleNow = 0;
|
||||
}
|
||||
}
|
||||
return ID;
|
||||
return id;
|
||||
}
|
||||
|
||||
public static SongInfoObj findPlayerMusic(String name) {
|
||||
|
||||
@@ -12,11 +12,7 @@ import java.util.concurrent.Executors;
|
||||
import java.util.concurrent.ScheduledExecutorService;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
|
||||
public class PlayGo {
|
||||
/**
|
||||
* 播放链接
|
||||
*/
|
||||
public static String url;
|
||||
public class PlayRuntime {
|
||||
/**
|
||||
* 倒数计数器
|
||||
*/
|
||||
@@ -44,12 +40,12 @@ public class PlayGo {
|
||||
* 启动歌曲工作
|
||||
*/
|
||||
public static void start() {
|
||||
Thread taskT = new Thread(PlayGo::task, "AllMusic_Play");
|
||||
Thread taskT = new Thread(PlayRuntime::task, "AllMusicPlay");
|
||||
isRun = true;
|
||||
taskT.start();
|
||||
|
||||
service2 = Executors.newSingleThreadScheduledExecutor();
|
||||
service2.scheduleAtFixedRate(PlayGo::time3, 0, 1, TimeUnit.SECONDS);
|
||||
service2.scheduleAtFixedRate(PlayRuntime::time3, 0, 1, TimeUnit.SECONDS);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -78,10 +74,10 @@ public class PlayGo {
|
||||
|
||||
private static void startTimer() {
|
||||
service = Executors.newSingleThreadScheduledExecutor();
|
||||
service.scheduleAtFixedRate(PlayGo::time1, 0, 10, TimeUnit.MILLISECONDS);
|
||||
service.scheduleAtFixedRate(PlayRuntime::time1, 0, 10, TimeUnit.MILLISECONDS);
|
||||
if (PlayMusic.lyric != null && PlayMusic.lyric.isHaveLyric()) {
|
||||
service1 = Executors.newSingleThreadScheduledExecutor();
|
||||
service1.scheduleAtFixedRate(PlayGo::time2, 0, 2, TimeUnit.MILLISECONDS);
|
||||
service1.scheduleAtFixedRate(PlayRuntime::time2, 0, 2, TimeUnit.MILLISECONDS);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -97,6 +93,9 @@ public class PlayGo {
|
||||
PlayMusic.nowPlayMusic = null;
|
||||
AllMusic.side.updateInfo();
|
||||
HudUtils.clearHud();
|
||||
HudUtils.sendHudNowData();
|
||||
HudUtils.sendHudLyricData();
|
||||
HudUtils.sendHudListData();
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -222,23 +221,19 @@ public class PlayGo {
|
||||
if (PlayMusic.getListSize() == 0) {
|
||||
if (PlayMusic.error >= 10) {
|
||||
Thread.sleep(1000);
|
||||
} else {
|
||||
HudUtils.sendHudNowData();
|
||||
HudUtils.sendHudLyricData();
|
||||
HudUtils.sendHudListData();
|
||||
} else if (PlayMusic.getIdleListSize() > 0) {
|
||||
if (AllMusic.side.needPlay()) {
|
||||
String ID = PlayMusic.getIdleMusic();
|
||||
if (ID != null) {
|
||||
PlayMusic.addMusic(null, ID, AllMusic.getMessage().custom.idle, true);
|
||||
String id = PlayMusic.getIdleMusic();
|
||||
if (id != null) {
|
||||
PlayMusic.addMusic(null, id, AllMusic.getMessage().custom.idle, true);
|
||||
}
|
||||
}
|
||||
}
|
||||
Thread.sleep(50);
|
||||
Thread.sleep(1000);
|
||||
} else {
|
||||
HudUtils.sendHudNowData();
|
||||
HudUtils.sendHudLyricData();
|
||||
HudUtils.sendHudListData();
|
||||
|
||||
AllMusic.side.sendHudUtilsAll();
|
||||
PlayMusic.nowPlayMusic = PlayMusic.remove(0);
|
||||
if (AllMusic.side.onMusicPlay(PlayMusic.nowPlayMusic)) {
|
||||
@@ -246,10 +241,10 @@ public class PlayGo {
|
||||
continue;
|
||||
}
|
||||
|
||||
url = PlayMusic.nowPlayMusic.getPlayerUrl() == null ?
|
||||
PlayMusic.url = PlayMusic.nowPlayMusic.getPlayerUrl() == null ?
|
||||
AllMusic.getMusicApi().getPlayUrl(PlayMusic.nowPlayMusic.getID()) :
|
||||
PlayMusic.nowPlayMusic.getPlayerUrl();
|
||||
if (url == null) {
|
||||
if (PlayMusic.url == null) {
|
||||
String data = AllMusic.getMessage().musicPlay.emptyCanPlay;
|
||||
AllMusic.side.bqTask(data.replace(PAL.musicId, PlayMusic.nowPlayMusic.getID()));
|
||||
PlayMusic.nowPlayMusic = null;
|
||||
@@ -264,13 +259,26 @@ public class PlayGo {
|
||||
if (PlayMusic.nowPlayMusic.getLength() != 0) {
|
||||
PlayMusic.musicAllTime = PlayMusic.musicLessTime = (PlayMusic.nowPlayMusic.getLength() / 1000) + 3;
|
||||
startTimer();
|
||||
AllMusic.side.sendMusic(url);
|
||||
AllMusic.side.sendMusic(PlayMusic.url);
|
||||
if (!AllMusic.getConfig().mutePlayMessage) {
|
||||
String info = getInfo();
|
||||
if (AllMusic.getConfig().showInBar)
|
||||
SongInfoObj music = PlayMusic.nowPlayMusic;
|
||||
if (AllMusic.getConfig().showInBar) {
|
||||
String info = AllMusic.getMessage().musicPlay.nowPlay
|
||||
.replace(PAL.musicName, HudUtils.messageLimit(music.getName()))
|
||||
.replace(PAL.musicAuthor, HudUtils.messageLimit(music.getAuthor()))
|
||||
.replace(PAL.musicAl, HudUtils.messageLimit(music.getAl()))
|
||||
.replace(PAL.musicAlia, HudUtils.messageLimit(music.getAlia()))
|
||||
.replace(PAL.player, music.getCall());
|
||||
AllMusic.side.sendBar(info);
|
||||
else
|
||||
} else {
|
||||
String info = AllMusic.getMessage().musicPlay.nowPlay
|
||||
.replace(PAL.musicName, music.getName())
|
||||
.replace(PAL.musicAuthor, music.getAuthor())
|
||||
.replace(PAL.musicAl, music.getAl())
|
||||
.replace(PAL.musicAlia, music.getAlia())
|
||||
.replace(PAL.player, music.getCall());
|
||||
AllMusic.side.bqTask(info);
|
||||
}
|
||||
}
|
||||
if (!PlayMusic.nowPlayMusic.isUrl() && PlayMusic.nowPlayMusic.getPicUrl() != null) {
|
||||
AllMusic.side.sendPic(PlayMusic.nowPlayMusic.getPicUrl());
|
||||
@@ -304,19 +312,4 @@ public class PlayGo {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private static @NotNull String getInfo() {
|
||||
String info = AllMusic.getMessage().musicPlay.nowPlay
|
||||
.replace(PAL.musicName, PlayMusic.nowPlayMusic.getName())
|
||||
.replace(PAL.musicAuthor, PlayMusic.nowPlayMusic.getAuthor())
|
||||
.replace(PAL.musicAl, PlayMusic.nowPlayMusic.getAl())
|
||||
.replace(PAL.musicAlia, PlayMusic.nowPlayMusic.getAlia())
|
||||
.replace(PAL.player, PlayMusic.nowPlayMusic.getCall());
|
||||
LimitObj limit = AllMusic.getConfig().limit;
|
||||
if (limit.messageLimit
|
||||
&& info.length() > limit.messageLimitSize) {
|
||||
info = info.substring(0, limit.messageLimitSize) + limit.limitText;
|
||||
}
|
||||
return info;
|
||||
}
|
||||
}
|
||||
@@ -66,6 +66,10 @@ public class ConfigObj {
|
||||
* 空闲歌单随机播放
|
||||
*/
|
||||
public boolean playListRandom;
|
||||
/**
|
||||
* 多少首歌不重复
|
||||
*/
|
||||
public int playListEscapeDeep;
|
||||
/**
|
||||
* 显示歌词
|
||||
*/
|
||||
@@ -87,7 +91,7 @@ public class ConfigObj {
|
||||
*/
|
||||
public boolean muteAddMessage;
|
||||
/**
|
||||
* 将信息限制在bar处
|
||||
* 将信息显示在bar处
|
||||
*/
|
||||
public boolean showInBar;
|
||||
/**
|
||||
@@ -217,6 +221,7 @@ public class ConfigObj {
|
||||
banPlayer = new HashSet<>();
|
||||
playListSwitch = true;
|
||||
playListRandom = true;
|
||||
playListEscapeDeep = 40;
|
||||
sendLyric = true;
|
||||
needPermission = false;
|
||||
defaultHud = SaveObj.make();
|
||||
|
||||
@@ -41,13 +41,13 @@ public class LimitObj {
|
||||
public static LimitObj make() {
|
||||
LimitObj obj = new LimitObj();
|
||||
obj.musicTimeLimit = true;
|
||||
obj.infoLimit = true;
|
||||
obj.infoLimitSize = 80;
|
||||
obj.listLimit = false;
|
||||
obj.listLimitSize = 60;
|
||||
obj.maxMusicTime = 600;
|
||||
obj.infoLimit = true;
|
||||
obj.infoLimitSize = 10;
|
||||
obj.listLimit = false;
|
||||
obj.listLimitSize = 10;
|
||||
obj.messageLimit = false;
|
||||
obj.messageLimitSize = 40;
|
||||
obj.messageLimitSize = 20;
|
||||
obj.limitText = "...";
|
||||
return obj;
|
||||
}
|
||||
|
||||
@@ -25,7 +25,7 @@ public class ListMusicObj {
|
||||
public void init() {
|
||||
head = "§d[AllMusic3]§e队列中有歌曲数:" + PAL.count;
|
||||
item = "§e" + PAL.index + "->" + PAL.musicName + " | " + PAL.musicAuthor
|
||||
+ " | " + PAL.musicAl + " | " + PAL.musicAlia;
|
||||
+ " | " + PAL.musicAl + " | " + PAL.musicAlia + " | by: " + PAL.player;
|
||||
get = "§d[AllMusic3]§e歌曲列表" + PAL.name + "获取成功";
|
||||
}
|
||||
}
|
||||
@@ -66,7 +66,7 @@ public class MusicPlayObj {
|
||||
mute = "§d[AllMusic3]§e你不会再收到点歌了!想要再次参与点歌就点一首歌吧!";
|
||||
switchMusic = "§d[AllMusic3]§e切换到玩家歌曲";
|
||||
addMusic = "§d[AllMusic3]§e音乐列表添加" + PAL.musicName + " | " + PAL.musicAuthor
|
||||
+ " | " + PAL.musicAl + " | " + PAL.musicAlia;
|
||||
+ " | " + PAL.musicAl + " | " + PAL.musicAlia + " | by: " + PAL.player;
|
||||
checkMusic = "§d[AllMusic3]§e正在解析歌曲" + PAL.musicId;
|
||||
musicInfo = PAL.musicName + " | " + PAL.musicAuthor + " | " + PAL.musicAl
|
||||
+ " | " + PAL.musicAlia + " | by: " + PAL.player;
|
||||
|
||||
+2
-19
@@ -191,17 +191,7 @@ public abstract class BaseSide {
|
||||
*
|
||||
* @param data 消息
|
||||
*/
|
||||
public final void bq(String data) {
|
||||
LimitObj limit = AllMusic.getConfig().limit;
|
||||
if (limit.messageLimit
|
||||
&& data.length() > limit.messageLimitSize) {
|
||||
data = data.substring(0, limit.messageLimitSize - 1) + limit.limitText;
|
||||
}
|
||||
|
||||
topBq(data);
|
||||
}
|
||||
|
||||
protected abstract void topBq(String data);
|
||||
public abstract void bq(String data);
|
||||
|
||||
/**
|
||||
* 广播点击消息
|
||||
@@ -218,14 +208,7 @@ public abstract class BaseSide {
|
||||
* @param data 消息
|
||||
*/
|
||||
public final void bqTask(String data) {
|
||||
LimitObj limit = AllMusic.getConfig().limit;
|
||||
if (limit.messageLimit
|
||||
&& data.length() > limit.messageLimitSize) {
|
||||
data = data.substring(0, limit.messageLimitSize - 1) + limit.limitText;
|
||||
}
|
||||
|
||||
String finalData = data;
|
||||
runTask(() -> bq(finalData));
|
||||
runTask(() -> bq(data));
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
+35
-12
@@ -99,13 +99,16 @@ public class HudUtils {
|
||||
} else {
|
||||
String now;
|
||||
StringBuilder list = new StringBuilder();
|
||||
LimitObj limit = AllMusic.getConfig().limit;
|
||||
for (SongInfoObj info1 : PlayMusic.getList()) {
|
||||
if (info1 == null)
|
||||
continue;
|
||||
now = info1.getInfo();
|
||||
if (limit.listLimit && now.length() > limit.listLimitSize)
|
||||
now = now.substring(0, limit.listLimitSize - 1) + limit.limitText;
|
||||
now = AllMusic.getMessage().musicPlay.musicInfo
|
||||
.replace(PAL.musicName, listLimit(info1.getName()))
|
||||
.replace(PAL.musicAuthor, listLimit(info1.getAuthor()))
|
||||
.replace(PAL.musicAl, listLimit(info1.getAl()))
|
||||
.replace(PAL.musicAlia, listLimit(info1.getAlia()))
|
||||
.replace(PAL.player, info1.getCall());
|
||||
|
||||
list.append(now).append("\n");
|
||||
}
|
||||
info = AllMusic.getMessage().hud.list
|
||||
@@ -137,19 +140,15 @@ public class HudUtils {
|
||||
info = AllMusic.getMessage().hud.emptyMusic;
|
||||
} else {
|
||||
info = AllMusic.getMessage().hud.music
|
||||
.replace(PAL.name, PlayMusic.nowPlayMusic.getName())
|
||||
.replace(PAL.name, infoLimit(PlayMusic.nowPlayMusic.getName()))
|
||||
.replace(PAL.allTime, tranTime(PlayMusic.musicAllTime))
|
||||
.replace(PAL.nowTime, tranTime(PlayMusic.musicNowTime / 1000))
|
||||
.replace(PAL.musicAuthor, PlayMusic.nowPlayMusic.getAuthor())
|
||||
.replace(PAL.musicAlia, PlayMusic.nowPlayMusic.getAlia())
|
||||
.replace(PAL.musicAl, PlayMusic.nowPlayMusic.getAl())
|
||||
.replace(PAL.musicAuthor, infoLimit(PlayMusic.nowPlayMusic.getAuthor()))
|
||||
.replace(PAL.musicAlia, infoLimit(PlayMusic.nowPlayMusic.getAlia()))
|
||||
.replace(PAL.musicAl, infoLimit(PlayMusic.nowPlayMusic.getAl()))
|
||||
.replace(PAL.player, PlayMusic.nowPlayMusic.getCall());
|
||||
}
|
||||
|
||||
LimitObj limit = AllMusic.getConfig().limit;
|
||||
if (limit.messageLimit && info.length() > limit.messageLimitSize)
|
||||
info = info.substring(0, limit.messageLimitSize - 1) + limit.limitText;
|
||||
|
||||
AllMusic.side.sendHudInfo(info);
|
||||
}
|
||||
|
||||
@@ -509,4 +508,28 @@ public class HudUtils {
|
||||
addAndSave(name, obj);
|
||||
HudUtils.sendHudPos(name);
|
||||
}
|
||||
|
||||
public static String infoLimit(String info) {
|
||||
LimitObj limit = AllMusic.getConfig().limit;
|
||||
if (limit.infoLimit && info.length() > limit.infoLimitSize)
|
||||
info = info.substring(0, limit.infoLimitSize - 1) + limit.limitText;
|
||||
|
||||
return info;
|
||||
}
|
||||
|
||||
public static String listLimit(String list) {
|
||||
LimitObj limit = AllMusic.getConfig().limit;
|
||||
if (limit.listLimit && list.length() > limit.listLimitSize)
|
||||
list = list.substring(0, limit.listLimitSize - 1) + limit.limitText;
|
||||
|
||||
return list;
|
||||
}
|
||||
|
||||
public static String messageLimit(String message) {
|
||||
LimitObj limit = AllMusic.getConfig().limit;
|
||||
if (limit.messageLimit && message.length() > limit.messageLimitSize)
|
||||
message = message.substring(0, limit.messageLimitSize - 1) + limit.limitText;
|
||||
|
||||
return message;
|
||||
}
|
||||
}
|
||||
@@ -339,7 +339,7 @@ public class SideFabric extends BaseSide {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void topBq(String data) {
|
||||
public void bq(String data) {
|
||||
for (ServerPlayerEntity player : AllMusicFabric.server.getPlayerManager().getPlayerList()) {
|
||||
if (!AllMusic.isSkip(player.getName().getString(), null, false)) {
|
||||
player.sendMessage(Text.of(data), false);
|
||||
|
||||
@@ -339,7 +339,7 @@ public class SideFabric extends BaseSide {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void topBq(String data) {
|
||||
public void bq(String data) {
|
||||
for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) {
|
||||
if (!AllMusic.isSkip(player.getName().getString(), null, false)) {
|
||||
player.sendMessage(Text.of(data), false);
|
||||
|
||||
@@ -341,7 +341,7 @@ public class SideFabric extends BaseSide {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void topBq(String data) {
|
||||
public void bq(String data) {
|
||||
for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) {
|
||||
if (!AllMusic.isSkip(player.getName().getString(), null, false)) {
|
||||
player.sendMessage(Text.of(data), false);
|
||||
|
||||
@@ -338,7 +338,7 @@ public class SideFabric extends BaseSide {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void topBq(String data) {
|
||||
public void bq(String data) {
|
||||
for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) {
|
||||
if (!AllMusic.isSkip(player.getName().getString(), null, false)) {
|
||||
player.sendMessage(Text.of(data), false);
|
||||
|
||||
@@ -338,7 +338,7 @@ public class SideFabric extends BaseSide {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void topBq(String data) {
|
||||
public void bq(String data) {
|
||||
for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) {
|
||||
if (!AllMusic.isSkip(player.getName().getString(), null, false)) {
|
||||
player.sendMessage(Text.of(data), false);
|
||||
|
||||
@@ -340,7 +340,7 @@ public class SideFabric extends BaseSide {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void topBq(String data) {
|
||||
public void bq(String data) {
|
||||
for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) {
|
||||
if (!AllMusic.isSkip(player.getName().getString(), null, false)) {
|
||||
player.sendMessage(Text.of(data), false);
|
||||
|
||||
@@ -336,7 +336,7 @@ public class SideFabric extends BaseSide {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void topBq(String data) {
|
||||
public void bq(String data) {
|
||||
for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) {
|
||||
if (!AllMusic.isSkip(player.getName().getString(), null, false)) {
|
||||
player.sendMessage(Text.of(data), false);
|
||||
|
||||
@@ -336,7 +336,7 @@ public class SideFabric extends BaseSide {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void topBq(String data) {
|
||||
public void bq(String data) {
|
||||
for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) {
|
||||
if (!AllMusic.isSkip(player.getName().getString(), null, false)) {
|
||||
player.sendMessage(Text.of(data), false);
|
||||
|
||||
@@ -292,7 +292,7 @@ public class SideFolia extends BaseSide {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void topBq(String data) {
|
||||
public void bq(String data) {
|
||||
for (Player player : Bukkit.getOnlinePlayers()) {
|
||||
if (!AllMusic.isSkip(player.getName(), null, false)) {
|
||||
player.sendMessage(data);
|
||||
|
||||
@@ -339,7 +339,7 @@ public class SideForge extends BaseSide {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void topBq(String data) {
|
||||
public void bq(String data) {
|
||||
for (EntityPlayerMP player : AllMusicForge.server.getPlayerList().getPlayers()) {
|
||||
if (!AllMusic.isSkip(player.getName(), null, false)) {
|
||||
player.sendMessage(new TextComponentString(data));
|
||||
|
||||
@@ -340,7 +340,7 @@ public class SideForge extends BaseSide {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void topBq(String data) {
|
||||
public void bq(String data) {
|
||||
for (ServerPlayerEntity player : AllMusicForge.server.getPlayerList().getPlayers()) {
|
||||
if (!AllMusic.isSkip(player.getName().getString(), null, false)) {
|
||||
player.sendMessage(new StringTextComponent(data), UUID.randomUUID());
|
||||
|
||||
@@ -340,7 +340,7 @@ public class SideForge extends BaseSide {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void topBq(String data) {
|
||||
public void bq(String data) {
|
||||
for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) {
|
||||
if (!AllMusic.isSkip(player.getName().getString(), null, false)) {
|
||||
player.sendMessage(new TextComponent(data), UUID.randomUUID());
|
||||
|
||||
@@ -339,7 +339,7 @@ public class SideForge extends BaseSide {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void topBq(String data) {
|
||||
public void bq(String data) {
|
||||
for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) {
|
||||
if (!AllMusic.isSkip(player.getName().getString(), null, false)) {
|
||||
player.sendSystemMessage(Component.literal(data));
|
||||
|
||||
@@ -339,7 +339,7 @@ public class SideForge extends BaseSide {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void topBq(String data) {
|
||||
public void bq(String data) {
|
||||
for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) {
|
||||
if (!AllMusic.isSkip(player.getName().getString(), null, false)) {
|
||||
player.sendSystemMessage(Component.literal(data));
|
||||
|
||||
@@ -349,7 +349,7 @@ public class SideForge extends BaseSide {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void topBq(String data) {
|
||||
public void bq(String data) {
|
||||
for (Object player1 : AllMusicForge.server.getConfigurationManager().playerEntityList) {
|
||||
EntityPlayerMP player = (EntityPlayerMP) player1;
|
||||
if (!AllMusic.isSkip(player.getCommandSenderName(), null, false)) {
|
||||
|
||||
@@ -335,7 +335,7 @@ public class SideForge extends BaseSide {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void topBq(String data) {
|
||||
public void bq(String data) {
|
||||
for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) {
|
||||
if (!AllMusic.isSkip(player.getName().getString(), null, false)) {
|
||||
player.sendSystemMessage(Component.literal(data));
|
||||
|
||||
@@ -335,7 +335,7 @@ public class SideForge extends BaseSide {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void topBq(String data) {
|
||||
public void bq(String data) {
|
||||
for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) {
|
||||
if (!AllMusic.isSkip(player.getName().getString(), null, false)) {
|
||||
player.sendSystemMessage(Component.literal(data));
|
||||
|
||||
@@ -335,7 +335,7 @@ public class SideForge extends BaseSide {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void topBq(String data) {
|
||||
public void bq(String data) {
|
||||
for (ServerPlayer player : AllMusicForge.server.getPlayerList().getPlayers()) {
|
||||
if (!AllMusic.isSkip(player.getName().getString(), null, false)) {
|
||||
player.sendSystemMessage(Component.literal(data));
|
||||
|
||||
@@ -374,7 +374,7 @@ public class SideBukkit extends BaseSide {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void topBq(String data) {
|
||||
public void bq(String data) {
|
||||
for (Player player : Bukkit.getOnlinePlayers()) {
|
||||
if (!AllMusic.isSkip(player.getName(), null, false)) {
|
||||
player.sendMessage(data);
|
||||
|
||||
@@ -54,9 +54,9 @@ dependencies {
|
||||
//compileOnly 'net.citizensnpcs:citizens-main:2.0.30-SNAPSHOT'
|
||||
// compileOnly fileTree(dir:'lib',include:['*.jar'])
|
||||
|
||||
implementation 'org.xerial:sqlite-jdbc:+'
|
||||
compile 'com.squareup.okhttp3:okhttp:+'
|
||||
compile 'com.google.code.gson:gson:+'
|
||||
implementation 'org.xerial:sqlite-jdbc:3.46.0.1'
|
||||
compile 'com.squareup.okhttp3:okhttp:4.12.0'
|
||||
compile 'com.google.code.gson:gson:2.11.0'
|
||||
|
||||
annotationProcessor 'com.velocitypowered:velocity-api:3.0.0'
|
||||
}
|
||||
|
||||
@@ -390,7 +390,7 @@ public class SideBC extends BaseSide implements IEconomy {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void topBq(String data) {
|
||||
public void bq(String data) {
|
||||
TextComponent message = new TextComponent(data);
|
||||
for (ProxiedPlayer player : ProxyServer.getInstance().getPlayers()) {
|
||||
if (skip(player))
|
||||
|
||||
+1
-1
@@ -136,7 +136,7 @@ public class SideVelocity extends BaseSide implements IEconomy {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void topBq(String data) {
|
||||
public void bq(String data) {
|
||||
Component message = Component.text(data);
|
||||
for (Player player : AllMusicVelocity.plugin.server.getAllPlayers()) {
|
||||
if (skip(player)) {
|
||||
|
||||
Reference in new issue
Block a user