Merge remote-tracking branch 'origin/master'

liujiahua123123 · liujiahua123123 · commit c5ca7d5e0888 · 2020-03-29T21:18:27.000+08:00
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -10,7 +10,7 @@ plugins {
 }
 
 group = "net.mamoe"
-version = "1.0.0"
+version = "1.1.0"
 
 // See https://github.com/JetBrains/gradle-intellij-plugin/
 intellij {
diff --git a/src/main/java/net/mamoe/mirai/intellij/CreateConfig.kt b/src/main/java/net/mamoe/mirai/intellij/CreateConfig.kt
@@ -26,40 +26,42 @@ object CreateConfig {
 
     private suspend fun getNewestCoreVersion(): String {
         return withContext(Dispatchers.IO) {
-            Jsoup.connect("https://bintray.com/package/generalTab?pkgPath=/him188moe/mirai/mirai-core").get().body().getElementById(
-                "versions"
-            ).getElementsByClass("tr")[0].getElementsByClass("td")[0].getElementsByTag("a")[0].text()
-        }
+            Jsoup.connect("https://bintray.com/package/generalTab?pkgPath=/him188moe/mirai/mirai-core").get().body()
+                .getElementById(
+                    "versions"
+                ).getElementsByClass("tr")[0].getElementsByClass("td")[0].getElementsByTag("a")[0].text()
+        }.also { cacheCoreVersion = it }
     }
 
     private suspend fun getNewestConsoleVersion(): String {
         return withContext(Dispatchers.IO) {
-            Jsoup.connect("https://bintray.com/package/generalTab?pkgPath=/him188moe/mirai/mirai-console").get().body().getElementById(
-                "versions"
-            ).getElementsByClass("tr")[0].getElementsByClass("td")[0].getElementsByTag("a")[0].text()
-        }
+            Jsoup.connect("https://bintray.com/package/generalTab?pkgPath=/him188moe/mirai/mirai-console").get().body()
+                .getElementById(
+                    "versions"
+                ).getElementsByClass("tr")[0].getElementsByClass("td")[0].getElementsByTag("a")[0].text()
+        }.also { cacheConsoleVersion = it }
     }
 
 
     private var nextCoreVersionCheck = 0L
     private var nextConsoleVersionCheck = 0L
 
-    private var cacheConsoleVersion:String? = null
-    private var cacheCoreVersion:String? = null
+    private var cacheConsoleVersion: String? = null
+    private var cacheCoreVersion: String? = null
 
