From a1bb9871c159fc69faefae1db201d3b60dc022ce Mon Sep 17 00:00:00 2001 From: Color_yr <402067010@qq.com> Date: Mon, 9 Jan 2023 16:54:42 +0800 Subject: [PATCH] 2.18.0 --- src/main/java/coloryr/allmusic/AllMusic.java | 16 ++--- .../coloryr/allmusic/command/CommandEX.java | 6 +- .../java/coloryr/allmusic/hud/DataSql.java | 18 ++--- .../java/coloryr/allmusic/hud/HudUtils.java | 38 +++++----- .../coloryr/allmusic/music/api/APIMain.java | 20 +++--- .../coloryr/allmusic/music/play/LyricDo.java | 4 +- .../java/coloryr/allmusic/objs/ConfigObj.java | 8 +-- .../objs/{MessageOBJ.java => MessageObj.java} | 72 +++++++++---------- .../music/info/{InfoOBJ.java => InfoObj.java} | 2 +- .../music/info/{PlayOBJ.java => PlayObj.java} | 2 +- .../music/list/{DataOBJ.java => DataObj.java} | 2 +- .../lyric/{WLyricOBJ.java => WLyricObj.java} | 2 +- ...{SearchDataOBJ.java => SearchDataObj.java} | 2 +- .../info/{PrInfoOBJ.java => PrInfoObj.java} | 2 +- .../coloryr/allmusic/objs/hud/PosOBJ.java | 19 ----- .../coloryr/allmusic/objs/hud/PosObj.java | 19 +++++ .../objs/hud/{SaveOBJ.java => SaveObj.java} | 24 +++---- .../{AddMusicOBJ.java => AddMusicObj.java} | 4 +- .../{CommandOBJ.java => CommandObj.java} | 4 +- .../{CustomOBJ.java => CustomObj.java} | 4 +- .../{HudListOBJ.java => HudListObj.java} | 4 +- .../objs/message/{HudOBJ.java => HudObj.java} | 4 +- .../{ListMusicOBJ.java => ListMusicObj.java} | 4 +- .../message/{LyricOBJ.java => LyricObj.java} | 4 +- .../{MusicPlayOBJ.java => MusicPlayObj.java} | 8 +-- .../message/{PAPIOBJ.java => PAPIObj.java} | 4 +- .../message/{PageOBJ.java => PageObj.java} | 4 +- .../{SearchOBJ.java => SearchObj.java} | 4 +- .../message/{VoteOBJ.java => VoteObj.java} | 4 +- .../java/coloryr/allmusic/side/bc/SideBC.java | 12 ++-- .../allmusic/side/bukkit/SideBukkit.java | 12 ++-- .../allmusic/side/velocity/SideVelocity.java | 12 ++-- 32 files changed, 170 insertions(+), 174 deletions(-) rename src/main/java/coloryr/allmusic/objs/{MessageOBJ.java => MessageObj.java} (61%) rename src/main/java/coloryr/allmusic/objs/api/music/info/{InfoOBJ.java => InfoObj.java} (99%) rename src/main/java/coloryr/allmusic/objs/api/music/info/{PlayOBJ.java => PlayObj.java} (95%) rename src/main/java/coloryr/allmusic/objs/api/music/list/{DataOBJ.java => DataObj.java} (96%) rename src/main/java/coloryr/allmusic/objs/api/music/lyric/{WLyricOBJ.java => WLyricObj.java} (98%) rename src/main/java/coloryr/allmusic/objs/api/music/search/{SearchDataOBJ.java => SearchDataObj.java} (95%) rename src/main/java/coloryr/allmusic/objs/api/program/info/{PrInfoOBJ.java => PrInfoObj.java} (98%) delete mode 100644 src/main/java/coloryr/allmusic/objs/hud/PosOBJ.java create mode 100644 src/main/java/coloryr/allmusic/objs/hud/PosObj.java rename src/main/java/coloryr/allmusic/objs/hud/{SaveOBJ.java => SaveObj.java} (74%) rename src/main/java/coloryr/allmusic/objs/message/{AddMusicOBJ.java => AddMusicObj.java} (95%) rename src/main/java/coloryr/allmusic/objs/message/{CommandOBJ.java => CommandObj.java} (87%) rename src/main/java/coloryr/allmusic/objs/message/{CustomOBJ.java => CustomObj.java} (77%) rename src/main/java/coloryr/allmusic/objs/message/{HudListOBJ.java => HudListObj.java} (95%) rename src/main/java/coloryr/allmusic/objs/message/{HudOBJ.java => HudObj.java} (97%) rename src/main/java/coloryr/allmusic/objs/message/{ListMusicOBJ.java => ListMusicObj.java} (90%) rename src/main/java/coloryr/allmusic/objs/message/{LyricOBJ.java => LyricObj.java} (85%) rename src/main/java/coloryr/allmusic/objs/message/{MusicPlayOBJ.java => MusicPlayObj.java} (94%) rename src/main/java/coloryr/allmusic/objs/message/{PAPIOBJ.java => PAPIObj.java} (80%) rename src/main/java/coloryr/allmusic/objs/message/{PageOBJ.java => PageObj.java} (92%) rename src/main/java/coloryr/allmusic/objs/message/{SearchOBJ.java => SearchObj.java} (96%) rename src/main/java/coloryr/allmusic/objs/message/{VoteOBJ.java => VoteObj.java} (96%) diff --git a/src/main/java/coloryr/allmusic/AllMusic.java b/src/main/java/coloryr/allmusic/AllMusic.java index 049e489e..81fe9d5e 100644 --- a/src/main/java/coloryr/allmusic/AllMusic.java +++ b/src/main/java/coloryr/allmusic/AllMusic.java @@ -8,8 +8,8 @@ import coloryr.allmusic.music.play.PlayGo; import coloryr.allmusic.music.play.PlayMusic; import coloryr.allmusic.objs.ConfigObj; import coloryr.allmusic.objs.CookieObj; -import coloryr.allmusic.objs.MessageOBJ; -import coloryr.allmusic.objs.hud.SaveOBJ; +import coloryr.allmusic.objs.MessageObj; +import coloryr.allmusic.objs.hud.SaveObj; import coloryr.allmusic.objs.music.SearchPageObj; import coloryr.allmusic.side.IMyLogger; import coloryr.allmusic.side.ISide; @@ -90,7 +90,7 @@ public class AllMusic { /** * 语言对象 */ - private static MessageOBJ message; + private static MessageObj message; /** * 配置文件 */ @@ -123,7 +123,7 @@ public class AllMusic { */ private static void messageCheck() { if (message == null) { - message = new MessageOBJ(); + message = new MessageObj(); log.warning("§d[AllMusic]§c配置文件message.json错误，已覆盖"); save(); } else if (message.check()) { @@ -183,10 +183,10 @@ public class AllMusic { * * @return 语言对象 */ - public static MessageOBJ getMessage() { + public static MessageObj getMessage() { if (message == null) { log.warning("§d[AllMusic]§c配置文件message.json错误，已使用默认配置文件"); - message = new MessageOBJ(); + message = new MessageObj(); } return message; } @@ -379,7 +379,7 @@ public class AllMusic { reader = new InputStreamReader(Files.newInputStream(messageFile.toPath()), StandardCharsets.UTF_8); bf = new BufferedReader(reader); - message = new Gson().fromJson(bf, MessageOBJ.class); + message = new Gson().fromJson(bf, MessageObj.class); bf.close(); reader.close(); messageCheck(); @@ -424,7 +424,7 @@ public class AllMusic { AllMusic.side.runTask(() -> { if (PlayMusic.nowPlayMusic != null) { - SaveOBJ obj = HudUtils.get(player); + SaveObj obj = HudUtils.get(player); String data = gson.toJson(obj); AllMusic.side.send(data, player); AllMusic.side.sendMusic(player, PlayGo.url); diff --git a/src/main/java/coloryr/allmusic/command/CommandEX.java b/src/main/java/coloryr/allmusic/command/CommandEX.java index dfd4b8a2..51ba6876 100644 --- a/src/main/java/coloryr/allmusic/command/CommandEX.java +++ b/src/main/java/coloryr/allmusic/command/CommandEX.java @@ -5,7 +5,7 @@ import coloryr.allmusic.hud.HudUtils; import coloryr.allmusic.music.play.MusicSearch; import coloryr.allmusic.music.play.PlayMusic; import coloryr.allmusic.objs.SearchMusicObj; -import coloryr.allmusic.objs.hud.PosOBJ; +import coloryr.allmusic.objs.hud.PosObj; import coloryr.allmusic.objs.music.MusicObj; import coloryr.allmusic.objs.music.SearchPageObj; import coloryr.allmusic.utils.Function; @@ -403,12 +403,12 @@ public class CommandEX { return; } AllMusic.side.sendMessage(sender, - AllMusic.getMessage().Hud.PicRotate.replace("%Size%", args[2])); + AllMusic.getMessage().Hud.PicRotateSpeed.replace("%Size%", args[2])); } else if (args.length != 4) { AllMusic.side.sendMessage(sender, AllMusic.getMessage().Command.Error); } else { try { - PosOBJ obj = HudUtils.setHudPos(name, args[1], args[2], args[3]); + PosObj obj = HudUtils.setHudPos(name, args[1], args[2], args[3]); if (obj == null) { AllMusic.side.sendMessage(sender, AllMusic.getMessage().Command.Error); } else { diff --git a/src/main/java/coloryr/allmusic/hud/DataSql.java b/src/main/java/coloryr/allmusic/hud/DataSql.java index b02c2084..e24a1a77 100644 --- a/src/main/java/coloryr/allmusic/hud/DataSql.java +++ b/src/main/java/coloryr/allmusic/hud/DataSql.java @@ -1,8 +1,8 @@ package coloryr.allmusic.hud; import coloryr.allmusic.AllMusic; -import coloryr.allmusic.objs.hud.PosOBJ; -import coloryr.allmusic.objs.hud.SaveOBJ; +import coloryr.allmusic.objs.hud.PosObj; +import coloryr.allmusic.objs.hud.SaveObj; import java.io.File; import java.sql.Connection; @@ -103,7 +103,7 @@ public class DataSql { * @param name 用户名 * @param hud Hud数据 */ - private static void update(String name, SaveOBJ hud) { + private static void update(String name, SaveObj hud) { String sql = ""; try { if (connection.isReadOnly() || connection.isClosed()) { @@ -132,7 +132,7 @@ public class DataSql { * @param name 用户名 * @param hud 数据 */ - public static void addUser(String name, SaveOBJ hud) { + public static void addUser(String name, SaveObj hud) { String sql = ""; try { if (connection.isReadOnly() || connection.isClosed()) { @@ -175,23 +175,23 @@ public class DataSql { ResultSet set = stat.executeQuery("SELECT name,info_x,info_y,info_enable,lyric_x,lyric_y,lyric_enable,list_x,list_y,list_enable,pic_x,pic_y,pic_enable,pic_size,pic_rotate,pic_rotate_speed FROM allmusic"); while (set.next()) { String name = set.getString(1); - SaveOBJ obj = new SaveOBJ(); - PosOBJ pos1 = new PosOBJ(); + SaveObj obj = new SaveObj(); + PosObj pos1 = new PosObj(); pos1.x = set.getInt(2); pos1.y = set.getInt(3); obj.Info = pos1; obj.EnableInfo = set.getInt(4) == 1; - PosOBJ pos2 = new PosOBJ(); + PosObj pos2 = new PosObj(); pos2.x = set.getInt(5); pos2.y = set.getInt(6); obj.Lyric = pos2; obj.EnableLyric = set.getInt(7) == 1; - PosOBJ pos3 = new PosOBJ(); + PosObj pos3 = new PosObj(); pos3.x = set.getInt(8); pos3.y = set.getInt(9); obj.List = pos3; obj.EnableList = set.getInt(10) == 1; - PosOBJ pos4 = new PosOBJ(); + PosObj pos4 = new PosObj(); pos4.x = set.getInt(11); pos4.y = set.getInt(12); obj.Pic = pos4; diff --git a/src/main/java/coloryr/allmusic/hud/HudUtils.java b/src/main/java/coloryr/allmusic/hud/HudUtils.java index 73de8e19..e4b34d47 100644 --- a/src/main/java/coloryr/allmusic/hud/HudUtils.java +++ b/src/main/java/coloryr/allmusic/hud/HudUtils.java @@ -4,8 +4,8 @@ import coloryr.allmusic.AllMusic; import coloryr.allmusic.enums.HudPos; import coloryr.allmusic.music.play.LyricSave; import coloryr.allmusic.music.play.PlayMusic; -import coloryr.allmusic.objs.hud.PosOBJ; -import coloryr.allmusic.objs.hud.SaveOBJ; +import coloryr.allmusic.objs.hud.PosObj; +import coloryr.allmusic.objs.hud.SaveObj; import coloryr.allmusic.objs.music.SongInfoObj; import coloryr.allmusic.utils.Function; import com.google.gson.Gson; @@ -14,11 +14,11 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; public class HudUtils { - private static final Map huds = new ConcurrentHashMap<>(); + private static final Map huds = new ConcurrentHashMap<>(); - public static SaveOBJ get(String name) { + public static SaveObj get(String name) { if (!huds.containsKey(name)) { - SaveOBJ obj = AllMusic.getConfig().DefaultHud.copy(); + SaveObj obj = AllMusic.getConfig().DefaultHud.copy(); huds.put(name, obj); DataSql.task(() -> DataSql.addUser(name, obj)); return obj; @@ -26,17 +26,17 @@ public class HudUtils { return huds.get(name); } - public static void add(String name, SaveOBJ hud) { + public static void add(String name, SaveObj hud) { huds.put(name, hud); } - public static void addAndSave(String name, SaveOBJ hud) { + public static void addAndSave(String name, SaveObj hud) { huds.put(name, hud); DataSql.task(() -> DataSql.addUser(name, hud)); } public static void save() { - for (Map.Entry item : huds.entrySet()) { + for (Map.Entry item : huds.entrySet()) { DataSql.addUser(item.getKey(), item.getValue()); } } @@ -50,12 +50,12 @@ public class HudUtils { * @param y y * @return 位置数据 */ - public static PosOBJ setHudPos(String player, String pos, String x, String y) { - SaveOBJ obj = get(player); + public static PosObj setHudPos(String player, String pos, String x, String y) { + SaveObj obj = get(player); if (obj == null) obj = AllMusic.getConfig().DefaultHud.copy(); HudPos pos1 = HudPos.valueOf(pos); - PosOBJ posOBJ = new PosOBJ(0, 0); + PosObj posOBJ = new PosObj(0, 0); if (!Function.isInteger(x) && !Function.isInteger(y)) return null; int x1 = Integer.parseInt(x); @@ -177,7 +177,7 @@ public class HudUtils { * @return 设置结果 */ public static boolean setHudEnable(String player, String pos) { - SaveOBJ obj = get(player); + SaveObj obj = get(player); boolean res = false; if (obj == null) { obj = AllMusic.getConfig().DefaultHud.copy(); @@ -260,7 +260,7 @@ public class HudUtils { public static void sendHudPos(String player) { AllMusic.side.runTask(() -> { try { - SaveOBJ obj = get(player); + SaveObj obj = get(player); if (obj == null) { obj = AllMusic.getConfig().DefaultHud.copy(); addAndSave(player, obj); @@ -281,10 +281,9 @@ public class HudUtils { * @param player 用户名 */ public static void reset(String player) { - SaveOBJ obj = AllMusic.getConfig().DefaultHud.copy(); + SaveObj obj = AllMusic.getConfig().DefaultHud.copy(); clearHud(player); addAndSave(player, obj); - AllMusic.save(); HudUtils.sendHudPos(player); } @@ -296,7 +295,7 @@ public class HudUtils { * @return 结果 */ public static boolean setPicSize(String player, String size) { - SaveOBJ obj = get(player); + SaveObj obj = get(player); if (obj == null) obj = AllMusic.getConfig().DefaultHud.copy(); if (!Function.isInteger(size)) @@ -305,7 +304,6 @@ public class HudUtils { obj.PicSize = Integer.parseInt(size); addAndSave(player, obj); - AllMusic.save(); HudUtils.sendHudPos(player); return true; } @@ -317,14 +315,13 @@ public class HudUtils { * @return 结果 */ public static boolean setPicRotate(String player, String open) { - SaveOBJ obj = get(player); + SaveObj obj = get(player); if (obj == null) obj = AllMusic.getConfig().DefaultHud.copy(); obj.EnablePicRotate = Boolean.parseBoolean(open); addAndSave(player, obj); - AllMusic.save(); HudUtils.sendHudPos(player); return obj.EnablePicRotate; } @@ -336,7 +333,7 @@ public class HudUtils { * @return 结果 */ public static boolean setPicRotateSpeed(String player, String size){ - SaveOBJ obj = get(player); + SaveObj obj = get(player); if (obj == null) obj = AllMusic.getConfig().DefaultHud.copy(); if (!Function.isInteger(size)) @@ -345,7 +342,6 @@ public class HudUtils { obj.PicRotateSpeed = Integer.parseInt(size); addAndSave(player, obj); - AllMusic.save(); HudUtils.sendHudPos(player); return true; } diff --git a/src/main/java/coloryr/allmusic/music/api/APIMain.java b/src/main/java/coloryr/allmusic/music/api/APIMain.java index c5ca2093..dbd0638c 100644 --- a/src/main/java/coloryr/allmusic/music/api/APIMain.java +++ b/src/main/java/coloryr/allmusic/music/api/APIMain.java @@ -7,13 +7,13 @@ import coloryr.allmusic.music.play.LyricSave; import coloryr.allmusic.music.play.PlayMusic; import coloryr.allmusic.objs.HttpResObj; import coloryr.allmusic.objs.SearchMusicObj; -import coloryr.allmusic.objs.api.music.info.InfoOBJ; -import coloryr.allmusic.objs.api.music.list.DataOBJ; -import coloryr.allmusic.objs.api.music.lyric.WLyricOBJ; -import coloryr.allmusic.objs.api.music.search.SearchDataOBJ; +import coloryr.allmusic.objs.api.music.info.InfoObj; +import coloryr.allmusic.objs.api.music.list.DataObj; +import coloryr.allmusic.objs.api.music.lyric.WLyricObj; +import coloryr.allmusic.objs.api.music.search.SearchDataObj; import coloryr.allmusic.objs.api.music.search.songs; import coloryr.allmusic.objs.api.music.trialinfo.TrialInfoObj; -import coloryr.allmusic.objs.api.program.info.PrInfoOBJ; +import coloryr.allmusic.objs.api.program.info.PrInfoObj; import coloryr.allmusic.objs.music.SearchPageObj; import coloryr.allmusic.objs.music.SongInfoObj; import coloryr.allmusic.utils.Logs; @@ -120,7 +120,7 @@ public class APIMain { HttpResObj res = HttpClientUtil.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); + InfoObj temp = AllMusic.gson.fromJson(res.data, InfoObj.class); if (temp.isOk()) { params = new JsonObject(); params.addProperty("ids", "[" + id + "]"); @@ -155,7 +155,7 @@ public class APIMain { params.addProperty("id", id); HttpResObj res = HttpClientUtil.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); + 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(), @@ -207,7 +207,7 @@ public class APIMain { if (res != null && res.ok) try { isUpdata = true; - DataOBJ obj = AllMusic.gson.fromJson(res.data, DataOBJ.class); + DataObj obj = AllMusic.gson.fromJson(res.data, DataObj.class); AllMusic.getConfig().PlayList.addAll(obj.getPlaylist()); AllMusic.save(); AllMusic.side.sendMessaget(sender, AllMusic.getMessage().MusicPlay.ListMusic.Get.replace("%ListName%", obj.getName())); @@ -242,7 +242,7 @@ public class APIMain { params, EncryptType.EAPI, "/api/song/lyric/v1"); if (res != null && res.ok) { try { - WLyricOBJ obj = AllMusic.gson.fromJson(res.data, WLyricOBJ.class); + WLyricObj obj = AllMusic.gson.fromJson(res.data, WLyricObj.class); LyricDo temp = new LyricDo(); for (int times = 0; times < 3; times++) { if (temp.check(obj)) { @@ -294,7 +294,7 @@ public class APIMain { HttpResObj res = HttpClientUtil.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); + SearchDataObj obj = AllMusic.gson.fromJson(res.data, SearchDataObj.class); if (obj != null && obj.isOk()) { List res1 = obj.getResult(); SearchMusicObj item; diff --git a/src/main/java/coloryr/allmusic/music/play/LyricDo.java b/src/main/java/coloryr/allmusic/music/play/LyricDo.java index 5246e6f0..cf2fb3e5 100644 --- a/src/main/java/coloryr/allmusic/music/play/LyricDo.java +++ b/src/main/java/coloryr/allmusic/music/play/LyricDo.java @@ -1,7 +1,7 @@ package coloryr.allmusic.music.play; import coloryr.allmusic.AllMusic; -import coloryr.allmusic.objs.api.music.lyric.WLyricOBJ; +import coloryr.allmusic.objs.api.music.lyric.WLyricObj; import coloryr.allmusic.objs.music.LyricItemObj; import coloryr.allmusic.utils.Function; @@ -30,7 +30,7 @@ public class LyricDo { * @param obj 歌词 * @return 结果 */ - public boolean check(WLyricOBJ obj) { + public boolean check(WLyricObj obj) { String[] lyric; boolean haveT = false; diff --git a/src/main/java/coloryr/allmusic/objs/ConfigObj.java b/src/main/java/coloryr/allmusic/objs/ConfigObj.java index d9143003..57976897 100644 --- a/src/main/java/coloryr/allmusic/objs/ConfigObj.java +++ b/src/main/java/coloryr/allmusic/objs/ConfigObj.java @@ -3,7 +3,7 @@ package coloryr.allmusic.objs; import coloryr.allmusic.AllMusic; import coloryr.allmusic.objs.config.EconomyObj; import coloryr.allmusic.objs.config.FunConfigObj; -import coloryr.allmusic.objs.hud.SaveOBJ; +import coloryr.allmusic.objs.hud.SaveObj; import java.util.ArrayList; import java.util.List; @@ -131,7 +131,7 @@ public class ConfigObj { /** * 默认的Hud配置 */ - public SaveOBJ DefaultHud; + public SaveObj DefaultHud; /** * 经济插件挂钩 */ @@ -156,7 +156,7 @@ public class ConfigObj { PlayListRandom = true; SendLyric = true; NeedPermission = false; - DefaultHud = new SaveOBJ(); + DefaultHud = new SaveObj(); UseCost = false; SearchCost = 20; @@ -218,7 +218,7 @@ public class ConfigObj { } if (DefaultHud == null) { saveConfig = true; - DefaultHud = new SaveOBJ(); + DefaultHud = new SaveObj(); } if (NoMusicPlayer == null) { saveConfig = true; diff --git a/src/main/java/coloryr/allmusic/objs/MessageOBJ.java b/src/main/java/coloryr/allmusic/objs/MessageObj.java similarity index 61% rename from src/main/java/coloryr/allmusic/objs/MessageOBJ.java rename to src/main/java/coloryr/allmusic/objs/MessageObj.java index f8e44add..bcfec413 100644 --- a/src/main/java/coloryr/allmusic/objs/MessageOBJ.java +++ b/src/main/java/coloryr/allmusic/objs/MessageObj.java @@ -1,39 +1,39 @@ package coloryr.allmusic.objs; import coloryr.allmusic.AllMusic; -import coloryr.allmusic.objs.message.SearchOBJ; +import coloryr.allmusic.objs.message.SearchObj; import coloryr.allmusic.objs.message.*; -public class MessageOBJ { - public MusicPlayOBJ MusicPlay; - public AddMusicOBJ AddMusic; - public PageOBJ Page; - public LyricOBJ Lyric; - public VoteOBJ Vote; - public SearchOBJ Search; - public HudOBJ Hud; - public HudListOBJ HudList; - public CommandOBJ Command; - public CustomOBJ Custom; - public PAPIOBJ PAPI; +public class MessageObj { + public MusicPlayObj MusicPlay; + public AddMusicObj AddMusic; + public PageObj Page; + public LyricObj Lyric; + public VoteObj Vote; + public SearchObj Search; + public HudObj Hud; + public HudListObj HudList; + public CommandObj Command; + public CustomObj Custom; + public PAPIObj PAPI; public CostObj Cost; public ClickObj Click; public HelpObj Help; public FunObj Fun; public String Version; - public MessageOBJ() { - MusicPlay = new MusicPlayOBJ(); - AddMusic = new AddMusicOBJ(); - Page = new PageOBJ(); - Lyric = new LyricOBJ(); - Vote = new VoteOBJ(); - Search = new coloryr.allmusic.objs.message.SearchOBJ(); - Hud = new HudOBJ(); - Command = new CommandOBJ(); - HudList = new HudListOBJ(); - Custom = new CustomOBJ(); - PAPI = new PAPIOBJ(); + public MessageObj() { + MusicPlay = new MusicPlayObj(); + AddMusic = new AddMusicObj(); + Page = new PageObj(); + Lyric = new LyricObj(); + Vote = new VoteObj(); + Search = new SearchObj(); + Hud = new HudObj(); + Command = new CommandObj(); + HudList = new HudListObj(); + Custom = new CustomObj(); + PAPI = new PAPIObj(); Cost = new CostObj(); Click = new ClickObj(); Help = new HelpObj(); @@ -45,47 +45,47 @@ public class MessageOBJ { boolean saveConfig = false; if (MusicPlay == null || MusicPlay.check()) { saveConfig = true; - MusicPlay = new MusicPlayOBJ(); + MusicPlay = new MusicPlayObj(); } if (AddMusic == null || AddMusic.check()) { saveConfig = true; - AddMusic = new AddMusicOBJ(); + AddMusic = new AddMusicObj(); } if (Page == null || Page.check()) { saveConfig = true; - Page = new PageOBJ(); + Page = new PageObj(); } if (Lyric == null || Lyric.check()) { saveConfig = true; - Lyric = new LyricOBJ(); + Lyric = new LyricObj(); } if (Vote == null || Vote.check()) { saveConfig = true; - Vote = new VoteOBJ(); + Vote = new VoteObj(); } if (Search == null || Search.check()) { saveConfig = true; - Search = new SearchOBJ(); + Search = new SearchObj(); } if (Hud == null || Hud.check()) { saveConfig = true; - Hud = new HudOBJ(); + Hud = new HudObj(); } if (HudList == null || HudList.check()) { saveConfig = true; - HudList = new HudListOBJ(); + HudList = new HudListObj(); } if (Command == null || Command.check()) { saveConfig = true; - Command = new CommandOBJ(); + Command = new CommandObj(); } if (Custom == null || Custom.check()) { saveConfig = true; - Custom = new CustomOBJ(); + Custom = new CustomObj(); } if (PAPI == null || PAPI.check()) { saveConfig = true; - PAPI = new PAPIOBJ(); + PAPI = new PAPIObj(); } if (Cost == null || Cost.check()) { saveConfig = true; diff --git a/src/main/java/coloryr/allmusic/objs/api/music/info/InfoOBJ.java b/src/main/java/coloryr/allmusic/objs/api/music/info/InfoObj.java similarity index 99% rename from src/main/java/coloryr/allmusic/objs/api/music/info/InfoOBJ.java rename to src/main/java/coloryr/allmusic/objs/api/music/info/InfoObj.java index 0dcb574a..6a2f6439 100644 --- a/src/main/java/coloryr/allmusic/objs/api/music/info/InfoOBJ.java +++ b/src/main/java/coloryr/allmusic/objs/api/music/info/InfoObj.java @@ -2,7 +2,7 @@ package coloryr.allmusic.objs.api.music.info; import java.util.List; -public class InfoOBJ { +public class InfoObj { private List songs; public boolean isOk() { diff --git a/src/main/java/coloryr/allmusic/objs/api/music/info/PlayOBJ.java b/src/main/java/coloryr/allmusic/objs/api/music/info/PlayObj.java similarity index 95% rename from src/main/java/coloryr/allmusic/objs/api/music/info/PlayOBJ.java rename to src/main/java/coloryr/allmusic/objs/api/music/info/PlayObj.java index 9c7d7928..68250c58 100644 --- a/src/main/java/coloryr/allmusic/objs/api/music/info/PlayOBJ.java +++ b/src/main/java/coloryr/allmusic/objs/api/music/info/PlayObj.java @@ -2,7 +2,7 @@ package coloryr.allmusic.objs.api.music.info; import java.util.List; -public class PlayOBJ { +public class PlayObj { private List data; private int code; diff --git a/src/main/java/coloryr/allmusic/objs/api/music/list/DataOBJ.java b/src/main/java/coloryr/allmusic/objs/api/music/list/DataObj.java similarity index 96% rename from src/main/java/coloryr/allmusic/objs/api/music/list/DataOBJ.java rename to src/main/java/coloryr/allmusic/objs/api/music/list/DataObj.java index d88796d7..7aa48275 100644 --- a/src/main/java/coloryr/allmusic/objs/api/music/list/DataOBJ.java +++ b/src/main/java/coloryr/allmusic/objs/api/music/list/DataObj.java @@ -3,7 +3,7 @@ package coloryr.allmusic.objs.api.music.list; import java.util.ArrayList; import java.util.List; -public class DataOBJ { +public class DataObj { private playlist playlist; public List getPlaylist() { diff --git a/src/main/java/coloryr/allmusic/objs/api/music/lyric/WLyricOBJ.java b/src/main/java/coloryr/allmusic/objs/api/music/lyric/WLyricObj.java similarity index 98% rename from src/main/java/coloryr/allmusic/objs/api/music/lyric/WLyricOBJ.java rename to src/main/java/coloryr/allmusic/objs/api/music/lyric/WLyricObj.java index ed37c5b4..6cf6989d 100644 --- a/src/main/java/coloryr/allmusic/objs/api/music/lyric/WLyricOBJ.java +++ b/src/main/java/coloryr/allmusic/objs/api/music/lyric/WLyricObj.java @@ -1,6 +1,6 @@ package coloryr.allmusic.objs.api.music.lyric; -public class WLyricOBJ { +public class WLyricObj { private lrc lrc; private tlyric tlyric; private klyric klyric; diff --git a/src/main/java/coloryr/allmusic/objs/api/music/search/SearchDataOBJ.java b/src/main/java/coloryr/allmusic/objs/api/music/search/SearchDataObj.java similarity index 95% rename from src/main/java/coloryr/allmusic/objs/api/music/search/SearchDataOBJ.java rename to src/main/java/coloryr/allmusic/objs/api/music/search/SearchDataObj.java index eae1c5b1..7f236096 100644 --- a/src/main/java/coloryr/allmusic/objs/api/music/search/SearchDataOBJ.java +++ b/src/main/java/coloryr/allmusic/objs/api/music/search/SearchDataObj.java @@ -2,7 +2,7 @@ package coloryr.allmusic.objs.api.music.search; import java.util.List; -public class SearchDataOBJ { +public class SearchDataObj { private result result; public boolean isOk() { diff --git a/src/main/java/coloryr/allmusic/objs/api/program/info/PrInfoOBJ.java b/src/main/java/coloryr/allmusic/objs/api/program/info/PrInfoObj.java similarity index 98% rename from src/main/java/coloryr/allmusic/objs/api/program/info/PrInfoOBJ.java rename to src/main/java/coloryr/allmusic/objs/api/program/info/PrInfoObj.java index 18f692d2..b89fc173 100644 --- a/src/main/java/coloryr/allmusic/objs/api/program/info/PrInfoOBJ.java +++ b/src/main/java/coloryr/allmusic/objs/api/program/info/PrInfoObj.java @@ -1,6 +1,6 @@ package coloryr.allmusic.objs.api.program.info; -public class PrInfoOBJ { +public class PrInfoObj { private program program; diff --git a/src/main/java/coloryr/allmusic/objs/hud/PosOBJ.java b/src/main/java/coloryr/allmusic/objs/hud/PosOBJ.java deleted file mode 100644 index a2182f08..00000000 --- a/src/main/java/coloryr/allmusic/objs/hud/PosOBJ.java +++ /dev/null @@ -1,19 +0,0 @@ -package coloryr.allmusic.objs.hud; - -public class PosOBJ { - public int x; - public int y; - - public PosOBJ() { - - } - - public PosOBJ(int x, int y) { - this.x = x; - this.y = y; - } - - public PosOBJ copy() { - return new PosOBJ(this.x, this.y); - } -} diff --git a/src/main/java/coloryr/allmusic/objs/hud/PosObj.java b/src/main/java/coloryr/allmusic/objs/hud/PosObj.java new file mode 100644 index 00000000..20f4f3e7 --- /dev/null +++ b/src/main/java/coloryr/allmusic/objs/hud/PosObj.java @@ -0,0 +1,19 @@ +package coloryr.allmusic.objs.hud; + +public class PosObj { + public int x; + public int y; + + public PosObj() { + + } + + public PosObj(int x, int y) { + this.x = x; + this.y = y; + } + + public PosObj copy() { + return new PosObj(this.x, this.y); + } +} diff --git a/src/main/java/coloryr/allmusic/objs/hud/SaveOBJ.java b/src/main/java/coloryr/allmusic/objs/hud/SaveObj.java similarity index 74% rename from src/main/java/coloryr/allmusic/objs/hud/SaveOBJ.java rename to src/main/java/coloryr/allmusic/objs/hud/SaveObj.java index 5ec41f99..cc3de42b 100644 --- a/src/main/java/coloryr/allmusic/objs/hud/SaveOBJ.java +++ b/src/main/java/coloryr/allmusic/objs/hud/SaveObj.java @@ -1,10 +1,10 @@ package coloryr.allmusic.objs.hud; -public class SaveOBJ { - public PosOBJ List; - public PosOBJ Lyric; - public PosOBJ Info; - public PosOBJ Pic; +public class SaveObj { + public PosObj List; + public PosObj Lyric; + public PosObj Info; + public PosObj Pic; public int PicSize; public int PicRotateSpeed; public boolean EnablePicRotate; @@ -13,22 +13,22 @@ public class SaveOBJ { public boolean EnableInfo; public boolean EnablePic; - public SaveOBJ() { + public SaveObj() { EnableList = true; EnableLyric = true; EnableInfo = true; EnablePic = true; EnablePicRotate = true; PicRotateSpeed = 10; - List = new PosOBJ(); - Lyric = new PosOBJ(); - Info = new PosOBJ(); - Pic = new PosOBJ(); + List = new PosObj(); + Lyric = new PosObj(); + Info = new PosObj(); + Pic = new PosObj(); PicSize = 70; } - public SaveOBJ copy() { - SaveOBJ obj1 = new SaveOBJ(); + public SaveObj copy() { + SaveObj obj1 = new SaveObj(); obj1.EnableInfo = this.EnableInfo; obj1.EnableList = this.EnableList; obj1.EnableLyric = this.EnableLyric; diff --git a/src/main/java/coloryr/allmusic/objs/message/AddMusicOBJ.java b/src/main/java/coloryr/allmusic/objs/message/AddMusicObj.java similarity index 95% rename from src/main/java/coloryr/allmusic/objs/message/AddMusicOBJ.java rename to src/main/java/coloryr/allmusic/objs/message/AddMusicObj.java index dfedf71c..36789b29 100644 --- a/src/main/java/coloryr/allmusic/objs/message/AddMusicOBJ.java +++ b/src/main/java/coloryr/allmusic/objs/message/AddMusicObj.java @@ -1,6 +1,6 @@ package coloryr.allmusic.objs.message; -public class AddMusicOBJ { +public class AddMusicObj { public String ListFull; public String BanMusic; public String ExistMusic; @@ -10,7 +10,7 @@ public class AddMusicOBJ { public String Cancel; public String TimeOut; - public AddMusicOBJ() { + public AddMusicObj() { ListFull = "§d[AllMusic]§c错误，队列已满"; BanMusic = "§d[AllMusic]§c错误，这首歌被禁点了"; ExistMusic = "§d[AllMusic]§c错误，这首歌已经存在了"; diff --git a/src/main/java/coloryr/allmusic/objs/message/CommandOBJ.java b/src/main/java/coloryr/allmusic/objs/message/CommandObj.java similarity index 87% rename from src/main/java/coloryr/allmusic/objs/message/CommandOBJ.java rename to src/main/java/coloryr/allmusic/objs/message/CommandObj.java index 33c419cc..6f8a4812 100644 --- a/src/main/java/coloryr/allmusic/objs/message/CommandOBJ.java +++ b/src/main/java/coloryr/allmusic/objs/message/CommandObj.java @@ -1,10 +1,10 @@ package coloryr.allmusic.objs.message; -public class CommandOBJ { +public class CommandObj { public String Error; public String NoPer; - public CommandOBJ() { + public CommandObj() { Error = "§d[AllMusic]§c参数错误，请输入/music help获取帮助"; NoPer = "§d[AllMusic]§c你没有权限点歌"; } diff --git a/src/main/java/coloryr/allmusic/objs/message/CustomOBJ.java b/src/main/java/coloryr/allmusic/objs/message/CustomObj.java similarity index 77% rename from src/main/java/coloryr/allmusic/objs/message/CustomOBJ.java rename to src/main/java/coloryr/allmusic/objs/message/CustomObj.java index a43f77ab..634611bb 100644 --- a/src/main/java/coloryr/allmusic/objs/message/CustomOBJ.java +++ b/src/main/java/coloryr/allmusic/objs/message/CustomObj.java @@ -1,9 +1,9 @@ package coloryr.allmusic.objs.message; -public class CustomOBJ { +public class CustomObj { public String Info; - public CustomOBJ() { + public CustomObj() { Info = "自定义音乐"; } diff --git a/src/main/java/coloryr/allmusic/objs/message/HudListOBJ.java b/src/main/java/coloryr/allmusic/objs/message/HudListObj.java similarity index 95% rename from src/main/java/coloryr/allmusic/objs/message/HudListOBJ.java rename to src/main/java/coloryr/allmusic/objs/message/HudListObj.java index 2384b121..027b097b 100644 --- a/src/main/java/coloryr/allmusic/objs/message/HudListOBJ.java +++ b/src/main/java/coloryr/allmusic/objs/message/HudListObj.java @@ -1,6 +1,6 @@ package coloryr.allmusic.objs.message; -public class HudListOBJ { +public class HudListObj { public String List; public String Lyric; public String Info; @@ -9,7 +9,7 @@ public class HudListOBJ { public String PicRoute; public String PicRouteSpeed; - public HudListOBJ() { + public HudListObj() { List = "待播放列表"; Lyric = "歌词"; Info = "歌曲信息"; diff --git a/src/main/java/coloryr/allmusic/objs/message/HudOBJ.java b/src/main/java/coloryr/allmusic/objs/message/HudObj.java similarity index 97% rename from src/main/java/coloryr/allmusic/objs/message/HudOBJ.java rename to src/main/java/coloryr/allmusic/objs/message/HudObj.java index 389e91e2..4a8243a5 100644 --- a/src/main/java/coloryr/allmusic/objs/message/HudOBJ.java +++ b/src/main/java/coloryr/allmusic/objs/message/HudObj.java @@ -1,6 +1,6 @@ package coloryr.allmusic.objs.message; -public class HudOBJ { +public class HudObj { public String State; public String Set; public String Reset; @@ -15,7 +15,7 @@ public class HudOBJ { public String List; public String Ktv; - public HudOBJ() { + public HudObj() { State = "§d[AllMusic]§2设置信息位置：%Hud%，状态：%State%"; Set = "§d[AllMusic]§2已设置%Hud%的坐标为%x%, %y%"; Reset = "§d[AllMusic]§2Hud恢复至默认位置"; diff --git a/src/main/java/coloryr/allmusic/objs/message/ListMusicOBJ.java b/src/main/java/coloryr/allmusic/objs/message/ListMusicObj.java similarity index 90% rename from src/main/java/coloryr/allmusic/objs/message/ListMusicOBJ.java rename to src/main/java/coloryr/allmusic/objs/message/ListMusicObj.java index 48bcafc8..fa2f5dc3 100644 --- a/src/main/java/coloryr/allmusic/objs/message/ListMusicOBJ.java +++ b/src/main/java/coloryr/allmusic/objs/message/ListMusicObj.java @@ -1,11 +1,11 @@ package coloryr.allmusic.objs.message; -public class ListMusicOBJ { +public class ListMusicObj { public String Head; public String Item; public String Get; - public ListMusicOBJ() { + public ListMusicObj() { Head = "§d[AllMusic]§2队列中有歌曲数：&Count&"; Item = "§2%index%->%MusicName% | %MusicAuthor% | %MusicAl% | %MusicAlia%"; Get = "§d[AllMusic]§2歌曲列表%ListName%获取成功"; diff --git a/src/main/java/coloryr/allmusic/objs/message/LyricOBJ.java b/src/main/java/coloryr/allmusic/objs/message/LyricObj.java similarity index 85% rename from src/main/java/coloryr/allmusic/objs/message/LyricOBJ.java rename to src/main/java/coloryr/allmusic/objs/message/LyricObj.java index 7d45139e..ff0789bd 100644 --- a/src/main/java/coloryr/allmusic/objs/message/LyricOBJ.java +++ b/src/main/java/coloryr/allmusic/objs/message/LyricObj.java @@ -1,10 +1,10 @@ package coloryr.allmusic.objs.message; -public class LyricOBJ { +public class LyricObj { public String Data; public String TData; - public LyricOBJ() { + public LyricObj() { Data = "%Lyric%"; TData = "%Lyric%(%TLyric%)"; } diff --git a/src/main/java/coloryr/allmusic/objs/message/MusicPlayOBJ.java b/src/main/java/coloryr/allmusic/objs/message/MusicPlayObj.java similarity index 94% rename from src/main/java/coloryr/allmusic/objs/message/MusicPlayOBJ.java rename to src/main/java/coloryr/allmusic/objs/message/MusicPlayObj.java index 92af3ce8..2063b88a 100644 --- a/src/main/java/coloryr/allmusic/objs/message/MusicPlayOBJ.java +++ b/src/main/java/coloryr/allmusic/objs/message/MusicPlayObj.java @@ -1,11 +1,11 @@ package coloryr.allmusic.objs.message; -public class MusicPlayOBJ { +public class MusicPlayObj { public String StopPlay; public String NoMusic; public String Play; public String NoPlay; - public ListMusicOBJ ListMusic; + public ListMusicObj ListMusic; public String NoCanPlay; public String NoPlayMusic; public String Switch; @@ -15,12 +15,12 @@ public class MusicPlayOBJ { public String Trail; public String Cancel; - public MusicPlayOBJ() { + public MusicPlayObj() { StopPlay = "§d[AllMusic]§2已停止你的音乐播放"; NoMusic = "§d[AllMusic]§2无正在播放的歌曲"; Play = "§d[AllMusic]§2正在播放：%MusicName% | %MusicAuthor% | %MusicAl% | %MusicAlia% | by: %PlayerName%"; NoPlay = "§d[AllMusic]§2队列中无歌曲"; - ListMusic = new ListMusicOBJ(); + ListMusic = new ListMusicObj(); NoCanPlay = "§d[AllMusic]§c无法播放歌曲%MusicID%可能该歌曲为VIP歌曲"; NoPlayMusic = "§d[AllMusic]§2你不会再收到点歌了！想要再次参与点歌就点一首歌吧！"; Switch = "§d[AllMusic]§2切换到玩家歌曲"; diff --git a/src/main/java/coloryr/allmusic/objs/message/PAPIOBJ.java b/src/main/java/coloryr/allmusic/objs/message/PAPIObj.java similarity index 80% rename from src/main/java/coloryr/allmusic/objs/message/PAPIOBJ.java rename to src/main/java/coloryr/allmusic/objs/message/PAPIObj.java index 3c8a17f9..4716cf39 100644 --- a/src/main/java/coloryr/allmusic/objs/message/PAPIOBJ.java +++ b/src/main/java/coloryr/allmusic/objs/message/PAPIObj.java @@ -1,9 +1,9 @@ package coloryr.allmusic.objs.message; -public class PAPIOBJ { +public class PAPIObj { public String NoMusic; - public PAPIOBJ() { + public PAPIObj() { NoMusic = "没有播放的音乐"; } diff --git a/src/main/java/coloryr/allmusic/objs/message/PageOBJ.java b/src/main/java/coloryr/allmusic/objs/message/PageObj.java similarity index 92% rename from src/main/java/coloryr/allmusic/objs/message/PageOBJ.java rename to src/main/java/coloryr/allmusic/objs/message/PageObj.java index a04f6591..e23a0fa0 100644 --- a/src/main/java/coloryr/allmusic/objs/message/PageOBJ.java +++ b/src/main/java/coloryr/allmusic/objs/message/PageObj.java @@ -1,11 +1,11 @@ package coloryr.allmusic.objs.message; -public class PageOBJ { +public class PageObj { public String Choice; public String Next; public String Last; - public PageOBJ() { + public PageObj() { Choice = "§e[§n点我选择§r§e]§2%index%->%MusicName% | %MusicAuthor% | %MusicAl%"; Next = "§d[AllMusic]§e[§n点我下一页§r§e]"; Last = "§d[AllMusic]§e[§n点我上一页§r§e]"; diff --git a/src/main/java/coloryr/allmusic/objs/message/SearchOBJ.java b/src/main/java/coloryr/allmusic/objs/message/SearchObj.java similarity index 96% rename from src/main/java/coloryr/allmusic/objs/message/SearchOBJ.java rename to src/main/java/coloryr/allmusic/objs/message/SearchObj.java index 41db493d..3cdbe5d9 100644 --- a/src/main/java/coloryr/allmusic/objs/message/SearchOBJ.java +++ b/src/main/java/coloryr/allmusic/objs/message/SearchObj.java @@ -1,6 +1,6 @@ package coloryr.allmusic.objs.message; -public class SearchOBJ { +public class SearchObj { public String NoPer; public String CantSearch; public String Res; @@ -11,7 +11,7 @@ public class SearchOBJ { public String CantLast; public String StartSearch; - public SearchOBJ() { + public SearchObj() { StartSearch = "§d[AllMusic]§2正在排队搜歌"; NoPer = "§d[AllMusic]§c你没有权限搜歌"; CantSearch = "§d[AllMusic]§c无法搜索歌曲：%Music%"; diff --git a/src/main/java/coloryr/allmusic/objs/message/VoteOBJ.java b/src/main/java/coloryr/allmusic/objs/message/VoteObj.java similarity index 96% rename from src/main/java/coloryr/allmusic/objs/message/VoteOBJ.java rename to src/main/java/coloryr/allmusic/objs/message/VoteObj.java index 08ca79dc..40acee3b 100644 --- a/src/main/java/coloryr/allmusic/objs/message/VoteOBJ.java +++ b/src/main/java/coloryr/allmusic/objs/message/VoteObj.java @@ -1,6 +1,6 @@ package coloryr.allmusic.objs.message; -public class VoteOBJ { +public class VoteObj { public String NoPermission; public String DoVote; public String BQ; @@ -10,7 +10,7 @@ public class VoteOBJ { public String TimeOut; public String Do; - public VoteOBJ() { + public VoteObj() { NoPermission = "§d[AllMusic]§c你没有权限切歌"; DoVote = "§d[AllMusic]§2已发起切歌投票"; BQ = "§d[AllMusic]§2%PlayerName%发起了切歌投票，30秒后结束，输入/music vote 同意切歌。"; diff --git a/src/main/java/coloryr/allmusic/side/bc/SideBC.java b/src/main/java/coloryr/allmusic/side/bc/SideBC.java index 2e3196b8..d6463e75 100644 --- a/src/main/java/coloryr/allmusic/side/bc/SideBC.java +++ b/src/main/java/coloryr/allmusic/side/bc/SideBC.java @@ -4,7 +4,7 @@ import coloryr.allmusic.AllMusic; import coloryr.allmusic.AllMusicBC; import coloryr.allmusic.hud.HudUtils; import coloryr.allmusic.music.play.PlayMusic; -import coloryr.allmusic.objs.hud.SaveOBJ; +import coloryr.allmusic.objs.hud.SaveObj; import coloryr.allmusic.objs.music.MusicObj; import coloryr.allmusic.objs.music.SongInfoObj; import coloryr.allmusic.side.ComType; @@ -146,7 +146,7 @@ public class SideBC extends ISide { for (ProxiedPlayer player : ProxyServer.getInstance().getPlayers()) { if (ok(player)) continue; - SaveOBJ obj = HudUtils.get(player.getName()); + SaveObj obj = HudUtils.get(player.getName()); if (!obj.EnableLyric) continue; send(player, ComType.lyric + data); @@ -163,7 +163,7 @@ public class SideBC extends ISide { for (ProxiedPlayer player : ProxyServer.getInstance().getPlayers()) { if (ok(player)) continue; - SaveOBJ obj = HudUtils.get(player.getName()); + SaveObj obj = HudUtils.get(player.getName()); if (!obj.EnableInfo) continue; send(player, ComType.info + data); @@ -181,7 +181,7 @@ public class SideBC extends ISide { if (ok(player)) continue; String name = player.getName(); - SaveOBJ obj = HudUtils.get(name); + SaveObj obj = HudUtils.get(name); if (!obj.EnableList) continue; send(player, ComType.list + data); @@ -196,7 +196,7 @@ public class SideBC extends ISide { public void sendHudUtilsAll() { for (ProxiedPlayer player : ProxyServer.getInstance().getPlayers()) { try { - SaveOBJ obj = HudUtils.get(player.getName()); + SaveObj obj = HudUtils.get(player.getName()); String data = AllMusic.gson.toJson(obj); send(player, data); } catch (Exception e1) { @@ -258,7 +258,7 @@ public class SideBC extends ISide { if (ok(player)) continue; String name = player.getName(); - SaveOBJ obj = HudUtils.get(name); + SaveObj obj = HudUtils.get(name); if (!obj.EnablePic) continue; send(player, ComType.img + url); diff --git a/src/main/java/coloryr/allmusic/side/bukkit/SideBukkit.java b/src/main/java/coloryr/allmusic/side/bukkit/SideBukkit.java index d03bc3dc..318b5e54 100644 --- a/src/main/java/coloryr/allmusic/side/bukkit/SideBukkit.java +++ b/src/main/java/coloryr/allmusic/side/bukkit/SideBukkit.java @@ -3,7 +3,7 @@ package coloryr.allmusic.side.bukkit; import coloryr.allmusic.AllMusic; import coloryr.allmusic.AllMusicBukkit; import coloryr.allmusic.hud.HudUtils; -import coloryr.allmusic.objs.hud.SaveOBJ; +import coloryr.allmusic.objs.hud.SaveObj; import coloryr.allmusic.objs.music.MusicObj; import coloryr.allmusic.objs.music.SongInfoObj; import coloryr.allmusic.side.ComType; @@ -84,7 +84,7 @@ public class SideBukkit extends ISide { if (AllMusic.isOK(player.getName(), null, true)) continue; String name = player.getName(); - SaveOBJ obj = HudUtils.get(name); + SaveObj obj = HudUtils.get(name); if (!obj.EnableLyric) continue; send(player, ComType.lyric + data); @@ -102,7 +102,7 @@ public class SideBukkit extends ISide { if (AllMusic.isOK(player.getName(), null, true)) continue; String name = player.getName(); - SaveOBJ obj = HudUtils.get(name); + SaveObj obj = HudUtils.get(name); if (!obj.EnableInfo) continue; send(player, ComType.info + data); @@ -120,7 +120,7 @@ public class SideBukkit extends ISide { if (AllMusic.isOK(player.getName(), null, true)) continue; String name = player.getName(); - SaveOBJ obj = HudUtils.get(name); + SaveObj obj = HudUtils.get(name); if (!obj.EnableList) continue; send(player, ComType.list + data); @@ -136,7 +136,7 @@ public class SideBukkit extends ISide { for (Player player : Bukkit.getOnlinePlayers()) { String Name = player.getName(); try { - SaveOBJ obj = HudUtils.get(Name); + SaveObj obj = HudUtils.get(Name); String data = new Gson().toJson(obj); send(player, data); } catch (Exception e1) { @@ -201,7 +201,7 @@ public class SideBukkit extends ISide { if (AllMusic.isOK(player.getName(), null, true)) continue; String name = player.getName(); - SaveOBJ obj = HudUtils.get(name); + SaveObj obj = HudUtils.get(name); if (!obj.EnablePic) continue; send(player, ComType.img + url); diff --git a/src/main/java/coloryr/allmusic/side/velocity/SideVelocity.java b/src/main/java/coloryr/allmusic/side/velocity/SideVelocity.java index 5c36e85b..e45fae65 100644 --- a/src/main/java/coloryr/allmusic/side/velocity/SideVelocity.java +++ b/src/main/java/coloryr/allmusic/side/velocity/SideVelocity.java @@ -4,7 +4,7 @@ import coloryr.allmusic.AllMusic; import coloryr.allmusic.AllMusicVelocity; import coloryr.allmusic.hud.HudUtils; import coloryr.allmusic.music.play.PlayMusic; -import coloryr.allmusic.objs.hud.SaveOBJ; +import coloryr.allmusic.objs.hud.SaveObj; import coloryr.allmusic.objs.music.MusicObj; import coloryr.allmusic.objs.music.SongInfoObj; import coloryr.allmusic.side.ComType; @@ -240,7 +240,7 @@ public class SideVelocity extends ISide { if (ok(player)) continue; String name = player.getUsername(); - SaveOBJ obj = HudUtils.get(name); + SaveObj obj = HudUtils.get(name); if (!obj.EnablePic) continue; send(player, ComType.img + url); @@ -287,7 +287,7 @@ public class SideVelocity extends ISide { for (Player player : AllMusicVelocity.plugin.server.getAllPlayers()) { if (ok(player)) continue; - SaveOBJ obj = HudUtils.get(player.getUsername()); + SaveObj obj = HudUtils.get(player.getUsername()); if (!obj.EnableLyric) continue; send(player, ComType.lyric + data); @@ -304,7 +304,7 @@ public class SideVelocity extends ISide { for (Player player : AllMusicVelocity.plugin.server.getAllPlayers()) { if (ok(player)) continue; - SaveOBJ obj = HudUtils.get(player.getUsername()); + SaveObj obj = HudUtils.get(player.getUsername()); if (!obj.EnableInfo) continue; send(player, ComType.info + data); @@ -322,7 +322,7 @@ public class SideVelocity extends ISide { if (ok(player)) continue; String name = player.getUsername(); - SaveOBJ obj = HudUtils.get(name); + SaveObj obj = HudUtils.get(name); if (!obj.EnableList) continue; send(player, ComType.list + data); @@ -338,7 +338,7 @@ public class SideVelocity extends ISide { for (Player players : AllMusicVelocity.plugin.server.getAllPlayers()) { String Name = players.getUsername(); try { - SaveOBJ obj = HudUtils.get(Name); + SaveObj obj = HudUtils.get(Name); String data = new Gson().toJson(obj); send(data, Name); } catch (Exception e1) {