diff --git a/core/AllMusic.java b/core/AllMusic.java index fafaa7b2..3d22ed81 100644 --- a/core/AllMusic.java +++ b/core/AllMusic.java @@ -30,6 +30,7 @@ import java.util.*; public class AllMusic { public static final Gson gson = new GsonBuilder() .disableHtmlEscaping() + .setPrettyPrinting() .create(); public static final Random random = new Random(); @@ -111,7 +112,7 @@ public class AllMusic { public static void configCheck() { if (config == null || config.check()) { config = ConfigObj.make(); - log.warning("[AllMusic3]配置文件config.json错误,已覆盖"); + log.data("[AllMusic3]配置文件config.json错误,已覆盖"); saveConfig(); } } @@ -122,7 +123,7 @@ public class AllMusic { private static void messageCheck() { if (message == null || message.check()) { message = MessageObj.make(); - log.warning("[AllMusic3]配置文件message.json错误,已覆盖"); + log.data("[AllMusic3]配置文件message.json错误,已覆盖"); saveMessage(); } } @@ -205,7 +206,7 @@ public class AllMusic { */ public static ConfigObj getConfig() { if (config == null) { - log.warning("[AllMusic3]配置文件config.json错误,已使用默认配置文件"); + log.data("[AllMusic3]配置文件config.json错误,已使用默认配置文件"); config = ConfigObj.make(); } return config; @@ -218,7 +219,7 @@ public class AllMusic { */ public static MessageObj getMessage() { if (message == null) { - log.warning("[AllMusic3]配置文件message.json错误,已使用默认配置文件"); + log.data("[AllMusic3]配置文件message.json错误,已使用默认配置文件"); message = MessageObj.make(); } return message; @@ -288,7 +289,7 @@ public class AllMusic { */ public static void saveConfig() { try { - String data = new GsonBuilder().setPrettyPrinting().create().toJson(config); + String data = gson.toJson(config); FileOutputStream out = new FileOutputStream(configFile); OutputStreamWriter write = new OutputStreamWriter( out, StandardCharsets.UTF_8); @@ -296,14 +297,14 @@ public class AllMusic { write.close(); out.close(); } catch (Exception e) { - log.warning("[AllMusic3]配置文件保存错误"); + log.data("[AllMusic3]配置文件保存错误"); e.printStackTrace(); } } public static void saveMessage() { try { - String data = new GsonBuilder().setPrettyPrinting().create().toJson(message); + String data = gson.toJson(message); FileOutputStream out = new FileOutputStream(messageFile); OutputStreamWriter write = new OutputStreamWriter( out, StandardCharsets.UTF_8); @@ -311,7 +312,7 @@ public class AllMusic { write.close(); out.close(); } catch (Exception e) { - log.warning("[AllMusic3]配置文件保存错误"); + log.data("[AllMusic3]配置文件保存错误"); e.printStackTrace(); } } @@ -321,14 +322,14 @@ public class AllMusic { */ public static void saveCookie() { try { - String data = new GsonBuilder().setPrettyPrinting().create().toJson(cookie); + String data = gson.toJson(cookie); FileOutputStream out = new FileOutputStream(cookieFile); OutputStreamWriter write = new OutputStreamWriter( out, StandardCharsets.UTF_8); write.write(data); write.close(); } catch (Exception e) { - log.warning("[AllMusic3]配置文件保存错误"); + log.data("[AllMusic3]配置文件保存错误"); e.printStackTrace(); } } @@ -347,7 +348,7 @@ public class AllMusic { MusicSearch.start(); DataSql.start(); - log.info("[AllMusic3]已启动-" + version); + log.data("[AllMusic3]已启动-" + version); } /** @@ -361,7 +362,7 @@ public class AllMusic { PlayMusic.stop(); PlayRuntime.stop(); DataSql.stop(); - log.info("[AllMusic3]已停止,感谢使用"); + log.data("[AllMusic3]已停止,感谢使用"); } /** @@ -372,30 +373,30 @@ public class AllMusic { InputStreamReader reader = new InputStreamReader( Files.newInputStream(configFile.toPath()), StandardCharsets.UTF_8); BufferedReader bf = new BufferedReader(reader); - config = new Gson().fromJson(bf, ConfigObj.class); + config = gson.fromJson(bf, ConfigObj.class); bf.close(); reader.close(); configCheck(); reader = new InputStreamReader(Files.newInputStream(messageFile.toPath()), StandardCharsets.UTF_8); bf = new BufferedReader(reader); - message = new Gson().fromJson(bf, MessageObj.class); + message = gson.fromJson(bf, MessageObj.class); bf.close(); reader.close(); messageCheck(); - log.info("[AllMusic3]当前语言配置文件版本为:" + messageVersion + log.data("[AllMusic3]当前语言配置文件版本为:" + messageVersion + ",你的语言文件版本为:" + message.version); if (!message.version.equalsIgnoreCase(messageVersion)) { - log.warning("[AllMusic3]语言文件版本号错误,运行可能会发生问题,请删除后重载"); + log.data("[AllMusic3]语言文件版本号错误,运行可能会发生问题,请删除后重载"); } reader = new InputStreamReader(Files.newInputStream(cookieFile.toPath()), StandardCharsets.UTF_8); bf = new BufferedReader(reader); Type listType = new TypeToken>() { }.getType(); - cookie = new Gson().fromJson(bf, listType); + cookie = gson.fromJson(bf, listType); bf.close(); reader.close(); if (cookie == null) { @@ -403,14 +404,14 @@ public class AllMusic { saveCookie(); } - log.info("[AllMusic3]当前插件配置文件版本为:" + configVersion + log.data("[AllMusic3]当前插件配置文件版本为:" + configVersion + ",你的配置文件版本为:" + config.version); if (!AllMusic.configVersion.equalsIgnoreCase(config.version)) { - log.warning("[AllMusic3]请及时更新配置文件"); + log.data("[AllMusic3]请及时更新配置文件"); } } catch (Exception e) { - log.warning("[AllMusic3]读取配置文件错误"); + log.data("[AllMusic3]读取配置文件错误"); e.printStackTrace(); } } @@ -465,8 +466,8 @@ public class AllMusic { * * @param file 配置文件文件夹 */ - public void init(File file) { - log.info("[AllMusic3]正在启动,感谢使用,本插件交流群:571239090"); + public static void init(File file) { + log.data("[AllMusic3]正在启动,感谢使用,本插件交流群:571239090"); try { if (!file.exists()) file.mkdir(); @@ -491,7 +492,7 @@ public class AllMusic { isRun = true; } catch (IOException e) { isRun = false; - log.warning("[AllMusic3]启动失败"); + log.data("[AllMusic3]启动失败"); e.printStackTrace(); } } diff --git a/core/music/MusicHttpClient.java b/core/music/MusicHttpClient.java index df007bfb..fafbc473 100644 --- a/core/music/MusicHttpClient.java +++ b/core/music/MusicHttpClient.java @@ -80,7 +80,7 @@ public class MusicHttpClient { int httpCode = response.getCode(); HttpEntity entity = response.getEntity(); if (entity == null) { - AllMusic.log.warning("[AllMusic3]获取网页错误"); + AllMusic.log.data("[AllMusic3]获取网页错误"); return null; } InputStream inputStream = entity.getContent(); @@ -96,7 +96,7 @@ public class MusicHttpClient { // 注意:需要调用者关闭 InputStream return inputStream; } catch (Exception e) { - AllMusic.log.warning("[AllMusic3]获取网页错误"); + AllMusic.log.data("[AllMusic3]获取网页错误"); e.printStackTrace(); } return null; diff --git a/core/music/MusicSearch.java b/core/music/MusicSearch.java index ba702bc4..6b9a5cf1 100644 --- a/core/music/MusicSearch.java +++ b/core/music/MusicSearch.java @@ -36,7 +36,7 @@ public class MusicSearch { } Thread.sleep(100); } catch (Exception e) { - AllMusic.log.warning("搜歌出现问题"); + AllMusic.log.data("搜歌出现问题"); e.printStackTrace(); } } @@ -75,9 +75,9 @@ public class MusicSearch { item = search.getRes(a + search.getPage() * 10); info = AllMusic.getMessage().page.choice; info = info.replace(ARG.index, "" + (a + 1)) - .replace(ARG.musicName, item.name()) - .replace(ARG.musicAuthor, item.author()) - .replace(ARG.musicAl, item.al()); + .replace(ARG.musicName, item.name) + .replace(ARG.musicAuthor, item.author) + .replace(ARG.musicAl, item.al); AllMusic.side.sendMessage(sender, AllMusic.miniMessage(info) .append(AllMusic.miniMessageRun(AllMusic.getMessage().click.clickRun, "/music select " + (a + 1)))); } diff --git a/core/music/PlayMusic.java b/core/music/PlayMusic.java index d9c26a96..0a195626 100644 --- a/core/music/PlayMusic.java +++ b/core/music/PlayMusic.java @@ -229,7 +229,7 @@ public class PlayMusic { } Thread.sleep(10); } catch (Exception e) { - AllMusic.log.warning("歌曲处理出现问题"); + AllMusic.log.data("歌曲处理出现问题"); e.printStackTrace(); } } @@ -251,7 +251,7 @@ public class PlayMusic { .replace(ARG.musicId, id); AllMusic.side.sendMessageTask(sender, text); } - AllMusic.log.info("玩家:" + player + " 点歌:" + id); + AllMusic.log.data("[AllMusic3]玩家:" + player + " 点歌:" + id); try { SongInfoObj info = api.getMusic(id, player, isList); if (info == null) { @@ -300,7 +300,7 @@ public class PlayMusic { if (isList) { error++; } - AllMusic.log.warning("[AllMusic3]歌曲信息解析错误"); + AllMusic.log.data("[AllMusic3]歌曲信息解析错误"); e.printStackTrace(); } } diff --git a/core/music/PlayRuntime.java b/core/music/PlayRuntime.java index f3d4df6c..1ff32636 100644 --- a/core/music/PlayRuntime.java +++ b/core/music/PlayRuntime.java @@ -307,7 +307,7 @@ public class PlayRuntime { clear(); } } catch (Exception e) { - AllMusic.log.warning("歌曲播放出现错误"); + AllMusic.log.data("歌曲播放出现错误"); e.printStackTrace(); } } diff --git a/core/objs/HttpResObj.java b/core/objs/HttpResObj.java index 8ede54bf..161fc281 100644 --- a/core/objs/HttpResObj.java +++ b/core/objs/HttpResObj.java @@ -1,4 +1,11 @@ package com.coloryr.allmusic.server.core.objs; -public record HttpResObj(String data, boolean ok) { +public class HttpResObj { + public final String data; + public final boolean ok; + + public HttpResObj(String data, boolean ok) { + this.data = data; + this.ok = ok; + } } diff --git a/core/objs/SearchMusicObj.java b/core/objs/SearchMusicObj.java index 41ad4e7a..bae70f41 100644 --- a/core/objs/SearchMusicObj.java +++ b/core/objs/SearchMusicObj.java @@ -1,4 +1,15 @@ package com.coloryr.allmusic.server.core.objs; -public record SearchMusicObj(String id, String name, String author, String al) { +public class SearchMusicObj { + public final String id; + public final String name; + public final String author; + public final String al; + + public SearchMusicObj(String ID, String Name, String Author, String Al) { + this.id = ID; + this.name = Name; + this.author = Author; + this.al = Al; + } } diff --git a/core/objs/music/SearchPageObj.java b/core/objs/music/SearchPageObj.java index 2c8fb1ea..2d71551d 100644 --- a/core/objs/music/SearchPageObj.java +++ b/core/objs/music/SearchPageObj.java @@ -17,7 +17,7 @@ public class SearchPageObj { } public String getSong(int index) { - return resData.get(index).id(); + return resData.get(index).id; } public SearchMusicObj getRes(int a) { diff --git a/core/side/BaseSide.java b/core/side/BaseSide.java index 947394dd..2464b3f8 100644 --- a/core/side/BaseSide.java +++ b/core/side/BaseSide.java @@ -171,7 +171,7 @@ public abstract class BaseSide { try { send(player1, CommandType.POS, null, pos); } catch (Exception e) { - AllMusic.log.warning("[AllMusic]清空Hud发生出错"); + AllMusic.log.data("[AllMusic]清空Hud发生出错"); e.printStackTrace(); } } @@ -189,7 +189,7 @@ public abstract class BaseSide { try { send(player, CommandType.STOP, null, 0); } catch (Exception e) { - AllMusic.log.warning("[AllMusic]停止指令发送出错"); + AllMusic.log.data("[AllMusic]停止指令发送出错"); e.printStackTrace(); } } @@ -204,7 +204,7 @@ public abstract class BaseSide { send(player, CommandType.STOP, null, 0); } } catch (Exception e) { - AllMusic.log.warning("[AllMusic]停止指令发送出错"); + AllMusic.log.data("[AllMusic]停止指令发送出错"); e.printStackTrace(); } } @@ -225,7 +225,7 @@ public abstract class BaseSide { return; send(player1, CommandType.PLAY, url, 0); } catch (Exception e) { - AllMusic.log.warning("[AllMusic]歌曲指令发送出错"); + AllMusic.log.data("[AllMusic]歌曲指令发送出错"); e.printStackTrace(); } } @@ -249,7 +249,7 @@ public abstract class BaseSide { continue; send(player, CommandType.LYRIC, data, 0); } catch (Exception e) { - AllMusic.log.warning("[AllMusic]歌词发送出错"); + AllMusic.log.data("[AllMusic]歌词发送出错"); e.printStackTrace(); } } @@ -274,7 +274,7 @@ public abstract class BaseSide { continue; send(player, CommandType.INFO, data, 0); } catch (Exception e) { - AllMusic.log.warning("[AllMusic]歌词信息发送出错"); + AllMusic.log.data("[AllMusic]歌词信息发送出错"); e.printStackTrace(); } } @@ -296,7 +296,7 @@ public abstract class BaseSide { String data = AllMusic.gson.toJson(obj); send(player, CommandType.HUD_DATA, data, 0); } catch (Exception e) { - AllMusic.log.warning("[AllMusic]界面位置发送出错"); + AllMusic.log.data("[AllMusic]界面位置发送出错"); e.printStackTrace(); } } @@ -330,7 +330,7 @@ public abstract class BaseSide { break; } } catch (Exception e) { - AllMusic.log.warning("[AllMusic]停止指令发送出错"); + AllMusic.log.data("[AllMusic]停止指令发送出错"); e.printStackTrace(); } } @@ -354,7 +354,7 @@ public abstract class BaseSide { continue; send(player, CommandType.LIST, data, 0); } catch (Exception e) { - AllMusic.log.warning("[AllMusic]歌曲列表发送出错"); + AllMusic.log.data("[AllMusic]歌曲列表发送出错"); e.printStackTrace(); } } @@ -374,7 +374,7 @@ public abstract class BaseSide { String data = AllMusic.gson.toJson(obj); send(player, CommandType.HUD_DATA, data, 0); } catch (Exception e1) { - AllMusic.log.warning("[AllMusic]数据发送发生错误"); + AllMusic.log.data("[AllMusic]数据发送发生错误"); e1.printStackTrace(); } } @@ -396,7 +396,7 @@ public abstract class BaseSide { continue; sendBar(player, data); } catch (Exception e1) { - AllMusic.log.warning("[AllMusic]数据发送发生错误"); + AllMusic.log.data("[AllMusic]数据发送发生错误"); e1.printStackTrace(); } } @@ -419,7 +419,7 @@ public abstract class BaseSide { send(player, CommandType.PLAY, url, 0); AllMusic.addNowPlayPlayer(name); } catch (Exception e) { - AllMusic.log.warning("[AllMusic]歌曲指令发送出错"); + AllMusic.log.data("[AllMusic]歌曲指令发送出错"); e.printStackTrace(); } } @@ -444,7 +444,7 @@ public abstract class BaseSide { try { send(player, CommandType.IMG, url, 0); } catch (Exception e) { - AllMusic.log.warning("[AllMusic]图片指令发送出错"); + AllMusic.log.data("[AllMusic]图片指令发送出错"); e.printStackTrace(); } } @@ -465,7 +465,7 @@ public abstract class BaseSide { try { send(player1, CommandType.IMG, url, 0); } catch (Exception e) { - AllMusic.log.warning("[AllMusic]图片指令发送出错"); + AllMusic.log.data("[AllMusic]图片指令发送出错"); e.printStackTrace(); } } @@ -482,7 +482,7 @@ public abstract class BaseSide { try { send(player, CommandType.CLEAR, null, 0); } catch (Exception e) { - AllMusic.log.warning("[AllMusic]清空Hud发生出错"); + AllMusic.log.data("[AllMusic]清空Hud发生出错"); e.printStackTrace(); } } @@ -495,7 +495,7 @@ public abstract class BaseSide { try { send(player, CommandType.CLEAR, null, 0); } catch (Exception e) { - AllMusic.log.warning("[AllMusic]清空Hud发生出错"); + AllMusic.log.data("[AllMusic]清空Hud发生出错"); e.printStackTrace(); } } diff --git a/core/side/IAllMusicLogger.java b/core/side/IAllMusicLogger.java index 5541e244..e9daf4e6 100644 --- a/core/side/IAllMusicLogger.java +++ b/core/side/IAllMusicLogger.java @@ -1,7 +1,12 @@ package com.coloryr.allmusic.server.core.side; -public interface IAllMusicLogger { - void warning(String data); +import com.coloryr.allmusic.server.core.AllMusic; +import net.kyori.adventure.text.Component; - void info(String data); +public interface IAllMusicLogger { + default void data(String data) { + data(AllMusic.miniMessage(data)); + } + + void data(Component data); } diff --git a/core/sql/DataSql.java b/core/sql/DataSql.java index 478eae88..595391d5 100644 --- a/core/sql/DataSql.java +++ b/core/sql/DataSql.java @@ -92,7 +92,7 @@ public class DataSql { */ public static void init() { try { - AllMusic.log.info("[AllMusic3]正在初始化数据库"); + AllMusic.log.data("[AllMusic3]正在初始化数据库"); if (connection != null) connection.close(); Class.forName("org.sqlite.JDBC"); @@ -107,8 +107,9 @@ public class DataSql { stat.close(); Cache.updateData(); - AllMusic.log.info("[AllMusic3]数据库初始化完成"); + AllMusic.log.data("[AllMusic3]数据库初始化完成"); } catch (Exception e) { + AllMusic.log.data("[AllMusic3]数据库初始化错误,请删除关闭服务器删除数据库,再启动服务器"); e.printStackTrace(); } } @@ -183,7 +184,7 @@ public class DataSql { stat.execute(sql); stat.close(); } catch (Exception e) { - AllMusic.log.info(sql); + AllMusic.log.data(sql); e.printStackTrace(); } } @@ -241,7 +242,7 @@ public class DataSql { stat.close(); } } catch (Exception e) { - AllMusic.log.info(sql); + AllMusic.log.data(sql); e.printStackTrace(); } } @@ -251,7 +252,6 @@ public class DataSql { */ public static HudPosObj readHud(String name) { try { - AllMusic.log.info("正在读取玩家数据:" + name); if (connection.isReadOnly() || connection.isClosed()) { init(); } @@ -302,7 +302,6 @@ public class DataSql { return obj; } catch (Exception e) { - AllMusic.log.warning("数据库读取错误,请删除关闭服务器删除数据库,在启动服务器"); e.printStackTrace(); } @@ -331,7 +330,6 @@ public class DataSql { obj.api = api; return obj; } catch (Exception e) { - AllMusic.log.warning("数据库读取错误,请删除关闭服务器删除数据库,在启动服务器"); e.printStackTrace(); } return null; @@ -359,7 +357,6 @@ public class DataSql { obj.api = index1; return obj; } catch (Exception e) { - AllMusic.log.warning("数据库读取错误,请删除关闭服务器删除数据库,在启动服务器"); e.printStackTrace(); } return null; @@ -384,7 +381,6 @@ public class DataSql { stat.close(); return count; } catch (Exception e) { - AllMusic.log.warning("数据库读取错误,请删除关闭服务器删除数据库,在启动服务器"); e.printStackTrace(); } return 0; @@ -393,7 +389,6 @@ public class DataSql { public static void addIdleList(List list, String api) { task(() -> { try { - AllMusic.log.info("添加" + list.size() + "首歌到空闲歌单"); if (connection.isReadOnly() || connection.isClosed()) { init(); } diff --git a/core/utils/HudUtils.java b/core/utils/HudUtils.java index b3a8b92e..c90aa041 100644 --- a/core/utils/HudUtils.java +++ b/core/utils/HudUtils.java @@ -271,7 +271,7 @@ public class HudUtils { } AllMusic.side.sendHudPos(player); } catch (Exception e1) { - AllMusic.log.warning("[AllMusic3]数据发送发生错误"); + AllMusic.log.data("[AllMusic3]数据发送发生错误"); e1.printStackTrace(); } }); diff --git a/fabric_1_16_5/build.gradle b/fabric_1_16_5/build.gradle index febcbdb8..0725a469 100644 --- a/fabric_1_16_5/build.gradle +++ b/fabric_1_16_5/build.gradle @@ -27,12 +27,6 @@ repositories { // Loom adds the essential maven repositories to download Minecraft and libraries from automatically. // See https://docs.gradle.org/current/userguide/declaring_repositories.html // for more information about repositories. - - maven { - name = 'sonatype-oss-snapshots1' - url = 'https://s01.oss.sonatype.org/content/repositories/snapshots/' - mavenContent { snapshotsOnly() } - } } dependencies { @@ -44,9 +38,11 @@ dependencies { // Fabric API. This is technically optional, but you probably want it anyway. modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" modImplementation "net.fabricmc:fabric-language-kotlin:${project.fabric_kotlin_version}" - modImplementation include('net.kyori:adventure-platform-fabric:4.0.0') // for Minecraft 1.21.11 +// modImplementation include('net.kyori:adventure-platform-fabric:5.3.0') // for Minecraft 1.21.11 include modImplementation('net.kyori:adventure-text-minimessage:4.26.1') + include modImplementation('net.kyori:adventure-api:4.26.1') + include modImplementation('net.kyori:adventure-key:4.26.1') include modImplementation('org.apache.httpcomponents.client5:httpclient5:5.6') include modImplementation('org.apache.httpcomponents.core5:httpcore5:5.4') include modImplementation('org.apache.httpcomponents.core5:httpcore5-h2:5.4') diff --git a/fabric_1_16_5/src/main/java/com/coloryr/allmusic/server/LogFabric.java b/fabric_1_16_5/src/main/java/com/coloryr/allmusic/server/LogFabric.java index 500971ca..31ecaa9c 100644 --- a/fabric_1_16_5/src/main/java/com/coloryr/allmusic/server/LogFabric.java +++ b/fabric_1_16_5/src/main/java/com/coloryr/allmusic/server/LogFabric.java @@ -1,15 +1,16 @@ package com.coloryr.allmusic.server; +import com.coloryr.allmusic.server.core.AllMusic; import com.coloryr.allmusic.server.core.side.IAllMusicLogger; public class LogFabric implements IAllMusicLogger { @Override public void warning(String data) { - AllMusicServer.LOGGER.warn(data); + AllMusicServer.adventure.console().sendMessage(AllMusic.miniMessage(data)); } @Override public void info(String data) { - AllMusicServer.LOGGER.info(data); + AllMusicServer.adventure.console().sendMessage(AllMusic.miniMessage(data)); } } diff --git a/fabric_1_16_5/src/main/java/com/coloryr/allmusic/server/SideFabric.java b/fabric_1_16_5/src/main/java/com/coloryr/allmusic/server/SideFabric.java index 2c55ecea..eadbd9cf 100644 --- a/fabric_1_16_5/src/main/java/com/coloryr/allmusic/server/SideFabric.java +++ b/fabric_1_16_5/src/main/java/com/coloryr/allmusic/server/SideFabric.java @@ -85,12 +85,10 @@ public class SideFabric extends BaseSide { } @Override - public void sendBar(Object player, String data) { + public void sendBar(Object player, Component data) { if (player instanceof ServerPlayerEntity) { ServerPlayerEntity player1 = (ServerPlayerEntity) player; - - Component data1 = AllMusic.miniMessage(data); - AllMusicServer.adventure.audience(player1).sendActionBar(data1); + AllMusicServer.adventure.audience(player1).sendActionBar(data); } } @@ -110,65 +108,17 @@ public class SideFabric extends BaseSide { } @Override - public void broadcast(String message) { - if (message == null || message.isEmpty()) { - return; - } - - Component data1 = AllMusic.miniMessage(message); - + public void broadcast(Component message) { for (ServerPlayerEntity player : AllMusicServer.server.getPlayerManager().getPlayerList()) { - AllMusicServer.adventure.audience(player).sendMessage(data1); + AllMusicServer.adventure.audience(player).sendMessage(message); } } @Override - public void broadcastWithRun(String message, String end, String command) { - if (message == null || message.isEmpty()) { - return; - } - - Component data1 = AllMusic.miniMessage(message).append(AllMusic.miniMessageRun(end, message)); - for (ServerPlayerEntity player : AllMusicServer.server.getPlayerManager().getPlayerList()) { - AllMusicServer.adventure.audience(player).sendActionBar(data1); - } - } - - @Override - public void sendMessage(Object obj, String message) { - if (message == null || message.isEmpty()) { - return; - } + public void sendMessage(Object obj, Component message) { if (obj instanceof ServerCommandSource) { ServerCommandSource sender = (ServerCommandSource) obj; - Component data1 = AllMusic.miniMessage(message); - AllMusicServer.adventure.audience(sender).sendMessage(data1); - } - } - - @Override - public void sendMessageRun(Object obj, String message, String end, String command) { - if (message == null || message.isEmpty()) { - return; - } - - if (obj instanceof ServerCommandSource) { - ServerCommandSource sender = (ServerCommandSource) obj; - Component data1 = AllMusic.miniMessage(message).append(AllMusic.miniMessageRun(end, message)); - AllMusicServer.adventure.audience(sender).sendMessage(data1); - } - } - - @Override - public void sendMessageSuggest(Object obj, String message, String end, String command) { - if (message == null || message.isEmpty()) { - return; - } - - if (obj instanceof ServerCommandSource) { - ServerCommandSource sender = (ServerCommandSource) obj; - Component data1 = AllMusic.miniMessage(message).append(AllMusic.miniMessageSuggest(end, message)); - AllMusicServer.adventure.audience(sender).sendMessage(data1); + AllMusicServer.adventure.audience(sender).sendMessage(message); } } diff --git a/fabric_1_20_1/build.gradle b/fabric_1_20_1/build.gradle index f5661af3..4511290e 100644 --- a/fabric_1_20_1/build.gradle +++ b/fabric_1_20_1/build.gradle @@ -38,7 +38,11 @@ dependencies { // Fabric API. This is technically optional, but you probably want it anyway. modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" modImplementation "net.fabricmc:fabric-language-kotlin:${project.fabric_kotlin_version}" + modImplementation include('net.kyori:adventure-platform-fabric:5.9.0') + include modImplementation('net.kyori:adventure-text-minimessage:4.26.1') + include modImplementation('net.kyori:adventure-api:4.26.1') + include modImplementation('net.kyori:adventure-key:4.26.1') include modImplementation('org.apache.httpcomponents.client5:httpclient5:5.6') include modImplementation('org.apache.httpcomponents.core5:httpcore5:5.4') include modImplementation('org.apache.httpcomponents.core5:httpcore5-h2:5.4') diff --git a/fabric_1_20_1/src/main/java/com/coloryr/allmusic/server/AllMusicServer.java b/fabric_1_20_1/src/main/java/com/coloryr/allmusic/server/AllMusicServer.java index 9fa86870..1506351a 100644 --- a/fabric_1_20_1/src/main/java/com/coloryr/allmusic/server/AllMusicServer.java +++ b/fabric_1_20_1/src/main/java/com/coloryr/allmusic/server/AllMusicServer.java @@ -13,7 +13,6 @@ import java.io.File; public class AllMusicServer implements DedicatedServerModInitializer { public static MinecraftServer server; - public static final Logger LOGGER = LoggerFactory.getLogger("AllMusic Server"); public static final Identifier ID = new Identifier("allmusic", "channel"); @@ -24,15 +23,12 @@ public class AllMusicServer implements DedicatedServerModInitializer { AllMusic.log = new LogFabric(); AllMusic.side = new SideFabric(); - new AllMusic().init(new File(dir)); - CommandRegistrationCallback.EVENT.register((dispatcher, registryAccess, environment) -> CommandFabric.instance.register(dispatcher)); ServerLifecycleEvents.SERVER_STARTED.register((a) -> { server = a; - + AllMusic.init(new File(dir)); AllMusic.start(); - Tasks.init(); }); diff --git a/fabric_1_20_1/src/main/java/com/coloryr/allmusic/server/FabricApi.java b/fabric_1_20_1/src/main/java/com/coloryr/allmusic/server/FabricApi.java deleted file mode 100644 index c06f920d..00000000 --- a/fabric_1_20_1/src/main/java/com/coloryr/allmusic/server/FabricApi.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.coloryr.allmusic.server; - -import net.minecraft.network.packet.s2c.play.OverlayMessageS2CPacket; -import net.minecraft.server.command.ServerCommandSource; -import net.minecraft.server.network.ServerPlayerEntity; -import net.minecraft.text.ClickEvent; -import net.minecraft.text.MutableText; -import net.minecraft.text.Text; - -public class FabricApi { - - public static void sendMessageRun(ServerCommandSource obj, String message, String end, String command) { - MutableText send = Text.literal(message); - var endText = Text.literal(end); - endText.setStyle(endText.getStyle().withClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, command))); - send.append(endText); - obj.sendMessage(send); - } - - public static void sendMessageSuggest(ServerCommandSource obj, String message, String end, String command) { - MutableText send = Text.literal(message); - var endText = Text.literal(end); - endText.setStyle(endText.getStyle().withClickEvent(new ClickEvent(ClickEvent.Action.SUGGEST_COMMAND, command))); - send.append(endText); - obj.sendMessage(send); - } - - public static void sendBar(ServerPlayerEntity player, String message) { - var pack = new OverlayMessageS2CPacket(Text.literal(message)); - player.networkHandler.sendPacket(pack); - } - - public static void sendMessageBqRun(String message, String end, String command) { - MutableText send = Text.literal(message); - MutableText endText = Text.literal(end); - endText.setStyle(endText.getStyle().withClickEvent(new ClickEvent(ClickEvent.Action.SUGGEST_COMMAND, command))); - send.append(endText); - for (var player : AllMusicServer.server.getPlayerManager().getPlayerList()) { - player.sendMessage(send, false); - } - } -} diff --git a/fabric_1_20_1/src/main/java/com/coloryr/allmusic/server/LogFabric.java b/fabric_1_20_1/src/main/java/com/coloryr/allmusic/server/LogFabric.java index df6c69ed..e2885068 100644 --- a/fabric_1_20_1/src/main/java/com/coloryr/allmusic/server/LogFabric.java +++ b/fabric_1_20_1/src/main/java/com/coloryr/allmusic/server/LogFabric.java @@ -1,15 +1,11 @@ package com.coloryr.allmusic.server; -import com.coloryr.allmusic.server.core.side.IMyLogger; +import com.coloryr.allmusic.server.core.side.IAllMusicLogger; +import net.kyori.adventure.text.Component; -public class LogFabric implements IMyLogger { +public class LogFabric implements IAllMusicLogger { @Override - public void warning(String data) { - AllMusicServer.LOGGER.warn(data); - } - - @Override - public void info(String data) { - AllMusicServer.LOGGER.info(data); + public void data(Component data) { + AllMusicServer.server.sendMessage(data); } } diff --git a/fabric_1_20_1/src/main/java/com/coloryr/allmusic/server/SideFabric.java b/fabric_1_20_1/src/main/java/com/coloryr/allmusic/server/SideFabric.java index 5c1410a3..046e2d79 100644 --- a/fabric_1_20_1/src/main/java/com/coloryr/allmusic/server/SideFabric.java +++ b/fabric_1_20_1/src/main/java/com/coloryr/allmusic/server/SideFabric.java @@ -10,6 +10,7 @@ import com.coloryr.allmusic.server.event.MusicAddEvent; import com.coloryr.allmusic.server.event.MusicPlayEvent; import io.netty.buffer.ByteBuf; import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking; +import net.kyori.adventure.text.Component; import net.minecraft.network.PacketByteBuf; import net.minecraft.server.command.ServerCommandSource; import net.minecraft.server.network.ServerPlayerEntity; @@ -92,9 +93,9 @@ public class SideFabric extends BaseSide { } @Override - public void sendBar(Object player, String data) { + public void sendBar(Object player, Component data) { if (player instanceof ServerPlayerEntity player1) { - FabricApi.sendBar(player1, data); + player1.sendActionBar(data); } } @@ -104,48 +105,19 @@ public class SideFabric extends BaseSide { } @Override - public void broadcast(String message) { - if (message == null || message.isEmpty()) { - return; - } + public void broadcast(Component message) { for (var player : AllMusicServer.server.getPlayerManager().getPlayerList()) { if (!AllMusic.isSkip(player.getName().getString(), null, false)) { - player.sendMessage(Text.of(message), false); + player.sendMessage(message); } } } @Override - public void broadcastWithRun(String message, String end, String command) { - if (message == null || message.isEmpty()) { - return; + public void sendMessage(Object obj, Component message) { + if (obj instanceof ServerCommandSource source) { + source.sendMessage(message); } - FabricApi.sendMessageBqRun(message, end, command); - } - - @Override - public void sendMessage(Object obj, String message) { - if (message == null || message.isEmpty()) { - return; - } - ServerCommandSource source = (ServerCommandSource) obj; - source.sendMessage(Text.of(message)); - } - - @Override - public void sendMessageRun(Object obj, String message, String end, String command) { - if (message == null || message.isEmpty()) { - return; - } - FabricApi.sendMessageRun((ServerCommandSource) obj, message, end, command); - } - - @Override - public void sendMessageSuggest(Object obj, String message, String end, String command) { - if (message == null || message.isEmpty()) { - return; - } - FabricApi.sendMessageSuggest((ServerCommandSource) obj, message, end, command); } @Override @@ -162,11 +134,6 @@ public class SideFabric extends BaseSide { private void send(ServerPlayerEntity players, ByteBuf data) { if (players == null) return; - try { - runTask(() -> ServerPlayNetworking.send(players, AllMusicServer.ID, new PacketByteBuf(data))); - } catch (Exception e) { - AllMusic.log.warning("§c数据发送发生错误"); - e.printStackTrace(); - } + runTask(() -> ServerPlayNetworking.send(players, AllMusicServer.ID, new PacketByteBuf(data))); } } diff --git a/fabric_1_21/build.gradle b/fabric_1_21/build.gradle index f9797b92..2a3e9106 100644 --- a/fabric_1_21/build.gradle +++ b/fabric_1_21/build.gradle @@ -38,7 +38,11 @@ dependencies { // Fabric API. This is technically optional, but you probably want it anyway. modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" modImplementation "net.fabricmc:fabric-language-kotlin:${project.fabric_kotlin_version}" + modImplementation include('net.kyori:adventure-platform-fabric:5.14.1') + include modImplementation('net.kyori:adventure-text-minimessage:4.26.1') + include modImplementation('net.kyori:adventure-api:4.26.1') + include modImplementation('net.kyori:adventure-key:4.26.1') include modImplementation('org.apache.httpcomponents.client5:httpclient5:5.6') include modImplementation('org.apache.httpcomponents.core5:httpcore5:5.4') include modImplementation('org.apache.httpcomponents.core5:httpcore5-h2:5.4') diff --git a/fabric_1_21/src/main/java/com/coloryr/allmusic/server/AllMusicServer.java b/fabric_1_21/src/main/java/com/coloryr/allmusic/server/AllMusicServer.java index 345e5f17..104cd961 100644 --- a/fabric_1_21/src/main/java/com/coloryr/allmusic/server/AllMusicServer.java +++ b/fabric_1_21/src/main/java/com/coloryr/allmusic/server/AllMusicServer.java @@ -11,7 +11,6 @@ import org.slf4j.LoggerFactory; import java.io.File; public class AllMusicServer implements DedicatedServerModInitializer { - public static final Logger LOGGER = LoggerFactory.getLogger("AllMusic Server"); public static MinecraftServer server; public static final String dir = "allmusic_server/"; @@ -21,16 +20,13 @@ public class AllMusicServer implements DedicatedServerModInitializer { AllMusic.log = new LogFabric(); AllMusic.side = new SideFabric(); - new AllMusic().init(new File(dir)); - CommandRegistrationCallback.EVENT.register((dispatcher, registryAccess, environment) -> CommandFabric.instance.register(dispatcher)); ServerLifecycleEvents.SERVER_STARTED.register((a) -> { server = a; - + AllMusic.init(new File(dir)); AllMusic.start(); - Tasks.init(); }); diff --git a/fabric_1_21/src/main/java/com/coloryr/allmusic/server/FabricApi.java b/fabric_1_21/src/main/java/com/coloryr/allmusic/server/FabricApi.java deleted file mode 100644 index c06f920d..00000000 --- a/fabric_1_21/src/main/java/com/coloryr/allmusic/server/FabricApi.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.coloryr.allmusic.server; - -import net.minecraft.network.packet.s2c.play.OverlayMessageS2CPacket; -import net.minecraft.server.command.ServerCommandSource; -import net.minecraft.server.network.ServerPlayerEntity; -import net.minecraft.text.ClickEvent; -import net.minecraft.text.MutableText; -import net.minecraft.text.Text; - -public class FabricApi { - - public static void sendMessageRun(ServerCommandSource obj, String message, String end, String command) { - MutableText send = Text.literal(message); - var endText = Text.literal(end); - endText.setStyle(endText.getStyle().withClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, command))); - send.append(endText); - obj.sendMessage(send); - } - - public static void sendMessageSuggest(ServerCommandSource obj, String message, String end, String command) { - MutableText send = Text.literal(message); - var endText = Text.literal(end); - endText.setStyle(endText.getStyle().withClickEvent(new ClickEvent(ClickEvent.Action.SUGGEST_COMMAND, command))); - send.append(endText); - obj.sendMessage(send); - } - - public static void sendBar(ServerPlayerEntity player, String message) { - var pack = new OverlayMessageS2CPacket(Text.literal(message)); - player.networkHandler.sendPacket(pack); - } - - public static void sendMessageBqRun(String message, String end, String command) { - MutableText send = Text.literal(message); - MutableText endText = Text.literal(end); - endText.setStyle(endText.getStyle().withClickEvent(new ClickEvent(ClickEvent.Action.SUGGEST_COMMAND, command))); - send.append(endText); - for (var player : AllMusicServer.server.getPlayerManager().getPlayerList()) { - player.sendMessage(send, false); - } - } -} diff --git a/fabric_1_21/src/main/java/com/coloryr/allmusic/server/LogFabric.java b/fabric_1_21/src/main/java/com/coloryr/allmusic/server/LogFabric.java index df6c69ed..e2885068 100644 --- a/fabric_1_21/src/main/java/com/coloryr/allmusic/server/LogFabric.java +++ b/fabric_1_21/src/main/java/com/coloryr/allmusic/server/LogFabric.java @@ -1,15 +1,11 @@ package com.coloryr.allmusic.server; -import com.coloryr.allmusic.server.core.side.IMyLogger; +import com.coloryr.allmusic.server.core.side.IAllMusicLogger; +import net.kyori.adventure.text.Component; -public class LogFabric implements IMyLogger { +public class LogFabric implements IAllMusicLogger { @Override - public void warning(String data) { - AllMusicServer.LOGGER.warn(data); - } - - @Override - public void info(String data) { - AllMusicServer.LOGGER.info(data); + public void data(Component data) { + AllMusicServer.server.sendMessage(data); } } diff --git a/fabric_1_21/src/main/java/com/coloryr/allmusic/server/SideFabric.java b/fabric_1_21/src/main/java/com/coloryr/allmusic/server/SideFabric.java index b5e961fa..e25da801 100644 --- a/fabric_1_21/src/main/java/com/coloryr/allmusic/server/SideFabric.java +++ b/fabric_1_21/src/main/java/com/coloryr/allmusic/server/SideFabric.java @@ -10,6 +10,7 @@ import com.coloryr.allmusic.server.core.side.BaseSide; import com.coloryr.allmusic.server.event.MusicAddEvent; import com.coloryr.allmusic.server.event.MusicPlayEvent; import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking; +import net.kyori.adventure.text.Component; import net.minecraft.server.command.ServerCommandSource; import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.text.Text; @@ -92,9 +93,9 @@ public class SideFabric extends BaseSide { } @Override - public void sendBar(Object player, String data) { + public void sendBar(Object player, Component data) { if (player instanceof ServerPlayerEntity player1) { - FabricApi.sendBar(player1, data); + player1.sendActionBar(data); } } @@ -104,48 +105,19 @@ public class SideFabric extends BaseSide { } @Override - public void broadcast(String message) { - if (message == null || message.isEmpty()) { - return; - } + public void broadcast(Component message) { for (var player : AllMusicServer.server.getPlayerManager().getPlayerList()) { if (!AllMusic.isSkip(player.getName().getString(), null, false)) { - player.sendMessage(Text.of(message), false); + player.sendMessage(message); } } } @Override - public void broadcastWithRun(String message, String end, String command) { - if (message == null || message.isEmpty()) { - return; + public void sendMessage(Object obj, Component message) { + if(obj instanceof ServerCommandSource source) { + source.sendMessage(message); } - FabricApi.sendMessageBqRun(message, end, command); - } - - @Override - public void sendMessage(Object obj, String message) { - if (message == null || message.isEmpty()) { - return; - } - ServerCommandSource source = (ServerCommandSource) obj; - source.sendMessage(Text.of(message)); - } - - @Override - public void sendMessageRun(Object obj, String message, String end, String command) { - if (message == null || message.isEmpty()) { - return; - } - FabricApi.sendMessageRun((ServerCommandSource) obj, message, end, command); - } - - @Override - public void sendMessageSuggest(Object obj, String message, String end, String command) { - if (message == null || message.isEmpty()) { - return; - } - FabricApi.sendMessageSuggest((ServerCommandSource) obj, message, end, command); } @Override @@ -162,11 +134,6 @@ public class SideFabric extends BaseSide { private void send(ServerPlayerEntity players, MusicPack data) { if (players == null) return; - try { - runTask(() -> ServerPlayNetworking.send(players, new MusicCodec(data))); - } catch (Exception e) { - AllMusic.log.warning("§c数据发送发生错误"); - e.printStackTrace(); - } + runTask(() -> ServerPlayNetworking.send(players, new MusicCodec(data))); } } diff --git a/fabric_1_21_11/build.gradle b/fabric_1_21_11/build.gradle index 19b722ea..2a29028d 100644 --- a/fabric_1_21_11/build.gradle +++ b/fabric_1_21_11/build.gradle @@ -36,7 +36,11 @@ dependencies { // Fabric API. This is technically optional, but you probably want it anyway. modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" + modImplementation include('net.kyori:adventure-platform-fabric:6.8.0') + include modImplementation('net.kyori:adventure-text-minimessage:4.26.1') + include modImplementation('net.kyori:adventure-api:4.26.1') + include modImplementation('net.kyori:adventure-key:4.26.1') include modImplementation('org.apache.httpcomponents.client5:httpclient5:5.6') include modImplementation('org.apache.httpcomponents.core5:httpcore5:5.4') include modImplementation('org.apache.httpcomponents.core5:httpcore5-h2:5.4') diff --git a/fabric_1_21_11/src/main/java/com/coloryr/allmusic/server/AllMusicServer.java b/fabric_1_21_11/src/main/java/com/coloryr/allmusic/server/AllMusicServer.java index 3da617a8..9e8e8014 100644 --- a/fabric_1_21_11/src/main/java/com/coloryr/allmusic/server/AllMusicServer.java +++ b/fabric_1_21_11/src/main/java/com/coloryr/allmusic/server/AllMusicServer.java @@ -1,41 +1,34 @@ package com.coloryr.allmusic.server; +import com.coloryr.allmusic.server.core.AllMusic; import net.fabricmc.api.DedicatedServerModInitializer; import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback; import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents; -import net.minecraft.resources.Identifier; import net.minecraft.server.MinecraftServer; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import java.io.File; public class AllMusicServer implements DedicatedServerModInitializer { - public static final Logger LOGGER = LoggerFactory.getLogger("AllMusic Server"); - public static final Identifier ID = Identifier.fromNamespaceAndPath("allmusic", "channel"); public static final String dir = "allmusic_server/"; public static MinecraftServer server; @Override public void onInitializeServer() { - com.coloryr.allmusic.server.core.AllMusic.log = new LogFabric(); - com.coloryr.allmusic.server.core.AllMusic.side = new SideFabric(); - - new com.coloryr.allmusic.server.core.AllMusic().init(new File(dir)); + AllMusic.log = new LogFabric(); + AllMusic.side = new SideFabric(); CommandRegistrationCallback.EVENT.register((dispatcher, registryAccess, environment) -> CommandFabric.instance.register(dispatcher)); ServerLifecycleEvents.SERVER_STARTED.register((a) -> { server = a; - - com.coloryr.allmusic.server.core.AllMusic.start(); - + AllMusic.init(new File(dir)); + AllMusic.start(); Tasks.init(); }); ServerLifecycleEvents.SERVER_STOPPING.register((a) -> { - com.coloryr.allmusic.server.core.AllMusic.stop(); + AllMusic.stop(); }); } } diff --git a/fabric_1_21_11/src/main/java/com/coloryr/allmusic/server/FabricApi.java b/fabric_1_21_11/src/main/java/com/coloryr/allmusic/server/FabricApi.java deleted file mode 100644 index 2e6b89c5..00000000 --- a/fabric_1_21_11/src/main/java/com/coloryr/allmusic/server/FabricApi.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.coloryr.allmusic.server; - -import net.minecraft.commands.CommandSourceStack; -import net.minecraft.network.chat.ClickEvent; -import net.minecraft.network.chat.Component; -import net.minecraft.network.chat.MutableComponent; -import net.minecraft.network.protocol.game.ClientboundSetActionBarTextPacket; -import net.minecraft.server.level.ServerPlayer; - -public class FabricApi { - - public static void sendMessageRun(CommandSourceStack obj, String message, String end, String command) { - MutableComponent send = Component.literal(message); - var endText = Component.literal(end); - endText.setStyle(endText.getStyle().withClickEvent(new ClickEvent.RunCommand(command))); - send.append(endText); - obj.sendSystemMessage(send); - } - - public static void sendMessageSuggest(CommandSourceStack obj, String message, String end, String command) { - MutableComponent send = Component.literal(message); - var endText = Component.literal(end); - endText.setStyle(endText.getStyle().withClickEvent(new ClickEvent.SuggestCommand(command))); - send.append(endText); - obj.sendSystemMessage(send); - } - - public static void sendBar(ServerPlayer player, String message) { - var pack = new ClientboundSetActionBarTextPacket(Component.literal(message)); - player.connection.send(pack); - } - - public static void sendMessageBqRun(String message, String end, String command) { - MutableComponent send = Component.literal(message); - MutableComponent endText = Component.literal(end); - endText.setStyle(endText.getStyle().withClickEvent(new ClickEvent.SuggestCommand(command))); - send.append(endText); - for (var player : AllMusicServer.server.getPlayerList().getPlayers()) { - player.sendSystemMessage(send); - } - } -} diff --git a/fabric_1_21_11/src/main/java/com/coloryr/allmusic/server/LogFabric.java b/fabric_1_21_11/src/main/java/com/coloryr/allmusic/server/LogFabric.java index df6c69ed..e2885068 100644 --- a/fabric_1_21_11/src/main/java/com/coloryr/allmusic/server/LogFabric.java +++ b/fabric_1_21_11/src/main/java/com/coloryr/allmusic/server/LogFabric.java @@ -1,15 +1,11 @@ package com.coloryr.allmusic.server; -import com.coloryr.allmusic.server.core.side.IMyLogger; +import com.coloryr.allmusic.server.core.side.IAllMusicLogger; +import net.kyori.adventure.text.Component; -public class LogFabric implements IMyLogger { +public class LogFabric implements IAllMusicLogger { @Override - public void warning(String data) { - AllMusicServer.LOGGER.warn(data); - } - - @Override - public void info(String data) { - AllMusicServer.LOGGER.info(data); + public void data(Component data) { + AllMusicServer.server.sendMessage(data); } } diff --git a/fabric_1_21_11/src/main/java/com/coloryr/allmusic/server/SideFabric.java b/fabric_1_21_11/src/main/java/com/coloryr/allmusic/server/SideFabric.java index bb49763d..91722995 100644 --- a/fabric_1_21_11/src/main/java/com/coloryr/allmusic/server/SideFabric.java +++ b/fabric_1_21_11/src/main/java/com/coloryr/allmusic/server/SideFabric.java @@ -3,6 +3,7 @@ package com.coloryr.allmusic.server; import com.coloryr.allmusic.codec.CommandType; import com.coloryr.allmusic.codec.MusicPack; import com.coloryr.allmusic.comm.MusicCodec; +import com.coloryr.allmusic.server.core.AllMusic; import com.coloryr.allmusic.server.core.objs.music.PlayerAddMusicObj; import com.coloryr.allmusic.server.core.objs.music.SongInfoObj; import com.coloryr.allmusic.server.core.side.BaseSide; @@ -91,9 +92,9 @@ public class SideFabric extends BaseSide { } @Override - public void sendBar(Object player, String data) { + public void sendBar(Object player, net.kyori.adventure.text.Component data) { if (player instanceof ServerPlayer player1) { - FabricApi.sendBar(player1, data); + player1.sendActionBar(data); } } @@ -103,48 +104,19 @@ public class SideFabric extends BaseSide { } @Override - public void broadcast(String message) { - if (message == null || message.isEmpty()) { - return; - } + public void broadcast(net.kyori.adventure.text.Component message) { for (var player : AllMusicServer.server.getPlayerList().getPlayers()) { - if (!com.coloryr.allmusic.server.core.AllMusic.isSkip(player.getName().getString(), null, false)) { - player.sendSystemMessage(Component.literal(message), false); + if (!AllMusic.isSkip(player.getName().getString(), null, false)) { + player.sendMessage(message); } } } @Override - public void broadcastWithRun(String message, String end, String command) { - if (message == null || message.isEmpty()) { - return; + public void sendMessage(Object obj, net.kyori.adventure.text.Component message) { + if (obj instanceof CommandSourceStack source) { + source.sendMessage(message); } - FabricApi.sendMessageBqRun(message, end, command); - } - - @Override - public void sendMessage(Object obj, String message) { - if (message == null || message.isEmpty()) { - return; - } - CommandSourceStack source = (CommandSourceStack) obj; - source.sendSystemMessage(Component.literal(message)); - } - - @Override - public void sendMessageRun(Object obj, String message, String end, String command) { - if (message == null || message.isEmpty()) { - return; - } - FabricApi.sendMessageRun((CommandSourceStack) obj, message, end, command); - } - - @Override - public void sendMessageSuggest(Object obj, String message, String end, String command) { - if (message == null || message.isEmpty()) { - return; - } - FabricApi.sendMessageSuggest((CommandSourceStack) obj, message, end, command); } @Override @@ -161,11 +133,6 @@ public class SideFabric extends BaseSide { private void send(ServerPlayer players, MusicPack data) { if (players == null) return; - try { - runTask(() -> ServerPlayNetworking.send(players, new MusicCodec(data))); - } catch (Exception e) { - com.coloryr.allmusic.server.core.AllMusic.log.warning("§c数据发送发生错误"); - e.printStackTrace(); - } + runTask(() -> ServerPlayNetworking.send(players, new MusicCodec(data))); } } diff --git a/fabric_1_21_6/build.gradle b/fabric_1_21_6/build.gradle index 66485304..2dbf476c 100644 --- a/fabric_1_21_6/build.gradle +++ b/fabric_1_21_6/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'fabric-loom' version '1.10-SNAPSHOT' + id 'fabric-loom' version '1.11-SNAPSHOT' id 'maven-publish' // id "org.jetbrains.kotlin.jvm" version "2.1.0" } @@ -38,7 +38,11 @@ dependencies { // Fabric API. This is technically optional, but you probably want it anyway. modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" modImplementation "net.fabricmc:fabric-language-kotlin:${project.fabric_kotlin_version}" + modImplementation include('net.kyori:adventure-platform-fabric:6.6.0') + include modImplementation('net.kyori:adventure-text-minimessage:4.26.1') + include modImplementation('net.kyori:adventure-api:4.26.1') + include modImplementation('net.kyori:adventure-key:4.26.1') include modImplementation('org.apache.httpcomponents.client5:httpclient5:5.6') include modImplementation('org.apache.httpcomponents.core5:httpcore5:5.4') include modImplementation('org.apache.httpcomponents.core5:httpcore5-h2:5.4') diff --git a/fabric_1_21_6/gradle/wrapper/gradle-wrapper.properties b/fabric_1_21_6/gradle/wrapper/gradle-wrapper.properties index e18bc253..ca025c83 100644 --- a/fabric_1_21_6/gradle/wrapper/gradle-wrapper.properties +++ b/fabric_1_21_6/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/fabric_1_21_6/src/main/java/com/coloryr/allmusic/server/AllMusicServer.java b/fabric_1_21_6/src/main/java/com/coloryr/allmusic/server/AllMusicServer.java index 64d92d4d..adb6f294 100644 --- a/fabric_1_21_6/src/main/java/com/coloryr/allmusic/server/AllMusicServer.java +++ b/fabric_1_21_6/src/main/java/com/coloryr/allmusic/server/AllMusicServer.java @@ -1,5 +1,6 @@ package com.coloryr.allmusic.server; +import com.coloryr.allmusic.server.core.AllMusic; import net.fabricmc.api.DedicatedServerModInitializer; import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback; import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents; @@ -10,28 +11,26 @@ import org.slf4j.LoggerFactory; import java.io.File; public class AllMusicServer implements DedicatedServerModInitializer { - public static final Logger LOGGER = LoggerFactory.getLogger("AllMusic Server"); public static final String dir = "allmusic_server/"; public static MinecraftServer server; @Override public void onInitializeServer() { - com.coloryr.allmusic.server.core.AllMusic.log = new LogFabric(); - com.coloryr.allmusic.server.core.AllMusic.side = new SideFabric(); - - new com.coloryr.allmusic.server.core.AllMusic().init(new File(dir)); + AllMusic.log = new LogFabric(); + AllMusic.side = new SideFabric(); CommandRegistrationCallback.EVENT.register((dispatcher, registryAccess, environment) -> CommandFabric.instance.register(dispatcher)); ServerLifecycleEvents.SERVER_STARTED.register((a) -> { server = a; - com.coloryr.allmusic.server.core.AllMusic.start(); + AllMusic.init(new File(dir)); + AllMusic.start(); Tasks.init(); }); ServerLifecycleEvents.SERVER_STOPPING.register((a) -> { - com.coloryr.allmusic.server.core.AllMusic.stop(); + AllMusic.stop(); }); } } diff --git a/fabric_1_21_6/src/main/java/com/coloryr/allmusic/server/FabricApi.java b/fabric_1_21_6/src/main/java/com/coloryr/allmusic/server/FabricApi.java deleted file mode 100644 index f0c8d580..00000000 --- a/fabric_1_21_6/src/main/java/com/coloryr/allmusic/server/FabricApi.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.coloryr.allmusic.server; - -import net.minecraft.network.packet.s2c.play.OverlayMessageS2CPacket; -import net.minecraft.server.command.ServerCommandSource; -import net.minecraft.server.network.ServerPlayerEntity; -import net.minecraft.text.ClickEvent; -import net.minecraft.text.MutableText; -import net.minecraft.text.Text; - -public class FabricApi { - - public static void sendMessageRun(ServerCommandSource obj, String message, String end, String command) { - MutableText send = Text.literal(message); - var endText = Text.literal(end); - endText.setStyle(endText.getStyle().withClickEvent(new ClickEvent.RunCommand(command))); - send.append(endText); - obj.sendMessage(send); - } - - public static void sendMessageSuggest(ServerCommandSource obj, String message, String end, String command) { - MutableText send = Text.literal(message); - var endText = Text.literal(end); - endText.setStyle(endText.getStyle().withClickEvent(new ClickEvent.SuggestCommand(command))); - send.append(endText); - obj.sendMessage(send); - } - - public static void sendBar(ServerPlayerEntity player, String message) { - var pack = new OverlayMessageS2CPacket(Text.literal(message)); - player.networkHandler.sendPacket(pack); - } - - public static void sendMessageBqRun(String message, String end, String command) { - MutableText send = Text.literal(message); - MutableText endText = Text.literal(end); - endText.setStyle(endText.getStyle().withClickEvent(new ClickEvent.SuggestCommand(command))); - send.append(endText); - for (var player : AllMusicServer.server.getPlayerManager().getPlayerList()) { - player.sendMessage(send, false); - } - } -} diff --git a/fabric_1_21_6/src/main/java/com/coloryr/allmusic/server/LogFabric.java b/fabric_1_21_6/src/main/java/com/coloryr/allmusic/server/LogFabric.java index df6c69ed..e2885068 100644 --- a/fabric_1_21_6/src/main/java/com/coloryr/allmusic/server/LogFabric.java +++ b/fabric_1_21_6/src/main/java/com/coloryr/allmusic/server/LogFabric.java @@ -1,15 +1,11 @@ package com.coloryr.allmusic.server; -import com.coloryr.allmusic.server.core.side.IMyLogger; +import com.coloryr.allmusic.server.core.side.IAllMusicLogger; +import net.kyori.adventure.text.Component; -public class LogFabric implements IMyLogger { +public class LogFabric implements IAllMusicLogger { @Override - public void warning(String data) { - AllMusicServer.LOGGER.warn(data); - } - - @Override - public void info(String data) { - AllMusicServer.LOGGER.info(data); + public void data(Component data) { + AllMusicServer.server.sendMessage(data); } } diff --git a/fabric_1_21_6/src/main/java/com/coloryr/allmusic/server/SideFabric.java b/fabric_1_21_6/src/main/java/com/coloryr/allmusic/server/SideFabric.java index 26920f1c..3c51112a 100644 --- a/fabric_1_21_6/src/main/java/com/coloryr/allmusic/server/SideFabric.java +++ b/fabric_1_21_6/src/main/java/com/coloryr/allmusic/server/SideFabric.java @@ -3,12 +3,14 @@ package com.coloryr.allmusic.server; import com.coloryr.allmusic.codec.CommandType; import com.coloryr.allmusic.codec.MusicPack; import com.coloryr.allmusic.comm.MusicCodec; +import com.coloryr.allmusic.server.core.AllMusic; import com.coloryr.allmusic.server.core.objs.music.PlayerAddMusicObj; import com.coloryr.allmusic.server.core.objs.music.SongInfoObj; import com.coloryr.allmusic.server.core.side.BaseSide; import com.coloryr.allmusic.server.event.MusicAddEvent; import com.coloryr.allmusic.server.event.MusicPlayEvent; import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking; +import net.kyori.adventure.text.Component; import net.minecraft.server.command.ServerCommandSource; import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.text.Text; @@ -90,9 +92,9 @@ public class SideFabric extends BaseSide { } @Override - public void sendBar(Object player, String data) { + public void sendBar(Object player, Component data) { if (player instanceof ServerPlayerEntity player1) { - FabricApi.sendBar(player1, data); + player1.sendActionBar(data); } } @@ -102,48 +104,19 @@ public class SideFabric extends BaseSide { } @Override - public void broadcast(String message) { - if (message == null || message.isEmpty()) { - return; - } + public void broadcast(Component message) { for (var player : AllMusicServer.server.getPlayerManager().getPlayerList()) { - if (!com.coloryr.allmusic.server.core.AllMusic.isSkip(player.getName().getString(), null, false)) { - player.sendMessage(Text.of(message), false); + if (!AllMusic.isSkip(player.getName().getString(), null, false)) { + player.sendMessage(message); } } } @Override - public void broadcastWithRun(String message, String end, String command) { - if (message == null || message.isEmpty()) { - return; + public void sendMessage(Object obj, Component message) { + if (obj instanceof ServerCommandSource source) { + source.sendMessage(message); } - FabricApi.sendMessageBqRun(message, end, command); - } - - @Override - public void sendMessage(Object obj, String message) { - if (message == null || message.isEmpty()) { - return; - } - ServerCommandSource source = (ServerCommandSource) obj; - source.sendMessage(Text.of(message)); - } - - @Override - public void sendMessageRun(Object obj, String message, String end, String command) { - if (message == null || message.isEmpty()) { - return; - } - FabricApi.sendMessageRun((ServerCommandSource) obj, message, end, command); - } - - @Override - public void sendMessageSuggest(Object obj, String message, String end, String command) { - if (message == null || message.isEmpty()) { - return; - } - FabricApi.sendMessageSuggest((ServerCommandSource) obj, message, end, command); } @Override @@ -160,11 +133,6 @@ public class SideFabric extends BaseSide { private void send(ServerPlayerEntity players, MusicPack data) { if (players == null) return; - try { - runTask(() -> ServerPlayNetworking.send(players, new MusicCodec(data))); - } catch (Exception e) { - com.coloryr.allmusic.server.core.AllMusic.log.warning("§c数据发送发生错误"); - e.printStackTrace(); - } + runTask(() -> ServerPlayNetworking.send(players, new MusicCodec(data))); } } diff --git a/folia/build.gradle b/folia/build.gradle index 87491a23..573ddbbe 100644 --- a/folia/build.gradle +++ b/folia/build.gradle @@ -51,6 +51,7 @@ dependencies { compileOnly 'dev.folia:folia-api:1.21.6-R0.1-SNAPSHOT' compileOnly "com.github.MilkBowl:VaultAPI:1.7.1" compileOnly 'me.clip:placeholderapi:2.11.7' + compileOnly 'net.kyori:adventure-text-minimessage:4.26.1' implementation 'com.google.code.gson:gson:2.10.1' implementation 'org.apache.httpcomponents.client5:httpclient5:5.6' diff --git a/folia/src/main/java/com/coloryr/allmusic/server/AllMusicFolia.java b/folia/src/main/java/com/coloryr/allmusic/server/AllMusicFolia.java index a77b9666..8dfd68fc 100644 --- a/folia/src/main/java/com/coloryr/allmusic/server/AllMusicFolia.java +++ b/folia/src/main/java/com/coloryr/allmusic/server/AllMusicFolia.java @@ -14,67 +14,56 @@ import org.bukkit.plugin.java.JavaPlugin; public class AllMusicFolia extends JavaPlugin { public static Plugin plugin; public static AllMusicPAPI PAPI; - public static boolean spigotSet; private static PluginMessage pluginMessage; @Override public void onEnable() { plugin = this; - AllMusic.log = new LogFolia(getLogger()); + AllMusic.log = new LogFolia(); AllMusic.side = new SideFolia(); - try { - Class.forName("net.md_5.bungee.api.chat.BaseComponent"); - Class test = Class.forName("org.bukkit.command.CommandSender"); - test.getMethod("spigot"); - AllMusic.log.info("§2Spigot已支持"); - spigotSet = true; - } catch (Exception e) { - AllMusic.log.info("§2Spigot不支持"); - } - - new AllMusic().init(plugin.getDataFolder()); + AllMusic.init(plugin.getDataFolder()); if (!AllMusic.isRun) { Bukkit.getPluginManager().disablePlugin(this); return; } - if (Bukkit.getPluginManager().getPlugin("PlaceholderAPI") != null) { - PAPI = new AllMusicPAPI(this); - if (!PAPI.register()) { - AllMusic.log.info("§2PAPI支持已启动"); - } - } else { - AllMusic.log.info("§2PAPI未挂钩"); - } - if (Bukkit.getPluginManager().getPlugin("Vault") != null && AllMusic.getConfig().economy.vault) { try { VaultHook vault = new VaultHook(); AllMusic.economy = vault; if (vault.setupEconomy()) { - AllMusic.log.info("§2Vault支持已启动"); + AllMusic.log.data("[AllMusic3]Vault支持已启动"); } else { - AllMusic.log.info("§2Vault未挂钩"); + AllMusic.log.data("[AllMusic3]Vault未挂钩"); AllMusic.economy = null; } } catch (Exception e) { - AllMusic.log.info("§2Vault未挂钩"); + AllMusic.log.data("[AllMusic3]Vault未挂钩"); AllMusic.economy = null; } } else { - AllMusic.log.info("§2Vault未挂钩"); + AllMusic.log.data("[AllMusic3]Vault未挂钩"); AllMusic.economy = null; } + if (Bukkit.getPluginManager().getPlugin("PlaceholderAPI") != null) { + PAPI = new AllMusicPAPI(this); + if (!PAPI.register()) { + AllMusic.log.data("[AllMusic3]PAPI支持已启动"); + } + } else { + AllMusic.log.data("[AllMusic3]PAPI未挂钩"); + } + if (AllMusic.getConfig().topPAPI) { PlayMusic.nowPlayMusic = new TopSongInfoObj(); PlayMusic.lyric = new TopLyricSave(); pluginMessage = new PluginMessage(); getServer().getMessenger().registerOutgoingPluginChannel(this, AllMusic.channelBC); getServer().getMessenger().registerIncomingPluginChannel(this, AllMusic.channelBC, pluginMessage); - AllMusic.log.info("§2设置为顶层模式"); + AllMusic.log.data("[AllMusic3]设置为顶层模式"); } else { CommandFolia command = new CommandFolia(); getServer().getMessenger().registerOutgoingPluginChannel(this, AllMusic.channel); diff --git a/folia/src/main/java/com/coloryr/allmusic/server/LogFolia.java b/folia/src/main/java/com/coloryr/allmusic/server/LogFolia.java index e4fe89ba..267a46c2 100644 --- a/folia/src/main/java/com/coloryr/allmusic/server/LogFolia.java +++ b/folia/src/main/java/com/coloryr/allmusic/server/LogFolia.java @@ -1,23 +1,14 @@ package com.coloryr.allmusic.server; -import com.coloryr.allmusic.server.core.side.IMyLogger; +import com.coloryr.allmusic.server.core.side.IAllMusicLogger; +import net.kyori.adventure.text.Component; +import org.bukkit.Bukkit; import java.util.logging.Logger; -public class LogFolia implements IMyLogger { - private final Logger Logger; - - public LogFolia(Logger Logger) { - this.Logger = Logger; - } - +public class LogFolia implements IAllMusicLogger { @Override - public void warning(String data) { - Logger.warning(data); - } - - @Override - public void info(String data) { - Logger.info(data); + public void data(Component data) { + Bukkit.getConsoleSender().sendMessage(data); } } diff --git a/folia/src/main/java/com/coloryr/allmusic/server/SideFolia.java b/folia/src/main/java/com/coloryr/allmusic/server/SideFolia.java index 21d8f38e..a4b14c00 100644 --- a/folia/src/main/java/com/coloryr/allmusic/server/SideFolia.java +++ b/folia/src/main/java/com/coloryr/allmusic/server/SideFolia.java @@ -3,14 +3,13 @@ package com.coloryr.allmusic.server; import com.coloryr.allmusic.buffercodec.MusicPacketCodec; import com.coloryr.allmusic.codec.CommandType; import com.coloryr.allmusic.server.core.AllMusic; -import com.coloryr.allmusic.server.core.objs.music.MusicObj; import com.coloryr.allmusic.server.core.objs.music.PlayerAddMusicObj; import com.coloryr.allmusic.server.core.objs.music.SongInfoObj; import com.coloryr.allmusic.server.core.side.BaseSide; import com.coloryr.allmusic.server.event.MusicAddEvent; import com.coloryr.allmusic.server.event.MusicPlayEvent; import com.coloryr.allmusic.server.hooks.CitizensNPC; -import com.coloryr.allmusic.server.hooks.SpigotApi; +import net.kyori.adventure.text.Component; import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; import org.bukkit.command.ConsoleCommandSender; @@ -41,13 +40,9 @@ public class SideFolia extends BaseSide { } @Override - public void sendBar(Object player, String data) { + public void sendBar(Object player, Component data) { if (player instanceof Player player1) { - if (AllMusicFolia.spigotSet) { - SpigotApi.sendBar(player1, data); - } else { - sendMessage(player1, data); - } + player1.sendActionBar(data); } } @@ -57,10 +52,7 @@ public class SideFolia extends BaseSide { } @Override - public void broadcast(String message) { - if (message == null || message.isEmpty()) { - return; - } + public void broadcast(Component message) { for (Player player : Bukkit.getOnlinePlayers()) { if (!AllMusic.isSkip(player.getName(), null, false)) { player.sendMessage(message); @@ -68,16 +60,6 @@ public class SideFolia extends BaseSide { } } - @Override - public void broadcastWithRun(String message, String end, String command) { - if (message == null || message.isEmpty()) { - return; - } - for (Player player : Bukkit.getOnlinePlayers()) { - SpigotApi.sendMessageBqRun(player, message, end, command); - } - } - @Override public boolean needPlay(boolean islist) { int online = AllMusic.side.getPlayers().size(); @@ -92,37 +74,9 @@ public class SideFolia extends BaseSide { } @Override - public void sendMessage(Object obj, String message) { - if (message == null || message.isEmpty()) { - return; - } - CommandSender sender = (CommandSender) obj; - sender.sendMessage(message); - } - - @Override - public void sendMessageRun(Object obj, String message, String end, String command) { - if (message == null || message.isEmpty()) { - return; - } - if (AllMusicFolia.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 (message == null || message.isEmpty()) { - return; - } - if (AllMusicFolia.spigotSet) { - SpigotApi.sendMessageSuggest(obj, message, end, command); - } else { - if (!message.isEmpty()) - sendMessage(obj, message); + public void sendMessage(Object obj, Component message) { + if(obj instanceof CommandSender sender) { + sender.sendMessage(message); } } @@ -191,13 +145,8 @@ public class SideFolia extends BaseSide { @Override public void send(Object player, CommandType type, String data, int data1) { if (AllMusic.isRun && player instanceof Player player1) { - try { - runTask(() -> - player1.sendPluginMessage(AllMusicFolia.plugin, AllMusic.channel, MusicPacketCodec.pack(type, data, data1).array())); - } catch (Exception e) { - AllMusic.log.warning("§c数据发送发生错误"); - e.printStackTrace(); - } + runTask(() -> player1.sendPluginMessage(AllMusicFolia.plugin, AllMusic.channel, + MusicPacketCodec.pack(type, data, data1).array())); } } diff --git a/folia/src/main/java/com/coloryr/allmusic/server/hooks/AllMusicPAPI.java b/folia/src/main/java/com/coloryr/allmusic/server/hooks/AllMusicPAPI.java index 7b173c6c..16532c45 100644 --- a/folia/src/main/java/com/coloryr/allmusic/server/hooks/AllMusicPAPI.java +++ b/folia/src/main/java/com/coloryr/allmusic/server/hooks/AllMusicPAPI.java @@ -29,7 +29,7 @@ public class AllMusicPAPI extends PlaceholderExpansion { @Override public boolean register() { - AllMusic.log.info("§e正在挂钩PlaceholderAPI"); + AllMusic.log.data("[AllMusic3]正在挂钩PlaceholderAPI"); return super.register(); } diff --git a/folia/src/main/java/com/coloryr/allmusic/server/hooks/SpigotApi.java b/folia/src/main/java/com/coloryr/allmusic/server/hooks/SpigotApi.java deleted file mode 100644 index ad12329c..00000000 --- a/folia/src/main/java/com/coloryr/allmusic/server/hooks/SpigotApi.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.coloryr.allmusic.server.hooks; - -import net.md_5.bungee.api.ChatMessageType; -import net.md_5.bungee.api.chat.ClickEvent; -import net.md_5.bungee.api.chat.TextComponent; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; - -public class SpigotApi { - public static void sendMessageRun(Object obj, String message, String end, String command) { - CommandSender sender = (CommandSender) obj; - TextComponent send = new TextComponent(message); - TextComponent endtext = new TextComponent(end); - endtext.setClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, command)); - send.addExtra(endtext); - sender.spigot().sendMessage(send); - } - - public static void sendMessageSuggest(Object obj, String message, String end, String command) { - CommandSender sender = (CommandSender) obj; - TextComponent send = new TextComponent(message); - TextComponent endtext = new TextComponent(end); - endtext.setClickEvent(new ClickEvent(ClickEvent.Action.SUGGEST_COMMAND, command)); - send.addExtra(endtext); - sender.spigot().sendMessage(send); - } - - public static void sendBar(Player player, String message) { - player.spigot().sendMessage(ChatMessageType.ACTION_BAR, new TextComponent(message)); - } - - public static void sendMessageBqRun(Player player, String message, String end, String command) { - TextComponent send = new TextComponent(message); - TextComponent endtext = new TextComponent(end); - endtext.setClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, command)); - send.addExtra(endtext); - player.spigot().sendMessage(send); - } -} diff --git a/neoforge_1_21/build.gradle b/neoforge_1_21/build.gradle index 1f780368..f2f98d43 100644 --- a/neoforge_1_21/build.gradle +++ b/neoforge_1_21/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java-library' id 'maven-publish' - id 'net.neoforged.gradle.userdev' version '7.0.184' + id 'net.neoforged.gradle.userdev' version '7.1.20' } tasks.named('wrapper', Wrapper).configure { @@ -28,6 +28,8 @@ group = mod_group_id repositories { mavenLocal() + + mavenCentral() } base { @@ -118,7 +120,13 @@ dependencies { implementation('org.apache.httpcomponents.client5:httpclient5:5.6') implementation('org.xerial:sqlite-jdbc:3.51.1.0') + implementation('net.kyori:adventure-platform-mod-shared:6.0.0') + implementation('net.kyori:adventure-text-minimessage:4.26.1') + jarJar(group: 'net.kyori', name: 'adventure-platform-mod-shared', version: '[6.0,6.1)') + jarJar(group: 'net.kyori', name: 'adventure-text-minimessage', version: '[4.26.1,4.27)') + jarJar(group: 'net.kyori', name: 'net.kyori:adventure-api', version: '[4.26.1,4.27)') + jarJar(group: 'net.kyori', name: 'net.kyori:adventure-key', version: '[4.26.1,4.27)') jarJar(group: 'org.apache.httpcomponents.client5', name: 'httpclient5', version: '[5.6,6.0)') jarJar(group: 'org.apache.httpcomponents.core5', name: 'httpcore5', version: '[5.4,6.0)') jarJar(group: 'org.apache.httpcomponents.core5', name: 'httpcore5-h2', version: '[5.4,6.0)') diff --git a/neoforge_1_21/gradle.properties b/neoforge_1_21/gradle.properties index 4b25f998..a07991e5 100644 --- a/neoforge_1_21/gradle.properties +++ b/neoforge_1_21/gradle.properties @@ -1,7 +1,9 @@ # Sets default memory used for gradle commands. Can be overridden by user or command line properties. org.gradle.jvmargs=-Xmx1G -org.gradle.daemon=false -org.gradle.debug=false +org.gradle.daemon=true +org.gradle.parallel=true +org.gradle.caching=true +org.gradle.configuration-cache=true #read more on this at https://github.com/neoforged/NeoGradle/blob/NG_7.0/README.md#apply-parchment-mappings # you can also find the latest versions at: https://parchmentmc.org/docs/getting-started diff --git a/neoforge_1_21/gradle/wrapper/gradle-wrapper.properties b/neoforge_1_21/gradle/wrapper/gradle-wrapper.properties index adda1f21..d205b54b 100644 --- a/neoforge_1_21/gradle/wrapper/gradle-wrapper.properties +++ b/neoforge_1_21/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/neoforge_1_21/src/main/java/com/coloryr/allmusic/server/AllMusicServer.java b/neoforge_1_21/src/main/java/com/coloryr/allmusic/server/AllMusicServer.java index fa21d41a..a14b9600 100644 --- a/neoforge_1_21/src/main/java/com/coloryr/allmusic/server/AllMusicServer.java +++ b/neoforge_1_21/src/main/java/com/coloryr/allmusic/server/AllMusicServer.java @@ -3,6 +3,7 @@ package com.coloryr.allmusic.server; import com.coloryr.allmusic.comm.AllMusicInit; import com.coloryr.allmusic.server.core.AllMusic; import com.mojang.brigadier.CommandDispatcher; +import net.kyori.adventure.platform.modcommon.MinecraftServerAudiences; import net.minecraft.commands.CommandSourceStack; import net.minecraft.server.MinecraftServer; import net.neoforged.api.distmarker.Dist; @@ -23,14 +24,13 @@ public class AllMusicServer { public static final Logger LOGGER = LoggerFactory.getLogger("AllMusic Server"); public static MinecraftServer server; + public static MinecraftServerAudiences audiences; public static final String dir = "config/allmusic_server/"; @SubscribeEvent public static void commonSetup(final FMLCommonSetupEvent event) { AllMusic.log = new LogForge(); AllMusic.side = new SideNeoForge(); - - new AllMusic().init(new File(dir)); } @EventBusSubscriber(modid = AllMusicInit.MODID, value = Dist.DEDICATED_SERVER) @@ -45,7 +45,8 @@ public class AllMusicServer { @SubscribeEvent public static void onServerStarting(ServerStartedEvent event) { server = event.getServer(); - + audiences = MinecraftServerAudiences.of(server); + new AllMusic().init(new File(dir)); AllMusic.start(); Tasks.init(); } diff --git a/neoforge_1_21/src/main/java/com/coloryr/allmusic/server/LogForge.java b/neoforge_1_21/src/main/java/com/coloryr/allmusic/server/LogForge.java index fa1d0461..f074711b 100644 --- a/neoforge_1_21/src/main/java/com/coloryr/allmusic/server/LogForge.java +++ b/neoforge_1_21/src/main/java/com/coloryr/allmusic/server/LogForge.java @@ -1,15 +1,11 @@ package com.coloryr.allmusic.server; -import com.coloryr.allmusic.server.core.side.IMyLogger; +import com.coloryr.allmusic.server.core.side.IAllMusicLogger; +import net.kyori.adventure.text.Component; -public class LogForge implements IMyLogger { +public class LogForge implements IAllMusicLogger { @Override - public void warning(String data) { - AllMusicServer.LOGGER.warn(data); - } - - @Override - public void info(String data) { - AllMusicServer.LOGGER.info(data); + public void data(Component data) { + AllMusicServer.audiences.console().sendMessage(data); } } diff --git a/neoforge_1_21/src/main/java/com/coloryr/allmusic/server/NeoForgeApi.java b/neoforge_1_21/src/main/java/com/coloryr/allmusic/server/NeoForgeApi.java deleted file mode 100644 index 53beca41..00000000 --- a/neoforge_1_21/src/main/java/com/coloryr/allmusic/server/NeoForgeApi.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.coloryr.allmusic.server; - -import net.minecraft.commands.CommandSourceStack; -import net.minecraft.network.chat.ClickEvent; -import net.minecraft.network.chat.Component; -import net.minecraft.network.chat.MutableComponent; -import net.minecraft.network.protocol.game.ClientboundSetActionBarTextPacket; -import net.minecraft.server.level.ServerPlayer; - -public class NeoForgeApi { - public static void sendMessageRun(CommandSourceStack obj, String message, String end, String command) { - MutableComponent send = Component.literal(message); - MutableComponent endtext = Component.literal(end); - endtext.setStyle(endtext.getStyle().withClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, command))); - send.append(endtext); - obj.sendSystemMessage(send); - } - - public static void sendMessageSuggest(CommandSourceStack obj, String message, String end, String command) { - MutableComponent send = Component.literal(message); - MutableComponent endtext = Component.literal(end); - endtext.setStyle(endtext.getStyle().withClickEvent(new ClickEvent(ClickEvent.Action.SUGGEST_COMMAND, command))); - send.append(endtext); - obj.sendSystemMessage(send); - } - - public static void sendBar(ServerPlayer player, String message) { - var pack = new ClientboundSetActionBarTextPacket(Component.literal(message)); - player.connection.send(pack); - } - - public static void sendMessageBqRun(String message, String end, String command) { - MutableComponent send = Component.literal(message); - MutableComponent endtext = Component.literal(end); - endtext.setStyle(endtext.getStyle().withClickEvent(new ClickEvent(ClickEvent.Action.SUGGEST_COMMAND, command))); - send.append(endtext); - for (ServerPlayer player : AllMusicServer.server.getPlayerList().getPlayers()) { - player.sendSystemMessage(send); - } - } -} diff --git a/neoforge_1_21/src/main/java/com/coloryr/allmusic/server/SideNeoForge.java b/neoforge_1_21/src/main/java/com/coloryr/allmusic/server/SideNeoForge.java index 99e67f43..51634013 100644 --- a/neoforge_1_21/src/main/java/com/coloryr/allmusic/server/SideNeoForge.java +++ b/neoforge_1_21/src/main/java/com/coloryr/allmusic/server/SideNeoForge.java @@ -9,8 +9,8 @@ import com.coloryr.allmusic.server.core.objs.music.SongInfoObj; import com.coloryr.allmusic.server.core.side.BaseSide; import com.coloryr.allmusic.server.event.MusicAddEvent; import com.coloryr.allmusic.server.event.MusicPlayEvent; +import net.kyori.adventure.text.Component; import net.minecraft.commands.CommandSourceStack; -import net.minecraft.network.chat.Component; import net.minecraft.server.level.ServerPlayer; import net.neoforged.neoforge.common.NeoForge; import net.neoforged.neoforge.network.PacketDistributor; @@ -91,9 +91,9 @@ public class SideNeoForge extends BaseSide { } @Override - public void sendBar(Object player, String data) { + public void sendBar(Object player, Component data) { if (player instanceof ServerPlayer player1) { - NeoForgeApi.sendBar(player1, data); + AllMusicServer.audiences.audience(player1).sendActionBar(data); } } @@ -103,48 +103,19 @@ public class SideNeoForge extends BaseSide { } @Override - public void broadcast(String message) { - if (message == null || message.isEmpty()) { - return; - } + public void broadcast(Component message) { for (ServerPlayer player : AllMusicServer.server.getPlayerList().getPlayers()) { if (!AllMusic.isSkip(player.getName().getString(), null, false)) { - player.sendSystemMessage(Component.literal(message)); + AllMusicServer.audiences.audience(player).sendMessage(message); } } } @Override - public void broadcastWithRun(String message, String end, String command) { - if (message == null || message.isEmpty()) { - return; + public void sendMessage(Object obj, Component message) { + if (obj instanceof CommandSourceStack source) { + AllMusicServer.audiences.audience(source).sendMessage(message); } - NeoForgeApi.sendMessageBqRun(message, end, command); - } - - @Override - public void sendMessage(Object obj, String message) { - if (message == null || message.isEmpty()) { - return; - } - CommandSourceStack source = (CommandSourceStack) obj; - source.sendSystemMessage(Component.literal(message)); - } - - @Override - public void sendMessageRun(Object obj, String message, String end, String command) { - if (message == null || message.isEmpty()) { - return; - } - NeoForgeApi.sendMessageRun((CommandSourceStack) obj, message, end, command); - } - - @Override - public void sendMessageSuggest(Object obj, String message, String end, String command) { - if (message == null || message.isEmpty()) { - return; - } - NeoForgeApi.sendMessageSuggest((CommandSourceStack) obj, message, end, command); } @Override @@ -168,7 +139,7 @@ public class SideNeoForge extends BaseSide { try { runTask(() -> PacketDistributor.sendToPlayer(players, new MusicCodec(data))); } catch (Exception e) { - AllMusic.log.warning("§c数据发送发生错误"); + AllMusic.log.data("数据发送发生错误"); e.printStackTrace(); } } diff --git a/neoforge_1_21_11/build.gradle b/neoforge_1_21_11/build.gradle index e13f249e..1af4e76e 100644 --- a/neoforge_1_21_11/build.gradle +++ b/neoforge_1_21_11/build.gradle @@ -31,6 +31,8 @@ group = mod_group_id repositories { mavenLocal() + + mavenCentral() } base { @@ -133,7 +135,13 @@ dependencies { implementation('org.apache.httpcomponents.client5:httpclient5:5.6') implementation('org.xerial:sqlite-jdbc:3.51.1.0') + compileOnly('net.kyori:adventure-platform-mod-shared:6.8.0') + compileOnly('net.kyori:adventure-text-minimessage:4.26.1') + jarJar(group: 'net.kyori', name: 'adventure-platform-mod-shared', version: '[6.0,6.1)') + jarJar(group: 'net.kyori', name: 'adventure-text-minimessage', version: '[4.26.1,4.27)') + jarJar(group: 'net.kyori', name: 'net.kyori:adventure-api', version: '[4.26.1,4.27)') + jarJar(group: 'net.kyori', name: 'net.kyori:adventure-key', version: '[4.26.1,4.27)') jarJar(group: 'org.apache.httpcomponents.client5', name: 'httpclient5', version: '[5.6,6.0)') jarJar(group: 'org.apache.httpcomponents.core5', name: 'httpcore5', version: '[5.4,6.0)') jarJar(group: 'org.apache.httpcomponents.core5', name: 'httpcore5-h2', version: '[5.4,6.0)') diff --git a/neoforge_1_21_11/src/main/java/com/coloryr/allmusic/server/AllMusicServer.java b/neoforge_1_21_11/src/main/java/com/coloryr/allmusic/server/AllMusicServer.java index 6f7c154c..7ef23749 100644 --- a/neoforge_1_21_11/src/main/java/com/coloryr/allmusic/server/AllMusicServer.java +++ b/neoforge_1_21_11/src/main/java/com/coloryr/allmusic/server/AllMusicServer.java @@ -3,6 +3,8 @@ package com.coloryr.allmusic.server; import com.coloryr.allmusic.comm.AllMusicInit; import com.coloryr.allmusic.server.core.AllMusic; import com.mojang.brigadier.CommandDispatcher; +import net.kyori.adventure.platform.modcommon.MinecraftAudiences; +import net.kyori.adventure.platform.modcommon.MinecraftServerAudiences; import net.minecraft.commands.CommandSourceStack; import net.minecraft.server.MinecraftServer; import net.neoforged.api.distmarker.Dist; @@ -23,13 +25,12 @@ public class AllMusicServer { public static final Logger LOGGER = LoggerFactory.getLogger("AllMusic Server"); public static final String dir = "config/allmusic_server/"; public static MinecraftServer server; + public static MinecraftServerAudiences audiences; @SubscribeEvent public static void commonSetup(final FMLCommonSetupEvent event) { AllMusic.log = new LogNeoForge(); AllMusic.side = new SideNeoForge(); - - new AllMusic().init(new File(dir)); } @SubscribeEvent @@ -41,8 +42,9 @@ public class AllMusicServer { @SubscribeEvent public static void onServerStarting(ServerStartedEvent event) { + audiences = MinecraftServerAudiences.of(event.getServer()); server = event.getServer(); - + new AllMusic().init(new File(dir)); AllMusic.start(); Tasks.init(); } diff --git a/neoforge_1_21_11/src/main/java/com/coloryr/allmusic/server/LogNeoForge.java b/neoforge_1_21_11/src/main/java/com/coloryr/allmusic/server/LogNeoForge.java index a44af856..ff5be1f7 100644 --- a/neoforge_1_21_11/src/main/java/com/coloryr/allmusic/server/LogNeoForge.java +++ b/neoforge_1_21_11/src/main/java/com/coloryr/allmusic/server/LogNeoForge.java @@ -1,15 +1,16 @@ package com.coloryr.allmusic.server; -import com.coloryr.allmusic.server.core.side.IMyLogger; +import com.coloryr.allmusic.server.core.AllMusic; +import com.coloryr.allmusic.server.core.side.IAllMusicLogger; -public class LogNeoForge implements IMyLogger { +public class LogNeoForge implements IAllMusicLogger { @Override public void warning(String data) { - AllMusicServer.LOGGER.warn(data); + AllMusicServer.audiences.console().sendMessage(AllMusic.miniMessage(data)); } @Override public void info(String data) { - AllMusicServer.LOGGER.info(data); + AllMusicServer.audiences.console().sendMessage(AllMusic.miniMessage(data)); } } diff --git a/neoforge_1_21_11/src/main/java/com/coloryr/allmusic/server/NeoForgeApi.java b/neoforge_1_21_11/src/main/java/com/coloryr/allmusic/server/NeoForgeApi.java deleted file mode 100644 index 596e4efc..00000000 --- a/neoforge_1_21_11/src/main/java/com/coloryr/allmusic/server/NeoForgeApi.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.coloryr.allmusic.server; - -import net.minecraft.commands.CommandSourceStack; -import net.minecraft.network.chat.ClickEvent; -import net.minecraft.network.chat.Component; -import net.minecraft.network.chat.MutableComponent; -import net.minecraft.network.protocol.game.ClientboundSetActionBarTextPacket; -import net.minecraft.server.level.ServerPlayer; - -public class NeoForgeApi { - public static void sendMessageRun(CommandSourceStack obj, String message, String end, String command) { - MutableComponent send = Component.literal(message); - MutableComponent endtext = Component.literal(end); - endtext.setStyle(endtext.getStyle().withClickEvent(new ClickEvent.RunCommand(command))); - send.append(endtext); - obj.sendSystemMessage(send); - } - - public static void sendMessageSuggest(CommandSourceStack obj, String message, String end, String command) { - MutableComponent send = Component.literal(message); - MutableComponent endtext = Component.literal(end); - endtext.setStyle(endtext.getStyle().withClickEvent(new ClickEvent.SuggestCommand(command))); - send.append(endtext); - obj.sendSystemMessage(send); - } - - public static void sendBar(ServerPlayer player, String message) { - var pack = new ClientboundSetActionBarTextPacket(Component.literal(message)); - player.connection.send(pack); - } - - public static void sendMessageBqRun(String message, String end, String command) { - MutableComponent send = Component.literal(message); - MutableComponent endtext = Component.literal(end); - endtext.setStyle(endtext.getStyle().withClickEvent(new ClickEvent.SuggestCommand(command))); - send.append(endtext); - for (ServerPlayer player : AllMusicServer.server.getPlayerList().getPlayers()) { - player.sendSystemMessage(send); - } - } -} diff --git a/neoforge_1_21_11/src/main/java/com/coloryr/allmusic/server/SideNeoForge.java b/neoforge_1_21_11/src/main/java/com/coloryr/allmusic/server/SideNeoForge.java index 8e3d3b5c..0633a690 100644 --- a/neoforge_1_21_11/src/main/java/com/coloryr/allmusic/server/SideNeoForge.java +++ b/neoforge_1_21_11/src/main/java/com/coloryr/allmusic/server/SideNeoForge.java @@ -92,9 +92,9 @@ public class SideNeoForge extends BaseSide { } @Override - public void sendBar(Object player, String data) { + public void sendBar(Object player, net.kyori.adventure.text.Component data) { if (player instanceof ServerPlayer player1) { - NeoForgeApi.sendBar(player1, data); + AllMusicServer.audiences.audience(player1).sendActionBar(data); } } @@ -104,48 +104,19 @@ public class SideNeoForge extends BaseSide { } @Override - public void broadcast(String message) { - if (message == null || message.isEmpty()) { - return; - } + public void broadcast(net.kyori.adventure.text.Component message) { for (ServerPlayer player : AllMusicServer.server.getPlayerList().getPlayers()) { if (!AllMusic.isSkip(player.getName().getString(), null, false)) { - player.sendSystemMessage(Component.literal(message)); + AllMusicServer.audiences.audience(player).sendActionBar(message); } } } @Override - public void broadcastWithRun(String message, String end, String command) { - if (message == null || message.isEmpty()) { - return; + public void sendMessage(Object obj, net.kyori.adventure.text.Component message) { + if(obj instanceof CommandSourceStack source) { + AllMusicServer.audiences.audience(source).sendActionBar(message); } - NeoForgeApi.sendMessageBqRun(message, end, command); - } - - @Override - public void sendMessage(Object obj, String message) { - if (message == null || message.isEmpty()) { - return; - } - CommandSourceStack source = (CommandSourceStack) obj; - source.sendSystemMessage(Component.literal(message)); - } - - @Override - public void sendMessageRun(Object obj, String message, String end, String command) { - if (message == null || message.isEmpty()) { - return; - } - NeoForgeApi.sendMessageRun((CommandSourceStack) obj, message, end, command); - } - - @Override - public void sendMessageSuggest(Object obj, String message, String end, String command) { - if (message == null || message.isEmpty()) { - return; - } - NeoForgeApi.sendMessageSuggest((CommandSourceStack) obj, message, end, command); } @Override diff --git a/neoforge_1_21_6/build.gradle b/neoforge_1_21_6/build.gradle index fb6f0aa5..b704ba7c 100644 --- a/neoforge_1_21_6/build.gradle +++ b/neoforge_1_21_6/build.gradle @@ -29,11 +29,7 @@ group = mod_group_id repositories { mavenLocal() -// maven { -// name = 'Kotlin for Forge' -// url = 'https://thedarkcolour.github.io/KotlinForForge/' -// content { includeGroup "thedarkcolour" } -// } + mavenCentral() } base { @@ -121,7 +117,13 @@ dependencies { implementation('org.apache.httpcomponents.client5:httpclient5:5.6') implementation('org.xerial:sqlite-jdbc:3.51.1.0') + implementation('net.kyori:adventure-platform-mod-shared:6.6.0') + implementation('net.kyori:adventure-text-minimessage:4.26.1') + jarJar(group: 'net.kyori', name: 'adventure-platform-mod-shared', version: '[6.0,6.1)') + jarJar(group: 'net.kyori', name: 'adventure-text-minimessage', version: '[4.26.1,4.27)') + jarJar(group: 'net.kyori', name: 'net.kyori:adventure-api', version: '[4.26.1,4.27)') + jarJar(group: 'net.kyori', name: 'net.kyori:adventure-key', version: '[4.26.1,4.27)') jarJar(group: 'org.apache.httpcomponents.client5', name: 'httpclient5', version: '[5.6,6.0)') jarJar(group: 'org.apache.httpcomponents.core5', name: 'httpcore5', version: '[5.4,6.0)') jarJar(group: 'org.apache.httpcomponents.core5', name: 'httpcore5-h2', version: '[5.4,6.0)') diff --git a/neoforge_1_21_6/src/main/java/com/coloryr/allmusic/server/AllMusicServer.java b/neoforge_1_21_6/src/main/java/com/coloryr/allmusic/server/AllMusicServer.java index 6e49a036..d5fe0378 100644 --- a/neoforge_1_21_6/src/main/java/com/coloryr/allmusic/server/AllMusicServer.java +++ b/neoforge_1_21_6/src/main/java/com/coloryr/allmusic/server/AllMusicServer.java @@ -3,6 +3,7 @@ package com.coloryr.allmusic.server; import com.coloryr.allmusic.comm.AllMusicInit; import com.coloryr.allmusic.server.core.AllMusic; import com.mojang.brigadier.CommandDispatcher; +import net.kyori.adventure.platform.modcommon.MinecraftServerAudiences; import net.minecraft.commands.CommandSourceStack; import net.minecraft.server.MinecraftServer; import net.neoforged.api.distmarker.Dist; @@ -23,6 +24,7 @@ public class AllMusicServer { public static final Logger LOGGER = LoggerFactory.getLogger("AllMusic Server"); public static MinecraftServer server; + public static MinecraftServerAudiences audiences; public static final String dir = "config/allmusic_server/"; @@ -30,8 +32,6 @@ public class AllMusicServer { public static void commonSetup(final FMLCommonSetupEvent event) { AllMusic.log = new LogNeoForge(); AllMusic.side = new SideNeoForge(); - - new AllMusic().init(new File(dir)); } @SubscribeEvent @@ -44,7 +44,8 @@ public class AllMusicServer { @SubscribeEvent public static void onServerStarting(ServerStartedEvent event) { server = event.getServer(); - + audiences = MinecraftServerAudiences.of(server); + AllMusic.init(new File(dir)); AllMusic.start(); Tasks.init(); } diff --git a/neoforge_1_21_6/src/main/java/com/coloryr/allmusic/server/LogNeoForge.java b/neoforge_1_21_6/src/main/java/com/coloryr/allmusic/server/LogNeoForge.java index a44af856..48f052ea 100644 --- a/neoforge_1_21_6/src/main/java/com/coloryr/allmusic/server/LogNeoForge.java +++ b/neoforge_1_21_6/src/main/java/com/coloryr/allmusic/server/LogNeoForge.java @@ -1,15 +1,11 @@ package com.coloryr.allmusic.server; -import com.coloryr.allmusic.server.core.side.IMyLogger; +import com.coloryr.allmusic.server.core.side.IAllMusicLogger; +import net.kyori.adventure.text.Component; -public class LogNeoForge implements IMyLogger { +public class LogNeoForge implements IAllMusicLogger { @Override - public void warning(String data) { - AllMusicServer.LOGGER.warn(data); - } - - @Override - public void info(String data) { - AllMusicServer.LOGGER.info(data); + public void data(Component data) { + AllMusicServer.audiences.console().sendActionBar(data); } } diff --git a/neoforge_1_21_6/src/main/java/com/coloryr/allmusic/server/NeoForgeApi.java b/neoforge_1_21_6/src/main/java/com/coloryr/allmusic/server/NeoForgeApi.java deleted file mode 100644 index 596e4efc..00000000 --- a/neoforge_1_21_6/src/main/java/com/coloryr/allmusic/server/NeoForgeApi.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.coloryr.allmusic.server; - -import net.minecraft.commands.CommandSourceStack; -import net.minecraft.network.chat.ClickEvent; -import net.minecraft.network.chat.Component; -import net.minecraft.network.chat.MutableComponent; -import net.minecraft.network.protocol.game.ClientboundSetActionBarTextPacket; -import net.minecraft.server.level.ServerPlayer; - -public class NeoForgeApi { - public static void sendMessageRun(CommandSourceStack obj, String message, String end, String command) { - MutableComponent send = Component.literal(message); - MutableComponent endtext = Component.literal(end); - endtext.setStyle(endtext.getStyle().withClickEvent(new ClickEvent.RunCommand(command))); - send.append(endtext); - obj.sendSystemMessage(send); - } - - public static void sendMessageSuggest(CommandSourceStack obj, String message, String end, String command) { - MutableComponent send = Component.literal(message); - MutableComponent endtext = Component.literal(end); - endtext.setStyle(endtext.getStyle().withClickEvent(new ClickEvent.SuggestCommand(command))); - send.append(endtext); - obj.sendSystemMessage(send); - } - - public static void sendBar(ServerPlayer player, String message) { - var pack = new ClientboundSetActionBarTextPacket(Component.literal(message)); - player.connection.send(pack); - } - - public static void sendMessageBqRun(String message, String end, String command) { - MutableComponent send = Component.literal(message); - MutableComponent endtext = Component.literal(end); - endtext.setStyle(endtext.getStyle().withClickEvent(new ClickEvent.SuggestCommand(command))); - send.append(endtext); - for (ServerPlayer player : AllMusicServer.server.getPlayerList().getPlayers()) { - player.sendSystemMessage(send); - } - } -} diff --git a/neoforge_1_21_6/src/main/java/com/coloryr/allmusic/server/SideNeoForge.java b/neoforge_1_21_6/src/main/java/com/coloryr/allmusic/server/SideNeoForge.java index 99e67f43..94aeaeac 100644 --- a/neoforge_1_21_6/src/main/java/com/coloryr/allmusic/server/SideNeoForge.java +++ b/neoforge_1_21_6/src/main/java/com/coloryr/allmusic/server/SideNeoForge.java @@ -91,9 +91,9 @@ public class SideNeoForge extends BaseSide { } @Override - public void sendBar(Object player, String data) { + public void sendBar(Object player, net.kyori.adventure.text.Component data) { if (player instanceof ServerPlayer player1) { - NeoForgeApi.sendBar(player1, data); + AllMusicServer.audiences.audience(player1).sendActionBar(data); } } @@ -103,48 +103,19 @@ public class SideNeoForge extends BaseSide { } @Override - public void broadcast(String message) { - if (message == null || message.isEmpty()) { - return; - } + public void broadcast(net.kyori.adventure.text.Component message) { for (ServerPlayer player : AllMusicServer.server.getPlayerList().getPlayers()) { if (!AllMusic.isSkip(player.getName().getString(), null, false)) { - player.sendSystemMessage(Component.literal(message)); + AllMusicServer.audiences.audience(player).sendMessage(message); } } } @Override - public void broadcastWithRun(String message, String end, String command) { - if (message == null || message.isEmpty()) { - return; + public void sendMessage(Object obj, net.kyori.adventure.text.Component message) { + if(obj instanceof CommandSourceStack source) { + AllMusicServer.audiences.audience(source).sendMessage(message); } - NeoForgeApi.sendMessageBqRun(message, end, command); - } - - @Override - public void sendMessage(Object obj, String message) { - if (message == null || message.isEmpty()) { - return; - } - CommandSourceStack source = (CommandSourceStack) obj; - source.sendSystemMessage(Component.literal(message)); - } - - @Override - public void sendMessageRun(Object obj, String message, String end, String command) { - if (message == null || message.isEmpty()) { - return; - } - NeoForgeApi.sendMessageRun((CommandSourceStack) obj, message, end, command); - } - - @Override - public void sendMessageSuggest(Object obj, String message, String end, String command) { - if (message == null || message.isEmpty()) { - return; - } - NeoForgeApi.sendMessageSuggest((CommandSourceStack) obj, message, end, command); } @Override @@ -168,7 +139,7 @@ public class SideNeoForge extends BaseSide { try { runTask(() -> PacketDistributor.sendToPlayer(players, new MusicCodec(data))); } catch (Exception e) { - AllMusic.log.warning("§c数据发送发生错误"); + AllMusic.log.data("§c数据发送发生错误"); e.printStackTrace(); } } diff --git a/netapi/LyricDecoder.java b/netapi/LyricDecoder.java index 40aa04aa..8921fd9b 100644 --- a/netapi/LyricDecoder.java +++ b/netapi/LyricDecoder.java @@ -154,8 +154,8 @@ public class LyricDecoder { try { temp5 = (Integer.parseInt(temp8[1]) / 10 * 10); } catch (Exception e) { - AllMusic.log.warning("不支持的Ktv歌词"); - AllMusic.log.warning("请带上音乐ID联系开发者"); + AllMusic.log.data("不支持的Ktv歌词"); + AllMusic.log.data("请带上音乐ID联系开发者"); return null; } diff --git a/netapi/NetApiHttpClient.java b/netapi/NetApiHttpClient.java index 5b2bbbcb..c1ee856c 100644 --- a/netapi/NetApiHttpClient.java +++ b/netapi/NetApiHttpClient.java @@ -32,7 +32,7 @@ public class NetApiHttpClient { public static HttpResObj get(String path, String data) { try { - data = URLEncoder.encode(data, StandardCharsets.UTF_8); + data = URLEncoder.encode(data, StandardCharsets.UTF_8.toString()); HttpGet request = new HttpGet(path + data); request.setHeader("referer", "https://music.163.com"); request.setHeader("content-type", "application/json;charset=UTF-8"); @@ -44,7 +44,7 @@ public class NetApiHttpClient { int httpCode = response.getCode(); HttpEntity entity = response.getEntity(); if (entity == null) { - AllMusic.log.warning("[AllMusic3]获取网页错误"); + AllMusic.log.data("[AllMusic3]获取网页错误"); return null; } InputStream inputStream = entity.getContent(); @@ -57,16 +57,16 @@ public class NetApiHttpClient { } inputStream.close(); EntityUtils.consume(entity); - String data1 = result.toString(StandardCharsets.UTF_8); + String data1 = result.toString(StandardCharsets.UTF_8.toString()); if (!ok) { - AllMusic.log.warning("[AllMusic3]服务器返回错误:" + data1); + AllMusic.log.data("[AllMusic3]服务器返回错误:" + data1); } // 保存 cookies MusicHttpClient.saveCookies(cookieStore); return new HttpResObj(data1, ok); } } catch (Exception e) { - AllMusic.log.warning("[AllMusic3]获取网页错误"); + AllMusic.log.data("[AllMusic3]获取网页错误"); e.printStackTrace(); } return null; @@ -143,7 +143,7 @@ public class NetApiHttpClient { int httpCode = response.getCode(); HttpEntity entity = response.getEntity(); if (entity == null) { - AllMusic.log.warning("[AllMusic3]获取网页错误"); + AllMusic.log.data("[AllMusic3]获取网页错误"); return null; } InputStream inputStream = entity.getContent(); @@ -154,17 +154,17 @@ public class NetApiHttpClient { while ((length = inputStream.read(buffer)) != -1) { result.write(buffer, 0, length); } - String data1 = result.toString(StandardCharsets.UTF_8); + String data1 = result.toString(StandardCharsets.UTF_8.toString()); EntityUtils.consume(entity); if (!ok) { - AllMusic.log.warning("[AllMusic3]服务器返回错误:" + data1); + AllMusic.log.data("[AllMusic3]服务器返回错误:" + data1); } // 保存 cookies MusicHttpClient.saveCookies(cookieStore); return new HttpResObj(data1, ok); } } catch (Exception e) { - AllMusic.log.warning("[AllMusic3]获取网页错误"); + AllMusic.log.data("[AllMusic3]获取网页错误"); e.printStackTrace(); } return null; diff --git a/netapi/NetiApiMain.java b/netapi/NetiApiMain.java index c34f3de7..62494e11 100644 --- a/netapi/NetiApiMain.java +++ b/netapi/NetiApiMain.java @@ -27,11 +27,11 @@ public class NetiApiMain implements IMusicApi { private boolean isUpdate; public NetiApiMain() { - AllMusic.log.info("[AllMusic3]正在初始化网络爬虫"); + AllMusic.log.data("[AllMusic3]正在初始化网络爬虫"); HttpResObj res = NetApiHttpClient.get("https://music.163.com", ""); - if (res == null || !res.ok()) { - AllMusic.log.info("[AllMusic3]初始化net api失败"); + if (res == null || !res.ok) { + AllMusic.log.data("[AllMusic3]初始化net api失败"); } } @@ -76,18 +76,18 @@ public class NetiApiMain implements IMusicApi { params.addProperty("c", "[{\"id\":" + id + "}]"); HttpResObj res = NetApiHttpClient.post("https://music.163.com/api/v3/song/detail", params, EncryptType.WEAPI, null); - if (res != null && res.ok()) { - InfoObj temp = AllMusic.gson.fromJson(res.data(), InfoObj.class); + if (res != null && res.ok) { + InfoObj temp = AllMusic.gson.fromJson(res.data, InfoObj.class); if (temp.isOk()) { params = new JsonObject(); params.addProperty("ids", "[" + id + "]"); params.addProperty("br", "320000"); res = NetApiHttpClient.post("https://music.163.com/weapi/song/enhance/player/url", params, EncryptType.WEAPI, null); - if (res == null || !res.ok()) { - AllMusic.log.warning("[AllMusic3]版权检索失败"); + if (res == null || !res.ok) { + AllMusic.log.data("[AllMusic3]版权检索失败"); return null; } - TrialInfoObj obj = AllMusic.gson.fromJson(res.data(), TrialInfoObj.class); + TrialInfoObj obj = AllMusic.gson.fromJson(res.data, TrialInfoObj.class); return new SongInfoObj(temp.getAuthor(), temp.getName(), id, temp.getAlia(), player, temp.getAl(), isList, temp.getLength(), temp.getPicUrl(), obj.isTrial(), obj.getFreeTrialInfo(), @@ -117,14 +117,14 @@ public class NetiApiMain implements IMusicApi { JsonObject params = new JsonObject(); params.addProperty("id", id); HttpResObj res = NetApiHttpClient.post("https://music.163.com/api/dj/program/detail", params, EncryptType.WEAPI, null); - if (res != null && res.ok()) { - PrInfoObj temp = AllMusic.gson.fromJson(res.data(), PrInfoObj.class); + if (res != null && res.ok) { + PrInfoObj temp = AllMusic.gson.fromJson(res.data, PrInfoObj.class); if (temp.isOk()) { return new SongInfoObj(temp.getAuthor(), temp.getName(), temp.getId(), temp.getAlia(), player, "电台", isList, temp.getLength(), null, false, null, getId()); } else { - AllMusic.log.warning("[AllMusic3]歌曲信息获取为空"); + AllMusic.log.data("[AllMusic3]歌曲信息获取为空"); } } return info; @@ -142,12 +142,12 @@ public class NetiApiMain implements IMusicApi { params.addProperty("level", "lossless"); params.addProperty("encodeType", "aac"); HttpResObj res = NetApiHttpClient.post("https://music.163.com/weapi/song/enhance/player/url/v1", params, EncryptType.WEAPI, null); - if (res != null && res.ok()) { + if (res != null && res.ok) { try { - TrialInfoObj obj = AllMusic.gson.fromJson(res.data(), TrialInfoObj.class); + TrialInfoObj obj = AllMusic.gson.fromJson(res.data, TrialInfoObj.class); return obj.getUrl(); } catch (Exception e) { - AllMusic.log.warning("[AllMusic3]播放连接解析错误:" + res.data()); + AllMusic.log.data("[AllMusic3]播放连接解析错误:" + res.data); e.printStackTrace(); } } @@ -167,14 +167,14 @@ public class NetiApiMain implements IMusicApi { params.addProperty("n", 100000); params.addProperty("s", 8); HttpResObj res = NetApiHttpClient.post("https://music.163.com/api/v6/playlist/detail", params, EncryptType.API, null); - if (res != null && res.ok()) + if (res != null && res.ok) try { isUpdate = true; - DataObj obj = AllMusic.gson.fromJson(res.data(), DataObj.class); + DataObj obj = AllMusic.gson.fromJson(res.data, DataObj.class); DataSql.addIdleList(obj.getPlaylist(), getId()); AllMusic.side.sendMessageTask(sender, AllMusic.getMessage().musicPlay.listMusic.get.replace(ARG.name, obj.getName())); } catch (Exception e) { - AllMusic.log.warning("[AllMusic3]歌曲列表获取错误"); + AllMusic.log.data("[AllMusic3]歌曲列表获取错误"); e.printStackTrace(); } isUpdate = false; @@ -202,13 +202,13 @@ public class NetiApiMain implements IMusicApi { params.addProperty("rtv", 0); HttpResObj res = NetApiHttpClient.post("https://interface3.music.163.com/eapi/song/lyric/v1", params, EncryptType.EAPI, "/api/song/lyric/v1"); - if (res != null && res.ok()) { + if (res != null && res.ok) { try { - WLyricObj obj = AllMusic.gson.fromJson(res.data(), WLyricObj.class); + WLyricObj obj = AllMusic.gson.fromJson(res.data, WLyricObj.class); LyricDecoder temp = new LyricDecoder(); for (int times = 0; times < 3; times++) { if (temp.check(obj)) { - AllMusic.log.warning("[AllMusic3]歌词解析错误,正在进行第" + times + "重试"); + AllMusic.log.data("[AllMusic3]歌词解析错误,正在进行第" + times + "重试"); } else { if (temp.isHave) { lyric.setHaveLyric(AllMusic.getConfig().sendLyric); @@ -221,9 +221,9 @@ public class NetiApiMain implements IMusicApi { } Thread.sleep(1000); } - AllMusic.log.warning("[AllMusic3]歌词解析失败"); + AllMusic.log.data("[AllMusic3]歌词解析失败"); } catch (Exception e) { - AllMusic.log.warning("[AllMusic3]歌词解析错误"); + AllMusic.log.data("[AllMusic3]歌词解析错误"); e.printStackTrace(); } } @@ -255,8 +255,8 @@ public class NetiApiMain implements IMusicApi { params.addProperty("offset", 0); HttpResObj res = NetApiHttpClient.post("https://music.163.com/weapi/search/get", params, EncryptType.WEAPI, null); - if (res != null && res.ok()) { - SearchDataObj obj = AllMusic.gson.fromJson(res.data(), SearchDataObj.class); + if (res != null && res.ok) { + SearchDataObj obj = AllMusic.gson.fromJson(res.data, SearchDataObj.class); if (obj != null && obj.isOk()) { List res1 = obj.getResult(); SearchMusicObj item; @@ -268,7 +268,7 @@ public class NetiApiMain implements IMusicApi { maxpage = res1.size() / 10; return new SearchPageObj(resData, maxpage, getId()); } else { - AllMusic.log.warning("[AllMusic3]歌曲搜索出现错误"); + AllMusic.log.data("[AllMusic3]歌曲搜索出现错误"); } } diff --git a/paper/src/main/java/com/coloryr/allmusic/server/AllMusicBukkit.java b/paper/src/main/java/com/coloryr/allmusic/server/AllMusicBukkit.java index 19e491e0..8e54de74 100644 --- a/paper/src/main/java/com/coloryr/allmusic/server/AllMusicBukkit.java +++ b/paper/src/main/java/com/coloryr/allmusic/server/AllMusicBukkit.java @@ -23,7 +23,7 @@ public class AllMusicBukkit extends JavaPlugin { AllMusic.log = new LogBukkit(); AllMusic.side = new SideBukkit(); - new AllMusic().init(plugin.getDataFolder()); + AllMusic.init(plugin.getDataFolder()); if (!AllMusic.isRun) { Bukkit.getPluginManager().disablePlugin(this); return; @@ -35,27 +35,27 @@ public class AllMusicBukkit extends JavaPlugin { VaultHook vault = new VaultHook(); AllMusic.economy = vault; if (vault.setupEconomy()) { - AllMusic.log.info("[AllMusic3]Vault支持已启动"); + AllMusic.log.data("[AllMusic3]Vault支持已启动"); } else { - AllMusic.log.info("[AllMusic3]Vault未挂钩"); + AllMusic.log.data("[AllMusic3]Vault未挂钩"); AllMusic.economy = null; } } catch (Exception e) { - AllMusic.log.info("[AllMusic3]Vault未挂钩"); + AllMusic.log.data("[AllMusic3]Vault未挂钩"); AllMusic.economy = null; } } else { - AllMusic.log.info("[AllMusic3]Vault未挂钩"); + AllMusic.log.data("[AllMusic3]Vault未挂钩"); AllMusic.economy = null; } if (Bukkit.getPluginManager().getPlugin("PlaceholderAPI") != null) { PAPI = new AllMusicPAPI(this); if (!PAPI.register()) { - AllMusic.log.info("[AllMusic3]PAPI支持已启动"); + AllMusic.log.data("[AllMusic3]PAPI支持已启动"); } } else { - AllMusic.log.info("[AllMusic3]PAPI未挂钩"); + AllMusic.log.data("[AllMusic3]PAPI未挂钩"); } if (AllMusic.getConfig().topPAPI) { @@ -64,7 +64,7 @@ public class AllMusicBukkit extends JavaPlugin { pluginMessage = new PluginMessage(); getServer().getMessenger().registerOutgoingPluginChannel(this, AllMusic.channelBC); getServer().getMessenger().registerIncomingPluginChannel(this, AllMusic.channelBC, pluginMessage); - AllMusic.log.info("[AllMusic3]设置为顶层模式"); + AllMusic.log.data("[AllMusic3]设置为顶层模式"); } else { CommandBukkit command = new CommandBukkit(); getServer().getMessenger().registerOutgoingPluginChannel(this, AllMusic.channel); diff --git a/paper/src/main/java/com/coloryr/allmusic/server/side/bukkit/LogBukkit.java b/paper/src/main/java/com/coloryr/allmusic/server/side/bukkit/LogBukkit.java index c398a7f4..cf9214b5 100644 --- a/paper/src/main/java/com/coloryr/allmusic/server/side/bukkit/LogBukkit.java +++ b/paper/src/main/java/com/coloryr/allmusic/server/side/bukkit/LogBukkit.java @@ -1,20 +1,12 @@ package com.coloryr.allmusic.server.side.bukkit; -import com.coloryr.allmusic.server.core.AllMusic; import com.coloryr.allmusic.server.core.side.IAllMusicLogger; import net.kyori.adventure.text.Component; import org.bukkit.Bukkit; public class LogBukkit implements IAllMusicLogger { @Override - public void warning(String data) { - Component data1 = AllMusic.miniMessage(data); - Bukkit.getConsoleSender().sendMessage(data1); - } - - @Override - public void info(String data) { - Component data1 = AllMusic.miniMessage(data); - Bukkit.getConsoleSender().sendMessage(data1); + public void data(Component data) { + Bukkit.getConsoleSender().sendMessage(data); } } diff --git a/paper/src/main/java/com/coloryr/allmusic/server/side/bukkit/hooks/AllMusicPAPI.java b/paper/src/main/java/com/coloryr/allmusic/server/side/bukkit/hooks/AllMusicPAPI.java index b55ccfef..0efcc6e9 100644 --- a/paper/src/main/java/com/coloryr/allmusic/server/side/bukkit/hooks/AllMusicPAPI.java +++ b/paper/src/main/java/com/coloryr/allmusic/server/side/bukkit/hooks/AllMusicPAPI.java @@ -29,7 +29,7 @@ public class AllMusicPAPI extends PlaceholderExpansion { @Override public boolean register() { - AllMusic.log.info("正在挂钩PlaceholderAPI"); + AllMusic.log.data("[AllMusic3]正在挂钩PlaceholderAPI"); return super.register(); } diff --git a/server_top/build.gradle b/server_top/build.gradle index f146ee69..0b423567 100644 --- a/server_top/build.gradle +++ b/server_top/build.gradle @@ -15,7 +15,7 @@ def getVersionFromFile() { version = getVersionFromFile() -archivesBaseName = "[bungeecord_velocity]AllMusic_Server" +archivesBaseName = "[velocity]AllMusic_Server" repositories { mavenCentral() @@ -43,7 +43,6 @@ repositories { } dependencies { - compileOnly 'net.md-5:bungeecord-api:1.20-R0.1-SNAPSHOT' compileOnly "com.github.MilkBowl:VaultAPI:1.7.1" compileOnly 'me.clip:placeholderapi:2.11.6' @@ -51,8 +50,11 @@ dependencies { compile 'org.apache.httpcomponents.client5:httpclient5:5.6' compile 'com.google.code.gson:gson:2.11.0' + compileOnly 'io.netty:netty-all:4.1.109.Final' compileOnly 'com.velocitypowered:velocity-api:3.0.0' annotationProcessor 'com.velocitypowered:velocity-api:3.0.0' + + compileOnly 'net.kyori:adventure-text-minimessage:4.26.1' } shadowJar { diff --git a/server_top/src/main/java/com/coloryr/allmusic/server/AllMusicBC.java b/server_top/src/main/java/com/coloryr/allmusic/server/AllMusicBC.java deleted file mode 100644 index f77da95b..00000000 --- a/server_top/src/main/java/com/coloryr/allmusic/server/AllMusicBC.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.coloryr.allmusic.server; - -import com.coloryr.allmusic.server.core.AllMusic; -import com.coloryr.allmusic.server.side.bc.*; -import net.md_5.bungee.api.ProxyServer; -import net.md_5.bungee.api.plugin.Plugin; - -public class AllMusicBC extends Plugin { - - public static Plugin plugin; - - @Override - public void onEnable() { - plugin = this; - AllMusic.log = new LogBC(ProxyServer.getInstance().getLogger()); - AllMusic.side = new SideBC(); - - new AllMusic().init(plugin.getDataFolder()); - - if (!AllMusic.isRun) - return; - ProxyServer.getInstance().registerChannel(AllMusic.channelBC); - ProxyServer.getInstance().getPluginManager().registerCommand(this, new CommandBC()); - ProxyServer.getInstance().getPluginManager().registerListener(this, new ListenerBC()); - - AllMusic.start(); - } - - @Override - public void onDisable() { - AllMusic.stop(); - } -} \ No newline at end of file diff --git a/server_top/src/main/java/com/coloryr/allmusic/server/AllMusicVelocity.java b/server_top/src/main/java/com/coloryr/allmusic/server/AllMusicVelocity.java index 8b3d8a8b..39ac0715 100644 --- a/server_top/src/main/java/com/coloryr/allmusic/server/AllMusicVelocity.java +++ b/server_top/src/main/java/com/coloryr/allmusic/server/AllMusicVelocity.java @@ -36,10 +36,10 @@ public class AllMusicVelocity { @Subscribe public void onProxyInitialization(ProxyInitializeEvent event) { plugin = this; - AllMusic.log = new LogVelocity(logger); + AllMusic.log = new LogVelocity(); AllMusic.side = new SideVelocity(); - new AllMusic().init(dataDirectory.toFile()); + AllMusic.init(dataDirectory.toFile()); CommandMeta meta = server.getCommandManager().metaBuilder("music") .build(); diff --git a/server_top/src/main/java/com/coloryr/allmusic/server/side/bc/CommandBC.java b/server_top/src/main/java/com/coloryr/allmusic/server/side/bc/CommandBC.java deleted file mode 100644 index 8978a662..00000000 --- a/server_top/src/main/java/com/coloryr/allmusic/server/side/bc/CommandBC.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.coloryr.allmusic.server.side.bc; - -import com.coloryr.allmusic.server.core.command.CommandEX; -import net.md_5.bungee.api.CommandSender; -import net.md_5.bungee.api.plugin.Command; -import net.md_5.bungee.api.plugin.TabExecutor; - -public class CommandBC extends Command implements TabExecutor { - - public CommandBC() { - super("music"); - } - - public void execute(CommandSender sender, String[] args) { - CommandEX.execute(sender, sender.getName(), args); - } - - public Iterable onTabComplete(CommandSender sender, String[] args) { - return CommandEX.getTabList(sender, sender.getName(), args); - } -} diff --git a/server_top/src/main/java/com/coloryr/allmusic/server/side/bc/ListenerBC.java b/server_top/src/main/java/com/coloryr/allmusic/server/side/bc/ListenerBC.java deleted file mode 100644 index 32479152..00000000 --- a/server_top/src/main/java/com/coloryr/allmusic/server/side/bc/ListenerBC.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.coloryr.allmusic.server.side.bc; - -import com.coloryr.allmusic.server.core.AllMusic; -import com.google.common.io.ByteArrayDataInput; -import com.google.common.io.ByteStreams; -import net.md_5.bungee.api.connection.Server; -import net.md_5.bungee.api.event.PlayerDisconnectEvent; -import net.md_5.bungee.api.event.PluginMessageEvent; -import net.md_5.bungee.api.event.ServerConnectedEvent; -import net.md_5.bungee.api.plugin.Listener; -import net.md_5.bungee.event.EventHandler; - -public class ListenerBC implements Listener { - @EventHandler - public void onPlayerDisconnectEvent(final PlayerDisconnectEvent event) { - AllMusic.removeNowPlayPlayer(event.getPlayer().getName()); - } - - @EventHandler - public void onServerConnectedEvent(ServerConnectedEvent event) { - AllMusic.side.runTask(() -> { - AllMusic.joinPlay(event.getPlayer().getName()); - }, 500); - } - - @EventHandler - public void onPluginMessageEvent(PluginMessageEvent event) { - if (event.getTag().equals(AllMusic.channelBC)) { - event.setCancelled(true); - ByteArrayDataInput data = ByteStreams.newDataInput(event.getData()); - int type = data.readInt(); - if (type == 255 && event.getSender() instanceof Server) { - Server server = (Server) event.getSender(); - SideBC.TopServers.add(server); - SideBC.sendAllToServer(server); - SideBC.sendLyricToServer(server); - } else if (type == 12 || type == 13) { - String uuid = data.readUTF(); - int res = data.readInt(); - SideBC.SendToBackend.put(uuid, res); - } - } - } -} diff --git a/server_top/src/main/java/com/coloryr/allmusic/server/side/bc/LogBC.java b/server_top/src/main/java/com/coloryr/allmusic/server/side/bc/LogBC.java deleted file mode 100644 index 5050c88c..00000000 --- a/server_top/src/main/java/com/coloryr/allmusic/server/side/bc/LogBC.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.coloryr.allmusic.server.side.bc; - -import com.coloryr.allmusic.server.core.side.IMyLogger; - -import java.util.logging.Logger; - -public class LogBC implements IMyLogger { - private final Logger Logger; - - public LogBC(Logger Logger) { - this.Logger = Logger; - } - - @Override - public void warning(String data) { - Logger.warning(data); - } - - @Override - public void info(String data) { - Logger.info(data); - } -} diff --git a/server_top/src/main/java/com/coloryr/allmusic/server/side/bc/SideBC.java b/server_top/src/main/java/com/coloryr/allmusic/server/side/bc/SideBC.java deleted file mode 100644 index 5d3d5d35..00000000 --- a/server_top/src/main/java/com/coloryr/allmusic/server/side/bc/SideBC.java +++ /dev/null @@ -1,417 +0,0 @@ -package com.coloryr.allmusic.server.side.bc; - -import com.coloryr.allmusic.buffercodec.MusicPacketCodec; -import com.coloryr.allmusic.codec.CommandType; -import com.coloryr.allmusic.server.AllMusicBC; -import com.coloryr.allmusic.server.core.AllMusic; -import com.coloryr.allmusic.server.core.music.PlayMusic; -import com.coloryr.allmusic.server.core.objs.music.MusicObj; -import com.coloryr.allmusic.server.core.objs.music.PlayerAddMusicObj; -import com.coloryr.allmusic.server.core.objs.music.SongInfoObj; -import com.coloryr.allmusic.server.core.side.BaseSide; -import com.coloryr.allmusic.server.core.sql.IEconomy; -import com.coloryr.allmusic.server.side.bc.event.MusicAddEvent; -import com.coloryr.allmusic.server.side.bc.event.MusicPlayEvent; -import com.google.common.io.ByteArrayDataOutput; -import com.google.common.io.ByteStreams; -import io.netty.buffer.ByteBuf; -import net.md_5.bungee.api.ChatMessageType; -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.connection.ProxiedPlayer; -import net.md_5.bungee.api.connection.Server; - -import java.io.File; -import java.util.*; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.CopyOnWriteArraySet; -import java.util.concurrent.TimeUnit; - -public class SideBC extends BaseSide implements IEconomy { - public static final Set TopServers = new CopyOnWriteArraySet<>(); - - public static final Map SendToBackend = new ConcurrentHashMap<>(); - - public static void sendAllToServer(Server server) { - ByteArrayDataOutput out = ByteStreams.newDataOutput(); - out.writeInt(0); - if (PlayMusic.nowPlayMusic == null) - out.writeUTF(AllMusic.getMessage().papi.emptyMusic); - else { - out.writeUTF(PlayMusic.nowPlayMusic.getName()); - } - - server.sendData(AllMusic.channelBC, out.toByteArray()); - - out = ByteStreams.newDataOutput(); - out.writeInt(1); - if (PlayMusic.nowPlayMusic == null) - out.writeUTF(""); - else - out.writeUTF(PlayMusic.nowPlayMusic.getAl()); - server.sendData(AllMusic.channelBC, out.toByteArray()); - - out = ByteStreams.newDataOutput(); - out.writeInt(2); - if (PlayMusic.nowPlayMusic == null) - out.writeUTF(""); - else - out.writeUTF(PlayMusic.nowPlayMusic.getAlia()); - server.sendData(AllMusic.channelBC, out.toByteArray()); - - out = ByteStreams.newDataOutput(); - out.writeInt(3); - if (PlayMusic.nowPlayMusic == null) - out.writeUTF(""); - else - out.writeUTF(PlayMusic.nowPlayMusic.getAuthor()); - server.sendData(AllMusic.channelBC, out.toByteArray()); - - out = ByteStreams.newDataOutput(); - out.writeInt(4); - if (PlayMusic.nowPlayMusic == null) - out.writeUTF(""); - else - out.writeUTF(PlayMusic.nowPlayMusic.getCall()); - server.sendData(AllMusic.channelBC, out.toByteArray()); - - out = ByteStreams.newDataOutput(); - out.writeInt(5); - out.writeInt(PlayMusic.getListSize()); - server.sendData(AllMusic.channelBC, out.toByteArray()); - - out = ByteStreams.newDataOutput(); - out.writeInt(6); - out.writeUTF(PlayMusic.getAllList()); - server.sendData(AllMusic.channelBC, out.toByteArray()); - } - - public static void sendLyricToServer(Server server) { - ByteArrayDataOutput out = ByteStreams.newDataOutput(); - out.writeInt(7); - if (PlayMusic.lyric == null) - out.writeUTF(""); - else - out.writeUTF(PlayMusic.lyric.getLyric()); - server.sendData(AllMusic.channelBC, out.toByteArray()); - - out = ByteStreams.newDataOutput(); - out.writeInt(8); - if (PlayMusic.lyric == null || PlayMusic.lyric.getTlyric() == null) - out.writeUTF(""); - else - out.writeUTF(PlayMusic.lyric.getTlyric()); - server.sendData(AllMusic.channelBC, out.toByteArray()); - - out = ByteStreams.newDataOutput(); - out.writeInt(9); - out.writeBoolean(PlayMusic.lyric != null && PlayMusic.lyric.getTlyric() != null); - server.sendData(AllMusic.channelBC, out.toByteArray()); - - out = ByteStreams.newDataOutput(); - out.writeInt(10); - if (PlayMusic.lyric == null || PlayMusic.lyric.getKly() == null) - out.writeUTF(""); - else - out.writeUTF(PlayMusic.lyric.getTlyric()); - server.sendData(AllMusic.channelBC, out.toByteArray()); - - out = ByteStreams.newDataOutput(); - out.writeInt(11); - out.writeBoolean(PlayMusic.lyric != null && PlayMusic.lyric.getKly() != null); - server.sendData(AllMusic.channelBC, out.toByteArray()); - } - - @Override - public void broadcast(String data) { - if (data == null || data.isEmpty()) - return; - TextComponent message = new TextComponent(data); - for (ProxiedPlayer player : ProxyServer.getInstance().getPlayers()) { - if (skip(player)) - continue; - player.sendMessage(message); - } - } - - @Override - public void broadcastWithRun(String message, String end, String command) { - if (message == null || message.isEmpty()) - return; - TextComponent send = new TextComponent(message); - TextComponent endtext = new TextComponent(end); - endtext.setClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, command)); - send.addExtra(endtext); - for (ProxiedPlayer player : ProxyServer.getInstance().getPlayers()) { - if (skip(player)) - continue; - player.sendMessage(send); - } - } - - @Override - public boolean needPlay(boolean islist) { - for (ProxiedPlayer player : ProxyServer.getInstance().getPlayers()) { - String server = player.getServer() == null ? null : player.getServer().getInfo().getName(); - if (!AllMusic.isSkip(player.getName(), server, false, islist)) { - return true; - } - } - - return false; - } - - @Override - public void sendMessage(Object obj, String message) { - if (message == null || message.isEmpty()) - return; - CommandSender sender = (CommandSender) obj; - sender.sendMessage(new TextComponent(message)); - } - - @Override - public void sendMessageRun(Object obj, String message, String end, String command) { - if (message == null || message.isEmpty()) - return; - CommandSender sender = (CommandSender) obj; - TextComponent send = new TextComponent(message); - TextComponent endtext = new TextComponent(end); - endtext.setClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, command)); - send.addExtra(endtext); - sender.sendMessage(send); - } - - @Override - public void sendMessageSuggest(Object obj, String message, String end, String command) { - if (message == null || message.isEmpty()) - return; - CommandSender sender = (CommandSender) obj; - TextComponent send = new TextComponent(message); - TextComponent endtext = new TextComponent(end); - endtext.setClickEvent(new ClickEvent(ClickEvent.Action.SUGGEST_COMMAND, command)); - send.addExtra(endtext); - sender.sendMessage(send); - } - - @Override - public void runTask(Runnable run) { - ProxyServer.getInstance().getScheduler().runAsync(AllMusicBC.plugin, run); - } - - @Override - public boolean checkPermission(Object player, String permission) { - if (checkPermission(player)) { - return true; - } - if (player instanceof CommandSender) { - return ((CommandSender) player).hasPermission(permission); - } - return false; - } - - @Override - public Collection getPlayers() { - return ProxyServer.getInstance().getPlayers(); - } - - @Override - public String getPlayerName(Object player) { - if (player instanceof ProxiedPlayer) { - ProxiedPlayer player1 = (ProxiedPlayer) player; - return player1.getName(); - } - return null; - } - - @Override - public String getPlayerServer(Object player) { - if (player instanceof ProxiedPlayer) { - ProxiedPlayer player1 = (ProxiedPlayer) player; - Server info = player1.getServer(); - if (info != null) { - return info.getInfo().getName(); - } - } - return null; - } - - @Override - public void send(Object player, CommandType type, String data, int data1) { - if (player instanceof ProxiedPlayer) { - ProxiedPlayer player1 = (ProxiedPlayer) player; - send(player1, MusicPacketCodec.pack(type, data, data1)); - } - } - - @Override - public Object getPlayer(String player) { - return ProxyServer.getInstance().getPlayer(player); - } - - @Override - public void sendBar(Object player, String data) { - if (player instanceof ProxiedPlayer) { - ProxiedPlayer player1 = (ProxiedPlayer) player; - player1.sendMessage(ChatMessageType.ACTION_BAR, TextComponent.fromLegacyText(data)); - } - } - - @Override - public File getFolder() { - return AllMusicBC.plugin.getDataFolder(); - } - - @Override - public boolean checkPermission(Object player) { - return player.equals(ProxyServer.getInstance().getConsole()); - } - - @Override - public boolean isPlayer(Object source) { - return source instanceof ProxiedPlayer; - } - - @Override - public void runTask(Runnable run, int delay) { - ProxyServer.getInstance().getScheduler() - .schedule(AllMusicBC.plugin, run, delay, TimeUnit.MICROSECONDS); - } - - @Override - public void updateInfo() { - for (Server server : TopServers) { - if (server.isConnected()) { - sendAllToServer(server); - } else { - TopServers.remove(server); - } - } - } - - @Override - public void updateLyric() { - for (Server server : TopServers) { - if (server.isConnected()) { - sendLyricToServer(server); - } else { - TopServers.remove(server); - } - } - } - - @Override - public void ping() { - for (Server server : new HashSet<>(TopServers)) { - if (server.isConnected()) { - ByteArrayDataOutput out = ByteStreams.newDataOutput(); - out.writeInt(200); - server.sendData(AllMusic.channelBC, out.toByteArray()); - } else { - TopServers.remove(server); - } - } - } - - @Override - public boolean onMusicPlay(SongInfoObj obj) { - MusicPlayEvent event = new MusicPlayEvent(obj); - ProxyServer.getInstance().getPluginManager().callEvent(event); - return event.isCancel(); - } - - @Override - public boolean onMusicAdd(Object obj, PlayerAddMusicObj music) { - MusicAddEvent event = new MusicAddEvent(music, (CommandSender) obj); - ProxyServer.getInstance().getPluginManager().callEvent(event); - return event.isCancel(); - } - - private void send(ProxiedPlayer players, ByteBuf data) { - if (players == null) - return; - try { - runTask(() -> players.sendData(AllMusic.channel, data.array())); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c数据发送发生错误"); - e.printStackTrace(); - } - } - - private boolean skip(ProxiedPlayer player) { - String server = player.getServer() == null ? null : player.getServer().getInfo().getName(); - return AllMusic.isSkip(player.getName(), server, true); - } - - @Override - public boolean check(String name, int cost) { - return topEconomy(name, cost, 12); - } - - @Override - public boolean cost(String name, int cost) { - return topEconomy(name, cost, 13); - } - - private boolean topEconomy(String name, int cost, int type) { - ByteArrayDataOutput out = ByteStreams.newDataOutput(); - out.writeInt(type); - String uuid; - do { - uuid = UUID.randomUUID().toString(); - } while (SendToBackend.containsKey(uuid)); - - SendToBackend.put(uuid, -1); - String server = AllMusic.getConfig().economy.backend; - Server toServer = null; - for (Server connection : TopServers) { - if (connection.getInfo().getName().equalsIgnoreCase(server)) { - toServer = connection; - } - } - if (toServer == null) { - AllMusic.log.warning("§d[AllMusic]§c没有找到目标服务器"); - return false; - } - - out.writeUTF(uuid); - out.write(cost); - out.writeUTF(name); - - toServer.sendData(AllMusic.channelBC, out.toByteArray()); - - Integer res; - - int count = 0; - - do { - try { - res = SendToBackend.get(uuid); - if (res == null) - return false; - else if (res == -1) { - Thread.sleep(1); - count++; - } else if (res == 0) { - AllMusic.log.warning("§d[AllMusic]§c后端经济插件错误"); - SendToBackend.remove(uuid); - return false; - } else if (res == 1) { - SendToBackend.remove(uuid); - return false; - } else if (res == 2) { - SendToBackend.remove(uuid); - return true; - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c经济数据发送错误"); - e.printStackTrace(); - } - } while (count < 100); - - AllMusic.log.warning("§d[AllMusic]§c经济数据请求超时"); - - return false; - } -} diff --git a/server_top/src/main/java/com/coloryr/allmusic/server/side/bc/event/MusicAddEvent.java b/server_top/src/main/java/com/coloryr/allmusic/server/side/bc/event/MusicAddEvent.java deleted file mode 100644 index 0c2a3316..00000000 --- a/server_top/src/main/java/com/coloryr/allmusic/server/side/bc/event/MusicAddEvent.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.coloryr.allmusic.server.side.bc.event; - -import com.coloryr.allmusic.server.core.objs.music.PlayerAddMusicObj; -import net.md_5.bungee.api.CommandSender; -import net.md_5.bungee.api.plugin.Event; - -/** - * 音乐添加事件 - */ -public class MusicAddEvent extends Event { - /** - * 添加的音乐 - */ - private final PlayerAddMusicObj music; - /** - * 添加者 - */ - private final CommandSender player; - /** - * 是否取消添加 - */ - private boolean cancel = false; - - public MusicAddEvent(PlayerAddMusicObj id, CommandSender player) { - this.music = id; - this.player = player; - } - - public boolean isCancel() { - return cancel; - } - - public void setCancel(boolean cancel) { - this.cancel = cancel; - } - - public CommandSender getPlayer() { - return player; - } - - public PlayerAddMusicObj getMusic() { - return music; - } -} diff --git a/server_top/src/main/java/com/coloryr/allmusic/server/side/bc/event/MusicPlayEvent.java b/server_top/src/main/java/com/coloryr/allmusic/server/side/bc/event/MusicPlayEvent.java deleted file mode 100644 index 1ba94eb3..00000000 --- a/server_top/src/main/java/com/coloryr/allmusic/server/side/bc/event/MusicPlayEvent.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.coloryr.allmusic.server.side.bc.event; - -import com.coloryr.allmusic.server.core.objs.music.SongInfoObj; -import net.md_5.bungee.api.plugin.Event; - -/** - * 音乐播发事件 - */ -public class MusicPlayEvent extends Event { - /** - * 音乐内容 - */ - private final SongInfoObj music; - /** - * 是否取消 - */ - private boolean cancel = false; - - public MusicPlayEvent(SongInfoObj music) { - this.music = music; - } - - public SongInfoObj getMusic() { - return music; - } - - public boolean isCancel() { - return cancel; - } - - public void setCancel(boolean cancel) { - this.cancel = cancel; - } -} diff --git a/server_top/src/main/java/com/coloryr/allmusic/server/side/velocity/LogVelocity.java b/server_top/src/main/java/com/coloryr/allmusic/server/side/velocity/LogVelocity.java index 5e1d28e9..d63a3943 100644 --- a/server_top/src/main/java/com/coloryr/allmusic/server/side/velocity/LogVelocity.java +++ b/server_top/src/main/java/com/coloryr/allmusic/server/side/velocity/LogVelocity.java @@ -1,22 +1,12 @@ package com.coloryr.allmusic.server.side.velocity; -import com.coloryr.allmusic.server.core.side.IMyLogger; -import org.slf4j.Logger; - -public class LogVelocity implements IMyLogger { - private final Logger logger; - - public LogVelocity(Logger logger) { - this.logger = logger; - } +import com.coloryr.allmusic.server.AllMusicVelocity; +import com.coloryr.allmusic.server.core.side.IAllMusicLogger; +import net.kyori.adventure.text.Component; +public class LogVelocity implements IAllMusicLogger { @Override - public void warning(String data) { - logger.warn(data); - } - - @Override - public void info(String data) { - logger.info(data); + public void data(Component data) { + AllMusicVelocity.plugin.server.sendMessage(data); } } diff --git a/server_top/src/main/java/com/coloryr/allmusic/server/side/velocity/SideVelocity.java b/server_top/src/main/java/com/coloryr/allmusic/server/side/velocity/SideVelocity.java index 2f7791f4..11495ee4 100644 --- a/server_top/src/main/java/com/coloryr/allmusic/server/side/velocity/SideVelocity.java +++ b/server_top/src/main/java/com/coloryr/allmusic/server/side/velocity/SideVelocity.java @@ -20,8 +20,6 @@ import com.velocitypowered.api.proxy.Player; import com.velocitypowered.api.proxy.ServerConnection; import io.netty.buffer.ByteBuf; import net.kyori.adventure.text.Component; -import net.kyori.adventure.text.TextComponent; -import net.kyori.adventure.text.event.ClickEvent; import java.io.File; import java.nio.charset.StandardCharsets; @@ -131,32 +129,13 @@ public class SideVelocity extends BaseSide implements IEconomy { } @Override - public void broadcast(String data) { - if (data == null || data.isEmpty()) - return; - Component message = Component.text(data); + public void broadcast(Component data) { for (Player player : AllMusicVelocity.plugin.server.getAllPlayers()) { if (skip(player)) { continue; } - player.sendMessage(message); - } - } - - @Override - public void broadcastWithRun(String message, String end, String command) { - if (message == null || message.isEmpty()) - return; - TextComponent endtext = Component.text(end) - .clickEvent(ClickEvent.runCommand(command)); - TextComponent send = Component.text(message).append(endtext); - for (Player player : AllMusicVelocity.plugin.server.getAllPlayers()) { - if (skip(player)) { - continue; - } - - player.sendMessage(send); + player.sendMessage(data); } } @@ -218,11 +197,10 @@ public class SideVelocity extends BaseSide implements IEconomy { } @Override - public void sendBar(Object player, String data) { + public void sendBar(Object player, Component data) { if (player instanceof Player) { Player player1 = (Player) player; - Component message = Component.text(data); - player1.sendActionBar(message); + player1.sendActionBar(data); } } @@ -232,33 +210,11 @@ public class SideVelocity extends BaseSide implements IEconomy { } @Override - public void sendMessage(Object obj, String message) { - if (message == null || message.isEmpty()) - return; - CommandSource sender = (CommandSource) obj; - sender.sendMessage(Component.text(message)); - } - - @Override - public void sendMessageRun(Object obj, String message, String end, String command) { - if (message == null || message.isEmpty()) - return; - CommandSource sender = (CommandSource) obj; - TextComponent endtext = Component.text(end) - .clickEvent(ClickEvent.runCommand(command)); - TextComponent send = Component.text(message).append(endtext); - sender.sendMessage(send); - } - - @Override - public void sendMessageSuggest(Object obj, String message, String end, String command) { - if (message == null || message.isEmpty()) - return; - CommandSource sender = (CommandSource) obj; - TextComponent endtext = Component.text(end) - .clickEvent(ClickEvent.suggestCommand(command)); - TextComponent send = Component.text(message).append(endtext); - sender.sendMessage(send); + public void sendMessage(Object obj, Component message) { + if(obj instanceof CommandSource) { + CommandSource source = (CommandSource) obj; + source.sendMessage(message); + } } @Override @@ -345,12 +301,7 @@ public class SideVelocity extends BaseSide implements IEconomy { private void send(Player players, ByteBuf data) { if (players == null) return; - try { - runTask(() -> players.sendPluginMessage(AllMusicVelocity.channel, data.array())); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c数据发送发生错误"); - e.printStackTrace(); - } + runTask(() -> players.sendPluginMessage(AllMusicVelocity.channel, data.array())); } private boolean skip(Player player) { @@ -389,7 +340,7 @@ public class SideVelocity extends BaseSide implements IEconomy { } } if (toServer == null) { - AllMusic.log.warning("§d[AllMusic]§c没有找到目标服务器"); + AllMusic.log.data("[AllMusic3]没有找到目标服务器"); return false; } @@ -412,7 +363,7 @@ public class SideVelocity extends BaseSide implements IEconomy { Thread.sleep(1); count++; } else if (res == 0) { - AllMusic.log.warning("§d[AllMusic]§c后端经济插件错误"); + AllMusic.log.data("[AllMusic3]后端经济插件错误"); SendToBackend.remove(uuid); return false; } else if (res == 1) { @@ -423,12 +374,12 @@ public class SideVelocity extends BaseSide implements IEconomy { return true; } } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c经济数据发送错误"); + AllMusic.log.data("[AllMusic3]经济数据发送错误"); e.printStackTrace(); } } while (count < 100); - AllMusic.log.warning("§d[AllMusic]§c经济数据请求超时"); + AllMusic.log.data("[AllMusic3]经济数据请求超时"); return false; } diff --git a/spigot/src/main/java/com/coloryr/allmusic/server/AllMusicBukkit.java b/spigot/src/main/java/com/coloryr/allmusic/server/AllMusicBukkit.java index acc1ac73..4bc93037 100644 --- a/spigot/src/main/java/com/coloryr/allmusic/server/AllMusicBukkit.java +++ b/spigot/src/main/java/com/coloryr/allmusic/server/AllMusicBukkit.java @@ -26,7 +26,7 @@ public class AllMusicBukkit extends JavaPlugin { AllMusic.log = new LogBukkit(); AllMusic.side = new SideBukkit(); - new AllMusic().init(plugin.getDataFolder()); + AllMusic.init(plugin.getDataFolder()); if (!AllMusic.isRun) { Bukkit.getPluginManager().disablePlugin(this); return; @@ -38,27 +38,27 @@ public class AllMusicBukkit extends JavaPlugin { VaultHook vault = new VaultHook(); AllMusic.economy = vault; if (vault.setupEconomy()) { - AllMusic.log.info("[AllMusic3]Vault支持已启动"); + AllMusic.log.data("[AllMusic3]Vault支持已启动"); } else { - AllMusic.log.info("[AllMusic3]Vault未挂钩"); + AllMusic.log.data("[AllMusic3]Vault未挂钩"); AllMusic.economy = null; } } catch (Exception e) { - AllMusic.log.info("[AllMusic3]Vault未挂钩"); + AllMusic.log.data("[AllMusic3]Vault未挂钩"); AllMusic.economy = null; } } else { - AllMusic.log.info("[AllMusic3]Vault未挂钩"); + AllMusic.log.data("[AllMusic3]Vault未挂钩"); AllMusic.economy = null; } if (Bukkit.getPluginManager().getPlugin("PlaceholderAPI") != null) { PAPI = new AllMusicPAPI(this); if (!PAPI.register()) { - AllMusic.log.info("[AllMusic3]PAPI支持已启动"); + AllMusic.log.data("[AllMusic3]PAPI支持已启动"); } } else { - AllMusic.log.info("[AllMusic3]PAPI未挂钩"); + AllMusic.log.data("[AllMusic3]PAPI未挂钩"); } if (AllMusic.getConfig().topPAPI) { @@ -67,7 +67,7 @@ public class AllMusicBukkit extends JavaPlugin { pluginMessage = new PluginMessage(); getServer().getMessenger().registerOutgoingPluginChannel(this, AllMusic.channelBC); getServer().getMessenger().registerIncomingPluginChannel(this, AllMusic.channelBC, pluginMessage); - AllMusic.log.info("[AllMusic3]设置为顶层模式"); + AllMusic.log.data("[AllMusic3]设置为顶层模式"); } else { CommandBukkit command = new CommandBukkit(); getServer().getMessenger().registerOutgoingPluginChannel(this, AllMusic.channel); diff --git a/spigot/src/main/java/com/coloryr/allmusic/server/side/bukkit/LogBukkit.java b/spigot/src/main/java/com/coloryr/allmusic/server/side/bukkit/LogBukkit.java index 72e36c41..4a6c5579 100644 --- a/spigot/src/main/java/com/coloryr/allmusic/server/side/bukkit/LogBukkit.java +++ b/spigot/src/main/java/com/coloryr/allmusic/server/side/bukkit/LogBukkit.java @@ -1,20 +1,12 @@ package com.coloryr.allmusic.server.side.bukkit; import com.coloryr.allmusic.server.AllMusicBukkit; -import com.coloryr.allmusic.server.core.AllMusic; import com.coloryr.allmusic.server.core.side.IAllMusicLogger; import net.kyori.adventure.text.Component; public class LogBukkit implements IAllMusicLogger { @Override - public void warning(String data) { - Component data1 = AllMusic.miniMessage(data); - AllMusicBukkit.adventure.console().sendMessage(data1); - } - - @Override - public void info(String data) { - Component data1 = AllMusic.miniMessage(data); - AllMusicBukkit.adventure.console().sendMessage(data1); + public void data(Component data) { + AllMusicBukkit.adventure.console().sendMessage(data); } } diff --git a/spigot/src/main/java/com/coloryr/allmusic/server/side/bukkit/SideBukkit.java b/spigot/src/main/java/com/coloryr/allmusic/server/side/bukkit/SideBukkit.java index 227fb2e5..1e41fd03 100644 --- a/spigot/src/main/java/com/coloryr/allmusic/server/side/bukkit/SideBukkit.java +++ b/spigot/src/main/java/com/coloryr/allmusic/server/side/bukkit/SideBukkit.java @@ -71,31 +71,14 @@ public class SideBukkit extends BaseSide { } @Override - public void broadcast(String data) { - if (data == null || data.isEmpty()) - return; - Component message = AllMusic.miniMessage(data); + public void broadcast(Component data) { for (Player player : Bukkit.getOnlinePlayers()) { if (!AllMusic.isSkip(player.getName(), null, false)) { - AllMusicBukkit.adventure.player(player).sendMessage(message); + AllMusicBukkit.adventure.player(player).sendMessage(data); } } } - @Override - public void broadcastWithRun(String message, String end, String command) { - if (message == null || message.isEmpty()) - return; - Component data1 = AllMusic.miniMessageRun(end, command); - Component data2 = AllMusic.miniMessage(message); - data2 = data2.append(data1); - for (Player player : Bukkit.getOnlinePlayers()) { - if (AllMusic.isSkip(player.getName(), null, true)) - continue; - AllMusicBukkit.adventure.player(player).sendMessage(data2); - } - } - @Override public boolean needPlay(boolean islist) { int online = Bukkit.getOnlinePlayers().size(); @@ -149,16 +132,10 @@ public class SideBukkit extends BaseSide { } @Override - public void sendBar(Object player, String message) { - if (message == null || message.isEmpty()) { - return; - } - - Component data1 = AllMusic.miniMessage(message); - + public void sendBar(Object player, Component message) { if (player instanceof Player) { Player player1 = (Player) player; - AllMusicBukkit.adventure.player(player1).sendActionBar(data1); + AllMusicBukkit.adventure.player(player1).sendActionBar(message); } } @@ -168,49 +145,10 @@ public class SideBukkit extends BaseSide { } @Override - public void sendMessage(Object obj, String message) { - if (message == null || message.isEmpty()) - return; - - Component data2 = AllMusic.miniMessage(message); - - if (obj instanceof Player) { - Player sender = (Player) obj; - AllMusicBukkit.adventure.player(sender).sendMessage(data2); - } - else if (obj instanceof CommandSender) { + public void sendMessage(Object obj, Component message) { + if (obj instanceof CommandSender) { CommandSender sender = (CommandSender) obj; - AllMusicBukkit.adventure.sender(sender).sendMessage(data2); - } - } - - @Override - public void sendMessageRun(Object obj, String message, String end, String command) { - if (message == null || message.isEmpty()) - return; - - Component data1 = AllMusic.miniMessageRun(end, command); - Component data2 = AllMusic.miniMessage(message); - data2 = data2.append(data1); - - if (obj instanceof Player) { - Player player = (Player) obj; - AllMusicBukkit.adventure.player(player).sendMessage(data2); - } - } - - @Override - public void sendMessageSuggest(Object obj, String message, String end, String command) { - if (message == null || message.isEmpty()) - return; - - Component data1 = AllMusic.miniMessageSuggest(end, command); - Component data2 = AllMusic.miniMessage(message); - data2 = data2.append(data1); - - if (obj instanceof Player) { - Player player = (Player) obj; - AllMusicBukkit.adventure.player(player).sendMessage(data2); + AllMusicBukkit.adventure.sender(sender).sendMessage(message); } } diff --git a/spigot/src/main/java/com/coloryr/allmusic/server/side/bukkit/hooks/AllMusicPAPI.java b/spigot/src/main/java/com/coloryr/allmusic/server/side/bukkit/hooks/AllMusicPAPI.java index b55ccfef..0efcc6e9 100644 --- a/spigot/src/main/java/com/coloryr/allmusic/server/side/bukkit/hooks/AllMusicPAPI.java +++ b/spigot/src/main/java/com/coloryr/allmusic/server/side/bukkit/hooks/AllMusicPAPI.java @@ -29,7 +29,7 @@ public class AllMusicPAPI extends PlaceholderExpansion { @Override public boolean register() { - AllMusic.log.info("正在挂钩PlaceholderAPI"); + AllMusic.log.data("[AllMusic3]正在挂钩PlaceholderAPI"); return super.register(); }