diff --git a/README.md b/README.md index 2ac4d751..86bf4633 100644 --- a/README.md +++ b/README.md @@ -14,6 +14,7 @@ - CatServer(LoliServer) - Spigot(CraftBukkit) - Paper +- Folia - Bungeecord - Velocity @@ -41,6 +42,9 @@ fabric同理 ## 播放VIP歌曲 1. 手机号创建网易云账户并购买网易云音乐VIP 2. 在配置文件给自己管理员然后/music reload + - bukkit/spigot/paper/folia 服务器给自己op是同样的效果 + - forge/fabric/neoforge 服务器给自己等级权限2是同样的效果 + - bc/velocity 需要配置文件写上自己的游戏名 3. 输入/music code 手机号码 获取手机验证码 4. 输入/music login 验证码 登录账户 @@ -59,8 +63,127 @@ fabric同理 > %allmusic_tlyric% 翻译的歌词 > %allmusic_klyric% KTV歌词 -### 更新日志 +## 更新日志 ``` 3.0.0：将插件大部分重写 +3.1.0：添加文本长度限制 ``` + +## 配置文件说明 +配置文件采用json格式，需要遵守json编写的格式规范 +- maxPlayList 最大歌曲数 +- maxPlayerList 一个玩家最大可点数量，0代表不限制 +- minVote 最小通过投票数 +- voteTime 投票时间 +- lyricDelay 歌曲延迟，单位毫秒 +- defaultAddMusic 默认添加歌曲方式，1为搜歌 +- ktvLyricDelay KTV模式歌词延迟，单位毫秒 +- adminList 管理员列表 +- muteServer 不参与点歌的服务器列表 +- mutePlayer 不参与点歌的玩家列表 +- banMusic 禁止点歌ID列表，ID为音乐ID +- banPlayer 禁止玩家点歌列表 +- playListSwitch 是否玩家点歌后是否直接从空闲歌单切换至玩家歌曲 +- playListRandom 是否空闲歌单随机播放 +- sendLyric 是否发送歌词到客户端 +- needPermission 是否指令需要权限 +- topPAPI 是否启用顶层模式，用于和BC交换数据 +- mutePlayMessage 是否不发送播放信息 +- muteAddMessage 是否不发送点歌信息 +- showInBar 是否将信息限制在bar处 +- ktvMode 是否启用KTV歌词 +- musicBR 歌曲音质 +- version 配置文件版本号 +- defaultHud 默认Hud配置 + - list 播放列表Hud配置 + - x x轴间距 + - y y轴间距 + - dir 对齐方式 + - color 字体颜色 + - shadow 是否显示字体阴影 + - enable 是否启用 + - lyric 歌词Hud配置 + - x + - y + - dir + - color + - shadow + - enable + - info 歌曲信息Hud配置 + - x + - y + - dir + - color + - shadow + - enable + - pic 图片显示配置 + - x + - y + - dir + - color 图片尺寸 + - shadow 是否开启图片旋转 + - enable + - picRotateSpeed 图片旋转速度 +- economy 经济扩展配置 +- mysqlUrl 目前无用 +- backend 目前无用 +- vault 是否使用vault插件 +- funConfig 娱乐选项 + - rain 是否启用随机下雨 + - rainRate 随机下雨概率 +- limit 限制设置 + - messageLimit 是否启用广播消息长度限制 + - messageLimitSize 广播消息限制长度 + - listLimit 是否启用歌曲列表长度限制 + - listLimitSize 歌曲列表限制长度 + - infoLimit 是否启用信息长度限制 + - infoLimitSize 信息长限制长度 + - musicTimeLimit 是否启用歌曲长度限制 + - maxMusicTime 限制最长歌曲长度，单位秒 +- limitText 限制长度替换文本 +- sendDelay Hud信息更新延迟 + +## 指令说明 +普通玩家指令 +- /music [音乐ID/网易云分享链接] 点歌 +- /music stop 停止播放歌曲 +- /music list 查看歌曲队列 +- /music cancel (序号) 取消你的点歌 +- /music vote 投票切歌 +- /music vote cancel 取消发起的切歌 +- /music push (序号) 投票将歌曲插入到队列头 +- /music push cancel 取消发起的插歌 +- /music mute 不再参与点歌 +- /music search [歌名] 搜索歌曲 +- /music select [序列] 选择歌曲 +- /music nextpage 切换下一页歌曲搜索结果 +- /music lastpage 切换上一页歌曲搜索结果 +- /music hud enable 启用/关闭全部界面 +- /music hud reset 重置全部界面 +- /music hud [位置] enable 启用关闭单一界面 +- /music hud [位置] pos [x] [y] 设置某个界面的位置 +- /music hud [位置] dir [对齐方式] 设置某个界面的对齐方式 +- /music hud [位置] color [颜色HEX] 设置某个界面的颜色 +- /music hud [位置] reset 重置单一界面 +- /music hud pic size [尺寸] 设置图片尺寸 +- /music hud pic rotate [开关] 设置图片旋转模式 +- /music hud pic speed [数值] 设置图片旋转速度 + +在配置文件给管理员后 +- /music reload 重读配置文件 +- /music next 强制切歌 +- /music ban [ID] 禁止点这首歌 +- /music banplayer [ID] 禁止某位玩家点歌 +- /music url [url] 播放一首自定义歌曲 +- /music delete [序号] 删除队列中的歌曲 +- /music addlist [歌单ID] 添加歌单到空闲列表 +- /music clearlist 清空空闲歌单 +- /music login [验证码] 登录账户 +- /music code [手机号] 获取短信验证码 + +若开启权限后 +- 点歌需要权限`allmusic.addmusic` +- 搜歌需要权限`allmusic.search` +- 插歌需要权限`allmusic.push` +- 投票切歌需要权限`allmusic.vote` \ No newline at end of file diff --git a/core/AllMusic.java b/core/AllMusic.java index cf6477a7..09887e49 100644 --- a/core/AllMusic.java +++ b/core/AllMusic.java @@ -35,15 +35,15 @@ public class AllMusic { /** * 插件版本号 */ - public static final String version = "3.1.0"; + public static final String version = "3.1.1"; /** * 配置文件版本号 */ - public static final String configVersion = "201"; + public static final String configVersion = "202"; /** * 语言文件配置版本号 */ - public static final String messageVersion = "201"; + public static final String messageVersion = "202"; /** * 搜歌结果 * 玩家名 结果 diff --git a/core/command/CommandEX.java b/core/command/CommandEX.java index a59cc71d..3cd89d04 100644 --- a/core/command/CommandEX.java +++ b/core/command/CommandEX.java @@ -254,7 +254,7 @@ public class CommandEX { return; } - if (AllMusic.getConfig().adminList.stream().anyMatch(name::equalsIgnoreCase)) { + if (AllMusic.side.checkPermission(name)) { command = commandAdminList.get(args[0]); if (command != null) { command.ex(sender, name, args); @@ -262,7 +262,7 @@ public class CommandEX { } } if (AllMusic.getConfig().needPermission && - AllMusic.side.checkPermission(name, "allmusic.addmusic")) + !AllMusic.side.checkPermission(name, "allmusic.addmusic")) AllMusic.side.sendMessage(sender, AllMusic.getMessage().command.noPer); else { switch (AllMusic.getConfig().defaultAddMusic) { diff --git a/core/command/CommandHelp.java b/core/command/CommandHelp.java index 19b11a0e..f359f536 100644 --- a/core/command/CommandHelp.java +++ b/core/command/CommandHelp.java @@ -28,6 +28,10 @@ public class CommandHelp extends ACommand { AllMusic.getMessage().click.clickCheck, "/music search "); AllMusic.side.sendMessageSuggest(sender, AllMusic.getMessage().help.normal.select, AllMusic.getMessage().click.clickCheck, "/music select "); + AllMusic.side.sendMessageRun(sender, AllMusic.getMessage().help.normal.nextpage, + AllMusic.getMessage().click.clickRun, "/music nextpage"); + AllMusic.side.sendMessageRun(sender, AllMusic.getMessage().help.normal.lastpage, + AllMusic.getMessage().click.clickRun, "/music lastpage"); AllMusic.side.sendMessageRun(sender, AllMusic.getMessage().help.normal.hud9, AllMusic.getMessage().click.clickRun, "/music hud enable"); AllMusic.side.sendMessageRun(sender, AllMusic.getMessage().help.normal.hud10, diff --git a/core/command/CommandLastPage.java b/core/command/CommandLastPage.java index 1bac257c..ce2354eb 100644 --- a/core/command/CommandLastPage.java +++ b/core/command/CommandLastPage.java @@ -7,7 +7,7 @@ public class CommandLastPage extends ACommand { @Override public void ex(Object sender, String name, String[] args) { if (AllMusic.getConfig().needPermission && - AllMusic.side.checkPermission(name, "allmusic.search")) { + !AllMusic.side.checkPermission(name, "allmusic.search")) { AllMusic.side.sendMessage(sender, AllMusic.getMessage().search.noPer); return; } diff --git a/core/command/CommandNextPage.java b/core/command/CommandNextPage.java index 84d50799..d7bd06ea 100644 --- a/core/command/CommandNextPage.java +++ b/core/command/CommandNextPage.java @@ -7,7 +7,7 @@ public class CommandNextPage extends ACommand { @Override public void ex(Object sender, String name, String[] args) { if (AllMusic.getConfig().needPermission && - AllMusic.side.checkPermission(name, "allmusic.search")) { + !AllMusic.side.checkPermission(name, "allmusic.search")) { AllMusic.side.sendMessage(sender, AllMusic.getMessage().search.noPer); return; } diff --git a/core/command/CommandPush.java b/core/command/CommandPush.java index ada8adab..698e1718 100644 --- a/core/command/CommandPush.java +++ b/core/command/CommandPush.java @@ -12,7 +12,7 @@ public class CommandPush extends ACommand { @Override public void ex(Object sender, String name, String[] args) { if (AllMusic.getConfig().needPermission && - AllMusic.side.checkPermission(name, "allmusic.push")) { + !AllMusic.side.checkPermission(name, "allmusic.push")) { AllMusic.side.sendMessage(sender, AllMusic.getMessage().push.noPermission); return; } diff --git a/core/command/CommandSearch.java b/core/command/CommandSearch.java index cba06f69..28e20c7f 100644 --- a/core/command/CommandSearch.java +++ b/core/command/CommandSearch.java @@ -6,7 +6,7 @@ public class CommandSearch extends ACommand { @Override public void ex(Object sender, String name, String[] args) { if (AllMusic.getConfig().needPermission && - AllMusic.side.checkPermission(name, "allmusic.search")) { + !AllMusic.side.checkPermission(name, "allmusic.search")) { AllMusic.side.sendMessage(sender, AllMusic.getMessage().search.noPer); return; } diff --git a/core/command/CommandSelect.java b/core/command/CommandSelect.java index 3cf16bda..0de220db 100644 --- a/core/command/CommandSelect.java +++ b/core/command/CommandSelect.java @@ -12,7 +12,7 @@ public class CommandSelect extends ACommand { @Override public void ex(Object sender, String name, String[] args) { if (AllMusic.getConfig().needPermission && - AllMusic.side.checkPermission(name, "allmusic.search")) { + !AllMusic.side.checkPermission(name, "allmusic.search")) { AllMusic.side.sendMessage(sender, AllMusic.getMessage().search.noPer); return; } diff --git a/core/command/CommandVote.java b/core/command/CommandVote.java index 203bd7e0..b2d04433 100644 --- a/core/command/CommandVote.java +++ b/core/command/CommandVote.java @@ -7,7 +7,7 @@ public class CommandVote extends ACommand { @Override public void ex(Object sender, String name, String[] args) { if (AllMusic.getConfig().needPermission && - AllMusic.side.checkPermission(name, "allmusic.vote")) { + !AllMusic.side.checkPermission(name, "allmusic.vote")) { AllMusic.side.sendMessage(sender, AllMusic.getMessage().vote.noPermission); return; } else if (PlayMusic.getListSize() == 0 && PlayMusic.getIdleListSize() == 0) { diff --git a/core/objs/config/SaveObj.java b/core/objs/config/SaveObj.java index 58473aab..cb95f12c 100644 --- a/core/objs/config/SaveObj.java +++ b/core/objs/config/SaveObj.java @@ -31,15 +31,15 @@ public class SaveObj { boolean save = false; if (list == null) { save = true; - list = new PosObj(2, 74, HudDirType.TOP_LEFT, 0xffffff, false, true); + list = new PosObj(2, 74, HudDirType.TOP_LEFT, 0xffffff, true, true); } if (lyric == null) { save = true; - lyric = new PosObj(74, 53, HudDirType.TOP_LEFT, 0xffffff, false, true); + lyric = new PosObj(74, 53, HudDirType.TOP_LEFT, 0xffffff, true, true); } if (info == null) { save = true; - info = new PosObj(74, 2, HudDirType.TOP_LEFT, 0xffffff, false, true); + info = new PosObj(74, 2, HudDirType.TOP_LEFT, 0xffffff, true, true); } if (pic == null) { save = true; @@ -50,9 +50,9 @@ public class SaveObj { public void init() { picRotateSpeed = 30; - list = new PosObj(2, 74, HudDirType.TOP_LEFT, 0xffffff, false, true); - lyric = new PosObj(74, 53, HudDirType.TOP_LEFT, 0xffffff, false, true); - info = new PosObj(74, 2, HudDirType.TOP_LEFT, 0xffffff, false, true); + list = new PosObj(2, 74, HudDirType.TOP_LEFT, 0xffffff, true, true); + lyric = new PosObj(74, 53, HudDirType.TOP_LEFT, 0xffffff, true, true); + info = new PosObj(74, 2, HudDirType.TOP_LEFT, 0xffffff, true, true); pic = new PosObj(2, 2, HudDirType.TOP_LEFT, 70, true, true); } } \ No newline at end of file diff --git a/core/objs/message/HelpNormalObj.java b/core/objs/message/HelpNormalObj.java index 743c84e5..ec7c695b 100644 --- a/core/objs/message/HelpNormalObj.java +++ b/core/objs/message/HelpNormalObj.java @@ -13,6 +13,8 @@ public class HelpNormalObj { public String mute; public String search; public String select; + public String nextpage; + public String lastpage; public String hud1; public String hud2; public String hud3; @@ -74,31 +76,37 @@ public class HelpNormalObj { return true; if (hud10 == null) return true; + if (nextpage == null) + return true; + if (lastpage == null) + return true; return hud5 == null; } public void init() { head = "§d[AllMusic3]§e帮助手册"; - base = "§d[AllMusic3]§e使用/music [音乐ID] 来点歌"; - stop = "§d[AllMusic3]§e使用/music stop 停止播放歌曲"; - list = "§d[AllMusic3]§e使用/music list 查看歌曲队列"; - cancel = "§d[AllMusic3]§e使用/music cancel (序号) 取消你的点歌"; - vote = "§d[AllMusic3]§e使用/music vote 投票切歌"; - vote1 = "§d[AllMusic3]§e使用/music vote cancel 取消发起的切歌"; - push = "§d[AllMusic3]§e使用/music push (序号) 投票将歌曲插入到队列头"; - push1 = "§d[AllMusic3]§e使用/music push cancel 取消发起的插歌"; - mute = "§d[AllMusic3]§e使用/music mute 不再参与点歌"; - search = "§d[AllMusic3]§e使用/music search [歌名] 搜索歌曲"; - select = "§d[AllMusic3]§e使用/music select [序列] 选择歌曲"; - hud9 = "§d[AllMusic3]§e使用/music hud enable 启用/关闭全部界面"; - hud10 = "§d[AllMusic3]§e使用/music hud reset 重置全部界面"; - hud1 = "§d[AllMusic3]§e使用/music hud [位置] enable 启用关闭单一界面"; - hud2 = "§d[AllMusic3]§e使用/music hud [位置] pos [x] [y] 设置某个界面的位置"; - hud6 = "§d[AllMusic3]§e使用/music hud [位置] dir [对齐方式] 设置某个界面的对齐方式"; - hud7 = "§d[AllMusic3]§e使用/music hud [位置] color [颜色HEX] 设置某个界面的颜色"; - hud8 = "§d[AllMusic3]§e使用/music hud [位置] reset 重置单一界面"; - hud3 = "§d[AllMusic3]§e使用/music hud pic size [尺寸] 设置图片尺寸"; - hud4 = "§d[AllMusic3]§e使用/music hud pic rotate [开关] 设置图片旋转模式"; - hud5 = "§d[AllMusic3]§e使用/music hud pic speed [数值] 设置图片旋转速度"; + base = "§d[AllMusic3]§e/music [音乐ID] 来点歌"; + stop = "§d[AllMusic3]§e/music stop 停止播放歌曲"; + list = "§d[AllMusic3]§e/music list 查看歌曲队列"; + cancel = "§d[AllMusic3]§e/music cancel (序号) 取消你的点歌"; + vote = "§d[AllMusic3]§e/music vote 投票切歌"; + vote1 = "§d[AllMusic3]§e/music vote cancel 取消发起的切歌"; + push = "§d[AllMusic3]§e/music push (序号) 投票将歌曲插入到队列头"; + push1 = "§d[AllMusic3]§e/music push cancel 取消发起的插歌"; + mute = "§d[AllMusic3]§e/music mute 不再参与点歌"; + search = "§d[AllMusic3]§e/music search [歌名] 搜索歌曲"; + select = "§d[AllMusic3]§e/music select [序列] 选择歌曲"; + nextpage = "§d[AllMusic3]§e/music nextpage 切换下一页歌曲搜索结果"; + lastpage = "§d[AllMusic3]§e/music lastpage 切换上一页歌曲搜索结果"; + hud9 = "§d[AllMusic3]§e/music hud enable 启用/关闭全部界面"; + hud10 = "§d[AllMusic3]§e/music hud reset 重置全部界面"; + hud1 = "§d[AllMusic3]§e/music hud [位置] enable 启用关闭单一界面"; + hud2 = "§d[AllMusic3]§e/music hud [位置] pos [x] [y] 设置某个界面的位置"; + hud6 = "§d[AllMusic3]§e/music hud [位置] dir [对齐方式] 设置某个界面的对齐方式"; + hud7 = "§d[AllMusic3]§e/music hud [位置] color [颜色HEX] 设置某个界面的颜色"; + hud8 = "§d[AllMusic3]§e/music hud [位置] reset 重置单一界面"; + hud3 = "§d[AllMusic3]§e/music hud pic size [尺寸] 设置图片尺寸"; + hud4 = "§d[AllMusic3]§e/music hud pic rotate [开关] 设置图片旋转模式"; + hud5 = "§d[AllMusic3]§e/music hud pic speed [数值] 设置图片旋转速度"; } } diff --git a/core/side/BaseSide.java b/core/side/BaseSide.java index 1f707f01..318f3acb 100644 --- a/core/side/BaseSide.java +++ b/core/side/BaseSide.java @@ -36,6 +36,14 @@ public abstract class BaseSide { */ public abstract void runTask(Runnable run, int delay); + /** + * 检查权限 + * + * @param player 用户名 + * @return 是否有权限 + */ + public abstract boolean checkPermission(String player); + /** * 检查权限 * diff --git a/fabric_1_16_5/gradle.properties b/fabric_1_16_5/gradle.properties index 48e6f8b6..8bd3a28a 100644 --- a/fabric_1_16_5/gradle.properties +++ b/fabric_1_16_5/gradle.properties @@ -10,7 +10,7 @@ loader_version=0.15.11 fabric_kotlin_version=1.10.19+kotlin.1.9.23 # Mod Properties -mod_version = 3.1.0 +mod_version = 3.1.1 maven_group = com.coloryr.allmusic.server archives_base_name =[fabric-1.16.5]AllMusic_Server diff --git a/fabric_1_16_5/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java b/fabric_1_16_5/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java index 4a411a98..e168a7b9 100644 --- a/fabric_1_16_5/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java +++ b/fabric_1_16_5/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java @@ -54,7 +54,12 @@ public class SideFabric extends BaseSide { } @Override - public boolean checkPermission(String player, String permission) { + public boolean checkPermission(String player) { + for (String item : AllMusic.getConfig().adminList) { + if (item.equalsIgnoreCase(player)) { + return true; + } + } ServerPlayerEntity player1 = AllMusicFabric.server.getPlayerManager().getPlayer(player); if (player1 == null) return false; @@ -62,6 +67,11 @@ public class SideFabric extends BaseSide { return player1.hasPermissionLevel(2); } + @Override + public boolean checkPermission(String player, String permission) { + return checkPermission(player); + } + @Override public boolean needPlay() { int online = getPlayerSize(); diff --git a/fabric_1_18_2/gradle.properties b/fabric_1_18_2/gradle.properties index 56bb4926..1a330ef0 100644 --- a/fabric_1_18_2/gradle.properties +++ b/fabric_1_18_2/gradle.properties @@ -10,7 +10,7 @@ loader_version=0.15.11 fabric_kotlin_version=1.10.19+kotlin.1.9.23 # Mod Properties -mod_version=3.1.0 +mod_version=3.1.1 maven_group=com.coloryr.allmusic.server archives_base_name=[fabric-1.18.2]AllMusic_Server diff --git a/fabric_1_18_2/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java b/fabric_1_18_2/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java index 2b296447..4b61f55f 100644 --- a/fabric_1_18_2/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java +++ b/fabric_1_18_2/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java @@ -54,14 +54,24 @@ public class SideFabric extends BaseSide { } @Override - public boolean checkPermission(String player, String permission) { - var player1 = AllMusicFabric.server.getPlayerManager().getPlayer(player); + public boolean checkPermission(String player) { + for (String item : AllMusic.getConfig().adminList) { + if (item.equalsIgnoreCase(player)) { + return true; + } + } + ServerPlayerEntity player1 = AllMusicFabric.server.getPlayerManager().getPlayer(player); if (player1 == null) return false; return player1.hasPermissionLevel(2); } + @Override + public boolean checkPermission(String player, String permission) { + return checkPermission(player); + } + @Override public boolean needPlay() { int online = getPlayerSize(); diff --git a/fabric_1_19_2/gradle.properties b/fabric_1_19_2/gradle.properties index bd12c2d7..215059a1 100644 --- a/fabric_1_19_2/gradle.properties +++ b/fabric_1_19_2/gradle.properties @@ -10,7 +10,7 @@ loader_version=0.15.11 fabric_kotlin_version=1.10.19+kotlin.1.9.23 # Mod Properties -mod_version = 3.1.0 +mod_version = 3.1.1 maven_group = com.coloryr.allmusic.server archives_base_name =[fabric-1.19.2]AllMusic_Server diff --git a/fabric_1_19_2/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java b/fabric_1_19_2/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java index bd467a80..74624255 100644 --- a/fabric_1_19_2/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java +++ b/fabric_1_19_2/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java @@ -55,7 +55,12 @@ public class SideFabric extends BaseSide { } @Override - public boolean checkPermission(String player, String permission) { + public boolean checkPermission(String player) { + for (String item : AllMusic.getConfig().adminList) { + if (item.equalsIgnoreCase(player)) { + return true; + } + } var player1 = AllMusicFabric.server.getPlayerManager().getPlayer(player); if (player1 == null) return false; @@ -63,6 +68,11 @@ public class SideFabric extends BaseSide { return player1.hasPermissionLevel(2); } + @Override + public boolean checkPermission(String player, String permission) { + return checkPermission(player); + } + @Override public boolean needPlay() { int online = getPlayerSize(); diff --git a/fabric_1_19_3/gradle.properties b/fabric_1_19_3/gradle.properties index f6c7c851..cc1671a7 100644 --- a/fabric_1_19_3/gradle.properties +++ b/fabric_1_19_3/gradle.properties @@ -10,7 +10,7 @@ loader_version=0.15.11 fabric_kotlin_version=1.10.19+kotlin.1.9.23 # Mod Properties -mod_version = 3.1.0 +mod_version = 3.1.1 maven_group = com.coloryr.allmusic.server archives_base_name =[fabric-1.19.3]AllMusic_Server diff --git a/fabric_1_19_3/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java b/fabric_1_19_3/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java index 7f0deadf..23cc9d9c 100644 --- a/fabric_1_19_3/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java +++ b/fabric_1_19_3/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java @@ -53,7 +53,12 @@ public class SideFabric extends BaseSide { } @Override - public boolean checkPermission(String player, String permission) { + public boolean checkPermission(String player) { + for (String item : AllMusic.getConfig().adminList) { + if (item.equalsIgnoreCase(player)) { + return true; + } + } var player1 = AllMusicFabric.server.getPlayerManager().getPlayer(player); if (player1 == null) return false; @@ -61,6 +66,11 @@ public class SideFabric extends BaseSide { return player1.hasPermissionLevel(2); } + @Override + public boolean checkPermission(String player, String permission) { + return checkPermission(player); + } + @Override public boolean needPlay() { int online = getPlayerSize(); diff --git a/fabric_1_20/gradle.properties b/fabric_1_20/gradle.properties index 20ea0d8e..34e72301 100644 --- a/fabric_1_20/gradle.properties +++ b/fabric_1_20/gradle.properties @@ -10,7 +10,7 @@ loader_version=0.15.11 fabric_kotlin_version=1.10.19+kotlin.1.9.23 # Mod Properties -mod_version = 3.1.0 +mod_version = 3.1.1 maven_group = com.coloryr.allmusic.server archives_base_name =[fabric-1.20]AllMusic_Server diff --git a/fabric_1_20/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java b/fabric_1_20/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java index 7f0deadf..23cc9d9c 100644 --- a/fabric_1_20/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java +++ b/fabric_1_20/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java @@ -53,7 +53,12 @@ public class SideFabric extends BaseSide { } @Override - public boolean checkPermission(String player, String permission) { + public boolean checkPermission(String player) { + for (String item : AllMusic.getConfig().adminList) { + if (item.equalsIgnoreCase(player)) { + return true; + } + } var player1 = AllMusicFabric.server.getPlayerManager().getPlayer(player); if (player1 == null) return false; @@ -61,6 +66,11 @@ public class SideFabric extends BaseSide { return player1.hasPermissionLevel(2); } + @Override + public boolean checkPermission(String player, String permission) { + return checkPermission(player); + } + @Override public boolean needPlay() { int online = getPlayerSize(); diff --git a/fabric_1_20_2/gradle.properties b/fabric_1_20_2/gradle.properties index 71552058..6d6ef5be 100644 --- a/fabric_1_20_2/gradle.properties +++ b/fabric_1_20_2/gradle.properties @@ -10,7 +10,7 @@ loader_version=0.15.11 fabric_kotlin_version=1.10.19+kotlin.1.9.23 # Mod Properties -mod_version = 3.1.0 +mod_version = 3.1.1 maven_group = com.coloryr.allmusic.server archives_base_name =[fabric-1.20.2]AllMusic_Server diff --git a/fabric_1_20_2/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java b/fabric_1_20_2/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java index bd467a80..74624255 100644 --- a/fabric_1_20_2/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java +++ b/fabric_1_20_2/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java @@ -55,7 +55,12 @@ public class SideFabric extends BaseSide { } @Override - public boolean checkPermission(String player, String permission) { + public boolean checkPermission(String player) { + for (String item : AllMusic.getConfig().adminList) { + if (item.equalsIgnoreCase(player)) { + return true; + } + } var player1 = AllMusicFabric.server.getPlayerManager().getPlayer(player); if (player1 == null) return false; @@ -63,6 +68,11 @@ public class SideFabric extends BaseSide { return player1.hasPermissionLevel(2); } + @Override + public boolean checkPermission(String player, String permission) { + return checkPermission(player); + } + @Override public boolean needPlay() { int online = getPlayerSize(); diff --git a/fabric_1_20_6/gradle.properties b/fabric_1_20_6/gradle.properties index 0c8e7f01..d4a6030e 100644 --- a/fabric_1_20_6/gradle.properties +++ b/fabric_1_20_6/gradle.properties @@ -10,7 +10,7 @@ loader_version=0.15.11 fabric_kotlin_version=1.10.19+kotlin.1.9.23 # Mod Properties -mod_version = 3.1.0 +mod_version = 3.1.1 maven_group = com.coloryr.allmusic.server archives_base_name =[fabric-1.20.6]AllMusic_Server diff --git a/fabric_1_20_6/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java b/fabric_1_20_6/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java index e1d85b73..abadc9ed 100644 --- a/fabric_1_20_6/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java +++ b/fabric_1_20_6/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java @@ -51,7 +51,12 @@ public class SideFabric extends BaseSide { } @Override - public boolean checkPermission(String player, String permission) { + public boolean checkPermission(String player) { + for (String item : AllMusic.getConfig().adminList) { + if (item.equalsIgnoreCase(player)) { + return true; + } + } var player1 = AllMusicFabric.server.getPlayerManager().getPlayer(player); if (player1 == null) return false; @@ -59,6 +64,11 @@ public class SideFabric extends BaseSide { return player1.hasPermissionLevel(2); } + @Override + public boolean checkPermission(String player, String permission) { + return checkPermission(player); + } + @Override public boolean needPlay() { int online = getPlayerSize(); 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 23468c3c..c6eb4a5d 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 @@ -21,6 +21,7 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import java.util.List; +import java.util.Locale; public class SideFolia extends BaseSide { @Override @@ -355,12 +356,28 @@ public class SideFolia extends BaseSide { @Override public boolean checkPermission(String player, String permission) { - if (AllMusic.getConfig().adminList.contains(player)) - return false; + for (String item : AllMusic.getConfig().adminList) { + if (item.equalsIgnoreCase(player)) { + return true; + } + } Player player1 = Bukkit.getPlayer(player); if (player1 == null) - return true; - return !player1.hasPermission(permission); + return false; + return player1.hasPermission(permission); + } + + @Override + public boolean checkPermission(String player) { + for (String item : AllMusic.getConfig().adminList) { + if (item.equalsIgnoreCase(player)) { + return true; + } + } + Player player1 = Bukkit.getPlayer(player); + if (player1 == null) + return false; + return player1.isOp(); } @Override diff --git a/folia/src/main/resources/plugin.yml b/folia/src/main/resources/plugin.yml index e35a36ef..82b72dd9 100644 --- a/folia/src/main/resources/plugin.yml +++ b/folia/src/main/resources/plugin.yml @@ -1,7 +1,7 @@ name: AllMusic3 main: com.coloryr.allmusic.server.AllMusicFolia author: Color_yr -version: 3.0.0 +version: 3.1.1 folia-supported: true softdepend: [PlaceholderAPI, Vault, Essentials, CMI] api-version: 1.19 diff --git a/forge_1_12_2/build.gradle b/forge_1_12_2/build.gradle index a62251cd..329c89d8 100644 --- a/forge_1_12_2/build.gradle +++ b/forge_1_12_2/build.gradle @@ -16,7 +16,7 @@ plugins { apply plugin: 'net.minecraftforge.gradle' //Only edit below this line, the above code adds and enables the necessary things for Forge to be setup. -version = '3.1.0' +version = '3.1.1' group = "com.coloryr.allmusic.server" // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = "[forge-1.12.2]AllMusic_Server" diff --git a/forge_1_12_2/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java b/forge_1_12_2/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java index c8c1f97b..0aea8a2d 100644 --- a/forge_1_12_2/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java +++ b/forge_1_12_2/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java @@ -57,6 +57,16 @@ public class SideForge extends BaseSide { @Override public boolean checkPermission(String player, String permission) { + return checkPermission(player); + } + + @Override + public boolean checkPermission(String player) { + for (String item : AllMusic.getConfig().adminList) { + if (item.equalsIgnoreCase(player)) { + return true; + } + } EntityPlayerMP player1 = AllMusicForge.server.getPlayerList().getPlayerByUsername(player); if (player1 == null) return false; diff --git a/forge_1_12_2/src/main/resources/mcmod.info b/forge_1_12_2/src/main/resources/mcmod.info index d0938e38..03983d8a 100644 --- a/forge_1_12_2/src/main/resources/mcmod.info +++ b/forge_1_12_2/src/main/resources/mcmod.info @@ -3,7 +3,7 @@ "modid": "allmusic_server", "name": "AllMusic Server", "description": "AllMusic Server Mod", - "version": "3.0.0", + "version": "3.1.1", "mcversion": "1.12.2", "url": "https://github.com/Coloryr/AllMusic_Server", "updateUrl": "", diff --git a/forge_1_16_5/build.gradle b/forge_1_16_5/build.gradle index 5759f4af..d1c2d284 100644 --- a/forge_1_16_5/build.gradle +++ b/forge_1_16_5/build.gradle @@ -19,7 +19,7 @@ apply plugin: 'eclipse' apply plugin: 'maven-publish' apply plugin: 'kotlin' -version = '3.1.0' +version = '3.1.1' group = 'com.coloryr.allmusic.server' // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = '[forge-1.16.5]AllMusic_Server' diff --git a/forge_1_16_5/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java b/forge_1_16_5/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java index f409303a..76da49d7 100644 --- a/forge_1_16_5/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java +++ b/forge_1_16_5/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java @@ -58,6 +58,16 @@ public class SideForge extends BaseSide { @Override public boolean checkPermission(String player, String permission) { + return checkPermission(player); + } + + @Override + public boolean checkPermission(String player) { + for (String item : AllMusic.getConfig().adminList) { + if (item.equalsIgnoreCase(player)) { + return true; + } + } ServerPlayerEntity player1 = AllMusicForge.server.getPlayerList().getPlayerByName(player); if (player1 == null) return false; diff --git a/forge_1_16_5/src/main/resources/META-INF/mods.toml b/forge_1_16_5/src/main/resources/META-INF/mods.toml index 7e5e9bc2..fe93a57c 100644 --- a/forge_1_16_5/src/main/resources/META-INF/mods.toml +++ b/forge_1_16_5/src/main/resources/META-INF/mods.toml @@ -20,7 +20,7 @@ modId="allmusic_server" #mandatory # The version number of the mod - there's a few well known ${} variables useable here or just hardcode it # ${file.jarVersion} will substitute the value of the Implementation-Version as read from the mod's JAR file metadata # see the associated build.gradle script for how to populate this completely automatically during a build -version="3.0.0" #mandatory +version="3.1.1" #mandatory # A display name for the mod displayName="AllMusic Server" #mandatory # A URL to query for updates for this mod. See the JSON update specification https://mcforge.readthedocs.io/en/latest/gettingstarted/autoupdate/ diff --git a/forge_1_18_2/build.gradle b/forge_1_18_2/build.gradle index d28941b4..fa3bc731 100644 --- a/forge_1_18_2/build.gradle +++ b/forge_1_18_2/build.gradle @@ -19,7 +19,7 @@ plugins { apply plugin: 'net.minecraftforge.gradle' -version = '3.1.0' +version = '3.1.1' group = 'com.coloryr.allmusic.server' // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = '[forge-1.18.2]AllMusic_Server' diff --git a/forge_1_18_2/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java b/forge_1_18_2/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java index a6e5045e..e2675cb2 100644 --- a/forge_1_18_2/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java +++ b/forge_1_18_2/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java @@ -58,6 +58,16 @@ public class SideForge extends BaseSide { @Override public boolean checkPermission(String player, String permission) { + return checkPermission(player); + } + + @Override + public boolean checkPermission(String player) { + for (String item : AllMusic.getConfig().adminList) { + if (item.equalsIgnoreCase(player)) { + return true; + } + } ServerPlayer player1 = AllMusicForge.server.getPlayerList().getPlayerByName(player); if (player1 == null) return false; diff --git a/forge_1_19_2/build.gradle b/forge_1_19_2/build.gradle index 7fa75d1a..461ceb86 100644 --- a/forge_1_19_2/build.gradle +++ b/forge_1_19_2/build.gradle @@ -7,7 +7,7 @@ plugins { id 'org.jetbrains.kotlin.plugin.serialization' version '1.8.21' } -version = '3.1.0' +version = '3.1.1' group = 'com.coloryr.allmusic.server' // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = '[forge-1.19.2]AllMusic_Server' diff --git a/forge_1_19_2/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java b/forge_1_19_2/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java index 3ee12596..e96aa9d8 100644 --- a/forge_1_19_2/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java +++ b/forge_1_19_2/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java @@ -57,6 +57,16 @@ public class SideForge extends BaseSide { @Override public boolean checkPermission(String player, String permission) { + return checkPermission(player); + } + + @Override + public boolean checkPermission(String player) { + for (String item : AllMusic.getConfig().adminList) { + if (item.equalsIgnoreCase(player)) { + return true; + } + } ServerPlayer player1 = AllMusicForge.server.getPlayerList().getPlayerByName(player); if (player1 == null) return false; diff --git a/forge_1_19_2/src/main/resources/META-INF/mods.toml b/forge_1_19_2/src/main/resources/META-INF/mods.toml index 25454ec5..8980a0a9 100644 --- a/forge_1_19_2/src/main/resources/META-INF/mods.toml +++ b/forge_1_19_2/src/main/resources/META-INF/mods.toml @@ -19,7 +19,7 @@ modId="allmusic_server" #mandatory # The version number of the mod - there's a few well known ${} variables useable here or just hardcode it # ${file.jarVersion} will substitute the value of the Implementation-Version as read from the mod's JAR file metadata # see the associated build.gradle script for how to populate this completely automatically during a build -version="3.0.0" #mandatory +version="3.1.1" #mandatory # A display name for the mod displayName="AllMusic Server" #mandatory # A URL to query for updates for this mod. See the JSON update specification https://mcforge.readthedocs.io/en/latest/gettingstarted/autoupdate/ diff --git a/forge_1_19_3/build.gradle b/forge_1_19_3/build.gradle index 90540bc6..c9af9136 100644 --- a/forge_1_19_3/build.gradle +++ b/forge_1_19_3/build.gradle @@ -7,7 +7,7 @@ plugins { id 'org.jetbrains.kotlin.plugin.serialization' version '1.9.0' } -version = '3.1.0' +version = '3.1.1' group = 'com.coloryr.allmusic.server' // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = '[forge-1.19.3]AllMusic_Server' diff --git a/forge_1_19_3/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java b/forge_1_19_3/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java index 3ee12596..e96aa9d8 100644 --- a/forge_1_19_3/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java +++ b/forge_1_19_3/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java @@ -57,6 +57,16 @@ public class SideForge extends BaseSide { @Override public boolean checkPermission(String player, String permission) { + return checkPermission(player); + } + + @Override + public boolean checkPermission(String player) { + for (String item : AllMusic.getConfig().adminList) { + if (item.equalsIgnoreCase(player)) { + return true; + } + } ServerPlayer player1 = AllMusicForge.server.getPlayerList().getPlayerByName(player); if (player1 == null) return false; diff --git a/forge_1_19_3/src/main/resources/META-INF/mods.toml b/forge_1_19_3/src/main/resources/META-INF/mods.toml index 33f8fee4..b63650a2 100644 --- a/forge_1_19_3/src/main/resources/META-INF/mods.toml +++ b/forge_1_19_3/src/main/resources/META-INF/mods.toml @@ -17,7 +17,7 @@ license="GPL-3.0" # The modid of the mod modId="allmusic_server" #mandatory # The version number of the mod -version="3.0.0" #mandatory +version="3.1.1" #mandatory # A display name for the mod displayName="AllMusic Server" #mandatory # A URL to query for updates for this mod. See the JSON update specification https://docs.minecraftforge.net/en/latest/misc/updatechecker/ diff --git a/forge_1_20/gradle.properties b/forge_1_20/gradle.properties index 62c87396..e9ab4483 100644 --- a/forge_1_20/gradle.properties +++ b/forge_1_20/gradle.properties @@ -48,7 +48,7 @@ mod_name=AllMusic Server # The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default. mod_license=GPL-3.0 # The mod version. See https://semver.org/ -mod_version=3.1.0 +mod_version=3.1.1 # The group ID for the mod. It is only important when publishing as an artifact to a Maven repository. # This should match the base package used for the mod sources. # See https://maven.apache.org/guides/mini/guide-naming-conventions.html diff --git a/forge_1_20/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java b/forge_1_20/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java index 96c589b1..df78beff 100644 --- a/forge_1_20/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java +++ b/forge_1_20/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java @@ -55,6 +55,16 @@ public class SideForge extends BaseSide { @Override public boolean checkPermission(String player, String permission) { + return checkPermission(player); + } + + @Override + public boolean checkPermission(String player) { + for (String item : AllMusic.getConfig().adminList) { + if (item.equalsIgnoreCase(player)) { + return true; + } + } ServerPlayer player1 = AllMusicForge.server.getPlayerList().getPlayerByName(player); if (player1 == null) return false; diff --git a/neoforge_1_20_4/gradle.properties b/neoforge_1_20_4/gradle.properties index 81ee2bf9..07e59ef2 100644 --- a/neoforge_1_20_4/gradle.properties +++ b/neoforge_1_20_4/gradle.properties @@ -34,7 +34,7 @@ mod_name=AllMusic Server # The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default. mod_license=GPL-3.0 # The mod version. See https://semver.org/ -mod_version=3.1.0 +mod_version=3.1.1 # The group ID for the mod. It is only important when publishing as an artifact to a Maven repository. # This should match the base package used for the mod sources. # See https://maven.apache.org/guides/mini/guide-naming-conventions.html diff --git a/neoforge_1_20_4/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java b/neoforge_1_20_4/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java index 7806c04c..abdf9070 100644 --- a/neoforge_1_20_4/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java +++ b/neoforge_1_20_4/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java @@ -53,6 +53,16 @@ public class SideForge extends BaseSide { @Override public boolean checkPermission(String player, String permission) { + return checkPermission(player); + } + + @Override + public boolean checkPermission(String player) { + for (String item : AllMusic.getConfig().adminList) { + if (item.equalsIgnoreCase(player)) { + return true; + } + } ServerPlayer player1 = AllMusicForge.server.getPlayerList().getPlayerByName(player); if (player1 == null) return false; diff --git a/neoforge_1_20_5/gradle.properties b/neoforge_1_20_5/gradle.properties index 29d6fd8e..66eb4570 100644 --- a/neoforge_1_20_5/gradle.properties +++ b/neoforge_1_20_5/gradle.properties @@ -34,7 +34,7 @@ mod_name=AllMusic Server # The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default. mod_license=GPL-3.0 # The mod version. See https://semver.org/ -mod_version=3.1.0 +mod_version=3.1.1 # The group ID for the mod. It is only important when publishing as an artifact to a Maven repository. # This should match the base package used for the mod sources. # See https://maven.apache.org/guides/mini/guide-naming-conventions.html diff --git a/neoforge_1_20_5/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java b/neoforge_1_20_5/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java index 5a2c759b..561088fe 100644 --- a/neoforge_1_20_5/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java +++ b/neoforge_1_20_5/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java @@ -53,6 +53,16 @@ public class SideForge extends BaseSide { @Override public boolean checkPermission(String player, String permission) { + return checkPermission(player); + } + + @Override + public boolean checkPermission(String player) { + for (String item : AllMusic.getConfig().adminList) { + if (item.equalsIgnoreCase(player)) { + return true; + } + } ServerPlayer player1 = AllMusicForge.server.getPlayerList().getPlayerByName(player); if (player1 == null) return false; diff --git a/server/build.gradle b/server/build.gradle index 5602f423..a6bcdfac 100644 --- a/server/build.gradle +++ b/server/build.gradle @@ -3,7 +3,7 @@ plugins { id 'maven-publish' id 'com.github.johnrengelman.shadow' version '6.1.0' } -version = "3.1.0" +version = "3.1.1" archivesBaseName = "[bukkit_spigot_paper]AllMusic_Server" 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 fa43725b..3fc430c6 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 @@ -436,12 +436,28 @@ public class SideBukkit extends BaseSide { @Override public boolean checkPermission(String player, String permission) { - if (AllMusic.getConfig().adminList.contains(player)) - return false; + for (String item : AllMusic.getConfig().adminList) { + if (item.equalsIgnoreCase(player)) { + return true; + } + } Player player1 = Bukkit.getPlayer(player); if (player1 == null) - return true; - return !player1.hasPermission(permission); + return false; + return player1.hasPermission(permission); + } + + @Override + public boolean checkPermission(String player) { + for (String item : AllMusic.getConfig().adminList) { + if (item.equalsIgnoreCase(player)) { + return true; + } + } + Player player1 = Bukkit.getPlayer(player); + if (player1 == null) + return false; + return player1.isOp(); } @Override diff --git a/server/src/main/resources/plugin.yml b/server/src/main/resources/plugin.yml index e497abf4..64002202 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.1.0 +version: 3.1.1 softdepend: [PlaceholderAPI, Vault, Essentials, CMI] api-version: 1.13 diff --git a/server_top/build.gradle b/server_top/build.gradle index b56ba826..6c03cb23 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.1.0" +version = "3.1.1" 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 07261927..289f597f 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 @@ -463,12 +463,26 @@ public class SideBC extends BaseSide implements IEconomy { @Override public boolean checkPermission(String player, String permission) { - if (AllMusic.getConfig().adminList.contains(player)) - return false; + for (String item : AllMusic.getConfig().adminList) { + if (item.equalsIgnoreCase(player)) { + return true; + } + } ProxiedPlayer player1 = ProxyServer.getInstance().getPlayer(player); if (player1 == null) - return true; - return !player1.hasPermission(permission); + return false; + return player1.hasPermission(permission); + } + + @Override + public boolean checkPermission(String player) { + for (String item : AllMusic.getConfig().adminList) { + if (item.equalsIgnoreCase(player)) { + return true; + } + } + + return false; } @Override 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 4b2fcb71..d5dfa617 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 @@ -478,15 +478,24 @@ public class SideVelocity extends BaseSide implements IEconomy { @Override public boolean checkPermission(String player, String permission) { - try { - if (AllMusic.getConfig().adminList.contains(player)) - return false; - Player player1 = AllMusicVelocity.plugin.server.getPlayer(player).get(); - player1.hasPermission(permission); - } catch (NoSuchElementException ignored) { - + for (String item : AllMusic.getConfig().adminList) { + if (item.equalsIgnoreCase(player)) { + return true; + } } - return true; + Optional player1 = AllMusicVelocity.plugin.server.getPlayer(player); + return player1.map(value -> value.hasPermission(permission)).orElse(false); + } + + @Override + public boolean checkPermission(String player) { + for (String item : AllMusic.getConfig().adminList) { + if (item.equalsIgnoreCase(player)) { + return true; + } + } + + return false; } @Override diff --git a/server_top/src/main/resources/bungee.yml b/server_top/src/main/resources/bungee.yml index a2a97def..585ec131 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.1.0 +version: 3.1.1