From 035f9b910a177cfad8480d5c74b337aaa4a8dac7 Mon Sep 17 00:00:00 2001 From: Coloryr <402067010@qq.com> Date: Mon, 13 May 2024 09:33:41 +0800 Subject: [PATCH] up --- .gitignore | 3 +- .../server/bstats => bstats}/MetricsBase.java | 131 +++++++++++------- .../charts/AdvancedBarChart.java | 4 +- .../bstats => bstats}/charts/AdvancedPie.java | 4 +- .../bstats => bstats}/charts/CustomChart.java | 4 +- .../charts/DrilldownPie.java | 4 +- .../charts/MultiLineChart.java | 4 +- .../charts/SimpleBarChart.java | 4 +- .../bstats => bstats}/charts/SimplePie.java | 4 +- .../charts/SingleLineChart.java | 4 +- .../config/MetricsConfig.java | 2 +- .../json/JsonObjectBuilder.java | 2 +- core/AllMusic.java | 10 +- core/command/CommandAddList.java | 17 ++- core/command/CommandEX.java | 8 +- core/command/CommandSearch.java | 4 +- core/music/api/APIMain.java | 2 +- core/music/play/MusicSearch.java | 4 +- core/music/play/PlayGo.java | 61 ++++---- core/music/play/PlayMusic.java | 48 ++++--- core/objs/config/ConfigObj.java | 47 +++---- core/objs/config/CostObj.java | 24 ++++ core/objs/config/LimitObj.java | 54 ++++++++ core/objs/message/CustomObj.java | 8 +- core/objs/message/MusicPlayObj.java | 4 + core/side/{ISide.java => BaseSide.java} | 37 ++++- core/utils/HudUtils.java | 10 +- folia/build.gradle | 10 +- .../server/side/folia/MetricsFolia.java | 6 +- .../allmusic/server/side/folia/SideFolia.java | 35 +---- .../server/side/folia/hooks/AllMusicPAPI.java | 4 - link.cmd | 6 + remove.cmd | 6 + server/build.gradle | 4 +- .../server/side/bukkit/SideBukkit.java | 127 +++++++++-------- .../side/bukkit/hooks/AllMusicPAPI.java | 4 - server/src/main/resources/plugin.yml | 2 +- server_top/build.gradle | 2 +- .../allmusic/server/side/bc/SideBC.java | 32 +---- .../server/side/velocity/SideVelocity.java | 31 +---- server_top/src/main/resources/bungee.yml | 2 +- 41 files changed, 443 insertions(+), 336 deletions(-) rename {folia/src/main/java/com/coloryr/allmusic/server/bstats => bstats}/MetricsBase.java (76%) rename {folia/src/main/java/com/coloryr/allmusic/server/bstats => bstats}/charts/AdvancedBarChart.java (92%) rename {folia/src/main/java/com/coloryr/allmusic/server/bstats => bstats}/charts/AdvancedPie.java (92%) rename {folia/src/main/java/com/coloryr/allmusic/server/bstats => bstats}/charts/CustomChart.java (90%) rename {folia/src/main/java/com/coloryr/allmusic/server/bstats => bstats}/charts/DrilldownPie.java (93%) rename {folia/src/main/java/com/coloryr/allmusic/server/bstats => bstats}/charts/MultiLineChart.java (92%) rename {folia/src/main/java/com/coloryr/allmusic/server/bstats => bstats}/charts/SimpleBarChart.java (90%) rename {folia/src/main/java/com/coloryr/allmusic/server/bstats => bstats}/charts/SimplePie.java (87%) rename {folia/src/main/java/com/coloryr/allmusic/server/bstats => bstats}/charts/SingleLineChart.java (87%) rename {folia/src/main/java/com/coloryr/allmusic/server/bstats => bstats}/config/MetricsConfig.java (99%) rename {folia/src/main/java/com/coloryr/allmusic/server/bstats => bstats}/json/JsonObjectBuilder.java (99%) create mode 100644 core/objs/config/CostObj.java create mode 100644 core/objs/config/LimitObj.java rename core/side/{ISide.java => BaseSide.java} (83%) diff --git a/.gitignore b/.gitignore index 3c8c36ec..418ac0db 100644 --- a/.gitignore +++ b/.gitignore @@ -26,4 +26,5 @@ forge*changelog.txt lib **/allmusic/server/core/ -**/allmusic/server/codec/ \ No newline at end of file +**/allmusic/server/codec/ +**/allmusic/server/bstats/ \ No newline at end of file diff --git a/folia/src/main/java/com/coloryr/allmusic/server/bstats/MetricsBase.java b/bstats/MetricsBase.java similarity index 76% rename from folia/src/main/java/com/coloryr/allmusic/server/bstats/MetricsBase.java rename to bstats/MetricsBase.java index df382d86..fb5678fd 100644 --- a/folia/src/main/java/com/coloryr/allmusic/server/bstats/MetricsBase.java +++ b/bstats/MetricsBase.java @@ -1,17 +1,21 @@ -package coloryr.allmusic.bstats; +package com.coloryr.allmusic.server.bstats; -import coloryr.allmusic.bstats.charts.CustomChart; -import coloryr.allmusic.bstats.json.JsonObjectBuilder; +import com.coloryr.allmusic.server.bstats.charts.CustomChart; +import com.coloryr.allmusic.server.bstats.json.JsonObjectBuilder; import javax.net.ssl.HttpsURLConnection; -import java.io.*; +import java.io.BufferedReader; +import java.io.ByteArrayOutputStream; +import java.io.DataOutputStream; +import java.io.IOException; +import java.io.InputStreamReader; import java.net.URL; import java.nio.charset.StandardCharsets; import java.util.HashSet; import java.util.Objects; import java.util.Set; -import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.ScheduledThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.function.BiConsumer; import java.util.function.Consumer; @@ -23,12 +27,12 @@ public class MetricsBase { /** * The version of the Metrics class. */ - public static final String METRICS_VERSION = "3.0.1-SNAPSHOT"; + public static final String METRICS_VERSION = "3.0.3-SNAPSHOT"; - private static final ScheduledExecutorService scheduler = - Executors.newScheduledThreadPool(1, task -> new Thread(task, "bStats-Metrics")); private static final String REPORT_URL = "https://bStats.org/api/v2/data/%s"; + private final ScheduledExecutorService scheduler; + private final String platform; private final String serverUuid; private final int serviceId; @@ -54,19 +58,28 @@ public class MetricsBase { * @param serviceId The id of the service. * @param serverUuid The server uuid. * @param enabled Whether or not data sending is enabled. - * @param appendPlatformDataConsumer A consumer that receives a {@code JsonObjectBuilder} and appends all + * @param appendPlatformDataConsumer A consumer that receives a + * {@code JsonObjectBuilder} and appends all * platform-specific data. - * @param appendServiceDataConsumer A consumer that receives a {@code JsonObjectBuilder} and appends all + * @param appendServiceDataConsumer A consumer that receives a + * {@code JsonObjectBuilder} and appends all * service-specific data. - * @param submitTaskConsumer A consumer that takes a runnable with the submit task. - * This can be used to delegate the data collection to a another thread to prevent - * errors caused by concurrency. Can be {@code null}. - * @param checkServiceEnabledSupplier A supplier to check if the service is still enabled. - * @param errorLogger A consumer that accepts log message and an error. + * @param submitTaskConsumer A consumer that takes a runnable with the + * submit task. + * This can be used to delegate the data + * collection to a another thread to prevent + * errors caused by concurrency. Can be + * {@code null}. + * @param checkServiceEnabledSupplier A supplier to check if the service is + * still enabled. + * @param errorLogger A consumer that accepts log message and an + * error. * @param infoLogger A consumer that accepts info log messages. * @param logErrors Whether or not errors should be logged. - * @param logSentData Whether or not the sent data should be logged. - * @param logResponseStatusText Whether or not the response status text should be logged. + * @param logSentData Whether or not the sent data should be + * logged. + * @param logResponseStatusText Whether or not the response status text + * should be logged. */ public MetricsBase( String platform, @@ -81,8 +94,16 @@ public class MetricsBase { Consumer infoLogger, boolean logErrors, boolean logSentData, - boolean logResponseStatusText - ) { + boolean logResponseStatusText) { + ScheduledThreadPoolExecutor scheduler = new ScheduledThreadPoolExecutor(1, + task -> new Thread(task, "bStats-Metrics")); + // We want delayed tasks (non-periodic) that will execute in the future to be + // cancelled when the scheduler is shutdown. + // Otherwise, we risk preventing the server from shutting down even when + // MetricsBase#shutdown() is called + scheduler.setExecuteExistingDelayedTasksAfterShutdownPolicy(false); + this.scheduler = scheduler; + this.platform = platform; this.serverUuid = serverUuid; this.serviceId = serviceId; @@ -99,32 +120,20 @@ public class MetricsBase { checkRelocation(); - if (enabled) { // WARNING: Removing the option to opt-out will get your plugin banned from bStats + if (enabled) { // WARNING: Removing the option to opt-out will get your plugin banned from + // bStats startSubmitting(); } } - /** - * Gzips the given string. - * - * @param str The string to gzip. - * @return The gzipped string. - */ - private static byte[] compress(final String str) throws IOException { - if (str == null) { - return null; - } - ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); - try (GZIPOutputStream gzip = new GZIPOutputStream(outputStream)) { - gzip.write(str.getBytes(StandardCharsets.UTF_8)); - } - return outputStream.toByteArray(); - } - public void addCustomChart(CustomChart chart) { this.customCharts.add(chart); } + public void shutdown() { + scheduler.shutdown(); + } + private void startSubmitting() { final Runnable submitTask = () -> { if (!enabled || !checkServiceEnabledSupplier.get()) { // Submitting data or service is disabled @@ -138,10 +147,14 @@ public class MetricsBase { } }; - // Many servers tend to restart at a fixed time at xx:00 which causes an uneven distribution of requests on the - // bStats backend. To circumvent this problem, we introduce some randomness into the initial and second delay. - // WARNING: You must not modify and part of this Metrics class, including the submit delay or frequency! - // WARNING: Modifying this code will get your plugin banned on bStats. Just don't do it! + // Many servers tend to restart at a fixed time at xx:00 which causes an uneven + // distribution of requests on the + // bStats backend. To circumvent this problem, we introduce some randomness into + // the initial and second delay. + // WARNING: You must not modify and part of this Metrics class, including the + // submit delay or frequency! + // WARNING: Modifying this code will get your plugin banned on bStats. Just + // don't do it! long initialDelay = (long) (1000 * 60 * (3 + Math.random() * 3)); long secondDelay = (long) (1000 * 60 * (Math.random() * 30)); scheduler.schedule(submitTask, initialDelay, TimeUnit.MILLISECONDS); @@ -223,16 +236,38 @@ public class MetricsBase { */ private void checkRelocation() { // You can use the property to disable the check in your test environment - if (System.getProperty("bstats.relocatecheck") == null || !System.getProperty("bstats.relocatecheck").equals("false")) { - // Maven's Relocate is clever and changes strings, too. So we have to use this little "trick" ... :D + if (System.getProperty("bstats.relocatecheck") == null + || !System.getProperty("bstats.relocatecheck").equals("false")) { + // Maven's Relocate is clever and changes strings, too. So we have to use this + // little "trick" ... :D final String defaultPackage = new String( - new byte[]{'o', 'r', 'g', '.', 'b', 's', 't', 'a', 't', 's'}); - final String examplePackage = new String(new byte[]{'y', 'o', 'u', 'r', '.', 'p', 'a', 'c', 'k', 'a', 'g', 'e'}); - // We want to make sure no one just copy & pastes the example and uses the wrong package names - if (MetricsBase.class.getPackage().getName().startsWith(defaultPackage) || MetricsBase.class.getPackage().getName().startsWith(examplePackage)) { + new byte[] { 'o', 'r', 'g', '.', 'b', 's', 't', 'a', 't', 's' }); + final String examplePackage = new String( + new byte[] { 'y', 'o', 'u', 'r', '.', 'p', 'a', 'c', 'k', 'a', 'g', 'e' }); + // We want to make sure no one just copy & pastes the example and uses the wrong + // package names + if (MetricsBase.class.getPackage().getName().startsWith(defaultPackage) + || MetricsBase.class.getPackage().getName().startsWith(examplePackage)) { throw new IllegalStateException("bStats Metrics class has not been relocated correctly!"); } } } -} + /** + * Gzips the given string. + * + * @param str The string to gzip. + * @return The gzipped string. + */ + private static byte[] compress(final String str) throws IOException { + if (str == null) { + return null; + } + ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); + try (GZIPOutputStream gzip = new GZIPOutputStream(outputStream)) { + gzip.write(str.getBytes(StandardCharsets.UTF_8)); + } + return outputStream.toByteArray(); + } + +} \ No newline at end of file diff --git a/folia/src/main/java/com/coloryr/allmusic/server/bstats/charts/AdvancedBarChart.java b/bstats/charts/AdvancedBarChart.java similarity index 92% rename from folia/src/main/java/com/coloryr/allmusic/server/bstats/charts/AdvancedBarChart.java rename to bstats/charts/AdvancedBarChart.java index 376dcbbf..c36e776e 100644 --- a/folia/src/main/java/com/coloryr/allmusic/server/bstats/charts/AdvancedBarChart.java +++ b/bstats/charts/AdvancedBarChart.java @@ -1,6 +1,6 @@ -package coloryr.allmusic.bstats.charts; +package com.coloryr.allmusic.server.bstats.charts; -import coloryr.allmusic.bstats.json.JsonObjectBuilder; +import com.coloryr.allmusic.server.bstats.json.JsonObjectBuilder; import java.util.Map; import java.util.concurrent.Callable; diff --git a/folia/src/main/java/com/coloryr/allmusic/server/bstats/charts/AdvancedPie.java b/bstats/charts/AdvancedPie.java similarity index 92% rename from folia/src/main/java/com/coloryr/allmusic/server/bstats/charts/AdvancedPie.java rename to bstats/charts/AdvancedPie.java index 90e33c55..0fb00fef 100644 --- a/folia/src/main/java/com/coloryr/allmusic/server/bstats/charts/AdvancedPie.java +++ b/bstats/charts/AdvancedPie.java @@ -1,6 +1,6 @@ -package coloryr.allmusic.bstats.charts; +package com.coloryr.allmusic.server.bstats.charts; -import coloryr.allmusic.bstats.json.JsonObjectBuilder; +import com.coloryr.allmusic.server.bstats.json.JsonObjectBuilder; import java.util.Map; import java.util.concurrent.Callable; diff --git a/folia/src/main/java/com/coloryr/allmusic/server/bstats/charts/CustomChart.java b/bstats/charts/CustomChart.java similarity index 90% rename from folia/src/main/java/com/coloryr/allmusic/server/bstats/charts/CustomChart.java rename to bstats/charts/CustomChart.java index b73d8cee..e1595e0c 100644 --- a/folia/src/main/java/com/coloryr/allmusic/server/bstats/charts/CustomChart.java +++ b/bstats/charts/CustomChart.java @@ -1,6 +1,6 @@ -package coloryr.allmusic.bstats.charts; +package com.coloryr.allmusic.server.bstats.charts; -import coloryr.allmusic.bstats.json.JsonObjectBuilder; +import com.coloryr.allmusic.server.bstats.json.JsonObjectBuilder; import java.util.function.BiConsumer; diff --git a/folia/src/main/java/com/coloryr/allmusic/server/bstats/charts/DrilldownPie.java b/bstats/charts/DrilldownPie.java similarity index 93% rename from folia/src/main/java/com/coloryr/allmusic/server/bstats/charts/DrilldownPie.java rename to bstats/charts/DrilldownPie.java index 7d2d87e2..43dbfaa3 100644 --- a/folia/src/main/java/com/coloryr/allmusic/server/bstats/charts/DrilldownPie.java +++ b/bstats/charts/DrilldownPie.java @@ -1,6 +1,6 @@ -package coloryr.allmusic.bstats.charts; +package com.coloryr.allmusic.server.bstats.charts; -import coloryr.allmusic.bstats.json.JsonObjectBuilder; +import com.coloryr.allmusic.server.bstats.json.JsonObjectBuilder; import java.util.Map; import java.util.concurrent.Callable; diff --git a/folia/src/main/java/com/coloryr/allmusic/server/bstats/charts/MultiLineChart.java b/bstats/charts/MultiLineChart.java similarity index 92% rename from folia/src/main/java/com/coloryr/allmusic/server/bstats/charts/MultiLineChart.java rename to bstats/charts/MultiLineChart.java index 63d0f74d..fac5d969 100644 --- a/folia/src/main/java/com/coloryr/allmusic/server/bstats/charts/MultiLineChart.java +++ b/bstats/charts/MultiLineChart.java @@ -1,6 +1,6 @@ -package coloryr.allmusic.bstats.charts; +package com.coloryr.allmusic.server.bstats.charts; -import coloryr.allmusic.bstats.json.JsonObjectBuilder; +import com.coloryr.allmusic.server.bstats.json.JsonObjectBuilder; import java.util.Map; import java.util.concurrent.Callable; diff --git a/folia/src/main/java/com/coloryr/allmusic/server/bstats/charts/SimpleBarChart.java b/bstats/charts/SimpleBarChart.java similarity index 90% rename from folia/src/main/java/com/coloryr/allmusic/server/bstats/charts/SimpleBarChart.java rename to bstats/charts/SimpleBarChart.java index 934de4df..184b5546 100644 --- a/folia/src/main/java/com/coloryr/allmusic/server/bstats/charts/SimpleBarChart.java +++ b/bstats/charts/SimpleBarChart.java @@ -1,6 +1,6 @@ -package coloryr.allmusic.bstats.charts; +package com.coloryr.allmusic.server.bstats.charts; -import coloryr.allmusic.bstats.json.JsonObjectBuilder; +import com.coloryr.allmusic.server.bstats.json.JsonObjectBuilder; import java.util.Map; import java.util.concurrent.Callable; diff --git a/folia/src/main/java/com/coloryr/allmusic/server/bstats/charts/SimplePie.java b/bstats/charts/SimplePie.java similarity index 87% rename from folia/src/main/java/com/coloryr/allmusic/server/bstats/charts/SimplePie.java rename to bstats/charts/SimplePie.java index b7db8a8b..41923e63 100644 --- a/folia/src/main/java/com/coloryr/allmusic/server/bstats/charts/SimplePie.java +++ b/bstats/charts/SimplePie.java @@ -1,6 +1,6 @@ -package coloryr.allmusic.bstats.charts; +package com.coloryr.allmusic.server.bstats.charts; -import coloryr.allmusic.bstats.json.JsonObjectBuilder; +import com.coloryr.allmusic.server.bstats.json.JsonObjectBuilder; import java.util.concurrent.Callable; diff --git a/folia/src/main/java/com/coloryr/allmusic/server/bstats/charts/SingleLineChart.java b/bstats/charts/SingleLineChart.java similarity index 87% rename from folia/src/main/java/com/coloryr/allmusic/server/bstats/charts/SingleLineChart.java rename to bstats/charts/SingleLineChart.java index 6c23c33d..ea4ae553 100644 --- a/folia/src/main/java/com/coloryr/allmusic/server/bstats/charts/SingleLineChart.java +++ b/bstats/charts/SingleLineChart.java @@ -1,6 +1,6 @@ -package coloryr.allmusic.bstats.charts; +package com.coloryr.allmusic.server.bstats.charts; -import coloryr.allmusic.bstats.json.JsonObjectBuilder; +import com.coloryr.allmusic.server.bstats.json.JsonObjectBuilder; import java.util.concurrent.Callable; diff --git a/folia/src/main/java/com/coloryr/allmusic/server/bstats/config/MetricsConfig.java b/bstats/config/MetricsConfig.java similarity index 99% rename from folia/src/main/java/com/coloryr/allmusic/server/bstats/config/MetricsConfig.java rename to bstats/config/MetricsConfig.java index a0b08fd1..148c5c3a 100644 --- a/folia/src/main/java/com/coloryr/allmusic/server/bstats/config/MetricsConfig.java +++ b/bstats/config/MetricsConfig.java @@ -1,4 +1,4 @@ -package coloryr.allmusic.bstats.config; +package com.coloryr.allmusic.server.bstats.config; import java.io.*; import java.util.ArrayList; diff --git a/folia/src/main/java/com/coloryr/allmusic/server/bstats/json/JsonObjectBuilder.java b/bstats/json/JsonObjectBuilder.java similarity index 99% rename from folia/src/main/java/com/coloryr/allmusic/server/bstats/json/JsonObjectBuilder.java rename to bstats/json/JsonObjectBuilder.java index aa6b16d1..17130eb7 100644 --- a/folia/src/main/java/com/coloryr/allmusic/server/bstats/json/JsonObjectBuilder.java +++ b/bstats/json/JsonObjectBuilder.java @@ -1,4 +1,4 @@ -package coloryr.allmusic.bstats.json; +package com.coloryr.allmusic.server.bstats.json; import java.util.Arrays; import java.util.stream.Collectors; diff --git a/core/AllMusic.java b/core/AllMusic.java index d78b7a23..cf6477a7 100644 --- a/core/AllMusic.java +++ b/core/AllMusic.java @@ -9,7 +9,7 @@ import com.coloryr.allmusic.server.core.objs.config.ConfigObj; import com.coloryr.allmusic.server.core.objs.message.MessageObj; import com.coloryr.allmusic.server.core.objs.music.SearchPageObj; import com.coloryr.allmusic.server.core.side.IMyLogger; -import com.coloryr.allmusic.server.core.side.ISide; +import com.coloryr.allmusic.server.core.side.BaseSide; import com.coloryr.allmusic.server.core.sql.DataSql; import com.coloryr.allmusic.server.core.sql.IEconomy; import com.coloryr.allmusic.server.core.utils.Logs; @@ -35,15 +35,15 @@ public class AllMusic { /** * 插件版本号 */ - public static final String version = "3.0.0"; + public static final String version = "3.1.0"; /** * 配置文件版本号 */ - public static final String configVersion = "200"; + public static final String configVersion = "201"; /** * 语言文件配置版本号 */ - public static final String messageVersion = "200"; + public static final String messageVersion = "201"; /** * 搜歌结果 * 玩家名 结果 @@ -72,7 +72,7 @@ public class AllMusic { /** * 服务器端操作 */ - public static ISide side; + public static BaseSide side; /** * 是否在运行 */ diff --git a/core/command/CommandAddList.java b/core/command/CommandAddList.java index 783fda39..dd70da0d 100644 --- a/core/command/CommandAddList.java +++ b/core/command/CommandAddList.java @@ -10,9 +10,20 @@ public class CommandAddList extends ACommand { AllMusic.side.sendMessage(sender, AllMusic.getMessage().command.error); return; } - if (Function.isInteger(args[1])) { - AllMusic.getMusicApi().setList(args[1], sender); - AllMusic.side.sendMessage(sender, "§d[AllMusic3]§2添加空闲音乐列表" + args[1]); + + String musicID; + + if (args[1].contains("id=") && !args[1].contains("/?userid")) { + if (args[1].contains("&user")) + musicID = Function.getString(args[1], "id=", "&user"); + else + musicID = Function.getString(args[1], "id=", null); + } else + musicID = args[1]; + + if (Function.isInteger(musicID)) { + AllMusic.getMusicApi().setList(musicID, sender); + AllMusic.side.sendMessage(sender, "§d[AllMusic3]§2添加空闲音乐列表" + musicID); } else { AllMusic.side.sendMessage(sender, "§d[AllMusic3]§2请输入有效的音乐列表ID"); } diff --git a/core/command/CommandEX.java b/core/command/CommandEX.java index da549ed2..a59cc71d 100644 --- a/core/command/CommandEX.java +++ b/core/command/CommandEX.java @@ -107,7 +107,7 @@ public class CommandEX { * @return 结果 */ public static boolean checkMoney(Object sender, String name, int cost) { - if (!AllMusic.getConfig().useCost || AllMusic.economy == null) { + if (!AllMusic.getConfig().cost.useCost || AllMusic.economy == null) { return false; } @@ -128,7 +128,7 @@ public class CommandEX { * @return 结果 */ public static boolean cost(Object sender, String name, int cost, String message) { - if (!AllMusic.getConfig().useCost || AllMusic.economy == null) { + if (!AllMusic.getConfig().cost.useCost || AllMusic.economy == null) { return false; } @@ -175,10 +175,10 @@ public class CommandEX { } else if (AllMusic.getConfig().banPlayer.contains(name)) { AllMusic.side.sendMessage(sender, AllMusic.getMessage().addMusic.playerBan); } else { - if (checkMoney(sender, name, AllMusic.getConfig().addMusicCost)) { + if (checkMoney(sender, name, AllMusic.getConfig().cost.addMusicCost)) { return; } - if (cost(sender, name, AllMusic.getConfig().addMusicCost, + if (cost(sender, name, AllMusic.getConfig().cost.addMusicCost, AllMusic.getMessage().cost.addMusic)) { return; } diff --git a/core/command/CommandSearch.java b/core/command/CommandSearch.java index 91f55110..cba06f69 100644 --- a/core/command/CommandSearch.java +++ b/core/command/CommandSearch.java @@ -10,10 +10,10 @@ public class CommandSearch extends ACommand { AllMusic.side.sendMessage(sender, AllMusic.getMessage().search.noPer); return; } - if (CommandEX.checkMoney(sender, name, AllMusic.getConfig().searchCost)) { + if (CommandEX.checkMoney(sender, name, AllMusic.getConfig().cost.searchCost)) { return; } - if (CommandEX.cost(sender, name, AllMusic.getConfig().searchCost, + if (CommandEX.cost(sender, name, AllMusic.getConfig().cost.searchCost, AllMusic.getMessage().cost.search)) { return; } diff --git a/core/music/api/APIMain.java b/core/music/api/APIMain.java index 56322253..7f9d0569 100644 --- a/core/music/api/APIMain.java +++ b/core/music/api/APIMain.java @@ -224,7 +224,7 @@ public class APIMain { isUpdate = true; DataObj obj = AllMusic.gson.fromJson(res.data, DataObj.class); PlayMusic.addIdleList(obj.getPlaylist()); - AllMusic.side.sendMessaget(sender, AllMusic.getMessage().musicPlay.listMusic.get.replace("%ListName%", obj.getName())); + AllMusic.side.sendMessageTask(sender, AllMusic.getMessage().musicPlay.listMusic.get.replace("%ListName%", obj.getName())); } catch (Exception e) { AllMusic.log.warning("§d[AllMusic3]§c歌曲列表获取错误"); e.printStackTrace(); diff --git a/core/music/play/MusicSearch.java b/core/music/play/MusicSearch.java index 1bbf459b..cee1c761 100644 --- a/core/music/play/MusicSearch.java +++ b/core/music/play/MusicSearch.java @@ -19,10 +19,10 @@ public class MusicSearch { if (obj != null) { SearchPageObj search = AllMusic.getMusicApi().search(obj.args, obj.isDefault); if (search == null) - AllMusic.side.sendMessaget(obj.sender, AllMusic.getMessage().search + AllMusic.side.sendMessageTask(obj.sender, AllMusic.getMessage().search .cantSearch.replace("%Music%", obj.isDefault ? obj.args[0] : obj.args[1])); else { - AllMusic.side.sendMessaget(obj.sender, AllMusic.getMessage().search.res); + AllMusic.side.sendMessageTask(obj.sender, AllMusic.getMessage().search.res); AllMusic.addSearch(obj.name, search); AllMusic.side.runTask(() -> CommandEX.showSearch(obj.sender, search)); } diff --git a/core/music/play/PlayGo.java b/core/music/play/PlayGo.java index 28b36301..de8e3d39 100644 --- a/core/music/play/PlayGo.java +++ b/core/music/play/PlayGo.java @@ -1,9 +1,10 @@ package com.coloryr.allmusic.server.core.music.play; import com.coloryr.allmusic.server.core.AllMusic; -import com.coloryr.allmusic.server.core.objs.music.MusicObj; +import com.coloryr.allmusic.server.core.objs.config.LimitObj; import com.coloryr.allmusic.server.core.objs.music.SongInfoObj; import com.coloryr.allmusic.server.core.utils.HudUtils; +import org.jetbrains.annotations.NotNull; import java.util.List; import java.util.concurrent.Executors; @@ -140,7 +141,7 @@ public class PlayGo { SongInfoObj push = PlayMusic.push; if (PlayMusic.nowPlayMusic.getID().equalsIgnoreCase(push.getID())) { PlayMusic.voteTime = 0; - AllMusic.side.bqt(AllMusic.getMessage().push.cancel); + AllMusic.side.bqTask(AllMusic.getMessage().push.cancel); return false; } List list = PlayMusic.getList(); @@ -173,22 +174,22 @@ public class PlayGo { if (!checkPush()) { PlayMusic.push = null; PlayMusic.pushTime = 0; - AllMusic.side.bqt(AllMusic.getMessage().push.cancel); + AllMusic.side.bqTask(AllMusic.getMessage().push.cancel); } else { PlayMusic.pushTime--; if (PlayMusic.pushTime == 0) { PlayMusic.push = null; AllMusic.clearPush(); - AllMusic.side.bqt(AllMusic.getMessage().push.timeOut); + AllMusic.side.bqTask(AllMusic.getMessage().push.timeOut); } else { - int players = AllMusic.side.getAllPlayer(); + int players = AllMusic.side.getPlayerSize(); if (AllMusic.getVoteCount() >= AllMusic.getConfig().minVote || (players <= AllMusic.getConfig().minVote && players <= AllMusic.getVoteCount())) { SongInfoObj info = PlayMusic.push; PlayMusic.push = null; PlayMusic.pushMusic(info); - AllMusic.side.bqt(AllMusic.getMessage().push.doPush); + AllMusic.side.bqTask(AllMusic.getMessage().push.doPush); AllMusic.clearPush(); PlayMusic.pushTime = 0; } @@ -199,13 +200,13 @@ public class PlayGo { PlayMusic.voteTime--; if (PlayMusic.voteTime == 0) { AllMusic.clearPush(); - AllMusic.side.bqt(AllMusic.getMessage().vote.timeOut); + AllMusic.side.bqTask(AllMusic.getMessage().vote.timeOut); } else { - int players = AllMusic.side.getAllPlayer(); + int players = AllMusic.side.getPlayerSize(); if (AllMusic.getVoteCount() >= AllMusic.getConfig().minVote || (players <= AllMusic.getConfig().minVote && players <= AllMusic.getVoteCount())) { - AllMusic.side.bqt(AllMusic.getMessage().vote.voteDone); + AllMusic.side.bqTask(AllMusic.getMessage().vote.voteDone); AllMusic.clearVote(); PlayMusic.musicLessTime = 0; PlayMusic.voteTime = 0; @@ -227,11 +228,7 @@ public class PlayGo { if (AllMusic.side.needPlay()) { String ID = PlayMusic.getIdleMusic(); if (ID != null) { - MusicObj obj = new MusicObj(); - obj.sender = ID; - obj.name = "空闲列表"; - obj.isDefault = true; - PlayMusic.addMusic(null, ID, "空闲列表", true); + PlayMusic.addMusic(null, ID, AllMusic.getMessage().custom.idle, true); } } } @@ -244,7 +241,7 @@ public class PlayGo { AllMusic.side.sendHudUtilsAll(); PlayMusic.nowPlayMusic = PlayMusic.remove(0); if (AllMusic.side.onMusicPlay(PlayMusic.nowPlayMusic)) { - AllMusic.side.bqt(AllMusic.getMessage().musicPlay.cancel); + AllMusic.side.bqTask(AllMusic.getMessage().musicPlay.cancel); continue; } @@ -253,7 +250,7 @@ public class PlayGo { PlayMusic.nowPlayMusic.getPlayerUrl(); if (url == null) { String data = AllMusic.getMessage().musicPlay.emptyCanPlay; - AllMusic.side.bqt(data.replace("%MusicID%", PlayMusic.nowPlayMusic.getID())); + AllMusic.side.bqTask(data.replace("%MusicID%", PlayMusic.nowPlayMusic.getID())); PlayMusic.nowPlayMusic = null; continue; } @@ -268,26 +265,17 @@ public class PlayGo { startTimer(); AllMusic.side.sendMusic(url); if (!AllMusic.getConfig().mutePlayMessage) { - String info = AllMusic.getMessage().musicPlay.nowPlay - .replace("%MusicName%", PlayMusic.nowPlayMusic.getName()) - .replace("%MusicAuthor%", PlayMusic.nowPlayMusic.getAuthor()) - .replace("%MusicAl%", PlayMusic.nowPlayMusic.getAl()) - .replace("%MusicAlia%", PlayMusic.nowPlayMusic.getAlia()) - .replace("%PlayerName%", PlayMusic.nowPlayMusic.getCall()); - if (AllMusic.getConfig().messageLimit - && info.length() > AllMusic.getConfig().messageLimitSize) { - info = info.substring(0, AllMusic.getConfig().messageLimitSize) + "..."; - } + String info = getInfo(); if (AllMusic.getConfig().showInBar) AllMusic.side.sendBar(info); else - AllMusic.side.bqt(info); + AllMusic.side.bqTask(info); } if (!PlayMusic.nowPlayMusic.isUrl() && PlayMusic.nowPlayMusic.getPicUrl() != null) { AllMusic.side.sendPic(PlayMusic.nowPlayMusic.getPicUrl()); } if (PlayMusic.nowPlayMusic.isTrial()) { - AllMusic.side.bqt(AllMusic.getMessage().musicPlay.trail); + AllMusic.side.bqTask(AllMusic.getMessage().musicPlay.trail); PlayMusic.musicLessTime = PlayMusic.nowPlayMusic.getTrialInfo().getEnd(); PlayMusic.musicNowTime = PlayMusic.nowPlayMusic.getTrialInfo().getStart(); } @@ -305,7 +293,7 @@ public class PlayGo { AllMusic.side.sendStop(); } else { String data = AllMusic.getMessage().musicPlay.emptyCanPlay; - AllMusic.side.bqt(data.replace("%MusicID%", PlayMusic.nowPlayMusic.getID())); + AllMusic.side.bqTask(data.replace("%MusicID%", PlayMusic.nowPlayMusic.getID())); } clear(); } @@ -315,4 +303,19 @@ public class PlayGo { } } } + + private static @NotNull String getInfo() { + String info = AllMusic.getMessage().musicPlay.nowPlay + .replace("%MusicName%", PlayMusic.nowPlayMusic.getName()) + .replace("%MusicAuthor%", PlayMusic.nowPlayMusic.getAuthor()) + .replace("%MusicAl%", PlayMusic.nowPlayMusic.getAl()) + .replace("%MusicAlia%", PlayMusic.nowPlayMusic.getAlia()) + .replace("%PlayerName%", PlayMusic.nowPlayMusic.getCall()); + LimitObj limit = AllMusic.getConfig().limit; + if (limit.messageLimit + && info.length() > limit.messageLimitSize) { + info = info.substring(0, limit.messageLimitSize) + limit.limitText; + } + return info; + } } diff --git a/core/music/play/PlayMusic.java b/core/music/play/PlayMusic.java index 92b6bf48..9a82b973 100644 --- a/core/music/play/PlayMusic.java +++ b/core/music/play/PlayMusic.java @@ -3,10 +3,12 @@ package com.coloryr.allmusic.server.core.music.play; import com.coloryr.allmusic.server.core.AllMusic; import com.coloryr.allmusic.server.core.decoder.Bitstream; import com.coloryr.allmusic.server.core.decoder.Header; +import com.coloryr.allmusic.server.core.objs.config.LimitObj; import com.coloryr.allmusic.server.core.objs.music.MusicObj; import com.coloryr.allmusic.server.core.objs.music.SongInfoObj; import com.coloryr.allmusic.server.core.sql.DataSql; import com.coloryr.allmusic.server.core.utils.Logs; +import org.jetbrains.annotations.NotNull; import java.io.BufferedInputStream; import java.net.URL; @@ -119,44 +121,37 @@ public class PlayMusic { if (sender != null) { String text = AllMusic.getMessage().musicPlay.checkMusic; text = text.replace("%MusicID%", id); - AllMusic.side.sendMessaget(sender, text); + AllMusic.side.sendMessageTask(sender, text); } - Logs.logWrite("玩家:" + player + " 点歌:" + id); + Logs.logWrite("player:" + player + " add:" + id); try { SongInfoObj info = AllMusic.getMusicApi().getMusic(id, player, isList); if (info == null) { if (sender != null) { String data = AllMusic.getMessage().musicPlay.emptyCanPlay; - AllMusic.side.sendMessaget(sender, data.replace("%MusicID%", id)); + AllMusic.side.sendMessageTask(sender, data.replace("%MusicID%", id)); } return; } - if (info.getLength() / 1000 > AllMusic.getConfig().maxMusicTime) { - AllMusic.side.sendMessaget(sender, AllMusic.getMessage().addMusic.timeOut); + LimitObj limit = AllMusic.getConfig().limit; + if (limit.musicTimeLimit && info.getLength() / 1000 > limit.maxMusicTime) { + AllMusic.side.sendMessageTask(sender, AllMusic.getMessage().addMusic.timeOut); return; } playList.add(info); if (!AllMusic.getConfig().muteAddMessage) { - String data = AllMusic.getMessage().musicPlay.addMusic - .replace("%MusicName%", info.getName()) - .replace("%MusicAuthor%", info.getAuthor()) - .replace("%MusicAl%", info.getAl()) - .replace("%MusicAlia%", info.getAlia()); - if (AllMusic.getConfig().messageLimit - && data.length() > AllMusic.getConfig().messageLimitSize) { - data = data.substring(0, AllMusic.getConfig().messageLimitSize) + "..."; - } + String data = getData(info); if (AllMusic.getConfig().showInBar) { AllMusic.side.sendBar(data); } else { - AllMusic.side.bqt(data); + AllMusic.side.bqTask(data); } } if (AllMusic.getConfig().playListSwitch && (PlayMusic.nowPlayMusic != null && PlayMusic.nowPlayMusic.isList())) { PlayMusic.musicLessTime = 1; if (!isList) - AllMusic.side.bqt(AllMusic.getMessage().musicPlay.switchMusic); + AllMusic.side.bqTask(AllMusic.getMessage().musicPlay.switchMusic); } error = 0; } catch (Exception e) { @@ -168,6 +163,25 @@ public class PlayMusic { } } + /** + * 构建字符串 + * @param info 歌曲信息 + * @return 信息 + */ + private static @NotNull String getData(SongInfoObj info) { + LimitObj limit = AllMusic.getConfig().limit; + String message = AllMusic.getMessage().musicPlay.addMusic + .replace("%MusicName%", info.getName()) + .replace("%MusicAuthor%", info.getAuthor()) + .replace("%MusicAl%", info.getAl()) + .replace("%MusicAlia%", info.getAlia()); + if (limit.messageLimit + && message.length() > limit.messageLimitSize) { + message = message.substring(0, limit.messageLimitSize) + limit.limitText; + } + return message; + } + /** * 将歌曲移动到队列头 * @@ -291,7 +305,7 @@ public class PlayMusic { Header h = bt.readFrame(); int le = 6000000; if (h == null) { - AllMusic.side.bqt("§d[AllMusic3]§c未知音乐类型"); + AllMusic.side.bqTask(AllMusic.getMessage().musicPlay.error1); } else { le = (int) h.total_ms(b); } diff --git a/core/objs/config/ConfigObj.java b/core/objs/config/ConfigObj.java index 3fa433b6..1894dc8a 100644 --- a/core/objs/config/ConfigObj.java +++ b/core/objs/config/ConfigObj.java @@ -29,26 +29,10 @@ public class ConfigObj { * 歌曲延迟 */ public int lyricDelay; - /** - * 搜歌花费 - */ - public int searchCost; - /** - * 点歌花费 - */ - public int addMusicCost; /** * 默认添加歌曲方式 */ public int defaultAddMusic; - /** - * 消息限制长度 - */ - public int messageLimitSize; - /** - * 最长音乐长度 - */ - public int maxMusicTime; /** * KTV模式歌词加时 */ @@ -89,18 +73,10 @@ public class ConfigObj { * 指令需要权限 */ public boolean needPermission; - /** - * 开启花钱点歌 - */ - public boolean useCost; /** * 顶层模式,用于和BC交换数据 */ public boolean topPAPI; - /** - * 开启信息长度限制 - */ - public boolean messageLimit; /** * 不发送播放信息 */ @@ -137,6 +113,14 @@ public class ConfigObj { * 娱乐选项 */ public FunConfigObj funConfig; + /** + * 限制设置 + */ + public LimitObj limit; + /** + * 花费点歌 + */ + public CostObj cost; /** * 信息更新延迟 */ @@ -203,6 +187,14 @@ public class ConfigObj { saveConfig = true; funConfig = FunConfigObj.make(); } + if (limit == null) { + saveConfig = true; + limit = LimitObj.make(); + } + if (cost == null) { + saveConfig = true; + cost = CostObj.make(); + } return saveConfig; } @@ -224,18 +216,13 @@ public class ConfigObj { sendLyric = true; needPermission = false; defaultHud = SaveObj.make(); - useCost = false; - searchCost = 20; mutePlayMessage = false; muteAddMessage = false; showInBar = false; - addMusicCost = 10; defaultAddMusic = 0; musicBR = "320000"; - maxMusicTime = 600; topPAPI = false; - messageLimit = false; - messageLimitSize = 40; + limit = LimitObj.make(); economy = EconomyObj.make(); funConfig = FunConfigObj.make(); ktvMode = true; diff --git a/core/objs/config/CostObj.java b/core/objs/config/CostObj.java new file mode 100644 index 00000000..51045cb4 --- /dev/null +++ b/core/objs/config/CostObj.java @@ -0,0 +1,24 @@ +package com.coloryr.allmusic.server.core.objs.config; + +public class CostObj { + /** + * 搜歌花费 + */ + public int searchCost; + /** + * 点歌花费 + */ + public int addMusicCost; + /** + * 开启花钱点歌 + */ + public boolean useCost; + + public static CostObj make() { + CostObj obj = new CostObj(); + obj.useCost = false; + obj.searchCost = 20; + obj.addMusicCost = 10; + return obj; + } +} diff --git a/core/objs/config/LimitObj.java b/core/objs/config/LimitObj.java new file mode 100644 index 00000000..d4cf9544 --- /dev/null +++ b/core/objs/config/LimitObj.java @@ -0,0 +1,54 @@ +package com.coloryr.allmusic.server.core.objs.config; + +public class LimitObj { + /** + * 开启信息长度限制 + */ + public boolean messageLimit; + /** + * 消息限制长度 + */ + public int messageLimitSize; + /** + * 开启信息长度限制 + */ + public boolean listLimit; + /** + * 消息限制长度 + */ + public int listLimitSize; + /** + * 开启信息长度限制 + */ + public boolean infoLimit; + /** + * 消息限制长度 + */ + public int infoLimitSize; + /** + * 开启歌曲长度限制 + */ + public boolean musicTimeLimit; + /** + * 最长音乐长度 + */ + public int maxMusicTime; + /** + * 长度替换符号 + */ + public String limitText; + + public static LimitObj make() { + LimitObj obj = new LimitObj(); + obj.musicTimeLimit = true; + obj.infoLimit = true; + obj.infoLimitSize = 80; + obj.listLimit = false; + obj.listLimitSize = 60; + obj.maxMusicTime = 600; + obj.messageLimit = false; + obj.messageLimitSize = 40; + obj.limitText = "..."; + return obj; + } +} diff --git a/core/objs/message/CustomObj.java b/core/objs/message/CustomObj.java index 56e9077c..5e780d66 100644 --- a/core/objs/message/CustomObj.java +++ b/core/objs/message/CustomObj.java @@ -2,6 +2,7 @@ package com.coloryr.allmusic.server.core.objs.message; public class CustomObj { public String info; + public String idle; public static CustomObj make() { CustomObj obj = new CustomObj(); @@ -11,10 +12,15 @@ public class CustomObj { } public boolean check() { - return info == null; + boolean res = idle == null; + if (info == null) { + res = true; + } + return res; } public void init() { info = "自定义音乐"; + idle = "空闲列表"; } } diff --git a/core/objs/message/MusicPlayObj.java b/core/objs/message/MusicPlayObj.java index f69700db..94b81d10 100644 --- a/core/objs/message/MusicPlayObj.java +++ b/core/objs/message/MusicPlayObj.java @@ -14,6 +14,7 @@ public class MusicPlayObj { public String musicInfo; public String trail; public String cancel; + public String error1; public static MusicPlayObj make() { MusicPlayObj obj = new MusicPlayObj(); @@ -48,6 +49,8 @@ public class MusicPlayObj { res = true; if (cancel == null) res = true; + if (error1 == null) + res = true; return res; } @@ -66,5 +69,6 @@ public class MusicPlayObj { musicInfo = "%MusicName% | %MusicAuthor% | %MusicAl% | %MusicAlia% | by: %PlayerName%"; trail = "§d[AllMusic3]§e该音乐为试听音乐"; cancel = "§d[AllMusic3]§e播放被取消"; + error1 = "§d[AllMusic3]§c未知音乐类型"; } } diff --git a/core/side/ISide.java b/core/side/BaseSide.java similarity index 83% rename from core/side/ISide.java rename to core/side/BaseSide.java index 409c4102..71b1c7ec 100644 --- a/core/side/ISide.java +++ b/core/side/BaseSide.java @@ -1,13 +1,14 @@ package com.coloryr.allmusic.server.core.side; import com.coloryr.allmusic.server.core.AllMusic; +import com.coloryr.allmusic.server.core.objs.config.LimitObj; import com.coloryr.allmusic.server.core.objs.enums.HudType; import com.coloryr.allmusic.server.core.objs.music.MusicObj; import com.coloryr.allmusic.server.core.objs.music.SongInfoObj; import java.util.List; -public abstract class ISide { +public abstract class BaseSide { /** * 重载 */ @@ -18,7 +19,7 @@ public abstract class ISide { * * @return 数量 */ - public abstract int getAllPlayer(); + public abstract int getPlayerSize(); /** * 主线程运行任务 @@ -80,6 +81,11 @@ public abstract class ISide { */ public abstract void sendMusic(String url); + /** + * 向指定玩家发送播放歌曲指令 + * @param player 玩家 + * @param url 地址 + */ public final void sendMusic(String player, String url) { AllMusic.addNowPlayPlayer(player); topSendMusic(player, url); @@ -176,7 +182,17 @@ public abstract class ISide { * * @param data 消息 */ - public abstract void bq(String data); + public final void bq(String data) { + LimitObj limit = AllMusic.getConfig().limit; + if (limit.messageLimit + && data.length() > limit.messageLimitSize) { + data = data.substring(0, limit.messageLimitSize - 1) + limit.limitText; + } + + topBq(data); + } + + protected abstract void topBq(String data); /** * 广播点击消息 @@ -192,7 +208,16 @@ public abstract class ISide { * * @param data 消息 */ - public abstract void bqt(String data); + public final void bqTask(String data) { + LimitObj limit = AllMusic.getConfig().limit; + if (limit.messageLimit + && data.length() > limit.messageLimitSize) { + data = data.substring(0, limit.messageLimitSize - 1) + limit.limitText; + } + + String finalData = data; + runTask(() -> bq(finalData)); + } /** * 在主线程发送消息 @@ -200,7 +225,9 @@ public abstract class ISide { * @param obj 接受对象 * @param message 消息 */ - public abstract void sendMessaget(Object obj, String message); + public final void sendMessageTask(Object obj, String message) { + runTask(() -> sendMessageTask(obj, message)); + } /** * 发送消息 diff --git a/core/utils/HudUtils.java b/core/utils/HudUtils.java index fcb47417..754a0727 100644 --- a/core/utils/HudUtils.java +++ b/core/utils/HudUtils.java @@ -3,6 +3,7 @@ package com.coloryr.allmusic.server.core.utils; import com.coloryr.allmusic.server.core.AllMusic; import com.coloryr.allmusic.server.core.music.play.LyricSave; import com.coloryr.allmusic.server.core.music.play.PlayMusic; +import com.coloryr.allmusic.server.core.objs.config.LimitObj; import com.coloryr.allmusic.server.core.objs.config.SaveObj; import com.coloryr.allmusic.server.core.objs.enums.HudDirType; import com.coloryr.allmusic.server.core.objs.enums.HudType; @@ -97,12 +98,13 @@ public class HudUtils { } else { String now; StringBuilder list = new StringBuilder(); + LimitObj limit = AllMusic.getConfig().limit; for (SongInfoObj info1 : PlayMusic.getList()) { if (info1 == null) continue; now = info1.getInfo(); - if (now.length() > AllMusic.getConfig().messageLimitSize) - now = now.substring(0, AllMusic.getConfig().messageLimitSize - 1) + "..."; + if (limit.listLimit && now.length() > limit.listLimitSize) + now = now.substring(0, limit.listLimitSize - 1) + limit.limitText; list.append(now).append("\n"); } info = AllMusic.getMessage().hud.list @@ -143,6 +145,10 @@ public class HudUtils { .replace("%Player%", PlayMusic.nowPlayMusic.getCall()); } + LimitObj limit = AllMusic.getConfig().limit; + if (limit.messageLimit && info.length() > limit.messageLimitSize) + info = info.substring(0, limit.messageLimitSize - 1) + limit.limitText; + AllMusic.side.sendHudInfo(info); } diff --git a/folia/build.gradle b/folia/build.gradle index 93b88cea..202a77f1 100644 --- a/folia/build.gradle +++ b/folia/build.gradle @@ -3,7 +3,7 @@ plugins { id 'maven-publish' id 'com.github.johnrengelman.shadow' version '7.1.2' } -version = "3.0.0" +version = "3.1.0" archivesBaseName = "[folia]AllMusic_Server" @@ -41,14 +41,14 @@ dependencies { //implementation 'mysql:mysql-connector-java:8.0.31' compileOnly 'io.netty:netty-all:4.1.109.Final' - compileOnly 'dev.folia:folia-api:1.20.4-R0.1-SNAPSHOT' - compileOnly "com.github.MilkBowl:VaultAPI:1.7.1" - compileOnly 'me.clip:placeholderapi:2.10.10' + compileOnly 'dev.folia:folia-api:+' + compileOnly "com.github.MilkBowl:VaultAPI:+" + compileOnly 'me.clip:placeholderapi:+' //compileOnly 'net.citizensnpcs:citizens-main:2.0.30-SNAPSHOT' // compileOnly fileTree(dir:'lib',include:['*.jar']) //implementation 'org.xerial:sqlite-jdbc:3.39.3.0' - implementation 'com.squareup.okhttp3:okhttp:4.12.0' + implementation 'com.squareup.okhttp3:okhttp:+' } shadowJar { diff --git a/folia/src/main/java/com/coloryr/allmusic/server/side/folia/MetricsFolia.java b/folia/src/main/java/com/coloryr/allmusic/server/side/folia/MetricsFolia.java index 387abe21..578afe20 100644 --- a/folia/src/main/java/com/coloryr/allmusic/server/side/folia/MetricsFolia.java +++ b/folia/src/main/java/com/coloryr/allmusic/server/side/folia/MetricsFolia.java @@ -1,8 +1,8 @@ package com.coloryr.allmusic.server.side.folia; -import coloryr.allmusic.bstats.MetricsBase; -import coloryr.allmusic.bstats.charts.CustomChart; -import coloryr.allmusic.bstats.json.JsonObjectBuilder; +import com.coloryr.allmusic.server.bstats.MetricsBase; +import com.coloryr.allmusic.server.bstats.charts.CustomChart; +import com.coloryr.allmusic.server.bstats.json.JsonObjectBuilder; import org.bukkit.Bukkit; import org.bukkit.configuration.file.YamlConfiguration; import org.bukkit.entity.Player; diff --git a/folia/src/main/java/com/coloryr/allmusic/server/side/folia/SideFolia.java b/folia/src/main/java/com/coloryr/allmusic/server/side/folia/SideFolia.java index ccf810d5..23468c3c 100644 --- a/folia/src/main/java/com/coloryr/allmusic/server/side/folia/SideFolia.java +++ b/folia/src/main/java/com/coloryr/allmusic/server/side/folia/SideFolia.java @@ -8,7 +8,7 @@ import com.coloryr.allmusic.server.core.objs.enums.ComType; import com.coloryr.allmusic.server.core.objs.enums.HudType; import com.coloryr.allmusic.server.core.objs.music.MusicObj; import com.coloryr.allmusic.server.core.objs.music.SongInfoObj; -import com.coloryr.allmusic.server.core.side.ISide; +import com.coloryr.allmusic.server.core.side.BaseSide; import com.coloryr.allmusic.server.core.utils.HudUtils; import com.coloryr.allmusic.server.side.folia.event.MusicAddEvent; import com.coloryr.allmusic.server.side.folia.event.MusicPlayEvent; @@ -22,9 +22,9 @@ import org.bukkit.entity.Player; import java.util.List; -public class SideFolia extends ISide { +public class SideFolia extends BaseSide { @Override - public int getAllPlayer() { + public int getPlayerSize() { return Bukkit.getOnlinePlayers().size(); } @@ -291,11 +291,7 @@ public class SideFolia extends ISide { } @Override - public void bq(String data) { - if (AllMusic.getConfig().messageLimit - && data.length() > AllMusic.getConfig().messageLimitSize) { - data = data.substring(0, AllMusic.getConfig().messageLimitSize - 1) + "..."; - } + public void topBq(String data) { for (Player player : Bukkit.getOnlinePlayers()) { if (!AllMusic.getConfig().mutePlayer.contains(player.getName())) { player.sendMessage(data); @@ -308,25 +304,9 @@ public class SideFolia extends ISide { SpigotApi.sendMessageBqRun(message, end, command); } - @Override - public void bqt(String data) { - if (AllMusic.getConfig().messageLimit - && data.length() > AllMusic.getConfig().messageLimitSize) { - data = data.substring(0, AllMusic.getConfig().messageLimitSize - 1) + "..."; - } - String finalData = data; - Bukkit.getGlobalRegionScheduler().execute(AllMusicFolia.plugin, () -> { - for (Player player : Bukkit.getOnlinePlayers()) { - if (!AllMusic.getConfig().mutePlayer.contains(player.getName())) { - player.sendMessage(finalData); - } - } - }); - } - @Override public boolean needPlay() { - int online = getAllPlayer(); + int online = getPlayerSize(); for (Player player : Bukkit.getOnlinePlayers()) { if (CitizensNPC.isNPC(player)) online--; @@ -337,11 +317,6 @@ public class SideFolia extends ISide { return online > 0; } - @Override - public void sendMessaget(Object obj, String message) { - Bukkit.getGlobalRegionScheduler().execute(AllMusicFolia.plugin, () -> ((CommandSender) obj).sendMessage(message)); - } - @Override public void sendMessage(Object obj, String message) { CommandSender sender = (CommandSender) obj; diff --git a/folia/src/main/java/com/coloryr/allmusic/server/side/folia/hooks/AllMusicPAPI.java b/folia/src/main/java/com/coloryr/allmusic/server/side/folia/hooks/AllMusicPAPI.java index f9d94eb5..dfabb4c0 100644 --- a/folia/src/main/java/com/coloryr/allmusic/server/side/folia/hooks/AllMusicPAPI.java +++ b/folia/src/main/java/com/coloryr/allmusic/server/side/folia/hooks/AllMusicPAPI.java @@ -109,10 +109,6 @@ public class AllMusicPAPI extends PlaceholderExpansion { case "now_music_name": { if (PlayMusic.nowPlayMusic == null) return AllMusic.getMessage().papi.emptyMusic; - if (AllMusic.getConfig().messageLimit - && PlayMusic.nowPlayMusic.getName().length() > AllMusic.getConfig().messageLimitSize) { - return PlayMusic.nowPlayMusic.getName().substring(0, AllMusic.getConfig().messageLimitSize); - } return PlayMusic.nowPlayMusic.getName(); } case "now_music_al": { diff --git a/link.cmd b/link.cmd index 504655b7..bbf4b495 100644 --- a/link.cmd +++ b/link.cmd @@ -24,3 +24,9 @@ fabric_1_16_5 fabric_1_20_6 neoforge_1_20_4 neoforge_1_20_5 for %%i in (%array1%) do ( if not exist "%%i\src\main\java\com\coloryr\allmusic\server\codec" mklink /j "%%i\src\main\java\com\coloryr\allmusic\server\codec" "codec" ) + +set array2=folia server_top server + +for %%i in (%array2%) do ( + if not exist "%%i\src\main\java\com\coloryr\allmusic\server\bstats" mklink /j "%%i\src\main\java\com\coloryr\allmusic\server\bstats" "bstats" +) diff --git a/remove.cmd b/remove.cmd index 052e6aa3..7361c04d 100644 --- a/remove.cmd +++ b/remove.cmd @@ -25,4 +25,10 @@ for %%i in (%array1%) do ( if exist "%%i\src\main\java\com\coloryr\allmusic\server\codec" rmdir "%%i\src\main\java\com\coloryr\allmusic\server\codec" "codec" ) +set array2=folia server_top server + +for %%i in (%array2%) do ( + if exist "%%i\src\main\java\com\coloryr\allmusic\server\bstats" rmdir "%%i\src\main\java\com\coloryr\allmusic\server\bstats" "bstats" +) + endlocal \ No newline at end of file diff --git a/server/build.gradle b/server/build.gradle index eab28830..5602f423 100644 --- a/server/build.gradle +++ b/server/build.gradle @@ -3,9 +3,9 @@ plugins { id 'maven-publish' id 'com.github.johnrengelman.shadow' version '6.1.0' } -version = "3.0.0" +version = "3.1.0" -archivesBaseName = "[bukkit]AllMusic_Server" +archivesBaseName = "[bukkit_spigot_paper]AllMusic_Server" repositories { mavenCentral() diff --git a/server/src/main/java/com/coloryr/allmusic/server/side/bukkit/SideBukkit.java b/server/src/main/java/com/coloryr/allmusic/server/side/bukkit/SideBukkit.java index 3d5bbb17..fa43725b 100644 --- a/server/src/main/java/com/coloryr/allmusic/server/side/bukkit/SideBukkit.java +++ b/server/src/main/java/com/coloryr/allmusic/server/side/bukkit/SideBukkit.java @@ -7,7 +7,7 @@ import com.coloryr.allmusic.server.core.objs.enums.ComType; import com.coloryr.allmusic.server.core.objs.enums.HudType; import com.coloryr.allmusic.server.core.objs.music.MusicObj; import com.coloryr.allmusic.server.core.objs.music.SongInfoObj; -import com.coloryr.allmusic.server.core.side.ISide; +import com.coloryr.allmusic.server.core.side.BaseSide; import com.coloryr.allmusic.server.core.utils.HudUtils; import com.coloryr.allmusic.server.side.bukkit.event.MusicAddEvent; import com.coloryr.allmusic.server.side.bukkit.event.MusicPlayEvent; @@ -23,7 +23,7 @@ import java.nio.charset.StandardCharsets; import java.util.Collections; import java.util.List; -public class SideBukkit extends ISide { +public class SideBukkit extends BaseSide { private static Class ByteBufC; private static Class UnpooledC; private static Method bufferM; @@ -71,13 +71,15 @@ public class SideBukkit extends ISide { } @Override - public int getAllPlayer() { + public int getPlayerSize() { return Bukkit.getOnlinePlayers().size(); } @Override public void sendHudLyric(String data) { try { + Object obj1 = pack(ComType.LYRIC, data, 0); + byte[] temp = (byte[]) arrayM.invoke(obj1); for (Player player : Bukkit.getOnlinePlayers()) { if (AllMusic.isOK(player.getName(), null, true)) continue; @@ -85,7 +87,7 @@ public class SideBukkit extends ISide { SaveObj obj = HudUtils.get(name); if (!obj.lyric.enable) continue; - send(player, pack(ComType.LYRIC, data, 0)); + send(player, temp); } } catch (Exception e) { AllMusic.log.warning("§d[AllMusic]§c歌词发送出错"); @@ -96,6 +98,8 @@ public class SideBukkit extends ISide { @Override public void sendHudInfo(String data) { try { + Object obj1 = pack(ComType.INFO, data, 0); + byte[] temp = (byte[]) arrayM.invoke(obj1); for (Player player : Bukkit.getOnlinePlayers()) { if (AllMusic.isOK(player.getName(), null, true)) continue; @@ -103,7 +107,7 @@ public class SideBukkit extends ISide { SaveObj obj = HudUtils.get(name); if (!obj.info.enable) continue; - send(player, pack(ComType.INFO, data, 0)); + send(player, temp); } } catch (Exception e) { AllMusic.log.warning("§d[AllMusic]§c歌词信息发送出错"); @@ -121,7 +125,9 @@ public class SideBukkit extends ISide { return; SaveObj obj = HudUtils.get(name); String data = AllMusic.gson.toJson(obj); - send(player, pack(ComType.HUD, data, 0)); + Object obj1 = pack(ComType.HUD, data, 0); + byte[] temp = (byte[]) arrayM.invoke(obj1); + send(player, temp); } catch (Exception e) { AllMusic.log.warning("§d[AllMusic]§c歌曲指令发送出错"); e.printStackTrace(); @@ -140,18 +146,24 @@ public class SideBukkit extends ISide { if (AllMusic.isOK(name, null, true)) return; - + Object obj1 = null; switch (pos) { case INFO: - send(player, pack(ComType.INFO, data, 0)); + obj1 = pack(ComType.INFO, data, 0); break; case LIST: - send(player, pack(ComType.LIST, data, 0)); + obj1 = pack(ComType.LIST, data, 0); break; case LYRIC: - send(player, pack(ComType.LYRIC, data, 0)); + obj1 = pack(ComType.LYRIC, data, 0); break; } + if (obj1 == null) { + return; + } + + byte[] temp = (byte[]) arrayM.invoke(obj1); + send(player, temp); } catch (Exception e) { AllMusic.log.warning("§d[AllMusic]§c停止指令发送出错"); e.printStackTrace(); @@ -161,6 +173,8 @@ public class SideBukkit extends ISide { @Override public void sendHudList(String data) { try { + Object obj1 = pack(ComType.LIST, data, 0); + byte[] temp = (byte[]) arrayM.invoke(obj1); for (Player player : Bukkit.getOnlinePlayers()) { if (AllMusic.isOK(player.getName(), null, true)) continue; @@ -168,7 +182,7 @@ public class SideBukkit extends ISide { SaveObj obj = HudUtils.get(name); if (!obj.list.enable) continue; - send(player, pack(ComType.LIST, data, 0)); + send(player, temp); } } catch (Exception e) { AllMusic.log.warning("§d[AllMusic]§c歌曲列表发送出错"); @@ -183,7 +197,9 @@ public class SideBukkit extends ISide { try { SaveObj obj = HudUtils.get(Name); String data = AllMusic.gson.toJson(obj); - send(player, pack(ComType.HUD, data, 0)); + Object obj1 = pack(ComType.HUD, data, 0); + byte[] temp = (byte[]) arrayM.invoke(obj1); + send(player, temp); } catch (Exception e1) { AllMusic.log.warning("§d[AllMusic]§c数据发送发生错误"); e1.printStackTrace(); @@ -212,10 +228,12 @@ public class SideBukkit extends ISide { @Override public void sendMusic(String data) { try { + Object obj1 = pack(ComType.PLAY, data, 0); + byte[] temp = (byte[]) arrayM.invoke(obj1); for (Player player : Bukkit.getOnlinePlayers()) { if (AllMusic.isOK(player.getName(), null, false)) continue; - send(player, pack(ComType.PLAY, data, 0)); + send(player, temp); AllMusic.addNowPlayPlayer(player.getName()); } } catch (Exception e) { @@ -232,7 +250,9 @@ public class SideBukkit extends ISide { return; if (AllMusic.isOK(player, null, false)) return; - send(player1, pack(ComType.PLAY, data, 0)); + Object obj1 = pack(ComType.PLAY, data, 0); + byte[] temp = (byte[]) arrayM.invoke(obj1); + send(player1, temp); } catch (Exception e) { AllMusic.log.warning("§d[AllMusic]§c歌曲指令发送出错"); e.printStackTrace(); @@ -242,6 +262,8 @@ public class SideBukkit extends ISide { @Override public void sendPic(String data) { try { + Object obj1 = pack(ComType.IMG, data, 0); + byte[] temp = (byte[]) arrayM.invoke(obj1); for (Player player : Bukkit.getOnlinePlayers()) { if (AllMusic.isOK(player.getName(), null, true)) continue; @@ -249,7 +271,7 @@ public class SideBukkit extends ISide { SaveObj obj = HudUtils.get(name); if (!obj.pic.enable) continue; - send(player, pack(ComType.IMG, data, 0)); + send(player, temp); } } catch (Exception e) { AllMusic.log.warning("§d[AllMusic]§c图片指令发送出错"); @@ -265,7 +287,9 @@ public class SideBukkit extends ISide { return; if (AllMusic.isOK(player1.getName(), null, true)) return; - send(player1, pack(ComType.IMG, data, 0)); + Object obj1 = pack(ComType.IMG, data, 0); + byte[] temp = (byte[]) arrayM.invoke(obj1); + send(player1, temp); } catch (Exception e) { AllMusic.log.warning("§d[AllMusic]§c图片指令发送出错"); e.printStackTrace(); @@ -280,7 +304,9 @@ public class SideBukkit extends ISide { return; if (AllMusic.isOK(player1.getName(), null, true)) return; - send(player1, pack(ComType.POS, null, pos)); + Object obj1 = pack(ComType.POS, null, pos); + byte[] temp = (byte[]) arrayM.invoke(obj1); + send(player1, temp); } catch (Exception e) { AllMusic.log.warning("§d[AllMusic]§c清空Hud发生出错"); e.printStackTrace(); @@ -290,8 +316,10 @@ public class SideBukkit extends ISide { @Override protected void topSendStop() { try { + Object obj1 = pack(ComType.STOP, null, 0); + byte[] temp = (byte[]) arrayM.invoke(obj1); for (Player player : Bukkit.getOnlinePlayers()) { - send(player, pack(ComType.STOP, null, 0)); + send(player, temp); } } catch (Exception e) { AllMusic.log.warning("§d[AllMusic]§c停止指令发送出错"); @@ -305,7 +333,9 @@ public class SideBukkit extends ISide { Player player = Bukkit.getPlayer(name); if (player == null) return; - send(player, pack(ComType.STOP, null, 0)); + Object obj1 = pack(ComType.STOP, null, 0); + byte[] temp = (byte[]) arrayM.invoke(obj1); + send(player, temp); } catch (Exception e) { AllMusic.log.warning("§d[AllMusic]§c停止指令发送出错"); e.printStackTrace(); @@ -318,7 +348,9 @@ public class SideBukkit extends ISide { Player player = Bukkit.getPlayer(name); if (player == null) return; - send(player, pack(ComType.CLEAR, null, 0)); + Object obj1 = pack(ComType.CLEAR, null, 0); + byte[] temp = (byte[]) arrayM.invoke(obj1); + send(player, temp); } catch (Exception e) { AllMusic.log.warning("§d[AllMusic]§c清空Hud发生出错"); e.printStackTrace(); @@ -328,8 +360,10 @@ public class SideBukkit extends ISide { @Override public void clearHud() { try { + Object obj1 = pack(ComType.CLEAR, null, 0); + byte[] temp = (byte[]) arrayM.invoke(obj1); for (Player player : Bukkit.getOnlinePlayers()) { - send(player, pack(ComType.CLEAR, null, 0)); + send(player, temp); } } catch (Exception e) { AllMusic.log.warning("§d[AllMusic]§c清空Hud发生出错"); @@ -338,11 +372,7 @@ public class SideBukkit extends ISide { } @Override - public void bq(String data) { - if (AllMusic.getConfig().messageLimit - && data.length() > AllMusic.getConfig().messageLimitSize) { - data = data.substring(0, AllMusic.getConfig().messageLimitSize - 1) + "..."; - } + public void topBq(String data) { for (Player player : Bukkit.getOnlinePlayers()) { if (!AllMusic.getConfig().mutePlayer.contains(player.getName())) { player.sendMessage(data); @@ -355,25 +385,9 @@ public class SideBukkit extends ISide { SpigotApi.sendMessageBqRun(message, end, command); } - @Override - public void bqt(String data) { - if (AllMusic.getConfig().messageLimit - && data.length() > AllMusic.getConfig().messageLimitSize) { - data = data.substring(0, AllMusic.getConfig().messageLimitSize - 1) + "..."; - } - String finalData = data; - Bukkit.getScheduler().runTask(AllMusicBukkit.plugin, () -> { - for (Player player : Bukkit.getOnlinePlayers()) { - if (!AllMusic.getConfig().mutePlayer.contains(player.getName())) { - player.sendMessage(finalData); - } - } - }); - } - @Override public boolean needPlay() { - int online = getAllPlayer(); + int online = getPlayerSize(); for (Player player : Bukkit.getOnlinePlayers()) { if (CitizensNPC.isNPC(player)) online--; @@ -384,11 +398,6 @@ public class SideBukkit extends ISide { return online > 0; } - @Override - public void sendMessaget(Object obj, String message) { - Bukkit.getScheduler().runTask(AllMusicBukkit.plugin, () -> ((CommandSender) obj).sendMessage(message)); - } - @Override public void sendMessage(Object obj, String message) { CommandSender sender = (CommandSender) obj; @@ -468,23 +477,12 @@ public class SideBukkit extends ISide { return event.isCancel(); } - private void send(Player players, Object data) { + private void send(Player players, byte[] data) { if (players == null) return; - try { - if (AllMusic.isRun) { - runTask(() -> - { - try { - players.sendPluginMessage(AllMusicBukkit.plugin, AllMusic.channel, (byte[]) arrayM.invoke(data)); - } catch (IllegalAccessException | InvocationTargetException e) { - e.printStackTrace(); - } - }); - } - } catch (Exception e) { - AllMusic.log.warning("§c数据发送发生错误"); - e.printStackTrace(); + + if (AllMusic.isRun) { + runTask(() -> players.sendPluginMessage(AllMusicBukkit.plugin, AllMusic.channel, data)); } } @@ -497,8 +495,7 @@ public class SideBukkit extends ISide { private Object pack(ComType type, String data, int data1) throws InvocationTargetException, IllegalAccessException { Object buf = bufferM.invoke(null, 0); writeByteM.invoke(buf, type.ordinal()); - switch (type) - { + switch (type) { case PLAY: case IMG: case INFO: diff --git a/server/src/main/java/com/coloryr/allmusic/server/side/bukkit/hooks/AllMusicPAPI.java b/server/src/main/java/com/coloryr/allmusic/server/side/bukkit/hooks/AllMusicPAPI.java index 64a1a743..daebc51f 100644 --- a/server/src/main/java/com/coloryr/allmusic/server/side/bukkit/hooks/AllMusicPAPI.java +++ b/server/src/main/java/com/coloryr/allmusic/server/side/bukkit/hooks/AllMusicPAPI.java @@ -109,10 +109,6 @@ public class AllMusicPAPI extends PlaceholderExpansion { case "now_music_name": { if (PlayMusic.nowPlayMusic == null) return AllMusic.getMessage().papi.emptyMusic; - if (AllMusic.getConfig().messageLimit - && PlayMusic.nowPlayMusic.getName().length() > AllMusic.getConfig().messageLimitSize) { - return PlayMusic.nowPlayMusic.getName().substring(0, AllMusic.getConfig().messageLimitSize); - } return PlayMusic.nowPlayMusic.getName(); } case "now_music_al": { diff --git a/server/src/main/resources/plugin.yml b/server/src/main/resources/plugin.yml index 9cd57141..e497abf4 100644 --- a/server/src/main/resources/plugin.yml +++ b/server/src/main/resources/plugin.yml @@ -1,7 +1,7 @@ name: AllMusic3 main: com.coloryr.allmusic.server.AllMusicBukkit author: Color_yr -version: 3.0.0 +version: 3.1.0 softdepend: [PlaceholderAPI, Vault, Essentials, CMI] api-version: 1.13 diff --git a/server_top/build.gradle b/server_top/build.gradle index 9b4613cf..a0171aa2 100644 --- a/server_top/build.gradle +++ b/server_top/build.gradle @@ -3,7 +3,7 @@ plugins { id 'maven-publish' id 'com.github.johnrengelman.shadow' version '6.1.0' } -version = "3.0.0" +version = "3.1.0" archivesBaseName = "[bungeecord_velocity]AllMusic_Server" 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 index bfa98cfb..633ceb56 100644 --- 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 @@ -4,12 +4,13 @@ import com.coloryr.allmusic.server.AllMusicBC; import com.coloryr.allmusic.server.codec.PacketCodec; import com.coloryr.allmusic.server.core.AllMusic; import com.coloryr.allmusic.server.core.music.play.PlayMusic; +import com.coloryr.allmusic.server.core.objs.config.LimitObj; import com.coloryr.allmusic.server.core.objs.config.SaveObj; import com.coloryr.allmusic.server.core.objs.enums.ComType; import com.coloryr.allmusic.server.core.objs.enums.HudType; import com.coloryr.allmusic.server.core.objs.music.MusicObj; import com.coloryr.allmusic.server.core.objs.music.SongInfoObj; -import com.coloryr.allmusic.server.core.side.ISide; +import com.coloryr.allmusic.server.core.side.BaseSide; import com.coloryr.allmusic.server.core.sql.IEconomy; import com.coloryr.allmusic.server.core.utils.HudUtils; import com.coloryr.allmusic.server.side.bc.event.MusicAddEvent; @@ -31,7 +32,7 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.CopyOnWriteArraySet; import java.util.concurrent.TimeUnit; -public class SideBC extends ISide implements IEconomy { +public class SideBC extends BaseSide implements IEconomy { public static final Set TopServers = new CopyOnWriteArraySet<>(); public static final Map SendToBackend = new ConcurrentHashMap<>(); @@ -42,13 +43,7 @@ public class SideBC extends ISide implements IEconomy { if (PlayMusic.nowPlayMusic == null) out.writeUTF(AllMusic.getMessage().papi.emptyMusic); else { - if (AllMusic.getConfig().messageLimit - && PlayMusic.nowPlayMusic.getName().length() > AllMusic.getConfig().messageLimitSize) { - out.writeUTF(PlayMusic.nowPlayMusic.getName() - .substring(0, AllMusic.getConfig().messageLimitSize)); - } else { - out.writeUTF(PlayMusic.nowPlayMusic.getName()); - } + out.writeUTF(PlayMusic.nowPlayMusic.getName()); } server.sendData(AllMusic.channelBC, out.toByteArray()); @@ -133,7 +128,7 @@ public class SideBC extends ISide implements IEconomy { } @Override - public int getAllPlayer() { + public int getPlayerSize() { return ProxyServer.getInstance().getOnlineCount(); } @@ -396,11 +391,7 @@ public class SideBC extends ISide implements IEconomy { } @Override - public void bq(String data) { - if (AllMusic.getConfig().messageLimit - && data.length() > AllMusic.getConfig().messageLimitSize) { - data = data.substring(0, AllMusic.getConfig().messageLimitSize - 1) + "..."; - } + public void topBq(String data) { TextComponent message = new TextComponent(data); for (ProxiedPlayer player : ProxyServer.getInstance().getPlayers()) { if (ok(player)) @@ -422,11 +413,6 @@ public class SideBC extends ISide implements IEconomy { } } - @Override - public void bqt(String data) { - this.bq(data); - } - @Override public boolean needPlay() { int online = 0; @@ -440,12 +426,6 @@ public class SideBC extends ISide implements IEconomy { return online > 0; } - @Override - public void sendMessaget(Object obj, String message) { - CommandSender sender = (CommandSender) obj; - sender.sendMessage(new TextComponent(message)); - } - @Override public void sendMessage(Object obj, String message) { CommandSender sender = (CommandSender) obj; 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 7505b75c..4b2fcb71 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 @@ -9,7 +9,7 @@ import com.coloryr.allmusic.server.core.objs.enums.ComType; import com.coloryr.allmusic.server.core.objs.enums.HudType; import com.coloryr.allmusic.server.core.objs.music.MusicObj; import com.coloryr.allmusic.server.core.objs.music.SongInfoObj; -import com.coloryr.allmusic.server.core.side.ISide; +import com.coloryr.allmusic.server.core.side.BaseSide; import com.coloryr.allmusic.server.core.sql.IEconomy; import com.coloryr.allmusic.server.core.utils.HudUtils; import com.coloryr.allmusic.server.side.velocity.event.MusicAddEvent; @@ -31,7 +31,7 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.CopyOnWriteArraySet; import java.util.concurrent.TimeUnit; -public class SideVelocity extends ISide implements IEconomy { +public class SideVelocity extends BaseSide implements IEconomy { public static final Set TopServers = new CopyOnWriteArraySet<>(); public static final Map SendToBackend = new ConcurrentHashMap<>(); @@ -42,13 +42,7 @@ public class SideVelocity extends ISide implements IEconomy { if (PlayMusic.nowPlayMusic == null) out.writeUTF(AllMusic.getMessage().papi.emptyMusic); else { - if (AllMusic.getConfig().messageLimit - && PlayMusic.nowPlayMusic.getName().length() > AllMusic.getConfig().messageLimitSize) { - out.writeUTF(PlayMusic.nowPlayMusic.getName() - .substring(0, AllMusic.getConfig().messageLimitSize)); - } else { - out.writeUTF(PlayMusic.nowPlayMusic.getName()); - } + out.writeUTF(PlayMusic.nowPlayMusic.getName()); } server.sendPluginMessage(AllMusicVelocity.channelBC, out.toByteArray()); @@ -138,16 +132,12 @@ public class SideVelocity extends ISide implements IEconomy { } @Override - public int getAllPlayer() { + public int getPlayerSize() { return AllMusicVelocity.plugin.server.getPlayerCount(); } @Override - public void bq(String data) { - if (AllMusic.getConfig().messageLimit - && data.length() > AllMusic.getConfig().messageLimitSize) { - data = data.substring(0, AllMusic.getConfig().messageLimitSize - 1) + "..."; - } + public void topBq(String data) { Component message = Component.text(data); for (RegisteredServer server : AllMusicVelocity.plugin.server.getAllServers()) { if (AllMusic.getConfig().muteServer.contains(server.getServerInfo().getName())) @@ -172,11 +162,6 @@ public class SideVelocity extends ISide implements IEconomy { } } - @Override - public void bqt(String data) { - this.bq(data); - } - @Override public boolean needPlay() { int online = 0; @@ -456,12 +441,6 @@ public class SideVelocity extends ISide implements IEconomy { } } - @Override - public void sendMessaget(Object obj, String message) { - CommandSource sender = (CommandSource) obj; - sender.sendMessage(Component.text(message)); - } - @Override public void sendMessage(Object obj, String message) { CommandSource sender = (CommandSource) obj; diff --git a/server_top/src/main/resources/bungee.yml b/server_top/src/main/resources/bungee.yml index b1fe146a..a2a97def 100644 --- a/server_top/src/main/resources/bungee.yml +++ b/server_top/src/main/resources/bungee.yml @@ -1,4 +1,4 @@ name: AllMusic3 main: com.coloryr.allmusic.server.AllMusicBC author: Color_yr -version: 3.0.0 +version: 3.1.0