Skip to content

Commit 4b69788

Browse files
authored
feat: 循环停止按钮 (#41)
2 parents cf11e6c + 2e54f2d commit 4b69788

File tree

4 files changed

+19
-2
lines changed

4 files changed

+19
-2
lines changed

zmusic-plugin/src/main/java/me/zhenxin/zmusic/language/Lang.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ public class Lang {
1010
public static String playSuccess;
1111
public static String playAllSource;
1212
public static String clickPlay;
13+
public static String clickStop;
14+
public static String clickLoop;
1315
public static String clickPlayText;
1416
public static String clickMusic;
1517
public static String clickMusicText;

zmusic-plugin/src/main/java/me/zhenxin/zmusic/language/LoadLang.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,8 @@ public void load() {
5454
// 全部点击事件
5555
JsonObject click = lang.get("click").getAsJsonObject();
5656
Lang.clickPlay = click.get("play").getAsString();
57+
Lang.clickStop = click.get("stop").getAsString();
58+
Lang.clickLoop = click.get("loop").getAsString();
5759
Lang.clickPlayText = click.get("playText").getAsString();
5860
Lang.clickMusic = click.get("music").getAsString();
5961
Lang.clickMusicText = click.get("musicText").getAsString();

zmusic-plugin/src/main/java/me/zhenxin/zmusic/music/PlayMusic.java

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,10 +167,19 @@ private static void play(Object player, List<Object> players, String src, long t
167167
}
168168
ZMusic.music.play(musicUrl, p);
169169
time = System.currentTimeMillis() - time;
170-
ZMusic.message.sendNormalMessage(Lang.playSuccess
170+
TextComponent success = new TextComponent(Lang.playSuccess
171171
.replaceAll("%source%", searchSourceName)
172172
.replaceAll("%fullName%", musicFullName)
173-
.replaceAll("%time%", String.valueOf(time)), p);
173+
.replaceAll("%time%", String.valueOf(time)));
174+
TextComponent stop = new TextComponent("§r[§e" + Lang.clickStop + "§r]");
175+
stop.setClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/zm stop"));
176+
stop.setColor(ChatColor.YELLOW);
177+
success.addExtra(stop);
178+
TextComponent loop = new TextComponent("§r[§e" + Lang.clickLoop + "§r]");
179+
loop.setClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/zm loop"));
180+
loop.setColor(ChatColor.YELLOW);
181+
success.addExtra(loop);
182+
ZMusic.message.sendJsonMessage(success, p);
174183
String title = "§a" + Lang.playing + "\n§e" + musicFullName;
175184
OtherUtils.sendAdv(p, title);
176185
}

zmusic-plugin/src/main/resources/language/zh_CN.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,10 @@
6161
"click": {
6262
// 播放
6363
"play": "播放",
64+
// 停止
65+
"stop": "停止",
66+
// 循环
67+
"loop": "循环",
6468
// 播放-悬浮字
6569
"playText": "点击播放",
6670
// 点歌

0 commit comments

Comments
 (0)