From 4521cfbc9e3e1e7f959ff4ffc7105652d2db4c98 Mon Sep 17 00:00:00 2001 From: Him188 Date: Thu, 14 May 2020 08:18:03 +0800 Subject: [PATCH] Rearrange frontend modules, extract mirai-console-pure to a frontend module. --- .../mirai-console}/README.MD | 0 .../mirai-console}/build.gradle.kts | 0 .../console/command/JCommandManager.java | 0 .../mirai/console/events/EventListener.java | 1 - .../mamoe/mirai/console/events/Events.java | 6 -- .../console/plugins/ConfigSectionFactory.java | 0 .../scheduler/SchedulerTaskManager.java | 0 .../mamoe/mirai/console/utils/BotManager.java | 0 .../net/mamoe/mirai/console/utils/Utils.java | 0 .../net/mamoe/mirai/console/MiraiConsole.kt | 0 .../mirai/console/center/CuiPluginCenter.kt | 0 .../mirai/console/center/PluginCenter.kt | 0 .../mamoe/mirai/console/command/Command.kt | 0 .../mirai/console/command/CommandArgParser.kt | 0 .../console/command/CommandDescriptor.kt | 0 .../mirai/console/command/CommandManager.kt | 0 .../mirai/console/command/CommandParam.kt | 0 .../console/command/CommandParserContext.kt | 0 .../console/command/CommandPermission.kt | 0 .../mirai/console/command/CommandSender.kt | 0 .../mirai/console/command/DefaultCommands.kt | 0 .../mamoe/mirai/console/events/EventsImpl.kt | 2 +- .../mirai/console/plugins/ConfigSection.kt | 0 .../mamoe/mirai/console/plugins/PluginBase.kt | 0 .../mirai/console/plugins/PluginManager.kt | 0 .../mirai/console/plugins/PluginsLoader.kt | 0 .../console/pure/MiraiConsolePureLoader.kt | 0 .../mirai/console/pure/MiraiConsoleUIPure.kt | 0 .../mirai/console/scheduler/SchedulerTask.kt | 0 .../mamoe/mirai/console/utils/BotHelper.kt | 0 .../mamoe/mirai/console/utils/ConsoleInput.kt | 0 .../mirai/console/utils/MiraiConsoleUI.kt | 0 .../net/mamoe/mirai/console/utils/Utils.kt | 0 .../net/mamoe/mirai/console/utils/Value.kt | 0 .../src/test/kotlin/StringFuzzyTest.kt | 0 buildSrc/src/main/kotlin/versions.kt | 2 + .../mirai-console-graphical}/README.md | 0 .../mirai-console-graphical}/build.gradle.kts | 0 .../graphical/MiraiConsoleGraphicalLoader.kt | 2 - .../mirai/console/graphical/MiraiGraphical.kt | 0 .../controller/MiraiGraphicalUIController.kt | 0 .../console/graphical/event/ReloadEvent.kt | 0 .../mirai/console/graphical/model/BotModel.kt | 0 .../console/graphical/model/ConsoleInfo.kt | 0 .../console/graphical/model/GlobalSetting.kt | 0 .../console/graphical/model/PluginModel.kt | 0 .../graphical/model/VerificationCodeModel.kt | 0 .../graphical/stylesheet/BaseStyleSheet.kt | 0 .../stylesheet/LoginViewStyleSheet.kt | 5 +- .../stylesheet/PluginViewStyleSheet.kt | 0 .../graphical/stylesheet/PrimaryStyleSheet.kt | 6 +- .../console/graphical/util/JFoenixAdaptor.kt | 1 - .../mamoe/mirai/console/graphical/util/SVG.kt | 0 .../mirai/console/graphical/util/controls.kt | 0 .../mirai/console/graphical/view/Decorator.kt | 0 .../mirai/console/graphical/view/LoginView.kt | 0 .../graphical/view/PluginsCenterView.kt | 0 .../console/graphical/view/PluginsView.kt | 1 - .../console/graphical/view/PrimaryView.kt | 5 -- .../console/graphical/view/SettingsView.kt | 0 .../graphical/view/dialog/InputDialog.kt | 0 .../view/dialog/PluginDetailFragment.kt | 0 .../view/dialog/VerificationCodeFragment.kt | 0 .../src/main/resources/character.png | Bin .../src/main/resources/logo.png | Bin .../src/test/kotlin/Main.kt | 0 frontend/mirai-console-pure/build.gradle.kts | 54 ++++++++++++++++++ .../mirai-console-terminal}/README.md | 0 .../mirai-console-terminal}/build.gradle.kts | 0 .../console/MiraiConsoleTerminalLoader.kt | 0 .../mirai/console/MiraiConsoleTerminalUI.kt | 0 settings.gradle | 8 +++ 72 files changed, 73 insertions(+), 20 deletions(-) rename {mirai-console => backend/mirai-console}/README.MD (100%) rename {mirai-console => backend/mirai-console}/build.gradle.kts (100%) rename {mirai-console => backend/mirai-console}/src/main/java/net/mamoe/mirai/console/command/JCommandManager.java (100%) rename {mirai-console => backend/mirai-console}/src/main/java/net/mamoe/mirai/console/events/EventListener.java (97%) rename {mirai-console => backend/mirai-console}/src/main/java/net/mamoe/mirai/console/events/Events.java (80%) rename {mirai-console => backend/mirai-console}/src/main/java/net/mamoe/mirai/console/plugins/ConfigSectionFactory.java (100%) rename {mirai-console => backend/mirai-console}/src/main/java/net/mamoe/mirai/console/scheduler/SchedulerTaskManager.java (100%) rename {mirai-console => backend/mirai-console}/src/main/java/net/mamoe/mirai/console/utils/BotManager.java (100%) rename {mirai-console => backend/mirai-console}/src/main/java/net/mamoe/mirai/console/utils/Utils.java (100%) rename {mirai-console => backend/mirai-console}/src/main/kotlin/net/mamoe/mirai/console/MiraiConsole.kt (100%) rename {mirai-console => backend/mirai-console}/src/main/kotlin/net/mamoe/mirai/console/center/CuiPluginCenter.kt (100%) rename {mirai-console => backend/mirai-console}/src/main/kotlin/net/mamoe/mirai/console/center/PluginCenter.kt (100%) rename {mirai-console => backend/mirai-console}/src/main/kotlin/net/mamoe/mirai/console/command/Command.kt (100%) rename {mirai-console => backend/mirai-console}/src/main/kotlin/net/mamoe/mirai/console/command/CommandArgParser.kt (100%) rename {mirai-console => backend/mirai-console}/src/main/kotlin/net/mamoe/mirai/console/command/CommandDescriptor.kt (100%) rename {mirai-console => backend/mirai-console}/src/main/kotlin/net/mamoe/mirai/console/command/CommandManager.kt (100%) rename {mirai-console => backend/mirai-console}/src/main/kotlin/net/mamoe/mirai/console/command/CommandParam.kt (100%) rename {mirai-console => backend/mirai-console}/src/main/kotlin/net/mamoe/mirai/console/command/CommandParserContext.kt (100%) rename {mirai-console => backend/mirai-console}/src/main/kotlin/net/mamoe/mirai/console/command/CommandPermission.kt (100%) rename {mirai-console => backend/mirai-console}/src/main/kotlin/net/mamoe/mirai/console/command/CommandSender.kt (100%) rename {mirai-console => backend/mirai-console}/src/main/kotlin/net/mamoe/mirai/console/command/DefaultCommands.kt (100%) rename {mirai-console => backend/mirai-console}/src/main/kotlin/net/mamoe/mirai/console/events/EventsImpl.kt (96%) rename {mirai-console => backend/mirai-console}/src/main/kotlin/net/mamoe/mirai/console/plugins/ConfigSection.kt (100%) rename {mirai-console => backend/mirai-console}/src/main/kotlin/net/mamoe/mirai/console/plugins/PluginBase.kt (100%) rename {mirai-console => backend/mirai-console}/src/main/kotlin/net/mamoe/mirai/console/plugins/PluginManager.kt (100%) rename {mirai-console => backend/mirai-console}/src/main/kotlin/net/mamoe/mirai/console/plugins/PluginsLoader.kt (100%) rename {mirai-console => backend/mirai-console}/src/main/kotlin/net/mamoe/mirai/console/pure/MiraiConsolePureLoader.kt (100%) rename {mirai-console => backend/mirai-console}/src/main/kotlin/net/mamoe/mirai/console/pure/MiraiConsoleUIPure.kt (100%) rename {mirai-console => backend/mirai-console}/src/main/kotlin/net/mamoe/mirai/console/scheduler/SchedulerTask.kt (100%) rename {mirai-console => backend/mirai-console}/src/main/kotlin/net/mamoe/mirai/console/utils/BotHelper.kt (100%) rename {mirai-console => backend/mirai-console}/src/main/kotlin/net/mamoe/mirai/console/utils/ConsoleInput.kt (100%) rename {mirai-console => backend/mirai-console}/src/main/kotlin/net/mamoe/mirai/console/utils/MiraiConsoleUI.kt (100%) rename {mirai-console => backend/mirai-console}/src/main/kotlin/net/mamoe/mirai/console/utils/Utils.kt (100%) rename {mirai-console => backend/mirai-console}/src/main/kotlin/net/mamoe/mirai/console/utils/Value.kt (100%) rename {mirai-console => backend/mirai-console}/src/test/kotlin/StringFuzzyTest.kt (100%) rename {mirai-console-graphical => frontend/mirai-console-graphical}/README.md (100%) rename {mirai-console-graphical => frontend/mirai-console-graphical}/build.gradle.kts (100%) rename {mirai-console-graphical => frontend/mirai-console-graphical}/src/main/kotlin/net/mamoe/mirai/console/graphical/MiraiConsoleGraphicalLoader.kt (95%) rename {mirai-console-graphical => frontend/mirai-console-graphical}/src/main/kotlin/net/mamoe/mirai/console/graphical/MiraiGraphical.kt (100%) rename {mirai-console-graphical => frontend/mirai-console-graphical}/src/main/kotlin/net/mamoe/mirai/console/graphical/controller/MiraiGraphicalUIController.kt (100%) rename {mirai-console-graphical => frontend/mirai-console-graphical}/src/main/kotlin/net/mamoe/mirai/console/graphical/event/ReloadEvent.kt (100%) rename {mirai-console-graphical => frontend/mirai-console-graphical}/src/main/kotlin/net/mamoe/mirai/console/graphical/model/BotModel.kt (100%) rename {mirai-console-graphical => frontend/mirai-console-graphical}/src/main/kotlin/net/mamoe/mirai/console/graphical/model/ConsoleInfo.kt (100%) rename {mirai-console-graphical => frontend/mirai-console-graphical}/src/main/kotlin/net/mamoe/mirai/console/graphical/model/GlobalSetting.kt (100%) rename {mirai-console-graphical => frontend/mirai-console-graphical}/src/main/kotlin/net/mamoe/mirai/console/graphical/model/PluginModel.kt (100%) rename {mirai-console-graphical => frontend/mirai-console-graphical}/src/main/kotlin/net/mamoe/mirai/console/graphical/model/VerificationCodeModel.kt (100%) rename {mirai-console-graphical => frontend/mirai-console-graphical}/src/main/kotlin/net/mamoe/mirai/console/graphical/stylesheet/BaseStyleSheet.kt (100%) rename {mirai-console-graphical => frontend/mirai-console-graphical}/src/main/kotlin/net/mamoe/mirai/console/graphical/stylesheet/LoginViewStyleSheet.kt (93%) rename {mirai-console-graphical => frontend/mirai-console-graphical}/src/main/kotlin/net/mamoe/mirai/console/graphical/stylesheet/PluginViewStyleSheet.kt (100%) rename {mirai-console-graphical => frontend/mirai-console-graphical}/src/main/kotlin/net/mamoe/mirai/console/graphical/stylesheet/PrimaryStyleSheet.kt (98%) rename {mirai-console-graphical => frontend/mirai-console-graphical}/src/main/kotlin/net/mamoe/mirai/console/graphical/util/JFoenixAdaptor.kt (98%) rename {mirai-console-graphical => frontend/mirai-console-graphical}/src/main/kotlin/net/mamoe/mirai/console/graphical/util/SVG.kt (100%) rename {mirai-console-graphical => frontend/mirai-console-graphical}/src/main/kotlin/net/mamoe/mirai/console/graphical/util/controls.kt (100%) rename {mirai-console-graphical => frontend/mirai-console-graphical}/src/main/kotlin/net/mamoe/mirai/console/graphical/view/Decorator.kt (100%) rename {mirai-console-graphical => frontend/mirai-console-graphical}/src/main/kotlin/net/mamoe/mirai/console/graphical/view/LoginView.kt (100%) rename {mirai-console-graphical => frontend/mirai-console-graphical}/src/main/kotlin/net/mamoe/mirai/console/graphical/view/PluginsCenterView.kt (100%) rename {mirai-console-graphical => frontend/mirai-console-graphical}/src/main/kotlin/net/mamoe/mirai/console/graphical/view/PluginsView.kt (98%) rename {mirai-console-graphical => frontend/mirai-console-graphical}/src/main/kotlin/net/mamoe/mirai/console/graphical/view/PrimaryView.kt (96%) rename {mirai-console-graphical => frontend/mirai-console-graphical}/src/main/kotlin/net/mamoe/mirai/console/graphical/view/SettingsView.kt (100%) rename {mirai-console-graphical => frontend/mirai-console-graphical}/src/main/kotlin/net/mamoe/mirai/console/graphical/view/dialog/InputDialog.kt (100%) rename {mirai-console-graphical => frontend/mirai-console-graphical}/src/main/kotlin/net/mamoe/mirai/console/graphical/view/dialog/PluginDetailFragment.kt (100%) rename {mirai-console-graphical => frontend/mirai-console-graphical}/src/main/kotlin/net/mamoe/mirai/console/graphical/view/dialog/VerificationCodeFragment.kt (100%) rename {mirai-console-graphical => frontend/mirai-console-graphical}/src/main/resources/character.png (100%) rename {mirai-console-graphical => frontend/mirai-console-graphical}/src/main/resources/logo.png (100%) rename {mirai-console-graphical => frontend/mirai-console-graphical}/src/test/kotlin/Main.kt (100%) create mode 100644 frontend/mirai-console-pure/build.gradle.kts rename {mirai-console-terminal => frontend/mirai-console-terminal}/README.md (100%) rename {mirai-console-terminal => frontend/mirai-console-terminal}/build.gradle.kts (100%) rename {mirai-console-terminal => frontend/mirai-console-terminal}/src/main/kotlin/net/mamoe/mirai/console/MiraiConsoleTerminalLoader.kt (100%) rename {mirai-console-terminal => frontend/mirai-console-terminal}/src/main/kotlin/net/mamoe/mirai/console/MiraiConsoleTerminalUI.kt (100%) diff --git a/mirai-console/README.MD b/backend/mirai-console/README.MD similarity index 100% rename from mirai-console/README.MD rename to backend/mirai-console/README.MD diff --git a/mirai-console/build.gradle.kts b/backend/mirai-console/build.gradle.kts similarity index 100% rename from mirai-console/build.gradle.kts rename to backend/mirai-console/build.gradle.kts diff --git a/mirai-console/src/main/java/net/mamoe/mirai/console/command/JCommandManager.java b/backend/mirai-console/src/main/java/net/mamoe/mirai/console/command/JCommandManager.java similarity index 100% rename from mirai-console/src/main/java/net/mamoe/mirai/console/command/JCommandManager.java rename to backend/mirai-console/src/main/java/net/mamoe/mirai/console/command/JCommandManager.java diff --git a/mirai-console/src/main/java/net/mamoe/mirai/console/events/EventListener.java b/backend/mirai-console/src/main/java/net/mamoe/mirai/console/events/EventListener.java similarity index 97% rename from mirai-console/src/main/java/net/mamoe/mirai/console/events/EventListener.java rename to backend/mirai-console/src/main/java/net/mamoe/mirai/console/events/EventListener.java index bb7409ee6..92f4d72ae 100644 --- a/mirai-console/src/main/java/net/mamoe/mirai/console/events/EventListener.java +++ b/backend/mirai-console/src/main/java/net/mamoe/mirai/console/events/EventListener.java @@ -1,6 +1,5 @@ package net.mamoe.mirai.console.events; -import kotlinx.coroutines.GlobalScope; import net.mamoe.mirai.console.plugins.PluginBase; import net.mamoe.mirai.event.Event; import net.mamoe.mirai.event.Listener; diff --git a/mirai-console/src/main/java/net/mamoe/mirai/console/events/Events.java b/backend/mirai-console/src/main/java/net/mamoe/mirai/console/events/Events.java similarity index 80% rename from mirai-console/src/main/java/net/mamoe/mirai/console/events/Events.java rename to backend/mirai-console/src/main/java/net/mamoe/mirai/console/events/Events.java index be017d241..eae53061e 100644 --- a/mirai-console/src/main/java/net/mamoe/mirai/console/events/Events.java +++ b/backend/mirai-console/src/main/java/net/mamoe/mirai/console/events/Events.java @@ -9,15 +9,9 @@ package net.mamoe.mirai.console.events; -import kotlinx.coroutines.GlobalScope; import net.mamoe.mirai.event.Event; -import net.mamoe.mirai.event.Listener; -import net.mamoe.mirai.event.ListeningStatus; import org.jetbrains.annotations.NotNull; -import java.util.function.Consumer; -import java.util.function.Function; - /** * 事件处理 */ diff --git a/mirai-console/src/main/java/net/mamoe/mirai/console/plugins/ConfigSectionFactory.java b/backend/mirai-console/src/main/java/net/mamoe/mirai/console/plugins/ConfigSectionFactory.java similarity index 100% rename from mirai-console/src/main/java/net/mamoe/mirai/console/plugins/ConfigSectionFactory.java rename to backend/mirai-console/src/main/java/net/mamoe/mirai/console/plugins/ConfigSectionFactory.java diff --git a/mirai-console/src/main/java/net/mamoe/mirai/console/scheduler/SchedulerTaskManager.java b/backend/mirai-console/src/main/java/net/mamoe/mirai/console/scheduler/SchedulerTaskManager.java similarity index 100% rename from mirai-console/src/main/java/net/mamoe/mirai/console/scheduler/SchedulerTaskManager.java rename to backend/mirai-console/src/main/java/net/mamoe/mirai/console/scheduler/SchedulerTaskManager.java diff --git a/mirai-console/src/main/java/net/mamoe/mirai/console/utils/BotManager.java b/backend/mirai-console/src/main/java/net/mamoe/mirai/console/utils/BotManager.java similarity index 100% rename from mirai-console/src/main/java/net/mamoe/mirai/console/utils/BotManager.java rename to backend/mirai-console/src/main/java/net/mamoe/mirai/console/utils/BotManager.java diff --git a/mirai-console/src/main/java/net/mamoe/mirai/console/utils/Utils.java b/backend/mirai-console/src/main/java/net/mamoe/mirai/console/utils/Utils.java similarity index 100% rename from mirai-console/src/main/java/net/mamoe/mirai/console/utils/Utils.java rename to backend/mirai-console/src/main/java/net/mamoe/mirai/console/utils/Utils.java diff --git a/mirai-console/src/main/kotlin/net/mamoe/mirai/console/MiraiConsole.kt b/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/MiraiConsole.kt similarity index 100% rename from mirai-console/src/main/kotlin/net/mamoe/mirai/console/MiraiConsole.kt rename to backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/MiraiConsole.kt diff --git a/mirai-console/src/main/kotlin/net/mamoe/mirai/console/center/CuiPluginCenter.kt b/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/center/CuiPluginCenter.kt similarity index 100% rename from mirai-console/src/main/kotlin/net/mamoe/mirai/console/center/CuiPluginCenter.kt rename to backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/center/CuiPluginCenter.kt diff --git a/mirai-console/src/main/kotlin/net/mamoe/mirai/console/center/PluginCenter.kt b/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/center/PluginCenter.kt similarity index 100% rename from mirai-console/src/main/kotlin/net/mamoe/mirai/console/center/PluginCenter.kt rename to backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/center/PluginCenter.kt diff --git a/mirai-console/src/main/kotlin/net/mamoe/mirai/console/command/Command.kt b/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/command/Command.kt similarity index 100% rename from mirai-console/src/main/kotlin/net/mamoe/mirai/console/command/Command.kt rename to backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/command/Command.kt diff --git a/mirai-console/src/main/kotlin/net/mamoe/mirai/console/command/CommandArgParser.kt b/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/command/CommandArgParser.kt similarity index 100% rename from mirai-console/src/main/kotlin/net/mamoe/mirai/console/command/CommandArgParser.kt rename to backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/command/CommandArgParser.kt diff --git a/mirai-console/src/main/kotlin/net/mamoe/mirai/console/command/CommandDescriptor.kt b/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/command/CommandDescriptor.kt similarity index 100% rename from mirai-console/src/main/kotlin/net/mamoe/mirai/console/command/CommandDescriptor.kt rename to backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/command/CommandDescriptor.kt diff --git a/mirai-console/src/main/kotlin/net/mamoe/mirai/console/command/CommandManager.kt b/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/command/CommandManager.kt similarity index 100% rename from mirai-console/src/main/kotlin/net/mamoe/mirai/console/command/CommandManager.kt rename to backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/command/CommandManager.kt diff --git a/mirai-console/src/main/kotlin/net/mamoe/mirai/console/command/CommandParam.kt b/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/command/CommandParam.kt similarity index 100% rename from mirai-console/src/main/kotlin/net/mamoe/mirai/console/command/CommandParam.kt rename to backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/command/CommandParam.kt diff --git a/mirai-console/src/main/kotlin/net/mamoe/mirai/console/command/CommandParserContext.kt b/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/command/CommandParserContext.kt similarity index 100% rename from mirai-console/src/main/kotlin/net/mamoe/mirai/console/command/CommandParserContext.kt rename to backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/command/CommandParserContext.kt diff --git a/mirai-console/src/main/kotlin/net/mamoe/mirai/console/command/CommandPermission.kt b/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/command/CommandPermission.kt similarity index 100% rename from mirai-console/src/main/kotlin/net/mamoe/mirai/console/command/CommandPermission.kt rename to backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/command/CommandPermission.kt diff --git a/mirai-console/src/main/kotlin/net/mamoe/mirai/console/command/CommandSender.kt b/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/command/CommandSender.kt similarity index 100% rename from mirai-console/src/main/kotlin/net/mamoe/mirai/console/command/CommandSender.kt rename to backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/command/CommandSender.kt diff --git a/mirai-console/src/main/kotlin/net/mamoe/mirai/console/command/DefaultCommands.kt b/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/command/DefaultCommands.kt similarity index 100% rename from mirai-console/src/main/kotlin/net/mamoe/mirai/console/command/DefaultCommands.kt rename to backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/command/DefaultCommands.kt diff --git a/mirai-console/src/main/kotlin/net/mamoe/mirai/console/events/EventsImpl.kt b/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/events/EventsImpl.kt similarity index 96% rename from mirai-console/src/main/kotlin/net/mamoe/mirai/console/events/EventsImpl.kt rename to backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/events/EventsImpl.kt index eaf9e99d9..4ccfa7052 100644 --- a/mirai-console/src/main/kotlin/net/mamoe/mirai/console/events/EventsImpl.kt +++ b/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/events/EventsImpl.kt @@ -9,7 +9,7 @@ @file:Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE") -package net.mamoe.mirai.console.events; +package net.mamoe.mirai.console.events import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.runBlocking diff --git a/mirai-console/src/main/kotlin/net/mamoe/mirai/console/plugins/ConfigSection.kt b/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/plugins/ConfigSection.kt similarity index 100% rename from mirai-console/src/main/kotlin/net/mamoe/mirai/console/plugins/ConfigSection.kt rename to backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/plugins/ConfigSection.kt diff --git a/mirai-console/src/main/kotlin/net/mamoe/mirai/console/plugins/PluginBase.kt b/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/plugins/PluginBase.kt similarity index 100% rename from mirai-console/src/main/kotlin/net/mamoe/mirai/console/plugins/PluginBase.kt rename to backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/plugins/PluginBase.kt diff --git a/mirai-console/src/main/kotlin/net/mamoe/mirai/console/plugins/PluginManager.kt b/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/plugins/PluginManager.kt similarity index 100% rename from mirai-console/src/main/kotlin/net/mamoe/mirai/console/plugins/PluginManager.kt rename to backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/plugins/PluginManager.kt diff --git a/mirai-console/src/main/kotlin/net/mamoe/mirai/console/plugins/PluginsLoader.kt b/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/plugins/PluginsLoader.kt similarity index 100% rename from mirai-console/src/main/kotlin/net/mamoe/mirai/console/plugins/PluginsLoader.kt rename to backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/plugins/PluginsLoader.kt diff --git a/mirai-console/src/main/kotlin/net/mamoe/mirai/console/pure/MiraiConsolePureLoader.kt b/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/pure/MiraiConsolePureLoader.kt similarity index 100% rename from mirai-console/src/main/kotlin/net/mamoe/mirai/console/pure/MiraiConsolePureLoader.kt rename to backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/pure/MiraiConsolePureLoader.kt diff --git a/mirai-console/src/main/kotlin/net/mamoe/mirai/console/pure/MiraiConsoleUIPure.kt b/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/pure/MiraiConsoleUIPure.kt similarity index 100% rename from mirai-console/src/main/kotlin/net/mamoe/mirai/console/pure/MiraiConsoleUIPure.kt rename to backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/pure/MiraiConsoleUIPure.kt diff --git a/mirai-console/src/main/kotlin/net/mamoe/mirai/console/scheduler/SchedulerTask.kt b/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/scheduler/SchedulerTask.kt similarity index 100% rename from mirai-console/src/main/kotlin/net/mamoe/mirai/console/scheduler/SchedulerTask.kt rename to backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/scheduler/SchedulerTask.kt diff --git a/mirai-console/src/main/kotlin/net/mamoe/mirai/console/utils/BotHelper.kt b/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/utils/BotHelper.kt similarity index 100% rename from mirai-console/src/main/kotlin/net/mamoe/mirai/console/utils/BotHelper.kt rename to backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/utils/BotHelper.kt diff --git a/mirai-console/src/main/kotlin/net/mamoe/mirai/console/utils/ConsoleInput.kt b/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/utils/ConsoleInput.kt similarity index 100% rename from mirai-console/src/main/kotlin/net/mamoe/mirai/console/utils/ConsoleInput.kt rename to backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/utils/ConsoleInput.kt diff --git a/mirai-console/src/main/kotlin/net/mamoe/mirai/console/utils/MiraiConsoleUI.kt b/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/utils/MiraiConsoleUI.kt similarity index 100% rename from mirai-console/src/main/kotlin/net/mamoe/mirai/console/utils/MiraiConsoleUI.kt rename to backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/utils/MiraiConsoleUI.kt diff --git a/mirai-console/src/main/kotlin/net/mamoe/mirai/console/utils/Utils.kt b/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/utils/Utils.kt similarity index 100% rename from mirai-console/src/main/kotlin/net/mamoe/mirai/console/utils/Utils.kt rename to backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/utils/Utils.kt diff --git a/mirai-console/src/main/kotlin/net/mamoe/mirai/console/utils/Value.kt b/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/utils/Value.kt similarity index 100% rename from mirai-console/src/main/kotlin/net/mamoe/mirai/console/utils/Value.kt rename to backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/utils/Value.kt diff --git a/mirai-console/src/test/kotlin/StringFuzzyTest.kt b/backend/mirai-console/src/test/kotlin/StringFuzzyTest.kt similarity index 100% rename from mirai-console/src/test/kotlin/StringFuzzyTest.kt rename to backend/mirai-console/src/test/kotlin/StringFuzzyTest.kt diff --git a/buildSrc/src/main/kotlin/versions.kt b/buildSrc/src/main/kotlin/versions.kt index 1909fb6f9..68e5161e8 100644 --- a/buildSrc/src/main/kotlin/versions.kt +++ b/buildSrc/src/main/kotlin/versions.kt @@ -14,6 +14,8 @@ object Versions { const val core = "1.0-RC2-1" const val console = "0.5.1" const val consoleGraphical = "0.0.7" + const val consoleTerminal = "0.1.0" + const val consolePure = "0.1.0" } object Kotlin { diff --git a/mirai-console-graphical/README.md b/frontend/mirai-console-graphical/README.md similarity index 100% rename from mirai-console-graphical/README.md rename to frontend/mirai-console-graphical/README.md diff --git a/mirai-console-graphical/build.gradle.kts b/frontend/mirai-console-graphical/build.gradle.kts similarity index 100% rename from mirai-console-graphical/build.gradle.kts rename to frontend/mirai-console-graphical/build.gradle.kts diff --git a/mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/MiraiConsoleGraphicalLoader.kt b/frontend/mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/MiraiConsoleGraphicalLoader.kt similarity index 95% rename from mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/MiraiConsoleGraphicalLoader.kt rename to frontend/mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/MiraiConsoleGraphicalLoader.kt index 46c2b5454..551b95f57 100644 --- a/mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/MiraiConsoleGraphicalLoader.kt +++ b/frontend/mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/MiraiConsoleGraphicalLoader.kt @@ -8,8 +8,6 @@ */ package net.mamoe.mirai.console.graphical -import net.mamoe.mirai.console.pure.MiraiConsoleUIPure - import net.mamoe.mirai.console.MiraiConsole import tornadofx.launch import kotlin.concurrent.thread diff --git a/mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/MiraiGraphical.kt b/frontend/mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/MiraiGraphical.kt similarity index 100% rename from mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/MiraiGraphical.kt rename to frontend/mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/MiraiGraphical.kt diff --git a/mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/controller/MiraiGraphicalUIController.kt b/frontend/mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/controller/MiraiGraphicalUIController.kt similarity index 100% rename from mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/controller/MiraiGraphicalUIController.kt rename to frontend/mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/controller/MiraiGraphicalUIController.kt diff --git a/mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/event/ReloadEvent.kt b/frontend/mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/event/ReloadEvent.kt similarity index 100% rename from mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/event/ReloadEvent.kt rename to frontend/mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/event/ReloadEvent.kt diff --git a/mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/model/BotModel.kt b/frontend/mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/model/BotModel.kt similarity index 100% rename from mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/model/BotModel.kt rename to frontend/mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/model/BotModel.kt diff --git a/mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/model/ConsoleInfo.kt b/frontend/mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/model/ConsoleInfo.kt similarity index 100% rename from mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/model/ConsoleInfo.kt rename to frontend/mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/model/ConsoleInfo.kt diff --git a/mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/model/GlobalSetting.kt b/frontend/mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/model/GlobalSetting.kt similarity index 100% rename from mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/model/GlobalSetting.kt rename to frontend/mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/model/GlobalSetting.kt diff --git a/mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/model/PluginModel.kt b/frontend/mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/model/PluginModel.kt similarity index 100% rename from mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/model/PluginModel.kt rename to frontend/mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/model/PluginModel.kt diff --git a/mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/model/VerificationCodeModel.kt b/frontend/mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/model/VerificationCodeModel.kt similarity index 100% rename from mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/model/VerificationCodeModel.kt rename to frontend/mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/model/VerificationCodeModel.kt diff --git a/mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/stylesheet/BaseStyleSheet.kt b/frontend/mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/stylesheet/BaseStyleSheet.kt similarity index 100% rename from mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/stylesheet/BaseStyleSheet.kt rename to frontend/mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/stylesheet/BaseStyleSheet.kt diff --git a/mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/stylesheet/LoginViewStyleSheet.kt b/frontend/mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/stylesheet/LoginViewStyleSheet.kt similarity index 93% rename from mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/stylesheet/LoginViewStyleSheet.kt rename to frontend/mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/stylesheet/LoginViewStyleSheet.kt index fec8b8757..8f84a9334 100644 --- a/mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/stylesheet/LoginViewStyleSheet.kt +++ b/frontend/mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/stylesheet/LoginViewStyleSheet.kt @@ -5,7 +5,10 @@ import javafx.scene.effect.BlurType import javafx.scene.effect.DropShadow import javafx.scene.paint.Color import javafx.scene.text.FontWeight -import tornadofx.* +import tornadofx.box +import tornadofx.c +import tornadofx.csselement +import tornadofx.px class LoginViewStyleSheet : BaseStyleSheet() { diff --git a/mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/stylesheet/PluginViewStyleSheet.kt b/frontend/mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/stylesheet/PluginViewStyleSheet.kt similarity index 100% rename from mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/stylesheet/PluginViewStyleSheet.kt rename to frontend/mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/stylesheet/PluginViewStyleSheet.kt diff --git a/mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/stylesheet/PrimaryStyleSheet.kt b/frontend/mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/stylesheet/PrimaryStyleSheet.kt similarity index 98% rename from mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/stylesheet/PrimaryStyleSheet.kt rename to frontend/mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/stylesheet/PrimaryStyleSheet.kt index 9bb6628e5..29c83094e 100644 --- a/mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/stylesheet/PrimaryStyleSheet.kt +++ b/frontend/mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/stylesheet/PrimaryStyleSheet.kt @@ -1,9 +1,11 @@ package net.mamoe.mirai.console.graphical.stylesheet import javafx.scene.Cursor -import javafx.scene.paint.Color import javafx.scene.text.FontWeight -import tornadofx.* +import tornadofx.box +import tornadofx.c +import tornadofx.cssclass +import tornadofx.px class PrimaryStyleSheet : BaseStyleSheet() { companion object { diff --git a/mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/util/JFoenixAdaptor.kt b/frontend/mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/util/JFoenixAdaptor.kt similarity index 98% rename from mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/util/JFoenixAdaptor.kt rename to frontend/mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/util/JFoenixAdaptor.kt index 987df669f..b22023376 100644 --- a/mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/util/JFoenixAdaptor.kt +++ b/frontend/mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/util/JFoenixAdaptor.kt @@ -6,7 +6,6 @@ import javafx.beans.value.ObservableValue import javafx.collections.ObservableList import javafx.event.EventTarget import javafx.scene.Node -import javafx.scene.control.Button import javafx.scene.control.ListView import tornadofx.SortedFilteredList import tornadofx.attachTo diff --git a/mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/util/SVG.kt b/frontend/mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/util/SVG.kt similarity index 100% rename from mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/util/SVG.kt rename to frontend/mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/util/SVG.kt diff --git a/mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/util/controls.kt b/frontend/mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/util/controls.kt similarity index 100% rename from mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/util/controls.kt rename to frontend/mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/util/controls.kt diff --git a/mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/view/Decorator.kt b/frontend/mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/view/Decorator.kt similarity index 100% rename from mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/view/Decorator.kt rename to frontend/mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/view/Decorator.kt diff --git a/mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/view/LoginView.kt b/frontend/mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/view/LoginView.kt similarity index 100% rename from mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/view/LoginView.kt rename to frontend/mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/view/LoginView.kt diff --git a/mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/view/PluginsCenterView.kt b/frontend/mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/view/PluginsCenterView.kt similarity index 100% rename from mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/view/PluginsCenterView.kt rename to frontend/mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/view/PluginsCenterView.kt diff --git a/mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/view/PluginsView.kt b/frontend/mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/view/PluginsView.kt similarity index 98% rename from mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/view/PluginsView.kt rename to frontend/mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/view/PluginsView.kt index 4d3e335d0..2753ad9cf 100644 --- a/mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/view/PluginsView.kt +++ b/frontend/mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/view/PluginsView.kt @@ -3,7 +3,6 @@ package net.mamoe.mirai.console.graphical.view import com.jfoenix.controls.JFXTreeTableColumn import javafx.scene.control.TreeTableCell import net.mamoe.mirai.console.graphical.controller.MiraiGraphicalUIController -import net.mamoe.mirai.console.graphical.event.ReloadEvent import net.mamoe.mirai.console.graphical.model.PluginModel import net.mamoe.mirai.console.graphical.stylesheet.PluginViewStyleSheet import net.mamoe.mirai.console.graphical.util.jfxButton diff --git a/mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/view/PrimaryView.kt b/frontend/mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/view/PrimaryView.kt similarity index 96% rename from mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/view/PrimaryView.kt rename to frontend/mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/view/PrimaryView.kt index 76f1bd2d1..4e2d1e3f6 100644 --- a/mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/view/PrimaryView.kt +++ b/frontend/mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/view/PrimaryView.kt @@ -3,7 +3,6 @@ package net.mamoe.mirai.console.graphical.view import com.jfoenix.controls.JFXButton import com.jfoenix.controls.JFXListCell import javafx.collections.ObservableList -import javafx.geometry.Insets import javafx.geometry.Pos import javafx.scene.control.Alert import javafx.scene.control.ButtonType @@ -18,11 +17,7 @@ import kotlinx.coroutines.runBlocking import net.mamoe.mirai.console.graphical.controller.MiraiGraphicalUIController import net.mamoe.mirai.console.graphical.model.BotModel import net.mamoe.mirai.console.graphical.util.* -import net.mamoe.mirai.console.graphical.util.jfxButton -import net.mamoe.mirai.console.graphical.util.jfxListView -import net.mamoe.mirai.console.graphical.util.jfxTabPane import tornadofx.* -import tornadofx.Stylesheet.Companion.contextMenu class PrimaryView : View() { diff --git a/mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/view/SettingsView.kt b/frontend/mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/view/SettingsView.kt similarity index 100% rename from mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/view/SettingsView.kt rename to frontend/mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/view/SettingsView.kt diff --git a/mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/view/dialog/InputDialog.kt b/frontend/mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/view/dialog/InputDialog.kt similarity index 100% rename from mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/view/dialog/InputDialog.kt rename to frontend/mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/view/dialog/InputDialog.kt diff --git a/mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/view/dialog/PluginDetailFragment.kt b/frontend/mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/view/dialog/PluginDetailFragment.kt similarity index 100% rename from mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/view/dialog/PluginDetailFragment.kt rename to frontend/mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/view/dialog/PluginDetailFragment.kt diff --git a/mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/view/dialog/VerificationCodeFragment.kt b/frontend/mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/view/dialog/VerificationCodeFragment.kt similarity index 100% rename from mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/view/dialog/VerificationCodeFragment.kt rename to frontend/mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/view/dialog/VerificationCodeFragment.kt diff --git a/mirai-console-graphical/src/main/resources/character.png b/frontend/mirai-console-graphical/src/main/resources/character.png similarity index 100% rename from mirai-console-graphical/src/main/resources/character.png rename to frontend/mirai-console-graphical/src/main/resources/character.png diff --git a/mirai-console-graphical/src/main/resources/logo.png b/frontend/mirai-console-graphical/src/main/resources/logo.png similarity index 100% rename from mirai-console-graphical/src/main/resources/logo.png rename to frontend/mirai-console-graphical/src/main/resources/logo.png diff --git a/mirai-console-graphical/src/test/kotlin/Main.kt b/frontend/mirai-console-graphical/src/test/kotlin/Main.kt similarity index 100% rename from mirai-console-graphical/src/test/kotlin/Main.kt rename to frontend/mirai-console-graphical/src/test/kotlin/Main.kt diff --git a/frontend/mirai-console-pure/build.gradle.kts b/frontend/mirai-console-pure/build.gradle.kts new file mode 100644 index 000000000..324ea9df4 --- /dev/null +++ b/frontend/mirai-console-pure/build.gradle.kts @@ -0,0 +1,54 @@ +import org.jetbrains.kotlin.gradle.tasks.KotlinCompile + +plugins { + kotlin("jvm") + kotlin("plugin.serialization") + id("java") + `maven-publish` + id("com.jfrog.bintray") +} + +apply(plugin = "com.github.johnrengelman.shadow") + +kotlin { + sourceSets { + all { + languageSettings.enableLanguageFeature("InlineClasses") + + languageSettings.useExperimentalAnnotation("kotlin.Experimental") + languageSettings.useExperimentalAnnotation("kotlin.OptIn") + languageSettings.progressiveMode = true + languageSettings.useExperimentalAnnotation("net.mamoe.mirai.utils.MiraiInternalAPI") + languageSettings.useExperimentalAnnotation("kotlin.ExperimentalUnsignedTypes") + languageSettings.useExperimentalAnnotation("kotlin.experimental.ExperimentalTypeInference") + languageSettings.useExperimentalAnnotation("kotlin.contracts.ExperimentalContracts") + } + } +} +dependencies { + compileOnly(project(":mirai-console")) + compileOnly(kotlin("stdlib")) // embedded by core + + testApi("net.mamoe:mirai-core-qqandroid:${Versions.Mirai.core}") + testApi(project(":mirai-console")) +} + +version = Versions.Mirai.consolePure + +description = "Console Pure CLI frontend for mirai" + +val compileKotlin: KotlinCompile by tasks +compileKotlin.kotlinOptions { + jvmTarget = "1.8" +} +val compileTestKotlin: KotlinCompile by tasks +compileTestKotlin.kotlinOptions { + jvmTarget = "1.8" +} +java { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 +} +tasks.withType(JavaCompile::class.java) { + options.encoding = "UTF8" +} \ No newline at end of file diff --git a/mirai-console-terminal/README.md b/frontend/mirai-console-terminal/README.md similarity index 100% rename from mirai-console-terminal/README.md rename to frontend/mirai-console-terminal/README.md diff --git a/mirai-console-terminal/build.gradle.kts b/frontend/mirai-console-terminal/build.gradle.kts similarity index 100% rename from mirai-console-terminal/build.gradle.kts rename to frontend/mirai-console-terminal/build.gradle.kts diff --git a/mirai-console-terminal/src/main/kotlin/net/mamoe/mirai/console/MiraiConsoleTerminalLoader.kt b/frontend/mirai-console-terminal/src/main/kotlin/net/mamoe/mirai/console/MiraiConsoleTerminalLoader.kt similarity index 100% rename from mirai-console-terminal/src/main/kotlin/net/mamoe/mirai/console/MiraiConsoleTerminalLoader.kt rename to frontend/mirai-console-terminal/src/main/kotlin/net/mamoe/mirai/console/MiraiConsoleTerminalLoader.kt diff --git a/mirai-console-terminal/src/main/kotlin/net/mamoe/mirai/console/MiraiConsoleTerminalUI.kt b/frontend/mirai-console-terminal/src/main/kotlin/net/mamoe/mirai/console/MiraiConsoleTerminalUI.kt similarity index 100% rename from mirai-console-terminal/src/main/kotlin/net/mamoe/mirai/console/MiraiConsoleTerminalUI.kt rename to frontend/mirai-console-terminal/src/main/kotlin/net/mamoe/mirai/console/MiraiConsoleTerminalUI.kt diff --git a/settings.gradle b/settings.gradle index e1df949be..f03fabaf1 100644 --- a/settings.gradle +++ b/settings.gradle @@ -24,7 +24,14 @@ pluginManagement { rootProject.name = 'mirai-console' include(':mirai-console') +project(':mirai-console').dir = file("backend/mirai-console") + + +include(':mirai-console-pure') +project(':mirai-console-pure').dir = file("frontend/mirai-console-pure") + include(':mirai-console-terminal') +project(':mirai-console-terminal').dir = file("frontend/mirai-console-terminal") try{ def javaVersion = System.getProperty("java.version") @@ -43,6 +50,7 @@ try{ } if (javaVersionNum >= 9) { include(':mirai-console-graphical') + project(':mirai-console-graphical').dir = file("frontend/mirai-console-graphical") } else { println("jdk版本为 "+ javaVersionNum) println("当前使用的 JDK 版本为 ${System.getProperty("java.version")}, 请使用JDK 9以上版本引入模块 `:mirai-console-graphical`\n")