-    fun refreshVersion(){
+    fun refreshVersion() {
         nextCoreVersionCheck = 0L
         nextConsoleVersionCheck = 0L
     }
 
-    fun consoleVersion():Deferred<String> = GlobalScope.async {
-        if (cacheConsoleVersion != null && nextConsoleVersionCheck < System.currentTimeMillis()) {
+    fun consoleVersion(): Deferred<String> = GlobalScope.async {
+        if (cacheConsoleVersion != null && nextConsoleVersionCheck > System.currentTimeMillis()) {
             return@async cacheConsoleVersion!!
         }
         repeat(3) {
             try {
                 return@async getNewestConsoleVersion().also {
-                    nextConsoleVersionCheck = System.currentTimeMillis() + 1000*60*10
+                    nextConsoleVersionCheck = System.currentTimeMillis() + 1000 * 60 * 10
                 }
             } catch (e: Exception) {
 
@@ -71,13 +73,13 @@ object CreateConfig {
 
 
     fun coreVersion(): Deferred<String> = GlobalScope.async {
-        if (cacheCoreVersion != null && nextCoreVersionCheck < System.currentTimeMillis()) {
+        if (cacheCoreVersion != null && nextCoreVersionCheck > System.currentTimeMillis()) {
             return@async cacheCoreVersion!!
         }
         repeat(3) {
             try {
                 return@async getNewestCoreVersion().also {
-                    nextCoreVersionCheck = System.currentTimeMillis() + 1000*60*10
+                    nextCoreVersionCheck = System.currentTimeMillis() + 1000 * 60 * 10
                 }
             } catch (e: Exception) {
 
diff --git a/src/main/java/net/mamoe/mirai/intellij/builder/ContentBuilder.kt b/src/main/java/net/mamoe/mirai/intellij/builder/ContentBuilder.kt
@@ -32,13 +32,21 @@ fun MiraiPluginModuleBuilder.createRoot(): VirtualFile? {
 fun MiraiPluginModuleBuilder.createDic(
     root: VirtualFile
 ) {
-    val sourceDirectory = VfsUtil.createDirectories(root.path + "/src/main/kotlin")
+    val sourceDirectory: VirtualFile
+    val testDirectory: VirtualFile
+    when (CreateConfig.language) {
+        CreateConfig.LANGUAGE_KOTLIN -> {
+            sourceDirectory = VfsUtil.createDirectories(root.path + "/src/main/kotlin")
+            testDirectory = VfsUtil.createDirectories(root.path + "/src/test/kotlin")
+        }
+        CreateConfig.LANGUAGE_JAVA -> {
+            sourceDirectory = VfsUtil.createDirectories(root.path + "/src/main/java")
+            testDirectory = VfsUtil.createDirectories(root.path + "/src/test/java")
+        }
+        else -> error("internal error: illegal language: ${CreateConfig.language}")
+    }
     VfsUtil.createDirectories(root.path + "/src/main/resources")
-    VfsUtil.createDirectories(root.path + "/src/test/kotlin")
     VfsUtil.createDirectories(root.path + "/src/test/resources")
-    //val resourceDirectory = VfsUtil.createDirectories(root.path + "/src/main/resources")
-    //val testSourceDirectory = VfsUtil.createDirectories(root.path + "/src/test/kotlin")
-    //val testResourceDirectory = VfsUtil.createDirectories(root.path + "/src/test/resources")
 
     val buildToolFiles: List<String> = when (CreateConfig.buildTool) {
         CreateConfig.BUILD_GRADLE_KOTLIN -> Template.gradleCommon + Template.gradleKotlinDsl
@@ -57,7 +65,7 @@ fun MiraiPluginModuleBuilder.createDic(
     @Suppress("EXPERIMENTAL_API_USAGE")
     fun String.replaceTemplateVariables(): String {
         return runBlocking {
-           this@replaceTemplateVariables.replace("<GROUP>", CreateConfig.groupId)
+            this@replaceTemplateVariables.replace("<GROUP>", CreateConfig.groupId)
                 .replace("<PROJECT_NAME>", CreateConfig.artifactId)
                 .replace("<VERSION>", CreateConfig.version)
                 .replace("<MIRAI_CONSOLE_VERSION>", consoleVersion().await())
@@ -82,6 +90,10 @@ fun MiraiPluginModuleBuilder.createDic(
                     pluginBaseClassName
                 ).replace("PACKAGE", packageName)
             )
+            testDirectory.writeChild(
+                "mirai/RunMirai.kt",
+                Template.testConsoleRunnerKotlin
+            )
         }
         CreateConfig.LANGUAGE_JAVA -> {
             sourceDirectory.writeChild(
@@ -91,6 +103,10 @@ fun MiraiPluginModuleBuilder.createDic(
                     pluginBaseClassName
                 ).replace("PACKAGE", packageName)
             )
+            testDirectory.writeChild(
+                "mirai/RunMirai.java",
+                Template.testConsoleRunnerJava
+            )
         }
     }
 
@@ -100,7 +116,10 @@ fun MiraiPluginModuleBuilder.createDic(
         .replace("AUTHOR", CreateConfig.author)
         .replace("MAIN", CreateConfig.mainClassQualifiedName)
         .replace("INFO", CreateConfig.info)
-        .replace("DEPENDS", CreateConfig.depends.takeIf { it.isNotEmpty() }?.joinToString { "\n  -$it" } ?: "[]")
+        .replace(
+            "DEPENDS",
+            CreateConfig.depends.filter { it.isNotBlank() }.takeIf { it.isNotEmpty() }?.joinToString { "\n  -$it" }
+                ?: "[]")
     )
 }
 
@@ -162,6 +181,30 @@ object Template {
         }
     """.trimIndent().let { it.replace("\\\$\\{", "\${") } // bug also
 
+
+    @Language("kotlin")
+    val testConsoleRunnerKotlin: String = """
+        package mirai
+
+        import kotlinx.coroutines.runBlocking
+        import net.mamoe.mirai.console.command.CommandManager
+        import net.mamoe.mirai.console.pure.MiraiConsolePureLoader
+
+        object RunMirai {
+
+            // 执行 gradle task: runMiraiConsole 来自动编译, shadow, 复制, 并启动 pure console.
+
+            @JvmStatic
+            fun main(args: Array<String>) {
+                // 默认在 /test 目录下运行
+
+                MiraiConsolePureLoader.load(args[0], args[1]) // 启动 console
+
+                runBlocking { CommandManager.join() } // 阻止主线程退出
+            }
+        }
+    """.trimIndent()
+
     @Language("java")
     val pluginBaseJava: String = """
         package PACKAGE;
@@ -171,8 +214,65 @@ object Template {
         class ExamplePluginMain extends PluginBase {
             
             public void onLoad(){
-                //start your code here
-                //欢迎使用Kotlin
+                bot.getFriends().forEach(friend -> {
+                    System.out.println(friend.getId() + ":" + friend.getNick());
+                    return Unit.INSTANCE; // kotlin 的所有函数都有返回值. Unit 为最基本的返回值. 请在这里永远返回 Unit
+                });
+
+                Events.subscribeAlways(GroupMessage.class, (GroupMessage event) -> {
+
+                    if (event.getMessage().contains("reply")) {
+                        // 引用回复
+                        final QuoteReplyToSend quote = MessageUtils.quote(event.getMessage(), event.getSender());
+                        event.getGroup().sendMessage(quote.plus("引用回复"));
+
+                    } else if (event.getMessage().contains("at")) {
+                        // at
+                        event.getGroup().sendMessage(new At(event.getSender()));
+
+                    } else if (event.getMessage().contains("permission")) {
+                        // 成员权限
+                        event.getGroup().sendMessage(event.getPermission().toString());
+
+                    } else if (event.getMessage().contains("mixed")) {
+                        // 复合消息, 通过 .plus 连接两个消息
+                        event.getGroup().sendMessage(
+                                MessageUtils.newImage("{01E9451B-70ED-EAE3-B37C-101F1EEBF5B5}.png") // 演示图片, 可能已过期
+                                        .plus("Hello") // 文本消息
+                                        .plus(new At(event.getSender())) // at 群成员
+                                        .plus(AtAll.INSTANCE) // at 全体成员
+                        );
+
+                    } else if (event.getMessage().contains("recall1")) {
+                        event.getGroup().sendMessage("你看不到这条消息").recall();
+                        // 发送消息马上就撤回. 因速度太快, 客户端将看不到这个消息.
+
+                    } else if (event.getMessage().contains("recall2")) {
+                        final Job job = event.getGroup().sendMessage("3秒后撤回").recallIn(3000);
+
+                        // job.cancel(new CancellationException()); // 可取消这个任务
+
+                    } else if (event.getMessage().contains("上传图片")) {
+                        File file = new File("myImage.jpg");
+                        if (file.exists()) {
+                            final Image image = event.getGroup().uploadImage(new File("myImage.jpg"));
+                            // 上传一个图片并得到 Image 类型的 Message
+
+                            final String imageId = image.getImageId(); // 可以拿到 ID
+                            final Image fromId = MessageUtils.newImage(imageId); // ID 转换得到 Image
+
+                            event.getGroup().sendMessage(image); // 发送图片
+                        }
+
+                    } else if (event.getMessage().contains("friend")) {
+                        final Future<MessageReceipt<? extends Contact>> future = event.getSender().sendMessageAsync("Async send"); // 异步发送
+                        try {
+                            future.get();
+                        } catch (InterruptedException | ExecutionException e) {
+                            e.printStackTrace();
+                        }
+                    }
+                });
             }
             
             public void onEnable(){
@@ -182,6 +282,29 @@ object Template {
         }        
     """.trimIndent()
 
+    @Language("java")
+    val testConsoleRunnerJava: String = """
+        package mirai;
+
+        import kotlinx.coroutines.BuildersKt;
+        import kotlinx.coroutines.GlobalScope;
+        import net.mamoe.mirai.console.command.CommandManager;
+        import net.mamoe.mirai.console.pure.MiraiConsolePureLoader;
+
+        public class RunMirai {
+           
+            // 执行 gradle task: runMiraiConsole 来自动编译, shadow, 复制, 并启动 pure console.
+
+            public static void main(String[] args) throws InterruptedException {
+                // 默认在 /test 目录下运行
+
+                MiraiConsolePureLoader.load(args[0], args[1]); // 启动 console
+
+                // 阻止主线程退出
+                BuildersKt.runBlocking(GlobalScope.INSTANCE.getCoroutineContext(), (coroutineScope, continuation) -> CommandManager.INSTANCE.join(continuation));
+            }
+        }
+    """.trimIndent()
 
     @Language("yaml")
     val pluginYml: String = """
diff --git a/src/main/java/net/mamoe/mirai/intellij/ui/PMSetupStep.form b/src/main/java/net/mamoe/mirai/intellij/ui/PMSetupStep.form
@@ -21,7 +21,7 @@
           <grid row="0" column="0" row-span="1" col-span="3" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
-          <text value="管理设置"/>
+          <text value="构建设置"/>
         </properties>
       </component>
       <component id="f1b7a" class="javax.swing.JTextField" binding="artifactIdField">
@@ -80,8 +80,8 @@
         </constraints>
         <properties>
           <model>
-            <item value="Groovy DSL"/>
             <item value="Kotlin DSL"/>
+            <item value="Groovy DSL"/>
           </model>
         </properties>
       </component>
@@ -93,7 +93,7 @@
           <text value="如何选择"/>
         </properties>
       </component>
-      <component id="c4618" class="javax.swing.JComboBox"  binding="pmField">
+      <component id="c4618" class="javax.swing.JComboBox" binding="pmField">
         <constraints>
           <grid row="3" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="1" indent="0" use-parent-layout="false"/>
         </constraints>
diff --git a/src/main/java/net/mamoe/mirai/intellij/ui/PluginSetup.form b/src/main/java/net/mamoe/mirai/intellij/ui/PluginSetup.form
@@ -253,8 +253,8 @@
                 </constraints>
                 <properties>
                   <model>
-                    <item value="Java"/>
                     <item value="Kotlin"/>
+                    <item value="Java"/>
                   </model>
                 </properties>
               </component>
diff --git a/src/main/java/net/mamoe/mirai/intellij/ui/PluginSetupStep.kt b/src/main/java/net/mamoe/mirai/intellij/ui/PluginSetupStep.kt
@@ -6,7 +6,6 @@ import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import net.mamoe.mirai.intellij.CreateConfig
 import javax.swing.*
-import javax.xml.bind.JAXBElement
 
 class PluginSetupStep : ModuleWizardStep() {
     private lateinit var pluginNameField: JTextField
@@ -16,6 +15,7 @@ class PluginSetupStep : ModuleWizardStep() {
     private lateinit var authorsField: JTextField
     private lateinit var websiteField: JTextField
     private lateinit var dependField: JTextField
+
     //private lateinit var buildToolField: JComboBox<String>
     //private lateinit var languageField: JComboBox<String>
     private lateinit var consoleVersionField: JTextField
@@ -40,19 +40,17 @@ class PluginSetupStep : ModuleWizardStep() {
         }
         CreateConfig.mainClassQualifiedName = mainClassField.text
         CreateConfig.version = pluginVersionField.text
-        if (!CreateConfig.version.toLowerCase().startsWith("v")) {
-            CreateConfig.version = "V" + CreateConfig.version
-        }
+        CreateConfig.version = CreateConfig.version
         CreateConfig.pluginName = pluginNameField.text
-        CreateConfig.language = languageField.selectedItem?.toString()?:"Java"
-       // CreateConfig.language = languageField.selectedItem?.toString().orEmpty()
-       //CreateConfig.buildTool = buildToolField.selectedItem?.toString().orEmpty()
+        CreateConfig.language = languageField.selectedItem?.toString() ?: "Java"
+        // CreateConfig.language = languageField.selectedItem?.toString().orEmpty()
+        //CreateConfig.buildTool = buildToolField.selectedItem?.toString().orEmpty()
         println("I received")
     }
 
     @Throws(ConfigurationException::class)
     override fun validate(): Boolean {
-        if(consoleVersionField.text == "获取中..." || coreVersionField.text == "获取中..."){
+        if (consoleVersionField.text == "获取中..." || coreVersionField.text == "获取中...") {
             throw ConfigurationException("正在获取最新的Core/Console版本", "信息获取中")
         }
         if (pluginNameField.text.isBlank()) {
diff --git a/src/main/resources/template/gradle-groovy-dsl/build.gradle b/src/main/resources/template/gradle-groovy-dsl/build.gradle
@@ -1,13 +1,16 @@
 plugins {
-    id 'org.jetbrains.kotlin.jvm' version '1.3.61'
+    id 'org.jetbrains.kotlin.jvm' version '1.4-M1'
     id 'java'
+    id 'com.github.johnrengelman.shadow' version '5.2.0'
 }
 
 group = '<GROUP>'
 version = '<VERSION>'
 
 repositories {
+    maven { url 'https://dl.bintray.com/kotlin/kotlin-eap' }
     maven { url 'https://mirrors.huaweicloud.com/repository/maven' }
+    mavenCentral()
     jcenter()
 }
 
diff --git a/src/main/resources/template/gradle-groovy-dsl/settings.gradle b/src/main/resources/template/gradle-groovy-dsl/settings.gradle
@@ -1,2 +1,19 @@
+pluginManagement {
+    resolutionStrategy {
+        eachPlugin {
+            switch (requested.id.id) {
+                case "com.github.johnrengelman.shadow": useModule("com.github.jengelman.gradle.plugins:shadow:${requested.version}")
+            }
+        }
+    }
+
+    repositories {
+        maven { url "https://dl.bintray.com/kotlin/kotlin-eap" }
+        maven { url 'https://mirrors.huaweicloud.com/repository/maven' }
+        mavenCentral()
+        jcenter()
+    }
+}
+
 rootProject.name = '<PROJECT_NAME>'
 
diff --git a/src/main/resources/template/gradle-kotlin-dsl/build.gradle.kts b/src/main/resources/template/gradle-kotlin-dsl/build.gradle.kts
diff --git a/src/main/resources/template/gradle-kotlin-dsl/settings.gradle.kts b/src/main/resources/template/gradle-kotlin-dsl/settings.gradle.kts

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ plugins {`
`10`	`10`	`}`
`11`	`11`
`12`	`12`	`group = "net.mamoe"`
`13`		`-version = "1.0.0"`
	`13`	`+version = "1.1.0"`
`14`	`14`
`15`	`15`	`// See https://github.com/JetBrains/gradle-intellij-plugin/`
`16`	`16`	`intellij {`