diff --git a/pom.xml b/pom.xml index 9651c05..25c49e1 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.khjxiaogu MiraiSongPlugin - 0.1.16 + 0.1.17 MiraiSongPlugin 使用“#音乐 关键词”、“#QQ 关键词”、“#网易 关键词”等方式进行点歌的插件。 diff --git a/src/main/java/com/khjxiaogu/MiraiSongPlugin/MiraiSongPlugin.java b/src/main/java/com/khjxiaogu/MiraiSongPlugin/MiraiSongPlugin.java index 2f484e2..49e9164 100644 --- a/src/main/java/com/khjxiaogu/MiraiSongPlugin/MiraiSongPlugin.java +++ b/src/main/java/com/khjxiaogu/MiraiSongPlugin/MiraiSongPlugin.java @@ -29,12 +29,8 @@ import com.khjxiaogu.MiraiSongPlugin.musicsource.NetEaseMusicSource; import com.khjxiaogu.MiraiSongPlugin.musicsource.QQMusicSource; -import net.mamoe.mirai.console.extensions.BotConfigurationAlterer; -import net.mamoe.mirai.console.internal.extension.GlobalComponentStorage; import net.mamoe.mirai.console.plugin.jvm.JavaPlugin; -import net.mamoe.mirai.console.plugin.jvm.JvmPluginDescription; import net.mamoe.mirai.console.plugin.jvm.JvmPluginDescriptionBuilder; -import net.mamoe.mirai.console.plugin.jvm.SimpleJvmPluginDescription; import net.mamoe.mirai.event.EventHandler; import net.mamoe.mirai.event.Events; import net.mamoe.mirai.event.SimpleListenerHost; @@ -46,7 +42,6 @@ import net.mamoe.yamlkt.YamlElement; import net.mamoe.yamlkt.YamlLiteral; import net.mamoe.yamlkt.YamlMap; -import net.mamoe.yamlkt.YamlPrimitive; // TODO: Auto-generated Javadoc /** @@ -160,7 +155,7 @@ public BiConsumer makeSearchesTemplate(String card) { continue; } try { - if(mi.source=="QQ音乐"&&cb instanceof LightAppCardProvider) + if(mi.source.equals("QQ音乐")&&cb instanceof LightAppCardProvider) Utils.getRealSender(event).sendMessage(cards.get("XML").process(mi, Utils.getRealSender(event))); else Utils.getRealSender(event).sendMessage(cb.process(mi, Utils.getRealSender(event))); diff --git a/src/main/java/com/khjxiaogu/MiraiSongPlugin/cardprovider/LightAppCardProvider.java b/src/main/java/com/khjxiaogu/MiraiSongPlugin/cardprovider/LightAppCardProvider.java index e7aae46..58601f0 100644 --- a/src/main/java/com/khjxiaogu/MiraiSongPlugin/cardprovider/LightAppCardProvider.java +++ b/src/main/java/com/khjxiaogu/MiraiSongPlugin/cardprovider/LightAppCardProvider.java @@ -3,8 +3,6 @@ import com.google.gson.JsonObject; import com.khjxiaogu.MiraiSongPlugin.MusicCardProvider; import com.khjxiaogu.MiraiSongPlugin.MusicInfo; -import com.khjxiaogu.MiraiSongPlugin.Utils; - import net.mamoe.mirai.contact.Contact; import net.mamoe.mirai.message.data.LightApp; import net.mamoe.mirai.message.data.MessageChain; diff --git a/src/main/java/com/khjxiaogu/MiraiSongPlugin/musicsource/NetEaseHQMusicSource.java b/src/main/java/com/khjxiaogu/MiraiSongPlugin/musicsource/NetEaseHQMusicSource.java index b92ef95..84bb277 100644 --- a/src/main/java/com/khjxiaogu/MiraiSongPlugin/musicsource/NetEaseHQMusicSource.java +++ b/src/main/java/com/khjxiaogu/MiraiSongPlugin/musicsource/NetEaseHQMusicSource.java @@ -15,6 +15,7 @@ public class NetEaseHQMusicSource extends NetEaseMusicSource { public NetEaseHQMusicSource() { } + @Override public String queryRealUrl(String id) throws Exception { JsonObject params = new JsonObject(); params.add("ids", new JsonPrimitive("[" + id + "]")); diff --git a/src/main/java/com/khjxiaogu/MiraiSongPlugin/musicsource/NetEaseMusicSource.java b/src/main/java/com/khjxiaogu/MiraiSongPlugin/musicsource/NetEaseMusicSource.java index 6621728..6d78260 100644 --- a/src/main/java/com/khjxiaogu/MiraiSongPlugin/musicsource/NetEaseMusicSource.java +++ b/src/main/java/com/khjxiaogu/MiraiSongPlugin/musicsource/NetEaseMusicSource.java @@ -1,7 +1,6 @@ package com.khjxiaogu.MiraiSongPlugin.musicsource; import java.io.FileNotFoundException; -import java.io.InputStream; import java.net.HttpURLConnection; import java.net.URL; import java.nio.charset.StandardCharsets; @@ -9,10 +8,8 @@ import com.google.gson.JsonArray; import com.google.gson.JsonObject; import com.google.gson.JsonParser; -import com.google.gson.JsonPrimitive; import com.khjxiaogu.MiraiSongPlugin.MusicInfo; import com.khjxiaogu.MiraiSongPlugin.MusicSource; -import com.khjxiaogu.MiraiSongPlugin.NetEaseCrypto; import com.khjxiaogu.MiraiSongPlugin.Utils; public class NetEaseMusicSource implements MusicSource {