From 66c575bbb3038fedfc2804ad7f7178ccf67c74a4 Mon Sep 17 00:00:00 2001
From: Sakuya Kosugi <kosugikun@icloud.com>
Date: Wed, 29 Mar 2023 00:55:33 +0900
Subject: [PATCH 01/39] =?UTF-8?q?.java=20=E3=82=92=20.kt=20=E3=81=AB?=
 =?UTF-8?q?=E5=90=8D=E5=89=8D=E5=A4=89=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/dev/cosgy/{TextToSpeak/Bot.java => textToSpeak/Bot.kt}   | 0
 .../{TextToSpeak/BotConfig.java => textToSpeak/BotConfig.kt}      | 0
 .../cosgy/{TextToSpeak/Listener.java => textToSpeak/Listener.kt}  | 0
 .../{TextToSpeak/TextToSpeak.java => textToSpeak/TextToSpeak.kt}  | 0
 .../audio/AloneInVoiceHandler.kt}                                 | 0
 .../audio/AudioHandler.java => textToSpeak/audio/AudioHandler.kt} | 0
 .../audio/Dictionary.java => textToSpeak/audio/Dictionary.kt}     | 0
 .../PlayerManager.java => textToSpeak/audio/PlayerManager.kt}     | 0
 .../audio/QueuedTrack.java => textToSpeak/audio/QueuedTrack.kt}   | 0
 .../VoiceCreation.java => textToSpeak/audio/VoiceCreation.kt}     | 0
 .../AdminCommand.java => textToSpeak/commands/AdminCommand.kt}    | 0
 .../OwnerCommand.java => textToSpeak/commands/OwnerCommand.kt}    | 0
 .../commands/admin/GuildSettings.kt}                              | 0
 .../JLReadCmd.java => textToSpeak/commands/admin/JLReadCmd.kt}    | 0
 .../commands/admin/SetReadNameCmd.kt}                             | 0
 .../SettcCmd.java => textToSpeak/commands/admin/SettcCmd.kt}      | 0
 .../commands/dictionary/AddWordCmd.kt}                            | 0
 .../commands/dictionary/DlWordCmd.kt}                             | 0
 .../commands/dictionary/WordListCmd.kt}                           | 0
 .../commands/general/AboutCommand.kt}                             | 0
 .../ByeCmd.java => textToSpeak/commands/general/ByeCmd.kt}        | 0
 .../HelpCmd.java => textToSpeak/commands/general/HelpCmd.kt}      | 0
 .../JoinCmd.java => textToSpeak/commands/general/JoinCmd.kt}      | 0
 .../commands/general/SetIntonationCmd.kt}                         | 0
 .../commands/general/SetSpeedCmd.kt}                              | 0
 .../commands/general/SetVoiceCmd.kt}                              | 0
 .../commands/general/SetVoiceQualityA.kt}                         | 0
 .../commands/general/SetVoiceQualityFm.kt}                        | 0
 .../commands/general/SettingsCmd.kt}                              | 0
 .../commands/owner/ShutdownCmd.kt}                                | 0
 .../entities/Prompt.java => textToSpeak/entities/Prompt.kt}       | 0
 .../gui/ConsolePanel.java => textToSpeak/gui/ConsolePanel.kt}     | 0
 .../cosgy/{TextToSpeak/gui/GUI.java => textToSpeak/gui/GUI.kt}    | 0
 .../gui/TextAreaOutputStream.kt}                                  | 0
 .../CommandAudit.java => textToSpeak/listeners/CommandAudit.kt}   | 0
 .../listeners/MessageListener.kt}                                 | 0
 .../queue/FairQueue.java => textToSpeak/queue/FairQueue.kt}       | 0
 .../queue/Queueable.java => textToSpeak/queue/Queueable.kt}       | 0
 .../settings/Settings.java => textToSpeak/settings/Settings.kt}   | 0
 .../settings/SettingsManager.kt}                                  | 0
 .../UserSettings.java => textToSpeak/settings/UserSettings.kt}    | 0
 .../settings/UserSettingsManager.kt}                              | 0
 .../utils/FormatUtil.java => textToSpeak/utils/FormatUtil.kt}     | 0
 .../utils/OtherUtil.java => textToSpeak/utils/OtherUtil.kt}       | 0
 .../utils/ReadChannel.java => textToSpeak/utils/ReadChannel.kt}   | 0
 45 files changed, 0 insertions(+), 0 deletions(-)
 rename src/main/java/dev/cosgy/{TextToSpeak/Bot.java => textToSpeak/Bot.kt} (100%)
 rename src/main/java/dev/cosgy/{TextToSpeak/BotConfig.java => textToSpeak/BotConfig.kt} (100%)
 rename src/main/java/dev/cosgy/{TextToSpeak/Listener.java => textToSpeak/Listener.kt} (100%)
 rename src/main/java/dev/cosgy/{TextToSpeak/TextToSpeak.java => textToSpeak/TextToSpeak.kt} (100%)
 rename src/main/java/dev/cosgy/{TextToSpeak/audio/AloneInVoiceHandler.java => textToSpeak/audio/AloneInVoiceHandler.kt} (100%)
 rename src/main/java/dev/cosgy/{TextToSpeak/audio/AudioHandler.java => textToSpeak/audio/AudioHandler.kt} (100%)
 rename src/main/java/dev/cosgy/{TextToSpeak/audio/Dictionary.java => textToSpeak/audio/Dictionary.kt} (100%)
 rename src/main/java/dev/cosgy/{TextToSpeak/audio/PlayerManager.java => textToSpeak/audio/PlayerManager.kt} (100%)
 rename src/main/java/dev/cosgy/{TextToSpeak/audio/QueuedTrack.java => textToSpeak/audio/QueuedTrack.kt} (100%)
 rename src/main/java/dev/cosgy/{TextToSpeak/audio/VoiceCreation.java => textToSpeak/audio/VoiceCreation.kt} (100%)
 rename src/main/java/dev/cosgy/{TextToSpeak/commands/AdminCommand.java => textToSpeak/commands/AdminCommand.kt} (100%)
 rename src/main/java/dev/cosgy/{TextToSpeak/commands/OwnerCommand.java => textToSpeak/commands/OwnerCommand.kt} (100%)
 rename src/main/java/dev/cosgy/{TextToSpeak/commands/admin/GuildSettings.java => textToSpeak/commands/admin/GuildSettings.kt} (100%)
 rename src/main/java/dev/cosgy/{TextToSpeak/commands/admin/JLReadCmd.java => textToSpeak/commands/admin/JLReadCmd.kt} (100%)
 rename src/main/java/dev/cosgy/{TextToSpeak/commands/admin/SetReadNameCmd.java => textToSpeak/commands/admin/SetReadNameCmd.kt} (100%)
 rename src/main/java/dev/cosgy/{TextToSpeak/commands/admin/SettcCmd.java => textToSpeak/commands/admin/SettcCmd.kt} (100%)
 rename src/main/java/dev/cosgy/{TextToSpeak/commands/dictionary/AddWordCmd.java => textToSpeak/commands/dictionary/AddWordCmd.kt} (100%)
 rename src/main/java/dev/cosgy/{TextToSpeak/commands/dictionary/DlWordCmd.java => textToSpeak/commands/dictionary/DlWordCmd.kt} (100%)
 rename src/main/java/dev/cosgy/{TextToSpeak/commands/dictionary/WordListCmd.java => textToSpeak/commands/dictionary/WordListCmd.kt} (100%)
 rename src/main/java/dev/cosgy/{TextToSpeak/commands/general/AboutCommand.java => textToSpeak/commands/general/AboutCommand.kt} (100%)
 rename src/main/java/dev/cosgy/{TextToSpeak/commands/general/ByeCmd.java => textToSpeak/commands/general/ByeCmd.kt} (100%)
 rename src/main/java/dev/cosgy/{TextToSpeak/commands/general/HelpCmd.java => textToSpeak/commands/general/HelpCmd.kt} (100%)
 rename src/main/java/dev/cosgy/{TextToSpeak/commands/general/JoinCmd.java => textToSpeak/commands/general/JoinCmd.kt} (100%)
 rename src/main/java/dev/cosgy/{TextToSpeak/commands/general/SetIntonationCmd.java => textToSpeak/commands/general/SetIntonationCmd.kt} (100%)
 rename src/main/java/dev/cosgy/{TextToSpeak/commands/general/SetSpeedCmd.java => textToSpeak/commands/general/SetSpeedCmd.kt} (100%)
 rename src/main/java/dev/cosgy/{TextToSpeak/commands/general/SetVoiceCmd.java => textToSpeak/commands/general/SetVoiceCmd.kt} (100%)
 rename src/main/java/dev/cosgy/{TextToSpeak/commands/general/SetVoiceQualityA.java => textToSpeak/commands/general/SetVoiceQualityA.kt} (100%)
 rename src/main/java/dev/cosgy/{TextToSpeak/commands/general/SetVoiceQualityFm.java => textToSpeak/commands/general/SetVoiceQualityFm.kt} (100%)
 rename src/main/java/dev/cosgy/{TextToSpeak/commands/general/SettingsCmd.java => textToSpeak/commands/general/SettingsCmd.kt} (100%)
 rename src/main/java/dev/cosgy/{TextToSpeak/commands/owner/ShutdownCmd.java => textToSpeak/commands/owner/ShutdownCmd.kt} (100%)
 rename src/main/java/dev/cosgy/{TextToSpeak/entities/Prompt.java => textToSpeak/entities/Prompt.kt} (100%)
 rename src/main/java/dev/cosgy/{TextToSpeak/gui/ConsolePanel.java => textToSpeak/gui/ConsolePanel.kt} (100%)
 rename src/main/java/dev/cosgy/{TextToSpeak/gui/GUI.java => textToSpeak/gui/GUI.kt} (100%)
 rename src/main/java/dev/cosgy/{TextToSpeak/gui/TextAreaOutputStream.java => textToSpeak/gui/TextAreaOutputStream.kt} (100%)
 rename src/main/java/dev/cosgy/{TextToSpeak/listeners/CommandAudit.java => textToSpeak/listeners/CommandAudit.kt} (100%)
 rename src/main/java/dev/cosgy/{TextToSpeak/listeners/MessageListener.java => textToSpeak/listeners/MessageListener.kt} (100%)
 rename src/main/java/dev/cosgy/{TextToSpeak/queue/FairQueue.java => textToSpeak/queue/FairQueue.kt} (100%)
 rename src/main/java/dev/cosgy/{TextToSpeak/queue/Queueable.java => textToSpeak/queue/Queueable.kt} (100%)
 rename src/main/java/dev/cosgy/{TextToSpeak/settings/Settings.java => textToSpeak/settings/Settings.kt} (100%)
 rename src/main/java/dev/cosgy/{TextToSpeak/settings/SettingsManager.java => textToSpeak/settings/SettingsManager.kt} (100%)
 rename src/main/java/dev/cosgy/{TextToSpeak/settings/UserSettings.java => textToSpeak/settings/UserSettings.kt} (100%)
 rename src/main/java/dev/cosgy/{TextToSpeak/settings/UserSettingsManager.java => textToSpeak/settings/UserSettingsManager.kt} (100%)
 rename src/main/java/dev/cosgy/{TextToSpeak/utils/FormatUtil.java => textToSpeak/utils/FormatUtil.kt} (100%)
 rename src/main/java/dev/cosgy/{TextToSpeak/utils/OtherUtil.java => textToSpeak/utils/OtherUtil.kt} (100%)
 rename src/main/java/dev/cosgy/{TextToSpeak/utils/ReadChannel.java => textToSpeak/utils/ReadChannel.kt} (100%)

diff --git a/src/main/java/dev/cosgy/TextToSpeak/Bot.java b/src/main/java/dev/cosgy/textToSpeak/Bot.kt
similarity index 100%
rename from src/main/java/dev/cosgy/TextToSpeak/Bot.java
rename to src/main/java/dev/cosgy/textToSpeak/Bot.kt
diff --git a/src/main/java/dev/cosgy/TextToSpeak/BotConfig.java b/src/main/java/dev/cosgy/textToSpeak/BotConfig.kt
similarity index 100%
rename from src/main/java/dev/cosgy/TextToSpeak/BotConfig.java
rename to src/main/java/dev/cosgy/textToSpeak/BotConfig.kt
diff --git a/src/main/java/dev/cosgy/TextToSpeak/Listener.java b/src/main/java/dev/cosgy/textToSpeak/Listener.kt
similarity index 100%
rename from src/main/java/dev/cosgy/TextToSpeak/Listener.java
rename to src/main/java/dev/cosgy/textToSpeak/Listener.kt
diff --git a/src/main/java/dev/cosgy/TextToSpeak/TextToSpeak.java b/src/main/java/dev/cosgy/textToSpeak/TextToSpeak.kt
similarity index 100%
rename from src/main/java/dev/cosgy/TextToSpeak/TextToSpeak.java
rename to src/main/java/dev/cosgy/textToSpeak/TextToSpeak.kt
diff --git a/src/main/java/dev/cosgy/TextToSpeak/audio/AloneInVoiceHandler.java b/src/main/java/dev/cosgy/textToSpeak/audio/AloneInVoiceHandler.kt
similarity index 100%
rename from src/main/java/dev/cosgy/TextToSpeak/audio/AloneInVoiceHandler.java
rename to src/main/java/dev/cosgy/textToSpeak/audio/AloneInVoiceHandler.kt
diff --git a/src/main/java/dev/cosgy/TextToSpeak/audio/AudioHandler.java b/src/main/java/dev/cosgy/textToSpeak/audio/AudioHandler.kt
similarity index 100%
rename from src/main/java/dev/cosgy/TextToSpeak/audio/AudioHandler.java
rename to src/main/java/dev/cosgy/textToSpeak/audio/AudioHandler.kt
diff --git a/src/main/java/dev/cosgy/TextToSpeak/audio/Dictionary.java b/src/main/java/dev/cosgy/textToSpeak/audio/Dictionary.kt
similarity index 100%
rename from src/main/java/dev/cosgy/TextToSpeak/audio/Dictionary.java
rename to src/main/java/dev/cosgy/textToSpeak/audio/Dictionary.kt
diff --git a/src/main/java/dev/cosgy/TextToSpeak/audio/PlayerManager.java b/src/main/java/dev/cosgy/textToSpeak/audio/PlayerManager.kt
similarity index 100%
rename from src/main/java/dev/cosgy/TextToSpeak/audio/PlayerManager.java
rename to src/main/java/dev/cosgy/textToSpeak/audio/PlayerManager.kt
diff --git a/src/main/java/dev/cosgy/TextToSpeak/audio/QueuedTrack.java b/src/main/java/dev/cosgy/textToSpeak/audio/QueuedTrack.kt
similarity index 100%
rename from src/main/java/dev/cosgy/TextToSpeak/audio/QueuedTrack.java
rename to src/main/java/dev/cosgy/textToSpeak/audio/QueuedTrack.kt
diff --git a/src/main/java/dev/cosgy/TextToSpeak/audio/VoiceCreation.java b/src/main/java/dev/cosgy/textToSpeak/audio/VoiceCreation.kt
similarity index 100%
rename from src/main/java/dev/cosgy/TextToSpeak/audio/VoiceCreation.java
rename to src/main/java/dev/cosgy/textToSpeak/audio/VoiceCreation.kt
diff --git a/src/main/java/dev/cosgy/TextToSpeak/commands/AdminCommand.java b/src/main/java/dev/cosgy/textToSpeak/commands/AdminCommand.kt
similarity index 100%
rename from src/main/java/dev/cosgy/TextToSpeak/commands/AdminCommand.java
rename to src/main/java/dev/cosgy/textToSpeak/commands/AdminCommand.kt
diff --git a/src/main/java/dev/cosgy/TextToSpeak/commands/OwnerCommand.java b/src/main/java/dev/cosgy/textToSpeak/commands/OwnerCommand.kt
similarity index 100%
rename from src/main/java/dev/cosgy/TextToSpeak/commands/OwnerCommand.java
rename to src/main/java/dev/cosgy/textToSpeak/commands/OwnerCommand.kt
diff --git a/src/main/java/dev/cosgy/TextToSpeak/commands/admin/GuildSettings.java b/src/main/java/dev/cosgy/textToSpeak/commands/admin/GuildSettings.kt
similarity index 100%
rename from src/main/java/dev/cosgy/TextToSpeak/commands/admin/GuildSettings.java
rename to src/main/java/dev/cosgy/textToSpeak/commands/admin/GuildSettings.kt
diff --git a/src/main/java/dev/cosgy/TextToSpeak/commands/admin/JLReadCmd.java b/src/main/java/dev/cosgy/textToSpeak/commands/admin/JLReadCmd.kt
similarity index 100%
rename from src/main/java/dev/cosgy/TextToSpeak/commands/admin/JLReadCmd.java
rename to src/main/java/dev/cosgy/textToSpeak/commands/admin/JLReadCmd.kt
diff --git a/src/main/java/dev/cosgy/TextToSpeak/commands/admin/SetReadNameCmd.java b/src/main/java/dev/cosgy/textToSpeak/commands/admin/SetReadNameCmd.kt
similarity index 100%
rename from src/main/java/dev/cosgy/TextToSpeak/commands/admin/SetReadNameCmd.java
rename to src/main/java/dev/cosgy/textToSpeak/commands/admin/SetReadNameCmd.kt
diff --git a/src/main/java/dev/cosgy/TextToSpeak/commands/admin/SettcCmd.java b/src/main/java/dev/cosgy/textToSpeak/commands/admin/SettcCmd.kt
similarity index 100%
rename from src/main/java/dev/cosgy/TextToSpeak/commands/admin/SettcCmd.java
rename to src/main/java/dev/cosgy/textToSpeak/commands/admin/SettcCmd.kt
diff --git a/src/main/java/dev/cosgy/TextToSpeak/commands/dictionary/AddWordCmd.java b/src/main/java/dev/cosgy/textToSpeak/commands/dictionary/AddWordCmd.kt
similarity index 100%
rename from src/main/java/dev/cosgy/TextToSpeak/commands/dictionary/AddWordCmd.java
rename to src/main/java/dev/cosgy/textToSpeak/commands/dictionary/AddWordCmd.kt
diff --git a/src/main/java/dev/cosgy/TextToSpeak/commands/dictionary/DlWordCmd.java b/src/main/java/dev/cosgy/textToSpeak/commands/dictionary/DlWordCmd.kt
similarity index 100%
rename from src/main/java/dev/cosgy/TextToSpeak/commands/dictionary/DlWordCmd.java
rename to src/main/java/dev/cosgy/textToSpeak/commands/dictionary/DlWordCmd.kt
diff --git a/src/main/java/dev/cosgy/TextToSpeak/commands/dictionary/WordListCmd.java b/src/main/java/dev/cosgy/textToSpeak/commands/dictionary/WordListCmd.kt
similarity index 100%
rename from src/main/java/dev/cosgy/TextToSpeak/commands/dictionary/WordListCmd.java
rename to src/main/java/dev/cosgy/textToSpeak/commands/dictionary/WordListCmd.kt
diff --git a/src/main/java/dev/cosgy/TextToSpeak/commands/general/AboutCommand.java b/src/main/java/dev/cosgy/textToSpeak/commands/general/AboutCommand.kt
similarity index 100%
rename from src/main/java/dev/cosgy/TextToSpeak/commands/general/AboutCommand.java
rename to src/main/java/dev/cosgy/textToSpeak/commands/general/AboutCommand.kt
diff --git a/src/main/java/dev/cosgy/TextToSpeak/commands/general/ByeCmd.java b/src/main/java/dev/cosgy/textToSpeak/commands/general/ByeCmd.kt
similarity index 100%
rename from src/main/java/dev/cosgy/TextToSpeak/commands/general/ByeCmd.java
rename to src/main/java/dev/cosgy/textToSpeak/commands/general/ByeCmd.kt
diff --git a/src/main/java/dev/cosgy/TextToSpeak/commands/general/HelpCmd.java b/src/main/java/dev/cosgy/textToSpeak/commands/general/HelpCmd.kt
similarity index 100%
rename from src/main/java/dev/cosgy/TextToSpeak/commands/general/HelpCmd.java
rename to src/main/java/dev/cosgy/textToSpeak/commands/general/HelpCmd.kt
diff --git a/src/main/java/dev/cosgy/TextToSpeak/commands/general/JoinCmd.java b/src/main/java/dev/cosgy/textToSpeak/commands/general/JoinCmd.kt
similarity index 100%
rename from src/main/java/dev/cosgy/TextToSpeak/commands/general/JoinCmd.java
rename to src/main/java/dev/cosgy/textToSpeak/commands/general/JoinCmd.kt
diff --git a/src/main/java/dev/cosgy/TextToSpeak/commands/general/SetIntonationCmd.java b/src/main/java/dev/cosgy/textToSpeak/commands/general/SetIntonationCmd.kt
similarity index 100%
rename from src/main/java/dev/cosgy/TextToSpeak/commands/general/SetIntonationCmd.java
rename to src/main/java/dev/cosgy/textToSpeak/commands/general/SetIntonationCmd.kt
diff --git a/src/main/java/dev/cosgy/TextToSpeak/commands/general/SetSpeedCmd.java b/src/main/java/dev/cosgy/textToSpeak/commands/general/SetSpeedCmd.kt
similarity index 100%
rename from src/main/java/dev/cosgy/TextToSpeak/commands/general/SetSpeedCmd.java
rename to src/main/java/dev/cosgy/textToSpeak/commands/general/SetSpeedCmd.kt
diff --git a/src/main/java/dev/cosgy/TextToSpeak/commands/general/SetVoiceCmd.java b/src/main/java/dev/cosgy/textToSpeak/commands/general/SetVoiceCmd.kt
similarity index 100%
rename from src/main/java/dev/cosgy/TextToSpeak/commands/general/SetVoiceCmd.java
rename to src/main/java/dev/cosgy/textToSpeak/commands/general/SetVoiceCmd.kt
diff --git a/src/main/java/dev/cosgy/TextToSpeak/commands/general/SetVoiceQualityA.java b/src/main/java/dev/cosgy/textToSpeak/commands/general/SetVoiceQualityA.kt
similarity index 100%
rename from src/main/java/dev/cosgy/TextToSpeak/commands/general/SetVoiceQualityA.java
rename to src/main/java/dev/cosgy/textToSpeak/commands/general/SetVoiceQualityA.kt
diff --git a/src/main/java/dev/cosgy/TextToSpeak/commands/general/SetVoiceQualityFm.java b/src/main/java/dev/cosgy/textToSpeak/commands/general/SetVoiceQualityFm.kt
similarity index 100%
rename from src/main/java/dev/cosgy/TextToSpeak/commands/general/SetVoiceQualityFm.java
rename to src/main/java/dev/cosgy/textToSpeak/commands/general/SetVoiceQualityFm.kt
diff --git a/src/main/java/dev/cosgy/TextToSpeak/commands/general/SettingsCmd.java b/src/main/java/dev/cosgy/textToSpeak/commands/general/SettingsCmd.kt
similarity index 100%
rename from src/main/java/dev/cosgy/TextToSpeak/commands/general/SettingsCmd.java
rename to src/main/java/dev/cosgy/textToSpeak/commands/general/SettingsCmd.kt
diff --git a/src/main/java/dev/cosgy/TextToSpeak/commands/owner/ShutdownCmd.java b/src/main/java/dev/cosgy/textToSpeak/commands/owner/ShutdownCmd.kt
similarity index 100%
rename from src/main/java/dev/cosgy/TextToSpeak/commands/owner/ShutdownCmd.java
rename to src/main/java/dev/cosgy/textToSpeak/commands/owner/ShutdownCmd.kt
diff --git a/src/main/java/dev/cosgy/TextToSpeak/entities/Prompt.java b/src/main/java/dev/cosgy/textToSpeak/entities/Prompt.kt
similarity index 100%
rename from src/main/java/dev/cosgy/TextToSpeak/entities/Prompt.java
rename to src/main/java/dev/cosgy/textToSpeak/entities/Prompt.kt
diff --git a/src/main/java/dev/cosgy/TextToSpeak/gui/ConsolePanel.java b/src/main/java/dev/cosgy/textToSpeak/gui/ConsolePanel.kt
similarity index 100%
rename from src/main/java/dev/cosgy/TextToSpeak/gui/ConsolePanel.java
rename to src/main/java/dev/cosgy/textToSpeak/gui/ConsolePanel.kt
diff --git a/src/main/java/dev/cosgy/TextToSpeak/gui/GUI.java b/src/main/java/dev/cosgy/textToSpeak/gui/GUI.kt
similarity index 100%
rename from src/main/java/dev/cosgy/TextToSpeak/gui/GUI.java
rename to src/main/java/dev/cosgy/textToSpeak/gui/GUI.kt
diff --git a/src/main/java/dev/cosgy/TextToSpeak/gui/TextAreaOutputStream.java b/src/main/java/dev/cosgy/textToSpeak/gui/TextAreaOutputStream.kt
similarity index 100%
rename from src/main/java/dev/cosgy/TextToSpeak/gui/TextAreaOutputStream.java
rename to src/main/java/dev/cosgy/textToSpeak/gui/TextAreaOutputStream.kt
diff --git a/src/main/java/dev/cosgy/TextToSpeak/listeners/CommandAudit.java b/src/main/java/dev/cosgy/textToSpeak/listeners/CommandAudit.kt
similarity index 100%
rename from src/main/java/dev/cosgy/TextToSpeak/listeners/CommandAudit.java
rename to src/main/java/dev/cosgy/textToSpeak/listeners/CommandAudit.kt
diff --git a/src/main/java/dev/cosgy/TextToSpeak/listeners/MessageListener.java b/src/main/java/dev/cosgy/textToSpeak/listeners/MessageListener.kt
similarity index 100%
rename from src/main/java/dev/cosgy/TextToSpeak/listeners/MessageListener.java
rename to src/main/java/dev/cosgy/textToSpeak/listeners/MessageListener.kt
diff --git a/src/main/java/dev/cosgy/TextToSpeak/queue/FairQueue.java b/src/main/java/dev/cosgy/textToSpeak/queue/FairQueue.kt
similarity index 100%
rename from src/main/java/dev/cosgy/TextToSpeak/queue/FairQueue.java
rename to src/main/java/dev/cosgy/textToSpeak/queue/FairQueue.kt
diff --git a/src/main/java/dev/cosgy/TextToSpeak/queue/Queueable.java b/src/main/java/dev/cosgy/textToSpeak/queue/Queueable.kt
similarity index 100%
rename from src/main/java/dev/cosgy/TextToSpeak/queue/Queueable.java
rename to src/main/java/dev/cosgy/textToSpeak/queue/Queueable.kt
diff --git a/src/main/java/dev/cosgy/TextToSpeak/settings/Settings.java b/src/main/java/dev/cosgy/textToSpeak/settings/Settings.kt
similarity index 100%
rename from src/main/java/dev/cosgy/TextToSpeak/settings/Settings.java
rename to src/main/java/dev/cosgy/textToSpeak/settings/Settings.kt
diff --git a/src/main/java/dev/cosgy/TextToSpeak/settings/SettingsManager.java b/src/main/java/dev/cosgy/textToSpeak/settings/SettingsManager.kt
similarity index 100%
rename from src/main/java/dev/cosgy/TextToSpeak/settings/SettingsManager.java
rename to src/main/java/dev/cosgy/textToSpeak/settings/SettingsManager.kt
diff --git a/src/main/java/dev/cosgy/TextToSpeak/settings/UserSettings.java b/src/main/java/dev/cosgy/textToSpeak/settings/UserSettings.kt
similarity index 100%
rename from src/main/java/dev/cosgy/TextToSpeak/settings/UserSettings.java
rename to src/main/java/dev/cosgy/textToSpeak/settings/UserSettings.kt
diff --git a/src/main/java/dev/cosgy/TextToSpeak/settings/UserSettingsManager.java b/src/main/java/dev/cosgy/textToSpeak/settings/UserSettingsManager.kt
similarity index 100%
rename from src/main/java/dev/cosgy/TextToSpeak/settings/UserSettingsManager.java
rename to src/main/java/dev/cosgy/textToSpeak/settings/UserSettingsManager.kt
diff --git a/src/main/java/dev/cosgy/TextToSpeak/utils/FormatUtil.java b/src/main/java/dev/cosgy/textToSpeak/utils/FormatUtil.kt
similarity index 100%
rename from src/main/java/dev/cosgy/TextToSpeak/utils/FormatUtil.java
rename to src/main/java/dev/cosgy/textToSpeak/utils/FormatUtil.kt
diff --git a/src/main/java/dev/cosgy/TextToSpeak/utils/OtherUtil.java b/src/main/java/dev/cosgy/textToSpeak/utils/OtherUtil.kt
similarity index 100%
rename from src/main/java/dev/cosgy/TextToSpeak/utils/OtherUtil.java
rename to src/main/java/dev/cosgy/textToSpeak/utils/OtherUtil.kt
diff --git a/src/main/java/dev/cosgy/TextToSpeak/utils/ReadChannel.java b/src/main/java/dev/cosgy/textToSpeak/utils/ReadChannel.kt
similarity index 100%
rename from src/main/java/dev/cosgy/TextToSpeak/utils/ReadChannel.java
rename to src/main/java/dev/cosgy/textToSpeak/utils/ReadChannel.kt

From b7ed2289d75ee716596ebe59e1953d3836c6d2c9 Mon Sep 17 00:00:00 2001
From: Sakuya Kosugi <kosugikun@icloud.com>
Date: Wed, 29 Mar 2023 00:55:33 +0900
Subject: [PATCH 02/39] =?UTF-8?q?=E5=85=A8=E3=81=A6=E3=81=AE=E3=83=97?=
 =?UTF-8?q?=E3=83=AD=E3=82=B0=E3=83=A9=E3=83=A0=E3=82=92Kotlin=E3=81=AB?=
 =?UTF-8?q?=E6=9B=B8=E3=81=8D=E6=8F=9B=E3=81=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/jarRepositories.xml                     |   5 +
 pom.xml                                       |  60 +++-
 src/main/java/dev/cosgy/textToSpeak/Bot.kt    | 244 ++++++---------
 .../java/dev/cosgy/textToSpeak/BotConfig.kt   | 291 ++++++++----------
 .../java/dev/cosgy/textToSpeak/Listener.kt    | 208 +++++--------
 .../java/dev/cosgy/textToSpeak/TextToSpeak.kt | 282 ++++++++---------
 .../textToSpeak/audio/AloneInVoiceHandler.kt  | 103 +++----
 .../cosgy/textToSpeak/audio/AudioHandler.kt   | 141 ++++-----
 .../dev/cosgy/textToSpeak/audio/Dictionary.kt | 218 ++++++-------
 .../cosgy/textToSpeak/audio/PlayerManager.kt  |  80 ++---
 .../cosgy/textToSpeak/audio/QueuedTrack.kt    |  33 +-
 .../cosgy/textToSpeak/audio/VoiceCreation.kt  | 244 +++++++--------
 .../textToSpeak/commands/AdminCommand.kt      |  47 ++-
 .../textToSpeak/commands/OwnerCommand.kt      |  15 +-
 .../commands/admin/GuildSettings.kt           |  94 +++---
 .../textToSpeak/commands/admin/JLReadCmd.kt   |  68 ++--
 .../commands/admin/SetReadNameCmd.kt          |  67 ++--
 .../textToSpeak/commands/admin/SettcCmd.kt    | 165 +++++-----
 .../commands/dictionary/AddWordCmd.kt         | 142 ++++-----
 .../commands/dictionary/DlWordCmd.kt          | 116 +++----
 .../commands/dictionary/WordListCmd.kt        | 129 ++++----
 .../commands/general/AboutCommand.kt          | 196 ++++++------
 .../textToSpeak/commands/general/ByeCmd.kt    |  87 +++---
 .../textToSpeak/commands/general/HelpCmd.kt   | 122 ++++----
 .../textToSpeak/commands/general/JoinCmd.kt   | 152 ++++-----
 .../commands/general/SetIntonationCmd.kt      | 121 +++-----
 .../commands/general/SetSpeedCmd.kt           | 138 ++++-----
 .../commands/general/SetVoiceCmd.kt           | 136 ++++----
 .../commands/general/SetVoiceQualityA.kt      | 124 ++++----
 .../commands/general/SetVoiceQualityFm.kt     | 138 ++++-----
 .../commands/general/SettingsCmd.kt           |  82 +++--
 .../textToSpeak/commands/owner/ShutdownCmd.kt |  40 +--
 .../dev/cosgy/textToSpeak/entities/Prompt.kt  | 124 +++-----
 .../dev/cosgy/textToSpeak/gui/ConsolePanel.kt |  45 ++-
 .../java/dev/cosgy/textToSpeak/gui/GUI.kt     |  82 +++--
 .../textToSpeak/gui/TextAreaOutputStream.kt   | 179 +++++------
 .../textToSpeak/listeners/CommandAudit.kt     |  36 +--
 .../textToSpeak/listeners/MessageListener.kt  | 181 ++++-------
 .../dev/cosgy/textToSpeak/queue/FairQueue.kt  |  94 +++---
 .../dev/cosgy/textToSpeak/queue/Queueable.kt  |   9 +-
 .../cosgy/textToSpeak/settings/Settings.kt    | 124 ++++----
 .../textToSpeak/settings/SettingsManager.kt   | 103 +++----
 .../textToSpeak/settings/UserSettings.kt      |  76 +----
 .../settings/UserSettingsManager.kt           | 122 ++++----
 .../dev/cosgy/textToSpeak/utils/FormatUtil.kt |  27 +-
 .../dev/cosgy/textToSpeak/utils/OtherUtil.kt  | 219 +++++++------
 .../cosgy/textToSpeak/utils/ReadChannel.kt    |  20 +-
 47 files changed, 2425 insertions(+), 3104 deletions(-)

diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index e5abd44..a99e3d6 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -21,6 +21,11 @@
       <option name="name" value="Maven Central" />
       <option name="url" value="https://repo.maven.apache.org/maven2/" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="m2-chew-snapshots" />
+      <option name="name" value="Maven Chewtral" />
+      <option name="url" value="https://m2.chew.pro/snapshots" />
+    </remote-repository>
     <remote-repository>
       <option name="id" value="chew-m2-snapshots" />
       <option name="name" value="chew-m2-snapshots" />
diff --git a/pom.xml b/pom.xml
index 7aa49c5..38f25df 100644
--- a/pom.xml
+++ b/pom.xml
@@ -126,6 +126,23 @@
             <artifactId>json</artifactId>
             <version>20220924</version>
         </dependency>
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-stdlib-jdk8</artifactId>
+            <version>${kotlin.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-test</artifactId>
+            <version>${kotlin.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-script-runtime</artifactId>
+            <version>1.8.20-RC2</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>
@@ -156,7 +173,7 @@
                                 <transformer
                                         implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
                                     <manifestEntries>
-                                        <Main-Class>dev.cosgy.TextToSpeak.TextToSpeak</Main-Class>
+                                        <Main-Class>dev.cosgy.textToSpeak.TextToSpeak</Main-Class>
                                         <Specification-Title>${project.artifactId}</Specification-Title>
                                         <Specification-Version>${project.version}</Specification-Version>
                                         <Implementation-Title>${project.artifactId}</Implementation-Title>
@@ -169,9 +186,49 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.jetbrains.kotlin</groupId>
+                <artifactId>kotlin-maven-plugin</artifactId>
+                <version>${kotlin.version}</version>
+                <executions>
+                    <execution>
+                        <id>compile</id>
+                        <phase>process-sources</phase>
+                        <goals>
+                            <goal>compile</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>test-compile</id>
+                        <phase>test-compile</phase>
+                        <goals>
+                            <goal>test-compile</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <jvmTarget>${maven.compiler.target}</jvmTarget>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>compile</id>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>compile</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>testCompile</id>
+                        <phase>test-compile</phase>
+                        <goals>
+                            <goal>testCompile</goal>
+                        </goals>
+                    </execution>
+                </executions>
                 <configuration>
                     <source>9</source>
                     <target>9</target>
@@ -184,6 +241,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
+        <kotlin.version>1.8.20-RC2</kotlin.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/src/main/java/dev/cosgy/textToSpeak/Bot.kt b/src/main/java/dev/cosgy/textToSpeak/Bot.kt
index 0a53c6d..375cdc0 100644
--- a/src/main/java/dev/cosgy/textToSpeak/Bot.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/Bot.kt
@@ -13,174 +13,116 @@
 //     See the License for the specific language governing permissions and               /
 //     limitations under the License.                                                    /
 //////////////////////////////////////////////////////////////////////////////////////////
-
-package dev.cosgy.TextToSpeak;
-
-import com.jagrosh.jdautilities.commons.waiter.EventWaiter;
-import dev.cosgy.TextToSpeak.audio.*;
-import dev.cosgy.TextToSpeak.gui.GUI;
-import dev.cosgy.TextToSpeak.settings.SettingsManager;
-import dev.cosgy.TextToSpeak.settings.UserSettingsManager;
-import net.dv8tion.jda.api.JDA;
-import net.dv8tion.jda.api.entities.Activity;
-import net.dv8tion.jda.api.entities.Guild;
-import org.apache.commons.io.FileUtils;
-import org.slf4j.Logger;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.Locale;
-import java.util.Objects;
-import java.util.ResourceBundle;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
-
-import static org.slf4j.LoggerFactory.getLogger;
-
-
-public class Bot {
-    public static Bot INSTANCE;
-    private final EventWaiter waiter;
-    private final ScheduledExecutorService threadpool;
-    private final BotConfig config;
-    private final SettingsManager settings;
-    private final ResourceBundle lang;
-    private final PlayerManager players;
-    private final VoiceCreation voiceCreation;
-    private final UserSettingsManager userSettingsManager;
-    private final AloneInVoiceHandler aloneInVoiceHandler;
-    Logger log = getLogger(this.getClass());
-    private Dictionary dictionary;
-    private boolean shuttingDown = false;
-    private JDA jda;
-    private GUI gui;
-
-    public Bot(EventWaiter waiter, BotConfig config, SettingsManager settings) {
-        this.waiter = waiter;
-        this.lang = ResourceBundle.getBundle("lang.yomiage", Locale.JAPAN);
-        this.config = config;
-        this.settings = settings;
-        this.threadpool = Executors.newSingleThreadScheduledExecutor();
-        this.players = new PlayerManager(this);
-        this.players.init();
-        this.voiceCreation = new VoiceCreation(this);
-        this.userSettingsManager = new UserSettingsManager();
-        this.aloneInVoiceHandler = new AloneInVoiceHandler(this);
-        this.aloneInVoiceHandler.init();
-    }
-
-    public JDA getJDA() {
-        return jda;
-    }
-
-    public void setJDA(JDA jda) {
-        this.jda = jda;
-    }
-
-    public void readyJDA() {
-        this.dictionary = Dictionary.getInstance(this);
-    }
-
-    public void closeAudioConnection(long guildId) {
-        Guild guild = jda.getGuildById(guildId);
-        if (guild != null)
-            threadpool.submit(() -> guild.getAudioManager().closeAudioConnection());
-    }
-
-    public void resetGame() {
-        Activity game = config.getGame() == null || config.getGame().getName().toLowerCase().matches("(none|なし)") ? null : config.getGame();
-        if (!Objects.equals(jda.getPresence().getActivity(), game))
-            jda.getPresence().setActivity(game);
-    }
-
-    public void shutdown() {
-        if (shuttingDown)
-            return;
-        shuttingDown = true;
-        threadpool.shutdownNow();
-        if (jda.getStatus() != JDA.Status.SHUTTING_DOWN) {
-            jda.getGuilds().forEach(g ->
-            {
-                g.getAudioManager().closeAudioConnection();
-                AudioHandler ah = (AudioHandler) g.getAudioManager().getSendingHandler();
+package dev.cosgy.textToSpeak
+
+import com.jagrosh.jdautilities.commons.waiter.EventWaiter
+import dev.cosgy.textToSpeak.audio.*
+import dev.cosgy.textToSpeak.audio.Dictionary
+import dev.cosgy.textToSpeak.gui.GUI
+import dev.cosgy.textToSpeak.settings.SettingsManager
+import dev.cosgy.textToSpeak.settings.UserSettingsManager
+import net.dv8tion.jda.api.JDA
+import net.dv8tion.jda.api.entities.Guild
+import org.apache.commons.io.FileUtils
+import org.slf4j.LoggerFactory
+import java.io.File
+import java.io.IOException
+import java.util.*
+import java.util.concurrent.Executors
+import java.util.concurrent.ScheduledExecutorService
+import java.util.concurrent.TimeUnit
+import java.util.function.Consumer
+
+class Bot(val waiter: EventWaiter, val config: BotConfig, val settingsManager: SettingsManager) {
+    val threadpool: ScheduledExecutorService
+    private val lang: ResourceBundle
+    val playerManager: PlayerManager
+    val voiceCreation: VoiceCreation
+    val userSettingsManager: UserSettingsManager
+    val aloneInVoiceHandler: AloneInVoiceHandler
+    var log = LoggerFactory.getLogger(this.javaClass)
+    var dictionary: Dictionary? = null
+        private set
+    private var shuttingDown = false
+    var jda: JDA? = null
+    private var gui: GUI? = null
+
+    init {
+        lang = ResourceBundle.getBundle("lang.yomiage", Locale.JAPAN)
+        threadpool = Executors.newSingleThreadScheduledExecutor()
+        playerManager = PlayerManager(this)
+        playerManager.init()
+        voiceCreation = VoiceCreation(this)
+        userSettingsManager = UserSettingsManager()
+        aloneInVoiceHandler = AloneInVoiceHandler(this)
+        aloneInVoiceHandler.init()
+    }
+
+    fun readyJDA() {
+        dictionary = Dictionary.Companion.getInstance(this)
+    }
+
+    fun closeAudioConnection(guildId: Long) {
+        val guild = jda!!.getGuildById(guildId)
+        if (guild != null) threadpool.submit { guild.audioManager.closeAudioConnection() }
+    }
+
+    fun resetGame() {
+        val game = if (config.game == null || config.game!!.name.lowercase(Locale.getDefault()).matches("(none|なし)".toRegex())) null else config.game
+        if (jda!!.presence.activity != game) jda!!.presence.activity = game
+    }
+
+    fun shutdown() {
+        if (shuttingDown) return
+        shuttingDown = true
+        threadpool.shutdownNow()
+        if (jda!!.status != JDA.Status.SHUTTING_DOWN) {
+            jda!!.guilds.forEach(Consumer { g: Guild ->
+                g.audioManager.closeAudioConnection()
+                val ah = g.audioManager.sendingHandler as AudioHandler?
                 if (ah != null) {
-                    ah.stopAndClear();
-                    ah.getPlayer().destroy();
+                    ah.stopAndClear()
+                    ah.player.destroy()
                 }
-            });
+            })
 
             // ここからJDAの終了処理
-            jda.shutdown();
+            jda!!.shutdown()
             try {
-                if (!jda.awaitShutdown(10, TimeUnit.SECONDS)) {
-                    jda.shutdownNow();
-                    if (!jda.awaitShutdown(10, TimeUnit.SECONDS)) {
-                        log.warn("JDAのシャットダウンがタイムアウトしました。");
+                if (!jda!!.awaitShutdown(10, TimeUnit.SECONDS)) {
+                    jda!!.shutdownNow()
+                    if (!jda!!.awaitShutdown(10, TimeUnit.SECONDS)) {
+                        log.warn("JDAのシャットダウンがタイムアウトしました。")
                     }
                 }
-            } catch (InterruptedException e) {
-                jda.shutdownNow();
-                Thread.currentThread().interrupt();
-                log.warn("JDAのシャットダウンが中断されました。");
+            } catch (e: InterruptedException) {
+                jda!!.shutdownNow()
+                Thread.currentThread().interrupt()
+                log.warn("JDAのシャットダウンが中断されました。")
             }
 
             // 一時ファイルを削除
             try {
-                FileUtils.cleanDirectory(new File("tmp"));
-                FileUtils.cleanDirectory(new File("wav"));
-                log.info("一時ファイルを削除しました。");
-            } catch (IOException e) {
-                log.warn("一時ファイルの削除に失敗しました。");
+                FileUtils.cleanDirectory(File("tmp"))
+                FileUtils.cleanDirectory(File("wav"))
+                log.info("一時ファイルを削除しました。")
+            } catch (e: IOException) {
+                log.warn("一時ファイルの削除に失敗しました。")
             }
-
         }
-        if (gui != null)
-            gui.dispose();
-        System.exit(0);
-    }
-
-    public void setGUI(GUI gui) {
-        this.gui = gui;
-    }
-
-    public ResourceBundle GetLang() {
-        return lang;
-    }
-
-    public SettingsManager getSettingsManager() {
-        return settings;
-    }
-
-    public PlayerManager getPlayerManager() {
-        return players;
-    }
-
-    public EventWaiter getWaiter() {
-        return waiter;
-    }
-
-    public BotConfig getConfig() {
-        return config;
-    }
-
-    public ScheduledExecutorService getThreadpool() {
-        return threadpool;
-    }
-
-    public VoiceCreation getVoiceCreation() {
-        return voiceCreation;
+        if (gui != null) gui!!.dispose()
+        System.exit(0)
     }
 
-    public UserSettingsManager getUserSettingsManager() {
-        return userSettingsManager;
+    fun setGUI(gui: GUI?) {
+        this.gui = gui
     }
 
-    public Dictionary getDictionary() {
-        return dictionary;
+    fun GetLang(): ResourceBundle {
+        return lang
     }
 
-    public AloneInVoiceHandler getAloneInVoiceHandler() {
-        return aloneInVoiceHandler;
+    companion object {
+        var INSTANCE: Bot? = null
     }
-}
+}
\ No newline at end of file
diff --git a/src/main/java/dev/cosgy/textToSpeak/BotConfig.kt b/src/main/java/dev/cosgy/textToSpeak/BotConfig.kt
index 975ac35..d4a81c9 100644
--- a/src/main/java/dev/cosgy/textToSpeak/BotConfig.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/BotConfig.kt
@@ -13,190 +13,159 @@
 //     See the License for the specific language governing permissions and               /
 //     limitations under the License.                                                    /
 //////////////////////////////////////////////////////////////////////////////////////////
-
-package dev.cosgy.TextToSpeak;
-
-import com.typesafe.config.Config;
-import com.typesafe.config.ConfigException;
-import com.typesafe.config.ConfigFactory;
-import dev.cosgy.TextToSpeak.entities.Prompt;
-import dev.cosgy.TextToSpeak.utils.OtherUtil;
-import net.dv8tion.jda.api.OnlineStatus;
-import net.dv8tion.jda.api.entities.Activity;
-import org.apache.commons.io.FileUtils;
-
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Path;
-
-public class BotConfig {
-    private final static String CONTEXT = "Config";
-    private final static String START_TOKEN = "/// START OF YOMIAGEBOT CONFIG ///";
-    private final static String END_TOKEN = "/// END OF YOMIAGEBOT CONFIG ///";
-    private final Prompt prompt;
-    private Path path = null;
-
-    private String token, prefix, altprefix, dictionary, voiceDirectory, winjtalkdir;
-    private long owner, aloneTimeUntilStop;
-    private int maxMessageCount;
-    private OnlineStatus status;
-    private Activity game;
-    private boolean updatealerts, dbots, helpToDm;
-
-
-    private boolean valid = false;
-
-    public BotConfig(Prompt prompt) {
-        this.prompt = prompt;
-    }
-
-    public void load() {
-        valid = false;
-
+package dev.cosgy.textToSpeak
+
+import com.typesafe.config.ConfigException
+import com.typesafe.config.ConfigFactory
+import dev.cosgy.textToSpeak.entities.Prompt
+import dev.cosgy.textToSpeak.utils.OtherUtil
+import net.dv8tion.jda.api.OnlineStatus
+import net.dv8tion.jda.api.entities.Activity
+import org.apache.commons.io.FileUtils
+import java.io.IOException
+import java.nio.charset.StandardCharsets
+import java.nio.file.Path
+import kotlin.system.exitProcess
+
+class BotConfig(private val prompt: Prompt) {
+    private var path: Path? = null
+    var token: String? = null
+        private set
+    var prefix: String? = null
+        private set
+    private var altprefix: String? = null
+    var dictionary: String? = null
+        private set
+    var voiceDirectory: String? = null
+        private set
+    var winJTalkDir: String? = null
+        private set
+    var ownerId: Long = 0
+        private set
+    var aloneTimeUntilStop: Long = 0
+        private set
+    var maxMessageCount = 0
+        private set
+    var status: OnlineStatus? = null
+        private set
+    var game: Activity? = null
+        private set
+    private var updatealerts = false
+    private var dBots = false
+    var helpToDm = false
+        private set
+    var isValid = false
+        private set
+
+    fun load() {
+        isValid = false
         try {
-            path = OtherUtil.getPath(System.getProperty("config.file", System.getProperty("config", "config.txt")));
-            if (path.toFile().exists()) {
-                if (System.getProperty("config.file") == null)
-                    System.setProperty("config.file", System.getProperty("config", "config.txt"));
-                ConfigFactory.invalidateCaches();
+            path = OtherUtil.getPath(System.getProperty("config.file", System.getProperty("config", "config.txt")))
+            if (path!!.toFile().exists()) {
+                if (System.getProperty("config.file") == null) System.setProperty("config.file", System.getProperty("config", "config.txt"))
+                ConfigFactory.invalidateCaches()
             }
 
             // load in the config file, plus the default values
-            //Config config = ConfigFactory.parseFile(path.toFile()).withFallback(ConfigFactory.load());
-            Config config = ConfigFactory.load();
-
-
-            token = config.getString("token");
-            prefix = config.getString("prefix");
-            altprefix = config.getString("altprefix");
-            owner = (config.getAnyRef("owner") instanceof String ? 0L : config.getLong("owner"));
-            game = OtherUtil.parseGame(config.getString("game"));
-            status = OtherUtil.parseStatus(config.getString("status"));
-            updatealerts = config.getBoolean("updatealerts");
-            dictionary = config.getString("dictionary");
-            voiceDirectory = config.getString("voiceDirectory");
-            aloneTimeUntilStop = config.getLong("alonetimeuntilstop");
-            maxMessageCount = config.getInt("maxmessagecount");
-            winjtalkdir = config.getString("winjtalkdir");
-            helpToDm = config.getBoolean("helptodm");
-            dbots = owner == 334091398263341056L;
-
-
-            boolean write = false;
+            //Config = ConfigFactory.parseFile(path.toFile()).withFallback(ConfigFactory.load());
+            val config = ConfigFactory.load()
+            token = config.getString("token")
+            prefix = config.getString("prefix")
+            altprefix = config.getString("altprefix")
+            ownerId = if (config.getAnyRef("owner") is String) 0L else config.getLong("owner")
+            game = OtherUtil.parseGame(config.getString("game"))
+            status = OtherUtil.parseStatus(config.getString("status"))
+            updatealerts = config.getBoolean("updatealerts")
+            dictionary = config.getString("dictionary")
+            voiceDirectory = config.getString("voiceDirectory")
+            aloneTimeUntilStop = config.getLong("alonetimeuntilstop")
+            maxMessageCount = config.getInt("maxmessagecount")
+            winJTalkDir = config.getString("winjtalkdir")
+            helpToDm = config.getBoolean("helptodm")
+            dBots = ownerId == 334091398263341056L
+            var write = false
 
             // validate bot token
-            if (token == null || token.isEmpty() || token.matches("(BOT_TOKEN_HERE|Botトークンをここに貼り付け)")) {
-                token = prompt.prompt("BOTトークンを入力してください。"
-                        + "\nBOTトークン: ");
-                if (token == null) {
-                    prompt.alert(Prompt.Level.WARNING, CONTEXT, "トークンが入力されていません！終了します。\n\n設定ファイルの場所: " + path.toAbsolutePath().toString());
-                    return;
+            if (token == null || token!!.isEmpty() || token!!.matches("(BOT_TOKEN_HERE|Botトークンをここに貼り付け)".toRegex())) {
+                token = prompt.prompt("""
+    BOTトークンを入力してください。
+    BOTトークン: 
+    """.trimIndent())
+                write = if (token == null) {
+                    prompt.alert(Prompt.Level.WARNING, CONTEXT, """
+     トークンが入力されていません！終了します。
+     
+     設定ファイルの場所: ${path!!.toAbsolutePath()}
+     """.trimIndent())
+                    return
                 } else {
-                    write = true;
+                    true
                 }
             }
 
             // validate bot owner
-            if (owner <= 0) {
-                try {
-                    owner = Long.parseLong(prompt.prompt("所有者のユーザーIDが設定されていない、または有効なIDではありません。"
-                            + "\nBOTの所有者のユーザーIDを入力してください。"
-                            + "\n所有者のユーザーID: "));
-                } catch (NumberFormatException | NullPointerException ex) {
-                    owner = 0;
+            if (ownerId <= 0) {
+                ownerId = try {
+                    prompt.prompt("""
+            所有者のユーザーIDが設定されていない、または有効なIDではありません。
+            BOTの所有者のユーザーIDを入力してください。
+            所有者のユーザーID: 
+            """.trimIndent())!!.toLong()
+                } catch (ex: NumberFormatException) {
+                    0
+                } catch (ex: NullPointerException) {
+                    0
                 }
-                if (owner <= 0) {
-                    prompt.alert(Prompt.Level.ERROR, CONTEXT, "無効なユーザーIDです！終了します。\n\n設定ファイルの場所: " + path.toAbsolutePath().toString());
-                    System.exit(0);
+                if (ownerId <= 0) {
+                    prompt.alert(Prompt.Level.ERROR, CONTEXT, """
+     無効なユーザーIDです！終了します。
+     
+     設定ファイルの場所: ${path!!.toAbsolutePath()}
+     """.trimIndent())
+                    exitProcess(0)
                 } else {
-                    write = true;
+                    write = true
                 }
             }
-
             if (write) {
-                String original = OtherUtil.loadResource(this, "/reference.conf");
-                String mod;
-                if (original == null) {
-                    mod = ("token = " + token + "\r\nowner = " + owner);
-                } else {
-                    mod = original.substring(original.indexOf(START_TOKEN) + START_TOKEN.length(), original.indexOf(END_TOKEN))
-                            .replace("BOT_TOKEN_HERE", token).replace("Botトークンをここに貼り付け", token)
-                            .replace("0 // OWNER ID", Long.toString(owner)).replace("所有者IDをここに貼り付け", Long.toString(owner))
-                            .trim();
-                }
-
-                FileUtils.writeStringToFile(path.toFile(), mod, StandardCharsets.UTF_8);
+                val original = OtherUtil.loadResource(this, "/reference.conf")
+                val mod: String = original?.substring(original.indexOf(START_TOKEN) + START_TOKEN.length, original.indexOf(END_TOKEN))?.replace("BOT_TOKEN_HERE", token!!)?.replace("Botトークンをここに貼り付け", token!!)?.replace("0 // OWNER ID", ownerId.toString())?.replace("所有者IDをここに貼り付け", ownerId.toString())?.trim { it <= ' ' }
+                        ?: """
+     token = $token
+     owner = $ownerId
+     """.trimIndent()
+                FileUtils.writeStringToFile(path!!.toFile(), mod, StandardCharsets.UTF_8)
             }
 
             // if we get through the whole config, it's good to go
-            valid = true;
-        } catch (ConfigException |
-                 IOException ex) {
-            prompt.alert(Prompt.Level.ERROR, CONTEXT, ex + ": " + ex.getMessage() + "\n\n設定ファイルの場所: " + path.toAbsolutePath().toString());
+            isValid = true
+        } catch (ex: ConfigException) {
+            prompt.alert(Prompt.Level.ERROR, CONTEXT, """
+     $ex: ${ex.message}
+     
+     設定ファイルの場所: ${path!!.toAbsolutePath()}
+     """.trimIndent())
+        } catch (ex: IOException) {
+            prompt.alert(Prompt.Level.ERROR, CONTEXT, """
+     $ex: ${ex.message}
+     
+     設定ファイルの場所: ${path!!.toAbsolutePath()}
+     """.trimIndent())
         }
     }
 
-    public boolean isValid() {
-        return valid;
-    }
-
-    public String getConfigLocation() {
-        return path.toFile().getAbsolutePath();
-    }
-
-    public String getPrefix() {
-        return prefix;
-    }
-
-    public String getAltPrefix() {
-        return "NONE".equalsIgnoreCase(altprefix) ? null : altprefix;
-    }
-
-    public String getToken() {
-        return token;
-    }
-
-    public long getOwnerId() {
-        return owner;
-    }
-
-    public Activity getGame() {
-        return game;
-    }
-
-    public boolean getHelpToDm() {
-        return helpToDm;
-    }
-
-    public OnlineStatus getStatus() {
-        return status;
-    }
-
-    public boolean useUpdateAlerts() {
-        return updatealerts;
-    }
-
-    public String getDictionary() {
-        return dictionary;
-    }
-
-    public String getVoiceDirectory() {
-        return voiceDirectory;
-    }
-
-    public String getWinJTalkDir() {
-        return winjtalkdir;
-    }
-
-    public long getAloneTimeUntilStop() {
-        return aloneTimeUntilStop;
-    }
+    val configLocation: String
+        get() = path!!.toFile().absolutePath
+    val altPrefix: String?
+        get() = if ("NONE".equals(altprefix, ignoreCase = true)) null else altprefix
 
-    public int getMaxMessageCount() {
-        return maxMessageCount;
+    fun useUpdateAlerts(): Boolean {
+        return updatealerts
     }
 
-    public boolean getDBots() {
-        return dbots;
+    companion object {
+        private const val CONTEXT = "Config"
+        private const val START_TOKEN = "/// START OF YOMIAGEBOT CONFIG ///"
+        private const val END_TOKEN = "/// END OF YOMIAGEBOT CONFIG ///"
     }
-}
+}
\ No newline at end of file
diff --git a/src/main/java/dev/cosgy/textToSpeak/Listener.kt b/src/main/java/dev/cosgy/textToSpeak/Listener.kt
index e4511af..e03c7e7 100644
--- a/src/main/java/dev/cosgy/textToSpeak/Listener.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/Listener.kt
@@ -13,155 +13,117 @@
 //     See the License for the specific language governing permissions and               /
 //     limitations under the License.                                                    /
 //////////////////////////////////////////////////////////////////////////////////////////
-
-package dev.cosgy.TextToSpeak;
-
-import com.sedmelluq.discord.lavaplayer.player.AudioLoadResultHandler;
-import com.sedmelluq.discord.lavaplayer.tools.FriendlyException;
-import com.sedmelluq.discord.lavaplayer.track.AudioPlaylist;
-import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
-import dev.cosgy.TextToSpeak.audio.AudioHandler;
-import dev.cosgy.TextToSpeak.audio.QueuedTrack;
-import dev.cosgy.TextToSpeak.settings.Settings;
-import dev.cosgy.TextToSpeak.utils.OtherUtil;
-import net.dv8tion.jda.api.entities.Member;
-import net.dv8tion.jda.api.entities.Message;
-import net.dv8tion.jda.api.entities.User;
-import net.dv8tion.jda.api.events.guild.voice.GuildVoiceUpdateEvent;
-import net.dv8tion.jda.api.events.session.ReadyEvent;
-import net.dv8tion.jda.api.events.session.ShutdownEvent;
-import net.dv8tion.jda.api.hooks.ListenerAdapter;
-import org.jetbrains.annotations.NotNull;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.IOException;
-import java.util.Objects;
-import java.util.concurrent.TimeUnit;
-
-import static org.slf4j.LoggerFactory.getLogger;
-
-public class Listener extends ListenerAdapter {
-    private final Bot bot;
-    Logger log = getLogger(this.getClass());
-
-    public Listener(Bot bot) {
-        this.bot = bot;
-    }
-
-    @Override
-    public void onReady(ReadyEvent event) {
-        if (event.getJDA().getGuilds().isEmpty()) {
-            Logger log = LoggerFactory.getLogger("TTSBot");
-            log.warn("このボットはグループに入っていません！ボットをあなたのグループに追加するには、以下のリンクを使用してください。");
-            log.warn(event.getJDA().getInviteUrl(TextToSpeak.RECOMMENDED_PERMS));
+package dev.cosgy.textToSpeak
+
+import com.sedmelluq.discord.lavaplayer.player.AudioLoadResultHandler
+import com.sedmelluq.discord.lavaplayer.tools.FriendlyException
+import com.sedmelluq.discord.lavaplayer.track.AudioPlaylist
+import com.sedmelluq.discord.lavaplayer.track.AudioTrack
+import dev.cosgy.textToSpeak.audio.AudioHandler
+import dev.cosgy.textToSpeak.audio.QueuedTrack
+import dev.cosgy.textToSpeak.utils.OtherUtil
+import net.dv8tion.jda.api.entities.Message
+import net.dv8tion.jda.api.entities.channel.concrete.PrivateChannel
+import net.dv8tion.jda.api.events.guild.voice.GuildVoiceUpdateEvent
+import net.dv8tion.jda.api.events.session.ReadyEvent
+import net.dv8tion.jda.api.events.session.ShutdownEvent
+import net.dv8tion.jda.api.hooks.ListenerAdapter
+import org.slf4j.Logger
+import org.slf4j.LoggerFactory
+import java.io.IOException
+import java.util.*
+import java.util.concurrent.TimeUnit
+import java.util.function.Consumer
+
+class Listener(private val bot: Bot) : ListenerAdapter() {
+    var log: Logger = LoggerFactory.getLogger(this.javaClass)
+    override fun onReady(event: ReadyEvent) {
+        if (event.jda.guilds.isEmpty()) {
+            val log = LoggerFactory.getLogger("TTSBot")
+            log.warn("このボットはグループに入っていません！ボットをあなたのグループに追加するには、以下のリンクを使用してください。")
+            log.warn(event.jda.getInviteUrl(*TextToSpeak.RECOMMENDED_PERMS))
         }
-        if (bot.getConfig().useUpdateAlerts()) {
-            bot.getThreadpool().scheduleWithFixedDelay(() ->
-            {
-                User owner = bot.getJDA().getUserById(bot.getConfig().getOwnerId());
+        if (bot.config.useUpdateAlerts()) {
+            bot.threadpool.scheduleWithFixedDelay({
+                val owner = bot.jda?.getUserById(bot.config.ownerId)
                 if (owner != null) {
-                    String currentVersion = OtherUtil.getCurrentVersion();
-                    String latestVersion = OtherUtil.getLatestVersion();
-                    if (latestVersion != null && !currentVersion.equalsIgnoreCase(latestVersion) && TextToSpeak.CHECK_UPDATE) {
-                        String msg = String.format(OtherUtil.NEW_VERSION_AVAILABLE, currentVersion, latestVersion);
-                        owner.openPrivateChannel().queue(pc -> pc.sendMessage(msg).queue());
+                    val currentVersion = OtherUtil.currentVersion
+                    val latestVersion = OtherUtil.latestVersion
+                    if (latestVersion != null && !currentVersion.equals(latestVersion, ignoreCase = true) && TextToSpeak.CHECK_UPDATE) {
+                        val msg = String.format(OtherUtil.NEW_VERSION_AVAILABLE, currentVersion, latestVersion)
+                        owner.openPrivateChannel().queue { pc: PrivateChannel -> pc.sendMessage(msg).queue() }
                     }
                 }
-            }, 0, 24, TimeUnit.HOURS);
+            }, 0, 24, TimeUnit.HOURS)
         }
     }
 
-    @Override
-    public void onGuildVoiceUpdate(@NotNull GuildVoiceUpdateEvent event) {
-        Member botMember = event.getGuild().getSelfMember();
-
-        Settings settings = bot.getSettingsManager().getSettings(event.getGuild());
-
-        if (event.getChannelLeft() != null) {
-            if (settings.isJoinAndLeaveRead() && Objects.requireNonNull(event.getGuild().getSelfMember().getVoiceState()).getChannel() == event.getChannelLeft() && event.getChannelLeft().getMembers().size() > 1) {
-                String file;
-                try {
-                    file = bot.getVoiceCreation().createVoice(event.getGuild(), event.getMember().getUser(), event.getMember().getUser().getName() + "がボイスチャンネルから退出しました。");
-                } catch (IOException | InterruptedException e) {
-                    throw new RuntimeException(e);
+    override fun onGuildVoiceUpdate(event: GuildVoiceUpdateEvent) {
+        val botMember = event.guild.selfMember
+        val settings = bot.settingsManager.getSettings(event.guild)
+        if (event.channelLeft != null) {
+            if (settings!!.isJoinAndLeaveRead() && Objects.requireNonNull(event.guild.selfMember.voiceState)?.channel === event.channelLeft && event.channelLeft!!.members.size > 1) {
+                val file: String? = try {
+                    bot.voiceCreation.createVoice(event.guild, event.member.user, event.member.user.name + "がボイスチャンネルから退出しました。")
+                } catch (e: IOException) {
+                    throw RuntimeException(e)
+                } catch (e: InterruptedException) {
+                    throw RuntimeException(e)
                 }
-                bot.getPlayerManager().loadItemOrdered(event.getGuild(), file, new ResultHandler(null, event));
+                bot.playerManager.loadItemOrdered(event.guild, file, ResultHandler(null, event))
             }
-
-            if (event.getChannelLeft().getMembers().size() == 1 && event.getChannelLeft().getMembers().contains(botMember)) {
-                AudioHandler handler = (AudioHandler) event.getGuild().getAudioManager().getSendingHandler();
-                handler.getQueue().clear();
+            if (event.channelLeft!!.members.size == 1 && event.channelLeft!!.members.contains(botMember)) {
+                val handler = event.guild.audioManager.sendingHandler as AudioHandler?
+                handler!!.queue.clear()
                 try {
-                    bot.getVoiceCreation().clearGuildFolder(event.getGuild());
-                } catch (IOException e) {
-                    throw new RuntimeException(e);
+                    bot.voiceCreation.clearGuildFolder(event.guild)
+                } catch (e: IOException) {
+                    throw RuntimeException(e)
                 }
             }
         }
-
-        if (event.getChannelJoined() != null) {
-            if (settings.isJoinAndLeaveRead() && Objects.requireNonNull(event.getGuild().getSelfMember().getVoiceState()).getChannel() == event.getChannelJoined()) {
-                String file;
-                try {
-                    file = bot.getVoiceCreation().createVoice(event.getGuild(), event.getMember().getUser(), event.getMember().getUser().getName() + "がボイスチャンネルに参加しました。");
-                } catch (IOException | InterruptedException e) {
-                    throw new RuntimeException(e);
+        if (event.channelJoined != null) {
+            if (settings!!.isJoinAndLeaveRead() && Objects.requireNonNull(event.guild.selfMember.voiceState)?.channel === event.channelJoined) {
+                val file: String? = try {
+                    bot.voiceCreation.createVoice(event.guild, event.member.user, event.member.user.name + "がボイスチャンネルに参加しました。")
+                } catch (e: IOException) {
+                    throw RuntimeException(e)
+                } catch (e: InterruptedException) {
+                    throw RuntimeException(e)
                 }
-                bot.getPlayerManager().loadItemOrdered(event.getGuild(), file, new ResultHandler(null, event));
+                bot.playerManager.loadItemOrdered(event.guild, file, ResultHandler(null, event))
             }
         }
     }
 
-    @Override
-    public void onShutdown(@NotNull ShutdownEvent event) {
-        bot.shutdown();
+    override fun onShutdown(event: ShutdownEvent) {
+        bot.shutdown()
     }
 
-
-    private class ResultHandler implements AudioLoadResultHandler {
-        private final Message m;
-        private final GuildVoiceUpdateEvent event;
-
-        private ResultHandler(Message m, GuildVoiceUpdateEvent event) {
-            this.m = m;
-            this.event = event;
+    private inner class ResultHandler(private val m: Message?, private val event: GuildVoiceUpdateEvent) : AudioLoadResultHandler {
+        private fun loadSingle(track: AudioTrack) {
+            val handler = event.guild.audioManager.sendingHandler as AudioHandler?
+            handler!!.addTrack(QueuedTrack(track, event.member.user))
         }
 
-        private void loadSingle(AudioTrack track, AudioPlaylist playlist) {
-            AudioHandler handler = (AudioHandler) event.getGuild().getAudioManager().getSendingHandler();
-            handler.addTrack(new QueuedTrack(track, event.getMember().getUser()));
-        }
-
-        private int loadPlaylist(AudioPlaylist playlist, AudioTrack exclude) {
-            int[] count = {0};
-            playlist.getTracks().forEach((track) -> {
-                if (!track.equals(exclude)) {
-                    AudioHandler handler = (AudioHandler) event.getGuild().getAudioManager().getSendingHandler();
-                    handler.addTrack(new QueuedTrack(track, event.getMember().getUser()));
-                    count[0]++;
+        private fun loadPlaylist(playlist: AudioPlaylist, exclude: AudioTrack): Int {
+            val count = intArrayOf(0)
+            playlist.tracks.forEach(Consumer { track: AudioTrack ->
+                if (track != exclude) {
+                    val handler = event.guild.audioManager.sendingHandler as AudioHandler?
+                    handler!!.addTrack(QueuedTrack(track, event.member.user))
+                    count[0]++
                 }
-            });
-            return count[0];
-        }
-
-        @Override
-        public void trackLoaded(AudioTrack track) {
-            loadSingle(track, null);
-        }
-
-        @Override
-        public void playlistLoaded(AudioPlaylist playlist) {
-
+            })
+            return count[0]
         }
 
-        @Override
-        public void noMatches() {
+        override fun trackLoaded(track: AudioTrack) {
+            loadSingle(track)
         }
 
-        @Override
-        public void loadFailed(FriendlyException throwable) {
-
-        }
+        override fun playlistLoaded(playlist: AudioPlaylist) {}
+        override fun noMatches() {}
+        override fun loadFailed(throwable: FriendlyException) {}
     }
 }
\ No newline at end of file
diff --git a/src/main/java/dev/cosgy/textToSpeak/TextToSpeak.kt b/src/main/java/dev/cosgy/textToSpeak/TextToSpeak.kt
index 04c09a3..a62b899 100644
--- a/src/main/java/dev/cosgy/textToSpeak/TextToSpeak.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/TextToSpeak.kt
@@ -13,184 +13,162 @@
 //     See the License for the specific language governing permissions and               /
 //     limitations under the License.                                                    /
 //////////////////////////////////////////////////////////////////////////////////////////
-
-package dev.cosgy.TextToSpeak;
-
-import com.github.lalyos.jfiglet.FigletFont;
-import com.jagrosh.jdautilities.command.CommandClientBuilder;
-import com.jagrosh.jdautilities.command.SlashCommand;
-import com.jagrosh.jdautilities.commons.waiter.EventWaiter;
-import dev.cosgy.TextToSpeak.commands.admin.GuildSettings;
-import dev.cosgy.TextToSpeak.commands.admin.JLReadCmd;
-import dev.cosgy.TextToSpeak.commands.admin.SetReadNameCmd;
-import dev.cosgy.TextToSpeak.commands.admin.SettcCmd;
-import dev.cosgy.TextToSpeak.commands.dictionary.AddWordCmd;
-import dev.cosgy.TextToSpeak.commands.dictionary.DlWordCmd;
-import dev.cosgy.TextToSpeak.commands.dictionary.WordListCmd;
-import dev.cosgy.TextToSpeak.commands.general.*;
-import dev.cosgy.TextToSpeak.commands.owner.ShutdownCmd;
-import dev.cosgy.TextToSpeak.entities.Prompt;
-import dev.cosgy.TextToSpeak.gui.GUI;
-import dev.cosgy.TextToSpeak.listeners.CommandAudit;
-import dev.cosgy.TextToSpeak.listeners.MessageListener;
-import dev.cosgy.TextToSpeak.settings.SettingsManager;
-import dev.cosgy.TextToSpeak.utils.OtherUtil;
-import net.dv8tion.jda.api.JDA;
-import net.dv8tion.jda.api.JDABuilder;
-import net.dv8tion.jda.api.OnlineStatus;
-import net.dv8tion.jda.api.Permission;
-import net.dv8tion.jda.api.entities.Activity;
-import net.dv8tion.jda.api.requests.GatewayIntent;
-import net.dv8tion.jda.api.utils.cache.CacheFlag;
-import org.slf4j.Logger;
-
-import java.awt.*;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import static org.slf4j.LoggerFactory.getLogger;
-
-public class TextToSpeak {
-    public final static Permission[] RECOMMENDED_PERMS = {Permission.VIEW_CHANNEL, Permission.MESSAGE_SEND, Permission.MESSAGE_HISTORY, Permission.MESSAGE_ADD_REACTION,
+package dev.cosgy.textToSpeak
+
+import com.github.lalyos.jfiglet.FigletFont
+import com.jagrosh.jdautilities.command.CommandClientBuilder
+import com.jagrosh.jdautilities.command.SlashCommand
+import com.jagrosh.jdautilities.commons.waiter.EventWaiter
+import dev.cosgy.textToSpeak.commands.admin.GuildSettings
+import dev.cosgy.textToSpeak.commands.admin.JLReadCmd
+import dev.cosgy.textToSpeak.commands.admin.SetReadNameCmd
+import dev.cosgy.textToSpeak.commands.admin.SettcCmd
+import dev.cosgy.textToSpeak.commands.dictionary.AddWordCmd
+import dev.cosgy.textToSpeak.commands.dictionary.DlWordCmd
+import dev.cosgy.textToSpeak.commands.dictionary.WordListCmd
+import dev.cosgy.textToSpeak.commands.general.*
+import dev.cosgy.textToSpeak.commands.owner.ShutdownCmd
+import dev.cosgy.textToSpeak.entities.Prompt
+import dev.cosgy.textToSpeak.gui.GUI
+import dev.cosgy.textToSpeak.listeners.CommandAudit
+import dev.cosgy.textToSpeak.listeners.MessageListener
+import dev.cosgy.textToSpeak.settings.SettingsManager
+import dev.cosgy.textToSpeak.utils.OtherUtil
+import net.dv8tion.jda.api.*
+import net.dv8tion.jda.api.entities.Activity
+import net.dv8tion.jda.api.requests.GatewayIntent
+import net.dv8tion.jda.api.utils.cache.CacheFlag
+import org.slf4j.LoggerFactory
+import java.awt.Color
+import java.io.IOException
+import java.util.*
+import kotlin.system.exitProcess
+
+object TextToSpeak {
+    val RECOMMENDED_PERMS = arrayOf(Permission.VIEW_CHANNEL, Permission.MESSAGE_SEND, Permission.MESSAGE_HISTORY, Permission.MESSAGE_ADD_REACTION,
             Permission.MESSAGE_EMBED_LINKS, Permission.MESSAGE_ATTACH_FILES, Permission.MESSAGE_MANAGE, Permission.MESSAGE_EXT_EMOJI, Permission.USE_APPLICATION_COMMANDS,
-            Permission.MANAGE_CHANNEL, Permission.VOICE_CONNECT, Permission.VOICE_SPEAK, Permission.NICKNAME_CHANGE};
-    public final static GatewayIntent[] INTENTS = {GatewayIntent.DIRECT_MESSAGES, GatewayIntent.GUILD_MESSAGES, GatewayIntent.GUILD_MESSAGE_REACTIONS, GatewayIntent.GUILD_VOICE_STATES, GatewayIntent.MESSAGE_CONTENT};
-    public static boolean CHECK_UPDATE = true;
-    public static boolean COMMAND_AUDIT_ENABLED = false;
+            Permission.MANAGE_CHANNEL, Permission.VOICE_CONNECT, Permission.VOICE_SPEAK, Permission.NICKNAME_CHANGE)
+    private val INTENTS = arrayOf(GatewayIntent.DIRECT_MESSAGES, GatewayIntent.GUILD_MESSAGES, GatewayIntent.GUILD_MESSAGE_REACTIONS, GatewayIntent.GUILD_VOICE_STATES, GatewayIntent.MESSAGE_CONTENT)
+    var CHECK_UPDATE = true
+    var COMMAND_AUDIT_ENABLED = false
 
     /**
      * @param args コマンドライン引数
      */
-    public static void main(String[] args) {
-        Logger log = getLogger("立ち上げ");
+    @JvmStatic
+    fun main(args: Array<String>) {
+        val log = LoggerFactory.getLogger("Startup")
         try {
-            System.out.println(FigletFont.convertOneLine("Yomiage Bot v" + OtherUtil.getCurrentVersion()) + "\n" + "by Cosgy Dev");
-        } catch (IOException ignored) {
+            println("""
+    ${FigletFont.convertOneLine("TextToSpeak Bot v" + OtherUtil.currentVersion)}
+    by Cosgy Dev
+    """.trimIndent())
+        } catch (ignored: IOException) {
         }
-
-        Prompt prompt = new Prompt("TextToSpeak Bot", "noguiモードに切り替えます。  -Dnogui=trueフラグを含めると、手動でnoguiモードで起動できます。",
-                "true".equalsIgnoreCase(System.getProperty("nogui", "false")));
+        val prompt = Prompt("TextToSpeak Bot", "noguiモードに切り替えます。  -Dnogui=trueフラグを含めると、手動でnoguiモードで起動できます。",
+                "true".equals(System.getProperty("nogui", "false"), ignoreCase = true))
 
         // check deprecated nogui mode (new way of setting it is -Dnogui=true)
-        for (String arg : args)
-            if ("-nogui".equalsIgnoreCase(arg)) {
-                prompt.alert(Prompt.Level.WARNING, "GUI", "-noguiフラグは廃止予定です。 "
-                        + "jarの名前の前に-Dnogui = trueフラグを使用してください。 例：java -jar -Dnogui=true JMusicBot.jar");
-            } else if ("-nocheckupdates".equalsIgnoreCase(arg)) {
-                CHECK_UPDATE = false;
-                log.info("アップデートチェックを無効にしました");
-            } else if ("-auditcommands".equalsIgnoreCase(arg)) {
-                COMMAND_AUDIT_ENABLED = true;
-                log.info("実行されたコマンドの記録を有効にしました。");
-            }
-
-        String version = OtherUtil.checkVersion(prompt);
-
-        if (!System.getProperty("java.vm.name").contains("64"))
-            prompt.alert(Prompt.Level.WARNING, "Java Version", "サポートされていないJavaバージョンを使用しています。64ビット版のJavaを使用してください。");
-
-        BotConfig config = new BotConfig(prompt);
-        config.load();
-        if (!config.isValid())
-            return;
-
-        EventWaiter waiter = new EventWaiter();
-        SettingsManager settings = new SettingsManager();
-        Bot bot = new Bot(waiter, config, settings);
-        Bot.INSTANCE = bot;
-
-        AboutCommand aboutCommand = new AboutCommand(Color.BLUE.brighter(),
+        for (arg in args) if ("-nogui".equals(arg, ignoreCase = true)) {
+            prompt.alert(Prompt.Level.WARNING, "GUI", "-noguiフラグは廃止予定です。 "
+                    + "jarの名前の前に-Dnogui = trueフラグを使用してください。 例：java -jar -Dnogui=true JMusicBot.jar")
+        } else if ("-nocheckupdates".equals(arg, ignoreCase = true)) {
+            CHECK_UPDATE = false
+            log.info("アップデートチェックを無効にしました")
+        } else if ("-auditcommands".equals(arg, ignoreCase = true)) {
+            COMMAND_AUDIT_ENABLED = true
+            log.info("実行されたコマンドの記録を有効にしました。")
+        }
+        val version = OtherUtil.checkVersion(prompt)
+        if (!System.getProperty("java.vm.name").contains("64")) prompt.alert(Prompt.Level.WARNING, "Java Version", "サポートされていないJavaバージョンを使用しています。64ビット版のJavaを使用してください。")
+        val config = BotConfig(prompt)
+        config.load()
+        if (!config.isValid) return
+        val waiter = EventWaiter()
+        val settings = SettingsManager()
+        val bot = Bot(waiter, config, settings)
+        Bot.INSTANCE = bot
+        val aboutCommand = AboutCommand(Color.BLUE.brighter(),
                 bot.GetLang().getString("appName") + "(v" + version + ")",
-                RECOMMENDED_PERMS);
-        aboutCommand.setIsAuthor(false);
-        aboutCommand.setReplacementCharacter("🎶");
-
-
-        CommandClientBuilder cb = new CommandClientBuilder()
-                .setPrefix(config.getPrefix())
-                .setAlternativePrefix(config.getAltPrefix())
-                .setOwnerId(Long.toString(config.getOwnerId()))
-                //.setEmojis(config.getSuccess(), config.getWarning(), config.getError())
+                *RECOMMENDED_PERMS)
+        aboutCommand.setIsAuthor(false)
+        aboutCommand.setReplacementCharacter("🎶")
+        val cb = CommandClientBuilder()
+                .setPrefix(config.prefix)
+                .setAlternativePrefix(config.altPrefix)
+                .setOwnerId(config.ownerId.toString()) //.setEmojis(config.getSuccess(), config.getWarning(), config.getError())
                 .setHelpWord("help")
                 .setLinkedCacheSize(200)
                 .setGuildSettingsManager(settings)
-                .setListener(new CommandAudit());
-
-        List<SlashCommand> slashCommandList = new ArrayList<>() {{
-            add(aboutCommand);
-            add(new HelpCmd(bot));
-            add(new JoinCmd(bot));
-            add(new ByeCmd(bot));
-            add(new SettingsCmd(bot));
-            add(new SetVoiceCmd(bot));
-            add(new SetSpeedCmd(bot));
-            add(new SetIntonationCmd(bot));
-            add(new SetVoiceQualityA(bot));
-            add(new SetVoiceQualityFm(bot));
-            add(new AddWordCmd(bot));
-            add(new WordListCmd(bot));
-            add(new DlWordCmd(bot));
-            add(new SettcCmd(bot));
-            add(new SetReadNameCmd(bot));
-            add(new JLReadCmd(bot));
-            add(new GuildSettings(bot));
-            add(new ShutdownCmd(bot));
-        }};
-        cb.addSlashCommands(slashCommandList.toArray(new SlashCommand[0]));
-        cb.addCommands(slashCommandList.toArray(new SlashCommand[0]));
-
-        boolean nogame = false;
-        if (config.getStatus() != OnlineStatus.UNKNOWN)
-            cb.setStatus(config.getStatus());
-        if (config.getGame() == null)
-            cb.setActivity(Activity.playing("/helpでヘルプを確認"));
-        else if (config.getGame().getName().toLowerCase().matches("(none|なし)")) {
-            cb.setActivity(null);
-            nogame = true;
-        } else
-            cb.setActivity(config.getGame());
-
-        if (!prompt.isNoGUI()) {
+                .setListener(CommandAudit())
+        val slashCommandList: ArrayList<SlashCommand?> = object : ArrayList<SlashCommand?>() {
+            init {
+                add(aboutCommand)
+                add(HelpCmd(bot))
+                add(JoinCmd(bot))
+                add(ByeCmd(bot))
+                add(SettingsCmd(bot))
+                add(SetVoiceCmd(bot))
+                add(SetSpeedCmd(bot))
+                add(SetIntonationCmd(bot))
+                add(SetVoiceQualityA(bot))
+                add(SetVoiceQualityFm(bot))
+                add(AddWordCmd(bot))
+                add(WordListCmd(bot))
+                add(DlWordCmd(bot))
+                add(SettcCmd(bot))
+                add(SetReadNameCmd(bot))
+                add(JLReadCmd(bot))
+                add(GuildSettings(bot))
+                add(ShutdownCmd(bot))
+            }
+        }
+        cb.addSlashCommands(*slashCommandList.toTypedArray())
+        cb.addCommands(*slashCommandList.toTypedArray())
+        var nogame = false
+        if (config.status != OnlineStatus.UNKNOWN) cb.setStatus(config.status)
+        if (config.game == null) cb.setActivity(Activity.playing("/helpでヘルプを確認")) else if (config.game!!.name.lowercase(Locale.getDefault()).matches("(none|なし)".toRegex())) {
+            cb.setActivity(null)
+            nogame = true
+        } else cb.setActivity(config.game)
+        if (!prompt.isNoGUI) {
             try {
-                GUI gui = new GUI(bot);
-                bot.setGUI(gui);
-                gui.init();
-            } catch (Exception e) {
-                log.error("GUIを開くことができませんでした。次の要因が考えられます:\n"
-                        + "サーバー上で実行している\n"
-                        + "画面がない環境下で実行している\n"
-                        + "このエラーを非表示にするには、 -Dnogui=true フラグを使用してGUIなしモードで実行してください。");
+                val gui = GUI(bot)
+                bot.setGUI(gui)
+                gui.init()
+            } catch (e: Exception) {
+                log.error("""
+    GUIを開くことができませんでした。次の要因が考えられます:
+    サーバー上で実行している
+    画面がない環境下で実行している
+    このエラーを非表示にするには、 -Dnogui=true フラグを使用してGUIなしモードで実行してください。
+    """.trimIndent())
             }
         }
-
-        log.info(config.getConfigLocation() + " から設定を読み込みました");
-
+        log.info(config.configLocation + " から設定を読み込みました")
         try {
-            JDA jda = JDABuilder.create(config.getToken(), Arrays.asList(INTENTS))
+            val jda = JDABuilder.create(config.token, listOf(*INTENTS))
                     .enableCache(CacheFlag.MEMBER_OVERRIDES, CacheFlag.VOICE_STATE)
                     .disableCache(CacheFlag.ACTIVITY, CacheFlag.CLIENT_STATUS, CacheFlag.EMOJI, CacheFlag.ONLINE_STATUS, CacheFlag.STICKER)
-                    .setActivity(nogame ? null : Activity.playing("準備中..."))
-                    .setStatus(config.getStatus() == OnlineStatus.INVISIBLE || config.getStatus() == OnlineStatus.OFFLINE
-                            ? OnlineStatus.INVISIBLE : OnlineStatus.DO_NOT_DISTURB)
-                    .addEventListeners(cb.build(), waiter, new Listener(bot), new MessageListener(bot))
+                    .setActivity(if (nogame) null else Activity.playing("準備中..."))
+                    .setStatus(if (config.status == OnlineStatus.INVISIBLE || config.status == OnlineStatus.OFFLINE) OnlineStatus.INVISIBLE else OnlineStatus.DO_NOT_DISTURB)
+                    .addEventListeners(cb.build(), waiter, Listener(bot), MessageListener(bot))
                     .setBulkDeleteSplittingEnabled(true)
-                    .build();
-
-            bot.setJDA(jda);
+                    .build()
+            bot.jda = jda
         } /*catch (LoginException ex) {
 prompt.alert(Prompt.Level.ERROR, bot.GetLang().getString("appName"), ex + "\n" +
 "正しい設定ファイルを編集していることを確認してください。Botトークンでのログインに失敗しました。" +
 "正しいBotトークンを入力してください。(CLIENT SECRET ではありません!)\n" +
 "設定ファイルの場所: " + config.getConfigLocation());
 System.exit(1);
-}*/ catch (IllegalArgumentException ex) {
-            prompt.alert(Prompt.Level.ERROR, bot.GetLang().getString("appName"), "設定の一部が無効です:" + ex + "\n" +
-                    "設定ファイルの場所: " + config.getConfigLocation());
-            System.exit(1);
+}*/ catch (ex: IllegalArgumentException) {
+            prompt.alert(Prompt.Level.ERROR, bot.GetLang().getString("appName"), """
+     設定の一部が無効です:$ex
+     設定ファイルの場所: ${config.configLocation}
+     """.trimIndent())
+            exitProcess(1)
         }
-
-        Runtime.getRuntime().addShutdownHook(new Thread(bot::shutdown));
+        Runtime.getRuntime().addShutdownHook(Thread { bot.shutdown() })
     }
 }
\ No newline at end of file
diff --git a/src/main/java/dev/cosgy/textToSpeak/audio/AloneInVoiceHandler.kt b/src/main/java/dev/cosgy/textToSpeak/audio/AloneInVoiceHandler.kt
index 0abdcc4..c9d87cc 100644
--- a/src/main/java/dev/cosgy/textToSpeak/audio/AloneInVoiceHandler.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/audio/AloneInVoiceHandler.kt
@@ -13,75 +13,54 @@
 //     See the License for the specific language governing permissions and               /
 //     limitations under the License.                                                    /
 //////////////////////////////////////////////////////////////////////////////////////////
-
-package dev.cosgy.TextToSpeak.audio;
-
-import dev.cosgy.TextToSpeak.Bot;
-import net.dv8tion.jda.api.entities.Guild;
-import net.dv8tion.jda.api.events.guild.voice.GuildVoiceUpdateEvent;
-
-import java.time.Instant;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
-
-public class AloneInVoiceHandler {
-    private final Bot bot;
-    private final HashMap<Long, Instant> aloneSince = new HashMap<>();
-    private long aloneTimeUntilStop = 0;
-
-    public AloneInVoiceHandler(Bot bot) {
-        this.bot = bot;
-    }
-
-    public void init() {
-        aloneTimeUntilStop = bot.getConfig().getAloneTimeUntilStop();
-        if (aloneTimeUntilStop > 0)
-            bot.getThreadpool().scheduleWithFixedDelay(this::check, 0, 5, TimeUnit.SECONDS);
+package dev.cosgy.textToSpeak.audio
+
+import dev.cosgy.textToSpeak.Bot
+import net.dv8tion.jda.api.entities.Guild
+import net.dv8tion.jda.api.entities.Member
+import net.dv8tion.jda.api.events.guild.voice.GuildVoiceUpdateEvent
+import java.time.Instant
+import java.util.concurrent.TimeUnit
+import java.util.function.Consumer
+
+class AloneInVoiceHandler(private val bot: Bot) {
+    private val aloneSince = HashMap<Long, Instant>()
+    private var aloneTimeUntilStop: Long = 0
+    fun init() {
+        aloneTimeUntilStop = bot.config.aloneTimeUntilStop
+        if (aloneTimeUntilStop > 0) bot.threadpool.scheduleWithFixedDelay({ this.check() }, 0, 5, TimeUnit.SECONDS)
     }
 
-    private void check() {
-        Set<Long> toRemove = new HashSet<>();
-        for (Map.Entry<Long, Instant> entrySet : aloneSince.entrySet()) {
-            if (entrySet.getValue().getEpochSecond() > Instant.now().getEpochSecond() - aloneTimeUntilStop) continue;
-
-            Guild guild = bot.getJDA().getGuildById(entrySet.getKey());
-
+    private fun check() {
+        val toRemove: MutableSet<Long> = HashSet()
+        for ((key, value) in aloneSince) {
+            if (value.epochSecond > Instant.now().epochSecond - aloneTimeUntilStop) continue
+            val guild = bot.jda?.getGuildById(key)
             if (guild == null) {
-                toRemove.add(entrySet.getKey());
-                continue;
+                toRemove.add(key)
+                continue
             }
-
-            ((AudioHandler) guild.getAudioManager().getSendingHandler()).stopAndClear();
-            guild.getAudioManager().closeAudioConnection();
-
-            toRemove.add(entrySet.getKey());
+            (guild.audioManager.sendingHandler as AudioHandler?)!!.stopAndClear()
+            guild.audioManager.closeAudioConnection()
+            toRemove.add(key)
         }
-        toRemove.forEach(aloneSince::remove);
+        toRemove.forEach(Consumer { key: Long -> aloneSince.remove(key) })
     }
 
-    public void onVoiceUpdate(GuildVoiceUpdateEvent event) {
-        if (aloneTimeUntilStop <= 0) return;
-
-        Guild guild = event.getEntity().getGuild();
-        if (!bot.getPlayerManager().hasHandler(guild)) return;
-
-        boolean alone = isAlone(guild);
-        boolean inList = aloneSince.containsKey(guild.getIdLong());
-
-        if (!alone && inList)
-            aloneSince.remove(guild.getIdLong());
-        else if (alone && !inList)
-            aloneSince.put(guild.getIdLong(), Instant.now());
+    fun onVoiceUpdate(event: GuildVoiceUpdateEvent) {
+        if (aloneTimeUntilStop <= 0) return
+        val guild = event.entity.guild
+        if (!bot.playerManager.hasHandler(guild)) return
+        val alone = isAlone(guild)
+        val inList = aloneSince.containsKey(guild.idLong)
+        if (!alone && inList) aloneSince.remove(guild.idLong) else if (alone && !inList) aloneSince[guild.idLong] = Instant.now()
     }
 
-    private boolean isAlone(Guild guild) {
-        if (guild.getAudioManager().getConnectedChannel() == null) return false;
-        return guild.getAudioManager().getConnectedChannel().getMembers().stream()
-                .noneMatch(x ->
-                        !x.getVoiceState().isDeafened()
-                                && !x.getUser().isBot());
+    private fun isAlone(guild: Guild): Boolean {
+        return if (guild.audioManager.connectedChannel == null) false else guild.audioManager.connectedChannel!!.members.stream()
+                .noneMatch { x: Member ->
+                    (!x.voiceState!!.isDeafened
+                            && !x.user.isBot)
+                }
     }
-}
+}
\ No newline at end of file
diff --git a/src/main/java/dev/cosgy/textToSpeak/audio/AudioHandler.kt b/src/main/java/dev/cosgy/textToSpeak/audio/AudioHandler.kt
index fc3230c..13dd1ca 100644
--- a/src/main/java/dev/cosgy/textToSpeak/audio/AudioHandler.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/audio/AudioHandler.kt
@@ -13,115 +13,84 @@
 //     See the License for the specific language governing permissions and               /
 //     limitations under the License.                                                    /
 //////////////////////////////////////////////////////////////////////////////////////////
-
-package dev.cosgy.TextToSpeak.audio;
-
-import com.sedmelluq.discord.lavaplayer.player.AudioPlayer;
-import com.sedmelluq.discord.lavaplayer.player.event.AudioEventAdapter;
-import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
-import com.sedmelluq.discord.lavaplayer.track.AudioTrackEndReason;
-import com.sedmelluq.discord.lavaplayer.track.playback.AudioFrame;
-import dev.cosgy.TextToSpeak.queue.FairQueue;
-import net.dv8tion.jda.api.JDA;
-import net.dv8tion.jda.api.audio.AudioSendHandler;
-import net.dv8tion.jda.api.entities.Guild;
-
-import java.nio.ByteBuffer;
-import java.util.HashSet;
-import java.util.Set;
-
-public class AudioHandler extends AudioEventAdapter implements AudioSendHandler {
-    private final FairQueue<QueuedTrack> queue = new FairQueue<>();
-    private final Set<String> votes = new HashSet<>();
-
-    private final PlayerManager manager;
-    private final AudioPlayer audioPlayer;
-    private final long guildId;
-    private final String stringGuildId;
-
-    private AudioFrame lastFrame;
-
-    protected AudioHandler(PlayerManager manager, Guild guild, AudioPlayer player) {
-        this.manager = manager;
-        this.audioPlayer = player;
-        this.guildId = guild.getIdLong();
-        this.stringGuildId = guild.getId();
+package dev.cosgy.textToSpeak.audio
+
+import com.sedmelluq.discord.lavaplayer.player.AudioPlayer
+import com.sedmelluq.discord.lavaplayer.player.event.AudioEventAdapter
+import com.sedmelluq.discord.lavaplayer.track.AudioTrack
+import com.sedmelluq.discord.lavaplayer.track.AudioTrackEndReason
+import com.sedmelluq.discord.lavaplayer.track.playback.AudioFrame
+import dev.cosgy.textToSpeak.queue.FairQueue
+import net.dv8tion.jda.api.JDA
+import net.dv8tion.jda.api.audio.AudioSendHandler
+import net.dv8tion.jda.api.entities.Guild
+import java.nio.ByteBuffer
+
+class AudioHandler(private val manager: PlayerManager, guild: Guild, val player: AudioPlayer) : AudioEventAdapter(), AudioSendHandler {
+    val queue = FairQueue<QueuedTrack?>()
+    val votes: Set<String> = HashSet()
+    private val guildId: Long
+    private val stringGuildId: String
+    private var lastFrame: AudioFrame? = null
+
+    init {
+        guildId = guild.idLong
+        stringGuildId = guild.id
     }
 
-    public int addTrackToFront(QueuedTrack qtrack) {
-        if (audioPlayer.getPlayingTrack() == null) {
-            audioPlayer.playTrack(qtrack.getTrack());
-            return -1;
+    fun addTrackToFront(qtrack: QueuedTrack): Int {
+        return if (player.playingTrack == null) {
+            player.playTrack(qtrack.track)
+            -1
         } else {
-            queue.addAt(0, qtrack);
-            return 0;
+            queue.addAt(0, qtrack)
+            0
         }
     }
 
-    public int addTrack(QueuedTrack qtrack) {
-        if (audioPlayer.getPlayingTrack() == null) {
-            audioPlayer.playTrack(qtrack.getTrack());
-            return -1;
-        } else
-            return queue.add(qtrack);
+    fun addTrack(qtrack: QueuedTrack): Int {
+        return if (player.playingTrack == null) {
+            player.playTrack(qtrack.track)
+            -1
+        } else queue.add(qtrack)
     }
 
-    public FairQueue<QueuedTrack> getQueue() {
-        return queue;
+    fun stopAndClear() {
+        queue.clear()
+        player.stopTrack()
     }
 
-    public void stopAndClear() {
-        queue.clear();
-        audioPlayer.stopTrack();
+    fun isVoiceListening(jda: JDA): Boolean {
+        return guild(jda)!!.selfMember.voiceState!!.inAudioChannel() && player.playingTrack != null
     }
 
-    public boolean isVoiceListening(JDA jda) {
-        return guild(jda).getSelfMember().getVoiceState().inAudioChannel() && audioPlayer.getPlayingTrack() != null;
-    }
-
-    public Set<String> getVotes() {
-        return votes;
-    }
-
-    public AudioPlayer getPlayer() {
-        return audioPlayer;
-    }
-
-    public long getRequester() {
-        if (audioPlayer.getPlayingTrack() == null || audioPlayer.getPlayingTrack().getUserData(Long.class) == null)
-            return 0;
-        return audioPlayer.getPlayingTrack().getUserData(Long.class);
-    }
+    val requester: Long
+        get() = if (player.playingTrack == null || player.playingTrack.getUserData(Long::class.java) == null) 0 else player.playingTrack.getUserData(Long::class.java)
 
     // Audio Events
-    @Override
-    public void onTrackEnd(AudioPlayer player, AudioTrack track, AudioTrackEndReason endReason) {
-        if (!queue.isEmpty()) {
-            QueuedTrack qt = queue.pull();
-            player.playTrack(qt.getTrack());
+    override fun onTrackEnd(player: AudioPlayer, track: AudioTrack, endReason: AudioTrackEndReason) {
+        if (!queue.isEmpty) {
+            val qt = queue.pull()
+            player.playTrack(qt!!.track)
         }
     }
 
     // Audio Send Handler methods
-    @Override
-    public boolean canProvide() {
-        lastFrame = audioPlayer.provide();
-        return lastFrame != null;
+    override fun canProvide(): Boolean {
+        lastFrame = player.provide()
+        return lastFrame != null
     }
 
-    @Override
-    public ByteBuffer provide20MsAudio() {
-        return ByteBuffer.wrap(lastFrame.getData());
+    override fun provide20MsAudio(): ByteBuffer? {
+        return ByteBuffer.wrap(lastFrame!!.data)
     }
 
-    @Override
-    public boolean isOpus() {
-        return true;
+    override fun isOpus(): Boolean {
+        return true
     }
 
-
     // Private methods
-    private Guild guild(JDA jda) {
-        return jda.getGuildById(guildId);
+    private fun guild(jda: JDA): Guild? {
+        return jda.getGuildById(guildId)
     }
-}
+}
\ No newline at end of file
diff --git a/src/main/java/dev/cosgy/textToSpeak/audio/Dictionary.kt b/src/main/java/dev/cosgy/textToSpeak/audio/Dictionary.kt
index 12a16f1..98d4558 100644
--- a/src/main/java/dev/cosgy/textToSpeak/audio/Dictionary.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/audio/Dictionary.kt
@@ -13,61 +13,48 @@
 //     See the License for the specific language governing permissions and               /
 //     limitations under the License.                                                    /
 //////////////////////////////////////////////////////////////////////////////////////////
-
-package dev.cosgy.TextToSpeak.audio;
-
-import dev.cosgy.TextToSpeak.Bot;
-import dev.cosgy.TextToSpeak.utils.OtherUtil;
-import net.dv8tion.jda.api.entities.Guild;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.nio.file.Path;
-import java.sql.*;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Optional;
-import java.util.concurrent.ConcurrentHashMap;
-
-public class Dictionary {
-    private static Dictionary instance;
-    private final Logger logger = LoggerFactory.getLogger(this.getClass());
-    private final Bot bot;
-    private final Path path;
-    private final boolean create;
-    private final Connection connection;
-    private final ConcurrentHashMap<Long, HashMap<String, String>> guildDic;
-
-    private Dictionary(Bot bot) {
-        this.bot = bot;
-        this.guildDic = new ConcurrentHashMap<>();
-        this.path = OtherUtil.getPath("UserData.sqlite");
-        this.create = !path.toFile().exists();
-
+package dev.cosgy.textToSpeak.audio
+
+import dev.cosgy.textToSpeak.Bot
+import dev.cosgy.textToSpeak.utils.OtherUtil
+import org.slf4j.LoggerFactory
+import java.nio.file.Path
+import java.sql.Connection
+import java.sql.DriverManager
+import java.sql.SQLException
+import java.util.*
+import java.util.concurrent.ConcurrentHashMap
+import java.util.function.BiFunction
+
+class Dictionary private constructor(private val bot: Bot) {
+    private val logger = LoggerFactory.getLogger(this.javaClass)
+    private val path: Path?
+    private val create: Boolean
+    private var connection: Connection
+    private val guildDic: ConcurrentHashMap<Long, HashMap<String?, String?>> = ConcurrentHashMap()
+
+    init {
+        path = OtherUtil.getPath("UserData.sqlite")
+        create = !path.toFile().exists()
         try {
-            Class.forName("org.sqlite.JDBC");
-            connection = DriverManager.getConnection("jdbc:sqlite:UserData.sqlite");
-            Statement statement = connection.createStatement();
-            statement.executeUpdate("CREATE TABLE IF NOT EXISTS Dictionary(guild_id integer,word text,reading)");
-
-            List<Guild> guilds = bot.getJDA().getGuilds();
-            for (Guild value : guilds) {
-                long guildId = value.getIdLong();
-                Optional<HashMap<String, String>> optionalHashMap = getWordsFromDatabase(guildId);
-                optionalHashMap.ifPresent(hashMap -> guildDic.put(guildId, hashMap));
+            Class.forName("org.sqlite.JDBC")
+            connection = DriverManager.getConnection("jdbc:sqlite:UserData.sqlite")
+            val statement = connection.createStatement()
+            statement.executeUpdate("CREATE TABLE IF NOT EXISTS Dictionary(guild_id integer,word text,reading)")
+            val guilds = bot.jda!!.guilds
+            for (value in guilds) {
+                val guildId = value.idLong
+                val optionalHashMap = getWordsFromDatabase(guildId)
+                optionalHashMap.ifPresent { hashMap: HashMap<String?, String?> -> guildDic[guildId] = hashMap }
             }
-        } catch (SQLException | ClassNotFoundException e) {
-            logger.error("An error occurred while initializing the dictionary: ", e);
-            throw new IllegalStateException(e);
-        }
-        logger.info("Dictionary initialization completed.");
-    }
-
-    public static Dictionary getInstance(Bot bot) {
-        if (instance == null) {
-            instance = new Dictionary(bot);
+        } catch (e: SQLException) {
+            logger.error("An error occurred while initializing the dictionary: ", e)
+            throw IllegalStateException(e)
+        } catch (e: ClassNotFoundException) {
+            logger.error("An error occurred while initializing the dictionary: ", e)
+            throw IllegalStateException(e)
         }
-        return instance;
+        logger.info("Dictionary initialization completed.")
     }
 
     /**
@@ -77,13 +64,14 @@ public class Dictionary {
      * @param word    単語
      * @param reading 読み方
      */
-    public synchronized void updateDictionary(Long guildId, String word, String reading) {
-        guildDic.compute(guildId, (k, v) -> {
-            HashMap<String, String> words = v != null ? v : new HashMap<>();
-            words.put(word, reading);
-            executeUpdate(guildId, word, reading);
-            return words;
-        });
+    @Synchronized
+    fun updateDictionary(guildId: Long, word: String?, reading: String?) {
+        guildDic.compute(guildId) { _: Long?, v: HashMap<String?, String?>? ->
+            val words: HashMap<String?, String?> = v ?: HashMap()
+            words[word] = reading
+            executeUpdate(guildId, word, reading)
+            words
+        }
     }
 
     /**
@@ -91,77 +79,93 @@ public class Dictionary {
      *
      * @param guildId サーバーID
      * @param word    単語
-     * @return 正常に削除できた場合は {@code true}、削除時に問題が発生した場合は{@code false}を返します。
+     * @return 正常に削除できた場合は `true`、削除時に問題が発生した場合は`false`を返します。
      */
-    public synchronized boolean deleteDictionary(Long guildId, String word) {
-        guildDic.compute(guildId, (k, v) -> {
+    @Synchronized
+    fun deleteDictionary(guildId: Long, word: String?): Boolean {
+        guildDic.compute(guildId, BiFunction { _: Long?, v: HashMap<String?, String?>? ->
             if (v == null || !v.containsKey(word)) {
-                return null;
+                return@BiFunction null
             }
-            HashMap<String, String> words = new HashMap<>(v);
-            words.remove(word);
-            executeDelete(guildId, word);
-            return words;
-        });
-        return true;
+            val words = HashMap(v)
+            words.remove(word)
+            executeDelete(guildId, word)
+            words
+        })
+        return true
     }
 
     /**
      * サーバーの辞書データを取得します。
      *
      * @param guildId サーバーID
-     * @return {@code HashMap<String, String>}形式の変数を返します。
+     * @return `HashMap<String, String>`形式の変数を返します。
      */
-    public HashMap<String, String> getWords(Long guildId) {
-        return guildDic.getOrDefault(guildId, new HashMap<>());
+    fun getWords(guildId: Long): HashMap<String?, String?> {
+        return guildDic.getOrDefault(guildId, HashMap())
     }
 
-    private Optional<HashMap<String, String>> getWordsFromDatabase(Long guildId) {
-        String sql = "SELECT * FROM Dictionary WHERE guild_id = ?";
-        try (PreparedStatement ps = connection.prepareStatement(sql)) {
-            ps.setLong(1, guildId);
-            ResultSet rs = ps.executeQuery();
-            HashMap<String, String> word = new HashMap<>();
-            while (rs.next()) {
-                word.put(rs.getString(2), rs.getString(3));
+    private fun getWordsFromDatabase(guildId: Long): Optional<HashMap<String?, String?>> {
+        val sql = "SELECT * FROM Dictionary WHERE guild_id = ?"
+        try {
+            connection.prepareStatement(sql).use { ps ->
+                ps.setLong(1, guildId)
+                val rs = ps.executeQuery()
+                val word = HashMap<String?, String?>()
+                while (rs.next()) {
+                    word[rs.getString(2)] = rs.getString(3)
+                }
+                return Optional.of(word)
             }
-            return Optional.of(word);
-        } catch (SQLException throwables) {
-            logger.error("An error occurred while retrieving data from the dictionary: ", throwables);
-            return Optional.empty();
+        } catch (throwables: SQLException) {
+            logger.error("An error occurred while retrieving data from the dictionary: ", throwables)
+            return Optional.empty()
         }
     }
 
-    private void executeUpdate(Long guildId, String word, String reading) {
-        String sql = "INSERT INTO Dictionary VALUES (?,?,?) ON CONFLICT (guild_id, word) DO UPDATE SET reading = ?";
-        try (PreparedStatement ps = connection.prepareStatement(sql)) {
-            ps.setLong(1, guildId);
-            ps.setString(2, word);
-            ps.setString(3, reading);
-            ps.setString(4, reading);
-            ps.executeUpdate();
-        } catch (SQLException throwables) {
-            logger.error("An error occurred while updating the dictionary: ", throwables);
+    private fun executeUpdate(guildId: Long, word: String?, reading: String?) {
+        val sql = "INSERT INTO Dictionary VALUES (?,?,?) ON CONFLICT (guild_id, word) DO UPDATE SET reading = ?"
+        try {
+            connection.prepareStatement(sql).use { ps ->
+                ps.setLong(1, guildId)
+                ps.setString(2, word)
+                ps.setString(3, reading)
+                ps.setString(4, reading)
+                ps.executeUpdate()
+            }
+        } catch (throwables: SQLException) {
+            logger.error("An error occurred while updating the dictionary: ", throwables)
         }
     }
 
-    private void executeDelete(Long guildId, String word) {
-        String sql = "DELETE FROM Dictionary WHERE guild_id = ? AND word = ?";
-        try (PreparedStatement ps = connection.prepareStatement(sql)) {
-            ps.setLong(1, guildId);
-            ps.setString(2, word);
-            ps.executeUpdate();
-        } catch (SQLException throwables) {
-            logger.error("An error occurred while deleting from the dictionary: ", throwables);
+    private fun executeDelete(guildId: Long, word: String?) {
+        val sql = "DELETE FROM Dictionary WHERE guild_id = ? AND word = ?"
+        try {
+            connection.prepareStatement(sql).use { ps ->
+                ps.setLong(1, guildId)
+                ps.setString(2, word)
+                ps.executeUpdate()
+            }
+        } catch (throwables: SQLException) {
+            logger.error("An error occurred while deleting from the dictionary: ", throwables)
         }
     }
 
-    public void close() {
+    fun close() {
         try {
-            connection.close();
-        } catch (SQLException throwables) {
-            logger.error("An error occurred while closing the database connection: ", throwables);
+            connection.close()
+        } catch (throwables: SQLException) {
+            logger.error("An error occurred while closing the database connection: ", throwables)
         }
     }
-}
 
+    companion object {
+        private var instance: Dictionary? = null
+        fun getInstance(bot: Bot): Dictionary? {
+            if (instance == null) {
+                instance = Dictionary(bot)
+            }
+            return instance
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/dev/cosgy/textToSpeak/audio/PlayerManager.kt b/src/main/java/dev/cosgy/textToSpeak/audio/PlayerManager.kt
index 4632951..c749803 100644
--- a/src/main/java/dev/cosgy/textToSpeak/audio/PlayerManager.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/audio/PlayerManager.kt
@@ -13,58 +13,42 @@
 //     See the License for the specific language governing permissions and               /
 //     limitations under the License.                                                    /
 //////////////////////////////////////////////////////////////////////////////////////////
-
-package dev.cosgy.TextToSpeak.audio;
-
-import com.sedmelluq.discord.lavaplayer.player.AudioConfiguration;
-import com.sedmelluq.discord.lavaplayer.player.AudioPlayer;
-import com.sedmelluq.discord.lavaplayer.player.DefaultAudioPlayerManager;
-import com.sedmelluq.discord.lavaplayer.source.AudioSourceManagers;
-import dev.cosgy.TextToSpeak.Bot;
-import net.dv8tion.jda.api.entities.Guild;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class PlayerManager extends DefaultAudioPlayerManager {
-    private final Bot bot;
-    private final Logger logger = LoggerFactory.getLogger(this.getClass());
-
-    public PlayerManager(Bot bot) {
-        this.bot = bot;
-    }
-
-    public void init() {
-        AudioSourceManagers.registerLocalSource(this);
-
-        if (getConfiguration().getOpusEncodingQuality() != 10) {
-            logger.debug("OpusEncodingQuality は、" + getConfiguration().getOpusEncodingQuality() + "(< 10)" + ", 品質を10に設定します。");
-            getConfiguration().setOpusEncodingQuality(10);
+package dev.cosgy.textToSpeak.audio
+
+import com.sedmelluq.discord.lavaplayer.player.AudioConfiguration
+import com.sedmelluq.discord.lavaplayer.player.DefaultAudioPlayerManager
+import com.sedmelluq.discord.lavaplayer.source.AudioSourceManagers
+import dev.cosgy.textToSpeak.Bot
+import net.dv8tion.jda.api.entities.Guild
+import org.slf4j.LoggerFactory
+
+class PlayerManager(val bot: Bot) : DefaultAudioPlayerManager() {
+    private val logger = LoggerFactory.getLogger(this.javaClass)
+    fun init() {
+        AudioSourceManagers.registerLocalSource(this)
+        if (configuration.opusEncodingQuality != 10) {
+            logger.debug("OpusEncodingQuality は、" + configuration.opusEncodingQuality + "(< 10)" + ", 品質を10に設定します。")
+            configuration.opusEncodingQuality = 10
         }
-
-        if (getConfiguration().getResamplingQuality() != AudioConfiguration.ResamplingQuality.HIGH) {
-            logger.debug("ResamplingQuality は " + getConfiguration().getResamplingQuality().name() + "(HIGHではない), 品質をHIGHに設定します。");
-            getConfiguration().setResamplingQuality(AudioConfiguration.ResamplingQuality.HIGH);
+        if (configuration.resamplingQuality != AudioConfiguration.ResamplingQuality.HIGH) {
+            logger.debug("ResamplingQuality は " + configuration.resamplingQuality.name + "(HIGHではない), 品質をHIGHに設定します。")
+            configuration.resamplingQuality = AudioConfiguration.ResamplingQuality.HIGH
         }
     }
 
-    public Bot getBot() {
-        return bot;
-    }
-
-    public boolean hasHandler(Guild guild) {
-        return guild.getAudioManager().getSendingHandler() != null;
+    fun hasHandler(guild: Guild): Boolean {
+        return guild.audioManager.sendingHandler != null
     }
 
-    public AudioHandler setUpHandler(Guild guild) {
-        AudioHandler handler;
-        if (guild.getAudioManager().getSendingHandler() == null) {
-            AudioPlayer player = createPlayer();
-            player.setVolume(bot.getSettingsManager().getSettings(guild).getVolume());
-            handler = new AudioHandler(this, guild, player);
-            player.addListener(handler);
-            guild.getAudioManager().setSendingHandler(handler);
-        } else
-            handler = (AudioHandler) guild.getAudioManager().getSendingHandler();
-        return handler;
+    fun setUpHandler(guild: Guild): AudioHandler? {
+        val handler: AudioHandler?
+        if (guild.audioManager.sendingHandler == null) {
+            val player = createPlayer()
+            player.volume = bot.settingsManager.getSettings(guild)!!.getVolume()
+            handler = AudioHandler(this, guild, player)
+            player.addListener(handler)
+            guild.audioManager.sendingHandler = handler
+        } else handler = guild.audioManager.sendingHandler as AudioHandler?
+        return handler
     }
-}
+}
\ No newline at end of file
diff --git a/src/main/java/dev/cosgy/textToSpeak/audio/QueuedTrack.kt b/src/main/java/dev/cosgy/textToSpeak/audio/QueuedTrack.kt
index 66ac184..eb56b20 100644
--- a/src/main/java/dev/cosgy/textToSpeak/audio/QueuedTrack.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/audio/QueuedTrack.kt
@@ -13,31 +13,20 @@
 //     See the License for the specific language governing permissions and               /
 //     limitations under the License.                                                    /
 //////////////////////////////////////////////////////////////////////////////////////////
+package dev.cosgy.textToSpeak.audio
 
-package dev.cosgy.TextToSpeak.audio;
+import com.sedmelluq.discord.lavaplayer.track.AudioTrack
+import dev.cosgy.textToSpeak.queue.Queueable
+import net.dv8tion.jda.api.entities.User
 
-import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
-import dev.cosgy.TextToSpeak.queue.Queueable;
-import net.dv8tion.jda.api.entities.User;
+class QueuedTrack(val track: AudioTrack, owner: Long) : Queueable {
 
-public class QueuedTrack implements Queueable {
-    private final AudioTrack track;
+    constructor(track: AudioTrack, owner: User) : this(track, owner.idLong)
 
-    public QueuedTrack(AudioTrack track, User owner) {
-        this(track, owner.getIdLong());
+    init {
+        track.userData = owner
     }
 
-    public QueuedTrack(AudioTrack track, long owner) {
-        this.track = track;
-        this.track.setUserData(owner);
-    }
-
-    @Override
-    public long getIdentifier() {
-        return track.getUserData(Long.class);
-    }
-
-    public AudioTrack getTrack() {
-        return track;
-    }
-}
+    override val identifier: Long
+        get() = track.getUserData(Long::class.java)
+}
\ No newline at end of file
diff --git a/src/main/java/dev/cosgy/textToSpeak/audio/VoiceCreation.kt b/src/main/java/dev/cosgy/textToSpeak/audio/VoiceCreation.kt
index fdcf533..f63aaa0 100644
--- a/src/main/java/dev/cosgy/textToSpeak/audio/VoiceCreation.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/audio/VoiceCreation.kt
@@ -13,182 +13,160 @@
 //     See the License for the specific language governing permissions and               /
 //     limitations under the License.                                                    /
 //////////////////////////////////////////////////////////////////////////////////////////
-
-package dev.cosgy.TextToSpeak.audio;
-
-import dev.cosgy.TextToSpeak.Bot;
-import dev.cosgy.TextToSpeak.settings.UserSettings;
-import net.dv8tion.jda.api.entities.Guild;
-import net.dv8tion.jda.api.entities.User;
-import org.apache.commons.io.FileUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.*;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
-
-public class VoiceCreation {
-    private static final Logger logger = LoggerFactory.getLogger(VoiceCreation.class);
-    private static final boolean IS_WINDOWS = System.getProperty("os.name").toLowerCase().startsWith("win");
-
-    // 各種設定の値を保持するためのフィールド
-    private final Bot bot;
-    private final String dictionary;
-    private final String voiceDirectory;
-    private final String winJTalkDir;
-    private final int maxMessageCount;
-
-    // 初期化処理を行うメソッド
-    public VoiceCreation(Bot bot) {
-        this.bot = bot;
-        this.dictionary = bot.getConfig().getDictionary();
-        this.voiceDirectory = bot.getConfig().getVoiceDirectory();
-        this.winJTalkDir = bot.getConfig().getWinJTalkDir();
-        this.maxMessageCount = bot.getConfig().getMaxMessageCount();
-    }
-
-    public String createVoice(Guild guild, User user, String message) throws IOException, InterruptedException {
+package dev.cosgy.textToSpeak.audio
+
+import dev.cosgy.textToSpeak.Bot
+import dev.cosgy.textToSpeak.settings.UserSettings
+import net.dv8tion.jda.api.entities.*
+import org.apache.commons.io.FileUtils
+import org.slf4j.LoggerFactory
+import java.io.*
+import java.nio.file.Files
+import java.nio.file.Paths
+import java.util.*
+
+class VoiceCreation( // 各種設定の値を保持するためのフィールド
+        private val bot: Bot) {
+    private val dictionary: String? = bot.config.dictionary
+    private val voiceDirectory: String? = bot.config.voiceDirectory
+    private val winJTalkDir: String? = bot.config.winJTalkDir
+    private val maxMessageCount: Int = bot.config.maxMessageCount
+
+    @Throws(IOException::class, InterruptedException::class)
+    fun createVoice(guild: Guild, user: User, message: String): String {
         // ファイル名やパスの生成に使用するIDを生成する
-        String guildId = guild.getId();
-        String fileId = UUID.randomUUID().toString();
-        String fileName = "wav" + File.separator + guildId + File.separator + fileId + ".wav";
+        val guildId = guild.id
+        val fileId = UUID.randomUUID().toString()
+        val fileName = "wav" + File.separator + guildId + File.separator + fileId + ".wav"
 
         // 必要なディレクトリを作成する
-        createDirectories(guildId);
+        createDirectories(guildId)
 
         // ユーザーの設定を取得する
-        UserSettings settings = bot.getUserSettingsManager().getSettings(user.getIdLong());
+        val settings = bot.userSettingsManager.getSettings(user.idLong)
 
         // 辞書データを取得し、メッセージを変換する
-        HashMap<String, String> words = bot.getDictionary().getWords(guild.getIdLong());
-        String dicMsg = sanitizeMessage(message);
-        for (Map.Entry<String, String> entry : words.entrySet()) {
-            String key = entry.getKey();
-            String value = entry.getValue();
-            dicMsg = dicMsg.replaceAll(key, value);
+        val words = bot.dictionary?.getWords(guild.idLong)
+        var dicMsg = sanitizeMessage(message)
+        for ((key, value) in words!!) {
+            dicMsg = dicMsg.replace(key!!.toRegex(), value!!)
         }
-        String tmpFilePath = createTmpTextFile(guildId, fileId, dicMsg);
+        val tmpFilePath = createTmpTextFile(guildId, fileId, dicMsg)
 
 
         // コマンドを生成して実行する
-        String[] command = getCommand(settings, tmpFilePath, fileName);
-        ProcessBuilder builder = new ProcessBuilder(command);
-
-        builder.redirectErrorStream(true);
-        logger.debug("Command: " + String.join(" ", command));
-        Process process = builder.start();
-        process.waitFor();
-
-        return fileName;
+        val command = getCommand(settings, tmpFilePath, fileName)
+        val builder = ProcessBuilder(*command)
+        builder.redirectErrorStream(true)
+        logger.debug("Command: " + java.lang.String.join(" ", *command))
+        val process = builder.start()
+        process.waitFor()
+        return fileName
     }
 
     // メッセージをサニタイズするメソッド
-    private String sanitizeMessage(String message) {
-        String sanitizedMsg = message.replaceAll("[\\uD800-\\uDFFF]", " ");
-        sanitizedMsg = sanitizedMsg.replaceAll("Kosugi_kun", "コスギクン");
-        return sanitizedMsg;
+    private fun sanitizeMessage(message: String): String {
+        var sanitizedMsg = message.replace("[\\uD800-\\uDFFF]".toRegex(), " ")
+        sanitizedMsg = sanitizedMsg.replace("Kosugi_kun".toRegex(), "コスギクン")
+        return sanitizedMsg
     }
 
     // テキストファイルを作成するメソッド
-    private String createTmpTextFile(String guildId, String fileId, String message) throws FileNotFoundException, UnsupportedEncodingException {
-        String filePath = "tmp" + File.separator + guildId + File.separator + fileId + ".txt";
-        try (PrintWriter writer = new PrintWriter(filePath, getCharacterCode())) {
-            writer.write(message);
-        }
-        return filePath;
+    @Throws(FileNotFoundException::class, UnsupportedEncodingException::class)
+    private fun createTmpTextFile(guildId: String, fileId: String, message: String): String {
+        val filePath = "tmp" + File.separator + guildId + File.separator + fileId + ".txt"
+        PrintWriter(filePath, characterCode).use { writer -> writer.write(message) }
+        return filePath
     }
 
-    // 文字コードを取得するメソッド
-    private String getCharacterCode() {
-        return IS_WINDOWS ? "Shift-JIS" : "UTF-8";
-    }
+    private val characterCode: String
+        // 文字コードを取得するメソッド
+        get() = if (IS_WINDOWS) "Shift-JIS" else "UTF-8"
 
     // コマンドを生成するメソッド
-    private String[] getCommand(UserSettings settings, String tmpFilePath, String fileName) {
-        ArrayList<String> command = new ArrayList<>();
-        command.add(getOpenJTalkExecutable());
-        command.add("-x");
-        command.add(dictionary);
-        command.add("-m");
-        command.add(getVoiceFilePath(settings.getVoice()));
-        command.add("-ow");
-        command.add(fileName);
-        command.add("-r");
-        command.add(String.valueOf(settings.getSpeed()));
-        command.add("-jf");
-        command.add(String.valueOf(settings.getIntonation()));
-        command.add("-a");
-        command.add(String.valueOf(settings.getVoiceQualityA()));
-        command.add("-fm");
-        command.add(String.valueOf(settings.getVoiceQualityFm()));
-        command.add(tmpFilePath);
-
-        return command.toArray(new String[0]);
+    private fun getCommand(settings: UserSettings?, tmpFilePath: String, fileName: String): Array<String?> {
+        val command = ArrayList<String?>()
+        command.add(openJTalkExecutable)
+        command.add("-x")
+        command.add(dictionary)
+        command.add("-m")
+        command.add(getVoiceFilePath(settings!!.voice))
+        command.add("-ow")
+        command.add(fileName)
+        command.add("-r")
+        command.add(settings.speed.toString())
+        command.add("-jf")
+        command.add(settings.intonation.toString())
+        command.add("-a")
+        command.add(settings.voiceQualityA.toString())
+        command.add("-fm")
+        command.add(settings.voiceQualityFm.toString())
+        command.add(tmpFilePath)
+        return command.toTypedArray()
     }
 
-    private String getOpenJTalkExecutable() {
-        if (IS_WINDOWS) {
-            return Paths.get(winJTalkDir, "open_jtalk.exe").toString();
+    private val openJTalkExecutable: String?
+        get() = if (IS_WINDOWS) {
+            winJTalkDir?.let { Paths.get(it, "open_jtalk.exe").toString() }
         } else {
-            return "open_jtalk";
+            "open_jtalk"
         }
-    }
 
-    private String getVoiceFilePath(String voice) {
-        return Paths.get(voiceDirectory, voice + ".htsvoice").toString();
+    private fun getVoiceFilePath(voice: String?): String? {
+        return voiceDirectory?.let { Paths.get(it, "$voice.htsvoice").toString() }
     }
 
     // 必要なディレクトリを作成するメソッド
-    private void createDirectories(String guildId) throws IOException {
-        createDirectory("tmp");
-        createDirectory("tmp" + File.separator + guildId);
-        createDirectory("wav");
-        createDirectory("wav" + File.separator + guildId);
+    @Throws(IOException::class)
+    private fun createDirectories(guildId: String) {
+        createDirectory("tmp")
+        createDirectory("tmp" + File.separator + guildId)
+        createDirectory("wav")
+        createDirectory("wav" + File.separator + guildId)
     }
 
     // ディレクトリを作成するメゾット
-    private void createDirectory(String directory) throws IOException {
-        Path path = Paths.get(directory);
+    @Throws(IOException::class)
+    private fun createDirectory(directory: String) {
+        val path = Paths.get(directory)
         if (!Files.exists(path)) {
-            Files.createDirectory(path);
-            logger.info("Created directory: " + directory);
+            Files.createDirectory(path)
+            logger.info("Created directory: $directory")
         }
     }
 
     // ギルドに関連する一時ファイルや音声ファイルを削除するメソッド
-    public void clearGuildFolder(Guild guild) throws IOException {
-        String guildId = guild.getId();
-        Path tmpPath = Paths.get("tmp" + File.separator + guildId);
-        Path wavPath = Paths.get("wav" + File.separator + guildId);
+    @Throws(IOException::class)
+    fun clearGuildFolder(guild: Guild) {
+        val guildId = guild.id
+        val tmpPath = Paths.get("tmp" + File.separator + guildId)
+        val wavPath = Paths.get("wav" + File.separator + guildId)
         if (Files.exists(tmpPath)) {
-            FileUtils.cleanDirectory(tmpPath.toFile());
-            logger.info("Cleared temporary files for guild: " + guildId);
+            FileUtils.cleanDirectory(tmpPath.toFile())
+            logger.info("Cleared temporary files for guild: $guildId")
         }
-
         if (Files.exists(wavPath)) {
-            FileUtils.cleanDirectory(wavPath.toFile());
-            logger.info("Cleared WAV files for guild: " + guildId);
+            FileUtils.cleanDirectory(wavPath.toFile())
+            logger.info("Cleared WAV files for guild: $guildId")
         }
     }
 
-    // 利用可能な音声名を取得するメソッド
-    public ArrayList<String> getVoices() {
-        FilenameFilter filter = (file, str) -> str.endsWith("htsvoice");
-        File dir = new File(voiceDirectory);
-        File[] list = dir.listFiles(filter);
-        ArrayList<String> voices = new ArrayList<>();
-
-        for (File file : list) {
-            voices.add(file.getName().replace(".htsvoice", ""));
+    val voices: ArrayList<String>
+        // 利用可能な音声名を取得するメソッド
+        get() {
+            val filter = FilenameFilter { _: File?, str: String -> str.endsWith("htsvoice") }
+            val dir = File(voiceDirectory!!)
+            val list = dir.listFiles(filter)
+            val voices = ArrayList<String>()
+            for (file in list!!) {
+                voices.add(file.name.replace(".htsvoice", ""))
+            }
+            logger.debug("Available voices: $voices")
+            return voices
         }
 
-        logger.debug("Available voices: " + voices.toString());
-        return voices;
+    companion object {
+        private val logger = LoggerFactory.getLogger(VoiceCreation::class.java)
+        private val IS_WINDOWS = System.getProperty("os.name").lowercase(Locale.getDefault()).startsWith("win")
     }
-}
+}
\ No newline at end of file
diff --git a/src/main/java/dev/cosgy/textToSpeak/commands/AdminCommand.kt b/src/main/java/dev/cosgy/textToSpeak/commands/AdminCommand.kt
index 4ff6436..e7c79ae 100644
--- a/src/main/java/dev/cosgy/textToSpeak/commands/AdminCommand.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/commands/AdminCommand.kt
@@ -13,33 +13,30 @@
 //     See the License for the specific language governing permissions and               /
 //     limitations under the License.                                                    /
 //////////////////////////////////////////////////////////////////////////////////////////
+package dev.cosgy.textToSpeak.commands
 
-package dev.cosgy.TextToSpeak.commands;
+import com.jagrosh.jdautilities.command.CommandClient
+import com.jagrosh.jdautilities.command.CommandEvent
+import com.jagrosh.jdautilities.command.SlashCommand
+import com.jagrosh.jdautilities.command.SlashCommandEvent
+import net.dv8tion.jda.api.Permission
+import java.util.function.Predicate
 
-import com.jagrosh.jdautilities.command.CommandClient;
-import com.jagrosh.jdautilities.command.SlashCommand;
-import com.jagrosh.jdautilities.command.SlashCommandEvent;
-import net.dv8tion.jda.api.Permission;
-
-public abstract class AdminCommand extends SlashCommand {
-    public AdminCommand() {
-        this.category = new Category("管理", event ->
-        {
-            if (event.isOwner() || event.getMember().isOwner())
-                return true;
-            if (event.getGuild() == null)
-                return true;
-            return event.getMember().hasPermission(Permission.MANAGE_SERVER);
-        });
-        this.guildOnly = true;
-        this.userPermissions = new Permission[]{Permission.ADMINISTRATOR};
+abstract class AdminCommand : SlashCommand() {
+    init {
+        this.category = Category("管理", Predicate { event: CommandEvent ->
+            if (event.isOwner || event.member.isOwner) return@Predicate true
+            if (event.guild == null) return@Predicate true
+            event.member.hasPermission(Permission.MANAGE_SERVER)
+        })
+        guildOnly = true
+        userPermissions = arrayOf(Permission.ADMINISTRATOR)
     }
 
-    public static boolean checkAdminPermission(CommandClient client, SlashCommandEvent event) {
-        if (event.getUser().getId().equals(client.getOwnerId()) || event.getMember().isOwner())
-            return true;
-        if (event.getGuild() == null)
-            return true;
-        return event.getMember().hasPermission(Permission.MANAGE_SERVER);
+    companion object {
+        fun checkAdminPermission(client: CommandClient, event: SlashCommandEvent): Boolean {
+            if (event.user.id == client.ownerId || event.member!!.isOwner) return true
+            return if (event.guild == null) true else event.member!!.hasPermission(Permission.MANAGE_SERVER)
+        }
     }
-}
+}
\ No newline at end of file
diff --git a/src/main/java/dev/cosgy/textToSpeak/commands/OwnerCommand.kt b/src/main/java/dev/cosgy/textToSpeak/commands/OwnerCommand.kt
index 6d2ef3d..bf0fb9e 100644
--- a/src/main/java/dev/cosgy/textToSpeak/commands/OwnerCommand.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/commands/OwnerCommand.kt
@@ -13,14 +13,13 @@
 //     See the License for the specific language governing permissions and               /
 //     limitations under the License.                                                    /
 //////////////////////////////////////////////////////////////////////////////////////////
+package dev.cosgy.textToSpeak.commands
 
-package dev.cosgy.TextToSpeak.commands;
+import com.jagrosh.jdautilities.command.SlashCommand
 
-import com.jagrosh.jdautilities.command.SlashCommand;
-
-public abstract class OwnerCommand extends SlashCommand {
-    public OwnerCommand() {
-        this.category = new Category("Owner");
-        this.ownerCommand = true;
+abstract class OwnerCommand : SlashCommand() {
+    init {
+        this.category = Category("Owner")
+        ownerCommand = true
     }
-}
+}
\ No newline at end of file
diff --git a/src/main/java/dev/cosgy/textToSpeak/commands/admin/GuildSettings.kt b/src/main/java/dev/cosgy/textToSpeak/commands/admin/GuildSettings.kt
index 5eed2eb..9a76517 100644
--- a/src/main/java/dev/cosgy/textToSpeak/commands/admin/GuildSettings.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/commands/admin/GuildSettings.kt
@@ -13,72 +13,58 @@
 //     See the License for the specific language governing permissions and               /
 //     limitations under the License.                                                    /
 //////////////////////////////////////////////////////////////////////////////////////////
+package dev.cosgy.textToSpeak.commands.admin
 
-package dev.cosgy.TextToSpeak.commands.admin;
+import com.jagrosh.jdautilities.command.CommandEvent
+import com.jagrosh.jdautilities.command.SlashCommandEvent
+import dev.cosgy.textToSpeak.Bot
+import dev.cosgy.textToSpeak.commands.AdminCommand
+import net.dv8tion.jda.api.EmbedBuilder
+import org.slf4j.Logger
+import org.slf4j.LoggerFactory
+import java.awt.Color
 
-import com.jagrosh.jdautilities.command.CommandEvent;
-import com.jagrosh.jdautilities.command.SlashCommandEvent;
-import dev.cosgy.TextToSpeak.Bot;
-import dev.cosgy.TextToSpeak.commands.AdminCommand;
-import dev.cosgy.TextToSpeak.settings.Settings;
-import net.dv8tion.jda.api.EmbedBuilder;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+class GuildSettings(private val bot: Bot) : AdminCommand() {
+    var log: Logger = LoggerFactory.getLogger(this.javaClass)
 
-import java.awt.*;
-import java.util.Objects;
-
-public class GuildSettings extends AdminCommand {
-    private final Bot bot;
-    Logger log = LoggerFactory.getLogger(this.getClass());
-
-    public GuildSettings(Bot bot) {
-        this.bot = bot;
-        this.name = "gsettings";
-        this.help = "ギルドの現在の設定を確認できます。";
+    init {
+        name = "gsettings"
+        help = "ギルドの現在の設定を確認できます。"
     }
 
-    @Override
-    protected void execute(SlashCommandEvent event) {
-        if (!checkAdminPermission(event.getClient(), event)) {
-            event.reply(event.getClient().getWarning() + "権限がないため実行できません。").queue();
-            return;
+    override fun execute(event: SlashCommandEvent) {
+        if (!checkAdminPermission(event.client, event)) {
+            event.reply(event.client.warning + "権限がないため実行できません。").queue()
+            return
         }
-
-        Settings settings = bot.getSettingsManager().getSettings(event.getGuild());
-
-        String text = "null";
-        if (settings.getTextChannel(event.getGuild()) != null) {
-            text = settings.getTextChannel(event.getGuild()).getName();
+        val settings = bot.settingsManager.getSettings(event.guild!!)
+        var text = "null"
+        if (settings!!.getTextChannel(event.guild) != null) {
+            text = settings.getTextChannel(event.guild)!!.name
         }
-
-        EmbedBuilder ebuilder = new EmbedBuilder()
+        val ebuilder = EmbedBuilder()
                 .setColor(Color.orange)
-                .setTitle(event.getGuild().getName() + "の設定")
-                .addField("ユーザー名読み上げ：", String.valueOf(Objects.requireNonNull(settings).isReadName()), false)
-                .addField("参加、退出時の読み上げ：", String.valueOf(settings.isJoinAndLeaveRead()), false)
-                //.addField("接頭語：", settings.getPrefix(), false)
+                .setTitle(event.guild!!.name + "の設定")
+                .addField("ユーザー名読み上げ：", settings.isReadName().toString(), false)
+                .addField("参加、退出時の読み上げ：", settings.isJoinAndLeaveRead().toString(), false) //.addField("接頭語：", settings.getPrefix(), false)
                 .addField("読み上げるチャンネル：", text, false)
-                .addField("読み上げの主音量：", String.valueOf(settings.getVolume()), false);
-        event.replyEmbeds(ebuilder.build()).queue();
+                .addField("読み上げの主音量：", settings.volume.toString(), false)
+        event.replyEmbeds(ebuilder.build()).queue()
     }
 
-    @Override
-    protected void execute(CommandEvent event) {
-        Settings settings = bot.getSettingsManager().getSettings(event.getGuild());
-        String text = "null";
-        if (settings.getTextChannel(event.getGuild()) != null) {
-            text = settings.getTextChannel(event.getGuild()).getName();
+    override fun execute(event: CommandEvent) {
+        val settings = bot.settingsManager.getSettings(event.guild)
+        var text = "null"
+        if (settings!!.getTextChannel(event.guild) != null) {
+            text = settings.getTextChannel(event.guild)!!.name
         }
-
-        EmbedBuilder ebuilder = new EmbedBuilder()
+        val ebuilder = EmbedBuilder()
                 .setColor(Color.orange)
-                .setTitle(event.getGuild().getName() + "の設定")
-                .addField("ユーザー名読み上げ：", String.valueOf(Objects.requireNonNull(settings).isReadName()), false)
-                .addField("参加、退出時の読み上げ：", String.valueOf(settings.isJoinAndLeaveRead()), false)
-                //.addField("接頭語：", settings.getPrefix(), false)
+                .setTitle(event.guild.name + "の設定")
+                .addField("ユーザー名読み上げ：", settings.isReadName().toString(), false)
+                .addField("参加、退出時の読み上げ：", settings.isJoinAndLeaveRead().toString(), false) //.addField("接頭語：", settings.getPrefix(), false)
                 .addField("読み上げるチャンネル：", text, false)
-                .addField("読み上げの主音量：", String.valueOf(settings.getVolume()), false);
-        event.reply(ebuilder.build());
+                .addField("読み上げの主音量：", settings.volume.toString(), false)
+        event.reply(ebuilder.build())
     }
-}
+}
\ No newline at end of file
diff --git a/src/main/java/dev/cosgy/textToSpeak/commands/admin/JLReadCmd.kt b/src/main/java/dev/cosgy/textToSpeak/commands/admin/JLReadCmd.kt
index 1b68160..c00d116 100644
--- a/src/main/java/dev/cosgy/textToSpeak/commands/admin/JLReadCmd.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/commands/admin/JLReadCmd.kt
@@ -13,54 +13,46 @@
 //     See the License for the specific language governing permissions and               /
 //     limitations under the License.                                                    /
 //////////////////////////////////////////////////////////////////////////////////////////
+package dev.cosgy.textToSpeak.commands.admin
 
-package dev.cosgy.TextToSpeak.commands.admin;
+import com.jagrosh.jdautilities.command.CommandEvent
+import com.jagrosh.jdautilities.command.SlashCommandEvent
+import dev.cosgy.textToSpeak.Bot
+import dev.cosgy.textToSpeak.commands.AdminCommand
+import org.slf4j.Logger
+import org.slf4j.LoggerFactory
 
-import com.jagrosh.jdautilities.command.CommandEvent;
-import com.jagrosh.jdautilities.command.SlashCommandEvent;
-import dev.cosgy.TextToSpeak.Bot;
-import dev.cosgy.TextToSpeak.commands.AdminCommand;
-import dev.cosgy.TextToSpeak.settings.Settings;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+class JLReadCmd(private val bot: Bot) : AdminCommand() {
+    var log: Logger = LoggerFactory.getLogger(this.javaClass)
 
-public class JLReadCmd extends AdminCommand {
-    private final Bot bot;
-    Logger log = LoggerFactory.getLogger(this.getClass());
-
-    public JLReadCmd(Bot bot) {
-        this.bot = bot;
-        this.name = "jlread";
-        this.help = "ボイスチャンネルにユーザーが参加または退出した時にユーザー名を読み上げるか否かを設定します。";
+    init {
+        name = "jlread"
+        help = "ボイスチャンネルにユーザーが参加または退出した時にユーザー名を読み上げるか否かを設定します。"
     }
 
-    @Override
-    protected void execute(SlashCommandEvent event) {
-        if (!checkAdminPermission(event.getClient(), event)) {
-            event.reply(event.getClient().getWarning() + "権限がないため実行できません。").queue();
-            return;
+    override fun execute(event: SlashCommandEvent) {
+        if (!checkAdminPermission(event.client, event)) {
+            event.reply(event.client.warning + "権限がないため実行できません。").queue()
+            return
         }
-        Settings settings = bot.getSettingsManager().getSettings(event.getGuild());
-
-        if (settings.isJoinAndLeaveRead()) {
-            settings.setJoinAndLeaveRead(false);
-            event.reply("ボイスチャンネルにユーザーが参加、退出した際の読み上げを無効にしました。").queue();
+        val settings = bot.settingsManager.getSettings(event.guild!!)
+        if (settings!!.isJoinAndLeaveRead()) {
+            settings.setJoinAndLeaveRead(false)
+            event.reply("ボイスチャンネルにユーザーが参加、退出した際の読み上げを無効にしました。").queue()
         } else {
-            settings.setJoinAndLeaveRead(true);
-            event.reply("ボイスチャンネルにユーザーが参加、退出した際の読み上げを有効にしました。").queue();
+            settings.setJoinAndLeaveRead(true)
+            event.reply("ボイスチャンネルにユーザーが参加、退出した際の読み上げを有効にしました。").queue()
         }
     }
 
-    @Override
-    protected void execute(CommandEvent event) {
-        Settings settings = bot.getSettingsManager().getSettings(event.getGuild());
-
-        if (settings.isJoinAndLeaveRead()) {
-            settings.setJoinAndLeaveRead(false);
-            event.reply("ボイスチャンネルにユーザーが参加、退出した際の読み上げを無効にしました。");
+    override fun execute(event: CommandEvent) {
+        val settings = bot.settingsManager.getSettings(event.guild)
+        if (settings!!.isJoinAndLeaveRead()) {
+            settings.setJoinAndLeaveRead(false)
+            event.reply("ボイスチャンネルにユーザーが参加、退出した際の読み上げを無効にしました。")
         } else {
-            settings.setJoinAndLeaveRead(true);
-            event.reply("ボイスチャンネルにユーザーが参加、退出した際の読み上げを有効にしました。");
+            settings.setJoinAndLeaveRead(true)
+            event.reply("ボイスチャンネルにユーザーが参加、退出した際の読み上げを有効にしました。")
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/main/java/dev/cosgy/textToSpeak/commands/admin/SetReadNameCmd.kt b/src/main/java/dev/cosgy/textToSpeak/commands/admin/SetReadNameCmd.kt
index 48aa98b..d167ad8 100644
--- a/src/main/java/dev/cosgy/textToSpeak/commands/admin/SetReadNameCmd.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/commands/admin/SetReadNameCmd.kt
@@ -13,54 +13,45 @@
 //     See the License for the specific language governing permissions and               /
 //     limitations under the License.                                                    /
 //////////////////////////////////////////////////////////////////////////////////////////
+package dev.cosgy.textToSpeak.commands.admin
 
-package dev.cosgy.TextToSpeak.commands.admin;
+import com.jagrosh.jdautilities.command.CommandEvent
+import com.jagrosh.jdautilities.command.SlashCommandEvent
+import dev.cosgy.textToSpeak.Bot
+import dev.cosgy.textToSpeak.commands.AdminCommand
+import org.slf4j.LoggerFactory
 
-import com.jagrosh.jdautilities.command.CommandEvent;
-import com.jagrosh.jdautilities.command.SlashCommandEvent;
-import dev.cosgy.TextToSpeak.Bot;
-import dev.cosgy.TextToSpeak.commands.AdminCommand;
-import dev.cosgy.TextToSpeak.settings.Settings;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+class SetReadNameCmd(private val bot: Bot) : AdminCommand() {
+    var log = LoggerFactory.getLogger(this.javaClass)
 
-public class SetReadNameCmd extends AdminCommand {
-    private final Bot bot;
-    Logger log = LoggerFactory.getLogger(this.getClass());
-
-    public SetReadNameCmd(Bot bot) {
-        this.bot = bot;
-        this.name = "setreadname";
-        this.help = "テキストを読み上げる際にユーザー名も読み上げるかを設定します。";
+    init {
+        name = "setreadname"
+        help = "テキストを読み上げる際にユーザー名も読み上げるかを設定します。"
     }
 
-    @Override
-    protected void execute(SlashCommandEvent event) {
-        if (!checkAdminPermission(event.getClient(), event)) {
-            event.reply(event.getClient().getWarning() + "権限がないため実行できません。").queue();
-            return;
+    override fun execute(event: SlashCommandEvent) {
+        if (!checkAdminPermission(event.client, event)) {
+            event.reply(event.client.warning + "権限がないため実行できません。").queue()
+            return
         }
-        Settings settings = bot.getSettingsManager().getSettings(event.getGuild());
-
-        if (settings.isReadName()) {
-            settings.setReadName(false);
-            event.reply("ユーザー名の読み上げを無効にしました。").queue();
+        val settings = bot.settingsManager.getSettings(event.guild!!)
+        if (settings!!.isReadName()) {
+            settings.setReadName(false)
+            event.reply("ユーザー名の読み上げを無効にしました。").queue()
         } else {
-            settings.setReadName(true);
-            event.reply("ユーザー名の読み上げを有効にしました。").queue();
+            settings.setReadName(true)
+            event.reply("ユーザー名の読み上げを有効にしました。").queue()
         }
     }
 
-    @Override
-    protected void execute(CommandEvent event) {
-        Settings settings = bot.getSettingsManager().getSettings(event.getGuild());
-
-        if (settings.isReadName()) {
-            settings.setReadName(false);
-            event.reply("ユーザー名の読み上げを無効にしました。");
+    override fun execute(event: CommandEvent) {
+        val settings = bot.settingsManager.getSettings(event.guild)
+        if (settings!!.isReadName()) {
+            settings.setReadName(false)
+            event.reply("ユーザー名の読み上げを無効にしました。")
         } else {
-            settings.setReadName(true);
-            event.reply("ユーザー名の読み上げを有効にしました。");
+            settings.setReadName(true)
+            event.reply("ユーザー名の読み上げを有効にしました。")
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/main/java/dev/cosgy/textToSpeak/commands/admin/SettcCmd.kt b/src/main/java/dev/cosgy/textToSpeak/commands/admin/SettcCmd.kt
index 53b9365..89d102d 100644
--- a/src/main/java/dev/cosgy/textToSpeak/commands/admin/SettcCmd.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/commands/admin/SettcCmd.kt
@@ -13,118 +13,95 @@
 //     See the License for the specific language governing permissions and               /
 //     limitations under the License.                                                    /
 //////////////////////////////////////////////////////////////////////////////////////////
-
-package dev.cosgy.TextToSpeak.commands.admin;
-
-import com.jagrosh.jdautilities.command.CommandEvent;
-import com.jagrosh.jdautilities.command.SlashCommand;
-import com.jagrosh.jdautilities.command.SlashCommandEvent;
-import com.jagrosh.jdautilities.commons.utils.FinderUtil;
-import dev.cosgy.TextToSpeak.Bot;
-import dev.cosgy.TextToSpeak.commands.AdminCommand;
-import dev.cosgy.TextToSpeak.settings.Settings;
-import dev.cosgy.TextToSpeak.utils.FormatUtil;
-import net.dv8tion.jda.api.entities.channel.ChannelType;
-import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
-import net.dv8tion.jda.api.interactions.commands.OptionType;
-import net.dv8tion.jda.api.interactions.commands.build.OptionData;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class SettcCmd extends AdminCommand {
-    Logger log = LoggerFactory.getLogger(this.getClass());
-
-    public SettcCmd(Bot bot) {
-        this.name = "settc";
-        this.help = "読み上げをするチャンネルを設定します。読み上げするチャンネルを設定していない場合は、joinコマンドを最後に実行したチャンネルが読み上げ対象になります。";
-        this.arguments = "<チャンネル名|NONE|なし>";
-
-        this.children = new SlashCommand[]{new Set(), new None()};
-    }
-
-    @Override
-    protected void execute(SlashCommandEvent event) {
+package dev.cosgy.textToSpeak.commands.admin
+
+import com.jagrosh.jdautilities.command.CommandEvent
+import com.jagrosh.jdautilities.command.SlashCommand
+import com.jagrosh.jdautilities.command.SlashCommandEvent
+import com.jagrosh.jdautilities.commons.utils.FinderUtil
+import dev.cosgy.textToSpeak.Bot
+import dev.cosgy.textToSpeak.commands.AdminCommand
+import dev.cosgy.textToSpeak.settings.Settings
+import dev.cosgy.textToSpeak.utils.FormatUtil
+import net.dv8tion.jda.api.entities.channel.ChannelType
+import net.dv8tion.jda.api.interactions.commands.OptionType
+import net.dv8tion.jda.api.interactions.commands.build.OptionData
+import org.slf4j.Logger
+import org.slf4j.LoggerFactory
+import java.util.*
+
+class SettcCmd(bot: Bot?) : AdminCommand() {
+    var log: Logger = LoggerFactory.getLogger(this.javaClass)
+
+    init {
+        name = "settc"
+        help = "読み上げをするチャンネルを設定します。読み上げするチャンネルを設定していない場合は、joinコマンドを最後に実行したチャンネルが読み上げ対象になります。"
+        arguments = "<チャンネル名|NONE|なし>"
+        children = arrayOf<SlashCommand>(Set(), None())
     }
 
-    @Override
-    protected void execute(CommandEvent event) {
-        if (event.getArgs().isEmpty()) {
-            event.reply(event.getClient().getError() + "チャンネルまたはNONEを含めてください。");
-            return;
+    override fun execute(event: SlashCommandEvent) {}
+    override fun execute(event: CommandEvent) {
+        if (event.args.isEmpty()) {
+            event.reply(event.client.error + "チャンネルまたはNONEを含めてください。")
+            return
         }
-        Settings s = event.getClient().getSettingsFor(event.getGuild());
-        if (event.getArgs().toLowerCase().matches("(none|なし)")) {
-            s.setTextChannel(null);
-            event.reply(event.getClient().getSuccess() + "読み上げをするチャンネルの設定を無効にしました。");
+        val s = event.client.getSettingsFor<Settings>(event.guild)
+        if (event.args.lowercase(Locale.getDefault()).matches("(none|なし)".toRegex())) {
+            s.setTextChannel(null)
+            event.reply(event.client.success + "読み上げをするチャンネルの設定を無効にしました。")
         } else {
-            List<TextChannel> list = FinderUtil.findTextChannels(event.getArgs(), event.getGuild());
-            if (list.isEmpty())
-                event.reply(event.getClient().getWarning() + "一致するチャンネルが見つかりませんでした \"" + event.getArgs() + "\"");
-            else if (list.size() > 1)
-                event.reply(event.getClient().getWarning() + FormatUtil.listOfTChannels(list, event.getArgs()));
-            else {
-                s.setTextChannel(list.get(0));
-                log.info("読み上げを行うチャンネルを設定しました。");
-                event.reply(event.getClient().getSuccess() + "読み上げるチャンネルを<#" + list.get(0).getId() + ">に設定しました。");
+            val list = FinderUtil.findTextChannels(event.args, event.guild)
+            if (list.isEmpty()) event.reply(event.client.warning + "一致するチャンネルが見つかりませんでした \"" + event.args + "\"") else if (list.size > 1) event.reply(event.client.warning + FormatUtil.listOfTChannels(list, event.args)) else {
+                s.setTextChannel(list[0])
+                log.info("読み上げを行うチャンネルを設定しました。")
+                event.reply(event.client.success + "読み上げるチャンネルを<#" + list[0].id + ">に設定しました。")
             }
         }
     }
 
-    private static class Set extends AdminCommand {
-        public Set() {
-            this.name = "set";
-            this.help = "読み上げるチャンネルを設定";
-
-            List<OptionData> options = new ArrayList<>();
-            options.add(new OptionData(OptionType.CHANNEL, "channel", "テキストチャンネル", true));
-
-            this.options = options;
+    private class Set : AdminCommand() {
+        init {
+            name = "set"
+            help = "読み上げるチャンネルを設定"
+            val options: MutableList<OptionData> = ArrayList()
+            options.add(OptionData(OptionType.CHANNEL, "channel", "テキストチャンネル", true))
+            this.options = options
         }
 
-        @Override
-        protected void execute(SlashCommandEvent event) {
-            Settings s = event.getClient().getSettingsFor(event.getGuild());
-
-
-            if (event.getOption("channel").getChannelType() != ChannelType.TEXT) {
-                event.reply(event.getClient().getError() + "テキストチャンネルを設定して下さい。").queue();
-                return;
+        override fun execute(event: SlashCommandEvent) {
+            val s = event.client.getSettingsFor<Settings>(event.guild)
+            if (event.getOption("channel")!!.channelType != ChannelType.TEXT) {
+                event.reply(event.client.error + "テキストチャンネルを設定して下さい。").queue()
+                return
             }
-            Long channelId = event.getOption("channel").getAsLong();
-            TextChannel tc = event.getGuild().getTextChannelById(channelId);
-
-            s.setTextChannel(tc);
-            event.reply(event.getClient().getSuccess() + "読み上げるチャンネルを<#" + tc.getId() + ">に設定しました。").queue();
-
+            val channelId = event.getOption("channel")!!.asLong
+            val tc = event.guild!!.getTextChannelById(channelId)
+            s.setTextChannel(tc)
+            event.reply(event.client.success + "読み上げるチャンネルを<#" + tc!!.id + ">に設定しました。").queue()
         }
     }
 
-    private static class None extends AdminCommand {
-        public None() {
-            this.name = "none";
-            this.help = "読み上げるチャンネル設定をリセットします。";
+    private class None : AdminCommand() {
+        init {
+            name = "none"
+            help = "読み上げるチャンネル設定をリセットします。"
         }
 
-        @Override
-        protected void execute(SlashCommandEvent event) {
-            if (!checkAdminPermission(event.getClient(), event)) {
-                event.reply(event.getClient().getWarning() + "権限がないため実行できません。").queue();
-                return;
+        override fun execute(event: SlashCommandEvent) {
+            if (!checkAdminPermission(event.client, event)) {
+                event.reply(event.client.warning + "権限がないため実行できません。").queue()
+                return
             }
-            Settings s = event.getClient().getSettingsFor(event.getGuild());
-            s.setTextChannel(null);
-            event.reply(event.getClient().getSuccess() + "読み上げるチャンネル設定をリセットしました。").queue();
+            val s = event.client.getSettingsFor<Settings>(event.guild)
+            s.setTextChannel(null)
+            event.reply(event.client.success + "読み上げるチャンネル設定をリセットしました。").queue()
         }
 
-        @Override
-        protected void execute(CommandEvent event) {
-            Settings s = event.getClient().getSettingsFor(event.getGuild());
-            s.setTextChannel(null);
-            event.reply(event.getClient().getSuccess() + "読み上げるチャンネル設定をリセットしました。");
+        override fun execute(event: CommandEvent) {
+            val s = event.client.getSettingsFor<Settings>(event.guild)
+            s.setTextChannel(null)
+            event.reply(event.client.success + "読み上げるチャンネル設定をリセットしました。")
         }
     }
-
-}
+}
\ No newline at end of file
diff --git a/src/main/java/dev/cosgy/textToSpeak/commands/dictionary/AddWordCmd.kt b/src/main/java/dev/cosgy/textToSpeak/commands/dictionary/AddWordCmd.kt
index 0a019e9..4f97a52 100644
--- a/src/main/java/dev/cosgy/textToSpeak/commands/dictionary/AddWordCmd.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/commands/dictionary/AddWordCmd.kt
@@ -13,104 +13,94 @@
 //     See the License for the specific language governing permissions and               /
 //     limitations under the License.                                                    /
 //////////////////////////////////////////////////////////////////////////////////////////
+package dev.cosgy.textToSpeak.commands.dictionary
 
-package dev.cosgy.TextToSpeak.commands.dictionary;
+import com.jagrosh.jdautilities.command.SlashCommand
+import com.jagrosh.jdautilities.command.SlashCommandEvent
+import com.jagrosh.jdautilities.menu.ButtonMenu
+import dev.cosgy.textToSpeak.Bot
+import net.dv8tion.jda.api.EmbedBuilder
+import net.dv8tion.jda.api.entities.Message
+import net.dv8tion.jda.api.entities.emoji.Emoji
+import net.dv8tion.jda.api.exceptions.PermissionException
+import net.dv8tion.jda.api.interactions.commands.OptionType
+import net.dv8tion.jda.api.interactions.commands.build.OptionData
+import org.slf4j.LoggerFactory
+import java.awt.Color
+import java.util.concurrent.TimeUnit
+import java.util.regex.Pattern
 
-import com.jagrosh.jdautilities.command.SlashCommand;
-import com.jagrosh.jdautilities.command.SlashCommandEvent;
-import com.jagrosh.jdautilities.menu.ButtonMenu;
-import dev.cosgy.TextToSpeak.Bot;
-import dev.cosgy.TextToSpeak.audio.Dictionary;
-import net.dv8tion.jda.api.EmbedBuilder;
-import net.dv8tion.jda.api.exceptions.PermissionException;
-import net.dv8tion.jda.api.interactions.commands.OptionType;
-import net.dv8tion.jda.api.interactions.commands.build.OptionData;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.awt.*;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-import java.util.regex.Pattern;
-
-public class AddWordCmd extends SlashCommand {
-    private static final Logger logger = LoggerFactory.getLogger(AddWordCmd.class);
-    private static final Color SUCCESS_COLOR = new Color(0, 163, 129);
-    private static final Color ERROR_COLOR = Color.RED;
-    private static final String INVALID_ARGS_MESSAGE = "コマンドが無効です。単語と読み方の２つを入力して実行して下さい。";
-    private static final String USAGE_MESSAGE = "使用方法: /addword <単語> <読み方>";
-    private static final String KATAKANA_REGEX = "^[ァ-ヶー]*$";
-    private final Bot bot;
-
-    public AddWordCmd(Bot bot) {
-        this.bot = bot;
-        this.name = "wdad";
-        this.help = "辞書に単語を追加します。辞書に単語が存在している場合は上書きされます。";
-        this.category = new Category("辞書");
-
-        List<OptionData> options = new ArrayList<>();
-        options.add(new OptionData(OptionType.STRING, "word", "単語", true));
-        options.add(new OptionData(OptionType.STRING, "reading", "読み方（カタカナ）", true));
-        this.options = options;
+class AddWordCmd(private val bot: Bot) : SlashCommand() {
+    init {
+        name = "wdad"
+        help = "辞書に単語を追加します。辞書に単語が存在している場合は上書きされます。"
+        this.category = Category("辞書")
+        val options: MutableList<OptionData> = ArrayList()
+        options.add(OptionData(OptionType.STRING, "word", "単語", true))
+        options.add(OptionData(OptionType.STRING, "reading", "読み方（カタカナ）", true))
+        this.options = options
     }
 
-    private static boolean isKatakana(String str) {
-        return Pattern.matches(KATAKANA_REGEX, str);
-    }
-
-    private void handleCommand(SlashCommandEvent event, String word, String reading) {
-        long guildId = event.getGuild().getIdLong();
-        Dictionary dictionary = bot.getDictionary();
-        boolean isWordExist = dictionary.getWords(guildId).containsKey(word);
-        event.deferReply().queue();
+    private fun handleCommand(event: SlashCommandEvent, word: String, reading: String) {
+        val guildId = event.guild!!.idLong
+        val dictionary = bot.dictionary
+        val isWordExist = dictionary!!.getWords(guildId).containsKey(word)
+        event.deferReply().queue()
         if (isWordExist) {
-            String no = "❌";
-            String ok = "✔";
-            new ButtonMenu.Builder()
+            val no = "❌"
+            val ok = "✔"
+            ButtonMenu.Builder()
                     .setText("単語が既に存在します。上書きしますか？")
                     .addChoices(no, ok)
-                    .setEventWaiter(bot.getWaiter())
+                    .setEventWaiter(bot.waiter)
                     .setTimeout(30, TimeUnit.SECONDS)
-                    .setAction(re -> {
-                        if (re.getName().equals(ok)) {
-                            dictionary.updateDictionary(guildId, word, reading);
-                            sendSuccessMessage(event);
+                    .setAction { re: Emoji ->
+                        if (re.name == ok) {
+                            dictionary.updateDictionary(guildId, word, reading)
+                            sendSuccessMessage(event)
                         } else {
-                            event.reply("辞書登録をキャンセルしました。").queue();
+                            event.reply("辞書登録をキャンセルしました。").queue()
                         }
-                    }).setFinalAction(m -> {
+                    }.setFinalAction { m: Message ->
                         try {
-                            m.clearReactions().queue();
-                            m.delete().queue();
-                        } catch (PermissionException ignore) {
+                            m.clearReactions().queue()
+                            m.delete().queue()
+                        } catch (ignore: PermissionException) {
                         }
-                    }).build().display(event.getMessageChannel());
+                    }.build().display(event.messageChannel)
         } else {
-            dictionary.updateDictionary(guildId, word, reading);
-            sendSuccessMessage(event);
+            dictionary.updateDictionary(guildId, word, reading)
+            sendSuccessMessage(event)
         }
     }
 
-    private void sendSuccessMessage(SlashCommandEvent event) {
-        EmbedBuilder builder = new EmbedBuilder()
+    private fun sendSuccessMessage(event: SlashCommandEvent) {
+        val builder = EmbedBuilder()
                 .setColor(SUCCESS_COLOR)
                 .setTitle("単語を追加しました。")
-                .addField("単語", "```" + event.getOption("word").getAsString() + "```", false)
-                .addField("読み", "```" + event.getOption("reading").getAsString() + "```", false);
-        event.replyEmbeds(builder.build()).queue();
+                .addField("単語", "```" + event.getOption("word")!!.asString + "```", false)
+                .addField("読み", "```" + event.getOption("reading")!!.asString + "```", false)
+        event.replyEmbeds(builder.build()).queue()
     }
 
-    @Override
-    protected void execute(SlashCommandEvent event) {
-        String word = event.getOption("word").getAsString();
-        String reading = event.getOption("reading").getAsString();
-
+    override fun execute(event: SlashCommandEvent) {
+        val word = event.getOption("word")!!.asString
+        val reading = event.getOption("reading")!!.asString
         if (!isKatakana(reading)) {
-            event.reply("読み方はすべてカタカナで入力して下さい。").setEphemeral(true).queue();
-            return;
+            event.reply("読み方はすべてカタカナで入力して下さい。").setEphemeral(true).queue()
+            return
         }
+        handleCommand(event, word, reading)
+    }
 
-        handleCommand(event, word, reading);
+    companion object {
+        private val SUCCESS_COLOR = Color(0, 163, 129)
+        private val ERROR_COLOR = Color.RED
+        private const val INVALID_ARGS_MESSAGE = "コマンドが無効です。単語と読み方の２つを入力して実行して下さい。"
+        private const val USAGE_MESSAGE = "使用方法: /addword <単語> <読み方>"
+        private const val KATAKANA_REGEX = "^[ァ-ヶー]*$"
+        private fun isKatakana(str: String): Boolean {
+            return Pattern.matches(KATAKANA_REGEX, str)
+        }
     }
 }
\ No newline at end of file
diff --git a/src/main/java/dev/cosgy/textToSpeak/commands/dictionary/DlWordCmd.kt b/src/main/java/dev/cosgy/textToSpeak/commands/dictionary/DlWordCmd.kt
index b9fbb72..6d84c69 100644
--- a/src/main/java/dev/cosgy/textToSpeak/commands/dictionary/DlWordCmd.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/commands/dictionary/DlWordCmd.kt
@@ -13,86 +13,62 @@
 //     See the License for the specific language governing permissions and               /
 //     limitations under the License.                                                    /
 //////////////////////////////////////////////////////////////////////////////////////////
-
-package dev.cosgy.TextToSpeak.commands.dictionary;
-
-import com.jagrosh.jdautilities.command.CommandEvent;
-import com.jagrosh.jdautilities.command.SlashCommand;
-import com.jagrosh.jdautilities.command.SlashCommandEvent;
-import dev.cosgy.TextToSpeak.Bot;
-import net.dv8tion.jda.api.EmbedBuilder;
-import net.dv8tion.jda.api.interactions.commands.OptionType;
-import net.dv8tion.jda.api.interactions.commands.build.OptionData;
-import org.slf4j.Logger;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-
-import static org.slf4j.LoggerFactory.getLogger;
-
-public class DlWordCmd extends SlashCommand {
-    private final Bot bot;
-    private final Logger log = getLogger(getClass());
-
-    public DlWordCmd(Bot bot) {
-        this.bot = bot;
-        this.name = "wddl";
-        this.help = "辞書に登録されている単語を削除します。";
-        this.category = new Category("辞書");
-
-        List<OptionData> options = new ArrayList<>();
-        options.add(new OptionData(OptionType.STRING, "word", "単語", true));
-
-        this.options = options;
+package dev.cosgy.textToSpeak.commands.dictionary
+
+import com.jagrosh.jdautilities.command.CommandEvent
+import com.jagrosh.jdautilities.command.SlashCommand
+import com.jagrosh.jdautilities.command.SlashCommandEvent
+import dev.cosgy.textToSpeak.Bot
+import net.dv8tion.jda.api.EmbedBuilder
+import net.dv8tion.jda.api.interactions.commands.OptionType
+import net.dv8tion.jda.api.interactions.commands.build.OptionData
+
+class DlWordCmd(private val bot: Bot) : SlashCommand() {
+
+    init {
+        name = "wddl"
+        help = "辞書に登録されている単語を削除します。"
+        this.category = Category("辞書")
+        val options: MutableList<OptionData> = ArrayList()
+        options.add(OptionData(OptionType.STRING, "word", "単語", true))
+        this.options = options
     }
 
-    @Override
-    protected void execute(SlashCommandEvent event) {
-        HashMap<String, String> words = bot.getDictionary().getWords(event.getGuild().getIdLong());
-
-        String args = event.getOption("word").getAsString();
-
-        if (!words.containsKey(args)) {
-            event.reply(args + "は、辞書に登録されていません。").queue();
-            return;
+    override fun execute(event: SlashCommandEvent) {
+        val words = bot.dictionary?.getWords(event.guild!!.idLong)
+        val args = event.getOption("word")!!.asString
+        if (!words!!.containsKey(args)) {
+            event.reply(args + "は、辞書に登録されていません。").queue()
+            return
         }
-
-        boolean result = bot.getDictionary().deleteDictionary(event.getGuild().getIdLong(), args);
-
-        if (result) {
-            event.reply(String.format("単語(%s)を削除しました。", args)).queue();
+        val result = bot.dictionary?.deleteDictionary(event.guild!!.idLong, args)
+        if (result == true) {
+            event.reply(String.format("単語(%s)を削除しました。", args)).queue()
         } else {
-            event.reply("削除中に問題が発生しました。").setEphemeral(true).queue();
+            event.reply("削除中に問題が発生しました。").setEphemeral(true).queue()
         }
     }
 
-    @Override
-    protected void execute(CommandEvent event) {
-        if (event.getArgs().isEmpty() && event.getMessage().getAttachments().isEmpty()) {
-            EmbedBuilder ebuilder = new EmbedBuilder()
+    override fun execute(event: CommandEvent) {
+        if (event.args.isEmpty() && event.message.attachments.isEmpty()) {
+            val ebuilder = EmbedBuilder()
                     .setTitle("dlwordコマンド")
-                    .addField("使用方法:", name + " <単語>", false)
-                    .addField("説明:", help, false);
-            event.reply(ebuilder.build());
-            return;
+                    .addField("使用方法:", "$name <単語>", false)
+                    .addField("説明:", help, false)
+            event.reply(ebuilder.build())
+            return
         }
-
-        HashMap<String, String> words = bot.getDictionary().getWords(event.getGuild().getIdLong());
-
-        String args = event.getArgs();
-
-        if (!words.containsKey(args)) {
-            event.reply(args + "は、辞書に登録されていません。");
-            return;
+        val words = bot.dictionary?.getWords(event.guild.idLong)
+        val args = event.args
+        if (!words!!.containsKey(args)) {
+            event.reply(args + "は、辞書に登録されていません。")
+            return
         }
-
-        boolean result = bot.getDictionary().deleteDictionary(event.getGuild().getIdLong(), args);
-
-        if (result) {
-            event.reply(String.format("単語(%s)を削除しました。", args));
+        val result = bot.dictionary?.deleteDictionary(event.guild.idLong, args)
+        if (result == true) {
+            event.reply(String.format("単語(%s)を削除しました。", args))
         } else {
-            event.reply("削除中に問題が発生しました。");
+            event.reply("削除中に問題が発生しました。")
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/main/java/dev/cosgy/textToSpeak/commands/dictionary/WordListCmd.kt b/src/main/java/dev/cosgy/textToSpeak/commands/dictionary/WordListCmd.kt
index 5fcfa53..feb2b93 100644
--- a/src/main/java/dev/cosgy/textToSpeak/commands/dictionary/WordListCmd.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/commands/dictionary/WordListCmd.kt
@@ -13,93 +13,86 @@
 //     See the License for the specific language governing permissions and               /
 //     limitations under the License.                                                    /
 //////////////////////////////////////////////////////////////////////////////////////////
+package dev.cosgy.textToSpeak.commands.dictionary
 
-package dev.cosgy.TextToSpeak.commands.dictionary;
+import com.jagrosh.jdautilities.command.CommandEvent
+import com.jagrosh.jdautilities.command.SlashCommand
+import com.jagrosh.jdautilities.command.SlashCommandEvent
+import com.jagrosh.jdautilities.menu.Paginator
+import dev.cosgy.textToSpeak.Bot
+import net.dv8tion.jda.api.Permission
+import net.dv8tion.jda.api.entities.Message
+import net.dv8tion.jda.api.exceptions.PermissionException
+import net.dv8tion.jda.api.interactions.InteractionHook
+import java.util.concurrent.TimeUnit
+import java.util.stream.Collectors
 
-import com.jagrosh.jdautilities.command.CommandEvent;
-import com.jagrosh.jdautilities.command.SlashCommand;
-import com.jagrosh.jdautilities.command.SlashCommandEvent;
-import com.jagrosh.jdautilities.menu.Paginator;
-import dev.cosgy.TextToSpeak.Bot;
-import net.dv8tion.jda.api.Permission;
-import net.dv8tion.jda.api.exceptions.PermissionException;
+class WordListCmd(private val bot: Bot) : SlashCommand() {
+    private val builder: Paginator.Builder
 
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
-
-public class WordListCmd extends SlashCommand {
-    private final Bot bot;
-    private final Paginator.Builder builder;
-
-    public WordListCmd(Bot bot) {
-        this.bot = bot;
-        this.name = "wdls";
-        this.help = "辞書に登録してある単語をリストアップします。";
-        this.category = new Category("辞書");
-        this.botPermissions = new Permission[]{Permission.MESSAGE_ADD_REACTION, Permission.MESSAGE_EMBED_LINKS};
-        builder = new Paginator.Builder()
+    init {
+        name = "wdls"
+        help = "辞書に登録してある単語をリストアップします。"
+        this.category = Category("辞書")
+        botPermissions = arrayOf(Permission.MESSAGE_ADD_REACTION, Permission.MESSAGE_EMBED_LINKS)
+        builder = Paginator.Builder()
                 .setColumns(1)
-                .setFinalAction(m -> {
+                .setFinalAction { m: Message ->
                     try {
-                        m.clearReactions().queue();
-                    } catch (PermissionException ignore) {
+                        m.clearReactions().queue()
+                    } catch (ignore: PermissionException) {
                     }
-                })
+                }
                 .setItemsPerPage(10)
                 .waitOnSinglePage(false)
                 .useNumberedItems(true)
                 .showPageNumbers(true)
                 .wrapPageEnds(true)
-                .setEventWaiter(bot.getWaiter())
-                .setTimeout(1, TimeUnit.MINUTES);
-
+                .setEventWaiter(bot.waiter)
+                .setTimeout(1, TimeUnit.MINUTES)
     }
 
-    @Override
-    protected void execute(SlashCommandEvent event) {
-        event.reply("単語一覧を表示します。").queue(m -> {
-            List<String> wordList = bot.getDictionary().getWords(event.getGuild().getIdLong())
-                    .entrySet().stream()
-                    .map(entry -> entry.getKey() + "-" + entry.getValue())
-                    .collect(Collectors.toList());
-
-            if (wordList.isEmpty()) {
-                m.editOriginal("単語が登録されていません。").queue();
-                return;
+    override fun execute(event: SlashCommandEvent) {
+        event.reply("単語一覧を表示します。").queue { m: InteractionHook ->
+            val wordList = bot.dictionary?.getWords(event.guild!!.idLong)
+                    ?.entries?.stream()
+                    ?.map { (key, value): Map.Entry<String?, String?> -> "$key-$value" }
+                    ?.collect(Collectors.toList())
+            if (wordList != null) {
+                if (wordList.isEmpty()) {
+                    m.editOriginal("単語が登録されていません。").queue()
+                    return@queue
+                }
             }
-
-            m.deleteOriginal().queue();
+            m.deleteOriginal().queue()
             builder.setText("単語一覧")
-                    .setItems(wordList.toArray(new String[0]))
-                    .setUsers(event.getUser())
-                    .setColor(event.getGuild().getSelfMember().getColor());
-            builder.build().paginate(event.getChannel(), 1);
-        });
+                    .setItems(*wordList!!.toTypedArray())
+                    .setUsers(event.user)
+                    .setColor(event.guild!!.selfMember.color)
+            builder.build().paginate(event.channel, 1)
+        }
     }
 
-    @Override
-    protected void execute(CommandEvent event) {
-        int pagenum = 1;
+    override fun execute(event: CommandEvent) {
+        var pagenum = 1
         try {
-            pagenum = Integer.parseInt(event.getArgs());
-        } catch (NumberFormatException ignore) {
+            pagenum = event.args.toInt()
+        } catch (ignore: NumberFormatException) {
         }
-
-        List<String> wordList = bot.getDictionary().getWords(event.getGuild().getIdLong())
-                .entrySet().stream()
-                .map(entry -> entry.getKey() + "-" + entry.getValue())
-                .collect(Collectors.toList());
-
-        if (wordList.isEmpty()) {
-            event.reply("単語が登録されていません。");
-            return;
+        val wordList = bot.dictionary?.getWords(event.guild.idLong)
+                ?.entries?.stream()
+                ?.map { (key, value): Map.Entry<String?, String?> -> "$key-$value" }
+                ?.collect(Collectors.toList())
+        if (wordList != null) {
+            if (wordList.isEmpty()) {
+                event.reply("単語が登録されていません。")
+                return
+            }
         }
-
         builder.setText("単語一覧")
-                .setItems(wordList.toArray(new String[0]))
-                .setUsers(event.getAuthor())
-                .setColor(event.getSelfMember().getColor());
-        builder.build().paginate(event.getChannel(), pagenum);
+                .setItems(*wordList!!.toTypedArray())
+                .setUsers(event.author)
+                .setColor(event.selfMember.color)
+        builder.build().paginate(event.channel, pagenum)
     }
-}
+}
\ No newline at end of file
diff --git a/src/main/java/dev/cosgy/textToSpeak/commands/general/AboutCommand.kt b/src/main/java/dev/cosgy/textToSpeak/commands/general/AboutCommand.kt
index b47cb34..4a92aaa 100644
--- a/src/main/java/dev/cosgy/textToSpeak/commands/general/AboutCommand.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/commands/general/AboutCommand.kt
@@ -13,133 +13,117 @@
 //     See the License for the specific language governing permissions and               /
 //     limitations under the License.                                                    /
 //////////////////////////////////////////////////////////////////////////////////////////
+package dev.cosgy.textToSpeak.commands.general
 
-package dev.cosgy.TextToSpeak.commands.general;
-
-import com.jagrosh.jdautilities.command.CommandClient;
-import com.jagrosh.jdautilities.command.CommandEvent;
-import com.jagrosh.jdautilities.command.SlashCommand;
-import com.jagrosh.jdautilities.command.SlashCommandEvent;
-import com.jagrosh.jdautilities.commons.JDAUtilitiesInfo;
-import com.jagrosh.jdautilities.doc.standard.CommandInfo;
-import net.dv8tion.jda.api.EmbedBuilder;
-import net.dv8tion.jda.api.JDA;
-import net.dv8tion.jda.api.JDAInfo;
-import net.dv8tion.jda.api.Permission;
-import net.dv8tion.jda.api.entities.ApplicationInfo;
-import net.dv8tion.jda.api.entities.channel.ChannelType;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.awt.*;
-import java.util.Objects;
+import com.jagrosh.jdautilities.command.CommandClient
+import com.jagrosh.jdautilities.command.CommandEvent
+import com.jagrosh.jdautilities.command.SlashCommand
+import com.jagrosh.jdautilities.command.SlashCommandEvent
+import com.jagrosh.jdautilities.commons.JDAUtilitiesInfo
+import com.jagrosh.jdautilities.doc.standard.CommandInfo
+import net.dv8tion.jda.api.EmbedBuilder
+import net.dv8tion.jda.api.JDA
+import net.dv8tion.jda.api.JDAInfo
+import net.dv8tion.jda.api.Permission
+import net.dv8tion.jda.api.entities.Guild
+import net.dv8tion.jda.api.entities.channel.ChannelType
+import org.slf4j.LoggerFactory
+import java.awt.Color
+import java.util.*
 
 /**
  * @author Kosugi_kun
  */
-@CommandInfo(
-        name = "About",
-        description = "ボットに関する情報を表示します"
-)
+@CommandInfo(name = ["About"], description = "ボットに関する情報を表示します")
+class AboutCommand(private val color: Color, private val description: String, vararg perms: Permission) : SlashCommand() {
+    private val perms: Array<out Permission>
+    private var isAuthor = true
+    private var replacementIcon = "+"
+    private var oauthLink: String? = null
 
-public class AboutCommand extends SlashCommand {
-    private final Color color;
-    private final String description;
-    private final Permission[] perms;
-    private boolean IS_AUTHOR = true;
-    private String REPLACEMENT_ICON = "+";
-    private String oauthLink;
-
-    public AboutCommand(Color color, String description, Permission... perms) {
-        this.color = color;
-        this.description = description;
-        this.name = "about";
-        this.help = "ボットに関する情報を表示します";
-        this.guildOnly = false;
-        this.perms = perms;
-        this.botPermissions = new Permission[]{Permission.MESSAGE_EMBED_LINKS};
+    init {
+        name = "about"
+        help = "ボットに関する情報を表示します"
+        guildOnly = false
+        this.perms = perms
+        botPermissions = arrayOf(Permission.MESSAGE_EMBED_LINKS)
     }
 
-    public void setIsAuthor(boolean value) {
-        this.IS_AUTHOR = value;
+    fun setIsAuthor(value: Boolean) {
+        isAuthor = value
     }
 
-    public void setReplacementCharacter(String value) {
-        this.REPLACEMENT_ICON = value;
+    fun setReplacementCharacter(value: String) {
+        replacementIcon = value
     }
 
-    @Override
-    protected void execute(SlashCommandEvent event) {
-        if (oauthLink == null) {
-            try {
-                ApplicationInfo info = event.getJDA().retrieveApplicationInfo().complete();
-                oauthLink = info.isBotPublic() ? info.getInviteUrl(0L, perms) : "";
-            } catch (Exception e) {
-                Logger log = LoggerFactory.getLogger("OAuth2");
-                log.error("招待リンクを生成できませんでした ", e);
-                oauthLink = "";
-            }
-        }
-        EmbedBuilder builder = new EmbedBuilder();
-        builder.setColor(event.isFromType(ChannelType.TEXT) ? event.getGuild().getSelfMember().getColor() : color);
-        builder.setAuthor(event.getJDA().getSelfUser().getName() + "について!", null, event.getJDA().getSelfUser().getAvatarUrl());
-        String CosgyOwner = "Cosgy Devが運営、開発をしています。";
-        String author = event.getJDA().getUserById(event.getClient().getOwnerId()) == null ? "<@" + event.getClient().getOwnerId() + ">"
-                : Objects.requireNonNull(event.getJDA().getUserById(event.getClient().getOwnerId())).getName();
-        StringBuilder descr = new StringBuilder().append("こんにちは！ **").append(event.getJDA().getSelfUser().getName()).append("**です。 ")
+    override fun execute(event: SlashCommandEvent) {
+        getOauthLink(event.jda)
+        val builder = EmbedBuilder()
+        builder.setColor(if (event.isFromType(ChannelType.TEXT)) event.guild!!.selfMember.color else color)
+        builder.setAuthor(event.jda.selfUser.name + "について!", null, event.jda.selfUser.avatarUrl)
+        val cosgyOwner = "Cosgy Devが運営、開発をしています。"
+        val author = if (event.jda.getUserById(event.client.ownerId) == null) "<@" + event.client.ownerId + ">" else Objects.requireNonNull(event.jda.getUserById(event.client.ownerId))?.name
+        val descr = StringBuilder().append("こんにちは！ **").append(event.jda.selfUser.name).append("**です。 ")
                 .append(description).append("は、").append(JDAUtilitiesInfo.AUTHOR + "の[コマンド拡張](" + JDAUtilitiesInfo.GITHUB + ") (")
                 .append(JDAUtilitiesInfo.VERSION).append(")と[JDAライブラリ](https://github.com/DV8FromTheWorld/JDA) (")
-                .append(JDAInfo.VERSION).append(")を使用しており、").append((IS_AUTHOR ? CosgyOwner : author + "が所有しています。"))
-                .append(event.getJDA().getSelfUser().getName()).append("についての質問などは[Cosgy Dev公式チャンネル](https://discord.gg/RBpkHxf)へお願いします。")
-                .append("\nこのボットの使用方法は`").append(event.getClient().getTextualPrefix()).append(event.getClient().getHelpWord())
-                .append("`で確認することができます。");
-        getMessage(builder, descr, event.getJDA(), event.getClient());
-        event.replyEmbeds(builder.build()).queue();
+                .append(JDAInfo.VERSION).append(")を使用しており、").append(if (isAuthor) cosgyOwner else author + "が所有しています。")
+                .append(event.jda.selfUser.name).append("についての質問などは[Cosgy Dev公式チャンネル](https://discord.gg/RBpkHxf)へお願いします。")
+                .append("\nこのボットの使用方法は`").append(event.client.textualPrefix).append(event.client.helpWord)
+                .append("`で確認することができます。")
+        getMessage(builder, descr, event.jda, event.client)
+        event.replyEmbeds(builder.build()).queue()
     }
 
-    private void getMessage(EmbedBuilder builder, StringBuilder descr, JDA jda, CommandClient client) {
-        builder.setDescription(descr);
-
-        if (jda.getShardInfo().getShardTotal() == 1) {
-            builder.addField("ステータス", jda.getGuilds().size() + " サーバー\n1 シャード", true);
-            builder.addField("ユーザー", jda.getUsers().size() + " ユニーク\n" + jda.getGuilds().stream().mapToInt(g -> g.getMembers().size()).sum() + " 合計", true);
-            builder.addField("チャンネル", jda.getTextChannels().size() + " テキスト\n" + jda.getVoiceChannels().size() + " ボイス", true);
+    private fun getMessage(builder: EmbedBuilder, descr: StringBuilder, jda: JDA, client: CommandClient) {
+        builder.setDescription(descr)
+        if (jda.shardInfo.shardTotal == 1) {
+            builder.addField("ステータス", """${jda.guilds.size} サーバー
+1 シャード""", true)
+            builder.addField("ユーザー", """${jda.users.size} ユニーク
+${jda.guilds.stream().mapToInt { g: Guild -> g.members.size }.sum()} 合計""", true)
+            builder.addField("チャンネル", """${jda.textChannels.size} テキスト
+${jda.voiceChannels.size} ボイス""", true)
         } else {
-            builder.addField("ステータス", (client).getTotalGuilds() + " サーバー\nシャード " + (jda.getShardInfo().getShardId() + 1)
-                    + "/" + jda.getShardInfo().getShardTotal(), true);
-            builder.addField("", jda.getUsers().size() + " ユーザーのシャード\n" + jda.getGuilds().size() + " サーバー", true);
-            builder.addField("", jda.getTextChannels().size() + " テキストチャンネル\n" + jda.getVoiceChannels().size() + " ボイスチャンネル", true);
+            builder.addField("ステータス", """${client.totalGuilds} サーバー
+シャード ${jda.shardInfo.shardId + 1}/${jda.shardInfo.shardTotal}""", true)
+            builder.addField("", """${jda.users.size} ユーザーのシャード
+${jda.guilds.size} サーバー""", true)
+            builder.addField("", """${jda.textChannels.size} テキストチャンネル
+${jda.voiceChannels.size} ボイスチャンネル""", true)
         }
-        builder.setFooter("再起動が行われた時間", "https://www.cosgy.dev/wp-content/uploads/2020/03/restart.jpg");
-        builder.setTimestamp(client.getStartTime());
+        builder.setFooter("再起動が行われた時間", "https://www.cosgy.dev/wp-content/uploads/2020/03/restart.jpg")
+        builder.setTimestamp(client.startTime)
     }
 
-    @Override
-    protected void execute(CommandEvent event) {
+    override fun execute(event: CommandEvent) {
+        getOauthLink(event.jda)
+        val builder = EmbedBuilder()
+        builder.setColor(if (event.isFromType(ChannelType.TEXT)) event.guild.selfMember.color else color)
+        builder.setAuthor(event.selfUser.name + "について!", null, event.selfUser.avatarUrl)
+        val cosgyOwner = "Cosgy Devが運営、開発をしています。"
+        val author = if (event.jda.getUserById(event.client.ownerId) == null) "<@" + event.client.ownerId + ">" else Objects.requireNonNull(event.jda.getUserById(event.client.ownerId))?.name
+        val descr = StringBuilder().append("こんにちは！ **").append(event.selfUser.name).append("**です。 ")
+                .append(description).append("は、").append(JDAUtilitiesInfo.AUTHOR + "の[コマンド拡張](" + JDAUtilitiesInfo.GITHUB + ") (")
+                .append(JDAUtilitiesInfo.VERSION).append(")と[JDAライブラリ](https://github.com/DV8FromTheWorld/JDA) (")
+                .append(JDAInfo.VERSION).append(")を使用しており、").append(if (isAuthor) cosgyOwner else author + "が所有しています。")
+                .append(event.selfUser.name).append("についての質問などは[Cosgy Dev公式チャンネル](https://discord.gg/RBpkHxf)へお願いします。")
+                .append("\nこのボットの使用方法は`").append(event.client.textualPrefix).append(event.client.helpWord)
+                .append("`で確認することができます。")
+        getMessage(builder, descr, event.jda, event.client)
+        event.reply(builder.build())
+    }
+
+    fun getOauthLink(jda: JDA){
         if (oauthLink == null) {
-            try {
-                ApplicationInfo info = event.getJDA().retrieveApplicationInfo().complete();
-                oauthLink = info.isBotPublic() ? info.getInviteUrl(0L, perms) : "";
-            } catch (Exception e) {
-                Logger log = LoggerFactory.getLogger("OAuth2");
-                log.error("招待リンクを生成できませんでした ", e);
-                oauthLink = "";
+            oauthLink = try {
+                val info = jda.retrieveApplicationInfo().complete()
+                if (info.isBotPublic) info.getInviteUrl(0L, *perms) else ""
+            } catch (e: Exception) {
+                val log = LoggerFactory.getLogger("OAuth2")
+                log.error("招待リンクを生成できませんでした ", e)
+                ""
             }
         }
-        EmbedBuilder builder = new EmbedBuilder();
-        builder.setColor(event.isFromType(ChannelType.TEXT) ? event.getGuild().getSelfMember().getColor() : color);
-        builder.setAuthor(event.getSelfUser().getName() + "について!", null, event.getSelfUser().getAvatarUrl());
-        String CosgyOwner = "Cosgy Devが運営、開発をしています。";
-        String author = event.getJDA().getUserById(event.getClient().getOwnerId()) == null ? "<@" + event.getClient().getOwnerId() + ">"
-                : Objects.requireNonNull(event.getJDA().getUserById(event.getClient().getOwnerId())).getName();
-        StringBuilder descr = new StringBuilder().append("こんにちは！ **").append(event.getSelfUser().getName()).append("**です。 ")
-                .append(description).append("は、").append(JDAUtilitiesInfo.AUTHOR + "の[コマンド拡張](" + JDAUtilitiesInfo.GITHUB + ") (")
-                .append(JDAUtilitiesInfo.VERSION).append(")と[JDAライブラリ](https://github.com/DV8FromTheWorld/JDA) (")
-                .append(JDAInfo.VERSION).append(")を使用しており、").append((IS_AUTHOR ? CosgyOwner : author + "が所有しています。"))
-                .append(event.getSelfUser().getName()).append("についての質問などは[Cosgy Dev公式チャンネル](https://discord.gg/RBpkHxf)へお願いします。")
-                .append("\nこのボットの使用方法は`").append(event.getClient().getTextualPrefix()).append(event.getClient().getHelpWord())
-                .append("`で確認することができます。");
-        getMessage(builder, descr, event.getJDA(), event.getClient());
-        event.reply(builder.build());
     }
-}
+}
\ No newline at end of file
diff --git a/src/main/java/dev/cosgy/textToSpeak/commands/general/ByeCmd.kt b/src/main/java/dev/cosgy/textToSpeak/commands/general/ByeCmd.kt
index f903010..ea9f855 100644
--- a/src/main/java/dev/cosgy/textToSpeak/commands/general/ByeCmd.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/commands/general/ByeCmd.kt
@@ -13,62 +13,53 @@
 //     See the License for the specific language governing permissions and               /
 //     limitations under the License.                                                    /
 //////////////////////////////////////////////////////////////////////////////////////////
+package dev.cosgy.textToSpeak.commands.general
 
-package dev.cosgy.TextToSpeak.commands.general;
+import com.jagrosh.jdautilities.command.CommandEvent
+import com.jagrosh.jdautilities.command.SlashCommand
+import com.jagrosh.jdautilities.command.SlashCommandEvent
+import dev.cosgy.textToSpeak.Bot
+import dev.cosgy.textToSpeak.audio.AudioHandler
+import net.dv8tion.jda.api.EmbedBuilder
+import java.awt.Color
+import java.io.IOException
 
-import com.jagrosh.jdautilities.command.CommandEvent;
-import com.jagrosh.jdautilities.command.SlashCommand;
-import com.jagrosh.jdautilities.command.SlashCommandEvent;
-import dev.cosgy.TextToSpeak.Bot;
-import dev.cosgy.TextToSpeak.audio.AudioHandler;
-import net.dv8tion.jda.api.EmbedBuilder;
-
-import java.awt.*;
-import java.io.IOException;
-
-public class ByeCmd extends SlashCommand {
-    protected final Bot bot;
-
-    public ByeCmd(Bot bot) {
-        this.bot = bot;
-        this.name = "bye";
-        this.help = "ボイスチャンネルから退出します。";
-        this.guildOnly = true;
+class ByeCmd(private val bot: Bot) : SlashCommand() {
+    init {
+        name = "bye"
+        help = "ボイスチャンネルから退出します。"
+        guildOnly = true
     }
 
-    @Override
-    protected void execute(SlashCommandEvent event) {
-        AudioHandler handler = (AudioHandler) event.getGuild().getAudioManager().getSendingHandler();
-        handler.stopAndClear();
+    override fun execute(event: SlashCommandEvent) {
+        val handler = event.guild!!.audioManager.sendingHandler as AudioHandler?
+        handler!!.stopAndClear()
         try {
-            bot.getVoiceCreation().clearGuildFolder(event.getGuild());
-        } catch (IOException e) {
-            throw new RuntimeException(e);
+            bot.voiceCreation.clearGuildFolder(event.guild!!)
+        } catch (e: IOException) {
+            throw RuntimeException(e)
         }
-        event.getGuild().getAudioManager().closeAudioConnection();
-
-        EmbedBuilder builder = new EmbedBuilder();
-        builder.setColor(new Color(180, 76, 151));
-        builder.setTitle("VCから切断");
-        builder.setDescription("ボイスチャンネルから切断しました。");
-        event.replyEmbeds(builder.build()).queue();
+        event.guild!!.audioManager.closeAudioConnection()
+        val builder = EmbedBuilder()
+        builder.setColor(Color(180, 76, 151))
+        builder.setTitle("VCから切断")
+        builder.setDescription("ボイスチャンネルから切断しました。")
+        event.replyEmbeds(builder.build()).queue()
     }
 
-    @Override
-    protected void execute(CommandEvent event) {
-        AudioHandler handler = (AudioHandler) event.getGuild().getAudioManager().getSendingHandler();
-        handler.stopAndClear();
+    override fun execute(event: CommandEvent) {
+        val handler = event.guild.audioManager.sendingHandler as AudioHandler?
+        handler!!.stopAndClear()
         try {
-            bot.getVoiceCreation().clearGuildFolder(event.getGuild());
-        } catch (IOException e) {
-            throw new RuntimeException(e);
+            bot.voiceCreation.clearGuildFolder(event.guild)
+        } catch (e: IOException) {
+            throw RuntimeException(e)
         }
-        event.getGuild().getAudioManager().closeAudioConnection();
-
-        EmbedBuilder builder = new EmbedBuilder();
-        builder.setColor(new Color(180, 76, 151));
-        builder.setTitle("VCから切断");
-        builder.setDescription("ボイスチャンネルから切断しました。");
-        event.reply(builder.build());
+        event.guild.audioManager.closeAudioConnection()
+        val builder = EmbedBuilder()
+        builder.setColor(Color(180, 76, 151))
+        builder.setTitle("VCから切断")
+        builder.setDescription("ボイスチャンネルから切断しました。")
+        event.reply(builder.build())
     }
-}
+}
\ No newline at end of file
diff --git a/src/main/java/dev/cosgy/textToSpeak/commands/general/HelpCmd.kt b/src/main/java/dev/cosgy/textToSpeak/commands/general/HelpCmd.kt
index 8dba584..3c4fe5c 100644
--- a/src/main/java/dev/cosgy/textToSpeak/commands/general/HelpCmd.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/commands/general/HelpCmd.kt
@@ -13,88 +13,74 @@
 //     See the License for the specific language governing permissions and               /
 //     limitations under the License.                                                    /
 //////////////////////////////////////////////////////////////////////////////////////////
+package dev.cosgy.textToSpeak.commands.general
 
-package dev.cosgy.TextToSpeak.commands.general;
+import com.jagrosh.jdautilities.command.CommandEvent
+import com.jagrosh.jdautilities.command.SlashCommand
+import com.jagrosh.jdautilities.command.SlashCommandEvent
+import dev.cosgy.textToSpeak.Bot
+import net.dv8tion.jda.api.EmbedBuilder
+import net.dv8tion.jda.api.entities.Message
+import net.dv8tion.jda.api.entities.channel.ChannelType
+import net.dv8tion.jda.api.entities.channel.concrete.PrivateChannel
+import java.awt.Color
 
-import com.jagrosh.jdautilities.command.Command;
-import com.jagrosh.jdautilities.command.CommandEvent;
-import com.jagrosh.jdautilities.command.SlashCommand;
-import com.jagrosh.jdautilities.command.SlashCommandEvent;
-import dev.cosgy.TextToSpeak.Bot;
-import net.dv8tion.jda.api.EmbedBuilder;
-import net.dv8tion.jda.api.entities.channel.ChannelType;
-
-import java.awt.*;
-import java.util.List;
-import java.util.Objects;
-
-public class HelpCmd extends SlashCommand {
-    public Bot bot;
-
-    public HelpCmd(Bot bot) {
-        this.bot = bot;
-        this.name = "help";
-        this.help = "コマンド一覧を表示します。";
+class HelpCmd(var bot: Bot) : SlashCommand() {
+    init {
+        name = "help"
+        help = "コマンド一覧を表示します。"
     }
 
-    @Override
-    protected void execute(SlashCommandEvent event) {
-        EmbedBuilder eBuilder = new EmbedBuilder();
-        eBuilder.setTitle("**" + event.getJDA().getSelfUser().getName() + "** コマンド一覧");
-        eBuilder.setColor(new Color(245, 229, 107));
-
-        StringBuilder builder = new StringBuilder();
-        Category category = null;
-        List<SlashCommand> commands = event.getClient().getSlashCommands();
-        for (SlashCommand command : commands) {
-            if (!command.isHidden() && (!command.isOwnerCommand() || event.getMember().isOwner())) {
-                if (!Objects.equals(category, command.getCategory())) {
-                    category = command.getCategory();
-                    builder.append("\n\n  __").append(category == null ? "カテゴリなし" : category.getName()).append("__:\n");
+    override fun execute(event: SlashCommandEvent) {
+        val eBuilder = EmbedBuilder()
+        eBuilder.setTitle("**" + event.jda.selfUser.name + "** コマンド一覧")
+        eBuilder.setColor(Color(245, 229, 107))
+        val builder = StringBuilder()
+        var category: Category? = null
+        val commands = event.client.slashCommands
+        for (command in commands) {
+            if (!command.isHidden && (!command.isOwnerCommand || event.member!!.isOwner)) {
+                if (category != command.category) {
+                    category = command.category
+                    builder.append("\n\n  __").append(if (category == null) "カテゴリなし" else category.name).append("__:\n")
                 }
-                builder.append("\n`").append("/").append(command.getName())
-                        .append(command.getArguments() == null ? "`" : " " + command.getArguments() + "`")
-                        .append(" - ").append(command.getHelp());
+                builder.append("\n`").append("/").append(command.name)
+                        .append(if (command.arguments == null) "`" else " " + command.arguments + "`")
+                        .append(" - ").append(command.help)
             }
         }
-        if (event.getClient().getServerInvite() != null)
-            builder.append("\n\nさらにヘルプが必要な場合は、公式サーバーに参加することもできます: ").append(client.getServerInvite());
-
-        eBuilder.setDescription(builder);
-
-        if (bot.getConfig().getHelpToDm()) {
-            event.getUser().openPrivateChannel().flatMap(channel -> channel.sendMessageEmbeds(eBuilder.build())).queue();
+        if (event.client.serverInvite != null) builder.append("\n\nさらにヘルプが必要な場合は、公式サーバーに参加することもできます: ").append(event.client.serverInvite)
+        eBuilder.setDescription(builder)
+        if (bot.config.helpToDm) {
+            event.user.openPrivateChannel().flatMap { channel: PrivateChannel -> channel.sendMessageEmbeds(eBuilder.build()) }.queue()
         } else {
-            event.replyEmbeds(eBuilder.build()).queue();
+            event.replyEmbeds(eBuilder.build()).queue()
         }
     }
 
-    public void execute(CommandEvent event) {
-        StringBuilder builder = new StringBuilder("**" + event.getJDA().getSelfUser().getName() + "** コマンド一覧:\n");
-        Category category = null;
-        List<Command> commands = event.getClient().getCommands();
-        for (Command command : commands) {
-            if (!command.isHidden() && (!command.isOwnerCommand() || event.isOwner())) {
-                if (!Objects.equals(category, command.getCategory())) {
-                    category = command.getCategory();
-                    builder.append("\n\n  __").append(category == null ? "カテゴリなし" : category.getName()).append("__:\n");
+    public override fun execute(event: CommandEvent) {
+        val builder = StringBuilder("""
+    **${event.jda.selfUser.name}** コマンド一覧:
+    
+    """.trimIndent())
+        var category: Category? = null
+        val commands = event.client.commands
+        for (command in commands) {
+            if (!command.isHidden && (!command.isOwnerCommand || event.isOwner)) {
+                if (category != command.category) {
+                    category = command.category
+                    builder.append("\n\n  __").append(if (category == null) "カテゴリなし" else category.name).append("__:\n")
                 }
-                builder.append("\n`").append(event.getClient().getTextualPrefix()).append(event.getClient().getPrefix() == null ? " " : "").append(command.getName())
-                        .append(command.getArguments() == null ? "`" : " " + command.getArguments() + "`")
-                        .append(" - ").append(command.getHelp());
+                builder.append("\n`").append(event.client.textualPrefix).append(if (event.client.prefix == null) " " else "").append(command.name)
+                        .append(if (command.arguments == null) "`" else " " + command.arguments + "`")
+                        .append(" - ").append(command.help)
             }
         }
-        if (event.getClient().getServerInvite() != null)
-            builder.append("\n\nさらにヘルプが必要な場合は、公式サーバーに参加することもできます: ").append(event.getClient().getServerInvite());
-
-        if (bot.getConfig().getHelpToDm()) {
-            event.replyInDm(builder.toString(), unused ->
-            {
-                if (event.isFromType(ChannelType.TEXT))
-                    event.reactSuccess();
-            }, t -> event.replyWarning("ダイレクトメッセージをブロックしているため、ヘルプを送信できません。"));
+        if (event.client.serverInvite != null) builder.append("\n\nさらにヘルプが必要な場合は、公式サーバーに参加することもできます: ").append(event.client.serverInvite)
+        if (bot.config.helpToDm) {
+            event.replyInDm(builder.toString(), { _: Message? -> if (event.isFromType(ChannelType.TEXT)) event.reactSuccess() }) { _: Throwable? -> event.replyWarning("ダイレクトメッセージをブロックしているため、ヘルプを送信できません。") }
         } else {
-            event.reply(builder.toString());
+            event.reply(builder.toString())
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/main/java/dev/cosgy/textToSpeak/commands/general/JoinCmd.kt b/src/main/java/dev/cosgy/textToSpeak/commands/general/JoinCmd.kt
index 49098b2..0122539 100644
--- a/src/main/java/dev/cosgy/textToSpeak/commands/general/JoinCmd.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/commands/general/JoinCmd.kt
@@ -13,102 +13,86 @@
 //     See the License for the specific language governing permissions and               /
 //     limitations under the License.                                                    /
 //////////////////////////////////////////////////////////////////////////////////////////
-
-package dev.cosgy.TextToSpeak.commands.general;
-
-import com.jagrosh.jdautilities.command.CommandEvent;
-import com.jagrosh.jdautilities.command.SlashCommand;
-import com.jagrosh.jdautilities.command.SlashCommandEvent;
-import dev.cosgy.TextToSpeak.Bot;
-import dev.cosgy.TextToSpeak.settings.Settings;
-import dev.cosgy.TextToSpeak.utils.ReadChannel;
-import net.dv8tion.jda.api.EmbedBuilder;
-import net.dv8tion.jda.api.entities.GuildVoiceState;
-import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
-import net.dv8tion.jda.api.exceptions.PermissionException;
-
-import java.awt.*;
-
-public class JoinCmd extends SlashCommand {
-    protected Bot bot;
-
-    public JoinCmd(Bot bot) {
-        this.bot = bot;
-        this.name = "join";
-        this.help = "ボイスチャンネルに参加します。";
-        this.guildOnly = true;
+package dev.cosgy.textToSpeak.commands.general
+
+import com.jagrosh.jdautilities.command.CommandEvent
+import com.jagrosh.jdautilities.command.SlashCommand
+import com.jagrosh.jdautilities.command.SlashCommandEvent
+import dev.cosgy.textToSpeak.Bot
+import dev.cosgy.textToSpeak.settings.Settings
+import dev.cosgy.textToSpeak.utils.ReadChannel
+import net.dv8tion.jda.api.EmbedBuilder
+import net.dv8tion.jda.api.exceptions.PermissionException
+import java.awt.Color
+
+class JoinCmd(private var bot: Bot) : SlashCommand() {
+    init {
+        name = "join"
+        help = "ボイスチャンネルに参加します。"
+        guildOnly = true
     }
 
-    @Override
-    protected void execute(SlashCommandEvent event) {
-        event.deferReply().queue();
-        Settings settings = event.getClient().getSettingsFor(event.getGuild());
-        TextChannel channel = settings.getTextChannel(event.getGuild());
+    override fun execute(event: SlashCommandEvent) {
+        event.deferReply().queue()
+        val settings = event.client.getSettingsFor<Settings>(event.guild)
+        val channel = settings.getTextChannel(event.guild)
         // VoiceChannel voiceChannel = settings.getVoiceChannel(event.getGuild());
-        bot.getPlayerManager().setUpHandler(event.getGuild());
-
-        GuildVoiceState userState = event.getMember().getVoiceState();
-        EmbedBuilder builder = new EmbedBuilder();
-
-        builder.setColor(new Color(76, 108, 179));
-        builder.setTitle("VCに接続");
-
-        if (!userState.inAudioChannel() || userState.isDeafened()) {
-            builder.setDescription(String.format("このコマンドを使用するには、%sに参加している必要があります。", "音声チャンネル"));
-            event.replyEmbeds(builder.build()).queue();
-            return;
+        bot.playerManager.setUpHandler(event.guild!!)
+        val userState = event.member!!.voiceState
+        val builder = EmbedBuilder()
+        builder.setColor(Color(76, 108, 179))
+        builder.setTitle("VCに接続")
+        if (!userState!!.inAudioChannel() || userState.isDeafened) {
+            builder.setDescription(String.format("このコマンドを使用するには、%sに参加している必要があります。", "音声チャンネル"))
+            event.replyEmbeds(builder.build()).queue()
+            return
+        }
+        if (channel == null) {
+            builder.addField("読み上げ対象", event.channel.name, true)
+        } else {
+            builder.addField("読み上げ対象", channel.name, true)
         }
-
-        builder.addField("読み上げ対象", "<#" + event.getChannel().getId() + ">", false);
-
         try {
-            event.getGuild().getAudioManager().openAudioConnection(userState.getChannel());
-            builder.addField("ボイスチャンネル", String.format("**%s**", userState.getChannel().getName()), false);
-            builder.setDescription("ボイスチャンネルへの接続に成功しました。");
-
-            event.getHook().sendMessageEmbeds(builder.build()).queue();
-            ReadChannel.setChannel(event.getGuild().getIdLong(), event.getTextChannel().getIdLong());
-        } catch (PermissionException ex) {
-            builder.appendDescription(event.getClient().getError() + String.format("**%s**に接続できません!", userState.getChannel().getName()));
-            builder.addField("ボイスチャンネル", event.getClient().getError() + String.format("**%s**に接続できません!",
-                    userState.getChannel().getName()), false);
-            event.getHook().sendMessageEmbeds(builder.build()).queue();
+            event.guild!!.audioManager.openAudioConnection(userState.channel)
+            builder.addField("ボイスチャンネル", String.format("**%s**", userState.channel!!.name), false)
+            builder.setDescription("ボイスチャンネルへの接続に成功しました。")
+            event.hook.sendMessageEmbeds(builder.build()).queue()
+            ReadChannel.setChannel(event.guild!!.idLong, event.textChannel.idLong)
+        } catch (ex: PermissionException) {
+            builder.appendDescription(event.client.error + String.format("**%s**に接続できません!", userState.channel!!.name))
+            builder.addField("ボイスチャンネル", event.client.error + String.format("**%s**に接続できません!",
+                    userState.channel!!.name), false)
+            event.hook.sendMessageEmbeds(builder.build()).queue()
         }
     }
 
-    @Override
-    protected void execute(CommandEvent event) {
-        Settings settings = event.getClient().getSettingsFor(event.getGuild());
-        TextChannel channel = settings.getTextChannel(event.getGuild());
-        bot.getPlayerManager().setUpHandler(event.getGuild());
-
-        GuildVoiceState userState = event.getMember().getVoiceState();
-
-        EmbedBuilder builder = new EmbedBuilder();
-        builder.setColor(new Color(76, 108, 179));
-        builder.setTitle("VCに接続");
-
-        if (!userState.inAudioChannel()) {
-            builder.setDescription("このコマンドを使用するには、ボイスチャンネルに参加している必要があります。");
-            event.reply(builder.build());
-            return;
+    override fun execute(event: CommandEvent) {
+        val settings = event.client.getSettingsFor<Settings>(event.guild)
+        val channel = settings.getTextChannel(event.guild)
+        bot.playerManager.setUpHandler(event.guild)
+        val userState = event.member.voiceState
+        val builder = EmbedBuilder()
+        builder.setColor(Color(76, 108, 179))
+        builder.setTitle("VCに接続")
+        if (!userState!!.inAudioChannel()) {
+            builder.setDescription("このコマンドを使用するには、ボイスチャンネルに参加している必要があります。")
+            event.reply(builder.build())
+            return
         }
         if (channel == null) {
-            builder.addField("読み上げ対象", event.getChannel().getName(), true);
+            builder.addField("読み上げ対象", event.channel.name, true)
         } else {
-            builder.addField("読み上げ対象", channel.getName(), true);
+            builder.addField("読み上げ対象", channel.name, true)
         }
         try {
-            event.getGuild().getAudioManager().openAudioConnection(userState.getChannel());
-            builder.addField("ボイスチャンネル", String.format("**%s**", userState.getChannel().getName()), false);
-            builder.setDescription("ボイスチャンネルへの接続に成功しました。");
-
-
-            event.reply(builder.build());
-            ReadChannel.setChannel(event.getGuild().getIdLong(), event.getTextChannel().getIdLong());
-        } catch (PermissionException ex) {
-            builder.setDescription("ボイスチャンネルへの接続に失敗しました。");
-            event.reply(builder.build());
+            event.guild.audioManager.openAudioConnection(userState.channel)
+            builder.addField("ボイスチャンネル", String.format("**%s**", userState.channel!!.name), false)
+            builder.setDescription("ボイスチャンネルへの接続に成功しました。")
+            event.reply(builder.build())
+            ReadChannel.setChannel(event.guild.idLong, event.textChannel.idLong)
+        } catch (ex: PermissionException) {
+            builder.setDescription("ボイスチャンネルへの接続に失敗しました。")
+            event.reply(builder.build())
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/main/java/dev/cosgy/textToSpeak/commands/general/SetIntonationCmd.kt b/src/main/java/dev/cosgy/textToSpeak/commands/general/SetIntonationCmd.kt
index e143f3e..3c6ff42 100644
--- a/src/main/java/dev/cosgy/textToSpeak/commands/general/SetIntonationCmd.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/commands/general/SetIntonationCmd.kt
@@ -13,97 +13,58 @@
 //     See the License for the specific language governing permissions and               /
 //     limitations under the License.                                                    /
 //////////////////////////////////////////////////////////////////////////////////////////
+package dev.cosgy.textToSpeak.commands.general
 
-package dev.cosgy.TextToSpeak.commands.general;
+import com.jagrosh.jdautilities.command.CommandEvent
+import com.jagrosh.jdautilities.command.SlashCommand
+import com.jagrosh.jdautilities.command.SlashCommandEvent
+import dev.cosgy.textToSpeak.Bot
+import net.dv8tion.jda.api.EmbedBuilder
+import net.dv8tion.jda.api.interactions.commands.OptionType
+import net.dv8tion.jda.api.interactions.commands.build.OptionData
+import java.math.BigDecimal
 
-import com.jagrosh.jdautilities.command.CommandEvent;
-import com.jagrosh.jdautilities.command.SlashCommand;
-import com.jagrosh.jdautilities.command.SlashCommandEvent;
-import dev.cosgy.TextToSpeak.Bot;
-import dev.cosgy.TextToSpeak.settings.UserSettings;
-import net.dv8tion.jda.api.EmbedBuilder;
-import net.dv8tion.jda.api.interactions.commands.OptionType;
-import net.dv8tion.jda.api.interactions.commands.build.OptionData;
-
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-
-public class SetIntonationCmd extends SlashCommand {
-    protected Bot bot;
-
-    public SetIntonationCmd(Bot bot) {
-        this.bot = bot;
-        this.name = "setinto";
-        this.help = "F0系列内変動の重みの設定を変更します。";
-        this.guildOnly = false;
-        this.category = new Category("設定");
-
-        List<OptionData> options = new ArrayList<>();
-        options.add(new OptionData(OptionType.STRING, "value", "0.1~100.0", true));
-
-        this.options = options;
+class SetIntonationCmd(private val bot: Bot) : SlashCommand() {
+    init {
+        name = "setinto"
+        help = "F0系列内変動の重みの設定を変更します。"
+        guildOnly = false
+        category = Category("設定")
+        options = listOf(OptionData(OptionType.STRING, "value", "0.1~100.0", true))
     }
 
-    @Override
-    protected void execute(SlashCommandEvent event) {
-        String args = event.getOption("value").getAsString();
-        boolean result;
-        BigDecimal bd = null;
-        try {
-            bd = new BigDecimal(args);
-            result = true;
-        } catch (NumberFormatException e) {
-            result = false;
-        }
-        if (!result) {
-            event.reply("数値を設定して下さい。").queue();
-            return;
-        }
-        BigDecimal min = new BigDecimal("0.0");
-        BigDecimal max = new BigDecimal("100.0");
+    override fun execute(event: SlashCommandEvent) {
+        val bd = event.getOption("value")?.asString?.toBigDecimalOrNull()
 
-        if (!(min.compareTo(bd) < 0 && max.compareTo(bd) > 0)) {
-            event.reply("有効な数値を設定して下さい。0.1~100.0").queue();
-            return;
+        if (bd == null || bd < BigDecimal.ZERO || bd > BigDecimal("100.0")) {
+            event.reply("有効な数値を設定してください。0.1~100.0").queue()
+            return
         }
-        UserSettings settings = bot.getUserSettingsManager().getSettings(event.getUser().getIdLong());
-        settings.setIntonation(bd.floatValue());
-        event.reply("F0系列内変動の重みを" + bd + "に設定しました。").queue();
+
+        val settings = bot.userSettingsManager.getSettings(event.user.idLong)
+        settings.intonation = bd.toFloat()
+        event.reply("F0系列内変動の重みを$bd に設定しました。").queue()
     }
 
-    @Override
-    protected void execute(CommandEvent event) {
-        if (event.getArgs().isEmpty() && event.getMessage().getAttachments().isEmpty()) {
-            EmbedBuilder ebuilder = new EmbedBuilder()
+    override fun execute(event: CommandEvent) {
+        if (event.args.isEmpty()) {
+            val ebuilder = EmbedBuilder()
                     .setTitle("setintoコマンド")
-                    .addField("使用方法:", name + " <数値(0.0~)>", false)
-                    .addField("説明:", "F0系列内変動の重みを変更します。F0系列内変動の重みは、0.0以上の数値で設定して下さい。", false);
-            event.reply(ebuilder.build());
-            return;
-        }
-        String args = event.getArgs();
-        boolean result;
-        BigDecimal bd = null;
-        try {
-            bd = new BigDecimal(args);
-            result = true;
-        } catch (NumberFormatException e) {
-            result = false;
+                    .addField("使用方法:", "$name <数値(0.0~)>", false)
+                    .addField("説明:", "F0系列内変動の重みを変更します。F0系列内変動の重みは、0.0以上の数値で設定して下さい。", false)
+            event.reply(ebuilder.build())
+            return
         }
-        if (!result) {
-            event.reply("数値を設定して下さい。");
-            return;
-        }
-        BigDecimal min = new BigDecimal("0.0");
-        BigDecimal max = new BigDecimal("100.0");
 
-        if (!(min.compareTo(bd) < 0 && max.compareTo(bd) > 0)) {
-            event.reply("有効な数値を設定して下さい。0.1~100.0");
-            return;
+        val bd = event.args.toBigDecimalOrNull()
+
+        if (bd == null || bd < BigDecimal.ZERO || bd > BigDecimal("100.0")) {
+            event.reply("有効な数値を設定してください。0.1~100.0")
+            return
         }
-        UserSettings settings = bot.getUserSettingsManager().getSettings(event.getAuthor().getIdLong());
-        settings.setIntonation(bd.floatValue());
-        event.reply("F0系列内変動の重みを" + bd + "に設定しました。");
+
+        val settings = bot.userSettingsManager.getSettings(event.author.idLong)
+        settings.intonation = bd.toFloat()
+        event.reply("F0系列内変動の重みを$bd に設定しました。")
     }
 }
diff --git a/src/main/java/dev/cosgy/textToSpeak/commands/general/SetSpeedCmd.kt b/src/main/java/dev/cosgy/textToSpeak/commands/general/SetSpeedCmd.kt
index 2c39686..fc17aa7 100644
--- a/src/main/java/dev/cosgy/textToSpeak/commands/general/SetSpeedCmd.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/commands/general/SetSpeedCmd.kt
@@ -13,99 +13,75 @@
 //     See the License for the specific language governing permissions and               /
 //     limitations under the License.                                                    /
 //////////////////////////////////////////////////////////////////////////////////////////
+package dev.cosgy.textToSpeak.commands.general
 
-package dev.cosgy.TextToSpeak.commands.general;
+import com.jagrosh.jdautilities.command.CommandEvent
+import com.jagrosh.jdautilities.command.SlashCommand
+import com.jagrosh.jdautilities.command.SlashCommandEvent
+import dev.cosgy.textToSpeak.Bot
+import net.dv8tion.jda.api.EmbedBuilder
+import net.dv8tion.jda.api.interactions.commands.OptionType
+import net.dv8tion.jda.api.interactions.commands.build.OptionData
+import java.math.BigDecimal
 
-import com.jagrosh.jdautilities.command.CommandEvent;
-import com.jagrosh.jdautilities.command.SlashCommand;
-import com.jagrosh.jdautilities.command.SlashCommandEvent;
-import dev.cosgy.TextToSpeak.Bot;
-import dev.cosgy.TextToSpeak.settings.UserSettings;
-import net.dv8tion.jda.api.EmbedBuilder;
-import net.dv8tion.jda.api.interactions.commands.OptionType;
-import net.dv8tion.jda.api.interactions.commands.build.OptionData;
-
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-
-public class SetSpeedCmd extends SlashCommand {
-    protected Bot bot;
-
-    public SetSpeedCmd(Bot bot) {
-        this.guildOnly = false;
-        this.bot = bot;
-        this.name = "setspeed";
-        this.help = "読み上げ速度の設定を変更します。";
-        this.category = new Category("設定");
-
-        List<OptionData> options = new ArrayList<>();
-        options.add(new OptionData(OptionType.STRING, "value", "0.1~100.0", true));
-
-        this.options = options;
+class SetSpeedCmd(private val bot: Bot) : SlashCommand() {
+    init {
+        name = "setspeed"
+        help = "読み上げ速度の設定を変更します。"
+        guildOnly = false
+        category = Category("設定")
+        options = mutableListOf(OptionData(OptionType.STRING, "value", "0.1~100.0", true))
     }
 
-    @Override
-    protected void execute(SlashCommandEvent event) {
-        String args = event.getOption("value").getAsString();
-        boolean result;
-        BigDecimal bd = null;
-        try {
-            bd = new BigDecimal(args);
-            result = true;
-        } catch (NumberFormatException e) {
-            result = false;
+    override fun execute(event: SlashCommandEvent) {
+        val args = event.getOption("value")?.asString
+        val bd = try {
+            BigDecimal(args)
+        } catch (e: NumberFormatException) {
+            event.reply("数値を設定して下さい。").queue()
+            return
         }
-        if (!result) {
-            event.reply("数値を設定して下さい。").queue();
-            return;
+        val min = BigDecimal.ZERO
+        val max = BigDecimal("100.0")
+        if (!(min < bd && max > bd)) {
+            event.reply("有効な数値を設定して下さい。0.1~100.0").queue()
+            return
         }
+        val settings = bot.userSettingsManager.getSettings(event.user.idLong)
+        settings.speed = bd.toFloat()
+        event.reply("速度を $bd に設定しました。").queue()
+    }
 
-        BigDecimal min = new BigDecimal("0.0");
-        BigDecimal max = new BigDecimal("100.0");
+    override fun execute(event: CommandEvent) {
+        val args = event.args
 
-        if (!(min.compareTo(bd) < 0 && max.compareTo(bd) > 0)) {
-            event.reply("有効な数値を設定して下さい。0.1~100.0").queue();
-            return;
+        if(args == null){
+            help(event)
+            return
         }
-        UserSettings settings = bot.getUserSettingsManager().getSettings(event.getUser().getIdLong());
-        settings.setSpeed(bd.floatValue());
-        event.reply("速度を" + bd + "に設定しました。").queue();
-    }
 
-    @Override
-    protected void execute(CommandEvent event) {
-        if (event.getArgs().isEmpty() && event.getMessage().getAttachments().isEmpty()) {
-            EmbedBuilder ebuilder = new EmbedBuilder()
-                    .setTitle("setspeedコマンド")
-                    .addField("使用方法:", name + " <数値(0.0~)>", false)
-                    .addField("説明:", "読み上げの速度を設定します。読み上げ速度は、0.0以上の数値で設定して下さい。", false);
-            event.reply(ebuilder.build());
-            return;
-        }
-        String args = event.getArgs();
-        boolean result;
-        BigDecimal bd = null;
-        try {
-            bd = new BigDecimal(args);
-            result = true;
-        } catch (NumberFormatException e) {
-            result = false;
+        val bd = try {
+            BigDecimal(args)
+        } catch (e: NumberFormatException) {
+            event.reply("数値を設定して下さい。")
+            return
         }
-        if (!result) {
-            event.reply("数値を設定して下さい。");
-            return;
+        val min = BigDecimal.ZERO
+        val max = BigDecimal("100.0")
+        if (!(min < bd && max > bd)) {
+            event.reply("有効な数値を設定して下さい。0.1~100.0")
+            return
         }
+        val settings = bot.userSettingsManager.getSettings(event.author.idLong)
+        settings.speed = bd.toFloat()
+        event.reply("速度を $bd に設定しました。")
+    }
 
-        BigDecimal min = new BigDecimal("0.0");
-        BigDecimal max = new BigDecimal("100.0");
-
-        if (!(min.compareTo(bd) < 0 && max.compareTo(bd) > 0)) {
-            event.reply("有効な数値を設定して下さい。0.1~100.0");
-            return;
-        }
-        UserSettings settings = bot.getUserSettingsManager().getSettings(event.getAuthor().getIdLong());
-        settings.setSpeed(bd.floatValue());
-        event.reply("速度を" + bd + "に設定しました。");
+    fun help(event: CommandEvent?) {
+        val ebuilder = EmbedBuilder()
+                .setTitle("setspeedコマンド")
+                .addField("使用方法:", "$name <数値(0.0~)>", false)
+                .addField("説明:", "読み上げの速度を設定します。読み上げ速度は、0.0以上の数値で設定して下さい。", false)
+        event?.reply(ebuilder.build())
     }
 }
diff --git a/src/main/java/dev/cosgy/textToSpeak/commands/general/SetVoiceCmd.kt b/src/main/java/dev/cosgy/textToSpeak/commands/general/SetVoiceCmd.kt
index 3be10f8..18973cc 100644
--- a/src/main/java/dev/cosgy/textToSpeak/commands/general/SetVoiceCmd.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/commands/general/SetVoiceCmd.kt
@@ -13,97 +13,83 @@
 //     See the License for the specific language governing permissions and               /
 //     limitations under the License.                                                    /
 //////////////////////////////////////////////////////////////////////////////////////////
+package dev.cosgy.textToSpeak.commands.general
 
-package dev.cosgy.TextToSpeak.commands.general;
+import com.jagrosh.jdautilities.command.CommandEvent
+import com.jagrosh.jdautilities.command.SlashCommand
+import com.jagrosh.jdautilities.command.SlashCommandEvent
+import dev.cosgy.textToSpeak.Bot
+import net.dv8tion.jda.api.EmbedBuilder
+import net.dv8tion.jda.api.events.interaction.command.CommandAutoCompleteInteractionEvent
+import net.dv8tion.jda.api.interactions.commands.Command
+import net.dv8tion.jda.api.interactions.commands.OptionType
+import net.dv8tion.jda.api.interactions.commands.build.OptionData
+import java.util.*
+import java.util.stream.Collectors
+import java.util.stream.Stream
 
-import com.jagrosh.jdautilities.command.CommandEvent;
-import com.jagrosh.jdautilities.command.SlashCommand;
-import com.jagrosh.jdautilities.command.SlashCommandEvent;
-import dev.cosgy.TextToSpeak.Bot;
-import dev.cosgy.TextToSpeak.settings.UserSettings;
-import net.dv8tion.jda.api.EmbedBuilder;
-import net.dv8tion.jda.api.events.interaction.command.CommandAutoCompleteInteractionEvent;
-import net.dv8tion.jda.api.interactions.commands.Command;
-import net.dv8tion.jda.api.interactions.commands.OptionType;
-import net.dv8tion.jda.api.interactions.commands.build.OptionData;
+class SetVoiceCmd(private var bot: Bot) : SlashCommand() {
+    private var voices: Array<String?>
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Objects;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-public class SetVoiceCmd extends SlashCommand {
-    protected Bot bot;
-    String[] voices;
-
-    public SetVoiceCmd(Bot bot) {
-        this.bot = bot;
-        this.name = "setvoice";
-        this.help = "声の種類を変更することができます。";
-        this.guildOnly = false;
-        this.category = new Category("設定");
-
-        List<OptionData> options = new ArrayList<>();
-        options.add(new OptionData(OptionType.STRING, "name", "声データの名前", true, true));
-
-        this.options = options;
-        voices = bot.getVoiceCreation().getVoices().toArray(new String[0]);
+    init {
+        name = "setvoice"
+        help = "声の種類を変更することができます。"
+        guildOnly = false
+        this.category = Category("設定")
+        val options: MutableList<OptionData> = ArrayList()
+        options.add(OptionData(OptionType.STRING, "name", "声データの名前", true, true))
+        this.options = options
+        voices = bot.voiceCreation.voices.toTypedArray()
     }
 
-    @Override
-    protected void execute(SlashCommandEvent event) {
+    override fun execute(event: SlashCommandEvent) {
         if (event.getOption("name") == null) {
-            EmbedBuilder ebuilder = new EmbedBuilder()
+            val ebuilder = EmbedBuilder()
                     .setTitle("setvoiceコマンド")
-                    .addField("声データ一覧：", Arrays.toString(voices), false)
-                    .addField("使用方法：", name + " <声データの名前>", false);
-            event.replyEmbeds(ebuilder.build()).queue();
-            return;
+                    .addField("声データ一覧：", voices.contentToString(), false)
+                    .addField("使用方法：", "$name <声データの名前>", false)
+            event.replyEmbeds(ebuilder.build()).queue()
+            return
         }
-        String viceName = event.getOption("name").getAsString();
-
+        val viceName = event.getOption("name")!!.asString
         if (isValidVoice(viceName)) {
-            UserSettings settings = bot.getUserSettingsManager().getSettings(event.getUser().getIdLong());
-            settings.setVoice(viceName);
-            event.reply("声データを`" + viceName + "`に設定しました。").queue();
+            val settings = bot.userSettingsManager.getSettings(event.user.idLong)
+            settings.voice = viceName
+            event.reply("声データを`$viceName`に設定しました。").queue()
         } else {
-            event.reply("有効な声データを選択して下さい。").queue();
+            event.reply("有効な声データを選択して下さい。").queue()
         }
     }
 
-    @Override
-    protected void execute(CommandEvent event) {
-        ArrayList<String> voices = bot.getVoiceCreation().getVoices();
-        if (event.getArgs().isEmpty() && event.getMessage().getAttachments().isEmpty()) {
-            EmbedBuilder ebuilder = new EmbedBuilder()
+    override fun execute(event: CommandEvent) {
+        val voices = bot.voiceCreation.voices
+        if (event.args.isEmpty() && event.message.attachments.isEmpty()) {
+            val ebuilder = EmbedBuilder()
                     .setTitle("setvoiceコマンド")
                     .addField("声データ一覧：", voices.toString(), false)
-                    .addField("使用方法：", name + " <声データの名前>", false);
-            event.reply(ebuilder.build());
-            return;
+                    .addField("使用方法：", "$name <声データの名前>", false)
+            event.reply(ebuilder.build())
+            return
         }
-        String args = event.getArgs();
+        val args = event.args
         if (voices.contains(args)) {
-            UserSettings settings = bot.getUserSettingsManager().getSettings(event.getAuthor().getIdLong());
-            settings.setVoice(args);
-            event.reply("声データを`" + args + "`に設定しました。");
+            val settings = bot.userSettingsManager.getSettings(event.author.idLong)
+            settings.voice = args
+            event.reply("声データを`$args`に設定しました。")
         } else {
-            event.reply("有効な声データを選択して下さい。");
+            event.reply("有効な声データを選択して下さい。")
         }
     }
 
-    @Override
-    public void onAutoComplete(CommandAutoCompleteInteractionEvent event) {
-        if (event.getName().equals("setvoice") && event.getFocusedOption().getName().equals("name")) {
-            List<Command.Choice> options = Stream.of(voices)
-                    .filter(word -> word.startsWith(event.getFocusedOption().getValue())) // only display words that start with the user's current input
-                    .map(word -> new Command.Choice(word, word)) // map the words to choices
-                    .collect(Collectors.toList());
-            event.replyChoices(options).queue();
+    override fun onAutoComplete(event: CommandAutoCompleteInteractionEvent) {
+        if (event.name == "setvoice" && event.focusedOption.name == "name") {
+            val options = Stream.of(*voices)
+                    .filter { word: String? -> word!!.startsWith(event.focusedOption.value) } // only display words that start with the user's current input
+                    .map { word: String? -> Command.Choice(word!!, word) } // map the words to choices
+                    .collect(Collectors.toList())
+            event.replyChoices(options).queue()
         }
-        super.onAutoComplete(event);
+        super.onAutoComplete(event)
     }
 
     /**
@@ -112,12 +98,12 @@ public class SetVoiceCmd extends SlashCommand {
      * @param voice ユーザーが入力した声の名前
      * @return 名前が有効の場合は true 無効な場合は false
      */
-    private boolean isValidVoice(String voice) {
-        for (String v : voices) {
-            if (Objects.equals(v, voice)) {
-                return true;
+    private fun isValidVoice(voice: String): Boolean {
+        for (v in voices) {
+            if (v == voice) {
+                return true
             }
         }
-        return false;
+        return false
     }
-}
+}
\ No newline at end of file
diff --git a/src/main/java/dev/cosgy/textToSpeak/commands/general/SetVoiceQualityA.kt b/src/main/java/dev/cosgy/textToSpeak/commands/general/SetVoiceQualityA.kt
index c62a5be..3384b96 100644
--- a/src/main/java/dev/cosgy/textToSpeak/commands/general/SetVoiceQualityA.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/commands/general/SetVoiceQualityA.kt
@@ -13,96 +13,80 @@
 //     See the License for the specific language governing permissions and               /
 //     limitations under the License.                                                    /
 //////////////////////////////////////////////////////////////////////////////////////////
+package dev.cosgy.textToSpeak.commands.general
 
-package dev.cosgy.TextToSpeak.commands.general;
+import com.jagrosh.jdautilities.command.CommandEvent
+import com.jagrosh.jdautilities.command.SlashCommand
+import com.jagrosh.jdautilities.command.SlashCommandEvent
+import dev.cosgy.textToSpeak.Bot
+import net.dv8tion.jda.api.interactions.commands.OptionType
+import net.dv8tion.jda.api.interactions.commands.build.OptionData
+import java.math.BigDecimal
 
-import com.jagrosh.jdautilities.command.CommandEvent;
-import com.jagrosh.jdautilities.command.SlashCommand;
-import com.jagrosh.jdautilities.command.SlashCommandEvent;
-import dev.cosgy.TextToSpeak.Bot;
-import dev.cosgy.TextToSpeak.settings.UserSettings;
-import net.dv8tion.jda.api.interactions.commands.OptionType;
-import net.dv8tion.jda.api.interactions.commands.build.OptionData;
-
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-
-public class SetVoiceQualityA extends SlashCommand {
-    protected Bot bot;
-
-    public SetVoiceQualityA(Bot bot) {
-        this.bot = bot;
-        this.name = "setqa";
-        this.help = "オールパス値の設定を変更します。";
-        this.guildOnly = false;
-        this.category = new Category("設定");
-
-        List<OptionData> options = new ArrayList<>();
-        options.add(new OptionData(OptionType.STRING, "value", "0.1~1.0", true));
-
-        this.options = options;
+class SetVoiceQualityA(private var bot: Bot) : SlashCommand() {
+    init {
+        name = "setqa"
+        help = "オールパス値の設定を変更します。"
+        guildOnly = false
+        this.category = Category("設定")
+        val options: MutableList<OptionData> = ArrayList()
+        options.add(OptionData(OptionType.STRING, "value", "0.1~1.0", true))
+        this.options = options
     }
 
-    @Override
-    protected void execute(SlashCommandEvent event) {
-        String args = event.getOption("value").getAsString();
-        boolean result;
-        float value = 0.0f;
-        BigDecimal bd = null;
+    override fun execute(event: SlashCommandEvent) {
+        val args = event.getOption("value")!!.asString
+        var result: Boolean
+        var bd: BigDecimal? = null
         try {
             //value = Float.parseFloat(args);
-            bd = new BigDecimal(args);
-            result = true;
-        } catch (NumberFormatException e) {
-            result = false;
+            bd = BigDecimal(args)
+            result = true
+        } catch (e: NumberFormatException) {
+            result = false
         }
         if (!result) {
-            event.reply("数値を設定して下さい。").queue();
-            return;
+            event.reply("数値を設定して下さい。").queue()
+            return
         }
-
-        BigDecimal min = new BigDecimal("0.0");
-        BigDecimal max = new BigDecimal("1.0");
+        val min = BigDecimal("0.0")
+        val max = BigDecimal("1.0")
 
         //if(!(0.1f <= value && value <= 1.0f)){
-        if (!(min.compareTo(bd) < 0 && max.compareTo(bd) > 0)) {
-            event.reply("有効な数値を設定して下さい。0.1~1.0").queue();
-            return;
+        if (!(min < bd && max > bd)) {
+            event.reply("有効な数値を設定して下さい。0.1~1.0").queue()
+            return
         }
-        UserSettings settings = bot.getUserSettingsManager().getSettings(event.getUser().getIdLong());
-        settings.setVoiceQualityA(bd.floatValue());
-        event.reply("オールパス値を" + bd + "に設定しました。").queue();
+        val settings = bot.userSettingsManager.getSettings(event.user.idLong)
+        settings.voiceQualityA = bd!!.toFloat()
+        event.reply("オールパス値を" + bd + "に設定しました。").queue()
     }
 
-    @Override
-    protected void execute(CommandEvent event) {
-        String args = event.getArgs();
-        boolean result;
-        float value = 0.0f;
-        BigDecimal bd = null;
+    override fun execute(event: CommandEvent) {
+        val args = event.args
+        var result: Boolean
+        var bd: BigDecimal? = null
         try {
             //value = Float.parseFloat(args);
-            bd = new BigDecimal(args);
-            result = true;
-        } catch (NumberFormatException e) {
-            result = false;
+            bd = BigDecimal(args)
+            result = true
+        } catch (e: NumberFormatException) {
+            result = false
         }
         if (!result) {
-            event.reply("数値を設定して下さい。");
-            return;
+            event.reply("数値を設定して下さい。")
+            return
         }
-
-        BigDecimal min = new BigDecimal("0.0");
-        BigDecimal max = new BigDecimal("1.0");
+        val min = BigDecimal("0.0")
+        val max = BigDecimal("1.0")
 
         //if(!(0.1f <= value && value <= 1.0f)){
-        if (!(min.compareTo(bd) < 0 && max.compareTo(bd) > 0)) {
-            event.reply("有効な数値を設定して下さい。0.1~1.0");
-            return;
+        if (!(min < bd && max > bd)) {
+            event.reply("有効な数値を設定して下さい。0.1~1.0")
+            return
         }
-        UserSettings settings = bot.getUserSettingsManager().getSettings(event.getAuthor().getIdLong());
-        settings.setVoiceQualityA(bd.floatValue());
-        event.reply("オールパス値を" + bd + "に設定しました。");
+        val settings = bot.userSettingsManager.getSettings(event.author.idLong)
+        settings.voiceQualityA = bd!!.toFloat()
+        event.reply("オールパス値を" + bd + "に設定しました。")
     }
-}
+}
\ No newline at end of file
diff --git a/src/main/java/dev/cosgy/textToSpeak/commands/general/SetVoiceQualityFm.kt b/src/main/java/dev/cosgy/textToSpeak/commands/general/SetVoiceQualityFm.kt
index 637ea6d..0224e05 100644
--- a/src/main/java/dev/cosgy/textToSpeak/commands/general/SetVoiceQualityFm.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/commands/general/SetVoiceQualityFm.kt
@@ -13,105 +13,89 @@
 //     See the License for the specific language governing permissions and               /
 //     limitations under the License.                                                    /
 //////////////////////////////////////////////////////////////////////////////////////////
+package dev.cosgy.textToSpeak.commands.general
 
-package dev.cosgy.TextToSpeak.commands.general;
+import com.jagrosh.jdautilities.command.CommandEvent
+import com.jagrosh.jdautilities.command.SlashCommand
+import com.jagrosh.jdautilities.command.SlashCommandEvent
+import dev.cosgy.textToSpeak.Bot
+import net.dv8tion.jda.api.EmbedBuilder
+import net.dv8tion.jda.api.interactions.commands.OptionType
+import net.dv8tion.jda.api.interactions.commands.build.OptionData
+import java.math.BigDecimal
 
-import com.jagrosh.jdautilities.command.CommandEvent;
-import com.jagrosh.jdautilities.command.SlashCommand;
-import com.jagrosh.jdautilities.command.SlashCommandEvent;
-import dev.cosgy.TextToSpeak.Bot;
-import dev.cosgy.TextToSpeak.settings.UserSettings;
-import net.dv8tion.jda.api.EmbedBuilder;
-import net.dv8tion.jda.api.interactions.commands.OptionType;
-import net.dv8tion.jda.api.interactions.commands.build.OptionData;
-
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-
-public class SetVoiceQualityFm extends SlashCommand {
-    protected Bot bot;
-
-    public SetVoiceQualityFm(Bot bot) {
-        this.bot = bot;
-        this.name = "setqfm";
-        this.help = "追加ハーフトーンの設定を変更します。";
-        this.guildOnly = false;
-        this.category = new Category("設定");
-
-        List<OptionData> options = new ArrayList<>();
-        options.add(new OptionData(OptionType.STRING, "value", "0.1~100.0", true));
-
-        this.options = options;
+class SetVoiceQualityFm(private var bot: Bot) : SlashCommand() {
+    init {
+        name = "setqfm"
+        help = "追加ハーフトーンの設定を変更します。"
+        guildOnly = false
+        this.category = Category("設定")
+        val options: MutableList<OptionData> = ArrayList()
+        options.add(OptionData(OptionType.STRING, "value", "0.1~100.0", true))
+        this.options = options
     }
 
-    @Override
-    protected void execute(SlashCommandEvent event) {
-        String args = event.getOption("value").getAsString();
-        boolean result;
-        float value = 0.0f;
-        BigDecimal bd = null;
+    override fun execute(event: SlashCommandEvent) {
+        val args = event.getOption("value")!!.asString
+        var result: Boolean
+        var bd: BigDecimal? = null
         try {
             //value = Float.parseFloat(args);
-            bd = new BigDecimal(args);
-            result = true;
-        } catch (NumberFormatException e) {
-            result = false;
+            bd = BigDecimal(args)
+            result = true
+        } catch (e: NumberFormatException) {
+            result = false
         }
         if (!result) {
-            event.reply("数値を設定して下さい。").queue();
-            return;
+            event.reply("数値を設定して下さい。").queue()
+            return
         }
-
-        BigDecimal min = new BigDecimal("0.0");
-        BigDecimal max = new BigDecimal("100.0");
+        val min = BigDecimal("0.0")
+        val max = BigDecimal("100.0")
 
         //if(!(0.1f <= value && value <= 100.0f)){
-        if (!(min.compareTo(bd) < 0 && max.compareTo(bd) > 0)) {
-            event.reply("有効な数値を設定して下さい。0.1~100.0").queue();
-            return;
+        if (!(min < bd && max > bd)) {
+            event.reply("有効な数値を設定して下さい。0.1~100.0").queue()
+            return
         }
-        UserSettings settings = bot.getUserSettingsManager().getSettings(event.getUser().getIdLong());
-        settings.setVoiceQualityFm(bd.floatValue());
-        event.reply("追加ハーフトーンを" + bd + "に設定しました。").queue();
+        val settings = bot.userSettingsManager.getSettings(event.user.idLong)
+        settings.voiceQualityFm = bd!!.toFloat()
+        event.reply("追加ハーフトーンを" + bd + "に設定しました。").queue()
     }
 
-    @Override
-    protected void execute(CommandEvent event) {
-        if (event.getArgs().isEmpty() && event.getMessage().getAttachments().isEmpty()) {
-            EmbedBuilder ebuilder = new EmbedBuilder()
+    override fun execute(event: CommandEvent) {
+        if (event.args.isEmpty() && event.message.attachments.isEmpty()) {
+            val ebuilder = EmbedBuilder()
                     .setTitle("setqfmコマンド")
-                    .addField("使用方法:", name + " <数値(0.0~)>", false)
-                    .addField("説明:", "追加ハーフトーンの設定を変更します。", false);
-            event.reply(ebuilder.build());
-            return;
+                    .addField("使用方法:", "$name <数値(0.0~)>", false)
+                    .addField("説明:", "追加ハーフトーンの設定を変更します。", false)
+            event.reply(ebuilder.build())
+            return
         }
-        String args = event.getArgs();
-        boolean result;
-        float value = 0.0f;
-        BigDecimal bd = null;
+        val args = event.args
+        var result: Boolean
+        var bd: BigDecimal? = null
         try {
             //value = Float.parseFloat(args);
-            bd = new BigDecimal(args);
-            result = true;
-        } catch (NumberFormatException e) {
-            result = false;
+            bd = BigDecimal(args)
+            result = true
+        } catch (e: NumberFormatException) {
+            result = false
         }
         if (!result) {
-            event.reply("数値を設定して下さい。");
-            return;
+            event.reply("数値を設定して下さい。")
+            return
         }
-
-        BigDecimal min = new BigDecimal("0.0");
-        BigDecimal max = new BigDecimal("100.0");
+        val min = BigDecimal("0.0")
+        val max = BigDecimal("100.0")
 
         //if(!(0.1f <= value && value <= 100.0f)){
-        if (!(min.compareTo(bd) < 0 && max.compareTo(bd) > 0)) {
-            event.reply("有効な数値を設定して下さい。0.1~100.0");
-            return;
+        if (!(min < bd && max > bd)) {
+            event.reply("有効な数値を設定して下さい。0.1~100.0")
+            return
         }
-        UserSettings settings = bot.getUserSettingsManager().getSettings(event.getAuthor().getIdLong());
-        settings.setVoiceQualityFm(bd.floatValue());
-        event.reply("追加ハーフトーンを" + bd + "に設定しました。");
+        val settings = bot.userSettingsManager.getSettings(event.author.idLong)
+        settings.voiceQualityFm = bd!!.toFloat()
+        event.reply("追加ハーフトーンを" + bd + "に設定しました。")
     }
-}
+}
\ No newline at end of file
diff --git a/src/main/java/dev/cosgy/textToSpeak/commands/general/SettingsCmd.kt b/src/main/java/dev/cosgy/textToSpeak/commands/general/SettingsCmd.kt
index 46c66b7..b61c44b 100644
--- a/src/main/java/dev/cosgy/textToSpeak/commands/general/SettingsCmd.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/commands/general/SettingsCmd.kt
@@ -13,56 +13,46 @@
 //     See the License for the specific language governing permissions and               /
 //     limitations under the License.                                                    /
 //////////////////////////////////////////////////////////////////////////////////////////
-
-package dev.cosgy.TextToSpeak.commands.general;
-
-import com.jagrosh.jdautilities.command.CommandEvent;
-import com.jagrosh.jdautilities.command.SlashCommand;
-import com.jagrosh.jdautilities.command.SlashCommandEvent;
-import dev.cosgy.TextToSpeak.Bot;
-import dev.cosgy.TextToSpeak.settings.UserSettings;
-import net.dv8tion.jda.api.EmbedBuilder;
-
-import java.awt.*;
-
-public class SettingsCmd extends SlashCommand {
-    protected Bot bot;
-
-    public SettingsCmd(Bot bot) {
-        this.bot = bot;
-        this.guildOnly = false;
-        this.name = "settings";
-        this.help = "現在の設定を確認します。";
-        this.category = new Category("設定");
+package dev.cosgy.textToSpeak.commands.general
+
+import com.jagrosh.jdautilities.command.CommandEvent
+import com.jagrosh.jdautilities.command.SlashCommand
+import com.jagrosh.jdautilities.command.SlashCommandEvent
+import dev.cosgy.textToSpeak.Bot
+import net.dv8tion.jda.api.EmbedBuilder
+import java.awt.Color
+
+class SettingsCmd(private var bot: Bot) : SlashCommand() {
+    init {
+        guildOnly = false
+        name = "settings"
+        help = "現在の設定を確認します。"
+        this.category = Category("設定")
     }
 
-    @Override
-    protected void execute(SlashCommandEvent event) {
-        UserSettings settings = bot.getUserSettingsManager().getSettings(event.getUser().getIdLong());
-
-        EmbedBuilder ebuilder = new EmbedBuilder()
+    override fun execute(event: SlashCommandEvent) {
+        val settings = bot.userSettingsManager.getSettings(event.user.idLong)
+        val ebuilder = EmbedBuilder()
                 .setColor(Color.orange)
-                .setTitle(event.getUser().getName() + "の設定")
-                .addField("声：", settings.getVoice(), false)
-                .addField("読み上げ速度：", String.valueOf(settings.getSpeed()), false)
-                .addField("F0系列内変動の重み：", String.valueOf(settings.getIntonation()), false)
-                .addField("オールパス値：", String.valueOf(settings.getVoiceQualityA()), false)
-                .addField("追加ハーフトーン：", String.valueOf(settings.getVoiceQualityFm()), false);
-        event.replyEmbeds(ebuilder.build()).queue();
+                .setTitle(event.user.name + "の設定")
+                .addField("声：", settings.voice, false)
+                .addField("読み上げ速度：", settings.speed.toString(), false)
+                .addField("F0系列内変動の重み：", settings.intonation.toString(), false)
+                .addField("オールパス値：", settings.voiceQualityA.toString(), false)
+                .addField("追加ハーフトーン：", settings.voiceQualityFm.toString(), false)
+        event.replyEmbeds(ebuilder.build()).queue()
     }
 
-    @Override
-    protected void execute(CommandEvent event) {
-        UserSettings settings = bot.getUserSettingsManager().getSettings(event.getAuthor().getIdLong());
-
-        EmbedBuilder ebuilder = new EmbedBuilder()
+    override fun execute(event: CommandEvent) {
+        val settings = bot.userSettingsManager.getSettings(event.author.idLong)
+        val ebuilder = EmbedBuilder()
                 .setColor(Color.orange)
-                .setTitle(event.getAuthor().getName() + "の設定")
-                .addField("声：", settings.getVoice(), false)
-                .addField("速度：", String.valueOf(settings.getSpeed()), false)
-                .addField("抑揚：", String.valueOf(settings.getIntonation()), false)
-                .addField("声質a：", String.valueOf(settings.getVoiceQualityA()), false)
-                .addField("声質fm：", String.valueOf(settings.getVoiceQualityFm()), false);
-        event.reply(ebuilder.build());
+                .setTitle(event.author.name + "の設定")
+                .addField("声：", settings.voice, false)
+                .addField("速度：", settings.speed.toString(), false)
+                .addField("抑揚：", settings.intonation.toString(), false)
+                .addField("声質a：", settings.voiceQualityA.toString(), false)
+                .addField("声質fm：", settings.voiceQualityFm.toString(), false)
+        event.reply(ebuilder.build())
     }
-}
+}
\ No newline at end of file
diff --git a/src/main/java/dev/cosgy/textToSpeak/commands/owner/ShutdownCmd.kt b/src/main/java/dev/cosgy/textToSpeak/commands/owner/ShutdownCmd.kt
index 85b4d60..0c76131 100644
--- a/src/main/java/dev/cosgy/textToSpeak/commands/owner/ShutdownCmd.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/commands/owner/ShutdownCmd.kt
@@ -13,33 +13,27 @@
 //     See the License for the specific language governing permissions and               /
 //     limitations under the License.                                                    /
 //////////////////////////////////////////////////////////////////////////////////////////
+package dev.cosgy.textToSpeak.commands.owner
 
-package dev.cosgy.TextToSpeak.commands.owner;
+import com.jagrosh.jdautilities.command.CommandEvent
+import com.jagrosh.jdautilities.command.SlashCommandEvent
+import dev.cosgy.textToSpeak.Bot
+import dev.cosgy.textToSpeak.commands.OwnerCommand
 
-import com.jagrosh.jdautilities.command.CommandEvent;
-import com.jagrosh.jdautilities.command.SlashCommandEvent;
-import dev.cosgy.TextToSpeak.Bot;
-import dev.cosgy.TextToSpeak.commands.OwnerCommand;
-
-public class ShutdownCmd extends OwnerCommand {
-    private final Bot bot;
-
-    public ShutdownCmd(Bot bot) {
-        this.bot = bot;
-        this.name = "shutdown";
-        this.help = "一時ファイルを削除してボットを停止します。";
-        this.guildOnly = false;
+class ShutdownCmd(private val bot: Bot) : OwnerCommand() {
+    init {
+        name = "shutdown"
+        help = "一時ファイルを削除してボットを停止します。"
+        guildOnly = false
     }
 
-    @Override
-    protected void execute(SlashCommandEvent event) {
-        event.reply(event.getClient().getWarning() + "シャットダウンしています...").queue();
-        bot.shutdown();
+    override fun execute(event: SlashCommandEvent) {
+        event.reply(event.client.warning + "シャットダウンしています...").queue()
+        bot.shutdown()
     }
 
-    @Override
-    protected void execute(CommandEvent event) {
-        event.reply(event.getClient().getWarning() + "シャットダウンしています...");
-        bot.shutdown();
+    override fun execute(event: CommandEvent) {
+        event.reply(event.client.warning + "シャットダウンしています...")
+        bot.shutdown()
     }
-}
+}
\ No newline at end of file
diff --git a/src/main/java/dev/cosgy/textToSpeak/entities/Prompt.kt b/src/main/java/dev/cosgy/textToSpeak/entities/Prompt.kt
index c52f5d5..3af73d1 100644
--- a/src/main/java/dev/cosgy/textToSpeak/entities/Prompt.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/entities/Prompt.kt
@@ -13,106 +13,70 @@
 //     See the License for the specific language governing permissions and               /
 //     limitations under the License.                                                    /
 //////////////////////////////////////////////////////////////////////////////////////////
+package dev.cosgy.textToSpeak.entities
 
-package dev.cosgy.TextToSpeak.entities;
+import org.slf4j.LoggerFactory
+import java.util.*
+import javax.swing.JOptionPane
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+class Prompt @JvmOverloads constructor(private val title: String, noguiMessage: String? = null, var isNoGUI: Boolean = "true".equals(System.getProperty("nogui"), ignoreCase = true)) {
+    private val noguiMessage: String
+    private var scanner: Scanner? = null
 
-import javax.swing.*;
-import java.util.Scanner;
-
-public class Prompt {
-    private final String title;
-    private final String noguiMessage;
-
-    private boolean nogui;
-    private Scanner scanner;
-
-    public Prompt(String title) {
-        this(title, null);
-    }
-
-    public Prompt(String title, String noguiMessage) {
-        this(title, noguiMessage, "true".equalsIgnoreCase(System.getProperty("nogui")));
-    }
-
-    public Prompt(String title, String noguiMessage, boolean nogui) {
-        this.title = title;
-        this.noguiMessage = noguiMessage == null ? "noguiモードに切り替えます。 -nogui=trueフラグを含めることで、手動でnoguiモードで起動できます。" : noguiMessage;
-        this.nogui = nogui;
-    }
-
-    public boolean isNoGUI() {
-        return nogui;
+    init {
+        this.noguiMessage = noguiMessage ?: "noguiモードに切り替えます。 -nogui=trueフラグを含めることで、手動でnoguiモードで起動できます。"
     }
 
-    public void alert(Level level, String context, String message) {
-        if (nogui) {
-            Logger log = LoggerFactory.getLogger(context);
-            switch (level) {
-                case WARNING:
-                    log.warn(message);
-                    break;
-                case ERROR:
-                    log.error(message);
-                    break;
-                case INFO:
-                default:
-                    log.info(message);
-                    break;
+    fun alert(level: Level?, context: String?, message: String) {
+        if (isNoGUI) {
+            val log = LoggerFactory.getLogger(context)
+            when (level) {
+                Level.WARNING -> log.warn(message)
+                Level.ERROR -> log.error(message)
+                Level.INFO -> log.info(message)
+                else -> log.info(message)
             }
         } else {
             try {
-                int option = 0;
-                switch (level) {
-                    case INFO:
-                        option = JOptionPane.INFORMATION_MESSAGE;
-                        break;
-                    case WARNING:
-                        option = JOptionPane.WARNING_MESSAGE;
-                        break;
-                    case ERROR:
-                        break;
-                    default:
-                        option = JOptionPane.PLAIN_MESSAGE;
-                        break;
+                var option = 0
+                when (level) {
+                    Level.INFO -> option = JOptionPane.INFORMATION_MESSAGE
+                    Level.WARNING -> option = JOptionPane.WARNING_MESSAGE
+                    Level.ERROR -> {}
+                    else -> option = JOptionPane.PLAIN_MESSAGE
                 }
-                JOptionPane.showMessageDialog(null, "<html><body><p style='width: 400px;'>" + message, title, option);
-            } catch (Exception e) {
-                nogui = true;
-                alert(Level.WARNING, context, noguiMessage);
-                alert(level, context, message);
+                JOptionPane.showMessageDialog(null, "<html><body><p style='width: 400px;'>$message", title, option)
+            } catch (e: Exception) {
+                isNoGUI = true
+                alert(Level.WARNING, context, noguiMessage)
+                alert(level, context, message)
             }
         }
     }
 
-    public String prompt(String content) {
-        if (nogui) {
-            if (scanner == null)
-                scanner = new Scanner(System.in);
+    fun prompt(content: String?): String? {
+        return if (isNoGUI) {
+            if (scanner == null) scanner = Scanner(System.`in`)
             try {
-                System.out.println(content);
-                if (scanner.hasNextLine())
-                    return scanner.nextLine();
-                return null;
-            } catch (Exception e) {
-                alert(Level.ERROR, title, "コマンドラインから入力を読み込めません。");
-                e.printStackTrace();
-                return null;
+                println(content)
+                if (scanner!!.hasNextLine()) scanner!!.nextLine() else null
+            } catch (e: Exception) {
+                alert(Level.ERROR, title, "コマンドラインから入力を読み込めません。")
+                e.printStackTrace()
+                null
             }
         } else {
             try {
-                return JOptionPane.showInputDialog(null, content, title, JOptionPane.QUESTION_MESSAGE);
-            } catch (Exception e) {
-                nogui = true;
-                alert(Level.WARNING, title, noguiMessage);
-                return prompt(content);
+                JOptionPane.showInputDialog(null, content, title, JOptionPane.QUESTION_MESSAGE)
+            } catch (e: Exception) {
+                isNoGUI = true
+                alert(Level.WARNING, title, noguiMessage)
+                prompt(content)
             }
         }
     }
 
-    public enum Level {
+    enum class Level {
         INFO, WARNING, ERROR
     }
-}
+}
\ No newline at end of file
diff --git a/src/main/java/dev/cosgy/textToSpeak/gui/ConsolePanel.kt b/src/main/java/dev/cosgy/textToSpeak/gui/ConsolePanel.kt
index fc18197..a5434eb 100644
--- a/src/main/java/dev/cosgy/textToSpeak/gui/ConsolePanel.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/gui/ConsolePanel.kt
@@ -13,29 +13,28 @@
 //     See the License for the specific language governing permissions and               /
 //     limitations under the License.                                                    /
 //////////////////////////////////////////////////////////////////////////////////////////
+package dev.cosgy.textToSpeak.gui
 
-package dev.cosgy.TextToSpeak.gui;
+import java.awt.Dimension
+import java.awt.GridLayout
+import java.io.PrintStream
+import javax.swing.JPanel
+import javax.swing.JScrollPane
+import javax.swing.JTextArea
 
-import javax.swing.*;
-import java.awt.*;
-import java.io.PrintStream;
-
-public class ConsolePanel extends JPanel {
-    public ConsolePanel() {
-        super();
-        JTextArea text = new JTextArea();
-        text.setLineWrap(true);
-        text.setWrapStyleWord(true);
-        text.setEditable(false);
-        PrintStream con = new PrintStream(new TextAreaOutputStream(text));
-        System.setOut(con);
-        System.setErr(con);
-
-        JScrollPane pane = new JScrollPane();
-        pane.setViewportView(text);
-
-        super.setLayout(new GridLayout(1, 1));
-        super.add(pane);
-        super.setPreferredSize(new Dimension(400, 300));
+class ConsolePanel : JPanel() {
+    init {
+        val text = JTextArea()
+        text.lineWrap = true
+        text.wrapStyleWord = true
+        text.isEditable = false
+        val con = PrintStream(TextAreaOutputStream(text))
+        System.setOut(con)
+        System.setErr(con)
+        val pane = JScrollPane()
+        pane.setViewportView(text)
+        super.setLayout(GridLayout(1, 1))
+        super.add(pane)
+        super.setPreferredSize(Dimension(400, 300))
     }
-}
+}
\ No newline at end of file
diff --git a/src/main/java/dev/cosgy/textToSpeak/gui/GUI.kt b/src/main/java/dev/cosgy/textToSpeak/gui/GUI.kt
index 086a58e..11dfca8 100644
--- a/src/main/java/dev/cosgy/textToSpeak/gui/GUI.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/gui/GUI.kt
@@ -13,64 +13,56 @@
 //     See the License for the specific language governing permissions and               /
 //     limitations under the License.                                                    /
 //////////////////////////////////////////////////////////////////////////////////////////
+package dev.cosgy.textToSpeak.gui
 
-package dev.cosgy.TextToSpeak.gui;
-
-import dev.cosgy.TextToSpeak.Bot;
-
-import javax.swing.*;
-import java.awt.event.WindowEvent;
-import java.awt.event.WindowListener;
+import dev.cosgy.textToSpeak.Bot
+import java.awt.event.WindowEvent
+import java.awt.event.WindowListener
+import javax.swing.JFrame
+import javax.swing.JTabbedPane
+import kotlin.system.exitProcess
 
 /**
  * @author Kosugi_kun
  */
-public class GUI extends JFrame {
-    private final ConsolePanel console;
-    private final Bot bot;
+class GUI(private val bot: Bot) : JFrame() {
+    private val console: ConsolePanel = ConsolePanel()
 
-    public GUI(Bot bot) {
-        super();
-        this.bot = bot;
-        console = new ConsolePanel();
-    }
-
-    public void init() {
-        setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
-        setTitle(bot.GetLang().getString("appName"));
-        JTabbedPane tabs = new JTabbedPane();
-        tabs.add("コンソール", console);
-        getContentPane().add(tabs);
-        pack();
-        setLocationRelativeTo(null);
-        setVisible(true);
-        addWindowListener(new WindowListener() {
-            @Override
-            public void windowOpened(WindowEvent e) { /* unused */ }
+    fun init() {
+        defaultCloseOperation = EXIT_ON_CLOSE
+        title = bot.GetLang().getString("appName")
+        val tabs = JTabbedPane()
+        tabs.add("コンソール", console)
+        contentPane.add(tabs)
+        pack()
+        setLocationRelativeTo(null)
+        isVisible = true
+        addWindowListener(object : WindowListener {
+            override fun windowOpened(e: WindowEvent) { /* unused */
+            }
 
-            @Override
-            public void windowClosing(WindowEvent e) {
+            override fun windowClosing(e: WindowEvent) {
                 try {
-                    bot.shutdown();
-                } catch (Exception ex) {
-                    System.exit(0);
+                    bot.shutdown()
+                } catch (ex: Exception) {
+                    exitProcess(0)
                 }
             }
 
-            @Override
-            public void windowClosed(WindowEvent e) { /* unused */ }
+            override fun windowClosed(e: WindowEvent) { /* unused */
+            }
 
-            @Override
-            public void windowIconified(WindowEvent e) { /* unused */ }
+            override fun windowIconified(e: WindowEvent) { /* unused */
+            }
 
-            @Override
-            public void windowDeiconified(WindowEvent e) { /* unused */ }
+            override fun windowDeiconified(e: WindowEvent) { /* unused */
+            }
 
-            @Override
-            public void windowActivated(WindowEvent e) { /* unused */ }
+            override fun windowActivated(e: WindowEvent) { /* unused */
+            }
 
-            @Override
-            public void windowDeactivated(WindowEvent e) { /* unused */ }
-        });
+            override fun windowDeactivated(e: WindowEvent) { /* unused */
+            }
+        })
     }
-}
+}
\ No newline at end of file
diff --git a/src/main/java/dev/cosgy/textToSpeak/gui/TextAreaOutputStream.kt b/src/main/java/dev/cosgy/textToSpeak/gui/TextAreaOutputStream.kt
index 97bfbba..8cc471b 100644
--- a/src/main/java/dev/cosgy/textToSpeak/gui/TextAreaOutputStream.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/gui/TextAreaOutputStream.kt
@@ -13,140 +13,129 @@
 //     See the License for the specific language governing permissions and               /
 //     limitations under the License.                                                    /
 //////////////////////////////////////////////////////////////////////////////////////////
+package dev.cosgy.textToSpeak.gui
 
-package dev.cosgy.TextToSpeak.gui;
-
-import javax.swing.*;
-import java.awt.*;
-import java.io.OutputStream;
-import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.LinkedList;
-import java.util.List;
+import java.awt.EventQueue
+import java.io.OutputStream
+import java.io.UnsupportedEncodingException
+import java.nio.charset.Charset
+import java.util.*
+import javax.swing.JTextArea
 
 /**
  * @author Kosugi_kun
  */
-public class TextAreaOutputStream extends OutputStream {
-    private final byte[] oneByte;
-    private Appender appender;
-
-    public TextAreaOutputStream(JTextArea txtara) {
-        this(txtara, 1000);
-    }
-
-    public TextAreaOutputStream(JTextArea txtara, int maxlin) {
-        if (maxlin < 1) {
-            throw new IllegalArgumentException("TextAreaOutputStreamの最大行数は正数でなければなりません(value=" + maxlin + ")");
-        }
-        oneByte = new byte[1];
-        appender = new Appender(txtara, maxlin);
+class TextAreaOutputStream @JvmOverloads constructor(txtara: JTextArea, maxlin: Int = 1000) : OutputStream() {
+    private val oneByte: ByteArray
+    private var appender: Appender?
+
+    init {
+        require(maxlin >= 1) { "TextAreaOutputStreamの最大行数は正数でなければなりません(value=$maxlin)" }
+        oneByte = ByteArray(1)
+        appender = Appender(txtara, maxlin)
     }
 
-    static private String bytesToString(byte[] ba, int str, int len) {
-        try {
-            return new String(ba, str, len, System.getProperty("file.encoding"));
-        } catch (UnsupportedEncodingException thr) {
-            return new String(ba, str, len);
-        }
-    }
-
-    public synchronized void clear() {
+    @Synchronized
+    fun clear() {
         if (appender != null) {
-            appender.clear();
+            appender!!.clear()
         }
     }
 
-    @Override
-    public synchronized void close() {
-        appender = null;
+    @Synchronized
+    override fun close() {
+        appender = null
     }
 
-    @Override
-    public synchronized void flush() {
+    @Synchronized
+    override fun flush() {
         /* empty */
     }
 
-    @Override
-    public synchronized void write(int val) {
-        oneByte[0] = (byte) val;
-        write(oneByte, 0, 1);
+    @Synchronized
+    override fun write(`val`: Int) {
+        oneByte[0] = `val`.toByte()
+        write(oneByte, 0, 1)
     }
 
-    @Override
-    public synchronized void write(byte[] ba) {
-        write(ba, 0, ba.length);
+    @Synchronized
+    override fun write(ba: ByteArray) {
+        write(ba, 0, ba.size)
     }
 
-    @Override
-    public synchronized void write(byte[] ba, int str, int len) {
+    @Synchronized
+    override fun write(ba: ByteArray, str: Int, len: Int) {
         if (appender != null) {
-            appender.append(bytesToString(ba, str, len));
+            appender!!.append(bytesToString(ba, str, len))
         }
     }
 
-    static class Appender
-            implements Runnable {
-        static private final String EOL1 = "\n";
-        static private final String EOL2 = System.getProperty("line.separator", EOL1);
-
-        private final JTextArea textArea;
-        private final int maxLines;
-        private final LinkedList<Integer> lengths;
-        private final List<String> values;
+    internal class Appender(private val textArea: JTextArea, private val maxLines: Int) : Runnable {
+        private val lengths: LinkedList<Int> = LinkedList()
+        private val values: MutableList<String>
+        private var curLength = 0
+        private var clear = false
+        private var queue = true
 
-        private int curLength = 0;
-        private boolean clear;
-        private boolean queue;
-
-        Appender(JTextArea txtara, int maxlin) {
-            textArea = txtara;
-            maxLines = maxlin;
-            lengths = new LinkedList<>();
-            values = new ArrayList<>();
-
-            clear = false;
-            queue = true;
+        init {
+            values = ArrayList()
         }
 
-        private synchronized void append(String val) {
-            values.add(val);
+        @Synchronized
+        fun append(`val`: String) {
+            values.add(`val`)
             if (queue) {
-                queue = false;
-                EventQueue.invokeLater(this);
+                queue = false
+                EventQueue.invokeLater(this)
             }
         }
 
-        private synchronized void clear() {
-            clear = true;
-            curLength = 0;
-            lengths.clear();
-            values.clear();
+        @Synchronized
+        fun clear() {
+            clear = true
+            curLength = 0
+            lengths.clear()
+            values.clear()
             if (queue) {
-                queue = false;
-                EventQueue.invokeLater(this);
+                queue = false
+                EventQueue.invokeLater(this)
             }
         }
 
-        @Override
-        public synchronized void run() {
+        @Synchronized
+        override fun run() {
             if (clear) {
-                textArea.setText("");
+                textArea.text = ""
             }
             values.stream()
-                    .peek((val) -> curLength += val.length())
-                    .peek((val) -> {
-                        if (val.endsWith(EOL1) || val.endsWith(EOL2)) {
-                            if (lengths.size() >= maxLines) {
-                                textArea.replaceRange("", 0, lengths.removeFirst());
+                    .peek { `val`: String -> curLength += `val`.length }
+                    .peek { `val`: String ->
+                        if (`val`.endsWith(EOL1) || `val`.endsWith(EOL2)) {
+                            if (lengths.size >= maxLines) {
+                                textArea.replaceRange("", 0, lengths.removeFirst())
                             }
-                            lengths.addLast(curLength);
-                            curLength = 0;
+                            lengths.addLast(curLength)
+                            curLength = 0
                         }
-                    }).forEach(textArea::append);
-            values.clear();
-            clear = false;
-            queue = true;
+                    }.forEach { str: String? -> textArea.append(str) }
+            values.clear()
+            clear = false
+            queue = true
+        }
+
+        companion object {
+            private const val EOL1 = "\n"
+            private val EOL2 = System.getProperty("line.separator", EOL1)
+        }
+    }
+
+    companion object {
+        private fun bytesToString(ba: ByteArray, str: Int, len: Int): String {
+            return try {
+                String(ba, str, len, Charset.defaultCharset())
+            } catch (thr: UnsupportedEncodingException) {
+                String(ba, str, len)
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/main/java/dev/cosgy/textToSpeak/listeners/CommandAudit.kt b/src/main/java/dev/cosgy/textToSpeak/listeners/CommandAudit.kt
index 57accdf..2285871 100644
--- a/src/main/java/dev/cosgy/textToSpeak/listeners/CommandAudit.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/listeners/CommandAudit.kt
@@ -13,29 +13,25 @@
 //     See the License for the specific language governing permissions and               /
 //     limitations under the License.                                                    /
 //////////////////////////////////////////////////////////////////////////////////////////
+package dev.cosgy.textToSpeak.listeners
 
-package dev.cosgy.TextToSpeak.listeners;
+import com.jagrosh.jdautilities.command.Command
+import com.jagrosh.jdautilities.command.CommandEvent
+import com.jagrosh.jdautilities.command.CommandListener
+import dev.cosgy.textToSpeak.TextToSpeak
+import net.dv8tion.jda.api.entities.channel.ChannelType
+import org.slf4j.LoggerFactory
 
-import com.jagrosh.jdautilities.command.Command;
-import com.jagrosh.jdautilities.command.CommandEvent;
-import com.jagrosh.jdautilities.command.CommandListener;
-import dev.cosgy.TextToSpeak.TextToSpeak;
-import net.dv8tion.jda.api.entities.channel.ChannelType;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class CommandAudit implements CommandListener {
-    @Override
-    public void onCommand(CommandEvent event, Command command) {
+class CommandAudit : CommandListener {
+    override fun onCommand(event: CommandEvent, command: Command) {
         if (TextToSpeak.COMMAND_AUDIT_ENABLED) {
-            Logger logger = LoggerFactory.getLogger("CommandAudit");
-            String textFormat = event.isFromType(ChannelType.PRIVATE) ? "%s%s で %s#%s (%s) がコマンド %s を実行しました" : "%s の #%s で %s#%s (%s) がコマンド %s を実行しました";
-
+            val logger = LoggerFactory.getLogger("CommandAudit")
+            val textFormat = if (event.isFromType(ChannelType.PRIVATE)) "%s%s で %s#%s (%s) がコマンド %s を実行しました" else "%s の #%s で %s#%s (%s) がコマンド %s を実行しました"
             logger.info(String.format(textFormat,
-                    event.isFromType(ChannelType.PRIVATE) ? "DM" : event.getGuild().getName(),
-                    event.isFromType(ChannelType.PRIVATE) ? "" : event.getTextChannel().getName(),
-                    event.getAuthor().getName(), event.getAuthor().getDiscriminator(), event.getAuthor().getId(),
-                    event.getMessage().getContentDisplay()));
+                    if (event.isFromType(ChannelType.PRIVATE)) "DM" else event.guild.name,
+                    if (event.isFromType(ChannelType.PRIVATE)) "" else event.textChannel.name,
+                    event.author.name, event.author.discriminator, event.author.id,
+                    event.message.contentDisplay))
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/main/java/dev/cosgy/textToSpeak/listeners/MessageListener.kt b/src/main/java/dev/cosgy/textToSpeak/listeners/MessageListener.kt
index ebb9f09..2e58705 100644
--- a/src/main/java/dev/cosgy/textToSpeak/listeners/MessageListener.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/listeners/MessageListener.kt
@@ -13,149 +13,94 @@
 //     See the License for the specific language governing permissions and               /
 //     limitations under the License.                                                    /
 //////////////////////////////////////////////////////////////////////////////////////////
-
-package dev.cosgy.TextToSpeak.listeners;
-
-import com.sedmelluq.discord.lavaplayer.player.AudioLoadResultHandler;
-import com.sedmelluq.discord.lavaplayer.tools.FriendlyException;
-import com.sedmelluq.discord.lavaplayer.track.AudioPlaylist;
-import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
-import dev.cosgy.TextToSpeak.Bot;
-import dev.cosgy.TextToSpeak.audio.AudioHandler;
-import dev.cosgy.TextToSpeak.audio.QueuedTrack;
-import dev.cosgy.TextToSpeak.audio.VoiceCreation;
-import dev.cosgy.TextToSpeak.utils.ReadChannel;
-import net.dv8tion.jda.api.JDA;
-import net.dv8tion.jda.api.entities.Guild;
-import net.dv8tion.jda.api.entities.Message;
-import net.dv8tion.jda.api.entities.User;
-import net.dv8tion.jda.api.entities.channel.ChannelType;
-import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
-import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel;
-import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
-import net.dv8tion.jda.api.events.session.ReadyEvent;
-import net.dv8tion.jda.api.hooks.ListenerAdapter;
-
-import java.io.IOException;
-
-public class MessageListener extends ListenerAdapter {
-    private final Bot bot;
-
-    public MessageListener(Bot bot) {
-        this.bot = bot;
-    }
-
-    @Override
-    public void onMessageReceived(MessageReceivedEvent event) {
-        JDA jda = event.getJDA();
-        long responseNumber = event.getResponseNumber();
+package dev.cosgy.textToSpeak.listeners
+
+import com.sedmelluq.discord.lavaplayer.player.AudioLoadResultHandler
+import com.sedmelluq.discord.lavaplayer.tools.FriendlyException
+import com.sedmelluq.discord.lavaplayer.track.AudioPlaylist
+import com.sedmelluq.discord.lavaplayer.track.AudioTrack
+import dev.cosgy.textToSpeak.Bot
+import dev.cosgy.textToSpeak.audio.AudioHandler
+import dev.cosgy.textToSpeak.audio.QueuedTrack
+import dev.cosgy.textToSpeak.utils.ReadChannel
+import net.dv8tion.jda.api.entities.Message
+import net.dv8tion.jda.api.entities.channel.ChannelType
+import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel
+import net.dv8tion.jda.api.events.message.MessageReceivedEvent
+import net.dv8tion.jda.api.events.session.ReadyEvent
+import net.dv8tion.jda.api.hooks.ListenerAdapter
+import java.io.IOException
+import java.util.function.Consumer
+
+class MessageListener(private val bot: Bot) : ListenerAdapter() {
+    override fun onMessageReceived(event: MessageReceivedEvent) {
+        val jda = event.jda
+        val responseNumber = event.responseNumber
 
         //イベント固有の情報
-        User author = event.getAuthor();                //メッセージを送信したユーザー
-
-        Message message = event.getMessage();           //受信したメッセージ。
-        MessageChannel channel = event.getChannel();    //メッセージが送信されたMessageChannel
-
-        String msg = message.getContentDisplay();
+        val author = event.author //メッセージを送信したユーザー
+        val message = event.message //受信したメッセージ。
+        val channel: MessageChannel = event.channel //メッセージが送信されたMessageChannel
+        var msg = message.contentDisplay
         //人間が読める形式のメッセージが返されます。 クライアントに表示されるものと同様。
-
-        boolean isBot = author.isBot();
+        val isBot = author.isBot
         //if(Arrays.asList(mentionedUsers).contains())
         //メッセージを送信したユーザーがBOTであるかどうかを判断。
-
         if (event.isFromType(ChannelType.TEXT)) {
-            if (isBot) return;
-            Guild guild = event.getGuild();
-            TextChannel textChannel = event.getGuildChannel().asTextChannel();
-            TextChannel settingText = bot.getSettingsManager().getSettings(event.getGuild()).getTextChannel(event.getGuild());
-
-            if (!guild.getAudioManager().isConnected()) {
-                return;
+            if (isBot) return
+            val guild = event.guild
+            val textChannel = event.guildChannel.asTextChannel()
+            var settingText = bot.settingsManager.getSettings(event.guild)?.getTextChannel(event.guild)
+            if (!guild.audioManager.isConnected) {
+                return
             }
-
-            String prefix = bot.getConfig().getPrefix().equals("@mention") ? "@" + event.getJDA().getSelfUser().getName() + " " : bot.getConfig().getPrefix();
-
-            if (msg.startsWith(prefix)) {
-                return;
+            val prefix = if (bot.config.prefix == "@mention") "@" + event.jda.selfUser.name + " " else bot.config.prefix
+            if (prefix?.let { msg.startsWith(it) } == true) {
+                return
             }
-
-            if (textChannel != settingText) {
+            if (textChannel !== settingText) {
                 if (settingText == null) {
-                    settingText = event.getGuild().getTextChannelById(ReadChannel.getChannel(event.getGuild().getIdLong()));
+                    settingText = event.guild.getTextChannelById(ReadChannel.getChannel(event.guild.idLong)!!)
                 }
             }
 
             // URLを置き換え
-            msg = msg.replaceAll("(http://|https://)[\\w.\\-/:#?=&;%~+]+", "ゆーあーるえる");
-
-            if (textChannel == settingText) {
-
-                if (bot.getSettingsManager().getSettings(guild).isReadName()) {
-                    msg = author.getName() + "  " + msg;
+            msg = msg.replace("(http://|https://)[\\w.\\-/:#?=&;%~+]+".toRegex(), "ゆーあーるえる")
+            if (textChannel === settingText) {
+                if (bot.settingsManager.getSettings(guild)!!.isReadName()) {
+                    msg = author.name + "  " + msg
                 }
-
-                VoiceCreation vc = bot.getVoiceCreation();
-                String file;
-                try {
-                    file = vc.createVoice(guild, author, msg);
-                } catch (IOException | InterruptedException e) {
-                    throw new RuntimeException(e);
+                val vc = bot.voiceCreation
+                val file: String? = try {
+                    vc.createVoice(guild, author, msg)
+                } catch (e: IOException) {
+                    throw RuntimeException(e)
+                } catch (e: InterruptedException) {
+                    throw RuntimeException(e)
                 }
-
-                bot.getPlayerManager().loadItemOrdered(event.getGuild(), file, new ResultHandler(null, event, false));
+                bot.playerManager.loadItemOrdered(event.guild, file, ResultHandler(null, event))
 
                 //textChannel.sendMessage(author.getName() + "が、「"+ msg +"」と送信しました。").queue();
             }
         }
     }
 
-
-    @Override
-    public void onReady(ReadyEvent e) {
-        bot.readyJDA();
+    override fun onReady(e: ReadyEvent) {
+        bot.readyJDA()
     }
 
-    private static class ResultHandler implements AudioLoadResultHandler {
-        private final MessageReceivedEvent event;
-
-        private ResultHandler(Message m, MessageReceivedEvent event, boolean ytsearch) {
-            this.event = event;
-        }
-
-        private void loadSingle(AudioTrack track, AudioPlaylist playlist) {
-            AudioHandler handler = (AudioHandler) event.getGuild().getAudioManager().getSendingHandler();
-            handler.addTrack(new QueuedTrack(track, event.getAuthor()));
-        }
-
-        private int loadPlaylist(AudioPlaylist playlist, AudioTrack exclude) {
-            int[] count = {0};
-            playlist.getTracks().forEach((track) -> {
-                if (!track.equals(exclude)) {
-                    AudioHandler handler = (AudioHandler) event.getGuild().getAudioManager().getSendingHandler();
-                    handler.addTrack(new QueuedTrack(track, event.getAuthor()));
-                    count[0]++;
-                }
-            });
-            return count[0];
-        }
-
-        @Override
-        public void trackLoaded(AudioTrack track) {
-            loadSingle(track, null);
-        }
-
-        @Override
-        public void playlistLoaded(AudioPlaylist playlist) {
-
+    private class ResultHandler(m: Message?, private val event: MessageReceivedEvent) : AudioLoadResultHandler {
+        private fun loadSingle(track: AudioTrack) {
+            val handler = event.guild.audioManager.sendingHandler as AudioHandler?
+            handler!!.addTrack(QueuedTrack(track, event.author))
         }
 
-        @Override
-        public void noMatches() {
+        override fun trackLoaded(track: AudioTrack) {
+            loadSingle(track)
         }
 
-        @Override
-        public void loadFailed(FriendlyException throwable) {
-
-        }
+        override fun playlistLoaded(playlist: AudioPlaylist) {}
+        override fun noMatches() {}
+        override fun loadFailed(throwable: FriendlyException) {}
     }
-}
+}
\ No newline at end of file
diff --git a/src/main/java/dev/cosgy/textToSpeak/queue/FairQueue.kt b/src/main/java/dev/cosgy/textToSpeak/queue/FairQueue.kt
index a34f3a4..d0cec88 100644
--- a/src/main/java/dev/cosgy/textToSpeak/queue/FairQueue.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/queue/FairQueue.kt
@@ -13,77 +13,67 @@
 //     See the License for the specific language governing permissions and               /
 //     limitations under the License.                                                    /
 //////////////////////////////////////////////////////////////////////////////////////////
+package dev.cosgy.textToSpeak.queue
 
-package dev.cosgy.TextToSpeak.queue;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-public class FairQueue<T extends Queueable> {
-    private final List<T> list = new ArrayList<>();
-    private final Set<Long> set = new HashSet<>();
-
-    public int add(T item) {
-        int lastIndex;
-        for (lastIndex = list.size() - 1; lastIndex > -1; lastIndex--)
-            if (list.get(lastIndex).getIdentifier() == item.getIdentifier())
-                break;
-        lastIndex++;
-        set.clear();
-        for (; lastIndex < list.size(); lastIndex++) {
-            if (set.contains(list.get(lastIndex).getIdentifier()))
-                break;
-            set.add(list.get(lastIndex).getIdentifier());
+class FairQueue<T : Queueable?> {
+    private val list: MutableList<T> = ArrayList()
+    private val set: MutableSet<Long> = HashSet()
+    fun add(item: T): Int {
+        var lastIndex: Int = list.size - 1
+        while (lastIndex > -1) {
+            if (list[lastIndex]!!.identifier == item!!.identifier) break
+            lastIndex--
         }
-        list.add(lastIndex, item);
-        return lastIndex;
+        lastIndex++
+        set.clear()
+        while (lastIndex < list.size) {
+            if (set.contains(list[lastIndex]!!.identifier)) break
+            set.add(list[lastIndex]!!.identifier)
+            lastIndex++
+        }
+        list.add(lastIndex, item)
+        return lastIndex
     }
 
-    public void addAt(int index, T item) {
-        if (index >= list.size())
-            list.add(item);
-        else
-            list.add(index, item);
+    fun addAt(index: Int, item: T) {
+        if (index >= list.size) list.add(item) else list.add(index, item)
     }
 
-    public int size() {
-        return list.size();
+    fun size(): Int {
+        return list.size
     }
 
-    public T pull() {
-        return list.remove(0);
+    fun pull(): T {
+        return list.removeAt(0)
     }
 
-    public boolean isEmpty() {
-        return list.isEmpty();
-    }
+    val isEmpty: Boolean
+        get() = list.isEmpty()
 
-    public List<T> getList() {
-        return list;
+    fun getList(): List<T> {
+        return list
     }
 
-    public T get(int index) {
-        return list.get(index);
+    operator fun get(index: Int): T {
+        return list[index]
     }
 
-    public T remove(int index) {
-        return list.remove(index);
+    fun remove(index: Int): T {
+        return list.removeAt(index)
     }
 
-    public int removeAll(long identifier) {
-        int count = 0;
-        for (int i = list.size() - 1; i >= 0; i--) {
-            if (list.get(i).getIdentifier() == identifier) {
-                list.remove(i);
-                count++;
+    fun removeAll(identifier: Long): Int {
+        var count = 0
+        for (i in list.indices.reversed()) {
+            if (list[i]!!.identifier == identifier) {
+                list.removeAt(i)
+                count++
             }
         }
-        return count;
+        return count
     }
 
-    public void clear() {
-        list.clear();
+    fun clear() {
+        list.clear()
     }
-}
+}
\ No newline at end of file
diff --git a/src/main/java/dev/cosgy/textToSpeak/queue/Queueable.kt b/src/main/java/dev/cosgy/textToSpeak/queue/Queueable.kt
index 2b28749..9d286a3 100644
--- a/src/main/java/dev/cosgy/textToSpeak/queue/Queueable.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/queue/Queueable.kt
@@ -13,9 +13,8 @@
 //     See the License for the specific language governing permissions and               /
 //     limitations under the License.                                                    /
 //////////////////////////////////////////////////////////////////////////////////////////
+package dev.cosgy.textToSpeak.queue
 
-package dev.cosgy.TextToSpeak.queue;
-
-public interface Queueable {
-    long getIdentifier();
-}
+interface Queueable {
+    val identifier: Long
+}
\ No newline at end of file
diff --git a/src/main/java/dev/cosgy/textToSpeak/settings/Settings.kt b/src/main/java/dev/cosgy/textToSpeak/settings/Settings.kt
index 7db2d8c..5167db7 100644
--- a/src/main/java/dev/cosgy/textToSpeak/settings/Settings.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/settings/Settings.kt
@@ -13,95 +13,89 @@
 //     See the License for the specific language governing permissions and               /
 //     limitations under the License.                                                    /
 //////////////////////////////////////////////////////////////////////////////////////////
-
-package dev.cosgy.TextToSpeak.settings;
-
-import com.jagrosh.jdautilities.command.GuildSettingsProvider;
-import net.dv8tion.jda.api.entities.Guild;
-import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
-
-import java.util.Collection;
-import java.util.Collections;
-
-public class Settings implements GuildSettingsProvider {
-    private final SettingsManager manager;
-    protected long textId;
-    private String prefix;
-    private int volume;
-    private boolean readName;
-    private boolean joinAndLeaveRead;
-
-
-    public Settings(SettingsManager manager, String textId, String prefix, int volume, boolean readName, boolean joinAndLeaveRead) {
-        this.manager = manager;
+package dev.cosgy.textToSpeak.settings
+
+import com.jagrosh.jdautilities.command.GuildSettingsProvider
+import net.dv8tion.jda.api.entities.Guild
+import net.dv8tion.jda.api.entities.channel.concrete.TextChannel
+
+class Settings : GuildSettingsProvider {
+    private val manager: SettingsManager
+    var textId: Long = 0
+    var prefix: String?
+    var volume: Int
+    private var readName: Boolean
+    private var joinAndLeaveRead: Boolean
+
+    constructor(manager: SettingsManager, textId: String?, prefix: String?, volume: Int, readName: Boolean, joinAndLeaveRead: Boolean) {
+        this.manager = manager
         try {
-            this.textId = Long.parseLong(textId);
-        } catch (NumberFormatException e) {
-            this.textId = 0;
+            this.textId = textId!!.toLong()
+        } catch (e: NumberFormatException) {
+            this.textId = 0
         }
-        this.prefix = prefix;
-        this.volume = volume;
-        this.readName = readName;
-        this.joinAndLeaveRead = joinAndLeaveRead;
+        this.prefix = prefix
+        this.volume = volume
+        this.readName = readName
+        this.joinAndLeaveRead = joinAndLeaveRead
     }
 
-    public Settings(SettingsManager manager, long textId, String prefix, int volume, boolean readName, boolean joinAndLeaveRead) {
-        this.manager = manager;
-        this.textId = textId;
-        this.prefix = prefix;
-        this.volume = volume;
-        this.readName = readName;
-        this.joinAndLeaveRead = joinAndLeaveRead;
+    constructor(manager: SettingsManager, textId: Long, prefix: String?, volume: Int, readName: Boolean, joinAndLeaveRead: Boolean) {
+        this.manager = manager
+        this.textId = textId
+        this.prefix = prefix
+        this.volume = volume
+        this.readName = readName
+        this.joinAndLeaveRead = joinAndLeaveRead
     }
 
-
-    public TextChannel getTextChannel(Guild guild) {
-        return guild == null ? null : guild.getTextChannelById(textId);
+    fun getTextChannel(guild: Guild?): TextChannel? {
+        return guild?.getTextChannelById(textId)
     }
 
-    public void setTextChannel(TextChannel tc) {
-        this.textId = tc == null ? 0 : tc.getIdLong();
-        this.manager.writeSettings();
+    fun setTextChannel(tc: TextChannel?) {
+        textId = tc?.idLong ?: 0
+        manager.writeSettings()
     }
 
-    public int getVolume() {
-        return volume;
+    fun getVolume(): Int {
+        return volume
     }
 
-    public void setVolume(int volume) {
-        this.volume = volume;
-        this.manager.writeSettings();
+    fun setVolume(volume: Int) {
+        this.volume = volume
+        manager.writeSettings()
     }
 
-    public String getPrefix() {
-        return prefix;
+    fun getPrefix(): String? {
+        return prefix
     }
 
-    public void setPrefix(String prefix) {
-        this.prefix = prefix;
-        this.manager.writeSettings();
+    fun setPrefix(prefix: String?) {
+        this.prefix = prefix
+        manager.writeSettings()
     }
 
-    @Override
-    public Collection<String> getPrefixes() {
-        return prefix == null ? Collections.EMPTY_SET : Collections.singleton(prefix);
+    override fun getPrefixes(): Collection<String?> {
+        return if (prefix == null) emptySet() else setOf(prefix)
     }
 
-    public boolean isReadName() {
-        return readName;
+
+    fun isReadName(): Boolean {
+        return readName
     }
 
-    public void setReadName(boolean readName) {
-        this.readName = readName;
-        this.manager.writeSettings();
+    fun setReadName(readName: Boolean) {
+        this.readName = readName
+        manager.writeSettings()
     }
 
-    public boolean isJoinAndLeaveRead() {
-        return joinAndLeaveRead;
+    fun isJoinAndLeaveRead(): Boolean {
+        return joinAndLeaveRead
     }
 
-    public void setJoinAndLeaveRead(boolean joinAndLeaveRead) {
-        this.joinAndLeaveRead = joinAndLeaveRead;
-        this.manager.writeSettings();
+    fun setJoinAndLeaveRead(joinAndLeaveRead: Boolean) {
+        this.joinAndLeaveRead = joinAndLeaveRead
+        manager.writeSettings()
     }
-}
+}
\ No newline at end of file
diff --git a/src/main/java/dev/cosgy/textToSpeak/settings/SettingsManager.kt b/src/main/java/dev/cosgy/textToSpeak/settings/SettingsManager.kt
index 8b678ab..a6f971f 100644
--- a/src/main/java/dev/cosgy/textToSpeak/settings/SettingsManager.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/settings/SettingsManager.kt
@@ -13,49 +13,47 @@
 //     See the License for the specific language governing permissions and               /
 //     limitations under the License.                                                    /
 //////////////////////////////////////////////////////////////////////////////////////////
+package dev.cosgy.textToSpeak.settings
 
-package dev.cosgy.TextToSpeak.settings;
+import com.jagrosh.jdautilities.command.GuildSettingsManager
+import dev.cosgy.textToSpeak.utils.OtherUtil
+import net.dv8tion.jda.api.entities.Guild
+import org.json.JSONException
+import org.json.JSONObject
+import org.slf4j.LoggerFactory
+import java.io.IOException
+import java.nio.file.Files
+import java.util.function.Consumer
 
-import com.jagrosh.jdautilities.command.GuildSettingsManager;
-import dev.cosgy.TextToSpeak.utils.OtherUtil;
-import net.dv8tion.jda.api.entities.Guild;
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.slf4j.LoggerFactory;
+class SettingsManager : GuildSettingsManager<Any?> {
+    private val settings: HashMap<Long, Settings> = HashMap()
 
-import java.io.IOException;
-import java.nio.file.Files;
-import java.util.HashMap;
-
-public class SettingsManager implements GuildSettingsManager {
-    private final HashMap<Long, Settings> settings;
-
-    public SettingsManager() {
-        this.settings = new HashMap<>();
+    init {
         try {
-            JSONObject loadedSettings = new JSONObject(new String(Files.readAllBytes(OtherUtil.getPath("serversettings.json"))));
-            loadedSettings.keySet().forEach((id) -> {
-                JSONObject o = loadedSettings.getJSONObject(id);
-                settings.put(Long.parseLong(id), new Settings(this,
-                        o.has("text_channel_id") ? o.getString("text_channel_id") : null,
-                        o.has("prefix") ? o.getString("prefix") : null,
-                        o.has("volume") ? o.getInt("volume") : 50,
+            val loadedSettings = JSONObject(Files.readAllBytes(OtherUtil.getPath("serversettings.json")))
+            loadedSettings.keySet().forEach(Consumer { id: String ->
+                val o = loadedSettings.getJSONObject(id)
+                settings[id.toLong()] = Settings(this,
+                        if (o.has("text_channel_id")) o.getString("text_channel_id") else null,
+                        if (o.has("prefix")) o.getString("prefix") else null,
+                        if (o.has("volume")) o.getInt("volume") else 50,
                         o.has("read_name") && o.getBoolean("read_name"),
                         o.has("join_and_leave_read") && o.getBoolean("join_and_leave_read")
-                ));
-            });
-        } catch (IOException | JSONException e) {
-            LoggerFactory.getLogger("Settings").warn("サーバー設定を読み込めませんでした(まだ設定がない場合は正常です): " + e);
+                )
+            })
+        } catch (e: IOException) {
+            LoggerFactory.getLogger("Settings").warn("サーバー設定を読み込めませんでした(まだ設定がない場合は正常です): $e")
+        } catch (e: JSONException) {
+            LoggerFactory.getLogger("Settings").warn("サーバー設定を読み込めませんでした(まだ設定がない場合は正常です): $e")
         }
     }
 
-    @Override
-    public Settings getSettings(Guild guild) {
-        return getSettings(guild.getIdLong());
+    override fun getSettings(guild: Guild): Settings? {
+        return getSettings(guild.idLong)
     }
 
-    public Settings getSettings(long guildId) {
-        return settings.computeIfAbsent(guildId, id -> createDefaultSettings());
+    fun getSettings(guildId: Long): Settings {
+        return settings.computeIfAbsent(guildId) { id: Long? -> createDefaultSettings() }
     }
 
     /**
@@ -63,34 +61,29 @@ public class SettingsManager implements GuildSettingsManager {
      *
      * @return 作成されたデフォルト設定
      */
-    private Settings createDefaultSettings() {
-        return new Settings(this, 0, null, 50, false, false);
+    private fun createDefaultSettings(): Settings {
+        return Settings(this, 0, null, 50, false, false)
     }
 
     /**
      * 設定をファイルに書き込む
      */
-    protected void writeSettings() {
-        JSONObject obj = new JSONObject();
-        settings.keySet().forEach(key -> {
-            JSONObject o = new JSONObject();
-            Settings s = settings.get(key);
-            if (s.textId != 0)
-                o.put("text_channel_id", Long.toString(s.textId));
-            if (s.getPrefix() != null)
-                o.put("prefix", s.getPrefix());
-            if (s.getVolume() != 50)
-                o.put("volume", s.getVolume());
-            if (s.isReadName())
-                o.put("read_name", s.isReadName());
-            if (s.isJoinAndLeaveRead())
-                o.put("join_and_leave_read", s.isJoinAndLeaveRead());
-            obj.put(Long.toString(key), o);
-        });
+    fun writeSettings() {
+        val obj = JSONObject()
+        settings.keys.forEach(Consumer { key: Long ->
+            val o = JSONObject()
+            val s = settings[key]
+            if (s!!.textId != 0L) o.put("text_channel_id", java.lang.Long.toString(s.textId))
+            if (s.prefix != null) o.put("prefix", s.prefix)
+            if (s.volume != 50) o.put("volume", s.volume)
+            if (s.isReadName()) o.put("read_name", s.isReadName())
+            if (s.isJoinAndLeaveRead()) o.put("join_and_leave_read", s.isJoinAndLeaveRead())
+            obj.put(java.lang.Long.toString(key), o)
+        })
         try {
-            Files.write(OtherUtil.getPath("serversettings.json"), obj.toString(4).getBytes());
-        } catch (IOException ex) {
-            LoggerFactory.getLogger("Settings").warn("ファイルへの書き込みに失敗しました： " + ex);
+            Files.write(OtherUtil.getPath("serversettings.json"), obj.toString(4).toByteArray())
+        } catch (ex: IOException) {
+            LoggerFactory.getLogger("Settings").warn("ファイルへの書き込みに失敗しました： $ex")
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/main/java/dev/cosgy/textToSpeak/settings/UserSettings.kt b/src/main/java/dev/cosgy/textToSpeak/settings/UserSettings.kt
index 627ac61..cf9fabd 100644
--- a/src/main/java/dev/cosgy/textToSpeak/settings/UserSettings.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/settings/UserSettings.kt
@@ -13,77 +13,9 @@
 //     See the License for the specific language governing permissions and               /
 //     limitations under the License.                                                    /
 //////////////////////////////////////////////////////////////////////////////////////////
+package dev.cosgy.textToSpeak.settings
 
-package dev.cosgy.TextToSpeak.settings;
+class UserSettings(private val manager: UserSettingsManager, // getter
+                   private val userId: Long, var voice: String, var speed: Float, var intonation: Float, var voiceQualityA: Float, var voiceQualityFm: Float) {
 
-public class UserSettings {
-    private final UserSettingsManager manager;
-    private final Long userId;
-    private String voice;
-    private float speed;
-    private float intonation;
-    private float voiceQualityA;
-    private float voiceQualityFm;
-
-    public UserSettings(UserSettingsManager manager, Long userId, String voice, float speed, float intonation, float voiceQualityA, float voiceQualityFm) {
-        this.manager = manager;
-        this.userId = userId;
-        this.voice = voice;
-        this.speed = speed;
-        this.intonation = intonation;
-        this.voiceQualityA = voiceQualityA;
-        this.voiceQualityFm = voiceQualityFm;
-    }
-
-
-    // getter
-    public Long getUserId() {
-        return userId;
-    }
-
-    public String getVoice() {
-        return voice;
-    }
-
-    // setter
-    public void setVoice(String voice) {
-        this.voice = voice;
-        this.manager.saveSetting(userId);
-    }
-
-    public float getSpeed() {
-        return speed;
-    }
-
-    public void setSpeed(float speed) {
-        this.speed = speed;
-        this.manager.saveSetting(userId);
-    }
-
-    public float getIntonation() {
-        return intonation;
-    }
-
-    public void setIntonation(float intonation) {
-        this.intonation = intonation;
-        this.manager.saveSetting(userId);
-    }
-
-    public float getVoiceQualityA() {
-        return voiceQualityA;
-    }
-
-    public void setVoiceQualityA(float voiceQualityA) {
-        this.voiceQualityA = voiceQualityA;
-        this.manager.saveSetting(userId);
-    }
-
-    public float getVoiceQualityFm() {
-        return voiceQualityFm;
-    }
-
-    public void setVoiceQualityFm(float voiceQualityFm) {
-        this.voiceQualityFm = voiceQualityFm;
-        this.manager.saveSetting(userId);
-    }
-}
+}
\ No newline at end of file
diff --git a/src/main/java/dev/cosgy/textToSpeak/settings/UserSettingsManager.kt b/src/main/java/dev/cosgy/textToSpeak/settings/UserSettingsManager.kt
index eca6c91..56efb02 100644
--- a/src/main/java/dev/cosgy/textToSpeak/settings/UserSettingsManager.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/settings/UserSettingsManager.kt
@@ -1,4 +1,13 @@
-package dev.cosgy.TextToSpeak.settings;
+package dev.cosgy.textToSpeak.settings
+
+import dev.cosgy.textToSpeak.utils.OtherUtil
+import org.apache.commons.io.FileUtils
+import org.slf4j.LoggerFactory
+import java.io.IOException
+import java.nio.charset.StandardCharsets
+import java.sql.Connection
+import java.sql.DriverManager
+import java.sql.SQLException
 
 //////////////////////////////////////////////////////////////////////////////////////////
 //  Copyright 2023 Cosgy Dev                                                             /
@@ -15,85 +24,72 @@ package dev.cosgy.TextToSpeak.settings;
 //     See the License for the specific language governing permissions and               /
 //     limitations under the License.                                                    /
 //////////////////////////////////////////////////////////////////////////////////////////
+class UserSettingsManager {
+    private val settings: HashMap<Long, UserSettings>
+    private val logger = LoggerFactory.getLogger(this.javaClass)
+    private var connection: Connection? = null
 
-import dev.cosgy.TextToSpeak.utils.OtherUtil;
-import org.apache.commons.io.FileUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Path;
-import java.sql.*;
-import java.util.HashMap;
-
-public class UserSettingsManager {
-    private final HashMap<Long, UserSettings> settings;
-    private final Logger logger = LoggerFactory.getLogger(this.getClass());
-    private Connection connection;
-
-    public UserSettingsManager() {
-        this.settings = new HashMap<>();
-        Path path = OtherUtil.getPath("UserData.sqlite");
-        boolean create = false;
-        if (!path.toFile().exists()) {
-            create = true;
-            String original = OtherUtil.loadResource(this, "UserData.sqlite");
+    init {
+        settings = HashMap()
+        val path = OtherUtil.getPath("UserData.sqlite")
+        var create = false
+        if (!path!!.toFile().exists()) {
+            create = true
+            val original = OtherUtil.loadResource(this, "UserData.sqlite")
             try {
-                FileUtils.writeStringToFile(path.toFile(), original, StandardCharsets.UTF_8);
-                logger.info("データベースファイルが存在しなかったためファイルを作成しました。");
-            } catch (IOException e) {
-                logger.error("データベースファイルを作成できませんでした。", e);
+                FileUtils.writeStringToFile(path.toFile(), original, StandardCharsets.UTF_8)
+                logger.info("データベースファイルが存在しなかったためファイルを作成しました。")
+            } catch (e: IOException) {
+                logger.error("データベースファイルを作成できませんでした。", e)
             }
         }
-
         try {
-            connection = DriverManager.getConnection("jdbc:sqlite:UserData.sqlite");
-            Statement statement = connection.createStatement();
-            String sql = "create table if not exists settings ( id integer not null constraint settings_pk primary key, voice TEXT, speed real, intonation real, voiceQualityA  real, voiceQualityFm real)";
-            statement.execute(sql);
-
-            ResultSet rs = statement.executeQuery("select * from settings");
+            connection = DriverManager.getConnection("jdbc:sqlite:UserData.sqlite")
+            val statement = connection!!.createStatement()
+            val sql = "create table if not exists settings ( id integer not null constraint settings_pk primary key, voice TEXT, speed real, intonation real, voiceQualityA  real, voiceQualityFm real)"
+            statement.execute(sql)
+            val rs = statement.executeQuery("select * from settings")
             while (rs.next()) {
-                settings.put(rs.getLong(1), new UserSettings(this, rs.getLong(1), rs.getString(2), rs.getFloat(3), rs.getFloat(4), rs.getFloat(5), rs.getFloat(6)));
+                settings[rs.getLong(1)] = UserSettings(this, rs.getLong(1), rs.getString(2), rs.getFloat(3), rs.getFloat(4), rs.getFloat(5), rs.getFloat(6))
             }
-        } catch (SQLException throwables) {
-            logger.error("データベースに接続できませんでした。", throwables);
+        } catch (throwables: SQLException) {
+            logger.error("データベースに接続できませんでした。", throwables)
         }
     }
 
-    public UserSettings getSettings(long userId) {
-        return settings.computeIfAbsent(userId, this::createDefaultSettings);
+    fun getSettings(userId: Long): UserSettings {
+        return settings.computeIfAbsent(userId) { userId: Long -> createDefaultSettings(userId) }
     }
 
-    private UserSettings createDefaultSettings(Long userId) {
-        return new UserSettings(this, userId, "mei_normal", 1.0f, 1.0f, 0.5f, 2.0f);
+    private fun createDefaultSettings(userId: Long): UserSettings {
+        return UserSettings(this, userId, "mei_normal", 1.0f, 1.0f, 0.5f, 2.0f)
     }
 
-    protected void saveSetting(Long userId) {
-        String sql = "REPLACE INTO settings (id, voice, speed, intonation, voiceQualityA, voiceQualityFm) VALUES (?,?,?,?,?,?)";
-        UserSettings settings = this.settings.get(userId);
-        try (PreparedStatement ps = connection.prepareStatement(sql)) {
-            ps.setLong(1, userId);
-            ps.setString(2, settings.getVoice());
-            ps.setFloat(3, settings.getSpeed());
-            ps.setFloat(4, settings.getIntonation());
-            ps.setFloat(5, settings.getVoiceQualityA());
-            ps.setFloat(6, settings.getVoiceQualityFm());
-
-            logger.debug(ps.toString());
-            ps.executeUpdate();
-        } catch (SQLException throwables) {
-            logger.error("設定を保存できませんでした。", throwables);
+    fun saveSetting(userId: Long) {
+        val sql = "REPLACE INTO settings (id, voice, speed, intonation, voiceQualityA, voiceQualityFm) VALUES (?,?,?,?,?,?)"
+        val settings = settings[userId]
+        try {
+            connection!!.prepareStatement(sql).use { ps ->
+                ps.setLong(1, userId)
+                ps.setString(2, settings!!.voice)
+                ps.setFloat(3, settings.speed)
+                ps.setFloat(4, settings.intonation)
+                ps.setFloat(5, settings.voiceQualityA)
+                ps.setFloat(6, settings.voiceQualityFm)
+                logger.debug(ps.toString())
+                ps.executeUpdate()
+            }
+        } catch (throwables: SQLException) {
+            logger.error("設定を保存できませんでした。", throwables)
         }
     }
 
-    public void closeConnection() {
+    fun closeConnection() {
         try {
-            connection.close();
-            logger.info("データベース接続を終了しました。");
-        } catch (SQLException e) {
-            logger.error("データベース接続を終了できませんでした。", e);
+            connection!!.close()
+            logger.info("データベース接続を終了しました。")
+        } catch (e: SQLException) {
+            logger.error("データベース接続を終了できませんでした。", e)
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/main/java/dev/cosgy/textToSpeak/utils/FormatUtil.kt b/src/main/java/dev/cosgy/textToSpeak/utils/FormatUtil.kt
index adbe2ea..34c75cf 100644
--- a/src/main/java/dev/cosgy/textToSpeak/utils/FormatUtil.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/utils/FormatUtil.kt
@@ -13,20 +13,19 @@
 //     See the License for the specific language governing permissions and               /
 //     limitations under the License.                                                    /
 //////////////////////////////////////////////////////////////////////////////////////////
+package dev.cosgy.textToSpeak.utils
 
-package dev.cosgy.TextToSpeak.utils;
+import net.dv8tion.jda.api.entities.channel.concrete.TextChannel
 
-import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
-
-import java.util.List;
-
-public class FormatUtil {
-    public static String listOfTChannels(List<TextChannel> list, String query) {
-        StringBuilder out = new StringBuilder(" 複数のテキストチャンネルで\"" + query + "\"が一致しました。:");
-        for (int i = 0; i < 6 && i < list.size(); i++)
-            out.append("\n - ").append(list.get(i).getName()).append(" (<#").append(list.get(i).getId()).append(">)");
-        if (list.size() > 6)
-            out.append("\n**と ").append(list.size() - 6).append(" など...**");
-        return out.toString();
+object FormatUtil {
+    fun listOfTChannels(list: List<TextChannel>, query: String): String {
+        val out = StringBuilder(" 複数のテキストチャンネルで\"$query\"が一致しました。:")
+        var i = 0
+        while (i < 6 && i < list.size) {
+            out.append("\n - ").append(list[i].name).append(" (<#").append(list[i].id).append(">)")
+            i++
+        }
+        if (list.size > 6) out.append("\n**と ").append(list.size - 6).append(" など...**")
+        return out.toString()
     }
-}
+}
\ No newline at end of file
diff --git a/src/main/java/dev/cosgy/textToSpeak/utils/OtherUtil.kt b/src/main/java/dev/cosgy/textToSpeak/utils/OtherUtil.kt
index 11b3c72..52e00a8 100644
--- a/src/main/java/dev/cosgy/textToSpeak/utils/OtherUtil.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/utils/OtherUtil.kt
@@ -13,45 +13,44 @@
 //     See the License for the specific language governing permissions and               /
 //     limitations under the License.                                                    /
 //////////////////////////////////////////////////////////////////////////////////////////
-
-package dev.cosgy.TextToSpeak.utils;
-
-import dev.cosgy.TextToSpeak.TextToSpeak;
-import dev.cosgy.TextToSpeak.entities.Prompt;
-import net.dv8tion.jda.api.OnlineStatus;
-import net.dv8tion.jda.api.entities.Activity;
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import okhttp3.Response;
-import okhttp3.ResponseBody;
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.json.JSONTokener;
-
-import java.io.*;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.net.URLConnection;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-
-public class OtherUtil {
-    public final static String NEW_VERSION_AVAILABLE = "利用可能な新しいバージョンがあります!\n"
+package dev.cosgy.textToSpeak.utils
+
+import dev.cosgy.textToSpeak.TextToSpeak
+import dev.cosgy.textToSpeak.entities.Prompt
+import net.dv8tion.jda.api.OnlineStatus
+import net.dv8tion.jda.api.entities.Activity
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import org.json.JSONException
+import org.json.JSONObject
+import org.slf4j.LoggerFactory
+import java.io.ByteArrayOutputStream
+import java.io.File
+import java.io.IOException
+import java.io.InputStream
+import java.net.URISyntaxException
+import java.net.URL
+import java.nio.file.Path
+import java.nio.file.Paths
+import java.util.*
+
+object OtherUtil {
+    const val NEW_VERSION_AVAILABLE = ("利用可能な新しいバージョンがあります!\n"
             + "現在のバージョン: %s\n"
             + "最新のバージョン: %s\n\n"
-            + " https://github.com/Cosgy-Dev/TextToSpeakBot/releases/latest から最新バージョンをダウンロードして下さい。";
-    private final static String WINDOWS_INVALID_PATH = "c:\\windows\\system32\\";
-
-    public static Path getPath(String path) {
+            + " https://github.com/Cosgy-Dev/TextToSpeakBot/releases/latest から最新バージョンをダウンロードして下さい。")
+    private const val WINDOWS_INVALID_PATH = "c:\\windows\\system32\\"
+    fun getPath(path: String): Path {
         // special logic to prevent trying to access system32
-        if (path.toLowerCase().startsWith(WINDOWS_INVALID_PATH)) {
-            String filename = path.substring(WINDOWS_INVALID_PATH.length());
+        var path = path
+        if (path.lowercase(Locale.getDefault()).startsWith(WINDOWS_INVALID_PATH)) {
+            val filename = path.substring(WINDOWS_INVALID_PATH.length)
             try {
-                path = new File(TextToSpeak.class.getProtectionDomain().getCodeSource().getLocation().toURI()).getParentFile().getPath() + File.separator + filename;
-            } catch (URISyntaxException ignored) {
+                path = File(TextToSpeak::class.java.protectionDomain.codeSource.location.toURI()).parentFile.path + File.separator + filename
+            } catch (ignored: URISyntaxException) {
             }
         }
-        return Paths.get(path);
+        return Paths.get(path)
     }
 
     /**
@@ -61,22 +60,24 @@ public class OtherUtil {
      * @param name  リソースの名前
      * @return リソースの内容を含む文字列
      */
-    public static String loadResource(Object clazz, String name) {
-        try {
-            return readString(clazz.getClass().getResourceAsStream(name));
-        } catch (Exception ex) {
-            return null;
+    fun loadResource(clazz: Any, name: String?): String? {
+        return try {
+            readString(clazz.javaClass.getResourceAsStream(name))
+        } catch (ex: Exception) {
+            null
         }
     }
 
-    public static String readString(InputStream inputStream) throws IOException {
-        ByteArrayOutputStream into = new ByteArrayOutputStream();
-        byte[] buf = new byte[32768];
-        for (int n; 0 < (n = inputStream.read(buf)); ) {
-            into.write(buf, 0, n);
+    @Throws(IOException::class)
+    fun readString(inputStream: InputStream): String {
+        val into = ByteArrayOutputStream()
+        val buf = ByteArray(32768)
+        var n: Int
+        while (0 < inputStream.read(buf).also { n = it }) {
+            into.write(buf, 0, n)
         }
-        into.close();
-        return into.toString("utf-8");
+        into.close()
+        return into.toString("utf-8")
     }
 
     /**
@@ -85,17 +86,17 @@ public class OtherUtil {
      * @param url 画像のURL
      * @return URLのinputstream
      */
-    public static InputStream imageFromUrl(String url) {
-        if (url == null)
-            return null;
+    fun imageFromUrl(url: String?): InputStream? {
+        if (url == null) return null
         try {
-            URL u = new URL(url);
-            URLConnection urlConnection = u.openConnection();
-            urlConnection.setRequestProperty("user-agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.87 Safari/537.36");
-            return urlConnection.getInputStream();
-        } catch (IOException | IllegalArgumentException ignore) {
+            val u = URL(url)
+            val urlConnection = u.openConnection()
+            urlConnection.setRequestProperty("user-agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.87 Safari/537.36")
+            return urlConnection.getInputStream()
+        } catch (ignore: IOException) {
+        } catch (ignore: IllegalArgumentException) {
         }
-        return null;
+        return null
     }
 
     /**
@@ -104,77 +105,75 @@ public class OtherUtil {
      * @param game the game, including the action such as 'playing' or 'watching'
      * @return the parsed activity
      */
-    public static Activity parseGame(String game) {
-        if (game == null || game.trim().isEmpty() || game.trim().equalsIgnoreCase("default"))
-            return null;
-        String lower = game.toLowerCase();
-        if (lower.startsWith("playing"))
-            return Activity.playing(makeNonEmpty(game.substring(7).trim()));
-        if (lower.startsWith("listening to"))
-            return Activity.listening(makeNonEmpty(game.substring(12).trim()));
-        if (lower.startsWith("listening"))
-            return Activity.listening(makeNonEmpty(game.substring(9).trim()));
-        if (lower.startsWith("watching"))
-            return Activity.watching(makeNonEmpty(game.substring(8).trim()));
+    fun parseGame(game: String?): Activity? {
+        if (game == null || game.trim { it <= ' ' }.isEmpty() || game.trim { it <= ' ' }.equals("default", ignoreCase = true)) return null
+        val lower = game.lowercase(Locale.getDefault())
+        if (lower.startsWith("playing")) return Activity.playing(makeNonEmpty(game.substring(7).trim { it <= ' ' }))
+        if (lower.startsWith("listening to")) return Activity.listening(makeNonEmpty(game.substring(12).trim { it <= ' ' }))
+        if (lower.startsWith("listening")) return Activity.listening(makeNonEmpty(game.substring(9).trim { it <= ' ' }))
+        if (lower.startsWith("watching")) return Activity.watching(makeNonEmpty(game.substring(8).trim { it <= ' ' }))
         if (lower.startsWith("streaming")) {
-            String[] parts = game.substring(9).trim().split("\\s+", 2);
-            if (parts.length == 2) {
-                return Activity.streaming(makeNonEmpty(parts[1]), "https://twitch.tv/" + parts[0]);
+            val parts = game.substring(9).trim { it <= ' ' }.split("\\s+".toRegex(), limit = 2).toTypedArray()
+            if (parts.size == 2) {
+                return Activity.streaming(makeNonEmpty(parts[1]), "https://twitch.tv/" + parts[0])
             }
         }
-        return Activity.playing(game);
+        return Activity.playing(game)
     }
 
-    public static String makeNonEmpty(String str) {
-        return str == null || str.isEmpty() ? "\u200B" : str;
+    fun makeNonEmpty(str: String?): String {
+        return if (str == null || str.isEmpty()) "\u200B" else str
     }
 
-    public static OnlineStatus parseStatus(String status) {
-        if (status == null || status.trim().isEmpty())
-            return OnlineStatus.ONLINE;
-        OnlineStatus st = OnlineStatus.fromKey(status);
-        return st == null ? OnlineStatus.ONLINE : st;
+    fun parseStatus(status: String?): OnlineStatus {
+        if (status == null || status.trim { it <= ' ' }.isEmpty()) return OnlineStatus.ONLINE
+        val st = OnlineStatus.fromKey(status)
+        return st ?: OnlineStatus.ONLINE
     }
 
-    public static String checkVersion(Prompt prompt) {
+    fun checkVersion(prompt: Prompt): String {
         // Get current version number
-        String version = getCurrentVersion();
+        val version = currentVersion
 
         // Check for new version
-        String latestVersion = getLatestVersion();
-
-        if (latestVersion != null && !latestVersion.equals(version) && TextToSpeak.CHECK_UPDATE) {
-            prompt.alert(Prompt.Level.WARNING, "Version", String.format(NEW_VERSION_AVAILABLE, version, latestVersion));
+        val latestVersion = latestVersion
+        if (latestVersion != null && latestVersion != version && TextToSpeak.CHECK_UPDATE) {
+            prompt.alert(Prompt.Level.WARNING, "Version", String.format(NEW_VERSION_AVAILABLE, version, latestVersion))
         }
 
         // Return the current version
-        return version;
+        return version
     }
 
-    public static String getCurrentVersion() {
-        if (TextToSpeak.class.getPackage() != null && TextToSpeak.class.getPackage().getImplementationVersion() != null)
-            return TextToSpeak.class.getPackage().getImplementationVersion();
-        else
-            return "不明";
-    }
-
-    public static String getLatestVersion() {
-        try {
-            Response response = new OkHttpClient.Builder().build()
-                    .newCall(new Request.Builder().get().url("https://api.github.com/repos/Cosgy-Dev/TextToSpeakBot/releases/latest").build())
-                    .execute();
-            ResponseBody body = response.body();
-            if (body != null) {
-                try (Reader reader = body.charStream()) {
-                    JSONObject obj = new JSONObject(new JSONTokener(reader));
-                    return obj.getString("tag_name");
-                } finally {
-                    response.close();
-                }
-            } else
-                return null;
-        } catch (IOException | JSONException | NullPointerException ex) {
-            return null;
+    val currentVersion: String
+        get() = if (TextToSpeak::class.java.getPackage() != null && TextToSpeak::class.java.getPackage().implementationVersion != null) TextToSpeak::class.java.getPackage().implementationVersion else "不明"
+    val latestVersion: String?
+        get() {
+            try {
+                val client = OkHttpClient()
+
+                val request = Request.Builder()
+                        .url("https://api.github.com/repos/Cosgy-Dev/TextToSpeakBot/releases/latest")
+                        .build()
+
+                val response = client.newCall(request).execute()
+                val body = response.body?.string()
+
+                if (body != null) {
+                    try {
+                        val obj = JSONObject(body)
+                        return obj.getString("tag_name")
+                    } catch (e: JSONException) {
+                        LoggerFactory.getLogger("Settings").warn("タグ名を解析できませんでした: $e")
+                    }
+                } else return null
+            } catch (ex: IOException) {
+                return null
+            } catch (ex: JSONException) {
+                return null
+            } catch (ex: NullPointerException) {
+                return null
+            }
+            return null
         }
-    }
-}
+}
\ No newline at end of file
diff --git a/src/main/java/dev/cosgy/textToSpeak/utils/ReadChannel.kt b/src/main/java/dev/cosgy/textToSpeak/utils/ReadChannel.kt
index 1078f26..d5b06bc 100644
--- a/src/main/java/dev/cosgy/textToSpeak/utils/ReadChannel.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/utils/ReadChannel.kt
@@ -13,19 +13,15 @@
 //     See the License for the specific language governing permissions and               /
 //     limitations under the License.                                                    /
 //////////////////////////////////////////////////////////////////////////////////////////
+package dev.cosgy.textToSpeak.utils
 
-package dev.cosgy.TextToSpeak.utils;
-
-import java.util.HashMap;
-
-public class ReadChannel {
-    private static HashMap<Long, Long> chat = new HashMap<>();
-
-    public static void setChannel(Long guild, Long textChannel) {
-        chat.put(guild, textChannel);
+object ReadChannel {
+    private val chat = HashMap<Long, Long>()
+    fun setChannel(guild: Long, textChannel: Long) {
+        chat[guild] = textChannel
     }
 
-    public static Long getChannel(Long guild) {
-        return chat.get(guild);
+    fun getChannel(guild: Long): Long? {
+        return chat[guild]
     }
-}
+}
\ No newline at end of file

From ee96b263ab52fb48e319ad1a8ac99a318cb0514f Mon Sep 17 00:00:00 2001
From: Sakuya Kosugi <kosugikun@icloud.com>
Date: Wed, 29 Mar 2023 01:02:52 +0900
Subject: [PATCH 03/39] =?UTF-8?q?=E4=B8=8D=E5=85=B7=E5=90=88=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                        |  2 +-
 .../cosgy/textToSpeak/audio/PlayerManager.kt   |  2 +-
 .../dev/cosgy/textToSpeak/settings/Settings.kt | 18 ------------------
 3 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/pom.xml b/pom.xml
index 38f25df..c92e528 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
 
     <groupId>dev.cosgy</groupId>
     <artifactId>TextToSpeak</artifactId>
-    <version>0.3.1</version>
+    <version>0.4.0</version>
     <packaging>jar</packaging>
 
     <repositories>
diff --git a/src/main/java/dev/cosgy/textToSpeak/audio/PlayerManager.kt b/src/main/java/dev/cosgy/textToSpeak/audio/PlayerManager.kt
index c749803..a8e9d6d 100644
--- a/src/main/java/dev/cosgy/textToSpeak/audio/PlayerManager.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/audio/PlayerManager.kt
@@ -44,7 +44,7 @@ class PlayerManager(val bot: Bot) : DefaultAudioPlayerManager() {
         val handler: AudioHandler?
         if (guild.audioManager.sendingHandler == null) {
             val player = createPlayer()
-            player.volume = bot.settingsManager.getSettings(guild)!!.getVolume()
+            player.volume = bot.settingsManager.getSettings(guild)!!.volume
             handler = AudioHandler(this, guild, player)
             player.addListener(handler)
             guild.audioManager.sendingHandler = handler
diff --git a/src/main/java/dev/cosgy/textToSpeak/settings/Settings.kt b/src/main/java/dev/cosgy/textToSpeak/settings/Settings.kt
index 5167db7..dc06cad 100644
--- a/src/main/java/dev/cosgy/textToSpeak/settings/Settings.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/settings/Settings.kt
@@ -58,24 +58,6 @@ class Settings : GuildSettingsProvider {
         manager.writeSettings()
     }
 
-    fun getVolume(): Int {
-        return volume
-    }
-
-    fun setVolume(volume: Int) {
-        this.volume = volume
-        manager.writeSettings()
-    }
-
-    fun getPrefix(): String? {
-        return prefix
-    }
-
-    fun setPrefix(prefix: String?) {
-        this.prefix = prefix
-        manager.writeSettings()
-    }
-
     override fun getPrefixes(): Collection<String?> {
         return if (prefix == null) emptySet() else setOf(prefix)
     }

From b9c796a4079ccb9a1fb7ace812b293d02258653a Mon Sep 17 00:00:00 2001
From: Sakuya Kosugi <kosugikun@icloud.com>
Date: Wed, 29 Mar 2023 01:20:05 +0900
Subject: [PATCH 04/39] =?UTF-8?q?=E4=B8=8D=E5=85=B7=E5=90=88=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/code_quality.yml         | 4 +---
 src/main/java/dev/cosgy/textToSpeak/Bot.kt | 3 ++-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/code_quality.yml b/.github/workflows/code_quality.yml
index 4512633..22c2852 100644
--- a/.github/workflows/code_quality.yml
+++ b/.github/workflows/code_quality.yml
@@ -4,9 +4,7 @@ on:
   pull_request:
   push:
     branches:
-      - master
-      - develop
-      - 'releases/*'
+      - '*'
 
 jobs:
   qodana:
diff --git a/src/main/java/dev/cosgy/textToSpeak/Bot.kt b/src/main/java/dev/cosgy/textToSpeak/Bot.kt
index 375cdc0..098a692 100644
--- a/src/main/java/dev/cosgy/textToSpeak/Bot.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/Bot.kt
@@ -32,6 +32,7 @@ import java.util.concurrent.Executors
 import java.util.concurrent.ScheduledExecutorService
 import java.util.concurrent.TimeUnit
 import java.util.function.Consumer
+import kotlin.system.exitProcess
 
 class Bot(val waiter: EventWaiter, val config: BotConfig, val settingsManager: SettingsManager) {
     val threadpool: ScheduledExecutorService
@@ -111,7 +112,7 @@ class Bot(val waiter: EventWaiter, val config: BotConfig, val settingsManager: S
             }
         }
         if (gui != null) gui!!.dispose()
-        System.exit(0)
+        exitProcess(0)
     }
 
     fun setGUI(gui: GUI?) {

From 3d7923f4862deb08307beb26b611a19017aec3f7 Mon Sep 17 00:00:00 2001
From: Sakuya Kosugi <kosugikun@icloud.com>
Date: Wed, 29 Mar 2023 01:35:25 +0900
Subject: [PATCH 05/39] =?UTF-8?q?=E7=B4=B0=E3=81=8B=E3=81=AA=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                                    | 2 +-
 src/main/java/dev/cosgy/textToSpeak/Bot.kt                 | 3 ++-
 .../dev/cosgy/textToSpeak/commands/admin/SetReadNameCmd.kt | 3 ++-
 .../dev/cosgy/textToSpeak/settings/UserSettingsManager.kt  | 7 ++-----
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/pom.xml b/pom.xml
index c92e528..97fb5cf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -133,7 +133,7 @@
         </dependency>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-test</artifactId>
+            <artifactId>kotlin-test-junit</artifactId>
             <version>${kotlin.version}</version>
             <scope>test</scope>
         </dependency>
diff --git a/src/main/java/dev/cosgy/textToSpeak/Bot.kt b/src/main/java/dev/cosgy/textToSpeak/Bot.kt
index 098a692..78d4687 100644
--- a/src/main/java/dev/cosgy/textToSpeak/Bot.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/Bot.kt
@@ -24,6 +24,7 @@ import dev.cosgy.textToSpeak.settings.UserSettingsManager
 import net.dv8tion.jda.api.JDA
 import net.dv8tion.jda.api.entities.Guild
 import org.apache.commons.io.FileUtils
+import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 import java.io.File
 import java.io.IOException
@@ -41,7 +42,7 @@ class Bot(val waiter: EventWaiter, val config: BotConfig, val settingsManager: S
     val voiceCreation: VoiceCreation
     val userSettingsManager: UserSettingsManager
     val aloneInVoiceHandler: AloneInVoiceHandler
-    var log = LoggerFactory.getLogger(this.javaClass)
+    var log: Logger = LoggerFactory.getLogger(this.javaClass)
     var dictionary: Dictionary? = null
         private set
     private var shuttingDown = false
diff --git a/src/main/java/dev/cosgy/textToSpeak/commands/admin/SetReadNameCmd.kt b/src/main/java/dev/cosgy/textToSpeak/commands/admin/SetReadNameCmd.kt
index d167ad8..7f8dc5f 100644
--- a/src/main/java/dev/cosgy/textToSpeak/commands/admin/SetReadNameCmd.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/commands/admin/SetReadNameCmd.kt
@@ -19,10 +19,11 @@ import com.jagrosh.jdautilities.command.CommandEvent
 import com.jagrosh.jdautilities.command.SlashCommandEvent
 import dev.cosgy.textToSpeak.Bot
 import dev.cosgy.textToSpeak.commands.AdminCommand
+import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 
 class SetReadNameCmd(private val bot: Bot) : AdminCommand() {
-    var log = LoggerFactory.getLogger(this.javaClass)
+    var log: Logger = LoggerFactory.getLogger(this.javaClass)
 
     init {
         name = "setreadname"
diff --git a/src/main/java/dev/cosgy/textToSpeak/settings/UserSettingsManager.kt b/src/main/java/dev/cosgy/textToSpeak/settings/UserSettingsManager.kt
index 56efb02..5e0ee0a 100644
--- a/src/main/java/dev/cosgy/textToSpeak/settings/UserSettingsManager.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/settings/UserSettingsManager.kt
@@ -25,16 +25,13 @@ import java.sql.SQLException
 //     limitations under the License.                                                    /
 //////////////////////////////////////////////////////////////////////////////////////////
 class UserSettingsManager {
-    private val settings: HashMap<Long, UserSettings>
+    private val settings: HashMap<Long, UserSettings> = HashMap()
     private val logger = LoggerFactory.getLogger(this.javaClass)
     private var connection: Connection? = null
 
     init {
-        settings = HashMap()
         val path = OtherUtil.getPath("UserData.sqlite")
-        var create = false
-        if (!path!!.toFile().exists()) {
-            create = true
+        if (!path.toFile().exists()) {
             val original = OtherUtil.loadResource(this, "UserData.sqlite")
             try {
                 FileUtils.writeStringToFile(path.toFile(), original, StandardCharsets.UTF_8)

From b2c175dff652fb3c78d43243ea4c1a592858f5c2 Mon Sep 17 00:00:00 2001
From: Sakuya Kosugi <kosugikun@icloud.com>
Date: Wed, 29 Mar 2023 01:42:58 +0900
Subject: [PATCH 06/39] =?UTF-8?q?=E4=BD=BF=E7=94=A8=E3=81=97=E3=81=AA?=
 =?UTF-8?q?=E3=81=84=E9=96=A2=E6=95=B0=E3=81=AA=E3=81=A9=E3=82=92=E5=89=8A?=
 =?UTF-8?q?=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/dev/cosgy/textToSpeak/Listener.kt    | 20 +++----------------
 .../commands/general/AboutCommand.kt          |  2 +-
 2 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/src/main/java/dev/cosgy/textToSpeak/Listener.kt b/src/main/java/dev/cosgy/textToSpeak/Listener.kt
index e03c7e7..eeec07f 100644
--- a/src/main/java/dev/cosgy/textToSpeak/Listener.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/Listener.kt
@@ -22,7 +22,6 @@ import com.sedmelluq.discord.lavaplayer.track.AudioTrack
 import dev.cosgy.textToSpeak.audio.AudioHandler
 import dev.cosgy.textToSpeak.audio.QueuedTrack
 import dev.cosgy.textToSpeak.utils.OtherUtil
-import net.dv8tion.jda.api.entities.Message
 import net.dv8tion.jda.api.entities.channel.concrete.PrivateChannel
 import net.dv8tion.jda.api.events.guild.voice.GuildVoiceUpdateEvent
 import net.dv8tion.jda.api.events.session.ReadyEvent
@@ -33,7 +32,6 @@ import org.slf4j.LoggerFactory
 import java.io.IOException
 import java.util.*
 import java.util.concurrent.TimeUnit
-import java.util.function.Consumer
 
 class Listener(private val bot: Bot) : ListenerAdapter() {
     var log: Logger = LoggerFactory.getLogger(this.javaClass)
@@ -70,7 +68,7 @@ class Listener(private val bot: Bot) : ListenerAdapter() {
                 } catch (e: InterruptedException) {
                     throw RuntimeException(e)
                 }
-                bot.playerManager.loadItemOrdered(event.guild, file, ResultHandler(null, event))
+                bot.playerManager.loadItemOrdered(event.guild, file, ResultHandler(event))
             }
             if (event.channelLeft!!.members.size == 1 && event.channelLeft!!.members.contains(botMember)) {
                 val handler = event.guild.audioManager.sendingHandler as AudioHandler?
@@ -91,7 +89,7 @@ class Listener(private val bot: Bot) : ListenerAdapter() {
                 } catch (e: InterruptedException) {
                     throw RuntimeException(e)
                 }
-                bot.playerManager.loadItemOrdered(event.guild, file, ResultHandler(null, event))
+                bot.playerManager.loadItemOrdered(event.guild, file, ResultHandler(event))
             }
         }
     }
@@ -100,24 +98,12 @@ class Listener(private val bot: Bot) : ListenerAdapter() {
         bot.shutdown()
     }
 
-    private inner class ResultHandler(private val m: Message?, private val event: GuildVoiceUpdateEvent) : AudioLoadResultHandler {
+    private inner class ResultHandler(private val event: GuildVoiceUpdateEvent) : AudioLoadResultHandler {
         private fun loadSingle(track: AudioTrack) {
             val handler = event.guild.audioManager.sendingHandler as AudioHandler?
             handler!!.addTrack(QueuedTrack(track, event.member.user))
         }
 
-        private fun loadPlaylist(playlist: AudioPlaylist, exclude: AudioTrack): Int {
-            val count = intArrayOf(0)
-            playlist.tracks.forEach(Consumer { track: AudioTrack ->
-                if (track != exclude) {
-                    val handler = event.guild.audioManager.sendingHandler as AudioHandler?
-                    handler!!.addTrack(QueuedTrack(track, event.member.user))
-                    count[0]++
-                }
-            })
-            return count[0]
-        }
-
         override fun trackLoaded(track: AudioTrack) {
             loadSingle(track)
         }
diff --git a/src/main/java/dev/cosgy/textToSpeak/commands/general/AboutCommand.kt b/src/main/java/dev/cosgy/textToSpeak/commands/general/AboutCommand.kt
index 4a92aaa..8edbb83 100644
--- a/src/main/java/dev/cosgy/textToSpeak/commands/general/AboutCommand.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/commands/general/AboutCommand.kt
@@ -114,7 +114,7 @@ ${jda.voiceChannels.size} ボイスチャンネル""", true)
         event.reply(builder.build())
     }
 
-    fun getOauthLink(jda: JDA){
+    private fun getOauthLink(jda: JDA){
         if (oauthLink == null) {
             oauthLink = try {
                 val info = jda.retrieveApplicationInfo().complete()

From d1dc852c083fb85d06f930b59c198f8427606d8f Mon Sep 17 00:00:00 2001
From: Sakuya Kosugi <kosugikun@icloud.com>
Date: Wed, 29 Mar 2023 12:47:22 +0900
Subject: [PATCH 07/39] =?UTF-8?q?=E8=AA=AD=E3=81=BF=E4=B8=8A=E3=81=92?=
 =?UTF-8?q?=E6=96=87=E5=AD=97=E6=95=B0=E3=81=AE=E5=88=B6=E9=99=90=E3=81=AB?=
 =?UTF-8?q?=E9=81=94=E3=81=97=E3=81=9F=E9=9A=9B=E3=81=AE=E5=87=A6=E7=90=86?=
 =?UTF-8?q?=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/sqldialects.xml                         |  4 ++--
 .../dev/cosgy/textToSpeak/audio/Dictionary.kt |  2 +-
 .../cosgy/textToSpeak/audio/VoiceCreation.kt  | 21 ++++++++++++++++++-
 3 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/.idea/sqldialects.xml b/.idea/sqldialects.xml
index 9a00d45..3dec230 100644
--- a/.idea/sqldialects.xml
+++ b/.idea/sqldialects.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="SqlDialectMappings">
-    <file url="file://$PROJECT_DIR$/src/main/java/dev/cosgy/TextToSpeak/audio/Dictionary.java" dialect="SQLite" />
-    <file url="file://$PROJECT_DIR$/src/main/java/dev/cosgy/TextToSpeak/settings/UserSettingsManager.java" dialect="SQLite" />
+    <file url="file://$PROJECT_DIR$/src/main/java/dev/cosgy/textToSpeak/audio/Dictionary.kt" dialect="SQLite" />
+    <file url="file://$PROJECT_DIR$/src/main/java/dev/cosgy/textToSpeak/settings/UserSettingsManager.kt" dialect="SQLite" />
     <file url="PROJECT" dialect="SQLite" />
   </component>
 </project>
\ No newline at end of file
diff --git a/src/main/java/dev/cosgy/textToSpeak/audio/Dictionary.kt b/src/main/java/dev/cosgy/textToSpeak/audio/Dictionary.kt
index 98d4558..fc7d934 100644
--- a/src/main/java/dev/cosgy/textToSpeak/audio/Dictionary.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/audio/Dictionary.kt
@@ -26,7 +26,7 @@ import java.util.*
 import java.util.concurrent.ConcurrentHashMap
 import java.util.function.BiFunction
 
-class Dictionary private constructor(private val bot: Bot) {
+class Dictionary private constructor(bot: Bot) {
     private val logger = LoggerFactory.getLogger(this.javaClass)
     private val path: Path?
     private val create: Boolean
diff --git a/src/main/java/dev/cosgy/textToSpeak/audio/VoiceCreation.kt b/src/main/java/dev/cosgy/textToSpeak/audio/VoiceCreation.kt
index f63aaa0..57a57cd 100644
--- a/src/main/java/dev/cosgy/textToSpeak/audio/VoiceCreation.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/audio/VoiceCreation.kt
@@ -23,6 +23,7 @@ import org.slf4j.LoggerFactory
 import java.io.*
 import java.nio.file.Files
 import java.nio.file.Paths
+import java.text.BreakIterator
 import java.util.*
 
 class VoiceCreation( // 各種設定の値を保持するためのフィールド
@@ -68,9 +69,27 @@ class VoiceCreation( // 各種設定の値を保持するためのフィール
     private fun sanitizeMessage(message: String): String {
         var sanitizedMsg = message.replace("[\\uD800-\\uDFFF]".toRegex(), " ")
         sanitizedMsg = sanitizedMsg.replace("Kosugi_kun".toRegex(), "コスギクン")
-        return sanitizedMsg
+        val sentences = BreakIterator.getSentenceInstance(Locale.JAPANESE)
+        sentences.setText(sanitizedMsg)
+        var messageCount = 0
+        var lastIndex = 0
+        val builder = StringBuilder()
+        while (sentences.next() != BreakIterator.DONE) {
+            val sentence = sanitizedMsg.substring(lastIndex, sentences.current())
+            if (sentence.length + builder.length > maxMessageCount) {
+                builder.append("以下略")
+                break
+            }
+            builder.append(sentence)
+            builder.append("\n")
+            messageCount++
+            lastIndex = sentences.current()
+        }
+        return builder.toString()
     }
 
+
+
     // テキストファイルを作成するメソッド
     @Throws(FileNotFoundException::class, UnsupportedEncodingException::class)
     private fun createTmpTextFile(guildId: String, fileId: String, message: String): String {

From cc2b1f0409649497098d6921fa658c318c77e3bb Mon Sep 17 00:00:00 2001
From: Sakuya Kosugi <kosugikun@icloud.com>
Date: Wed, 29 Mar 2023 13:16:39 +0900
Subject: [PATCH 08/39] =?UTF-8?q?=E4=B8=80=E6=99=82=E3=83=95=E3=82=A1?=
 =?UTF-8?q?=E3=82=A4=E3=83=AB=E3=81=AE=E6=93=8D=E4=BD=9C=E9=96=A2=E9=80=A3?=
 =?UTF-8?q?=E3=81=AE=E5=87=A6=E7=90=86=E3=82=92=E6=9C=80=E9=81=A9=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/kotlinc.xml                             |  6 +++
 .idea/resourceBundles.xml                     | 14 ++++++
 src/main/java/dev/cosgy/textToSpeak/Bot.kt    |  1 +
 .../java/dev/cosgy/textToSpeak/BotConfig.kt   |  2 +-
 .../cosgy/textToSpeak/audio/VoiceCreation.kt  | 43 +++++++------------
 5 files changed, 38 insertions(+), 28 deletions(-)
 create mode 100644 .idea/kotlinc.xml
 create mode 100644 .idea/resourceBundles.xml

diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
new file mode 100644
index 0000000..fc2d343
--- /dev/null
+++ b/.idea/kotlinc.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="KotlinJpsPluginSettings">
+    <option name="version" value="1.8.20-RC2" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/resourceBundles.xml b/.idea/resourceBundles.xml
new file mode 100644
index 0000000..5767f32
--- /dev/null
+++ b/.idea/resourceBundles.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ResourceBundleManager">
+    <file url="file://$PROJECT_DIR$/src/main/resources/lang/yomiage.properties" />
+    <file url="file://$PROJECT_DIR$/src/main/resources/lang/yomiage_en.properties" />
+    <file url="file://$PROJECT_DIR$/src/main/resources/lang/yomiage_ja.properties" />
+    <custom-resource-bundle>
+      <file value="file://$PROJECT_DIR$/src/main/resources/lang/yomiage.properties" />
+      <file value="file://$PROJECT_DIR$/src/main/resources/lang/yomiage_en.properties" />
+      <file value="file://$PROJECT_DIR$/src/main/resources/lang/yomiage_ja.properties" />
+      <base-name>yomiage</base-name>
+    </custom-resource-bundle>
+  </component>
+</project>
\ No newline at end of file
diff --git a/src/main/java/dev/cosgy/textToSpeak/Bot.kt b/src/main/java/dev/cosgy/textToSpeak/Bot.kt
index 78d4687..3b71538 100644
--- a/src/main/java/dev/cosgy/textToSpeak/Bot.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/Bot.kt
@@ -103,6 +103,7 @@ class Bot(val waiter: EventWaiter, val config: BotConfig, val settingsManager: S
                 log.warn("JDAのシャットダウンが中断されました。")
             }
 
+            dictionary?.close()
             // 一時ファイルを削除
             try {
                 FileUtils.cleanDirectory(File("tmp"))
diff --git a/src/main/java/dev/cosgy/textToSpeak/BotConfig.kt b/src/main/java/dev/cosgy/textToSpeak/BotConfig.kt
index d4a81c9..5bc22c6 100644
--- a/src/main/java/dev/cosgy/textToSpeak/BotConfig.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/BotConfig.kt
@@ -82,7 +82,7 @@ class BotConfig(private val prompt: Prompt) {
             maxMessageCount = config.getInt("maxmessagecount")
             winJTalkDir = config.getString("winjtalkdir")
             helpToDm = config.getBoolean("helptodm")
-            dBots = ownerId == 334091398263341056L
+            dBots = ownerId == 334091398263341056
             var write = false
 
             // validate bot token
diff --git a/src/main/java/dev/cosgy/textToSpeak/audio/VoiceCreation.kt b/src/main/java/dev/cosgy/textToSpeak/audio/VoiceCreation.kt
index 57a57cd..8daca58 100644
--- a/src/main/java/dev/cosgy/textToSpeak/audio/VoiceCreation.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/audio/VoiceCreation.kt
@@ -22,6 +22,7 @@ import org.apache.commons.io.FileUtils
 import org.slf4j.LoggerFactory
 import java.io.*
 import java.nio.file.Files
+import java.nio.file.Path
 import java.nio.file.Paths
 import java.text.BreakIterator
 import java.util.*
@@ -93,8 +94,8 @@ class VoiceCreation( // 各種設定の値を保持するためのフィール
     // テキストファイルを作成するメソッド
     @Throws(FileNotFoundException::class, UnsupportedEncodingException::class)
     private fun createTmpTextFile(guildId: String, fileId: String, message: String): String {
-        val filePath = "tmp" + File.separator + guildId + File.separator + fileId + ".txt"
-        PrintWriter(filePath, characterCode).use { writer -> writer.write(message) }
+        val filePath = Paths.get("tmp", guildId, "$fileId.txt").toString()
+        PrintWriter(filePath, characterCode).use { it.write(message) }
         return filePath
     }
 
@@ -136,22 +137,13 @@ class VoiceCreation( // 各種設定の値を保持するためのフィール
     }
 
     // 必要なディレクトリを作成するメソッド
-    @Throws(IOException::class)
-    private fun createDirectories(guildId: String) {
-        createDirectory("tmp")
-        createDirectory("tmp" + File.separator + guildId)
-        createDirectory("wav")
-        createDirectory("wav" + File.separator + guildId)
-    }
 
-    // ディレクトリを作成するメゾット
     @Throws(IOException::class)
-    private fun createDirectory(directory: String) {
-        val path = Paths.get(directory)
-        if (!Files.exists(path)) {
-            Files.createDirectory(path)
-            logger.info("Created directory: $directory")
-        }
+    private fun createDirectories(guildId: String) {
+        val tmpPath: Path = Paths.get("tmp", guildId)
+        val wavPath: Path = Paths.get("wav", guildId)
+        Files.createDirectories(tmpPath)
+        Files.createDirectories(wavPath)
     }
 
     // ギルドに関連する一時ファイルや音声ファイルを削除するメソッド
@@ -170,20 +162,17 @@ class VoiceCreation( // 各種設定の値を保持するためのフィール
         }
     }
 
-    val voices: ArrayList<String>
-        // 利用可能な音声名を取得するメソッド
+    val voices: List<String>
         get() {
-            val filter = FilenameFilter { _: File?, str: String -> str.endsWith("htsvoice") }
-            val dir = File(voiceDirectory!!)
-            val list = dir.listFiles(filter)
-            val voices = ArrayList<String>()
-            for (file in list!!) {
-                voices.add(file.name.replace(".htsvoice", ""))
-            }
-            logger.debug("Available voices: $voices")
-            return voices
+            val voiceDir = File(requireNotNull(voiceDirectory) { "voiceDirectory is null" })
+            return voiceDir.listFiles { _, name -> name.endsWith(".htsvoice") }
+                ?.map { file -> file.nameWithoutExtension }
+                ?.toList()
+                .orEmpty()
+                .also { logger.debug("Available voices: $it") }
         }
 
+
     companion object {
         private val logger = LoggerFactory.getLogger(VoiceCreation::class.java)
         private val IS_WINDOWS = System.getProperty("os.name").lowercase(Locale.getDefault()).startsWith("win")

From a691d0e80057a1befbef853fd3a58238e3513751 Mon Sep 17 00:00:00 2001
From: kosugikun <>
Date: Wed, 29 Mar 2023 14:32:10 +0900
Subject: [PATCH 09/39] =?UTF-8?q?=E4=B8=80=E9=83=A8=E3=81=AE=E8=8B=B1?=
 =?UTF-8?q?=E8=AA=9E=E3=82=92=E3=82=AB=E3=82=BF=E3=82=AB=E3=83=8A=E3=81=AB?=
 =?UTF-8?q?=E8=87=AA=E5=8B=95=E3=81=A7=E5=A4=89=E6=8F=9B=E3=81=97=E3=81=A6?=
 =?UTF-8?q?=E8=AA=AD=E3=81=BF=E4=B8=8A=E3=81=92=E3=82=8B=E6=A9=9F=E8=83=BD?=
 =?UTF-8?q?=E3=82=92=E5=AE=9F=E8=A3=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/codeStyles/Project.xml                  |  7 ------
 .idea/codeStyles/codeStyleConfig.xml          |  1 +
 .../bcae6d7f-dd17-487e-ab3f-743f9b393d89.xml  |  6 ++---
 pom.xml                                       |  7 +++++-
 src/main/java/dev/cosgy/textToSpeak/Bot.kt    | 11 ++++-----
 .../cosgy/textToSpeak/audio/AudioHandler.kt   |  6 +++++
 .../cosgy/textToSpeak/audio/VoiceCreation.kt  | 23 ++++++++++++++++++-
 7 files changed, 41 insertions(+), 20 deletions(-)

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index ccec7b6..1bec35e 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -3,13 +3,6 @@
     <JetCodeStyleSettings>
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
     </JetCodeStyleSettings>
-    <ScalaCodeStyleSettings>
-      <option name="MULTILINE_STRING_CLOSING_QUOTES_ON_NEW_LINE" value="true" />
-    </ScalaCodeStyleSettings>
-    <codeStyleSettings language="JSON">
-      <option name="SPACE_BEFORE_COMMA" value="true" />
-      <option name="SPACE_WITHIN_BRACKETS" value="true" />
-    </codeStyleSettings>
     <codeStyleSettings language="kotlin">
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
     </codeStyleSettings>
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
index a55e7a1..6e6eec1 100644
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ b/.idea/codeStyles/codeStyleConfig.xml
@@ -1,5 +1,6 @@
 <component name="ProjectCodeStyleConfiguration">
   <state>
+    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
     <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
   </state>
 </component>
\ No newline at end of file
diff --git a/.idea/dataSources/bcae6d7f-dd17-487e-ab3f-743f9b393d89.xml b/.idea/dataSources/bcae6d7f-dd17-487e-ab3f-743f9b393d89.xml
index dafa3ce..acb4919 100644
--- a/.idea/dataSources/bcae6d7f-dd17-487e-ab3f-743f9b393d89.xml
+++ b/.idea/dataSources/bcae6d7f-dd17-487e-ab3f-743f9b393d89.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <dataSource name="UserData">
-  <database-model serializer="dbm" dbms="SQLITE" family-id="SQLITE" format-version="4.45">
-    <root id="1">
-      <ServerVersion>3.40.1</ServerVersion>
-    </root>
+  <database-model serializer="dbm" dbms="SQLITE" family-id="SQLITE" format-version="4.48">
+    <root id="1"/>
     <collation id="2" parent="1" name="BINARY"/>
     <collation id="3" parent="1" name="NOCASE"/>
     <collation id="4" parent="1" name="RTRIM"/>
diff --git a/pom.xml b/pom.xml
index 97fb5cf..b446fd8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
 
     <groupId>dev.cosgy</groupId>
     <artifactId>TextToSpeak</artifactId>
-    <version>0.4.0</version>
+    <version>0.4.0-beta.1</version>
     <packaging>jar</packaging>
 
     <repositories>
@@ -143,6 +143,11 @@
             <version>1.8.20-RC2</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.ibm.icu</groupId>
+            <artifactId>icu4j</artifactId>
+            <version>69.1</version>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/src/main/java/dev/cosgy/textToSpeak/Bot.kt b/src/main/java/dev/cosgy/textToSpeak/Bot.kt
index 3b71538..6eb02f6 100644
--- a/src/main/java/dev/cosgy/textToSpeak/Bot.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/Bot.kt
@@ -36,12 +36,12 @@ import java.util.function.Consumer
 import kotlin.system.exitProcess
 
 class Bot(val waiter: EventWaiter, val config: BotConfig, val settingsManager: SettingsManager) {
-    val threadpool: ScheduledExecutorService
-    private val lang: ResourceBundle
-    val playerManager: PlayerManager
+    val threadpool: ScheduledExecutorService = Executors.newSingleThreadScheduledExecutor()
+    private val lang: ResourceBundle = ResourceBundle.getBundle("lang.yomiage", Locale.JAPAN)
+    val playerManager: PlayerManager = PlayerManager(this)
     val voiceCreation: VoiceCreation
     val userSettingsManager: UserSettingsManager
-    val aloneInVoiceHandler: AloneInVoiceHandler
+    private val aloneInVoiceHandler: AloneInVoiceHandler
     var log: Logger = LoggerFactory.getLogger(this.javaClass)
     var dictionary: Dictionary? = null
         private set
@@ -50,9 +50,6 @@ class Bot(val waiter: EventWaiter, val config: BotConfig, val settingsManager: S
     private var gui: GUI? = null
 
     init {
-        lang = ResourceBundle.getBundle("lang.yomiage", Locale.JAPAN)
-        threadpool = Executors.newSingleThreadScheduledExecutor()
-        playerManager = PlayerManager(this)
         playerManager.init()
         voiceCreation = VoiceCreation(this)
         userSettingsManager = UserSettingsManager()
diff --git a/src/main/java/dev/cosgy/textToSpeak/audio/AudioHandler.kt b/src/main/java/dev/cosgy/textToSpeak/audio/AudioHandler.kt
index 13dd1ca..1a77118 100644
--- a/src/main/java/dev/cosgy/textToSpeak/audio/AudioHandler.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/audio/AudioHandler.kt
@@ -38,6 +38,9 @@ class AudioHandler(private val manager: PlayerManager, guild: Guild, val player:
         stringGuildId = guild.id
     }
 
+    /**
+     * 再生キューのトップに追加
+     */
     fun addTrackToFront(qtrack: QueuedTrack): Int {
         return if (player.playingTrack == null) {
             player.playTrack(qtrack.track)
@@ -48,6 +51,9 @@ class AudioHandler(private val manager: PlayerManager, guild: Guild, val player:
         }
     }
 
+    /**
+     * 再生キューに追加
+     */
     fun addTrack(qtrack: QueuedTrack): Int {
         return if (player.playingTrack == null) {
             player.playTrack(qtrack.track)
diff --git a/src/main/java/dev/cosgy/textToSpeak/audio/VoiceCreation.kt b/src/main/java/dev/cosgy/textToSpeak/audio/VoiceCreation.kt
index 8daca58..e815b5b 100644
--- a/src/main/java/dev/cosgy/textToSpeak/audio/VoiceCreation.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/audio/VoiceCreation.kt
@@ -19,6 +19,7 @@ import dev.cosgy.textToSpeak.Bot
 import dev.cosgy.textToSpeak.settings.UserSettings
 import net.dv8tion.jda.api.entities.*
 import org.apache.commons.io.FileUtils
+import com.ibm.icu.text.Transliterator
 import org.slf4j.LoggerFactory
 import java.io.*
 import java.nio.file.Files
@@ -53,6 +54,9 @@ class VoiceCreation( // 各種設定の値を保持するためのフィール
         for ((key, value) in words!!) {
             dicMsg = dicMsg.replace(key!!.toRegex(), value!!)
         }
+
+        toKatakanaIfEnglishExists(dicMsg)
+
         val tmpFilePath = createTmpTextFile(guildId, fileId, dicMsg)
 
 
@@ -66,6 +70,23 @@ class VoiceCreation( // 各種設定の値を保持するためのフィール
         return fileName
     }
 
+    // 英単語をカタカナに変換するメソッド
+    private fun toKatakanaIfEnglishExists(message: String): String {
+        var englishExists = false
+        for (c in message) {
+            if (c in 'a'..'z' || c in 'A'..'Z') {
+                englishExists = true
+                break
+            }
+        }
+        return if (englishExists) {
+            val latinToKatakana = Transliterator.getInstance("Latin-Katakana")
+            latinToKatakana.transliterate(message)
+        } else {
+            message
+        }
+    }
+
     // メッセージをサニタイズするメソッド
     private fun sanitizeMessage(message: String): String {
         var sanitizedMsg = message.replace("[\\uD800-\\uDFFF]".toRegex(), " ")
@@ -77,7 +98,7 @@ class VoiceCreation( // 各種設定の値を保持するためのフィール
         val builder = StringBuilder()
         while (sentences.next() != BreakIterator.DONE) {
             val sentence = sanitizedMsg.substring(lastIndex, sentences.current())
-            if (sentence.length + builder.length > maxMessageCount) {
+            if (maxMessageCount > 0 && sentence.length + builder.length > maxMessageCount) {
                 builder.append("以下略")
                 break
             }

From 746c47c138e3aff059ab16760be7b1d514b3279d Mon Sep 17 00:00:00 2001
From: kosugikun <>
Date: Wed, 29 Mar 2023 20:32:43 +0900
Subject: [PATCH 10/39] =?UTF-8?q?=E3=82=B3=E3=83=B3=E3=82=BD=E3=83=BC?=
 =?UTF-8?q?=E3=83=AB=E4=B8=8A=E3=81=A7=E3=83=9C=E3=83=83=E3=83=88=E3=81=AE?=
 =?UTF-8?q?=E7=B5=82=E4=BA=86=E5=87=A6=E7=90=86=E3=82=92=E5=AE=9F=E8=A1=8C?=
 =?UTF-8?q?=E3=81=97=E3=81=9F=E9=9A=9B=E3=81=AB=E7=99=BA=E7=94=9F=E3=81=99?=
 =?UTF-8?q?=E3=82=8B=E4=B8=8D=E5=85=B7=E5=90=88=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/dev/cosgy/textToSpeak/Bot.kt    | 61 ++++++++++++-------
 .../java/dev/cosgy/textToSpeak/TextToSpeak.kt |  7 ++-
 .../cosgy/textToSpeak/audio/VoiceCreation.kt  |  2 -
 3 files changed, 45 insertions(+), 25 deletions(-)

diff --git a/src/main/java/dev/cosgy/textToSpeak/Bot.kt b/src/main/java/dev/cosgy/textToSpeak/Bot.kt
index 6eb02f6..0ebb274 100644
--- a/src/main/java/dev/cosgy/textToSpeak/Bot.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/Bot.kt
@@ -33,6 +33,7 @@ import java.util.concurrent.Executors
 import java.util.concurrent.ScheduledExecutorService
 import java.util.concurrent.TimeUnit
 import java.util.function.Consumer
+import javax.swing.JOptionPane
 import kotlin.system.exitProcess
 
 class Bot(val waiter: EventWaiter, val config: BotConfig, val settingsManager: SettingsManager) {
@@ -74,46 +75,62 @@ class Bot(val waiter: EventWaiter, val config: BotConfig, val settingsManager: S
     fun shutdown() {
         if (shuttingDown) return
         shuttingDown = true
-        threadpool.shutdownNow()
         if (jda!!.status != JDA.Status.SHUTTING_DOWN) {
             jda!!.guilds.forEach(Consumer { g: Guild ->
-                g.audioManager.closeAudioConnection()
-                val ah = g.audioManager.sendingHandler as AudioHandler?
-                if (ah != null) {
-                    ah.stopAndClear()
-                    ah.player.destroy()
+                val am = g.audioManager
+                if (am.isConnected) {
+                    am.closeAudioConnection()
+                    val ah = am.sendingHandler as AudioHandler?
+                    if (ah != null) {
+                        ah.stopAndClear()
+                        ah.player.destroy()
+                    }
                 }
             })
 
-            // ここからJDAの終了処理
-            jda!!.shutdown()
+            // Wait for any remaining tasks to complete before shutting down the thread pool
+            threadpool.shutdown()
             try {
-                if (!jda!!.awaitShutdown(10, TimeUnit.SECONDS)) {
-                    jda!!.shutdownNow()
-                    if (!jda!!.awaitShutdown(10, TimeUnit.SECONDS)) {
-                        log.warn("JDAのシャットダウンがタイムアウトしました。")
+                if (!threadpool.awaitTermination(10, TimeUnit.SECONDS)) {
+                    threadpool.shutdownNow()
+                    if (!threadpool.awaitTermination(10, TimeUnit.SECONDS)) {
+                        log.warn("Thread pool did not terminate")
                     }
                 }
             } catch (e: InterruptedException) {
-                jda!!.shutdownNow()
+                threadpool.shutdownNow()
                 Thread.currentThread().interrupt()
-                log.warn("JDAのシャットダウンが中断されました。")
+                log.warn("Thread pool shutdown was interrupted")
             }
+        }
 
-            dictionary?.close()
-            // 一時ファイルを削除
-            try {
-                FileUtils.cleanDirectory(File("tmp"))
-                FileUtils.cleanDirectory(File("wav"))
-                log.info("一時ファイルを削除しました。")
-            } catch (e: IOException) {
-                log.warn("一時ファイルの削除に失敗しました。")
+        // Shutdown JDA
+        jda?.shutdown()
+        try {
+            if (!jda!!.awaitShutdown(10, TimeUnit.SECONDS)) {
+                log.warn("JDA did not shutdown properly")
             }
+        } catch (e: InterruptedException) {
+            jda!!.shutdownNow()
+            Thread.currentThread().interrupt()
+            log.warn("JDA shutdown was interrupted")
         }
+
+        dictionary?.close()
+        // Delete temporary files
+        try {
+            FileUtils.cleanDirectory(File("tmp"))
+            FileUtils.cleanDirectory(File("wav"))
+            log.info("Deleted temporary files")
+        } catch (e: IOException) {
+            log.warn("Failed to delete temporary files")
+        }
+
         if (gui != null) gui!!.dispose()
         exitProcess(0)
     }
 
+
     fun setGUI(gui: GUI?) {
         this.gui = gui
     }
diff --git a/src/main/java/dev/cosgy/textToSpeak/TextToSpeak.kt b/src/main/java/dev/cosgy/textToSpeak/TextToSpeak.kt
index a62b899..0d63c8e 100644
--- a/src/main/java/dev/cosgy/textToSpeak/TextToSpeak.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/TextToSpeak.kt
@@ -39,6 +39,7 @@ import net.dv8tion.jda.api.entities.Activity
 import net.dv8tion.jda.api.requests.GatewayIntent
 import net.dv8tion.jda.api.utils.cache.CacheFlag
 import org.slf4j.LoggerFactory
+import sun.misc.Signal
 import java.awt.Color
 import java.io.IOException
 import java.util.*
@@ -169,6 +170,10 @@ System.exit(1);
      """.trimIndent())
             exitProcess(1)
         }
-        Runtime.getRuntime().addShutdownHook(Thread { bot.shutdown() })
+
+        Signal.handle(Signal("INT")) { _ ->
+            println("プログラムを終了しています...")
+            bot.shutdown()
+        }
     }
 }
\ No newline at end of file
diff --git a/src/main/java/dev/cosgy/textToSpeak/audio/VoiceCreation.kt b/src/main/java/dev/cosgy/textToSpeak/audio/VoiceCreation.kt
index e815b5b..fc0f017 100644
--- a/src/main/java/dev/cosgy/textToSpeak/audio/VoiceCreation.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/audio/VoiceCreation.kt
@@ -110,8 +110,6 @@ class VoiceCreation( // 各種設定の値を保持するためのフィール
         return builder.toString()
     }
 
-
-
     // テキストファイルを作成するメソッド
     @Throws(FileNotFoundException::class, UnsupportedEncodingException::class)
     private fun createTmpTextFile(guildId: String, fileId: String, message: String): String {

From fc3a57ff01c768016c0d211a43141e43ba2e122a Mon Sep 17 00:00:00 2001
From: kosugikun <>
Date: Fri, 31 Mar 2023 03:28:32 +0900
Subject: [PATCH 11/39] =?UTF-8?q?GUI=E3=81=AB=E3=82=B7=E3=82=B9=E3=83=86?=
 =?UTF-8?q?=E3=83=A0=E6=83=85=E5=A0=B1=E3=82=92=E8=A1=A8=E7=A4=BA=E3=81=99?=
 =?UTF-8?q?=E3=82=8B=E3=82=BF=E3=83=96=E3=82=92=E8=BF=BD=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       |  10 +
 src/main/java/dev/cosgy/textToSpeak/Bot.kt    |   2 +
 .../java/dev/cosgy/textToSpeak/TextToSpeak.kt |  42 +++--
 .../java/dev/cosgy/textToSpeak/gui/GUI.kt     | 172 +++++++++++++++++-
 4 files changed, 204 insertions(+), 22 deletions(-)

diff --git a/pom.xml b/pom.xml
index b446fd8..af37337 100644
--- a/pom.xml
+++ b/pom.xml
@@ -148,6 +148,16 @@
             <artifactId>icu4j</artifactId>
             <version>69.1</version>
         </dependency>
+        <dependency>
+            <groupId>org.openjfx</groupId>
+            <artifactId>javafx-controls</artifactId>
+            <version>17</version>
+        </dependency>
+        <dependency>
+            <groupId>org.openjfx</groupId>
+            <artifactId>javafx-fxml</artifactId>
+            <version>17</version>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/src/main/java/dev/cosgy/textToSpeak/Bot.kt b/src/main/java/dev/cosgy/textToSpeak/Bot.kt
index 0ebb274..eed3060 100644
--- a/src/main/java/dev/cosgy/textToSpeak/Bot.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/Bot.kt
@@ -124,6 +124,8 @@ class Bot(val waiter: EventWaiter, val config: BotConfig, val settingsManager: S
             log.info("Deleted temporary files")
         } catch (e: IOException) {
             log.warn("Failed to delete temporary files")
+        } catch (e: IllegalArgumentException){
+            log.warn("One or more directory paths were invalid.")
         }
 
         if (gui != null) gui!!.dispose()
diff --git a/src/main/java/dev/cosgy/textToSpeak/TextToSpeak.kt b/src/main/java/dev/cosgy/textToSpeak/TextToSpeak.kt
index 0d63c8e..d50adbc 100644
--- a/src/main/java/dev/cosgy/textToSpeak/TextToSpeak.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/TextToSpeak.kt
@@ -36,6 +36,7 @@ import dev.cosgy.textToSpeak.settings.SettingsManager
 import dev.cosgy.textToSpeak.utils.OtherUtil
 import net.dv8tion.jda.api.*
 import net.dv8tion.jda.api.entities.Activity
+import net.dv8tion.jda.api.exceptions.InvalidTokenException
 import net.dv8tion.jda.api.requests.GatewayIntent
 import net.dv8tion.jda.api.utils.cache.CacheFlag
 import org.slf4j.LoggerFactory
@@ -61,9 +62,9 @@ object TextToSpeak {
         val log = LoggerFactory.getLogger("Startup")
         try {
             println("""
-    ${FigletFont.convertOneLine("TextToSpeak Bot v" + OtherUtil.currentVersion)}
-    by Cosgy Dev
-    """.trimIndent())
+                    ${FigletFont.convertOneLine("TextToSpeak Bot v" + OtherUtil.currentVersion)}
+                    by Cosgy Dev
+                    """.trimIndent())
         } catch (ignored: IOException) {
         }
         val prompt = Prompt("TextToSpeak Bot", "noguiモードに切り替えます。  -Dnogui=trueフラグを含めると、手動でnoguiモードで起動できます。",
@@ -139,11 +140,11 @@ object TextToSpeak {
                 gui.init()
             } catch (e: Exception) {
                 log.error("""
-    GUIを開くことができませんでした。次の要因が考えられます:
-    サーバー上で実行している
-    画面がない環境下で実行している
-    このエラーを非表示にするには、 -Dnogui=true フラグを使用してGUIなしモードで実行してください。
-    """.trimIndent())
+                    GUIを開くことができませんでした。次の要因が考えられます:
+                    サーバー上で実行している
+                    画面がない環境下で実行している
+                    このエラーを非表示にするには、 -Dnogui=true フラグを使用してGUIなしモードで実行してください。
+                    """.trimIndent())
             }
         }
         log.info(config.configLocation + " から設定を読み込みました")
@@ -157,17 +158,20 @@ object TextToSpeak {
                     .setBulkDeleteSplittingEnabled(true)
                     .build()
             bot.jda = jda
-        } /*catch (LoginException ex) {
-prompt.alert(Prompt.Level.ERROR, bot.GetLang().getString("appName"), ex + "\n" +
-"正しい設定ファイルを編集していることを確認してください。Botトークンでのログインに失敗しました。" +
-"正しいBotトークンを入力してください。(CLIENT SECRET ではありません!)\n" +
-"設定ファイルの場所: " + config.getConfigLocation());
-System.exit(1);
-}*/ catch (ex: IllegalArgumentException) {
-            prompt.alert(Prompt.Level.ERROR, bot.GetLang().getString("appName"), """
-     設定の一部が無効です:$ex
-     設定ファイルの場所: ${config.configLocation}
-     """.trimIndent())
+        } catch (ex: InvalidTokenException) {
+            prompt.alert(Prompt.Level.ERROR, "TextToSpeak Bot",
+                    """
+                        Botトークンでのログインに失敗しました。
+                        正しいBotトークンが設定されていることを確認してください。(CLIENT SECRET ではありません!)
+                        設定ファイルの場所；${config.configLocation}
+                    """.trimIndent())
+            exitProcess(1);
+        } catch (ex: IllegalArgumentException) {
+            prompt.alert(Prompt.Level.ERROR, "TextToSpeak Bot",
+                """
+                    設定の一部が無効です:$ex
+                    設定ファイルの場所: ${config.configLocation}
+                """.trimIndent())
             exitProcess(1)
         }
 
diff --git a/src/main/java/dev/cosgy/textToSpeak/gui/GUI.kt b/src/main/java/dev/cosgy/textToSpeak/gui/GUI.kt
index 11dfca8..3436a25 100644
--- a/src/main/java/dev/cosgy/textToSpeak/gui/GUI.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/gui/GUI.kt
@@ -15,30 +15,83 @@
 //////////////////////////////////////////////////////////////////////////////////////////
 package dev.cosgy.textToSpeak.gui
 
+import com.sun.management.OperatingSystemMXBean
 import dev.cosgy.textToSpeak.Bot
+import java.awt.Font
 import java.awt.event.WindowEvent
 import java.awt.event.WindowListener
-import javax.swing.JFrame
-import javax.swing.JTabbedPane
+import java.lang.management.*
+import java.time.Duration
+import java.time.Instant
+import java.time.LocalDateTime
+import java.time.ZoneId
+import java.time.format.DateTimeFormatter
+import javax.swing.*
 import kotlin.system.exitProcess
 
+
 /**
  * @author Kosugi_kun
  */
 class GUI(private val bot: Bot) : JFrame() {
     private val console: ConsolePanel = ConsolePanel()
 
+    private var runtimeMx: RuntimeMXBean? = null
+    private var compilationMx: CompilationMXBean? = null
+    private var sunThreadMx: ThreadMXBean? = null
+    private var memoryMx: MemoryMXBean? = null
+    private var classLoadingMx: ClassLoadingMXBean? = null
+    private var sunOsMx: OperatingSystemMXBean? = null
+    private var garbageCollectors: Collection<GarbageCollectorMXBean>? = null
+
     fun init() {
+
+        runtimeMx = ManagementFactory.getRuntimeMXBean()
+        compilationMx = ManagementFactory.getCompilationMXBean()
+        sunThreadMx = ManagementFactory.getThreadMXBean() as com.sun.management.ThreadMXBean
+        memoryMx = ManagementFactory.getMemoryMXBean()
+        classLoadingMx = ManagementFactory.getClassLoadingMXBean()
+        sunOsMx = ManagementFactory.getOperatingSystemMXBean() as OperatingSystemMXBean
+        garbageCollectors = ManagementFactory.getGarbageCollectorMXBeans() as List<*> as List<GarbageCollectorMXBean>?
+
+
         defaultCloseOperation = EXIT_ON_CLOSE
         title = bot.GetLang().getString("appName")
         val tabs = JTabbedPane()
         tabs.add("コンソール", console)
+
+        val botInfoPanel = JPanel()
+
+        botInfoPanel.layout = BoxLayout(botInfoPanel, BoxLayout.Y_AXIS)
+        val scrollPane = JScrollPane(botInfoPanel, JScrollPane.VERTICAL_SCROLLBAR_ALWAYS, JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED)
+
+// Add bot info label to bot info panel
+        val botInfoLabel = JLabel()
+        val systemInfoLabel = JLabel()
+
+        val osName = sunOsMx?.name
+        val osVersion = sunOsMx?.version
+        val osArch = sunOsMx?.arch
+        val processors = sunOsMx?.availableProcessors
+
+        val vmName = runtimeMx?.name
+        val vmVersion = runtimeMx?.vmVersion
+        val vmVendor = runtimeMx?.vmVendor
+        val vmArguments = runtimeMx?.inputArguments?.joinToString(" ")
+
+        //botInfoPanel.add(systemInfoLabel)
+        botInfoLabel.font = Font("monospaced", Font.PLAIN, 12)
+        botInfoPanel.add(botInfoLabel)
+
+        tabs.add("システム情報", scrollPane)
+
         contentPane.add(tabs)
         pack()
         setLocationRelativeTo(null)
         isVisible = true
         addWindowListener(object : WindowListener {
-            override fun windowOpened(e: WindowEvent) { /* unused */
+            override fun windowOpened(e: WindowEvent) {
+            /* unused */
             }
 
             override fun windowClosing(e: WindowEvent) {
@@ -64,5 +117,118 @@ class GUI(private val bot: Bot) : JFrame() {
             override fun windowDeactivated(e: WindowEvent) { /* unused */
             }
         })
+
+        // ボット情報を定期的に更新する
+        Timer(1000) {
+            val uptime = Duration.ofMillis(runtimeMx!!.uptime).toMinutes()
+
+// Convert start time to LocalDateTime
+            val start = LocalDateTime.ofInstant(Instant.ofEpochMilli(runtimeMx!!.startTime), ZoneId.systemDefault())
+            val vmName = runtimeMx!!.name
+            val vmVendor = runtimeMx!!.vmVendor
+            val vmVersion = runtimeMx!!.vmVersion
+            val gcCount = garbageCollectors!!.sumOf { it.collectionCount }
+
+            val cpuUsage = sunOsMx!!.processCpuLoad * 100
+            val systemCpuUsage = sunOsMx!!.systemCpuLoad * 100
+            val loadAverage = sunOsMx!!.systemLoadAverage
+
+            val physicalMemory = sunOsMx!!.totalPhysicalMemorySize / 1024 / 1024
+            val freePhysicalMemory = sunOsMx!!.freePhysicalMemorySize / 1024 / 1024
+            val usedPhysicalMemory = physicalMemory - freePhysicalMemory
+
+            val swapSpace = sunOsMx!!.totalSwapSpaceSize / 1024 / 1024
+            val freeSwapSpace = sunOsMx!!.freeSwapSpaceSize / 1024 / 1024
+
+            val heapMemory = memoryMx!!.heapMemoryUsage
+            val heapInit = heapMemory.init / 1024 / 1024
+            val heapMax = heapMemory.max / 1024 / 1024
+            val heapCommitted = heapMemory.committed / 1024 / 1024
+            val heapUsed = heapMemory.used / 1024 / 1024
+
+            val nonHeapMemory = memoryMx!!.nonHeapMemoryUsage
+            val nonHeapInit = nonHeapMemory.init / 1024 / 1024
+            val nonHeapMax = nonHeapMemory.max / 1024 / 1024
+            val nonHeapCommitted = nonHeapMemory.committed / 1024 / 1024
+            val nonHeapUsed = nonHeapMemory.used / 1024 / 1024
+
+            val threadCount = sunThreadMx!!.threadCount
+            val daemonThreadCount = sunThreadMx!!.daemonThreadCount
+            val peakThreadCount = sunThreadMx!!.peakThreadCount
+            val totalStartedThreadCount = sunThreadMx!!.totalStartedThreadCount
+
+            val loadedClassCount = classLoadingMx!!.loadedClassCount
+            val totalLoadedClassCount = classLoadingMx!!.totalLoadedClassCount
+            val unloadedClassCount = classLoadingMx!!.unloadedClassCount
+
+            val gcStats = garbageCollectors!!.map { gc ->
+                val name = gc.name
+                val count = gc.collectionCount
+                val time = gc.collectionTime / 1000
+                "$name: Count=$count, Time=$time sec"
+            }.joinToString("\n")
+
+            val botInfoText = """
+                :: System<br>
+                    CPU usage: %.2f, Load average (last minute): %.5f<br>
+                    Physical memory: %s, Free: %s, Used: %s<br>
+                    Swap space: %s, Free: %s<br><br>
+                :: VM Process<br>
+                    Uptime: %s minutes, Started: %s<br>
+                    CPU usage: %.2f, CPU time: %s ms, JIT compile time: %s ms<br><br>
+                :: Heap<br>
+                    Current: %s, Committed: %s, Init: %s, Max: %s<br><br>
+                :: Non-Heap Memory<br>
+                    Current: %d MB, Committed: %d MB, Init: %d MB, Max: %d MB<br><br>
+                :: Thread Usage<br>
+                    Live: %d, Peak: %d, Daemon: %d, Total Started: %d<br><br>
+                :: Class Loading<br>
+                    Current loaded: %d, Loaded (total): %d, Unloaded (total): %d<br><br>
+                :: Garbage Collector<br>
+                    $gcStats
+            """.trimIndent()
+
+            val sysInfoText = """
+    :: System Information<br>
+        Operating system: %s, Version: %s, Arch: %s<br>
+        Number of processors: %d, Physical memory: %s, Virtual memory: %s<br><br>
+    :: VM Information<br>
+        VM: %s, Version: %s, Vendor: %s, JIT compiler: %s<br>
+        Arguments: %s<br><br><br>
+    """.trimIndent()
+
+            val systemInfo = sysInfoText.format(
+                osName, osVersion, osArch, processors,
+                prettyBytes(sunOsMx!!.totalPhysicalMemorySize), prettyBytes(sunOsMx!!.committedVirtualMemorySize),
+                vmName, vmVersion, vmVendor, compilationMx?.name,
+                vmArguments
+            )
+
+            botInfoLabel.text = "<html>$systemInfo" + botInfoText.format(
+                cpuUsage, loadAverage,
+                physicalMemory, freePhysicalMemory, usedPhysicalMemory,
+                swapSpace, freeSwapSpace,
+                uptime, start.format(DateTimeFormatter.ISO_LOCAL_DATE_TIME), systemCpuUsage, sunOsMx!!.processCpuTime / 1000000, compilationMx!!.totalCompilationTime,
+                heapUsed, heapCommitted, heapInit, heapMax,
+                nonHeapUsed, nonHeapCommitted, nonHeapInit, nonHeapMax,
+                threadCount, peakThreadCount, daemonThreadCount, totalStartedThreadCount,
+                loadedClassCount, totalLoadedClassCount, unloadedClassCount
+            ) + "</html>"
+
+        }.start()
+
+    }
+
+    fun prettyBytes(bytes: Long): String {
+        return prettyBytes(bytes, true)
+    }
+
+    private fun prettyBytes(bytes: Long, si: Boolean): String {
+        val unit = if (si) 1000 else 1024
+        if (bytes < unit) return "$bytes B"
+        val exp = (Math.log(bytes.toDouble()) / Math.log(unit.toDouble())).toInt()
+        val pre = (if (si) "kMGTPE" else "KMGTPE")[exp - 1].toString() + if (si) "" else "i"
+        return String.format("%.1f %sB", bytes / Math.pow(unit.toDouble(), exp.toDouble()), pre)
     }
+
 }
\ No newline at end of file

From 40a8606223b43bff8fc12c237b76e6c080d4e5eb Mon Sep 17 00:00:00 2001
From: kosugikun <>
Date: Sat, 1 Apr 2023 16:36:58 +0900
Subject: [PATCH 12/39] =?UTF-8?q?=E5=A3=B0=E3=81=AE=E8=A8=AD=E5=AE=9A?=
 =?UTF-8?q?=E3=81=8C=E4=BF=9D=E5=AD=98=E3=81=95=E3=82=8C=E3=81=AA=E3=81=84?=
 =?UTF-8?q?=E4=B8=8D=E5=85=B7=E5=90=88=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/compiler.xml                            |  1 -
 src/main/java/dev/cosgy/textToSpeak/Bot.kt    |  3 +--
 .../cosgy/textToSpeak/audio/AudioHandler.kt   | 15 +----------
 .../cosgy/textToSpeak/audio/PlayerManager.kt  |  2 +-
 .../cosgy/textToSpeak/audio/VoiceCreation.kt  |  2 +-
 .../commands/admin/GuildSettings.kt           |  8 +++---
 .../commands/dictionary/DlWordCmd.kt          |  4 +--
 .../commands/general/AboutCommand.kt          | 12 ++++-----
 .../textToSpeak/commands/general/HelpCmd.kt   |  4 +--
 .../commands/general/SetIntonationCmd.kt      |  8 +++---
 .../commands/general/SetSpeedCmd.kt           |  8 +++---
 .../commands/general/SetVoiceCmd.kt           | 12 ++++-----
 .../commands/general/SetVoiceQualityA.kt      |  4 +--
 .../commands/general/SetVoiceQualityFm.kt     |  8 +++---
 .../commands/general/SettingsCmd.kt           |  8 +++---
 .../java/dev/cosgy/textToSpeak/gui/GUI.kt     | 27 ++++++++++---------
 .../textToSpeak/settings/SettingsManager.kt   |  2 +-
 .../textToSpeak/settings/UserSettings.kt      | 25 +++++++++++++++++
 18 files changed, 82 insertions(+), 71 deletions(-)

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 0f63fb0..d0b40cc 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -6,7 +6,6 @@
         <sourceOutputDir name="target/generated-sources/annotations" />
         <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
         <outputRelativeToContentRoot value="true" />
-        <module name="TextToSpeakBot" />
         <module name="TextToSpeak" />
       </profile>
     </annotationProcessing>
diff --git a/src/main/java/dev/cosgy/textToSpeak/Bot.kt b/src/main/java/dev/cosgy/textToSpeak/Bot.kt
index eed3060..7cfac6c 100644
--- a/src/main/java/dev/cosgy/textToSpeak/Bot.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/Bot.kt
@@ -33,7 +33,6 @@ import java.util.concurrent.Executors
 import java.util.concurrent.ScheduledExecutorService
 import java.util.concurrent.TimeUnit
 import java.util.function.Consumer
-import javax.swing.JOptionPane
 import kotlin.system.exitProcess
 
 class Bot(val waiter: EventWaiter, val config: BotConfig, val settingsManager: SettingsManager) {
@@ -59,7 +58,7 @@ class Bot(val waiter: EventWaiter, val config: BotConfig, val settingsManager: S
     }
 
     fun readyJDA() {
-        dictionary = Dictionary.Companion.getInstance(this)
+        dictionary = Dictionary.getInstance(this)
     }
 
     fun closeAudioConnection(guildId: Long) {
diff --git a/src/main/java/dev/cosgy/textToSpeak/audio/AudioHandler.kt b/src/main/java/dev/cosgy/textToSpeak/audio/AudioHandler.kt
index 1a77118..54bb94d 100644
--- a/src/main/java/dev/cosgy/textToSpeak/audio/AudioHandler.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/audio/AudioHandler.kt
@@ -26,7 +26,7 @@ import net.dv8tion.jda.api.audio.AudioSendHandler
 import net.dv8tion.jda.api.entities.Guild
 import java.nio.ByteBuffer
 
-class AudioHandler(private val manager: PlayerManager, guild: Guild, val player: AudioPlayer) : AudioEventAdapter(), AudioSendHandler {
+class AudioHandler(guild: Guild, val player: AudioPlayer) : AudioEventAdapter(), AudioSendHandler {
     val queue = FairQueue<QueuedTrack?>()
     val votes: Set<String> = HashSet()
     private val guildId: Long
@@ -38,19 +38,6 @@ class AudioHandler(private val manager: PlayerManager, guild: Guild, val player:
         stringGuildId = guild.id
     }
 
-    /**
-     * 再生キューのトップに追加
-     */
-    fun addTrackToFront(qtrack: QueuedTrack): Int {
-        return if (player.playingTrack == null) {
-            player.playTrack(qtrack.track)
-            -1
-        } else {
-            queue.addAt(0, qtrack)
-            0
-        }
-    }
-
     /**
      * 再生キューに追加
      */
diff --git a/src/main/java/dev/cosgy/textToSpeak/audio/PlayerManager.kt b/src/main/java/dev/cosgy/textToSpeak/audio/PlayerManager.kt
index a8e9d6d..e802f2b 100644
--- a/src/main/java/dev/cosgy/textToSpeak/audio/PlayerManager.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/audio/PlayerManager.kt
@@ -45,7 +45,7 @@ class PlayerManager(val bot: Bot) : DefaultAudioPlayerManager() {
         if (guild.audioManager.sendingHandler == null) {
             val player = createPlayer()
             player.volume = bot.settingsManager.getSettings(guild)!!.volume
-            handler = AudioHandler(this, guild, player)
+            handler = AudioHandler(guild, player)
             player.addListener(handler)
             guild.audioManager.sendingHandler = handler
         } else handler = guild.audioManager.sendingHandler as AudioHandler?
diff --git a/src/main/java/dev/cosgy/textToSpeak/audio/VoiceCreation.kt b/src/main/java/dev/cosgy/textToSpeak/audio/VoiceCreation.kt
index fc0f017..7dc4f93 100644
--- a/src/main/java/dev/cosgy/textToSpeak/audio/VoiceCreation.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/audio/VoiceCreation.kt
@@ -188,7 +188,7 @@ class VoiceCreation( // 各種設定の値を保持するためのフィール
                 ?.map { file -> file.nameWithoutExtension }
                 ?.toList()
                 .orEmpty()
-                .also { logger.debug("Available voices: $it") }
+                .also { logger.debug("Available voices: {}", it) }
         }
 
 
diff --git a/src/main/java/dev/cosgy/textToSpeak/commands/admin/GuildSettings.kt b/src/main/java/dev/cosgy/textToSpeak/commands/admin/GuildSettings.kt
index 9a76517..122119e 100644
--- a/src/main/java/dev/cosgy/textToSpeak/commands/admin/GuildSettings.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/commands/admin/GuildSettings.kt
@@ -42,14 +42,14 @@ class GuildSettings(private val bot: Bot) : AdminCommand() {
         if (settings!!.getTextChannel(event.guild) != null) {
             text = settings.getTextChannel(event.guild)!!.name
         }
-        val ebuilder = EmbedBuilder()
+        val builder = EmbedBuilder()
                 .setColor(Color.orange)
                 .setTitle(event.guild!!.name + "の設定")
                 .addField("ユーザー名読み上げ：", settings.isReadName().toString(), false)
                 .addField("参加、退出時の読み上げ：", settings.isJoinAndLeaveRead().toString(), false) //.addField("接頭語：", settings.getPrefix(), false)
                 .addField("読み上げるチャンネル：", text, false)
                 .addField("読み上げの主音量：", settings.volume.toString(), false)
-        event.replyEmbeds(ebuilder.build()).queue()
+        event.replyEmbeds(builder.build()).queue()
     }
 
     override fun execute(event: CommandEvent) {
@@ -58,13 +58,13 @@ class GuildSettings(private val bot: Bot) : AdminCommand() {
         if (settings!!.getTextChannel(event.guild) != null) {
             text = settings.getTextChannel(event.guild)!!.name
         }
-        val ebuilder = EmbedBuilder()
+        val builder = EmbedBuilder()
                 .setColor(Color.orange)
                 .setTitle(event.guild.name + "の設定")
                 .addField("ユーザー名読み上げ：", settings.isReadName().toString(), false)
                 .addField("参加、退出時の読み上げ：", settings.isJoinAndLeaveRead().toString(), false) //.addField("接頭語：", settings.getPrefix(), false)
                 .addField("読み上げるチャンネル：", text, false)
                 .addField("読み上げの主音量：", settings.volume.toString(), false)
-        event.reply(ebuilder.build())
+        event.reply(builder.build())
     }
 }
\ No newline at end of file
diff --git a/src/main/java/dev/cosgy/textToSpeak/commands/dictionary/DlWordCmd.kt b/src/main/java/dev/cosgy/textToSpeak/commands/dictionary/DlWordCmd.kt
index 6d84c69..8c21ce6 100644
--- a/src/main/java/dev/cosgy/textToSpeak/commands/dictionary/DlWordCmd.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/commands/dictionary/DlWordCmd.kt
@@ -51,11 +51,11 @@ class DlWordCmd(private val bot: Bot) : SlashCommand() {
 
     override fun execute(event: CommandEvent) {
         if (event.args.isEmpty() && event.message.attachments.isEmpty()) {
-            val ebuilder = EmbedBuilder()
+            val builder = EmbedBuilder()
                     .setTitle("dlwordコマンド")
                     .addField("使用方法:", "$name <単語>", false)
                     .addField("説明:", help, false)
-            event.reply(ebuilder.build())
+            event.reply(builder.build())
             return
         }
         val words = bot.dictionary?.getWords(event.guild.idLong)
diff --git a/src/main/java/dev/cosgy/textToSpeak/commands/general/AboutCommand.kt b/src/main/java/dev/cosgy/textToSpeak/commands/general/AboutCommand.kt
index 8edbb83..be3c60a 100644
--- a/src/main/java/dev/cosgy/textToSpeak/commands/general/AboutCommand.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/commands/general/AboutCommand.kt
@@ -79,18 +79,18 @@ class AboutCommand(private val color: Color, private val description: String, va
         builder.setDescription(descr)
         if (jda.shardInfo.shardTotal == 1) {
             builder.addField("ステータス", """${jda.guilds.size} サーバー
-1 シャード""", true)
+                1 シャード""", true)
             builder.addField("ユーザー", """${jda.users.size} ユニーク
-${jda.guilds.stream().mapToInt { g: Guild -> g.members.size }.sum()} 合計""", true)
+                ${jda.guilds.stream().mapToInt { g: Guild -> g.members.size }.sum()} 合計""", true)
             builder.addField("チャンネル", """${jda.textChannels.size} テキスト
-${jda.voiceChannels.size} ボイス""", true)
+                ${jda.voiceChannels.size} ボイス""", true)
         } else {
             builder.addField("ステータス", """${client.totalGuilds} サーバー
-シャード ${jda.shardInfo.shardId + 1}/${jda.shardInfo.shardTotal}""", true)
+                シャード ${jda.shardInfo.shardId + 1}/${jda.shardInfo.shardTotal}""", true)
             builder.addField("", """${jda.users.size} ユーザーのシャード
-${jda.guilds.size} サーバー""", true)
+                ${jda.guilds.size} サーバー""", true)
             builder.addField("", """${jda.textChannels.size} テキストチャンネル
-${jda.voiceChannels.size} ボイスチャンネル""", true)
+                ${jda.voiceChannels.size} ボイスチャンネル""", true)
         }
         builder.setFooter("再起動が行われた時間", "https://www.cosgy.dev/wp-content/uploads/2020/03/restart.jpg")
         builder.setTimestamp(client.startTime)
diff --git a/src/main/java/dev/cosgy/textToSpeak/commands/general/HelpCmd.kt b/src/main/java/dev/cosgy/textToSpeak/commands/general/HelpCmd.kt
index 3c4fe5c..0ab041d 100644
--- a/src/main/java/dev/cosgy/textToSpeak/commands/general/HelpCmd.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/commands/general/HelpCmd.kt
@@ -60,9 +60,9 @@ class HelpCmd(var bot: Bot) : SlashCommand() {
 
     public override fun execute(event: CommandEvent) {
         val builder = StringBuilder("""
-    **${event.jda.selfUser.name}** コマンド一覧:
+            **${event.jda.selfUser.name}** コマンド一覧:
     
-    """.trimIndent())
+            """.trimIndent())
         var category: Category? = null
         val commands = event.client.commands
         for (command in commands) {
diff --git a/src/main/java/dev/cosgy/textToSpeak/commands/general/SetIntonationCmd.kt b/src/main/java/dev/cosgy/textToSpeak/commands/general/SetIntonationCmd.kt
index 3c6ff42..2fe5e04 100644
--- a/src/main/java/dev/cosgy/textToSpeak/commands/general/SetIntonationCmd.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/commands/general/SetIntonationCmd.kt
@@ -42,17 +42,17 @@ class SetIntonationCmd(private val bot: Bot) : SlashCommand() {
         }
 
         val settings = bot.userSettingsManager.getSettings(event.user.idLong)
-        settings.intonation = bd.toFloat()
+        settings.setIntonation(bd.toFloat())
         event.reply("F0系列内変動の重みを$bd に設定しました。").queue()
     }
 
     override fun execute(event: CommandEvent) {
         if (event.args.isEmpty()) {
-            val ebuilder = EmbedBuilder()
+            val builder = EmbedBuilder()
                     .setTitle("setintoコマンド")
                     .addField("使用方法:", "$name <数値(0.0~)>", false)
                     .addField("説明:", "F0系列内変動の重みを変更します。F0系列内変動の重みは、0.0以上の数値で設定して下さい。", false)
-            event.reply(ebuilder.build())
+            event.reply(builder.build())
             return
         }
 
@@ -64,7 +64,7 @@ class SetIntonationCmd(private val bot: Bot) : SlashCommand() {
         }
 
         val settings = bot.userSettingsManager.getSettings(event.author.idLong)
-        settings.intonation = bd.toFloat()
+        settings.setIntonation(bd.toFloat())
         event.reply("F0系列内変動の重みを$bd に設定しました。")
     }
 }
diff --git a/src/main/java/dev/cosgy/textToSpeak/commands/general/SetSpeedCmd.kt b/src/main/java/dev/cosgy/textToSpeak/commands/general/SetSpeedCmd.kt
index fc17aa7..b98b70d 100644
--- a/src/main/java/dev/cosgy/textToSpeak/commands/general/SetSpeedCmd.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/commands/general/SetSpeedCmd.kt
@@ -48,7 +48,7 @@ class SetSpeedCmd(private val bot: Bot) : SlashCommand() {
             return
         }
         val settings = bot.userSettingsManager.getSettings(event.user.idLong)
-        settings.speed = bd.toFloat()
+        settings.setSpeed(bd.toFloat())
         event.reply("速度を $bd に設定しました。").queue()
     }
 
@@ -73,15 +73,15 @@ class SetSpeedCmd(private val bot: Bot) : SlashCommand() {
             return
         }
         val settings = bot.userSettingsManager.getSettings(event.author.idLong)
-        settings.speed = bd.toFloat()
+        settings.setSpeed(bd.toFloat())
         event.reply("速度を $bd に設定しました。")
     }
 
     fun help(event: CommandEvent?) {
-        val ebuilder = EmbedBuilder()
+        val builder = EmbedBuilder()
                 .setTitle("setspeedコマンド")
                 .addField("使用方法:", "$name <数値(0.0~)>", false)
                 .addField("説明:", "読み上げの速度を設定します。読み上げ速度は、0.0以上の数値で設定して下さい。", false)
-        event?.reply(ebuilder.build())
+        event?.reply(builder.build())
     }
 }
diff --git a/src/main/java/dev/cosgy/textToSpeak/commands/general/SetVoiceCmd.kt b/src/main/java/dev/cosgy/textToSpeak/commands/general/SetVoiceCmd.kt
index 18973cc..e17b8bb 100644
--- a/src/main/java/dev/cosgy/textToSpeak/commands/general/SetVoiceCmd.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/commands/general/SetVoiceCmd.kt
@@ -44,17 +44,17 @@ class SetVoiceCmd(private var bot: Bot) : SlashCommand() {
 
     override fun execute(event: SlashCommandEvent) {
         if (event.getOption("name") == null) {
-            val ebuilder = EmbedBuilder()
+            val builder = EmbedBuilder()
                     .setTitle("setvoiceコマンド")
                     .addField("声データ一覧：", voices.contentToString(), false)
                     .addField("使用方法：", "$name <声データの名前>", false)
-            event.replyEmbeds(ebuilder.build()).queue()
+            event.replyEmbeds(builder.build()).queue()
             return
         }
         val viceName = event.getOption("name")!!.asString
         if (isValidVoice(viceName)) {
             val settings = bot.userSettingsManager.getSettings(event.user.idLong)
-            settings.voice = viceName
+            settings.setVoice(viceName)
             event.reply("声データを`$viceName`に設定しました。").queue()
         } else {
             event.reply("有効な声データを選択して下さい。").queue()
@@ -64,17 +64,17 @@ class SetVoiceCmd(private var bot: Bot) : SlashCommand() {
     override fun execute(event: CommandEvent) {
         val voices = bot.voiceCreation.voices
         if (event.args.isEmpty() && event.message.attachments.isEmpty()) {
-            val ebuilder = EmbedBuilder()
+            val builder = EmbedBuilder()
                     .setTitle("setvoiceコマンド")
                     .addField("声データ一覧：", voices.toString(), false)
                     .addField("使用方法：", "$name <声データの名前>", false)
-            event.reply(ebuilder.build())
+            event.reply(builder.build())
             return
         }
         val args = event.args
         if (voices.contains(args)) {
             val settings = bot.userSettingsManager.getSettings(event.author.idLong)
-            settings.voice = args
+            settings.setVoice(args)
             event.reply("声データを`$args`に設定しました。")
         } else {
             event.reply("有効な声データを選択して下さい。")
diff --git a/src/main/java/dev/cosgy/textToSpeak/commands/general/SetVoiceQualityA.kt b/src/main/java/dev/cosgy/textToSpeak/commands/general/SetVoiceQualityA.kt
index 3384b96..fc1e128 100644
--- a/src/main/java/dev/cosgy/textToSpeak/commands/general/SetVoiceQualityA.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/commands/general/SetVoiceQualityA.kt
@@ -58,7 +58,7 @@ class SetVoiceQualityA(private var bot: Bot) : SlashCommand() {
             return
         }
         val settings = bot.userSettingsManager.getSettings(event.user.idLong)
-        settings.voiceQualityA = bd!!.toFloat()
+        settings.setVoiceQualityA(bd!!.toFloat())
         event.reply("オールパス値を" + bd + "に設定しました。").queue()
     }
 
@@ -86,7 +86,7 @@ class SetVoiceQualityA(private var bot: Bot) : SlashCommand() {
             return
         }
         val settings = bot.userSettingsManager.getSettings(event.author.idLong)
-        settings.voiceQualityA = bd!!.toFloat()
+        settings.setVoiceQualityA(bd!!.toFloat())
         event.reply("オールパス値を" + bd + "に設定しました。")
     }
 }
\ No newline at end of file
diff --git a/src/main/java/dev/cosgy/textToSpeak/commands/general/SetVoiceQualityFm.kt b/src/main/java/dev/cosgy/textToSpeak/commands/general/SetVoiceQualityFm.kt
index 0224e05..becd218 100644
--- a/src/main/java/dev/cosgy/textToSpeak/commands/general/SetVoiceQualityFm.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/commands/general/SetVoiceQualityFm.kt
@@ -59,17 +59,17 @@ class SetVoiceQualityFm(private var bot: Bot) : SlashCommand() {
             return
         }
         val settings = bot.userSettingsManager.getSettings(event.user.idLong)
-        settings.voiceQualityFm = bd!!.toFloat()
+        bd?.let { settings.setVoiceQualityFm(it.toFloat()) }
         event.reply("追加ハーフトーンを" + bd + "に設定しました。").queue()
     }
 
     override fun execute(event: CommandEvent) {
         if (event.args.isEmpty() && event.message.attachments.isEmpty()) {
-            val ebuilder = EmbedBuilder()
+            val builder = EmbedBuilder()
                     .setTitle("setqfmコマンド")
                     .addField("使用方法:", "$name <数値(0.0~)>", false)
                     .addField("説明:", "追加ハーフトーンの設定を変更します。", false)
-            event.reply(ebuilder.build())
+            event.reply(builder.build())
             return
         }
         val args = event.args
@@ -95,7 +95,7 @@ class SetVoiceQualityFm(private var bot: Bot) : SlashCommand() {
             return
         }
         val settings = bot.userSettingsManager.getSettings(event.author.idLong)
-        settings.voiceQualityFm = bd!!.toFloat()
+        bd?.let { settings.setVoiceQualityFm(it.toFloat()) }
         event.reply("追加ハーフトーンを" + bd + "に設定しました。")
     }
 }
\ No newline at end of file
diff --git a/src/main/java/dev/cosgy/textToSpeak/commands/general/SettingsCmd.kt b/src/main/java/dev/cosgy/textToSpeak/commands/general/SettingsCmd.kt
index b61c44b..af05290 100644
--- a/src/main/java/dev/cosgy/textToSpeak/commands/general/SettingsCmd.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/commands/general/SettingsCmd.kt
@@ -32,7 +32,7 @@ class SettingsCmd(private var bot: Bot) : SlashCommand() {
 
     override fun execute(event: SlashCommandEvent) {
         val settings = bot.userSettingsManager.getSettings(event.user.idLong)
-        val ebuilder = EmbedBuilder()
+        val builder = EmbedBuilder()
                 .setColor(Color.orange)
                 .setTitle(event.user.name + "の設定")
                 .addField("声：", settings.voice, false)
@@ -40,12 +40,12 @@ class SettingsCmd(private var bot: Bot) : SlashCommand() {
                 .addField("F0系列内変動の重み：", settings.intonation.toString(), false)
                 .addField("オールパス値：", settings.voiceQualityA.toString(), false)
                 .addField("追加ハーフトーン：", settings.voiceQualityFm.toString(), false)
-        event.replyEmbeds(ebuilder.build()).queue()
+        event.replyEmbeds(builder.build()).queue()
     }
 
     override fun execute(event: CommandEvent) {
         val settings = bot.userSettingsManager.getSettings(event.author.idLong)
-        val ebuilder = EmbedBuilder()
+        val builder = EmbedBuilder()
                 .setColor(Color.orange)
                 .setTitle(event.author.name + "の設定")
                 .addField("声：", settings.voice, false)
@@ -53,6 +53,6 @@ class SettingsCmd(private var bot: Bot) : SlashCommand() {
                 .addField("抑揚：", settings.intonation.toString(), false)
                 .addField("声質a：", settings.voiceQualityA.toString(), false)
                 .addField("声質fm：", settings.voiceQualityFm.toString(), false)
-        event.reply(ebuilder.build())
+        event.reply(builder.build())
     }
 }
\ No newline at end of file
diff --git a/src/main/java/dev/cosgy/textToSpeak/gui/GUI.kt b/src/main/java/dev/cosgy/textToSpeak/gui/GUI.kt
index 3436a25..de1eb98 100644
--- a/src/main/java/dev/cosgy/textToSpeak/gui/GUI.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/gui/GUI.kt
@@ -27,6 +27,8 @@ import java.time.LocalDateTime
 import java.time.ZoneId
 import java.time.format.DateTimeFormatter
 import javax.swing.*
+import kotlin.math.ln
+import kotlin.math.pow
 import kotlin.system.exitProcess
 
 
@@ -65,9 +67,8 @@ class GUI(private val bot: Bot) : JFrame() {
         botInfoPanel.layout = BoxLayout(botInfoPanel, BoxLayout.Y_AXIS)
         val scrollPane = JScrollPane(botInfoPanel, JScrollPane.VERTICAL_SCROLLBAR_ALWAYS, JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED)
 
-// Add bot info label to bot info panel
+        // Add bot info label to bot info panel
         val botInfoLabel = JLabel()
-        val systemInfoLabel = JLabel()
 
         val osName = sunOsMx?.name
         val osVersion = sunOsMx?.version
@@ -122,7 +123,7 @@ class GUI(private val bot: Bot) : JFrame() {
         Timer(1000) {
             val uptime = Duration.ofMillis(runtimeMx!!.uptime).toMinutes()
 
-// Convert start time to LocalDateTime
+            // Convert start time to LocalDateTime
             val start = LocalDateTime.ofInstant(Instant.ofEpochMilli(runtimeMx!!.startTime), ZoneId.systemDefault())
             val vmName = runtimeMx!!.name
             val vmVendor = runtimeMx!!.vmVendor
@@ -189,13 +190,13 @@ class GUI(private val bot: Bot) : JFrame() {
             """.trimIndent()
 
             val sysInfoText = """
-    :: System Information<br>
-        Operating system: %s, Version: %s, Arch: %s<br>
-        Number of processors: %d, Physical memory: %s, Virtual memory: %s<br><br>
-    :: VM Information<br>
-        VM: %s, Version: %s, Vendor: %s, JIT compiler: %s<br>
-        Arguments: %s<br><br><br>
-    """.trimIndent()
+            :: System Information<br>
+                Operating system: %s, Version: %s, Arch: %s<br>
+                Number of processors: %d, Physical memory: %s, Virtual memory: %s<br><br>
+            :: VM Information<br>
+                VM: %s, Version: %s, Vendor: %s, JIT compiler: %s<br>
+                Arguments: %s<br><br><br>
+            """.trimIndent()
 
             val systemInfo = sysInfoText.format(
                 osName, osVersion, osArch, processors,
@@ -219,16 +220,16 @@ class GUI(private val bot: Bot) : JFrame() {
 
     }
 
-    fun prettyBytes(bytes: Long): String {
+    private fun prettyBytes(bytes: Long): String {
         return prettyBytes(bytes, true)
     }
 
     private fun prettyBytes(bytes: Long, si: Boolean): String {
         val unit = if (si) 1000 else 1024
         if (bytes < unit) return "$bytes B"
-        val exp = (Math.log(bytes.toDouble()) / Math.log(unit.toDouble())).toInt()
+        val exp = (ln(bytes.toDouble()) / ln(unit.toDouble())).toInt()
         val pre = (if (si) "kMGTPE" else "KMGTPE")[exp - 1].toString() + if (si) "" else "i"
-        return String.format("%.1f %sB", bytes / Math.pow(unit.toDouble(), exp.toDouble()), pre)
+        return String.format("%.1f %sB", bytes / unit.toDouble().pow(exp.toDouble()), pre)
     }
 
 }
\ No newline at end of file
diff --git a/src/main/java/dev/cosgy/textToSpeak/settings/SettingsManager.kt b/src/main/java/dev/cosgy/textToSpeak/settings/SettingsManager.kt
index a6f971f..64a674c 100644
--- a/src/main/java/dev/cosgy/textToSpeak/settings/SettingsManager.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/settings/SettingsManager.kt
@@ -78,7 +78,7 @@ class SettingsManager : GuildSettingsManager<Any?> {
             if (s.volume != 50) o.put("volume", s.volume)
             if (s.isReadName()) o.put("read_name", s.isReadName())
             if (s.isJoinAndLeaveRead()) o.put("join_and_leave_read", s.isJoinAndLeaveRead())
-            obj.put(java.lang.Long.toString(key), o)
+            obj.put(key.toString(), o)
         })
         try {
             Files.write(OtherUtil.getPath("serversettings.json"), obj.toString(4).toByteArray())
diff --git a/src/main/java/dev/cosgy/textToSpeak/settings/UserSettings.kt b/src/main/java/dev/cosgy/textToSpeak/settings/UserSettings.kt
index cf9fabd..7580db4 100644
--- a/src/main/java/dev/cosgy/textToSpeak/settings/UserSettings.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/settings/UserSettings.kt
@@ -18,4 +18,29 @@ package dev.cosgy.textToSpeak.settings
 class UserSettings(private val manager: UserSettingsManager, // getter
                    private val userId: Long, var voice: String, var speed: Float, var intonation: Float, var voiceQualityA: Float, var voiceQualityFm: Float) {
 
+    fun setVoice(voice: String) {
+        this.voice = voice
+        manager.saveSetting(userId)
+    }
+
+    fun setSpeed(speed:Float){
+        this.speed = speed
+        manager.saveSetting(userId)
+    }
+
+    fun setIntonation(intonation: Float){
+        this.intonation = intonation
+        manager.saveSetting(userId)
+    }
+
+    fun setVoiceQualityA(voiceQualityA: Float){
+        this.voiceQualityA = voiceQualityA
+        manager.saveSetting(userId)
+    }
+
+    fun setVoiceQualityFm(voiceQualityFm: Float){
+        this.voiceQualityFm = voiceQualityFm
+        manager.saveSetting(userId)
+    }
+
 }
\ No newline at end of file

From 3e6567236e67366083a3edf9e65419e0575bfc80 Mon Sep 17 00:00:00 2001
From: kosugikun <>
Date: Mon, 3 Apr 2023 17:58:06 +0900
Subject: [PATCH 13/39] =?UTF-8?q?=E3=83=A6=E3=83=BC=E3=82=B6=E3=83=BC?=
 =?UTF-8?q?=E8=A8=AD=E5=AE=9A=E3=81=AE=E4=BF=9D=E5=AD=98=E5=87=A6=E7=90=86?=
 =?UTF-8?q?=E3=81=AE=E4=B8=8D=E5=85=B7=E5=90=88=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/dev/cosgy/textToSpeak/BotConfig.kt   | 32 ++++-----
 .../cosgy/textToSpeak/audio/VoiceCreation.kt  | 10 +--
 .../commands/general/SetIntonationCmd.kt      |  4 +-
 .../commands/general/SetSpeedCmd.kt           |  4 +-
 .../commands/general/SetVoiceCmd.kt           | 10 +--
 .../commands/general/SetVoiceQualityA.kt      |  6 +-
 .../commands/general/SetVoiceQualityFm.kt     |  4 +-
 .../commands/general/SettingsCmd.kt           | 20 +++---
 .../dev/cosgy/textToSpeak/entities/Prompt.kt  |  2 +-
 .../textToSpeak/settings/UserSettings.kt      | 65 ++++++++++++-------
 .../settings/UserSettingsManager.kt           | 10 +--
 .../dev/cosgy/textToSpeak/utils/OtherUtil.kt  |  6 +-
 12 files changed, 93 insertions(+), 80 deletions(-)

diff --git a/src/main/java/dev/cosgy/textToSpeak/BotConfig.kt b/src/main/java/dev/cosgy/textToSpeak/BotConfig.kt
index 5bc22c6..f3bc5b1 100644
--- a/src/main/java/dev/cosgy/textToSpeak/BotConfig.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/BotConfig.kt
@@ -107,10 +107,10 @@ class BotConfig(private val prompt: Prompt) {
             if (ownerId <= 0) {
                 ownerId = try {
                     prompt.prompt("""
-            所有者のユーザーIDが設定されていない、または有効なIDではありません。
-            BOTの所有者のユーザーIDを入力してください。
-            所有者のユーザーID: 
-            """.trimIndent())!!.toLong()
+                        所有者のユーザーIDが設定されていない、または有効なIDではありません。
+                        BOTの所有者のユーザーIDを入力してください。
+                        所有者のユーザーID: 
+                    """.trimIndent())!!.toLong()
                 } catch (ex: NumberFormatException) {
                     0
                 } catch (ex: NullPointerException) {
@@ -118,10 +118,10 @@ class BotConfig(private val prompt: Prompt) {
                 }
                 if (ownerId <= 0) {
                     prompt.alert(Prompt.Level.ERROR, CONTEXT, """
-     無効なユーザーIDです！終了します。
+                        無効なユーザーIDです！終了します。
      
-     設定ファイルの場所: ${path!!.toAbsolutePath()}
-     """.trimIndent())
+                        設定ファイルの場所: ${path!!.toAbsolutePath()}
+                    """.trimIndent())
                     exitProcess(0)
                 } else {
                     write = true
@@ -131,9 +131,9 @@ class BotConfig(private val prompt: Prompt) {
                 val original = OtherUtil.loadResource(this, "/reference.conf")
                 val mod: String = original?.substring(original.indexOf(START_TOKEN) + START_TOKEN.length, original.indexOf(END_TOKEN))?.replace("BOT_TOKEN_HERE", token!!)?.replace("Botトークンをここに貼り付け", token!!)?.replace("0 // OWNER ID", ownerId.toString())?.replace("所有者IDをここに貼り付け", ownerId.toString())?.trim { it <= ' ' }
                         ?: """
-     token = $token
-     owner = $ownerId
-     """.trimIndent()
+                            token = $token
+                            owner = $ownerId
+                        """.trimIndent()
                 FileUtils.writeStringToFile(path!!.toFile(), mod, StandardCharsets.UTF_8)
             }
 
@@ -141,16 +141,16 @@ class BotConfig(private val prompt: Prompt) {
             isValid = true
         } catch (ex: ConfigException) {
             prompt.alert(Prompt.Level.ERROR, CONTEXT, """
-     $ex: ${ex.message}
+                $ex: ${ex.message}
      
-     設定ファイルの場所: ${path!!.toAbsolutePath()}
-     """.trimIndent())
+                設定ファイルの場所: ${path!!.toAbsolutePath()}
+            """.trimIndent())
         } catch (ex: IOException) {
             prompt.alert(Prompt.Level.ERROR, CONTEXT, """
-     $ex: ${ex.message}
+                $ex: ${ex.message}
      
-     設定ファイルの場所: ${path!!.toAbsolutePath()}
-     """.trimIndent())
+                設定ファイルの場所: ${path!!.toAbsolutePath()}
+            """.trimIndent())
         }
     }
 
diff --git a/src/main/java/dev/cosgy/textToSpeak/audio/VoiceCreation.kt b/src/main/java/dev/cosgy/textToSpeak/audio/VoiceCreation.kt
index 7dc4f93..ce53e62 100644
--- a/src/main/java/dev/cosgy/textToSpeak/audio/VoiceCreation.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/audio/VoiceCreation.kt
@@ -129,17 +129,17 @@ class VoiceCreation( // 各種設定の値を保持するためのフィール
         command.add("-x")
         command.add(dictionary)
         command.add("-m")
-        command.add(getVoiceFilePath(settings!!.voice))
+        command.add(getVoiceFilePath(settings!!.voiceSetting))
         command.add("-ow")
         command.add(fileName)
         command.add("-r")
-        command.add(settings.speed.toString())
+        command.add(settings.speedSetting.toString())
         command.add("-jf")
-        command.add(settings.intonation.toString())
+        command.add(settings.intonationSetting.toString())
         command.add("-a")
-        command.add(settings.voiceQualityA.toString())
+        command.add(settings.voiceQualityASetting.toString())
         command.add("-fm")
-        command.add(settings.voiceQualityFm.toString())
+        command.add(settings.voiceQualityFmSetting.toString())
         command.add(tmpFilePath)
         return command.toTypedArray()
     }
diff --git a/src/main/java/dev/cosgy/textToSpeak/commands/general/SetIntonationCmd.kt b/src/main/java/dev/cosgy/textToSpeak/commands/general/SetIntonationCmd.kt
index 2fe5e04..ec3f9e2 100644
--- a/src/main/java/dev/cosgy/textToSpeak/commands/general/SetIntonationCmd.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/commands/general/SetIntonationCmd.kt
@@ -42,7 +42,7 @@ class SetIntonationCmd(private val bot: Bot) : SlashCommand() {
         }
 
         val settings = bot.userSettingsManager.getSettings(event.user.idLong)
-        settings.setIntonation(bd.toFloat())
+        settings.intonationSetting = bd.toFloat()
         event.reply("F0系列内変動の重みを$bd に設定しました。").queue()
     }
 
@@ -64,7 +64,7 @@ class SetIntonationCmd(private val bot: Bot) : SlashCommand() {
         }
 
         val settings = bot.userSettingsManager.getSettings(event.author.idLong)
-        settings.setIntonation(bd.toFloat())
+        settings.intonationSetting = bd.toFloat()
         event.reply("F0系列内変動の重みを$bd に設定しました。")
     }
 }
diff --git a/src/main/java/dev/cosgy/textToSpeak/commands/general/SetSpeedCmd.kt b/src/main/java/dev/cosgy/textToSpeak/commands/general/SetSpeedCmd.kt
index b98b70d..42e2ef1 100644
--- a/src/main/java/dev/cosgy/textToSpeak/commands/general/SetSpeedCmd.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/commands/general/SetSpeedCmd.kt
@@ -48,7 +48,7 @@ class SetSpeedCmd(private val bot: Bot) : SlashCommand() {
             return
         }
         val settings = bot.userSettingsManager.getSettings(event.user.idLong)
-        settings.setSpeed(bd.toFloat())
+        settings.speedSetting = bd.toFloat()
         event.reply("速度を $bd に設定しました。").queue()
     }
 
@@ -73,7 +73,7 @@ class SetSpeedCmd(private val bot: Bot) : SlashCommand() {
             return
         }
         val settings = bot.userSettingsManager.getSettings(event.author.idLong)
-        settings.setSpeed(bd.toFloat())
+        settings.speedSetting = bd.toFloat()
         event.reply("速度を $bd に設定しました。")
     }
 
diff --git a/src/main/java/dev/cosgy/textToSpeak/commands/general/SetVoiceCmd.kt b/src/main/java/dev/cosgy/textToSpeak/commands/general/SetVoiceCmd.kt
index e17b8bb..9566752 100644
--- a/src/main/java/dev/cosgy/textToSpeak/commands/general/SetVoiceCmd.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/commands/general/SetVoiceCmd.kt
@@ -51,11 +51,11 @@ class SetVoiceCmd(private var bot: Bot) : SlashCommand() {
             event.replyEmbeds(builder.build()).queue()
             return
         }
-        val viceName = event.getOption("name")!!.asString
-        if (isValidVoice(viceName)) {
+        val voiceName = event.getOption("name")!!.asString
+        if (isValidVoice(voiceName)) {
             val settings = bot.userSettingsManager.getSettings(event.user.idLong)
-            settings.setVoice(viceName)
-            event.reply("声データを`$viceName`に設定しました。").queue()
+            settings.voiceSetting = voiceName
+            event.reply("声データを`$voiceName`に設定しました。").queue()
         } else {
             event.reply("有効な声データを選択して下さい。").queue()
         }
@@ -74,7 +74,7 @@ class SetVoiceCmd(private var bot: Bot) : SlashCommand() {
         val args = event.args
         if (voices.contains(args)) {
             val settings = bot.userSettingsManager.getSettings(event.author.idLong)
-            settings.setVoice(args)
+            settings.voiceSetting = args
             event.reply("声データを`$args`に設定しました。")
         } else {
             event.reply("有効な声データを選択して下さい。")
diff --git a/src/main/java/dev/cosgy/textToSpeak/commands/general/SetVoiceQualityA.kt b/src/main/java/dev/cosgy/textToSpeak/commands/general/SetVoiceQualityA.kt
index fc1e128..8b77766 100644
--- a/src/main/java/dev/cosgy/textToSpeak/commands/general/SetVoiceQualityA.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/commands/general/SetVoiceQualityA.kt
@@ -58,7 +58,7 @@ class SetVoiceQualityA(private var bot: Bot) : SlashCommand() {
             return
         }
         val settings = bot.userSettingsManager.getSettings(event.user.idLong)
-        settings.setVoiceQualityA(bd!!.toFloat())
+        settings.voiceQualityASetting = bd!!.toFloat()
         event.reply("オールパス値を" + bd + "に設定しました。").queue()
     }
 
@@ -67,7 +67,6 @@ class SetVoiceQualityA(private var bot: Bot) : SlashCommand() {
         var result: Boolean
         var bd: BigDecimal? = null
         try {
-            //value = Float.parseFloat(args);
             bd = BigDecimal(args)
             result = true
         } catch (e: NumberFormatException) {
@@ -80,13 +79,12 @@ class SetVoiceQualityA(private var bot: Bot) : SlashCommand() {
         val min = BigDecimal("0.0")
         val max = BigDecimal("1.0")
 
-        //if(!(0.1f <= value && value <= 1.0f)){
         if (!(min < bd && max > bd)) {
             event.reply("有効な数値を設定して下さい。0.1~1.0")
             return
         }
         val settings = bot.userSettingsManager.getSettings(event.author.idLong)
-        settings.setVoiceQualityA(bd!!.toFloat())
+        settings.voiceQualityASetting = bd!!.toFloat()
         event.reply("オールパス値を" + bd + "に設定しました。")
     }
 }
\ No newline at end of file
diff --git a/src/main/java/dev/cosgy/textToSpeak/commands/general/SetVoiceQualityFm.kt b/src/main/java/dev/cosgy/textToSpeak/commands/general/SetVoiceQualityFm.kt
index becd218..ea56495 100644
--- a/src/main/java/dev/cosgy/textToSpeak/commands/general/SetVoiceQualityFm.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/commands/general/SetVoiceQualityFm.kt
@@ -59,7 +59,7 @@ class SetVoiceQualityFm(private var bot: Bot) : SlashCommand() {
             return
         }
         val settings = bot.userSettingsManager.getSettings(event.user.idLong)
-        bd?.let { settings.setVoiceQualityFm(it.toFloat()) }
+        bd?.let { settings.voiceQualityFmSetting = it.toFloat() }
         event.reply("追加ハーフトーンを" + bd + "に設定しました。").queue()
     }
 
@@ -95,7 +95,7 @@ class SetVoiceQualityFm(private var bot: Bot) : SlashCommand() {
             return
         }
         val settings = bot.userSettingsManager.getSettings(event.author.idLong)
-        bd?.let { settings.setVoiceQualityFm(it.toFloat()) }
+        bd?.let { settings.voiceQualityFmSetting = it.toFloat() }
         event.reply("追加ハーフトーンを" + bd + "に設定しました。")
     }
 }
\ No newline at end of file
diff --git a/src/main/java/dev/cosgy/textToSpeak/commands/general/SettingsCmd.kt b/src/main/java/dev/cosgy/textToSpeak/commands/general/SettingsCmd.kt
index af05290..536b9df 100644
--- a/src/main/java/dev/cosgy/textToSpeak/commands/general/SettingsCmd.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/commands/general/SettingsCmd.kt
@@ -35,11 +35,11 @@ class SettingsCmd(private var bot: Bot) : SlashCommand() {
         val builder = EmbedBuilder()
                 .setColor(Color.orange)
                 .setTitle(event.user.name + "の設定")
-                .addField("声：", settings.voice, false)
-                .addField("読み上げ速度：", settings.speed.toString(), false)
-                .addField("F0系列内変動の重み：", settings.intonation.toString(), false)
-                .addField("オールパス値：", settings.voiceQualityA.toString(), false)
-                .addField("追加ハーフトーン：", settings.voiceQualityFm.toString(), false)
+                .addField("声：", settings.voiceSetting, false)
+                .addField("読み上げ速度：", settings.speedSetting.toString(), false)
+                .addField("F0系列内変動の重み：", settings.intonationSetting.toString(), false)
+                .addField("オールパス値：", settings.voiceQualityASetting.toString(), false)
+                .addField("追加ハーフトーン：", settings.voiceQualityFmSetting.toString(), false)
         event.replyEmbeds(builder.build()).queue()
     }
 
@@ -48,11 +48,11 @@ class SettingsCmd(private var bot: Bot) : SlashCommand() {
         val builder = EmbedBuilder()
                 .setColor(Color.orange)
                 .setTitle(event.author.name + "の設定")
-                .addField("声：", settings.voice, false)
-                .addField("速度：", settings.speed.toString(), false)
-                .addField("抑揚：", settings.intonation.toString(), false)
-                .addField("声質a：", settings.voiceQualityA.toString(), false)
-                .addField("声質fm：", settings.voiceQualityFm.toString(), false)
+                .addField("声：", settings.voiceSetting, false)
+                .addField("速度：", settings.speedSetting.toString(), false)
+                .addField("抑揚：", settings.intonationSetting.toString(), false)
+                .addField("声質a：", settings.voiceQualityASetting.toString(), false)
+                .addField("声質fm：", settings.voiceQualityFmSetting.toString(), false)
         event.reply(builder.build())
     }
 }
\ No newline at end of file
diff --git a/src/main/java/dev/cosgy/textToSpeak/entities/Prompt.kt b/src/main/java/dev/cosgy/textToSpeak/entities/Prompt.kt
index 3af73d1..ff7c6a8 100644
--- a/src/main/java/dev/cosgy/textToSpeak/entities/Prompt.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/entities/Prompt.kt
@@ -1,5 +1,5 @@
 //////////////////////////////////////////////////////////////////////////////////////////
-//  Copyright 2023 Cosgy Dev                                                             /
+//     Copyright 2023 Cosgy Dev                                                             /
 //                                                                                       /
 //     Licensed under the Apache License, Version 2.0 (the "License");                   /
 //     you may not use this file except in compliance with the License.                  /
diff --git a/src/main/java/dev/cosgy/textToSpeak/settings/UserSettings.kt b/src/main/java/dev/cosgy/textToSpeak/settings/UserSettings.kt
index 7580db4..9626744 100644
--- a/src/main/java/dev/cosgy/textToSpeak/settings/UserSettings.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/settings/UserSettings.kt
@@ -15,32 +15,47 @@
 //////////////////////////////////////////////////////////////////////////////////////////
 package dev.cosgy.textToSpeak.settings
 
-class UserSettings(private val manager: UserSettingsManager, // getter
-                   private val userId: Long, var voice: String, var speed: Float, var intonation: Float, var voiceQualityA: Float, var voiceQualityFm: Float) {
+class UserSettings(
+    private val manager: UserSettingsManager,
+    private val userId: Long,
+    private var voice: String,
+    private var speed: Float,
+    private var intonation: Float,
+    private var voiceQualityA: Float,
+    private var voiceQualityFm: Float
+) {
+    var voiceSetting: String
+        get() = voice
+        set(value) {
+            voice = value
+            manager.saveSetting(userId)
+        }
 
-    fun setVoice(voice: String) {
-        this.voice = voice
-        manager.saveSetting(userId)
-    }
+    var speedSetting: Float
+        get() = speed
+        set(value) {
+            speed = value
+            manager.saveSetting(userId)
+        }
 
-    fun setSpeed(speed:Float){
-        this.speed = speed
-        manager.saveSetting(userId)
-    }
+    var intonationSetting: Float
+        get() = intonation
+        set(value) {
+            intonation = value
+            manager.saveSetting(userId)
+        }
 
-    fun setIntonation(intonation: Float){
-        this.intonation = intonation
-        manager.saveSetting(userId)
-    }
+    var voiceQualityASetting: Float
+        get() = voiceQualityA
+        set(value) {
+            voiceQualityA = value
+            manager.saveSetting(userId)
+        }
 
-    fun setVoiceQualityA(voiceQualityA: Float){
-        this.voiceQualityA = voiceQualityA
-        manager.saveSetting(userId)
-    }
-
-    fun setVoiceQualityFm(voiceQualityFm: Float){
-        this.voiceQualityFm = voiceQualityFm
-        manager.saveSetting(userId)
-    }
-
-}
\ No newline at end of file
+    var voiceQualityFmSetting: Float
+        get() = voiceQualityFm
+        set(value) {
+            voiceQualityFm = value
+            manager.saveSetting(userId)
+        }
+}
diff --git a/src/main/java/dev/cosgy/textToSpeak/settings/UserSettingsManager.kt b/src/main/java/dev/cosgy/textToSpeak/settings/UserSettingsManager.kt
index 5e0ee0a..1d7526f 100644
--- a/src/main/java/dev/cosgy/textToSpeak/settings/UserSettingsManager.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/settings/UserSettingsManager.kt
@@ -68,11 +68,11 @@ class UserSettingsManager {
         try {
             connection!!.prepareStatement(sql).use { ps ->
                 ps.setLong(1, userId)
-                ps.setString(2, settings!!.voice)
-                ps.setFloat(3, settings.speed)
-                ps.setFloat(4, settings.intonation)
-                ps.setFloat(5, settings.voiceQualityA)
-                ps.setFloat(6, settings.voiceQualityFm)
+                ps.setString(2, settings!!.voiceSetting)
+                ps.setFloat(3, settings.speedSetting)
+                ps.setFloat(4, settings.intonationSetting)
+                ps.setFloat(5, settings.voiceQualityASetting)
+                ps.setFloat(6, settings.voiceQualityFmSetting)
                 logger.debug(ps.toString())
                 ps.executeUpdate()
             }
diff --git a/src/main/java/dev/cosgy/textToSpeak/utils/OtherUtil.kt b/src/main/java/dev/cosgy/textToSpeak/utils/OtherUtil.kt
index 52e00a8..31db718 100644
--- a/src/main/java/dev/cosgy/textToSpeak/utils/OtherUtil.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/utils/OtherUtil.kt
@@ -62,7 +62,7 @@ object OtherUtil {
      */
     fun loadResource(clazz: Any, name: String?): String? {
         return try {
-            readString(clazz.javaClass.getResourceAsStream(name))
+            name?.let { clazz.javaClass.getResourceAsStream(it)?.let { readString(it) } }
         } catch (ex: Exception) {
             null
         }
@@ -121,8 +121,8 @@ object OtherUtil {
         return Activity.playing(game)
     }
 
-    fun makeNonEmpty(str: String?): String {
-        return if (str == null || str.isEmpty()) "\u200B" else str
+    private fun makeNonEmpty(str: String?): String {
+        return if (str.isNullOrEmpty()) "\u200B" else str
     }
 
     fun parseStatus(status: String?): OnlineStatus {

From c7749b77c6fb01b9fb2c49722599cc31f21c6680 Mon Sep 17 00:00:00 2001
From: kosugikun <>
Date: Sat, 10 Jun 2023 07:37:56 +0900
Subject: [PATCH 14/39] =?UTF-8?q?adwd=E3=82=B3=E3=83=9E=E3=83=B3=E3=83=89?=
 =?UTF-8?q?=E3=81=A7=E3=83=9C=E3=83=83=E3=83=88=E3=81=8B=E3=82=89=E5=AE=8C?=
 =?UTF-8?q?=E4=BA=86=E3=83=A1=E3=83=83=E3=82=BB=E3=83=BC=E3=82=B8=E3=81=8C?=
 =?UTF-8?q?=E9=80=81=E4=BF=A1=E3=81=95=E3=82=8C=E3=81=AA=E3=81=84=E4=B8=8D?=
 =?UTF-8?q?=E5=85=B7=E5=90=88=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                         |  2 +-
 .../textToSpeak/commands/admin/GuildSettings.kt |  4 ++--
 .../textToSpeak/commands/admin/JLReadCmd.kt     |  4 ++--
 .../commands/admin/SetReadNameCmd.kt            |  4 ++--
 .../commands/dictionary/AddWordCmd.kt           |  6 +++---
 .../commands/general/AboutCommand.kt            |  2 +-
 src/main/java/dev/cosgy/textToSpeak/gui/GUI.kt  | 14 +++++++-------
 .../textToSpeak/listeners/MessageListener.kt    | 17 +++++++----------
 .../textToSpeak/settings/SettingsManager.kt     |  8 ++++----
 9 files changed, 29 insertions(+), 32 deletions(-)

diff --git a/pom.xml b/pom.xml
index af37337..a54f4ed 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
 
     <groupId>dev.cosgy</groupId>
     <artifactId>TextToSpeak</artifactId>
-    <version>0.4.0-beta.1</version>
+    <version>0.4.0-beta.2</version>
     <packaging>jar</packaging>
 
     <repositories>
diff --git a/src/main/java/dev/cosgy/textToSpeak/commands/admin/GuildSettings.kt b/src/main/java/dev/cosgy/textToSpeak/commands/admin/GuildSettings.kt
index 122119e..883e46f 100644
--- a/src/main/java/dev/cosgy/textToSpeak/commands/admin/GuildSettings.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/commands/admin/GuildSettings.kt
@@ -39,7 +39,7 @@ class GuildSettings(private val bot: Bot) : AdminCommand() {
         }
         val settings = bot.settingsManager.getSettings(event.guild!!)
         var text = "null"
-        if (settings!!.getTextChannel(event.guild) != null) {
+        if (settings.getTextChannel(event.guild) != null) {
             text = settings.getTextChannel(event.guild)!!.name
         }
         val builder = EmbedBuilder()
@@ -55,7 +55,7 @@ class GuildSettings(private val bot: Bot) : AdminCommand() {
     override fun execute(event: CommandEvent) {
         val settings = bot.settingsManager.getSettings(event.guild)
         var text = "null"
-        if (settings!!.getTextChannel(event.guild) != null) {
+        if (settings.getTextChannel(event.guild) != null) {
             text = settings.getTextChannel(event.guild)!!.name
         }
         val builder = EmbedBuilder()
diff --git a/src/main/java/dev/cosgy/textToSpeak/commands/admin/JLReadCmd.kt b/src/main/java/dev/cosgy/textToSpeak/commands/admin/JLReadCmd.kt
index c00d116..8b74c2a 100644
--- a/src/main/java/dev/cosgy/textToSpeak/commands/admin/JLReadCmd.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/commands/admin/JLReadCmd.kt
@@ -36,7 +36,7 @@ class JLReadCmd(private val bot: Bot) : AdminCommand() {
             return
         }
         val settings = bot.settingsManager.getSettings(event.guild!!)
-        if (settings!!.isJoinAndLeaveRead()) {
+        if (settings.isJoinAndLeaveRead()) {
             settings.setJoinAndLeaveRead(false)
             event.reply("ボイスチャンネルにユーザーが参加、退出した際の読み上げを無効にしました。").queue()
         } else {
@@ -47,7 +47,7 @@ class JLReadCmd(private val bot: Bot) : AdminCommand() {
 
     override fun execute(event: CommandEvent) {
         val settings = bot.settingsManager.getSettings(event.guild)
-        if (settings!!.isJoinAndLeaveRead()) {
+        if (settings.isJoinAndLeaveRead()) {
             settings.setJoinAndLeaveRead(false)
             event.reply("ボイスチャンネルにユーザーが参加、退出した際の読み上げを無効にしました。")
         } else {
diff --git a/src/main/java/dev/cosgy/textToSpeak/commands/admin/SetReadNameCmd.kt b/src/main/java/dev/cosgy/textToSpeak/commands/admin/SetReadNameCmd.kt
index 7f8dc5f..575e9c0 100644
--- a/src/main/java/dev/cosgy/textToSpeak/commands/admin/SetReadNameCmd.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/commands/admin/SetReadNameCmd.kt
@@ -36,7 +36,7 @@ class SetReadNameCmd(private val bot: Bot) : AdminCommand() {
             return
         }
         val settings = bot.settingsManager.getSettings(event.guild!!)
-        if (settings!!.isReadName()) {
+        if (settings.isReadName()) {
             settings.setReadName(false)
             event.reply("ユーザー名の読み上げを無効にしました。").queue()
         } else {
@@ -47,7 +47,7 @@ class SetReadNameCmd(private val bot: Bot) : AdminCommand() {
 
     override fun execute(event: CommandEvent) {
         val settings = bot.settingsManager.getSettings(event.guild)
-        if (settings!!.isReadName()) {
+        if (settings.isReadName()) {
             settings.setReadName(false)
             event.reply("ユーザー名の読み上げを無効にしました。")
         } else {
diff --git a/src/main/java/dev/cosgy/textToSpeak/commands/dictionary/AddWordCmd.kt b/src/main/java/dev/cosgy/textToSpeak/commands/dictionary/AddWordCmd.kt
index 4f97a52..38920cc 100644
--- a/src/main/java/dev/cosgy/textToSpeak/commands/dictionary/AddWordCmd.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/commands/dictionary/AddWordCmd.kt
@@ -25,7 +25,6 @@ import net.dv8tion.jda.api.entities.emoji.Emoji
 import net.dv8tion.jda.api.exceptions.PermissionException
 import net.dv8tion.jda.api.interactions.commands.OptionType
 import net.dv8tion.jda.api.interactions.commands.build.OptionData
-import org.slf4j.LoggerFactory
 import java.awt.Color
 import java.util.concurrent.TimeUnit
 import java.util.regex.Pattern
@@ -59,7 +58,8 @@ class AddWordCmd(private val bot: Bot) : SlashCommand() {
                             dictionary.updateDictionary(guildId, word, reading)
                             sendSuccessMessage(event)
                         } else {
-                            event.reply("辞書登録をキャンセルしました。").queue()
+
+                            event.hook.sendMessage("辞書登録をキャンセルしました。").queue()
                         }
                     }.setFinalAction { m: Message ->
                         try {
@@ -80,7 +80,7 @@ class AddWordCmd(private val bot: Bot) : SlashCommand() {
                 .setTitle("単語を追加しました。")
                 .addField("単語", "```" + event.getOption("word")!!.asString + "```", false)
                 .addField("読み", "```" + event.getOption("reading")!!.asString + "```", false)
-        event.replyEmbeds(builder.build()).queue()
+        event.hook.sendMessageEmbeds(builder.build()).queue()
     }
 
     override fun execute(event: SlashCommandEvent) {
diff --git a/src/main/java/dev/cosgy/textToSpeak/commands/general/AboutCommand.kt b/src/main/java/dev/cosgy/textToSpeak/commands/general/AboutCommand.kt
index be3c60a..622556c 100644
--- a/src/main/java/dev/cosgy/textToSpeak/commands/general/AboutCommand.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/commands/general/AboutCommand.kt
@@ -92,7 +92,7 @@ class AboutCommand(private val color: Color, private val description: String, va
             builder.addField("", """${jda.textChannels.size} テキストチャンネル
                 ${jda.voiceChannels.size} ボイスチャンネル""", true)
         }
-        builder.setFooter("再起動が行われた時間", "https://www.cosgy.dev/wp-content/uploads/2020/03/restart.jpg")
+        builder.setFooter("再起動が行われた時間")
         builder.setTimestamp(client.startTime)
     }
 
diff --git a/src/main/java/dev/cosgy/textToSpeak/gui/GUI.kt b/src/main/java/dev/cosgy/textToSpeak/gui/GUI.kt
index de1eb98..722b85e 100644
--- a/src/main/java/dev/cosgy/textToSpeak/gui/GUI.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/gui/GUI.kt
@@ -54,7 +54,7 @@ class GUI(private val bot: Bot) : JFrame() {
         memoryMx = ManagementFactory.getMemoryMXBean()
         classLoadingMx = ManagementFactory.getClassLoadingMXBean()
         sunOsMx = ManagementFactory.getOperatingSystemMXBean() as OperatingSystemMXBean
-        garbageCollectors = ManagementFactory.getGarbageCollectorMXBeans() as List<*> as List<GarbageCollectorMXBean>?
+        garbageCollectors = ManagementFactory.getGarbageCollectorMXBeans().filterIsInstance<GarbageCollectorMXBean>()
 
 
         defaultCloseOperation = EXIT_ON_CLOSE
@@ -75,9 +75,9 @@ class GUI(private val bot: Bot) : JFrame() {
         val osArch = sunOsMx?.arch
         val processors = sunOsMx?.availableProcessors
 
-        val vmName = runtimeMx?.name
-        val vmVersion = runtimeMx?.vmVersion
-        val vmVendor = runtimeMx?.vmVendor
+        //val vmName = runtimeMx?.name
+        //val vmVersion = runtimeMx?.vmVersion
+        //val vmVendor = runtimeMx?.vmVendor
         val vmArguments = runtimeMx?.inputArguments?.joinToString(" ")
 
         //botInfoPanel.add(systemInfoLabel)
@@ -128,7 +128,7 @@ class GUI(private val bot: Bot) : JFrame() {
             val vmName = runtimeMx!!.name
             val vmVendor = runtimeMx!!.vmVendor
             val vmVersion = runtimeMx!!.vmVersion
-            val gcCount = garbageCollectors!!.sumOf { it.collectionCount }
+            //val gcCount = garbageCollectors!!.sumOf { it.collectionCount }
 
             val cpuUsage = sunOsMx!!.processCpuLoad * 100
             val systemCpuUsage = sunOsMx!!.systemCpuLoad * 100
@@ -162,12 +162,12 @@ class GUI(private val bot: Bot) : JFrame() {
             val totalLoadedClassCount = classLoadingMx!!.totalLoadedClassCount
             val unloadedClassCount = classLoadingMx!!.unloadedClassCount
 
-            val gcStats = garbageCollectors!!.map { gc ->
+            val gcStats = garbageCollectors!!.joinToString("\n") { gc ->
                 val name = gc.name
                 val count = gc.collectionCount
                 val time = gc.collectionTime / 1000
                 "$name: Count=$count, Time=$time sec"
-            }.joinToString("\n")
+            }
 
             val botInfoText = """
                 :: System<br>
diff --git a/src/main/java/dev/cosgy/textToSpeak/listeners/MessageListener.kt b/src/main/java/dev/cosgy/textToSpeak/listeners/MessageListener.kt
index 2e58705..5bbb0f3 100644
--- a/src/main/java/dev/cosgy/textToSpeak/listeners/MessageListener.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/listeners/MessageListener.kt
@@ -23,24 +23,21 @@ import dev.cosgy.textToSpeak.Bot
 import dev.cosgy.textToSpeak.audio.AudioHandler
 import dev.cosgy.textToSpeak.audio.QueuedTrack
 import dev.cosgy.textToSpeak.utils.ReadChannel
-import net.dv8tion.jda.api.entities.Message
 import net.dv8tion.jda.api.entities.channel.ChannelType
-import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel
 import net.dv8tion.jda.api.events.message.MessageReceivedEvent
 import net.dv8tion.jda.api.events.session.ReadyEvent
 import net.dv8tion.jda.api.hooks.ListenerAdapter
 import java.io.IOException
-import java.util.function.Consumer
 
 class MessageListener(private val bot: Bot) : ListenerAdapter() {
     override fun onMessageReceived(event: MessageReceivedEvent) {
-        val jda = event.jda
-        val responseNumber = event.responseNumber
+        event.jda
+        event.responseNumber
 
         //イベント固有の情報
         val author = event.author //メッセージを送信したユーザー
         val message = event.message //受信したメッセージ。
-        val channel: MessageChannel = event.channel //メッセージが送信されたMessageChannel
+        event.channel //メッセージが送信されたMessageChannel
         var msg = message.contentDisplay
         //人間が読める形式のメッセージが返されます。 クライアントに表示されるものと同様。
         val isBot = author.isBot
@@ -50,7 +47,7 @@ class MessageListener(private val bot: Bot) : ListenerAdapter() {
             if (isBot) return
             val guild = event.guild
             val textChannel = event.guildChannel.asTextChannel()
-            var settingText = bot.settingsManager.getSettings(event.guild)?.getTextChannel(event.guild)
+            var settingText = bot.settingsManager.getSettings(event.guild).getTextChannel(event.guild)
             if (!guild.audioManager.isConnected) {
                 return
             }
@@ -67,7 +64,7 @@ class MessageListener(private val bot: Bot) : ListenerAdapter() {
             // URLを置き換え
             msg = msg.replace("(http://|https://)[\\w.\\-/:#?=&;%~+]+".toRegex(), "ゆーあーるえる")
             if (textChannel === settingText) {
-                if (bot.settingsManager.getSettings(guild)!!.isReadName()) {
+                if (bot.settingsManager.getSettings(guild).isReadName()) {
                     msg = author.name + "  " + msg
                 }
                 val vc = bot.voiceCreation
@@ -78,7 +75,7 @@ class MessageListener(private val bot: Bot) : ListenerAdapter() {
                 } catch (e: InterruptedException) {
                     throw RuntimeException(e)
                 }
-                bot.playerManager.loadItemOrdered(event.guild, file, ResultHandler(null, event))
+                bot.playerManager.loadItemOrdered(event.guild, file, ResultHandler(event))
 
                 //textChannel.sendMessage(author.getName() + "が、「"+ msg +"」と送信しました。").queue();
             }
@@ -89,7 +86,7 @@ class MessageListener(private val bot: Bot) : ListenerAdapter() {
         bot.readyJDA()
     }
 
-    private class ResultHandler(m: Message?, private val event: MessageReceivedEvent) : AudioLoadResultHandler {
+    private class ResultHandler(private val event: MessageReceivedEvent) : AudioLoadResultHandler {
         private fun loadSingle(track: AudioTrack) {
             val handler = event.guild.audioManager.sendingHandler as AudioHandler?
             handler!!.addTrack(QueuedTrack(track, event.author))
diff --git a/src/main/java/dev/cosgy/textToSpeak/settings/SettingsManager.kt b/src/main/java/dev/cosgy/textToSpeak/settings/SettingsManager.kt
index 64a674c..64d60ab 100644
--- a/src/main/java/dev/cosgy/textToSpeak/settings/SettingsManager.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/settings/SettingsManager.kt
@@ -48,12 +48,12 @@ class SettingsManager : GuildSettingsManager<Any?> {
         }
     }
 
-    override fun getSettings(guild: Guild): Settings? {
+    override fun getSettings(guild: Guild): Settings {
         return getSettings(guild.idLong)
     }
 
     fun getSettings(guildId: Long): Settings {
-        return settings.computeIfAbsent(guildId) { id: Long? -> createDefaultSettings() }
+        return settings.computeIfAbsent(guildId) { _: Long? -> createDefaultSettings() }
     }
 
     /**
@@ -62,7 +62,7 @@ class SettingsManager : GuildSettingsManager<Any?> {
      * @return 作成されたデフォルト設定
      */
     private fun createDefaultSettings(): Settings {
-        return Settings(this, 0, null, 50, false, false)
+        return Settings(this, 0, null, 50, readName = false, joinAndLeaveRead = false)
     }
 
     /**
@@ -73,7 +73,7 @@ class SettingsManager : GuildSettingsManager<Any?> {
         settings.keys.forEach(Consumer { key: Long ->
             val o = JSONObject()
             val s = settings[key]
-            if (s!!.textId != 0L) o.put("text_channel_id", java.lang.Long.toString(s.textId))
+            if (s!!.textId != 0L) o.put("text_channel_id", s.textId.toString())
             if (s.prefix != null) o.put("prefix", s.prefix)
             if (s.volume != 50) o.put("volume", s.volume)
             if (s.isReadName()) o.put("read_name", s.isReadName())

From 460d17b68979fe40331a24da8082a6aeec1bfc1f Mon Sep 17 00:00:00 2001
From: kosugikun <>
Date: Sat, 10 Jun 2023 07:42:18 +0900
Subject: [PATCH 15/39] =?UTF-8?q?=E3=82=AF=E3=83=AA=E3=83=BC=E3=83=B3?=
 =?UTF-8?q?=E3=82=A2=E3=83=83=E3=83=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cosgy/textToSpeak/audio/AudioHandler.kt   |  4 +-
 .../cosgy/textToSpeak/audio/VoiceCreation.kt  |  5 ++-
 .../java/dev/cosgy/textToSpeak/gui/GUI.kt     | 40 ++++++++++++++-----
 .../textToSpeak/gui/TextAreaOutputStream.kt   | 18 ++++-----
 4 files changed, 45 insertions(+), 22 deletions(-)

diff --git a/src/main/java/dev/cosgy/textToSpeak/audio/AudioHandler.kt b/src/main/java/dev/cosgy/textToSpeak/audio/AudioHandler.kt
index 54bb94d..a3d2256 100644
--- a/src/main/java/dev/cosgy/textToSpeak/audio/AudioHandler.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/audio/AudioHandler.kt
@@ -58,7 +58,9 @@ class AudioHandler(guild: Guild, val player: AudioPlayer) : AudioEventAdapter(),
     }
 
     val requester: Long
-        get() = if (player.playingTrack == null || player.playingTrack.getUserData(Long::class.java) == null) 0 else player.playingTrack.getUserData(Long::class.java)
+        get() = if (player.playingTrack == null || player.playingTrack.getUserData(Long::class.java) == null) 0 else player.playingTrack.getUserData(
+            Long::class.java
+        )
 
     // Audio Events
     override fun onTrackEnd(player: AudioPlayer, track: AudioTrack, endReason: AudioTrackEndReason) {
diff --git a/src/main/java/dev/cosgy/textToSpeak/audio/VoiceCreation.kt b/src/main/java/dev/cosgy/textToSpeak/audio/VoiceCreation.kt
index ce53e62..404745a 100644
--- a/src/main/java/dev/cosgy/textToSpeak/audio/VoiceCreation.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/audio/VoiceCreation.kt
@@ -15,11 +15,11 @@
 //////////////////////////////////////////////////////////////////////////////////////////
 package dev.cosgy.textToSpeak.audio
 
+import com.ibm.icu.text.Transliterator
 import dev.cosgy.textToSpeak.Bot
 import dev.cosgy.textToSpeak.settings.UserSettings
 import net.dv8tion.jda.api.entities.*
 import org.apache.commons.io.FileUtils
-import com.ibm.icu.text.Transliterator
 import org.slf4j.LoggerFactory
 import java.io.*
 import java.nio.file.Files
@@ -29,7 +29,8 @@ import java.text.BreakIterator
 import java.util.*
 
 class VoiceCreation( // 各種設定の値を保持するためのフィールド
-        private val bot: Bot) {
+    private val bot: Bot
+) {
     private val dictionary: String? = bot.config.dictionary
     private val voiceDirectory: String? = bot.config.voiceDirectory
     private val winJTalkDir: String? = bot.config.winJTalkDir
diff --git a/src/main/java/dev/cosgy/textToSpeak/gui/GUI.kt b/src/main/java/dev/cosgy/textToSpeak/gui/GUI.kt
index 722b85e..855e879 100644
--- a/src/main/java/dev/cosgy/textToSpeak/gui/GUI.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/gui/GUI.kt
@@ -65,7 +65,8 @@ class GUI(private val bot: Bot) : JFrame() {
         val botInfoPanel = JPanel()
 
         botInfoPanel.layout = BoxLayout(botInfoPanel, BoxLayout.Y_AXIS)
-        val scrollPane = JScrollPane(botInfoPanel, JScrollPane.VERTICAL_SCROLLBAR_ALWAYS, JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED)
+        val scrollPane =
+            JScrollPane(botInfoPanel, JScrollPane.VERTICAL_SCROLLBAR_ALWAYS, JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED)
 
         // Add bot info label to bot info panel
         val botInfoLabel = JLabel()
@@ -92,7 +93,7 @@ class GUI(private val bot: Bot) : JFrame() {
         isVisible = true
         addWindowListener(object : WindowListener {
             override fun windowOpened(e: WindowEvent) {
-            /* unused */
+                /* unused */
             }
 
             override fun windowClosing(e: WindowEvent) {
@@ -206,14 +207,33 @@ class GUI(private val bot: Bot) : JFrame() {
             )
 
             botInfoLabel.text = "<html>$systemInfo" + botInfoText.format(
-                cpuUsage, loadAverage,
-                physicalMemory, freePhysicalMemory, usedPhysicalMemory,
-                swapSpace, freeSwapSpace,
-                uptime, start.format(DateTimeFormatter.ISO_LOCAL_DATE_TIME), systemCpuUsage, sunOsMx!!.processCpuTime / 1000000, compilationMx!!.totalCompilationTime,
-                heapUsed, heapCommitted, heapInit, heapMax,
-                nonHeapUsed, nonHeapCommitted, nonHeapInit, nonHeapMax,
-                threadCount, peakThreadCount, daemonThreadCount, totalStartedThreadCount,
-                loadedClassCount, totalLoadedClassCount, unloadedClassCount
+                cpuUsage,
+                loadAverage,
+                physicalMemory,
+                freePhysicalMemory,
+                usedPhysicalMemory,
+                swapSpace,
+                freeSwapSpace,
+                uptime,
+                start.format(DateTimeFormatter.ISO_LOCAL_DATE_TIME),
+                systemCpuUsage,
+                sunOsMx!!.processCpuTime / 1000000,
+                compilationMx!!.totalCompilationTime,
+                heapUsed,
+                heapCommitted,
+                heapInit,
+                heapMax,
+                nonHeapUsed,
+                nonHeapCommitted,
+                nonHeapInit,
+                nonHeapMax,
+                threadCount,
+                peakThreadCount,
+                daemonThreadCount,
+                totalStartedThreadCount,
+                loadedClassCount,
+                totalLoadedClassCount,
+                unloadedClassCount
             ) + "</html>"
 
         }.start()
diff --git a/src/main/java/dev/cosgy/textToSpeak/gui/TextAreaOutputStream.kt b/src/main/java/dev/cosgy/textToSpeak/gui/TextAreaOutputStream.kt
index 8cc471b..7e804af 100644
--- a/src/main/java/dev/cosgy/textToSpeak/gui/TextAreaOutputStream.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/gui/TextAreaOutputStream.kt
@@ -108,16 +108,16 @@ class TextAreaOutputStream @JvmOverloads constructor(txtara: JTextArea, maxlin:
                 textArea.text = ""
             }
             values.stream()
-                    .peek { `val`: String -> curLength += `val`.length }
-                    .peek { `val`: String ->
-                        if (`val`.endsWith(EOL1) || `val`.endsWith(EOL2)) {
-                            if (lengths.size >= maxLines) {
-                                textArea.replaceRange("", 0, lengths.removeFirst())
-                            }
-                            lengths.addLast(curLength)
-                            curLength = 0
+                .peek { `val`: String -> curLength += `val`.length }
+                .peek { `val`: String ->
+                    if (`val`.endsWith(EOL1) || `val`.endsWith(EOL2)) {
+                        if (lengths.size >= maxLines) {
+                            textArea.replaceRange("", 0, lengths.removeFirst())
                         }
-                    }.forEach { str: String? -> textArea.append(str) }
+                        lengths.addLast(curLength)
+                        curLength = 0
+                    }
+                }.forEach { str: String? -> textArea.append(str) }
             values.clear()
             clear = false
             queue = true

From 6462b573f1e910cebcbe69dd506c204855c33982 Mon Sep 17 00:00:00 2001
From: kosugikun <>
Date: Sat, 10 Jun 2023 07:42:25 +0900
Subject: [PATCH 16/39] =?UTF-8?q?=E3=82=AF=E3=83=AA=E3=83=BC=E3=83=B3?=
 =?UTF-8?q?=E3=82=A2=E3=83=83=E3=83=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/dev/cosgy/textToSpeak/Bot.kt    |   6 +-
 .../java/dev/cosgy/textToSpeak/BotConfig.kt   |  47 +++++--
 .../java/dev/cosgy/textToSpeak/Listener.kt    |  18 ++-
 .../java/dev/cosgy/textToSpeak/TextToSpeak.kt | 121 ++++++++++++------
 .../textToSpeak/audio/AloneInVoiceHandler.kt  |  11 +-
 .../commands/admin/GuildSettings.kt           |  32 +++--
 .../textToSpeak/commands/admin/SettcCmd.kt    |   4 +-
 .../commands/dictionary/AddWordCmd.kt         |  44 +++----
 .../commands/dictionary/DlWordCmd.kt          |   6 +-
 .../commands/dictionary/WordListCmd.kt        |  50 ++++----
 .../commands/general/AboutCommand.kt          |  75 +++++++----
 .../textToSpeak/commands/general/HelpCmd.kt   |  34 +++--
 .../textToSpeak/commands/general/JoinCmd.kt   |   8 +-
 .../commands/general/SetIntonationCmd.kt      |   6 +-
 .../commands/general/SetSpeedCmd.kt           |   8 +-
 .../commands/general/SetVoiceCmd.kt           |  19 ++-
 .../commands/general/SetVoiceQualityFm.kt     |   6 +-
 .../commands/general/SettingsCmd.kt           |  28 ++--
 .../dev/cosgy/textToSpeak/entities/Prompt.kt  |   9 +-
 .../textToSpeak/listeners/CommandAudit.kt     |  11 +-
 .../cosgy/textToSpeak/settings/Settings.kt    |  18 ++-
 .../textToSpeak/settings/SettingsManager.kt   |  13 +-
 .../settings/UserSettingsManager.kt           |  16 ++-
 .../dev/cosgy/textToSpeak/utils/OtherUtil.kt  |  20 ++-
 24 files changed, 391 insertions(+), 219 deletions(-)

diff --git a/src/main/java/dev/cosgy/textToSpeak/Bot.kt b/src/main/java/dev/cosgy/textToSpeak/Bot.kt
index 7cfac6c..f862e3a 100644
--- a/src/main/java/dev/cosgy/textToSpeak/Bot.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/Bot.kt
@@ -67,7 +67,9 @@ class Bot(val waiter: EventWaiter, val config: BotConfig, val settingsManager: S
     }
 
     fun resetGame() {
-        val game = if (config.game == null || config.game!!.name.lowercase(Locale.getDefault()).matches("(none|なし)".toRegex())) null else config.game
+        val game = if (config.game == null || config.game!!.name.lowercase(Locale.getDefault())
+                .matches("(none|なし)".toRegex())
+        ) null else config.game
         if (jda!!.presence.activity != game) jda!!.presence.activity = game
     }
 
@@ -123,7 +125,7 @@ class Bot(val waiter: EventWaiter, val config: BotConfig, val settingsManager: S
             log.info("Deleted temporary files")
         } catch (e: IOException) {
             log.warn("Failed to delete temporary files")
-        } catch (e: IllegalArgumentException){
+        } catch (e: IllegalArgumentException) {
             log.warn("One or more directory paths were invalid.")
         }
 
diff --git a/src/main/java/dev/cosgy/textToSpeak/BotConfig.kt b/src/main/java/dev/cosgy/textToSpeak/BotConfig.kt
index f3bc5b1..a8b9f3f 100644
--- a/src/main/java/dev/cosgy/textToSpeak/BotConfig.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/BotConfig.kt
@@ -62,7 +62,10 @@ class BotConfig(private val prompt: Prompt) {
         try {
             path = OtherUtil.getPath(System.getProperty("config.file", System.getProperty("config", "config.txt")))
             if (path!!.toFile().exists()) {
-                if (System.getProperty("config.file") == null) System.setProperty("config.file", System.getProperty("config", "config.txt"))
+                if (System.getProperty("config.file") == null) System.setProperty(
+                    "config.file",
+                    System.getProperty("config", "config.txt")
+                )
                 ConfigFactory.invalidateCaches()
             }
 
@@ -87,16 +90,20 @@ class BotConfig(private val prompt: Prompt) {
 
             // validate bot token
             if (token == null || token!!.isEmpty() || token!!.matches("(BOT_TOKEN_HERE|Botトークンをここに貼り付け)".toRegex())) {
-                token = prompt.prompt("""
+                token = prompt.prompt(
+                    """
     BOTトークンを入力してください。
     BOTトークン: 
-    """.trimIndent())
+    """.trimIndent()
+                )
                 write = if (token == null) {
-                    prompt.alert(Prompt.Level.WARNING, CONTEXT, """
+                    prompt.alert(
+                        Prompt.Level.WARNING, CONTEXT, """
      トークンが入力されていません！終了します。
      
      設定ファイルの場所: ${path!!.toAbsolutePath()}
-     """.trimIndent())
+     """.trimIndent()
+                    )
                     return
                 } else {
                     true
@@ -106,22 +113,26 @@ class BotConfig(private val prompt: Prompt) {
             // validate bot owner
             if (ownerId <= 0) {
                 ownerId = try {
-                    prompt.prompt("""
+                    prompt.prompt(
+                        """
                         所有者のユーザーIDが設定されていない、または有効なIDではありません。
                         BOTの所有者のユーザーIDを入力してください。
                         所有者のユーザーID: 
-                    """.trimIndent())!!.toLong()
+                    """.trimIndent()
+                    )!!.toLong()
                 } catch (ex: NumberFormatException) {
                     0
                 } catch (ex: NullPointerException) {
                     0
                 }
                 if (ownerId <= 0) {
-                    prompt.alert(Prompt.Level.ERROR, CONTEXT, """
+                    prompt.alert(
+                        Prompt.Level.ERROR, CONTEXT, """
                         無効なユーザーIDです！終了します。
      
                         設定ファイルの場所: ${path!!.toAbsolutePath()}
-                    """.trimIndent())
+                    """.trimIndent()
+                    )
                     exitProcess(0)
                 } else {
                     write = true
@@ -129,7 +140,11 @@ class BotConfig(private val prompt: Prompt) {
             }
             if (write) {
                 val original = OtherUtil.loadResource(this, "/reference.conf")
-                val mod: String = original?.substring(original.indexOf(START_TOKEN) + START_TOKEN.length, original.indexOf(END_TOKEN))?.replace("BOT_TOKEN_HERE", token!!)?.replace("Botトークンをここに貼り付け", token!!)?.replace("0 // OWNER ID", ownerId.toString())?.replace("所有者IDをここに貼り付け", ownerId.toString())?.trim { it <= ' ' }
+                val mod: String =
+                    original?.substring(original.indexOf(START_TOKEN) + START_TOKEN.length, original.indexOf(END_TOKEN))
+                        ?.replace("BOT_TOKEN_HERE", token!!)?.replace("Botトークンをここに貼り付け", token!!)
+                        ?.replace("0 // OWNER ID", ownerId.toString())
+                        ?.replace("所有者IDをここに貼り付け", ownerId.toString())?.trim { it <= ' ' }
                         ?: """
                             token = $token
                             owner = $ownerId
@@ -140,17 +155,21 @@ class BotConfig(private val prompt: Prompt) {
             // if we get through the whole config, it's good to go
             isValid = true
         } catch (ex: ConfigException) {
-            prompt.alert(Prompt.Level.ERROR, CONTEXT, """
+            prompt.alert(
+                Prompt.Level.ERROR, CONTEXT, """
                 $ex: ${ex.message}
      
                 設定ファイルの場所: ${path!!.toAbsolutePath()}
-            """.trimIndent())
+            """.trimIndent()
+            )
         } catch (ex: IOException) {
-            prompt.alert(Prompt.Level.ERROR, CONTEXT, """
+            prompt.alert(
+                Prompt.Level.ERROR, CONTEXT, """
                 $ex: ${ex.message}
      
                 設定ファイルの場所: ${path!!.toAbsolutePath()}
-            """.trimIndent())
+            """.trimIndent()
+            )
         }
     }
 
diff --git a/src/main/java/dev/cosgy/textToSpeak/Listener.kt b/src/main/java/dev/cosgy/textToSpeak/Listener.kt
index eeec07f..5ab6d24 100644
--- a/src/main/java/dev/cosgy/textToSpeak/Listener.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/Listener.kt
@@ -47,7 +47,11 @@ class Listener(private val bot: Bot) : ListenerAdapter() {
                 if (owner != null) {
                     val currentVersion = OtherUtil.currentVersion
                     val latestVersion = OtherUtil.latestVersion
-                    if (latestVersion != null && !currentVersion.equals(latestVersion, ignoreCase = true) && TextToSpeak.CHECK_UPDATE) {
+                    if (latestVersion != null && !currentVersion.equals(
+                            latestVersion,
+                            ignoreCase = true
+                        ) && TextToSpeak.CHECK_UPDATE
+                    ) {
                         val msg = String.format(OtherUtil.NEW_VERSION_AVAILABLE, currentVersion, latestVersion)
                         owner.openPrivateChannel().queue { pc: PrivateChannel -> pc.sendMessage(msg).queue() }
                     }
@@ -62,7 +66,11 @@ class Listener(private val bot: Bot) : ListenerAdapter() {
         if (event.channelLeft != null) {
             if (settings!!.isJoinAndLeaveRead() && Objects.requireNonNull(event.guild.selfMember.voiceState)?.channel === event.channelLeft && event.channelLeft!!.members.size > 1) {
                 val file: String? = try {
-                    bot.voiceCreation.createVoice(event.guild, event.member.user, event.member.user.name + "がボイスチャンネルから退出しました。")
+                    bot.voiceCreation.createVoice(
+                        event.guild,
+                        event.member.user,
+                        event.member.user.name + "がボイスチャンネルから退出しました。"
+                    )
                 } catch (e: IOException) {
                     throw RuntimeException(e)
                 } catch (e: InterruptedException) {
@@ -83,7 +91,11 @@ class Listener(private val bot: Bot) : ListenerAdapter() {
         if (event.channelJoined != null) {
             if (settings!!.isJoinAndLeaveRead() && Objects.requireNonNull(event.guild.selfMember.voiceState)?.channel === event.channelJoined) {
                 val file: String? = try {
-                    bot.voiceCreation.createVoice(event.guild, event.member.user, event.member.user.name + "がボイスチャンネルに参加しました。")
+                    bot.voiceCreation.createVoice(
+                        event.guild,
+                        event.member.user,
+                        event.member.user.name + "がボイスチャンネルに参加しました。"
+                    )
                 } catch (e: IOException) {
                     throw RuntimeException(e)
                 } catch (e: InterruptedException) {
diff --git a/src/main/java/dev/cosgy/textToSpeak/TextToSpeak.kt b/src/main/java/dev/cosgy/textToSpeak/TextToSpeak.kt
index d50adbc..16426bf 100644
--- a/src/main/java/dev/cosgy/textToSpeak/TextToSpeak.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/TextToSpeak.kt
@@ -34,7 +34,9 @@ import dev.cosgy.textToSpeak.listeners.CommandAudit
 import dev.cosgy.textToSpeak.listeners.MessageListener
 import dev.cosgy.textToSpeak.settings.SettingsManager
 import dev.cosgy.textToSpeak.utils.OtherUtil
-import net.dv8tion.jda.api.*
+import net.dv8tion.jda.api.JDABuilder
+import net.dv8tion.jda.api.OnlineStatus
+import net.dv8tion.jda.api.Permission
 import net.dv8tion.jda.api.entities.Activity
 import net.dv8tion.jda.api.exceptions.InvalidTokenException
 import net.dv8tion.jda.api.requests.GatewayIntent
@@ -47,10 +49,28 @@ import java.util.*
 import kotlin.system.exitProcess
 
 object TextToSpeak {
-    val RECOMMENDED_PERMS = arrayOf(Permission.VIEW_CHANNEL, Permission.MESSAGE_SEND, Permission.MESSAGE_HISTORY, Permission.MESSAGE_ADD_REACTION,
-            Permission.MESSAGE_EMBED_LINKS, Permission.MESSAGE_ATTACH_FILES, Permission.MESSAGE_MANAGE, Permission.MESSAGE_EXT_EMOJI, Permission.USE_APPLICATION_COMMANDS,
-            Permission.MANAGE_CHANNEL, Permission.VOICE_CONNECT, Permission.VOICE_SPEAK, Permission.NICKNAME_CHANGE)
-    private val INTENTS = arrayOf(GatewayIntent.DIRECT_MESSAGES, GatewayIntent.GUILD_MESSAGES, GatewayIntent.GUILD_MESSAGE_REACTIONS, GatewayIntent.GUILD_VOICE_STATES, GatewayIntent.MESSAGE_CONTENT)
+    val RECOMMENDED_PERMS = arrayOf(
+        Permission.VIEW_CHANNEL,
+        Permission.MESSAGE_SEND,
+        Permission.MESSAGE_HISTORY,
+        Permission.MESSAGE_ADD_REACTION,
+        Permission.MESSAGE_EMBED_LINKS,
+        Permission.MESSAGE_ATTACH_FILES,
+        Permission.MESSAGE_MANAGE,
+        Permission.MESSAGE_EXT_EMOJI,
+        Permission.USE_APPLICATION_COMMANDS,
+        Permission.MANAGE_CHANNEL,
+        Permission.VOICE_CONNECT,
+        Permission.VOICE_SPEAK,
+        Permission.NICKNAME_CHANGE
+    )
+    private val INTENTS = arrayOf(
+        GatewayIntent.DIRECT_MESSAGES,
+        GatewayIntent.GUILD_MESSAGES,
+        GatewayIntent.GUILD_MESSAGE_REACTIONS,
+        GatewayIntent.GUILD_VOICE_STATES,
+        GatewayIntent.MESSAGE_CONTENT
+    )
     var CHECK_UPDATE = true
     var COMMAND_AUDIT_ENABLED = false
 
@@ -61,19 +81,25 @@ object TextToSpeak {
     fun main(args: Array<String>) {
         val log = LoggerFactory.getLogger("Startup")
         try {
-            println("""
+            println(
+                """
                     ${FigletFont.convertOneLine("TextToSpeak Bot v" + OtherUtil.currentVersion)}
                     by Cosgy Dev
-                    """.trimIndent())
+                    """.trimIndent()
+            )
         } catch (ignored: IOException) {
         }
-        val prompt = Prompt("TextToSpeak Bot", "noguiモードに切り替えます。  -Dnogui=trueフラグを含めると、手動でnoguiモードで起動できます。",
-                "true".equals(System.getProperty("nogui", "false"), ignoreCase = true))
+        val prompt = Prompt(
+            "TextToSpeak Bot", "noguiモードに切り替えます。  -Dnogui=trueフラグを含めると、手動でnoguiモードで起動できます。",
+            "true".equals(System.getProperty("nogui", "false"), ignoreCase = true)
+        )
 
         // check deprecated nogui mode (new way of setting it is -Dnogui=true)
         for (arg in args) if ("-nogui".equals(arg, ignoreCase = true)) {
-            prompt.alert(Prompt.Level.WARNING, "GUI", "-noguiフラグは廃止予定です。 "
-                    + "jarの名前の前に-Dnogui = trueフラグを使用してください。 例：java -jar -Dnogui=true JMusicBot.jar")
+            prompt.alert(
+                Prompt.Level.WARNING, "GUI", "-noguiフラグは廃止予定です。 "
+                        + "jarの名前の前に-Dnogui = trueフラグを使用してください。 例：java -jar -Dnogui=true JMusicBot.jar"
+            )
         } else if ("-nocheckupdates".equals(arg, ignoreCase = true)) {
             CHECK_UPDATE = false
             log.info("アップデートチェックを無効にしました")
@@ -82,7 +108,11 @@ object TextToSpeak {
             log.info("実行されたコマンドの記録を有効にしました。")
         }
         val version = OtherUtil.checkVersion(prompt)
-        if (!System.getProperty("java.vm.name").contains("64")) prompt.alert(Prompt.Level.WARNING, "Java Version", "サポートされていないJavaバージョンを使用しています。64ビット版のJavaを使用してください。")
+        if (!System.getProperty("java.vm.name").contains("64")) prompt.alert(
+            Prompt.Level.WARNING,
+            "Java Version",
+            "サポートされていないJavaバージョンを使用しています。64ビット版のJavaを使用してください。"
+        )
         val config = BotConfig(prompt)
         config.load()
         if (!config.isValid) return
@@ -90,19 +120,21 @@ object TextToSpeak {
         val settings = SettingsManager()
         val bot = Bot(waiter, config, settings)
         Bot.INSTANCE = bot
-        val aboutCommand = AboutCommand(Color.BLUE.brighter(),
-                bot.GetLang().getString("appName") + "(v" + version + ")",
-                *RECOMMENDED_PERMS)
+        val aboutCommand = AboutCommand(
+            Color.BLUE.brighter(),
+            bot.GetLang().getString("appName") + "(v" + version + ")",
+            *RECOMMENDED_PERMS
+        )
         aboutCommand.setIsAuthor(false)
         aboutCommand.setReplacementCharacter("🎶")
         val cb = CommandClientBuilder()
-                .setPrefix(config.prefix)
-                .setAlternativePrefix(config.altPrefix)
-                .setOwnerId(config.ownerId.toString()) //.setEmojis(config.getSuccess(), config.getWarning(), config.getError())
-                .setHelpWord("help")
-                .setLinkedCacheSize(200)
-                .setGuildSettingsManager(settings)
-                .setListener(CommandAudit())
+            .setPrefix(config.prefix)
+            .setAlternativePrefix(config.altPrefix)
+            .setOwnerId(config.ownerId.toString()) //.setEmojis(config.getSuccess(), config.getWarning(), config.getError())
+            .setHelpWord("help")
+            .setLinkedCacheSize(200)
+            .setGuildSettingsManager(settings)
+            .setListener(CommandAudit())
         val slashCommandList: ArrayList<SlashCommand?> = object : ArrayList<SlashCommand?>() {
             init {
                 add(aboutCommand)
@@ -129,7 +161,10 @@ object TextToSpeak {
         cb.addCommands(*slashCommandList.toTypedArray())
         var nogame = false
         if (config.status != OnlineStatus.UNKNOWN) cb.setStatus(config.status)
-        if (config.game == null) cb.setActivity(Activity.playing("/helpでヘルプを確認")) else if (config.game!!.name.lowercase(Locale.getDefault()).matches("(none|なし)".toRegex())) {
+        if (config.game == null) cb.setActivity(Activity.playing("/helpでヘルプを確認")) else if (config.game!!.name.lowercase(
+                Locale.getDefault()
+            ).matches("(none|なし)".toRegex())
+        ) {
             cb.setActivity(null)
             nogame = true
         } else cb.setActivity(config.game)
@@ -139,39 +174,51 @@ object TextToSpeak {
                 bot.setGUI(gui)
                 gui.init()
             } catch (e: Exception) {
-                log.error("""
+                log.error(
+                    """
                     GUIを開くことができませんでした。次の要因が考えられます:
                     サーバー上で実行している
                     画面がない環境下で実行している
                     このエラーを非表示にするには、 -Dnogui=true フラグを使用してGUIなしモードで実行してください。
-                    """.trimIndent())
+                    """.trimIndent()
+                )
             }
         }
         log.info(config.configLocation + " から設定を読み込みました")
         try {
             val jda = JDABuilder.create(config.token, listOf(*INTENTS))
-                    .enableCache(CacheFlag.MEMBER_OVERRIDES, CacheFlag.VOICE_STATE)
-                    .disableCache(CacheFlag.ACTIVITY, CacheFlag.CLIENT_STATUS, CacheFlag.EMOJI, CacheFlag.ONLINE_STATUS, CacheFlag.STICKER)
-                    .setActivity(if (nogame) null else Activity.playing("準備中..."))
-                    .setStatus(if (config.status == OnlineStatus.INVISIBLE || config.status == OnlineStatus.OFFLINE) OnlineStatus.INVISIBLE else OnlineStatus.DO_NOT_DISTURB)
-                    .addEventListeners(cb.build(), waiter, Listener(bot), MessageListener(bot))
-                    .setBulkDeleteSplittingEnabled(true)
-                    .build()
+                .enableCache(CacheFlag.MEMBER_OVERRIDES, CacheFlag.VOICE_STATE)
+                .disableCache(
+                    CacheFlag.ACTIVITY,
+                    CacheFlag.CLIENT_STATUS,
+                    CacheFlag.EMOJI,
+                    CacheFlag.ONLINE_STATUS,
+                    CacheFlag.STICKER
+                )
+                .setActivity(if (nogame) null else Activity.playing("準備中..."))
+                .setStatus(if (config.status == OnlineStatus.INVISIBLE || config.status == OnlineStatus.OFFLINE) OnlineStatus.INVISIBLE else OnlineStatus.DO_NOT_DISTURB)
+                .addEventListeners(cb.build(), waiter, Listener(bot), MessageListener(bot))
+                .setBulkDeleteSplittingEnabled(true)
+                .build()
             bot.jda = jda
         } catch (ex: InvalidTokenException) {
-            prompt.alert(Prompt.Level.ERROR, "TextToSpeak Bot",
-                    """
+            prompt.alert(
+                Prompt.Level.ERROR, "TextToSpeak Bot",
+                """
                         Botトークンでのログインに失敗しました。
                         正しいBotトークンが設定されていることを確認してください。(CLIENT SECRET ではありません!)
                         設定ファイルの場所；${config.configLocation}
-                    """.trimIndent())
+                    """.trimIndent()
+            )
             exitProcess(1);
         } catch (ex: IllegalArgumentException) {
-            prompt.alert(Prompt.Level.ERROR, "TextToSpeak Bot",
+            prompt.alert(
+                Prompt.Level.ERROR, "TextToSpeak Bot",
                 """
                     設定の一部が無効です:$ex
                     設定ファイルの場所: ${config.configLocation}
-                """.trimIndent())
+                """.trimIndent()
+            )
             exitProcess(1)
         }
 
diff --git a/src/main/java/dev/cosgy/textToSpeak/audio/AloneInVoiceHandler.kt b/src/main/java/dev/cosgy/textToSpeak/audio/AloneInVoiceHandler.kt
index c9d87cc..201ad2f 100644
--- a/src/main/java/dev/cosgy/textToSpeak/audio/AloneInVoiceHandler.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/audio/AloneInVoiceHandler.kt
@@ -53,14 +53,15 @@ class AloneInVoiceHandler(private val bot: Bot) {
         if (!bot.playerManager.hasHandler(guild)) return
         val alone = isAlone(guild)
         val inList = aloneSince.containsKey(guild.idLong)
-        if (!alone && inList) aloneSince.remove(guild.idLong) else if (alone && !inList) aloneSince[guild.idLong] = Instant.now()
+        if (!alone && inList) aloneSince.remove(guild.idLong) else if (alone && !inList) aloneSince[guild.idLong] =
+            Instant.now()
     }
 
     private fun isAlone(guild: Guild): Boolean {
         return if (guild.audioManager.connectedChannel == null) false else guild.audioManager.connectedChannel!!.members.stream()
-                .noneMatch { x: Member ->
-                    (!x.voiceState!!.isDeafened
-                            && !x.user.isBot)
-                }
+            .noneMatch { x: Member ->
+                (!x.voiceState!!.isDeafened
+                        && !x.user.isBot)
+            }
     }
 }
\ No newline at end of file
diff --git a/src/main/java/dev/cosgy/textToSpeak/commands/admin/GuildSettings.kt b/src/main/java/dev/cosgy/textToSpeak/commands/admin/GuildSettings.kt
index 883e46f..cdf36eb 100644
--- a/src/main/java/dev/cosgy/textToSpeak/commands/admin/GuildSettings.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/commands/admin/GuildSettings.kt
@@ -43,12 +43,16 @@ class GuildSettings(private val bot: Bot) : AdminCommand() {
             text = settings.getTextChannel(event.guild)!!.name
         }
         val builder = EmbedBuilder()
-                .setColor(Color.orange)
-                .setTitle(event.guild!!.name + "の設定")
-                .addField("ユーザー名読み上げ：", settings.isReadName().toString(), false)
-                .addField("参加、退出時の読み上げ：", settings.isJoinAndLeaveRead().toString(), false) //.addField("接頭語：", settings.getPrefix(), false)
-                .addField("読み上げるチャンネル：", text, false)
-                .addField("読み上げの主音量：", settings.volume.toString(), false)
+            .setColor(Color.orange)
+            .setTitle(event.guild!!.name + "の設定")
+            .addField("ユーザー名読み上げ：", settings.isReadName().toString(), false)
+            .addField(
+                "参加、退出時の読み上げ：",
+                settings.isJoinAndLeaveRead().toString(),
+                false
+            ) //.addField("接頭語：", settings.getPrefix(), false)
+            .addField("読み上げるチャンネル：", text, false)
+            .addField("読み上げの主音量：", settings.volume.toString(), false)
         event.replyEmbeds(builder.build()).queue()
     }
 
@@ -59,12 +63,16 @@ class GuildSettings(private val bot: Bot) : AdminCommand() {
             text = settings.getTextChannel(event.guild)!!.name
         }
         val builder = EmbedBuilder()
-                .setColor(Color.orange)
-                .setTitle(event.guild.name + "の設定")
-                .addField("ユーザー名読み上げ：", settings.isReadName().toString(), false)
-                .addField("参加、退出時の読み上げ：", settings.isJoinAndLeaveRead().toString(), false) //.addField("接頭語：", settings.getPrefix(), false)
-                .addField("読み上げるチャンネル：", text, false)
-                .addField("読み上げの主音量：", settings.volume.toString(), false)
+            .setColor(Color.orange)
+            .setTitle(event.guild.name + "の設定")
+            .addField("ユーザー名読み上げ：", settings.isReadName().toString(), false)
+            .addField(
+                "参加、退出時の読み上げ：",
+                settings.isJoinAndLeaveRead().toString(),
+                false
+            ) //.addField("接頭語：", settings.getPrefix(), false)
+            .addField("読み上げるチャンネル：", text, false)
+            .addField("読み上げの主音量：", settings.volume.toString(), false)
         event.reply(builder.build())
     }
 }
\ No newline at end of file
diff --git a/src/main/java/dev/cosgy/textToSpeak/commands/admin/SettcCmd.kt b/src/main/java/dev/cosgy/textToSpeak/commands/admin/SettcCmd.kt
index 89d102d..2e3cf23 100644
--- a/src/main/java/dev/cosgy/textToSpeak/commands/admin/SettcCmd.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/commands/admin/SettcCmd.kt
@@ -52,7 +52,9 @@ class SettcCmd(bot: Bot?) : AdminCommand() {
             event.reply(event.client.success + "読み上げをするチャンネルの設定を無効にしました。")
         } else {
             val list = FinderUtil.findTextChannels(event.args, event.guild)
-            if (list.isEmpty()) event.reply(event.client.warning + "一致するチャンネルが見つかりませんでした \"" + event.args + "\"") else if (list.size > 1) event.reply(event.client.warning + FormatUtil.listOfTChannels(list, event.args)) else {
+            if (list.isEmpty()) event.reply(event.client.warning + "一致するチャンネルが見つかりませんでした \"" + event.args + "\"") else if (list.size > 1) event.reply(
+                event.client.warning + FormatUtil.listOfTChannels(list, event.args)
+            ) else {
                 s.setTextChannel(list[0])
                 log.info("読み上げを行うチャンネルを設定しました。")
                 event.reply(event.client.success + "読み上げるチャンネルを<#" + list[0].id + ">に設定しました。")
diff --git a/src/main/java/dev/cosgy/textToSpeak/commands/dictionary/AddWordCmd.kt b/src/main/java/dev/cosgy/textToSpeak/commands/dictionary/AddWordCmd.kt
index 38920cc..5df4d6c 100644
--- a/src/main/java/dev/cosgy/textToSpeak/commands/dictionary/AddWordCmd.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/commands/dictionary/AddWordCmd.kt
@@ -49,25 +49,25 @@ class AddWordCmd(private val bot: Bot) : SlashCommand() {
             val no = "❌"
             val ok = "✔"
             ButtonMenu.Builder()
-                    .setText("単語が既に存在します。上書きしますか？")
-                    .addChoices(no, ok)
-                    .setEventWaiter(bot.waiter)
-                    .setTimeout(30, TimeUnit.SECONDS)
-                    .setAction { re: Emoji ->
-                        if (re.name == ok) {
-                            dictionary.updateDictionary(guildId, word, reading)
-                            sendSuccessMessage(event)
-                        } else {
+                .setText("単語が既に存在します。上書きしますか？")
+                .addChoices(no, ok)
+                .setEventWaiter(bot.waiter)
+                .setTimeout(30, TimeUnit.SECONDS)
+                .setAction { re: Emoji ->
+                    if (re.name == ok) {
+                        dictionary.updateDictionary(guildId, word, reading)
+                        sendSuccessMessage(event)
+                    } else {
 
-                            event.hook.sendMessage("辞書登録をキャンセルしました。").queue()
-                        }
-                    }.setFinalAction { m: Message ->
-                        try {
-                            m.clearReactions().queue()
-                            m.delete().queue()
-                        } catch (ignore: PermissionException) {
-                        }
-                    }.build().display(event.messageChannel)
+                        event.hook.sendMessage("辞書登録をキャンセルしました。").queue()
+                    }
+                }.setFinalAction { m: Message ->
+                    try {
+                        m.clearReactions().queue()
+                        m.delete().queue()
+                    } catch (ignore: PermissionException) {
+                    }
+                }.build().display(event.messageChannel)
         } else {
             dictionary.updateDictionary(guildId, word, reading)
             sendSuccessMessage(event)
@@ -76,10 +76,10 @@ class AddWordCmd(private val bot: Bot) : SlashCommand() {
 
     private fun sendSuccessMessage(event: SlashCommandEvent) {
         val builder = EmbedBuilder()
-                .setColor(SUCCESS_COLOR)
-                .setTitle("単語を追加しました。")
-                .addField("単語", "```" + event.getOption("word")!!.asString + "```", false)
-                .addField("読み", "```" + event.getOption("reading")!!.asString + "```", false)
+            .setColor(SUCCESS_COLOR)
+            .setTitle("単語を追加しました。")
+            .addField("単語", "```" + event.getOption("word")!!.asString + "```", false)
+            .addField("読み", "```" + event.getOption("reading")!!.asString + "```", false)
         event.hook.sendMessageEmbeds(builder.build()).queue()
     }
 
diff --git a/src/main/java/dev/cosgy/textToSpeak/commands/dictionary/DlWordCmd.kt b/src/main/java/dev/cosgy/textToSpeak/commands/dictionary/DlWordCmd.kt
index 8c21ce6..833d525 100644
--- a/src/main/java/dev/cosgy/textToSpeak/commands/dictionary/DlWordCmd.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/commands/dictionary/DlWordCmd.kt
@@ -52,9 +52,9 @@ class DlWordCmd(private val bot: Bot) : SlashCommand() {
     override fun execute(event: CommandEvent) {
         if (event.args.isEmpty() && event.message.attachments.isEmpty()) {
             val builder = EmbedBuilder()
-                    .setTitle("dlwordコマンド")
-                    .addField("使用方法:", "$name <単語>", false)
-                    .addField("説明:", help, false)
+                .setTitle("dlwordコマンド")
+                .addField("使用方法:", "$name <単語>", false)
+                .addField("説明:", help, false)
             event.reply(builder.build())
             return
         }
diff --git a/src/main/java/dev/cosgy/textToSpeak/commands/dictionary/WordListCmd.kt b/src/main/java/dev/cosgy/textToSpeak/commands/dictionary/WordListCmd.kt
index feb2b93..b25d10b 100644
--- a/src/main/java/dev/cosgy/textToSpeak/commands/dictionary/WordListCmd.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/commands/dictionary/WordListCmd.kt
@@ -36,28 +36,28 @@ class WordListCmd(private val bot: Bot) : SlashCommand() {
         this.category = Category("辞書")
         botPermissions = arrayOf(Permission.MESSAGE_ADD_REACTION, Permission.MESSAGE_EMBED_LINKS)
         builder = Paginator.Builder()
-                .setColumns(1)
-                .setFinalAction { m: Message ->
-                    try {
-                        m.clearReactions().queue()
-                    } catch (ignore: PermissionException) {
-                    }
+            .setColumns(1)
+            .setFinalAction { m: Message ->
+                try {
+                    m.clearReactions().queue()
+                } catch (ignore: PermissionException) {
                 }
-                .setItemsPerPage(10)
-                .waitOnSinglePage(false)
-                .useNumberedItems(true)
-                .showPageNumbers(true)
-                .wrapPageEnds(true)
-                .setEventWaiter(bot.waiter)
-                .setTimeout(1, TimeUnit.MINUTES)
+            }
+            .setItemsPerPage(10)
+            .waitOnSinglePage(false)
+            .useNumberedItems(true)
+            .showPageNumbers(true)
+            .wrapPageEnds(true)
+            .setEventWaiter(bot.waiter)
+            .setTimeout(1, TimeUnit.MINUTES)
     }
 
     override fun execute(event: SlashCommandEvent) {
         event.reply("単語一覧を表示します。").queue { m: InteractionHook ->
             val wordList = bot.dictionary?.getWords(event.guild!!.idLong)
-                    ?.entries?.stream()
-                    ?.map { (key, value): Map.Entry<String?, String?> -> "$key-$value" }
-                    ?.collect(Collectors.toList())
+                ?.entries?.stream()
+                ?.map { (key, value): Map.Entry<String?, String?> -> "$key-$value" }
+                ?.collect(Collectors.toList())
             if (wordList != null) {
                 if (wordList.isEmpty()) {
                     m.editOriginal("単語が登録されていません。").queue()
@@ -66,9 +66,9 @@ class WordListCmd(private val bot: Bot) : SlashCommand() {
             }
             m.deleteOriginal().queue()
             builder.setText("単語一覧")
-                    .setItems(*wordList!!.toTypedArray())
-                    .setUsers(event.user)
-                    .setColor(event.guild!!.selfMember.color)
+                .setItems(*wordList!!.toTypedArray())
+                .setUsers(event.user)
+                .setColor(event.guild!!.selfMember.color)
             builder.build().paginate(event.channel, 1)
         }
     }
@@ -80,9 +80,9 @@ class WordListCmd(private val bot: Bot) : SlashCommand() {
         } catch (ignore: NumberFormatException) {
         }
         val wordList = bot.dictionary?.getWords(event.guild.idLong)
-                ?.entries?.stream()
-                ?.map { (key, value): Map.Entry<String?, String?> -> "$key-$value" }
-                ?.collect(Collectors.toList())
+            ?.entries?.stream()
+            ?.map { (key, value): Map.Entry<String?, String?> -> "$key-$value" }
+            ?.collect(Collectors.toList())
         if (wordList != null) {
             if (wordList.isEmpty()) {
                 event.reply("単語が登録されていません。")
@@ -90,9 +90,9 @@ class WordListCmd(private val bot: Bot) : SlashCommand() {
             }
         }
         builder.setText("単語一覧")
-                .setItems(*wordList!!.toTypedArray())
-                .setUsers(event.author)
-                .setColor(event.selfMember.color)
+            .setItems(*wordList!!.toTypedArray())
+            .setUsers(event.author)
+            .setColor(event.selfMember.color)
         builder.build().paginate(event.channel, pagenum)
     }
 }
\ No newline at end of file
diff --git a/src/main/java/dev/cosgy/textToSpeak/commands/general/AboutCommand.kt b/src/main/java/dev/cosgy/textToSpeak/commands/general/AboutCommand.kt
index 622556c..ce194a3 100644
--- a/src/main/java/dev/cosgy/textToSpeak/commands/general/AboutCommand.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/commands/general/AboutCommand.kt
@@ -35,7 +35,8 @@ import java.util.*
  * @author Kosugi_kun
  */
 @CommandInfo(name = ["About"], description = "ボットに関する情報を表示します")
-class AboutCommand(private val color: Color, private val description: String, vararg perms: Permission) : SlashCommand() {
+class AboutCommand(private val color: Color, private val description: String, vararg perms: Permission) :
+    SlashCommand() {
     private val perms: Array<out Permission>
     private var isAuthor = true
     private var replacementIcon = "+"
@@ -63,14 +64,19 @@ class AboutCommand(private val color: Color, private val description: String, va
         builder.setColor(if (event.isFromType(ChannelType.TEXT)) event.guild!!.selfMember.color else color)
         builder.setAuthor(event.jda.selfUser.name + "について!", null, event.jda.selfUser.avatarUrl)
         val cosgyOwner = "Cosgy Devが運営、開発をしています。"
-        val author = if (event.jda.getUserById(event.client.ownerId) == null) "<@" + event.client.ownerId + ">" else Objects.requireNonNull(event.jda.getUserById(event.client.ownerId))?.name
+        val author =
+            if (event.jda.getUserById(event.client.ownerId) == null) "<@" + event.client.ownerId + ">" else Objects.requireNonNull(
+                event.jda.getUserById(event.client.ownerId)
+            )?.name
         val descr = StringBuilder().append("こんにちは！ **").append(event.jda.selfUser.name).append("**です。 ")
-                .append(description).append("は、").append(JDAUtilitiesInfo.AUTHOR + "の[コマンド拡張](" + JDAUtilitiesInfo.GITHUB + ") (")
-                .append(JDAUtilitiesInfo.VERSION).append(")と[JDAライブラリ](https://github.com/DV8FromTheWorld/JDA) (")
-                .append(JDAInfo.VERSION).append(")を使用しており、").append(if (isAuthor) cosgyOwner else author + "が所有しています。")
-                .append(event.jda.selfUser.name).append("についての質問などは[Cosgy Dev公式チャンネル](https://discord.gg/RBpkHxf)へお願いします。")
-                .append("\nこのボットの使用方法は`").append(event.client.textualPrefix).append(event.client.helpWord)
-                .append("`で確認することができます。")
+            .append(description).append("は、")
+            .append(JDAUtilitiesInfo.AUTHOR + "の[コマンド拡張](" + JDAUtilitiesInfo.GITHUB + ") (")
+            .append(JDAUtilitiesInfo.VERSION).append(")と[JDAライブラリ](https://github.com/DV8FromTheWorld/JDA) (")
+            .append(JDAInfo.VERSION).append(")を使用しており、").append(if (isAuthor) cosgyOwner else author + "が所有しています。")
+            .append(event.jda.selfUser.name)
+            .append("についての質問などは[Cosgy Dev公式チャンネル](https://discord.gg/RBpkHxf)へお願いします。")
+            .append("\nこのボットの使用方法は`").append(event.client.textualPrefix).append(event.client.helpWord)
+            .append("`で確認することができます。")
         getMessage(builder, descr, event.jda, event.client)
         event.replyEmbeds(builder.build()).queue()
     }
@@ -78,19 +84,30 @@ class AboutCommand(private val color: Color, private val description: String, va
     private fun getMessage(builder: EmbedBuilder, descr: StringBuilder, jda: JDA, client: CommandClient) {
         builder.setDescription(descr)
         if (jda.shardInfo.shardTotal == 1) {
-            builder.addField("ステータス", """${jda.guilds.size} サーバー
-                1 シャード""", true)
+            builder.addField(
+                "ステータス", """${jda.guilds.size} サーバー
+                1 シャード""", true
+            )
             builder.addField("ユーザー", """${jda.users.size} ユニーク
-                ${jda.guilds.stream().mapToInt { g: Guild -> g.members.size }.sum()} 合計""", true)
-            builder.addField("チャンネル", """${jda.textChannels.size} テキスト
-                ${jda.voiceChannels.size} ボイス""", true)
+                ${jda.guilds.stream().mapToInt { g: Guild -> g.members.size }.sum()} 合計""", true
+            )
+            builder.addField(
+                "チャンネル", """${jda.textChannels.size} テキスト
+                ${jda.voiceChannels.size} ボイス""", true
+            )
         } else {
-            builder.addField("ステータス", """${client.totalGuilds} サーバー
-                シャード ${jda.shardInfo.shardId + 1}/${jda.shardInfo.shardTotal}""", true)
-            builder.addField("", """${jda.users.size} ユーザーのシャード
-                ${jda.guilds.size} サーバー""", true)
-            builder.addField("", """${jda.textChannels.size} テキストチャンネル
-                ${jda.voiceChannels.size} ボイスチャンネル""", true)
+            builder.addField(
+                "ステータス", """${client.totalGuilds} サーバー
+                シャード ${jda.shardInfo.shardId + 1}/${jda.shardInfo.shardTotal}""", true
+            )
+            builder.addField(
+                "", """${jda.users.size} ユーザーのシャード
+                ${jda.guilds.size} サーバー""", true
+            )
+            builder.addField(
+                "", """${jda.textChannels.size} テキストチャンネル
+                ${jda.voiceChannels.size} ボイスチャンネル""", true
+            )
         }
         builder.setFooter("再起動が行われた時間")
         builder.setTimestamp(client.startTime)
@@ -102,19 +119,23 @@ class AboutCommand(private val color: Color, private val description: String, va
         builder.setColor(if (event.isFromType(ChannelType.TEXT)) event.guild.selfMember.color else color)
         builder.setAuthor(event.selfUser.name + "について!", null, event.selfUser.avatarUrl)
         val cosgyOwner = "Cosgy Devが運営、開発をしています。"
-        val author = if (event.jda.getUserById(event.client.ownerId) == null) "<@" + event.client.ownerId + ">" else Objects.requireNonNull(event.jda.getUserById(event.client.ownerId))?.name
+        val author =
+            if (event.jda.getUserById(event.client.ownerId) == null) "<@" + event.client.ownerId + ">" else Objects.requireNonNull(
+                event.jda.getUserById(event.client.ownerId)
+            )?.name
         val descr = StringBuilder().append("こんにちは！ **").append(event.selfUser.name).append("**です。 ")
-                .append(description).append("は、").append(JDAUtilitiesInfo.AUTHOR + "の[コマンド拡張](" + JDAUtilitiesInfo.GITHUB + ") (")
-                .append(JDAUtilitiesInfo.VERSION).append(")と[JDAライブラリ](https://github.com/DV8FromTheWorld/JDA) (")
-                .append(JDAInfo.VERSION).append(")を使用しており、").append(if (isAuthor) cosgyOwner else author + "が所有しています。")
-                .append(event.selfUser.name).append("についての質問などは[Cosgy Dev公式チャンネル](https://discord.gg/RBpkHxf)へお願いします。")
-                .append("\nこのボットの使用方法は`").append(event.client.textualPrefix).append(event.client.helpWord)
-                .append("`で確認することができます。")
+            .append(description).append("は、")
+            .append(JDAUtilitiesInfo.AUTHOR + "の[コマンド拡張](" + JDAUtilitiesInfo.GITHUB + ") (")
+            .append(JDAUtilitiesInfo.VERSION).append(")と[JDAライブラリ](https://github.com/DV8FromTheWorld/JDA) (")
+            .append(JDAInfo.VERSION).append(")を使用しており、").append(if (isAuthor) cosgyOwner else author + "が所有しています。")
+            .append(event.selfUser.name).append("についての質問などは[Cosgy Dev公式チャンネル](https://discord.gg/RBpkHxf)へお願いします。")
+            .append("\nこのボットの使用方法は`").append(event.client.textualPrefix).append(event.client.helpWord)
+            .append("`で確認することができます。")
         getMessage(builder, descr, event.jda, event.client)
         event.reply(builder.build())
     }
 
-    private fun getOauthLink(jda: JDA){
+    private fun getOauthLink(jda: JDA) {
         if (oauthLink == null) {
             oauthLink = try {
                 val info = jda.retrieveApplicationInfo().complete()
diff --git a/src/main/java/dev/cosgy/textToSpeak/commands/general/HelpCmd.kt b/src/main/java/dev/cosgy/textToSpeak/commands/general/HelpCmd.kt
index 0ab041d..ead986d 100644
--- a/src/main/java/dev/cosgy/textToSpeak/commands/general/HelpCmd.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/commands/general/HelpCmd.kt
@@ -45,24 +45,28 @@ class HelpCmd(var bot: Bot) : SlashCommand() {
                     builder.append("\n\n  __").append(if (category == null) "カテゴリなし" else category.name).append("__:\n")
                 }
                 builder.append("\n`").append("/").append(command.name)
-                        .append(if (command.arguments == null) "`" else " " + command.arguments + "`")
-                        .append(" - ").append(command.help)
+                    .append(if (command.arguments == null) "`" else " " + command.arguments + "`")
+                    .append(" - ").append(command.help)
             }
         }
-        if (event.client.serverInvite != null) builder.append("\n\nさらにヘルプが必要な場合は、公式サーバーに参加することもできます: ").append(event.client.serverInvite)
+        if (event.client.serverInvite != null) builder.append("\n\nさらにヘルプが必要な場合は、公式サーバーに参加することもできます: ")
+            .append(event.client.serverInvite)
         eBuilder.setDescription(builder)
         if (bot.config.helpToDm) {
-            event.user.openPrivateChannel().flatMap { channel: PrivateChannel -> channel.sendMessageEmbeds(eBuilder.build()) }.queue()
+            event.user.openPrivateChannel()
+                .flatMap { channel: PrivateChannel -> channel.sendMessageEmbeds(eBuilder.build()) }.queue()
         } else {
             event.replyEmbeds(eBuilder.build()).queue()
         }
     }
 
     public override fun execute(event: CommandEvent) {
-        val builder = StringBuilder("""
+        val builder = StringBuilder(
+            """
             **${event.jda.selfUser.name}** コマンド一覧:
     
-            """.trimIndent())
+            """.trimIndent()
+        )
         var category: Category? = null
         val commands = event.client.commands
         for (command in commands) {
@@ -71,14 +75,22 @@ class HelpCmd(var bot: Bot) : SlashCommand() {
                     category = command.category
                     builder.append("\n\n  __").append(if (category == null) "カテゴリなし" else category.name).append("__:\n")
                 }
-                builder.append("\n`").append(event.client.textualPrefix).append(if (event.client.prefix == null) " " else "").append(command.name)
-                        .append(if (command.arguments == null) "`" else " " + command.arguments + "`")
-                        .append(" - ").append(command.help)
+                builder.append("\n`").append(event.client.textualPrefix)
+                    .append(if (event.client.prefix == null) " " else "").append(command.name)
+                    .append(if (command.arguments == null) "`" else " " + command.arguments + "`")
+                    .append(" - ").append(command.help)
             }
         }
-        if (event.client.serverInvite != null) builder.append("\n\nさらにヘルプが必要な場合は、公式サーバーに参加することもできます: ").append(event.client.serverInvite)
+        if (event.client.serverInvite != null) builder.append("\n\nさらにヘルプが必要な場合は、公式サーバーに参加することもできます: ")
+            .append(event.client.serverInvite)
         if (bot.config.helpToDm) {
-            event.replyInDm(builder.toString(), { _: Message? -> if (event.isFromType(ChannelType.TEXT)) event.reactSuccess() }) { _: Throwable? -> event.replyWarning("ダイレクトメッセージをブロックしているため、ヘルプを送信できません。") }
+            event.replyInDm(
+                builder.toString(),
+                { _: Message? -> if (event.isFromType(ChannelType.TEXT)) event.reactSuccess() }) { _: Throwable? ->
+                event.replyWarning(
+                    "ダイレクトメッセージをブロックしているため、ヘルプを送信できません。"
+                )
+            }
         } else {
             event.reply(builder.toString())
         }
diff --git a/src/main/java/dev/cosgy/textToSpeak/commands/general/JoinCmd.kt b/src/main/java/dev/cosgy/textToSpeak/commands/general/JoinCmd.kt
index 0122539..8093646 100644
--- a/src/main/java/dev/cosgy/textToSpeak/commands/general/JoinCmd.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/commands/general/JoinCmd.kt
@@ -60,8 +60,12 @@ class JoinCmd(private var bot: Bot) : SlashCommand() {
             ReadChannel.setChannel(event.guild!!.idLong, event.textChannel.idLong)
         } catch (ex: PermissionException) {
             builder.appendDescription(event.client.error + String.format("**%s**に接続できません!", userState.channel!!.name))
-            builder.addField("ボイスチャンネル", event.client.error + String.format("**%s**に接続できません!",
-                    userState.channel!!.name), false)
+            builder.addField(
+                "ボイスチャンネル", event.client.error + String.format(
+                    "**%s**に接続できません!",
+                    userState.channel!!.name
+                ), false
+            )
             event.hook.sendMessageEmbeds(builder.build()).queue()
         }
     }
diff --git a/src/main/java/dev/cosgy/textToSpeak/commands/general/SetIntonationCmd.kt b/src/main/java/dev/cosgy/textToSpeak/commands/general/SetIntonationCmd.kt
index ec3f9e2..844460d 100644
--- a/src/main/java/dev/cosgy/textToSpeak/commands/general/SetIntonationCmd.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/commands/general/SetIntonationCmd.kt
@@ -49,9 +49,9 @@ class SetIntonationCmd(private val bot: Bot) : SlashCommand() {
     override fun execute(event: CommandEvent) {
         if (event.args.isEmpty()) {
             val builder = EmbedBuilder()
-                    .setTitle("setintoコマンド")
-                    .addField("使用方法:", "$name <数値(0.0~)>", false)
-                    .addField("説明:", "F0系列内変動の重みを変更します。F0系列内変動の重みは、0.0以上の数値で設定して下さい。", false)
+                .setTitle("setintoコマンド")
+                .addField("使用方法:", "$name <数値(0.0~)>", false)
+                .addField("説明:", "F0系列内変動の重みを変更します。F0系列内変動の重みは、0.0以上の数値で設定して下さい。", false)
             event.reply(builder.build())
             return
         }
diff --git a/src/main/java/dev/cosgy/textToSpeak/commands/general/SetSpeedCmd.kt b/src/main/java/dev/cosgy/textToSpeak/commands/general/SetSpeedCmd.kt
index 42e2ef1..47599bc 100644
--- a/src/main/java/dev/cosgy/textToSpeak/commands/general/SetSpeedCmd.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/commands/general/SetSpeedCmd.kt
@@ -55,7 +55,7 @@ class SetSpeedCmd(private val bot: Bot) : SlashCommand() {
     override fun execute(event: CommandEvent) {
         val args = event.args
 
-        if(args == null){
+        if (args == null) {
             help(event)
             return
         }
@@ -79,9 +79,9 @@ class SetSpeedCmd(private val bot: Bot) : SlashCommand() {
 
     fun help(event: CommandEvent?) {
         val builder = EmbedBuilder()
-                .setTitle("setspeedコマンド")
-                .addField("使用方法:", "$name <数値(0.0~)>", false)
-                .addField("説明:", "読み上げの速度を設定します。読み上げ速度は、0.0以上の数値で設定して下さい。", false)
+            .setTitle("setspeedコマンド")
+            .addField("使用方法:", "$name <数値(0.0~)>", false)
+            .addField("説明:", "読み上げの速度を設定します。読み上げ速度は、0.0以上の数値で設定して下さい。", false)
         event?.reply(builder.build())
     }
 }
diff --git a/src/main/java/dev/cosgy/textToSpeak/commands/general/SetVoiceCmd.kt b/src/main/java/dev/cosgy/textToSpeak/commands/general/SetVoiceCmd.kt
index 9566752..482e486 100644
--- a/src/main/java/dev/cosgy/textToSpeak/commands/general/SetVoiceCmd.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/commands/general/SetVoiceCmd.kt
@@ -24,7 +24,6 @@ import net.dv8tion.jda.api.events.interaction.command.CommandAutoCompleteInterac
 import net.dv8tion.jda.api.interactions.commands.Command
 import net.dv8tion.jda.api.interactions.commands.OptionType
 import net.dv8tion.jda.api.interactions.commands.build.OptionData
-import java.util.*
 import java.util.stream.Collectors
 import java.util.stream.Stream
 
@@ -45,9 +44,9 @@ class SetVoiceCmd(private var bot: Bot) : SlashCommand() {
     override fun execute(event: SlashCommandEvent) {
         if (event.getOption("name") == null) {
             val builder = EmbedBuilder()
-                    .setTitle("setvoiceコマンド")
-                    .addField("声データ一覧：", voices.contentToString(), false)
-                    .addField("使用方法：", "$name <声データの名前>", false)
+                .setTitle("setvoiceコマンド")
+                .addField("声データ一覧：", voices.contentToString(), false)
+                .addField("使用方法：", "$name <声データの名前>", false)
             event.replyEmbeds(builder.build()).queue()
             return
         }
@@ -65,9 +64,9 @@ class SetVoiceCmd(private var bot: Bot) : SlashCommand() {
         val voices = bot.voiceCreation.voices
         if (event.args.isEmpty() && event.message.attachments.isEmpty()) {
             val builder = EmbedBuilder()
-                    .setTitle("setvoiceコマンド")
-                    .addField("声データ一覧：", voices.toString(), false)
-                    .addField("使用方法：", "$name <声データの名前>", false)
+                .setTitle("setvoiceコマンド")
+                .addField("声データ一覧：", voices.toString(), false)
+                .addField("使用方法：", "$name <声データの名前>", false)
             event.reply(builder.build())
             return
         }
@@ -84,9 +83,9 @@ class SetVoiceCmd(private var bot: Bot) : SlashCommand() {
     override fun onAutoComplete(event: CommandAutoCompleteInteractionEvent) {
         if (event.name == "setvoice" && event.focusedOption.name == "name") {
             val options = Stream.of(*voices)
-                    .filter { word: String? -> word!!.startsWith(event.focusedOption.value) } // only display words that start with the user's current input
-                    .map { word: String? -> Command.Choice(word!!, word) } // map the words to choices
-                    .collect(Collectors.toList())
+                .filter { word: String? -> word!!.startsWith(event.focusedOption.value) } // only display words that start with the user's current input
+                .map { word: String? -> Command.Choice(word!!, word) } // map the words to choices
+                .collect(Collectors.toList())
             event.replyChoices(options).queue()
         }
         super.onAutoComplete(event)
diff --git a/src/main/java/dev/cosgy/textToSpeak/commands/general/SetVoiceQualityFm.kt b/src/main/java/dev/cosgy/textToSpeak/commands/general/SetVoiceQualityFm.kt
index ea56495..ec762b4 100644
--- a/src/main/java/dev/cosgy/textToSpeak/commands/general/SetVoiceQualityFm.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/commands/general/SetVoiceQualityFm.kt
@@ -66,9 +66,9 @@ class SetVoiceQualityFm(private var bot: Bot) : SlashCommand() {
     override fun execute(event: CommandEvent) {
         if (event.args.isEmpty() && event.message.attachments.isEmpty()) {
             val builder = EmbedBuilder()
-                    .setTitle("setqfmコマンド")
-                    .addField("使用方法:", "$name <数値(0.0~)>", false)
-                    .addField("説明:", "追加ハーフトーンの設定を変更します。", false)
+                .setTitle("setqfmコマンド")
+                .addField("使用方法:", "$name <数値(0.0~)>", false)
+                .addField("説明:", "追加ハーフトーンの設定を変更します。", false)
             event.reply(builder.build())
             return
         }
diff --git a/src/main/java/dev/cosgy/textToSpeak/commands/general/SettingsCmd.kt b/src/main/java/dev/cosgy/textToSpeak/commands/general/SettingsCmd.kt
index 536b9df..0835153 100644
--- a/src/main/java/dev/cosgy/textToSpeak/commands/general/SettingsCmd.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/commands/general/SettingsCmd.kt
@@ -33,26 +33,26 @@ class SettingsCmd(private var bot: Bot) : SlashCommand() {
     override fun execute(event: SlashCommandEvent) {
         val settings = bot.userSettingsManager.getSettings(event.user.idLong)
         val builder = EmbedBuilder()
-                .setColor(Color.orange)
-                .setTitle(event.user.name + "の設定")
-                .addField("声：", settings.voiceSetting, false)
-                .addField("読み上げ速度：", settings.speedSetting.toString(), false)
-                .addField("F0系列内変動の重み：", settings.intonationSetting.toString(), false)
-                .addField("オールパス値：", settings.voiceQualityASetting.toString(), false)
-                .addField("追加ハーフトーン：", settings.voiceQualityFmSetting.toString(), false)
+            .setColor(Color.orange)
+            .setTitle(event.user.name + "の設定")
+            .addField("声：", settings.voiceSetting, false)
+            .addField("読み上げ速度：", settings.speedSetting.toString(), false)
+            .addField("F0系列内変動の重み：", settings.intonationSetting.toString(), false)
+            .addField("オールパス値：", settings.voiceQualityASetting.toString(), false)
+            .addField("追加ハーフトーン：", settings.voiceQualityFmSetting.toString(), false)
         event.replyEmbeds(builder.build()).queue()
     }
 
     override fun execute(event: CommandEvent) {
         val settings = bot.userSettingsManager.getSettings(event.author.idLong)
         val builder = EmbedBuilder()
-                .setColor(Color.orange)
-                .setTitle(event.author.name + "の設定")
-                .addField("声：", settings.voiceSetting, false)
-                .addField("速度：", settings.speedSetting.toString(), false)
-                .addField("抑揚：", settings.intonationSetting.toString(), false)
-                .addField("声質a：", settings.voiceQualityASetting.toString(), false)
-                .addField("声質fm：", settings.voiceQualityFmSetting.toString(), false)
+            .setColor(Color.orange)
+            .setTitle(event.author.name + "の設定")
+            .addField("声：", settings.voiceSetting, false)
+            .addField("速度：", settings.speedSetting.toString(), false)
+            .addField("抑揚：", settings.intonationSetting.toString(), false)
+            .addField("声質a：", settings.voiceQualityASetting.toString(), false)
+            .addField("声質fm：", settings.voiceQualityFmSetting.toString(), false)
         event.reply(builder.build())
     }
 }
\ No newline at end of file
diff --git a/src/main/java/dev/cosgy/textToSpeak/entities/Prompt.kt b/src/main/java/dev/cosgy/textToSpeak/entities/Prompt.kt
index ff7c6a8..66c7478 100644
--- a/src/main/java/dev/cosgy/textToSpeak/entities/Prompt.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/entities/Prompt.kt
@@ -19,7 +19,14 @@ import org.slf4j.LoggerFactory
 import java.util.*
 import javax.swing.JOptionPane
 
-class Prompt @JvmOverloads constructor(private val title: String, noguiMessage: String? = null, var isNoGUI: Boolean = "true".equals(System.getProperty("nogui"), ignoreCase = true)) {
+class Prompt @JvmOverloads constructor(
+    private val title: String,
+    noguiMessage: String? = null,
+    var isNoGUI: Boolean = "true".equals(
+        System.getProperty("nogui"),
+        ignoreCase = true
+    )
+) {
     private val noguiMessage: String
     private var scanner: Scanner? = null
 
diff --git a/src/main/java/dev/cosgy/textToSpeak/listeners/CommandAudit.kt b/src/main/java/dev/cosgy/textToSpeak/listeners/CommandAudit.kt
index 2285871..ee1b5a9 100644
--- a/src/main/java/dev/cosgy/textToSpeak/listeners/CommandAudit.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/listeners/CommandAudit.kt
@@ -26,12 +26,17 @@ class CommandAudit : CommandListener {
     override fun onCommand(event: CommandEvent, command: Command) {
         if (TextToSpeak.COMMAND_AUDIT_ENABLED) {
             val logger = LoggerFactory.getLogger("CommandAudit")
-            val textFormat = if (event.isFromType(ChannelType.PRIVATE)) "%s%s で %s#%s (%s) がコマンド %s を実行しました" else "%s の #%s で %s#%s (%s) がコマンド %s を実行しました"
-            logger.info(String.format(textFormat,
+            val textFormat =
+                if (event.isFromType(ChannelType.PRIVATE)) "%s%s で %s#%s (%s) がコマンド %s を実行しました" else "%s の #%s で %s#%s (%s) がコマンド %s を実行しました"
+            logger.info(
+                String.format(
+                    textFormat,
                     if (event.isFromType(ChannelType.PRIVATE)) "DM" else event.guild.name,
                     if (event.isFromType(ChannelType.PRIVATE)) "" else event.textChannel.name,
                     event.author.name, event.author.discriminator, event.author.id,
-                    event.message.contentDisplay))
+                    event.message.contentDisplay
+                )
+            )
         }
     }
 }
\ No newline at end of file
diff --git a/src/main/java/dev/cosgy/textToSpeak/settings/Settings.kt b/src/main/java/dev/cosgy/textToSpeak/settings/Settings.kt
index dc06cad..65d6b12 100644
--- a/src/main/java/dev/cosgy/textToSpeak/settings/Settings.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/settings/Settings.kt
@@ -27,7 +27,14 @@ class Settings : GuildSettingsProvider {
     private var readName: Boolean
     private var joinAndLeaveRead: Boolean
 
-    constructor(manager: SettingsManager, textId: String?, prefix: String?, volume: Int, readName: Boolean, joinAndLeaveRead: Boolean) {
+    constructor(
+        manager: SettingsManager,
+        textId: String?,
+        prefix: String?,
+        volume: Int,
+        readName: Boolean,
+        joinAndLeaveRead: Boolean
+    ) {
         this.manager = manager
         try {
             this.textId = textId!!.toLong()
@@ -40,7 +47,14 @@ class Settings : GuildSettingsProvider {
         this.joinAndLeaveRead = joinAndLeaveRead
     }
 
-    constructor(manager: SettingsManager, textId: Long, prefix: String?, volume: Int, readName: Boolean, joinAndLeaveRead: Boolean) {
+    constructor(
+        manager: SettingsManager,
+        textId: Long,
+        prefix: String?,
+        volume: Int,
+        readName: Boolean,
+        joinAndLeaveRead: Boolean
+    ) {
         this.manager = manager
         this.textId = textId
         this.prefix = prefix
diff --git a/src/main/java/dev/cosgy/textToSpeak/settings/SettingsManager.kt b/src/main/java/dev/cosgy/textToSpeak/settings/SettingsManager.kt
index 64d60ab..b820552 100644
--- a/src/main/java/dev/cosgy/textToSpeak/settings/SettingsManager.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/settings/SettingsManager.kt
@@ -33,12 +33,13 @@ class SettingsManager : GuildSettingsManager<Any?> {
             val loadedSettings = JSONObject(Files.readAllBytes(OtherUtil.getPath("serversettings.json")))
             loadedSettings.keySet().forEach(Consumer { id: String ->
                 val o = loadedSettings.getJSONObject(id)
-                settings[id.toLong()] = Settings(this,
-                        if (o.has("text_channel_id")) o.getString("text_channel_id") else null,
-                        if (o.has("prefix")) o.getString("prefix") else null,
-                        if (o.has("volume")) o.getInt("volume") else 50,
-                        o.has("read_name") && o.getBoolean("read_name"),
-                        o.has("join_and_leave_read") && o.getBoolean("join_and_leave_read")
+                settings[id.toLong()] = Settings(
+                    this,
+                    if (o.has("text_channel_id")) o.getString("text_channel_id") else null,
+                    if (o.has("prefix")) o.getString("prefix") else null,
+                    if (o.has("volume")) o.getInt("volume") else 50,
+                    o.has("read_name") && o.getBoolean("read_name"),
+                    o.has("join_and_leave_read") && o.getBoolean("join_and_leave_read")
                 )
             })
         } catch (e: IOException) {
diff --git a/src/main/java/dev/cosgy/textToSpeak/settings/UserSettingsManager.kt b/src/main/java/dev/cosgy/textToSpeak/settings/UserSettingsManager.kt
index 1d7526f..16d6e00 100644
--- a/src/main/java/dev/cosgy/textToSpeak/settings/UserSettingsManager.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/settings/UserSettingsManager.kt
@@ -43,11 +43,20 @@ class UserSettingsManager {
         try {
             connection = DriverManager.getConnection("jdbc:sqlite:UserData.sqlite")
             val statement = connection!!.createStatement()
-            val sql = "create table if not exists settings ( id integer not null constraint settings_pk primary key, voice TEXT, speed real, intonation real, voiceQualityA  real, voiceQualityFm real)"
+            val sql =
+                "create table if not exists settings ( id integer not null constraint settings_pk primary key, voice TEXT, speed real, intonation real, voiceQualityA  real, voiceQualityFm real)"
             statement.execute(sql)
             val rs = statement.executeQuery("select * from settings")
             while (rs.next()) {
-                settings[rs.getLong(1)] = UserSettings(this, rs.getLong(1), rs.getString(2), rs.getFloat(3), rs.getFloat(4), rs.getFloat(5), rs.getFloat(6))
+                settings[rs.getLong(1)] = UserSettings(
+                    this,
+                    rs.getLong(1),
+                    rs.getString(2),
+                    rs.getFloat(3),
+                    rs.getFloat(4),
+                    rs.getFloat(5),
+                    rs.getFloat(6)
+                )
             }
         } catch (throwables: SQLException) {
             logger.error("データベースに接続できませんでした。", throwables)
@@ -63,7 +72,8 @@ class UserSettingsManager {
     }
 
     fun saveSetting(userId: Long) {
-        val sql = "REPLACE INTO settings (id, voice, speed, intonation, voiceQualityA, voiceQualityFm) VALUES (?,?,?,?,?,?)"
+        val sql =
+            "REPLACE INTO settings (id, voice, speed, intonation, voiceQualityA, voiceQualityFm) VALUES (?,?,?,?,?,?)"
         val settings = settings[userId]
         try {
             connection!!.prepareStatement(sql).use { ps ->
diff --git a/src/main/java/dev/cosgy/textToSpeak/utils/OtherUtil.kt b/src/main/java/dev/cosgy/textToSpeak/utils/OtherUtil.kt
index 31db718..bb06fad 100644
--- a/src/main/java/dev/cosgy/textToSpeak/utils/OtherUtil.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/utils/OtherUtil.kt
@@ -46,7 +46,8 @@ object OtherUtil {
         if (path.lowercase(Locale.getDefault()).startsWith(WINDOWS_INVALID_PATH)) {
             val filename = path.substring(WINDOWS_INVALID_PATH.length)
             try {
-                path = File(TextToSpeak::class.java.protectionDomain.codeSource.location.toURI()).parentFile.path + File.separator + filename
+                path =
+                    File(TextToSpeak::class.java.protectionDomain.codeSource.location.toURI()).parentFile.path + File.separator + filename
             } catch (ignored: URISyntaxException) {
             }
         }
@@ -91,7 +92,10 @@ object OtherUtil {
         try {
             val u = URL(url)
             val urlConnection = u.openConnection()
-            urlConnection.setRequestProperty("user-agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.87 Safari/537.36")
+            urlConnection.setRequestProperty(
+                "user-agent",
+                "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.87 Safari/537.36"
+            )
             return urlConnection.getInputStream()
         } catch (ignore: IOException) {
         } catch (ignore: IllegalArgumentException) {
@@ -106,10 +110,14 @@ object OtherUtil {
      * @return the parsed activity
      */
     fun parseGame(game: String?): Activity? {
-        if (game == null || game.trim { it <= ' ' }.isEmpty() || game.trim { it <= ' ' }.equals("default", ignoreCase = true)) return null
+        if (game == null || game.trim { it <= ' ' }.isEmpty() || game.trim { it <= ' ' }
+                .equals("default", ignoreCase = true)) return null
         val lower = game.lowercase(Locale.getDefault())
         if (lower.startsWith("playing")) return Activity.playing(makeNonEmpty(game.substring(7).trim { it <= ' ' }))
-        if (lower.startsWith("listening to")) return Activity.listening(makeNonEmpty(game.substring(12).trim { it <= ' ' }))
+        if (lower.startsWith("listening to")) return Activity.listening(
+            makeNonEmpty(
+                game.substring(12).trim { it <= ' ' })
+        )
         if (lower.startsWith("listening")) return Activity.listening(makeNonEmpty(game.substring(9).trim { it <= ' ' }))
         if (lower.startsWith("watching")) return Activity.watching(makeNonEmpty(game.substring(8).trim { it <= ' ' }))
         if (lower.startsWith("streaming")) {
@@ -153,8 +161,8 @@ object OtherUtil {
                 val client = OkHttpClient()
 
                 val request = Request.Builder()
-                        .url("https://api.github.com/repos/Cosgy-Dev/TextToSpeakBot/releases/latest")
-                        .build()
+                    .url("https://api.github.com/repos/Cosgy-Dev/TextToSpeakBot/releases/latest")
+                    .build()
 
                 val response = client.newCall(request).execute()
                 val body = response.body?.string()

From 8f69645cc2bf2a2f4b25055e7d71b51ac18d672f Mon Sep 17 00:00:00 2001
From: kosugikun <>
Date: Sat, 10 Jun 2023 08:26:29 +0900
Subject: [PATCH 17/39] =?UTF-8?q?JDK=E3=83=90=E3=83=BC=E3=82=B8=E3=83=A7?=
 =?UTF-8?q?=E3=83=B3=E3=82=92=E6=9C=80=E6=96=B0=E3=81=AE=E3=82=82=E3=81=AE?=
 =?UTF-8?q?=E3=81=AB=E5=A4=89=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/ISSUE_TEMPLATE/---.md                 |  4 +++-
 .github/ISSUE_TEMPLATE/bug-report.md          |  4 +++-
 .github/ISSUE_TEMPLATE/feature_request.md     |  4 +++-
 pom.xml                                       | 24 +++++++++++++++----
 src/main/java/dev/cosgy/textToSpeak/Bot.kt    |  3 ++-
 .../java/dev/cosgy/textToSpeak/BotConfig.kt   |  7 +++---
 .../java/dev/cosgy/textToSpeak/Listener.kt    |  4 ++--
 .../java/dev/cosgy/textToSpeak/TextToSpeak.kt |  4 ++--
 .../cosgy/textToSpeak/audio/PlayerManager.kt  |  2 +-
 .../commands/dictionary/AddWordCmd.kt         |  6 ++---
 .../java/dev/cosgy/textToSpeak/gui/GUI.kt     |  8 +++----
 .../dev/cosgy/textToSpeak/utils/OtherUtil.kt  |  2 +-
 12 files changed, 48 insertions(+), 24 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/---.md b/.github/ISSUE_TEMPLATE/---.md
index cabf517..c4691cc 100644
--- a/.github/ISSUE_TEMPLATE/---.md
+++ b/.github/ISSUE_TEMPLATE/---.md
@@ -1,5 +1,7 @@
 ---
-name: その他 about: その他のIssueを立てたい場合はこちら title: ''
+name: その他 
+about: その他のIssueを立てたい場合はこちら 
+title: ''
 labels: ''
 assignees: ''
 
diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md
index 84cca76..d67b1f4 100644
--- a/.github/ISSUE_TEMPLATE/bug-report.md
+++ b/.github/ISSUE_TEMPLATE/bug-report.md
@@ -1,5 +1,7 @@
 ---
-name: バグレポート about: バグや予期しない動作を報告する title: "[バグレポート] タイトルを入力"
+name: バグレポート 
+about: バグや予期しない動作を報告する 
+title: "[バグレポート] タイトルを入力"
 labels: ''
 assignees: ''
 
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index ed44b4e..b9149dd 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -1,5 +1,7 @@
 ---
-name: 機能リクエスト about: このプロジェクトにアイデアを提案 title: "[機能要求]タイトルを入力"
+name: 機能リクエスト 
+about: このプロジェクトにアイデアを提案 
+title: "[機能要求]タイトルを入力"
 labels: ''
 assignees: ''
 
diff --git a/pom.xml b/pom.xml
index a54f4ed..440eb27 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
 
     <groupId>dev.cosgy</groupId>
     <artifactId>TextToSpeak</artifactId>
-    <version>0.4.0-beta.2</version>
+    <version>0.4.0-beta.3</version>
     <packaging>jar</packaging>
 
     <repositories>
@@ -66,7 +66,7 @@
         <dependency>
             <groupId>net.dv8tion</groupId>
             <artifactId>JDA</artifactId>
-            <version>5.0.0-beta.6</version>
+            <version>5.0.0-beta.10</version>
         </dependency>
         <dependency>
             <groupId>com.github.walkyst</groupId>
@@ -158,6 +158,21 @@
             <artifactId>javafx-fxml</artifactId>
             <version>17</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <version>4.5.13</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-codec</groupId>
+            <artifactId>commons-codec</artifactId>
+            <version>1.13</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jsoup</groupId>
+            <artifactId>jsoup</artifactId>
+            <version>1.15.3</version>
+        </dependency>
     </dependencies>
 
     <build>
@@ -228,6 +243,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.11.0</version>
                 <executions>
                     <execution>
                         <id>compile</id>
@@ -245,8 +261,8 @@
                     </execution>
                 </executions>
                 <configuration>
-                    <source>9</source>
-                    <target>9</target>
+                    <source>14</source>
+                    <target>14</target>
                 </configuration>
             </plugin>
         </plugins>
diff --git a/src/main/java/dev/cosgy/textToSpeak/Bot.kt b/src/main/java/dev/cosgy/textToSpeak/Bot.kt
index f862e3a..d13937b 100644
--- a/src/main/java/dev/cosgy/textToSpeak/Bot.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/Bot.kt
@@ -89,6 +89,7 @@ class Bot(val waiter: EventWaiter, val config: BotConfig, val settingsManager: S
                 }
             })
 
+            userSettingsManager.closeConnection()
             // Wait for any remaining tasks to complete before shutting down the thread pool
             threadpool.shutdown()
             try {
@@ -138,7 +139,7 @@ class Bot(val waiter: EventWaiter, val config: BotConfig, val settingsManager: S
         this.gui = gui
     }
 
-    fun GetLang(): ResourceBundle {
+    fun getLang(): ResourceBundle {
         return lang
     }
 
diff --git a/src/main/java/dev/cosgy/textToSpeak/BotConfig.kt b/src/main/java/dev/cosgy/textToSpeak/BotConfig.kt
index a8b9f3f..a8fb5dc 100644
--- a/src/main/java/dev/cosgy/textToSpeak/BotConfig.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/BotConfig.kt
@@ -118,7 +118,7 @@ class BotConfig(private val prompt: Prompt) {
                         所有者のユーザーIDが設定されていない、または有効なIDではありません。
                         BOTの所有者のユーザーIDを入力してください。
                         所有者のユーザーID: 
-                    """.trimIndent()
+                        """.trimIndent()
                     )!!.toLong()
                 } catch (ex: NumberFormatException) {
                     0
@@ -127,11 +127,12 @@ class BotConfig(private val prompt: Prompt) {
                 }
                 if (ownerId <= 0) {
                     prompt.alert(
-                        Prompt.Level.ERROR, CONTEXT, """
+                        Prompt.Level.ERROR, CONTEXT,
+                        """
                         無効なユーザーIDです！終了します。
      
                         設定ファイルの場所: ${path!!.toAbsolutePath()}
-                    """.trimIndent()
+                        """.trimIndent()
                     )
                     exitProcess(0)
                 } else {
diff --git a/src/main/java/dev/cosgy/textToSpeak/Listener.kt b/src/main/java/dev/cosgy/textToSpeak/Listener.kt
index 5ab6d24..54b2259 100644
--- a/src/main/java/dev/cosgy/textToSpeak/Listener.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/Listener.kt
@@ -64,7 +64,7 @@ class Listener(private val bot: Bot) : ListenerAdapter() {
         val botMember = event.guild.selfMember
         val settings = bot.settingsManager.getSettings(event.guild)
         if (event.channelLeft != null) {
-            if (settings!!.isJoinAndLeaveRead() && Objects.requireNonNull(event.guild.selfMember.voiceState)?.channel === event.channelLeft && event.channelLeft!!.members.size > 1) {
+            if (settings.isJoinAndLeaveRead() && Objects.requireNonNull(event.guild.selfMember.voiceState)?.channel === event.channelLeft && event.channelLeft!!.members.size > 1) {
                 val file: String? = try {
                     bot.voiceCreation.createVoice(
                         event.guild,
@@ -89,7 +89,7 @@ class Listener(private val bot: Bot) : ListenerAdapter() {
             }
         }
         if (event.channelJoined != null) {
-            if (settings!!.isJoinAndLeaveRead() && Objects.requireNonNull(event.guild.selfMember.voiceState)?.channel === event.channelJoined) {
+            if (settings.isJoinAndLeaveRead() && Objects.requireNonNull(event.guild.selfMember.voiceState)?.channel === event.channelJoined) {
                 val file: String? = try {
                     bot.voiceCreation.createVoice(
                         event.guild,
diff --git a/src/main/java/dev/cosgy/textToSpeak/TextToSpeak.kt b/src/main/java/dev/cosgy/textToSpeak/TextToSpeak.kt
index 16426bf..d15ccb6 100644
--- a/src/main/java/dev/cosgy/textToSpeak/TextToSpeak.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/TextToSpeak.kt
@@ -122,7 +122,7 @@ object TextToSpeak {
         Bot.INSTANCE = bot
         val aboutCommand = AboutCommand(
             Color.BLUE.brighter(),
-            bot.GetLang().getString("appName") + "(v" + version + ")",
+            bot.getLang().getString("appName") + "(v" + version + ")",
             *RECOMMENDED_PERMS
         )
         aboutCommand.setIsAuthor(false)
@@ -210,7 +210,7 @@ object TextToSpeak {
                         設定ファイルの場所；${config.configLocation}
                     """.trimIndent()
             )
-            exitProcess(1);
+            exitProcess(1)
         } catch (ex: IllegalArgumentException) {
             prompt.alert(
                 Prompt.Level.ERROR, "TextToSpeak Bot",
diff --git a/src/main/java/dev/cosgy/textToSpeak/audio/PlayerManager.kt b/src/main/java/dev/cosgy/textToSpeak/audio/PlayerManager.kt
index e802f2b..3c8b468 100644
--- a/src/main/java/dev/cosgy/textToSpeak/audio/PlayerManager.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/audio/PlayerManager.kt
@@ -44,7 +44,7 @@ class PlayerManager(val bot: Bot) : DefaultAudioPlayerManager() {
         val handler: AudioHandler?
         if (guild.audioManager.sendingHandler == null) {
             val player = createPlayer()
-            player.volume = bot.settingsManager.getSettings(guild)!!.volume
+            player.volume = bot.settingsManager.getSettings(guild).volume
             handler = AudioHandler(guild, player)
             player.addListener(handler)
             guild.audioManager.sendingHandler = handler
diff --git a/src/main/java/dev/cosgy/textToSpeak/commands/dictionary/AddWordCmd.kt b/src/main/java/dev/cosgy/textToSpeak/commands/dictionary/AddWordCmd.kt
index 5df4d6c..d98a46d 100644
--- a/src/main/java/dev/cosgy/textToSpeak/commands/dictionary/AddWordCmd.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/commands/dictionary/AddWordCmd.kt
@@ -95,9 +95,9 @@ class AddWordCmd(private val bot: Bot) : SlashCommand() {
 
     companion object {
         private val SUCCESS_COLOR = Color(0, 163, 129)
-        private val ERROR_COLOR = Color.RED
-        private const val INVALID_ARGS_MESSAGE = "コマンドが無効です。単語と読み方の２つを入力して実行して下さい。"
-        private const val USAGE_MESSAGE = "使用方法: /addword <単語> <読み方>"
+        //private val ERROR_COLOR = Color.RED
+        //private const val INVALID_ARGS_MESSAGE = "コマンドが無効です。単語と読み方の２つを入力して実行して下さい。"
+        //private const val USAGE_MESSAGE = "使用方法: /addword <単語> <読み方>"
         private const val KATAKANA_REGEX = "^[ァ-ヶー]*$"
         private fun isKatakana(str: String): Boolean {
             return Pattern.matches(KATAKANA_REGEX, str)
diff --git a/src/main/java/dev/cosgy/textToSpeak/gui/GUI.kt b/src/main/java/dev/cosgy/textToSpeak/gui/GUI.kt
index 855e879..f97e053 100644
--- a/src/main/java/dev/cosgy/textToSpeak/gui/GUI.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/gui/GUI.kt
@@ -58,7 +58,7 @@ class GUI(private val bot: Bot) : JFrame() {
 
 
         defaultCloseOperation = EXIT_ON_CLOSE
-        title = bot.GetLang().getString("appName")
+        title = bot.getLang().getString("appName")
         val tabs = JTabbedPane()
         tabs.add("コンソール", console)
 
@@ -132,11 +132,11 @@ class GUI(private val bot: Bot) : JFrame() {
             //val gcCount = garbageCollectors!!.sumOf { it.collectionCount }
 
             val cpuUsage = sunOsMx!!.processCpuLoad * 100
-            val systemCpuUsage = sunOsMx!!.systemCpuLoad * 100
+            val systemCpuUsage = sunOsMx!!.cpuLoad * 100
             val loadAverage = sunOsMx!!.systemLoadAverage
 
-            val physicalMemory = sunOsMx!!.totalPhysicalMemorySize / 1024 / 1024
-            val freePhysicalMemory = sunOsMx!!.freePhysicalMemorySize / 1024 / 1024
+            val physicalMemory = sunOsMx!!.totalMemorySize / 1024 / 1024
+            val freePhysicalMemory = sunOsMx!!.freeMemorySize / 1024 / 1024
             val usedPhysicalMemory = physicalMemory - freePhysicalMemory
 
             val swapSpace = sunOsMx!!.totalSwapSpaceSize / 1024 / 1024
diff --git a/src/main/java/dev/cosgy/textToSpeak/utils/OtherUtil.kt b/src/main/java/dev/cosgy/textToSpeak/utils/OtherUtil.kt
index bb06fad..38e110a 100644
--- a/src/main/java/dev/cosgy/textToSpeak/utils/OtherUtil.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/utils/OtherUtil.kt
@@ -63,7 +63,7 @@ object OtherUtil {
      */
     fun loadResource(clazz: Any, name: String?): String? {
         return try {
-            name?.let { clazz.javaClass.getResourceAsStream(it)?.let { readString(it) } }
+            name?.let { clazz.javaClass.getResourceAsStream(it)?.let { it -> readString(it) } }
         } catch (ex: Exception) {
             null
         }

From b6ed2bc20813f31398dc2f6ff96f5c5eda396519 Mon Sep 17 00:00:00 2001
From: kosugikun <>
Date: Sat, 10 Jun 2023 08:36:11 +0900
Subject: [PATCH 18/39] =?UTF-8?q?=E7=B4=B0=E3=81=8B=E3=81=AA=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cosgy/textToSpeak/settings/UserSettingsManager.kt  |  2 +-
 src/main/java/dev/cosgy/textToSpeak/utils/OtherUtil.kt | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/java/dev/cosgy/textToSpeak/settings/UserSettingsManager.kt b/src/main/java/dev/cosgy/textToSpeak/settings/UserSettingsManager.kt
index 16d6e00..9cec6d1 100644
--- a/src/main/java/dev/cosgy/textToSpeak/settings/UserSettingsManager.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/settings/UserSettingsManager.kt
@@ -64,7 +64,7 @@ class UserSettingsManager {
     }
 
     fun getSettings(userId: Long): UserSettings {
-        return settings.computeIfAbsent(userId) { userId: Long -> createDefaultSettings(userId) }
+        return settings.computeIfAbsent(userId) { _ : Long -> createDefaultSettings(userId) }
     }
 
     private fun createDefaultSettings(userId: Long): UserSettings {
diff --git a/src/main/java/dev/cosgy/textToSpeak/utils/OtherUtil.kt b/src/main/java/dev/cosgy/textToSpeak/utils/OtherUtil.kt
index 38e110a..104c073 100644
--- a/src/main/java/dev/cosgy/textToSpeak/utils/OtherUtil.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/utils/OtherUtil.kt
@@ -42,16 +42,16 @@ object OtherUtil {
     private const val WINDOWS_INVALID_PATH = "c:\\windows\\system32\\"
     fun getPath(path: String): Path {
         // special logic to prevent trying to access system32
-        var path = path
-        if (path.lowercase(Locale.getDefault()).startsWith(WINDOWS_INVALID_PATH)) {
-            val filename = path.substring(WINDOWS_INVALID_PATH.length)
+        var returnPath = path
+        if (returnPath.lowercase(Locale.getDefault()).startsWith(WINDOWS_INVALID_PATH)) {
+            val filename = returnPath.substring(WINDOWS_INVALID_PATH.length)
             try {
-                path =
+                returnPath =
                     File(TextToSpeak::class.java.protectionDomain.codeSource.location.toURI()).parentFile.path + File.separator + filename
             } catch (ignored: URISyntaxException) {
             }
         }
-        return Paths.get(path)
+        return Paths.get(returnPath)
     }
 
     /**

From 4ab1027b84f0003b950bbb2ed9e1da302e316ad8 Mon Sep 17 00:00:00 2001
From: kosugikun <>
Date: Sat, 10 Jun 2023 08:38:33 +0900
Subject: [PATCH 19/39] =?UTF-8?q?=E7=B4=B0=E3=81=8B=E3=81=AA=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/dev/cosgy/textToSpeak/gui/GUI.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/dev/cosgy/textToSpeak/gui/GUI.kt b/src/main/java/dev/cosgy/textToSpeak/gui/GUI.kt
index f97e053..ac7bf84 100644
--- a/src/main/java/dev/cosgy/textToSpeak/gui/GUI.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/gui/GUI.kt
@@ -201,7 +201,7 @@ class GUI(private val bot: Bot) : JFrame() {
 
             val systemInfo = sysInfoText.format(
                 osName, osVersion, osArch, processors,
-                prettyBytes(sunOsMx!!.totalPhysicalMemorySize), prettyBytes(sunOsMx!!.committedVirtualMemorySize),
+                prettyBytes(sunOsMx!!.totalMemorySize), prettyBytes(sunOsMx!!.committedVirtualMemorySize),
                 vmName, vmVersion, vmVendor, compilationMx?.name,
                 vmArguments
             )

From 03c6d305f00950dd0568228b5bbea294912c80ad Mon Sep 17 00:00:00 2001
From: kosugikun <>
Date: Sat, 10 Jun 2023 08:53:39 +0900
Subject: [PATCH 20/39] =?UTF-8?q?=E7=B4=B0=E3=81=8B=E3=81=AA=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../textToSpeak/commands/general/AboutCommand.kt     | 12 ++++++------
 .../textToSpeak/commands/general/SetIntonationCmd.kt |  4 ++--
 .../textToSpeak/commands/general/SetVoiceQualityA.kt |  4 ++--
 .../commands/general/SetVoiceQualityFm.kt            |  2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/main/java/dev/cosgy/textToSpeak/commands/general/AboutCommand.kt b/src/main/java/dev/cosgy/textToSpeak/commands/general/AboutCommand.kt
index ce194a3..a57641b 100644
--- a/src/main/java/dev/cosgy/textToSpeak/commands/general/AboutCommand.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/commands/general/AboutCommand.kt
@@ -86,27 +86,27 @@ class AboutCommand(private val color: Color, private val description: String, va
         if (jda.shardInfo.shardTotal == 1) {
             builder.addField(
                 "ステータス", """${jda.guilds.size} サーバー
-                1 シャード""", true
+                    |1シャード""".trimMargin(), true
             )
             builder.addField("ユーザー", """${jda.users.size} ユニーク
-                ${jda.guilds.stream().mapToInt { g: Guild -> g.members.size }.sum()} 合計""", true
+                |${jda.guilds.stream().mapToInt { g: Guild -> g.members.size }.sum()} 合計""".trimMargin(), true
             )
             builder.addField(
                 "チャンネル", """${jda.textChannels.size} テキスト
-                ${jda.voiceChannels.size} ボイス""", true
+                    |${jda.voiceChannels.size} ボイス""".trimMargin(), true
             )
         } else {
             builder.addField(
                 "ステータス", """${client.totalGuilds} サーバー
-                シャード ${jda.shardInfo.shardId + 1}/${jda.shardInfo.shardTotal}""", true
+                    |シャード ${jda.shardInfo.shardId + 1}/${jda.shardInfo.shardTotal}""".trimMargin(), true
             )
             builder.addField(
                 "", """${jda.users.size} ユーザーのシャード
-                ${jda.guilds.size} サーバー""", true
+                    |${jda.guilds.size} サーバー""".trimMargin(), true
             )
             builder.addField(
                 "", """${jda.textChannels.size} テキストチャンネル
-                ${jda.voiceChannels.size} ボイスチャンネル""", true
+                    |${jda.voiceChannels.size} ボイスチャンネル""".trimMargin(), true
             )
         }
         builder.setFooter("再起動が行われた時間")
diff --git a/src/main/java/dev/cosgy/textToSpeak/commands/general/SetIntonationCmd.kt b/src/main/java/dev/cosgy/textToSpeak/commands/general/SetIntonationCmd.kt
index 844460d..602a5cc 100644
--- a/src/main/java/dev/cosgy/textToSpeak/commands/general/SetIntonationCmd.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/commands/general/SetIntonationCmd.kt
@@ -43,7 +43,7 @@ class SetIntonationCmd(private val bot: Bot) : SlashCommand() {
 
         val settings = bot.userSettingsManager.getSettings(event.user.idLong)
         settings.intonationSetting = bd.toFloat()
-        event.reply("F0系列内変動の重みを$bd に設定しました。").queue()
+        event.reply("F0系列内変動の重みを $bd に設定しました。").queue()
     }
 
     override fun execute(event: CommandEvent) {
@@ -65,6 +65,6 @@ class SetIntonationCmd(private val bot: Bot) : SlashCommand() {
 
         val settings = bot.userSettingsManager.getSettings(event.author.idLong)
         settings.intonationSetting = bd.toFloat()
-        event.reply("F0系列内変動の重みを$bd に設定しました。")
+        event.reply("F0系列内変動の重みを $bd に設定しました。")
     }
 }
diff --git a/src/main/java/dev/cosgy/textToSpeak/commands/general/SetVoiceQualityA.kt b/src/main/java/dev/cosgy/textToSpeak/commands/general/SetVoiceQualityA.kt
index 8b77766..8f87da2 100644
--- a/src/main/java/dev/cosgy/textToSpeak/commands/general/SetVoiceQualityA.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/commands/general/SetVoiceQualityA.kt
@@ -59,7 +59,7 @@ class SetVoiceQualityA(private var bot: Bot) : SlashCommand() {
         }
         val settings = bot.userSettingsManager.getSettings(event.user.idLong)
         settings.voiceQualityASetting = bd!!.toFloat()
-        event.reply("オールパス値を" + bd + "に設定しました。").queue()
+        event.reply("オールパス値を $bd に設定しました。").queue()
     }
 
     override fun execute(event: CommandEvent) {
@@ -85,6 +85,6 @@ class SetVoiceQualityA(private var bot: Bot) : SlashCommand() {
         }
         val settings = bot.userSettingsManager.getSettings(event.author.idLong)
         settings.voiceQualityASetting = bd!!.toFloat()
-        event.reply("オールパス値を" + bd + "に設定しました。")
+        event.reply("オールパス値を $bd に設定しました。")
     }
 }
\ No newline at end of file
diff --git a/src/main/java/dev/cosgy/textToSpeak/commands/general/SetVoiceQualityFm.kt b/src/main/java/dev/cosgy/textToSpeak/commands/general/SetVoiceQualityFm.kt
index ec762b4..76748a0 100644
--- a/src/main/java/dev/cosgy/textToSpeak/commands/general/SetVoiceQualityFm.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/commands/general/SetVoiceQualityFm.kt
@@ -96,6 +96,6 @@ class SetVoiceQualityFm(private var bot: Bot) : SlashCommand() {
         }
         val settings = bot.userSettingsManager.getSettings(event.author.idLong)
         bd?.let { settings.voiceQualityFmSetting = it.toFloat() }
-        event.reply("追加ハーフトーンを" + bd + "に設定しました。")
+        event.reply("追加ハーフトーンを $bd に設定しました。")
     }
 }
\ No newline at end of file

From 14ccb60dfec06aff25a309f40f44b8ded4252285 Mon Sep 17 00:00:00 2001
From: Kosugi_kun <33971692+kosugikun@users.noreply.github.com>
Date: Thu, 22 Jun 2023 02:22:53 +0900
Subject: [PATCH 21/39] =?UTF-8?q?=E7=B4=B0=E3=81=8B=E3=81=AA=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/dataSources.xml                         |  7 ++++--
 .idea/encodings.xml                           |  1 +
 .idea/sqldialects.xml                         |  3 +++
 pom.xml                                       |  4 ++--
 .../commands/admin/GuildSettings.kt           | 10 ++++----
 .../textToSpeak/commands/admin/JLReadCmd.kt   | 24 +++++++++++++++----
 .../commands/admin/SetReadNameCmd.kt          | 24 +++++++++++++++----
 .../commands/dictionary/AddWordCmd.kt         |  1 +
 .../commands/general/AboutCommand.kt          |  3 ++-
 .../settings/UserSettingsManager.kt           |  2 +-
 src/main/resources/reference.conf             |  6 ++---
 11 files changed, 61 insertions(+), 24 deletions(-)

diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml
index b2bb500..4ffb1c8 100644
--- a/.idea/dataSources.xml
+++ b/.idea/dataSources.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="DataSourceManagerImpl" format="xml" multifile-model="true">
-    <data-source source="LOCAL" name="UserData" uuid="bcae6d7f-dd17-487e-ab3f-743f9b393d89">
+    <data-source source="LOCAL" name="UserData" uuid="648c6ef7-2bba-4e14-b21f-f6619a5657a5">
       <driver-ref>sqlite.xerial</driver-ref>
       <synchronize>true</synchronize>
       <jdbc-driver>org.sqlite.JDBC</jdbc-driver>
-      <jdbc-url>jdbc:sqlite:C:\Users\kosug\IdeaProjects\TextToSpeak\src\main\resources\UserData.sqlite</jdbc-url>
+      <jdbc-url>jdbc:sqlite:C:\Users\kosug\IdeaProjects\TextToSpeakBot\src\main\resources\UserData.sqlite</jdbc-url>
       <working-dir>$ProjectFileDir$</working-dir>
       <libraries>
+        <library>
+          <url>file://$APPLICATION_CONFIG_DIR$/jdbc-drivers/Xerial SQLiteJDBC/3.39.2/sqlite-jdbc-3.39.2.jar</url>
+        </library>
         <library>
           <url>file://$APPLICATION_CONFIG_DIR$/jdbc-drivers/Xerial SQLiteJDBC/3.34.0/sqlite-jdbc-3.34.0.jar</url>
         </library>
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index c79ede3..146230b 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -3,5 +3,6 @@
   <component name="Encoding" native2AsciiForPropertiesFiles="true">
     <file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/src/main/resources/reference.conf" charset="ISO-8859-1" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/sqldialects.xml b/.idea/sqldialects.xml
index 3dec230..59295c4 100644
--- a/.idea/sqldialects.xml
+++ b/.idea/sqldialects.xml
@@ -5,4 +5,7 @@
     <file url="file://$PROJECT_DIR$/src/main/java/dev/cosgy/textToSpeak/settings/UserSettingsManager.kt" dialect="SQLite" />
     <file url="PROJECT" dialect="SQLite" />
   </component>
+  <component name="SqlResolveMappings">
+    <file url="file://$PROJECT_DIR$/src/main/java/dev/cosgy/textToSpeak/settings/UserSettingsManager.kt" scope="{&quot;node&quot;:{  &quot;@negative&quot;:&quot;1&quot;,  &quot;group&quot;:{   &quot;@kind&quot;:&quot;root&quot;,   &quot;node&quot;:{    &quot;@negative&quot;:&quot;1&quot;   }  } }}" />
+  </component>
 </project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 440eb27..266dba9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
 
     <groupId>dev.cosgy</groupId>
     <artifactId>TextToSpeak</artifactId>
-    <version>0.4.0-beta.3</version>
+    <version>0.4.0-beta.4</version>
     <packaging>jar</packaging>
 
     <repositories>
@@ -66,7 +66,7 @@
         <dependency>
             <groupId>net.dv8tion</groupId>
             <artifactId>JDA</artifactId>
-            <version>5.0.0-beta.10</version>
+            <version>5.0.0-beta.11</version>
         </dependency>
         <dependency>
             <groupId>com.github.walkyst</groupId>
diff --git a/src/main/java/dev/cosgy/textToSpeak/commands/admin/GuildSettings.kt b/src/main/java/dev/cosgy/textToSpeak/commands/admin/GuildSettings.kt
index cdf36eb..b5a392b 100644
--- a/src/main/java/dev/cosgy/textToSpeak/commands/admin/GuildSettings.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/commands/admin/GuildSettings.kt
@@ -45,12 +45,12 @@ class GuildSettings(private val bot: Bot) : AdminCommand() {
         val builder = EmbedBuilder()
             .setColor(Color.orange)
             .setTitle(event.guild!!.name + "の設定")
-            .addField("ユーザー名読み上げ：", settings.isReadName().toString(), false)
+            .addField("ユーザー名読み上げ：", if (settings.isReadName()) "有効" else "無効", false)
             .addField(
                 "参加、退出時の読み上げ：",
-                settings.isJoinAndLeaveRead().toString(),
+                if (settings.isJoinAndLeaveRead()) "有効" else "無効",
                 false
-            ) //.addField("接頭語：", settings.getPrefix(), false)
+            )
             .addField("読み上げるチャンネル：", text, false)
             .addField("読み上げの主音量：", settings.volume.toString(), false)
         event.replyEmbeds(builder.build()).queue()
@@ -65,10 +65,10 @@ class GuildSettings(private val bot: Bot) : AdminCommand() {
         val builder = EmbedBuilder()
             .setColor(Color.orange)
             .setTitle(event.guild.name + "の設定")
-            .addField("ユーザー名読み上げ：", settings.isReadName().toString(), false)
+            .addField("ユーザー名読み上げ：", if (settings.isReadName()) "有効" else "無効", false)
             .addField(
                 "参加、退出時の読み上げ：",
-                settings.isJoinAndLeaveRead().toString(),
+                if (settings.isJoinAndLeaveRead()) "有効" else "無効",
                 false
             ) //.addField("接頭語：", settings.getPrefix(), false)
             .addField("読み上げるチャンネル：", text, false)
diff --git a/src/main/java/dev/cosgy/textToSpeak/commands/admin/JLReadCmd.kt b/src/main/java/dev/cosgy/textToSpeak/commands/admin/JLReadCmd.kt
index 8b74c2a..d70f3ad 100644
--- a/src/main/java/dev/cosgy/textToSpeak/commands/admin/JLReadCmd.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/commands/admin/JLReadCmd.kt
@@ -19,6 +19,8 @@ import com.jagrosh.jdautilities.command.CommandEvent
 import com.jagrosh.jdautilities.command.SlashCommandEvent
 import dev.cosgy.textToSpeak.Bot
 import dev.cosgy.textToSpeak.commands.AdminCommand
+import net.dv8tion.jda.api.interactions.commands.OptionType
+import net.dv8tion.jda.api.interactions.commands.build.OptionData
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 
@@ -28,6 +30,8 @@ class JLReadCmd(private val bot: Bot) : AdminCommand() {
     init {
         name = "jlread"
         help = "ボイスチャンネルにユーザーが参加または退出した時にユーザー名を読み上げるか否かを設定します。"
+
+        options = listOf(OptionData(OptionType.BOOLEAN, "value", "機能を有効にするか否か", false))
     }
 
     override fun execute(event: SlashCommandEvent) {
@@ -36,17 +40,27 @@ class JLReadCmd(private val bot: Bot) : AdminCommand() {
             return
         }
         val settings = bot.settingsManager.getSettings(event.guild!!)
-        if (settings.isJoinAndLeaveRead()) {
-            settings.setJoinAndLeaveRead(false)
-            event.reply("ボイスチャンネルにユーザーが参加、退出した際の読み上げを無効にしました。").queue()
+
+        if (event.getOption("value") == null) {
+            if (settings.isJoinAndLeaveRead()) {
+                settings.setJoinAndLeaveRead(false)
+                event.reply("ボイスチャンネルにユーザーが参加、退出した際の読み上げを無効にしました。").queue()
+            } else {
+                settings.setJoinAndLeaveRead(true)
+                event.reply("ボイスチャンネルにユーザーが参加、退出した際の読み上げを有効にしました。").queue()
+            }
         } else {
-            settings.setJoinAndLeaveRead(true)
-            event.reply("ボイスチャンネルにユーザーが参加、退出した際の読み上げを有効にしました。").queue()
+            val args = event.getOption("value")!!.asBoolean
+
+            settings.setReadName(args)
+
+            event.reply("ボイスチャンネルにユーザーが参加、退出した際の読み上げを${if (args) "有効" else "無効"}にしました。").queue()
         }
     }
 
     override fun execute(event: CommandEvent) {
         val settings = bot.settingsManager.getSettings(event.guild)
+
         if (settings.isJoinAndLeaveRead()) {
             settings.setJoinAndLeaveRead(false)
             event.reply("ボイスチャンネルにユーザーが参加、退出した際の読み上げを無効にしました。")
diff --git a/src/main/java/dev/cosgy/textToSpeak/commands/admin/SetReadNameCmd.kt b/src/main/java/dev/cosgy/textToSpeak/commands/admin/SetReadNameCmd.kt
index 575e9c0..016991a 100644
--- a/src/main/java/dev/cosgy/textToSpeak/commands/admin/SetReadNameCmd.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/commands/admin/SetReadNameCmd.kt
@@ -19,6 +19,8 @@ import com.jagrosh.jdautilities.command.CommandEvent
 import com.jagrosh.jdautilities.command.SlashCommandEvent
 import dev.cosgy.textToSpeak.Bot
 import dev.cosgy.textToSpeak.commands.AdminCommand
+import net.dv8tion.jda.api.interactions.commands.OptionType
+import net.dv8tion.jda.api.interactions.commands.build.OptionData
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 
@@ -28,6 +30,8 @@ class SetReadNameCmd(private val bot: Bot) : AdminCommand() {
     init {
         name = "setreadname"
         help = "テキストを読み上げる際にユーザー名も読み上げるかを設定します。"
+
+        options = listOf(OptionData(OptionType.BOOLEAN, "value", "機能を有効にするか否か", false))
     }
 
     override fun execute(event: SlashCommandEvent) {
@@ -35,13 +39,23 @@ class SetReadNameCmd(private val bot: Bot) : AdminCommand() {
             event.reply(event.client.warning + "権限がないため実行できません。").queue()
             return
         }
+
         val settings = bot.settingsManager.getSettings(event.guild!!)
-        if (settings.isReadName()) {
-            settings.setReadName(false)
-            event.reply("ユーザー名の読み上げを無効にしました。").queue()
+
+        if (event.getOption("value") == null) {
+            if (settings.isReadName()) {
+                settings.setReadName(false)
+                event.reply("ユーザー名の読み上げを無効にしました。").queue()
+            } else {
+                settings.setReadName(true)
+                event.reply("ユーザー名の読み上げを有効にしました。").queue()
+            }
         } else {
-            settings.setReadName(true)
-            event.reply("ユーザー名の読み上げを有効にしました。").queue()
+            val args = event.getOption("value")!!.asBoolean
+
+            settings.setReadName(args)
+
+            event.reply("ユーザー名の読み上げを${if (args) "有効" else "無効"}にしました。").queue()
         }
     }
 
diff --git a/src/main/java/dev/cosgy/textToSpeak/commands/dictionary/AddWordCmd.kt b/src/main/java/dev/cosgy/textToSpeak/commands/dictionary/AddWordCmd.kt
index d98a46d..9028169 100644
--- a/src/main/java/dev/cosgy/textToSpeak/commands/dictionary/AddWordCmd.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/commands/dictionary/AddWordCmd.kt
@@ -95,6 +95,7 @@ class AddWordCmd(private val bot: Bot) : SlashCommand() {
 
     companion object {
         private val SUCCESS_COLOR = Color(0, 163, 129)
+
         //private val ERROR_COLOR = Color.RED
         //private const val INVALID_ARGS_MESSAGE = "コマンドが無効です。単語と読み方の２つを入力して実行して下さい。"
         //private const val USAGE_MESSAGE = "使用方法: /addword <単語> <読み方>"
diff --git a/src/main/java/dev/cosgy/textToSpeak/commands/general/AboutCommand.kt b/src/main/java/dev/cosgy/textToSpeak/commands/general/AboutCommand.kt
index a57641b..7e5b1af 100644
--- a/src/main/java/dev/cosgy/textToSpeak/commands/general/AboutCommand.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/commands/general/AboutCommand.kt
@@ -88,7 +88,8 @@ class AboutCommand(private val color: Color, private val description: String, va
                 "ステータス", """${jda.guilds.size} サーバー
                     |1シャード""".trimMargin(), true
             )
-            builder.addField("ユーザー", """${jda.users.size} ユニーク
+            builder.addField(
+                "ユーザー", """${jda.users.size} ユニーク
                 |${jda.guilds.stream().mapToInt { g: Guild -> g.members.size }.sum()} 合計""".trimMargin(), true
             )
             builder.addField(
diff --git a/src/main/java/dev/cosgy/textToSpeak/settings/UserSettingsManager.kt b/src/main/java/dev/cosgy/textToSpeak/settings/UserSettingsManager.kt
index 9cec6d1..12dd607 100644
--- a/src/main/java/dev/cosgy/textToSpeak/settings/UserSettingsManager.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/settings/UserSettingsManager.kt
@@ -64,7 +64,7 @@ class UserSettingsManager {
     }
 
     fun getSettings(userId: Long): UserSettings {
-        return settings.computeIfAbsent(userId) { _ : Long -> createDefaultSettings(userId) }
+        return settings.computeIfAbsent(userId) { _: Long -> createDefaultSettings(userId) }
     }
 
     private fun createDefaultSettings(userId: Long): UserSettings {
diff --git a/src/main/resources/reference.conf b/src/main/resources/reference.conf
index 4ef7ffc..5fd4596 100644
--- a/src/main/resources/reference.conf
+++ b/src/main/resources/reference.conf
@@ -1,8 +1,8 @@
 /// START OF YOMIAGEBOT CONFIG ///
 //______________________________________________________________
-//                     ===================
-//                      Yomiage Botの設定
-//                     ===================
+//===================
+// Yomiage Bot\u00E3\u0081\u00AE\u00E8\u00A8\u00AD\u00E5\u00AE\u009A
+//===================
 //
 // //で始まる行は無視されます。
 // トークンと所有者を設定しなければなりません。

From e8935512761bf43bbda55da76babe3d7cddc3b92 Mon Sep 17 00:00:00 2001
From: Kosugi_kun <33971692+kosugikun@users.noreply.github.com>
Date: Tue, 27 Jun 2023 21:35:51 +0900
Subject: [PATCH 22/39] =?UTF-8?q?=E3=83=9C=E3=83=83=E3=83=88=E3=81=8CVC?=
 =?UTF-8?q?=E3=81=AB=E5=8F=82=E5=8A=A0=E6=99=82=E3=81=AB=E7=8F=BE=E5=9C=A8?=
 =?UTF-8?q?=E3=81=AE=E3=82=AE=E3=83=AB=E3=83=89=E8=A8=AD=E5=AE=9A=E3=82=92?=
 =?UTF-8?q?=E8=A1=A8=E7=A4=BA=E3=81=99=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB?=
 =?UTF-8?q?=E5=A4=89=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ... 648c6ef7-2bba-4e14-b21f-f6619a5657a5.xml} | 1299 ++++++++---------
 .../entities/entities.dat                     |  Bin 4096 -> 0 bytes
 .../entities/entities.dat.len                 |  Bin 8 -> 0 bytes
 .../entities/entities.dat.values              |  Bin 5741 -> 0 bytes
 .../entities/entities.dat.values.at           |  Bin 9111 -> 0 bytes
 .../entities/entities.dat.values.s            |    1 -
 .../entities/entities.dat_i                   |  Bin 32768 -> 0 bytes
 .../entities/entities.dat_i.len               |  Bin 8 -> 0 bytes
 .../textToSpeak/commands/general/JoinCmd.kt   |    4 +
 9 files changed, 622 insertions(+), 682 deletions(-)
 rename .idea/dataSources/{bcae6d7f-dd17-487e-ab3f-743f9b393d89.xml => 648c6ef7-2bba-4e14-b21f-f6619a5657a5.xml} (57%)
 delete mode 100644 .idea/dataSources/bcae6d7f-dd17-487e-ab3f-743f9b393d89/entities/entities.dat
 delete mode 100644 .idea/dataSources/bcae6d7f-dd17-487e-ab3f-743f9b393d89/entities/entities.dat.len
 delete mode 100644 .idea/dataSources/bcae6d7f-dd17-487e-ab3f-743f9b393d89/entities/entities.dat.values
 delete mode 100644 .idea/dataSources/bcae6d7f-dd17-487e-ab3f-743f9b393d89/entities/entities.dat.values.at
 delete mode 100644 .idea/dataSources/bcae6d7f-dd17-487e-ab3f-743f9b393d89/entities/entities.dat.values.s
 delete mode 100644 .idea/dataSources/bcae6d7f-dd17-487e-ab3f-743f9b393d89/entities/entities.dat_i
 delete mode 100644 .idea/dataSources/bcae6d7f-dd17-487e-ab3f-743f9b393d89/entities/entities.dat_i.len

diff --git a/.idea/dataSources/bcae6d7f-dd17-487e-ab3f-743f9b393d89.xml b/.idea/dataSources/648c6ef7-2bba-4e14-b21f-f6619a5657a5.xml
similarity index 57%
rename from .idea/dataSources/bcae6d7f-dd17-487e-ab3f-743f9b393d89.xml
rename to .idea/dataSources/648c6ef7-2bba-4e14-b21f-f6619a5657a5.xml
index acb4919..e07f1dd 100644
--- a/.idea/dataSources/bcae6d7f-dd17-487e-ab3f-743f9b393d89.xml
+++ b/.idea/dataSources/648c6ef7-2bba-4e14-b21f-f6619a5657a5.xml
@@ -1,433 +1,435 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <dataSource name="UserData">
   <database-model serializer="dbm" dbms="SQLITE" family-id="SQLITE" format-version="4.48">
-    <root id="1"/>
-    <collation id="2" parent="1" name="BINARY"/>
+    <root id="1">
+      <ServerVersion>3.40.1</ServerVersion>
+    </root>
+    <collation id="2" parent="1" name="RTRIM"/>
     <collation id="3" parent="1" name="NOCASE"/>
-    <collation id="4" parent="1" name="RTRIM"/>
-    <package id="5" parent="1" name="dbstat"/>
-    <package id="6" parent="1" name="fts3"/>
-    <package id="7" parent="1" name="fts3tokenize"/>
-    <package id="8" parent="1" name="fts4"/>
-    <package id="9" parent="1" name="fts4aux"/>
-    <package id="10" parent="1" name="fts5"/>
+    <collation id="4" parent="1" name="BINARY"/>
+    <package id="5" parent="1" name="json_tree"/>
+    <package id="6" parent="1" name="json_each"/>
+    <package id="7" parent="1" name="fts4aux"/>
+    <package id="8" parent="1" name="fts3"/>
+    <package id="9" parent="1" name="fts4"/>
+    <package id="10" parent="1" name="fts3tokenize"/>
     <package id="11" parent="1" name="fts5vocab"/>
-    <package id="12" parent="1" name="json_each"/>
-    <package id="13" parent="1" name="json_tree"/>
+    <package id="12" parent="1" name="rtree_i32"/>
+    <package id="13" parent="1" name="fts5"/>
     <package id="14" parent="1" name="rtree"/>
-    <package id="15" parent="1" name="rtree_i32"/>
-    <routine id="16" parent="1" name="-&gt;">
+    <package id="15" parent="1" name="dbstat"/>
+    <routine id="16" parent="1" name="pow">
       <Deterministic>1</Deterministic>
     </routine>
-    <routine id="17" parent="1" name="-&gt;&gt;">
-      <Deterministic>1</Deterministic>
+    <routine id="17" parent="1" name="group_concat">
+      <FunctionType>window</FunctionType>
     </routine>
-    <routine id="18" parent="1" name="abs">
+    <routine id="18" parent="1" name="json_type">
       <Deterministic>1</Deterministic>
     </routine>
-    <routine id="19" parent="1" name="acos">
+    <routine id="19" parent="1" name="julianday">
       <Deterministic>1</Deterministic>
+      <Variadic>1</Variadic>
     </routine>
-    <routine id="20" parent="1" name="acosh">
-      <Deterministic>1</Deterministic>
+    <routine id="20" parent="1" name="ntile">
+      <FunctionType>window</FunctionType>
     </routine>
-    <routine id="21" parent="1" name="asin">
+    <routine id="21" parent="1" name="nullif">
       <Deterministic>1</Deterministic>
     </routine>
-    <routine id="22" parent="1" name="asinh">
+    <routine id="22" parent="1" name="sqlite_compileoption_get"/>
+    <routine id="23" parent="1" name="json_valid">
       <Deterministic>1</Deterministic>
     </routine>
-    <routine id="23" parent="1" name="atan">
+    <routine id="24" parent="1" name="json_quote">
       <Deterministic>1</Deterministic>
     </routine>
-    <routine id="24" parent="1" name="atan2">
+    <routine id="25" parent="1" name="json_patch">
       <Deterministic>1</Deterministic>
     </routine>
-    <routine id="25" parent="1" name="atanh">
+    <routine id="26" parent="1" name="-&gt;">
       <Deterministic>1</Deterministic>
     </routine>
-    <routine id="26" parent="1" name="atn2"/>
-    <routine id="27" parent="1" name="avg">
-      <FunctionType>window</FunctionType>
-    </routine>
-    <routine id="28" parent="1" name="bm25">
+    <routine id="27" parent="1" name="json_array">
+      <Deterministic>1</Deterministic>
       <Variadic>1</Variadic>
     </routine>
-    <routine id="29" parent="1" name="ceil">
+    <routine id="28" parent="1" name="current_timestamp"/>
+    <routine id="29" parent="1" name="power">
       <Deterministic>1</Deterministic>
     </routine>
-    <routine id="30" parent="1" name="ceiling">
+    <routine id="30" parent="1" name="sqlite_compileoption_used"/>
+    <routine id="31" parent="1" name="json_remove">
       <Deterministic>1</Deterministic>
+      <Variadic>1</Variadic>
     </routine>
-    <routine id="31" parent="1" name="changes"/>
-    <routine id="32" parent="1" name="char">
+    <routine id="32" parent="1" name="json_object">
       <Deterministic>1</Deterministic>
       <Variadic>1</Variadic>
     </routine>
-    <routine id="33" parent="1" name="charindex"/>
-    <routine id="34" parent="1" name="charindex"/>
-    <routine id="35" parent="1" name="coalesce">
+    <routine id="33" parent="1" name="json_insert">
       <Deterministic>1</Deterministic>
       <Variadic>1</Variadic>
     </routine>
-    <routine id="36" parent="1" name="cos">
+    <routine id="34" parent="1" name="-&gt;&gt;">
       <Deterministic>1</Deterministic>
     </routine>
-    <routine id="37" parent="1" name="cosh">
+    <routine id="35" parent="1" name="sin">
       <Deterministic>1</Deterministic>
     </routine>
-    <routine id="38" parent="1" name="cot"/>
-    <routine id="39" parent="1" name="coth"/>
-    <routine id="40" parent="1" name="count">
+    <routine id="36" parent="1" name="sum">
       <FunctionType>window</FunctionType>
     </routine>
-    <routine id="41" parent="1" name="cume_dist">
-      <FunctionType>window</FunctionType>
+    <routine id="37" parent="1" name="quote">
+      <Deterministic>1</Deterministic>
     </routine>
-    <routine id="42" parent="1" name="current_date"/>
-    <routine id="43" parent="1" name="current_time"/>
-    <routine id="44" parent="1" name="current_timestamp"/>
-    <routine id="45" parent="1" name="date">
+    <routine id="38" parent="1" name="printf">
       <Deterministic>1</Deterministic>
       <Variadic>1</Variadic>
     </routine>
-    <routine id="46" parent="1" name="datetime">
+    <routine id="39" parent="1" name="likelihood">
+      <Deterministic>1</Deterministic>
+    </routine>
+    <routine id="40" parent="1" name="json_replace">
       <Deterministic>1</Deterministic>
       <Variadic>1</Variadic>
     </routine>
-    <routine id="47" parent="1" name="degrees">
+    <routine id="41" parent="1" name="json_extract">
       <Deterministic>1</Deterministic>
+      <Variadic>1</Variadic>
     </routine>
-    <routine id="48" parent="1" name="dense_rank">
+    <routine id="42" parent="1" name="last_value">
       <FunctionType>window</FunctionType>
     </routine>
-    <routine id="49" parent="1" name="difference"/>
-    <routine id="50" parent="1" name="exp">
+    <routine id="43" parent="1" name="rank">
+      <FunctionType>window</FunctionType>
+    </routine>
+    <routine id="44" parent="1" name="sign">
       <Deterministic>1</Deterministic>
     </routine>
-    <routine id="51" parent="1" name="first_value">
-      <FunctionType>window</FunctionType>
+    <routine id="45" parent="1" name="sqrt">
+      <Deterministic>1</Deterministic>
     </routine>
-    <routine id="52" parent="1" name="floor">
+    <routine id="46" parent="1" name="sinh">
       <Deterministic>1</Deterministic>
     </routine>
-    <routine id="53" parent="1" name="format">
+    <routine id="47" parent="1" name="tan">
       <Deterministic>1</Deterministic>
-      <Variadic>1</Variadic>
     </routine>
-    <routine id="54" parent="1" name="fts3_tokenizer"/>
-    <routine id="55" parent="1" name="fts3_tokenizer"/>
-    <routine id="56" parent="1" name="fts5"/>
-    <routine id="57" parent="1" name="fts5_source_id"/>
-    <routine id="58" parent="1" name="glob">
+    <routine id="48" parent="1" name="round">
       <Deterministic>1</Deterministic>
     </routine>
-    <routine id="59" parent="1" name="group_concat">
+    <routine id="49" parent="1" name="rtrim">
+      <Deterministic>1</Deterministic>
+    </routine>
+    <routine id="50" parent="1" name="nth_value">
       <FunctionType>window</FunctionType>
     </routine>
-    <routine id="60" parent="1" name="hex">
+    <routine id="51" parent="1" name="tanh">
       <Deterministic>1</Deterministic>
     </routine>
-    <routine id="61" parent="1" name="highlight">
-      <Variadic>1</Variadic>
+    <routine id="52" parent="1" name="random"/>
+    <routine id="53" parent="1" name="trim">
+      <Deterministic>1</Deterministic>
     </routine>
-    <routine id="62" parent="1" name="ifnull">
+    <routine id="54" parent="1" name="time">
       <Deterministic>1</Deterministic>
+      <Variadic>1</Variadic>
     </routine>
-    <routine id="63" parent="1" name="iif">
+    <routine id="55" parent="1" name="radians">
       <Deterministic>1</Deterministic>
     </routine>
-    <routine id="64" parent="1" name="instr">
+    <routine id="56" parent="1" name="trunc">
       <Deterministic>1</Deterministic>
     </routine>
-    <routine id="65" parent="1" name="json">
+    <routine id="57" parent="1" name="total">
+      <FunctionType>window</FunctionType>
+    </routine>
+    <routine id="58" parent="1" name="substr">
       <Deterministic>1</Deterministic>
     </routine>
-    <routine id="66" parent="1" name="json_array">
+    <routine id="59" parent="1" name="replace">
       <Deterministic>1</Deterministic>
-      <Variadic>1</Variadic>
     </routine>
-    <routine id="67" parent="1" name="json_array_length">
+    <routine id="60" parent="1" name="upper">
       <Deterministic>1</Deterministic>
     </routine>
-    <routine id="68" parent="1" name="json_extract">
+    <routine id="61" parent="1" name="subtype">
       <Deterministic>1</Deterministic>
-      <Variadic>1</Variadic>
     </routine>
-    <routine id="69" parent="1" name="json_group_array">
+    <routine id="62" parent="1" name="typeof">
       <Deterministic>1</Deterministic>
-      <FunctionType>window</FunctionType>
     </routine>
-    <routine id="70" parent="1" name="json_group_object">
+    <routine id="63" parent="1" name="load_extension"/>
+    <routine id="64" parent="1" name="json_group_array">
       <Deterministic>1</Deterministic>
       <FunctionType>window</FunctionType>
     </routine>
-    <routine id="71" parent="1" name="json_insert">
-      <Deterministic>1</Deterministic>
-      <Variadic>1</Variadic>
+    <routine id="65" parent="1" name="avg">
+      <FunctionType>window</FunctionType>
     </routine>
-    <routine id="72" parent="1" name="json_object">
+    <routine id="66" parent="1" name="abs">
       <Deterministic>1</Deterministic>
-      <Variadic>1</Variadic>
     </routine>
-    <routine id="73" parent="1" name="json_patch">
+    <routine id="67" parent="1" name="json_group_object">
       <Deterministic>1</Deterministic>
+      <FunctionType>window</FunctionType>
     </routine>
-    <routine id="74" parent="1" name="json_quote">
+    <routine id="68" parent="1" name="json_array_length">
       <Deterministic>1</Deterministic>
     </routine>
-    <routine id="75" parent="1" name="json_remove">
+    <routine id="69" parent="1" name="strftime">
       <Deterministic>1</Deterministic>
       <Variadic>1</Variadic>
     </routine>
-    <routine id="76" parent="1" name="json_replace">
+    <routine id="70" parent="1" name="atan">
       <Deterministic>1</Deterministic>
-      <Variadic>1</Variadic>
     </routine>
-    <routine id="77" parent="1" name="json_set">
+    <routine id="71" parent="1" name="asin">
       <Deterministic>1</Deterministic>
-      <Variadic>1</Variadic>
     </routine>
-    <routine id="78" parent="1" name="json_type">
+    <routine id="72" parent="1" name="acos">
       <Deterministic>1</Deterministic>
     </routine>
-    <routine id="79" parent="1" name="json_valid">
+    <routine id="73" parent="1" name="substring">
       <Deterministic>1</Deterministic>
     </routine>
-    <routine id="80" parent="1" name="julianday">
+    <routine id="74" parent="1" name="randomblob"/>
+    <routine id="75" parent="1" name="unicode">
       <Deterministic>1</Deterministic>
-      <Variadic>1</Variadic>
-    </routine>
-    <routine id="81" parent="1" name="lag">
-      <FunctionType>window</FunctionType>
-    </routine>
-    <routine id="82" parent="1" name="lag">
-      <FunctionType>window</FunctionType>
-    </routine>
-    <routine id="83" parent="1" name="last_insert_rowid"/>
-    <routine id="84" parent="1" name="last_value">
-      <FunctionType>window</FunctionType>
     </routine>
-    <routine id="85" parent="1" name="lead">
+    <routine id="76" parent="1" name="percent_rank">
       <FunctionType>window</FunctionType>
     </routine>
-    <routine id="86" parent="1" name="lead">
+    <routine id="77" parent="1" name="row_number">
       <FunctionType>window</FunctionType>
     </routine>
-    <routine id="87" parent="1" name="leftstr"/>
-    <routine id="88" parent="1" name="length">
+    <routine id="78" parent="1" name="atanh">
       <Deterministic>1</Deterministic>
     </routine>
-    <routine id="89" parent="1" name="like">
+    <routine id="79" parent="1" name="asinh">
       <Deterministic>1</Deterministic>
     </routine>
-    <routine id="90" parent="1" name="likelihood">
+    <routine id="80" parent="1" name="acosh">
       <Deterministic>1</Deterministic>
     </routine>
-    <routine id="91" parent="1" name="likely">
+    <routine id="81" parent="1" name="cos">
       <Deterministic>1</Deterministic>
     </routine>
-    <routine id="92" parent="1" name="ln">
+    <routine id="82" parent="1" name="atan2">
       <Deterministic>1</Deterministic>
     </routine>
-    <routine id="93" parent="1" name="load_extension"/>
-    <routine id="94" parent="1" name="log">
-      <Deterministic>1</Deterministic>
-    </routine>
-    <routine id="95" parent="1" name="log10">
+    <routine id="83" parent="1" name="last_insert_rowid"/>
+    <routine id="84" parent="1" name="sqlite_log">
       <Deterministic>1</Deterministic>
     </routine>
-    <routine id="96" parent="1" name="log2">
+    <routine id="85" parent="1" name="unlikely">
       <Deterministic>1</Deterministic>
     </routine>
-    <routine id="97" parent="1" name="lower">
+    <routine id="86" parent="1" name="cosh">
       <Deterministic>1</Deterministic>
     </routine>
-    <routine id="98" parent="1" name="lower_quartile">
-      <FunctionType>aggregate</FunctionType>
-    </routine>
-    <routine id="99" parent="1" name="ltrim">
+    <routine id="87" parent="1" name="ceil">
       <Deterministic>1</Deterministic>
     </routine>
-    <routine id="100" parent="1" name="match"/>
-    <routine id="101" parent="1" name="matchinfo"/>
-    <routine id="102" parent="1" name="matchinfo"/>
-    <routine id="103" parent="1" name="max">
+    <routine id="88" parent="1" name="char">
       <Deterministic>1</Deterministic>
       <Variadic>1</Variadic>
     </routine>
-    <routine id="104" parent="1" name="max">
-      <FunctionType>window</FunctionType>
-    </routine>
-    <routine id="105" parent="1" name="median">
-      <FunctionType>aggregate</FunctionType>
-    </routine>
-    <routine id="106" parent="1" name="min">
+    <routine id="89" parent="1" name="unixepoch">
       <Deterministic>1</Deterministic>
       <Variadic>1</Variadic>
     </routine>
-    <routine id="107" parent="1" name="min">
-      <FunctionType>window</FunctionType>
-    </routine>
-    <routine id="108" parent="1" name="mod">
+    <routine id="90" parent="1" name="exp">
       <Deterministic>1</Deterministic>
     </routine>
-    <routine id="109" parent="1" name="mode">
-      <FunctionType>aggregate</FunctionType>
-    </routine>
-    <routine id="110" parent="1" name="nth_value">
-      <FunctionType>window</FunctionType>
-    </routine>
-    <routine id="111" parent="1" name="ntile">
+    <routine id="91" parent="1" name="count">
       <FunctionType>window</FunctionType>
     </routine>
-    <routine id="112" parent="1" name="nullif">
+    <routine id="92" parent="1" name="date">
       <Deterministic>1</Deterministic>
+      <Variadic>1</Variadic>
     </routine>
-    <routine id="113" parent="1" name="offsets"/>
-    <routine id="114" parent="1" name="optimize"/>
-    <routine id="115" parent="1" name="padc"/>
-    <routine id="116" parent="1" name="padl"/>
-    <routine id="117" parent="1" name="padr"/>
-    <routine id="118" parent="1" name="percent_rank">
-      <FunctionType>window</FunctionType>
-    </routine>
-    <routine id="119" parent="1" name="pi">
+    <routine id="93" parent="1" name="ceiling">
       <Deterministic>1</Deterministic>
     </routine>
-    <routine id="120" parent="1" name="pow">
+    <routine id="94" parent="1" name="total_changes"/>
+    <routine id="95" parent="1" name="changes"/>
+    <routine id="96" parent="1" name="sqlite_version"/>
+    <routine id="97" parent="1" name="degrees">
       <Deterministic>1</Deterministic>
     </routine>
-    <routine id="121" parent="1" name="power">
+    <routine id="98" parent="1" name="floor">
       <Deterministic>1</Deterministic>
     </routine>
-    <routine id="122" parent="1" name="printf">
+    <routine id="99" parent="1" name="coalesce">
       <Deterministic>1</Deterministic>
       <Variadic>1</Variadic>
     </routine>
-    <routine id="123" parent="1" name="proper"/>
-    <routine id="124" parent="1" name="quote">
+    <routine id="100" parent="1" name="glob">
       <Deterministic>1</Deterministic>
     </routine>
-    <routine id="125" parent="1" name="radians">
+    <routine id="101" parent="1" name="zeroblob">
       <Deterministic>1</Deterministic>
     </routine>
-    <routine id="126" parent="1" name="random"/>
-    <routine id="127" parent="1" name="randomblob"/>
-    <routine id="128" parent="1" name="rank">
-      <FunctionType>window</FunctionType>
+    <routine id="102" parent="1" name="hex">
+      <Deterministic>1</Deterministic>
     </routine>
-    <routine id="129" parent="1" name="regexp">
-      <Variadic>1</Variadic>
+    <routine id="103" parent="1" name="iif">
+      <Deterministic>1</Deterministic>
     </routine>
-    <routine id="130" parent="1" name="replace">
+    <routine id="104" parent="1" name="sqlite_source_id"/>
+    <routine id="105" parent="1" name="format">
       <Deterministic>1</Deterministic>
+      <Variadic>1</Variadic>
     </routine>
-    <routine id="131" parent="1" name="replicate"/>
-    <routine id="132" parent="1" name="reverse"/>
-    <routine id="133" parent="1" name="rightstr"/>
-    <routine id="134" parent="1" name="round">
+    <routine id="106" parent="1" name="datetime">
       <Deterministic>1</Deterministic>
+      <Variadic>1</Variadic>
     </routine>
-    <routine id="135" parent="1" name="row_number">
+    <routine id="107" parent="1" name="cume_dist">
       <FunctionType>window</FunctionType>
     </routine>
-    <routine id="136" parent="1" name="rtreecheck">
-      <Variadic>1</Variadic>
+    <routine id="108" parent="1" name="ln">
+      <Deterministic>1</Deterministic>
     </routine>
-    <routine id="137" parent="1" name="rtreedepth"/>
-    <routine id="138" parent="1" name="rtreenode"/>
-    <routine id="139" parent="1" name="rtrim">
+    <routine id="109" parent="1" name="instr">
       <Deterministic>1</Deterministic>
     </routine>
-    <routine id="140" parent="1" name="sign">
+    <routine id="110" parent="1" name="json">
       <Deterministic>1</Deterministic>
     </routine>
-    <routine id="141" parent="1" name="sin">
+    <routine id="111" parent="1" name="dense_rank">
+      <FunctionType>window</FunctionType>
+    </routine>
+    <routine id="112" parent="1" name="log">
       <Deterministic>1</Deterministic>
     </routine>
-    <routine id="142" parent="1" name="sinh">
+    <routine id="113" parent="1" name="ifnull">
       <Deterministic>1</Deterministic>
     </routine>
-    <routine id="143" parent="1" name="snippet">
-      <Variadic>1</Variadic>
+    <routine id="114" parent="1" name="current_date"/>
+    <routine id="115" parent="1" name="current_time"/>
+    <routine id="116" parent="1" name="lag">
+      <FunctionType>window</FunctionType>
     </routine>
-    <routine id="144" parent="1" name="sqlite_compileoption_get"/>
-    <routine id="145" parent="1" name="sqlite_compileoption_used"/>
-    <routine id="146" parent="1" name="sqlite_log">
+    <routine id="117" parent="1" name="lag">
+      <FunctionType>window</FunctionType>
+    </routine>
+    <routine id="118" parent="1" name="mod">
       <Deterministic>1</Deterministic>
     </routine>
-    <routine id="147" parent="1" name="sqlite_source_id"/>
-    <routine id="148" parent="1" name="sqlite_version"/>
-    <routine id="149" parent="1" name="sqrt">
+    <routine id="119" parent="1" name="log2">
       <Deterministic>1</Deterministic>
     </routine>
-    <routine id="150" parent="1" name="square"/>
-    <routine id="151" parent="1" name="stdev">
-      <FunctionType>aggregate</FunctionType>
+    <routine id="120" parent="1" name="like">
+      <Deterministic>1</Deterministic>
     </routine>
-    <routine id="152" parent="1" name="strfilter"/>
-    <routine id="153" parent="1" name="strftime">
+    <routine id="121" parent="1" name="max">
       <Deterministic>1</Deterministic>
       <Variadic>1</Variadic>
     </routine>
-    <routine id="154" parent="1" name="substr">
-      <Deterministic>1</Deterministic>
+    <routine id="122" parent="1" name="max">
+      <FunctionType>window</FunctionType>
     </routine>
-    <routine id="155" parent="1" name="substring">
+    <routine id="123" parent="1" name="min">
       <Deterministic>1</Deterministic>
+      <Variadic>1</Variadic>
     </routine>
-    <routine id="156" parent="1" name="subtype">
-      <Deterministic>1</Deterministic>
+    <routine id="124" parent="1" name="min">
+      <FunctionType>window</FunctionType>
+    </routine>
+    <routine id="125" parent="1" name="lead">
+      <FunctionType>window</FunctionType>
     </routine>
-    <routine id="157" parent="1" name="sum">
+    <routine id="126" parent="1" name="lead">
       <FunctionType>window</FunctionType>
     </routine>
-    <routine id="158" parent="1" name="tan">
+    <routine id="127" parent="1" name="log10">
       <Deterministic>1</Deterministic>
     </routine>
-    <routine id="159" parent="1" name="tanh">
+    <routine id="128" parent="1" name="lower">
       <Deterministic>1</Deterministic>
     </routine>
-    <routine id="160" parent="1" name="time">
+    <routine id="129" parent="1" name="ltrim">
       <Deterministic>1</Deterministic>
-      <Variadic>1</Variadic>
     </routine>
-    <routine id="161" parent="1" name="total">
+    <routine id="130" parent="1" name="first_value">
       <FunctionType>window</FunctionType>
     </routine>
-    <routine id="162" parent="1" name="total_changes"/>
-    <routine id="163" parent="1" name="trim">
-      <Deterministic>1</Deterministic>
-    </routine>
-    <routine id="164" parent="1" name="trunc">
+    <routine id="131" parent="1" name="pi">
       <Deterministic>1</Deterministic>
     </routine>
-    <routine id="165" parent="1" name="typeof">
+    <routine id="132" parent="1" name="length">
       <Deterministic>1</Deterministic>
     </routine>
-    <routine id="166" parent="1" name="unicode">
+    <routine id="133" parent="1" name="likely">
       <Deterministic>1</Deterministic>
     </routine>
-    <routine id="167" parent="1" name="unixepoch">
+    <routine id="134" parent="1" name="json_set">
       <Deterministic>1</Deterministic>
       <Variadic>1</Variadic>
     </routine>
-    <routine id="168" parent="1" name="unlikely">
-      <Deterministic>1</Deterministic>
+    <routine id="135" parent="1" name="upper_quartile">
+      <FunctionType>aggregate</FunctionType>
     </routine>
-    <routine id="169" parent="1" name="upper">
-      <Deterministic>1</Deterministic>
+    <routine id="136" parent="1" name="median">
+      <FunctionType>aggregate</FunctionType>
     </routine>
-    <routine id="170" parent="1" name="upper_quartile">
+    <routine id="137" parent="1" name="stdev">
       <FunctionType>aggregate</FunctionType>
     </routine>
-    <routine id="171" parent="1" name="variance">
+    <routine id="138" parent="1" name="rightstr"/>
+    <routine id="139" parent="1" name="leftstr"/>
+    <routine id="140" parent="1" name="mode">
       <FunctionType>aggregate</FunctionType>
     </routine>
-    <routine id="172" parent="1" name="zeroblob">
-      <Deterministic>1</Deterministic>
+    <routine id="141" parent="1" name="replicate"/>
+    <routine id="142" parent="1" name="padl"/>
+    <routine id="143" parent="1" name="square"/>
+    <routine id="144" parent="1" name="regexp">
+      <Variadic>1</Variadic>
+    </routine>
+    <routine id="145" parent="1" name="strfilter"/>
+    <routine id="146" parent="1" name="difference"/>
+    <routine id="147" parent="1" name="lower_quartile">
+      <FunctionType>aggregate</FunctionType>
+    </routine>
+    <routine id="148" parent="1" name="padr"/>
+    <routine id="149" parent="1" name="rtreedepth"/>
+    <routine id="150" parent="1" name="atn2"/>
+    <routine id="151" parent="1" name="match"/>
+    <routine id="152" parent="1" name="snippet">
+      <Variadic>1</Variadic>
     </routine>
+    <routine id="153" parent="1" name="coth"/>
+    <routine id="154" parent="1" name="fts5_source_id"/>
+    <routine id="155" parent="1" name="offsets"/>
+    <routine id="156" parent="1" name="matchinfo"/>
+    <routine id="157" parent="1" name="matchinfo"/>
+    <routine id="158" parent="1" name="variance">
+      <FunctionType>aggregate</FunctionType>
+    </routine>
+    <routine id="159" parent="1" name="optimize"/>
+    <routine id="160" parent="1" name="padc"/>
+    <routine id="161" parent="1" name="proper"/>
+    <routine id="162" parent="1" name="reverse"/>
+    <routine id="163" parent="1" name="rtreecheck">
+      <Variadic>1</Variadic>
+    </routine>
+    <routine id="164" parent="1" name="rtreenode"/>
+    <routine id="165" parent="1" name="highlight">
+      <Variadic>1</Variadic>
+    </routine>
+    <routine id="166" parent="1" name="bm25">
+      <Variadic>1</Variadic>
+    </routine>
+    <routine id="167" parent="1" name="charindex"/>
+    <routine id="168" parent="1" name="charindex"/>
+    <routine id="169" parent="1" name="cot"/>
+    <routine id="170" parent="1" name="fts3_tokenizer"/>
+    <routine id="171" parent="1" name="fts3_tokenizer"/>
+    <routine id="172" parent="1" name="fts5"/>
     <schema id="173" parent="1" name="main">
       <Current>1</Current>
     </schema>
@@ -455,11 +457,11 @@
     <argument id="181" parent="18">
       <Position>1</Position>
     </argument>
-    <argument id="182" parent="19">
-      <ArgumentDirection>R</ArgumentDirection>
+    <argument id="182" parent="18">
+      <Position>2</Position>
     </argument>
     <argument id="183" parent="19">
-      <Position>1</Position>
+      <ArgumentDirection>R</ArgumentDirection>
     </argument>
     <argument id="184" parent="20">
       <ArgumentDirection>R</ArgumentDirection>
@@ -473,26 +475,26 @@
     <argument id="187" parent="21">
       <Position>1</Position>
     </argument>
-    <argument id="188" parent="22">
-      <ArgumentDirection>R</ArgumentDirection>
+    <argument id="188" parent="21">
+      <Position>2</Position>
     </argument>
     <argument id="189" parent="22">
-      <Position>1</Position>
-    </argument>
-    <argument id="190" parent="23">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="191" parent="23">
+    <argument id="190" parent="22">
       <Position>1</Position>
     </argument>
-    <argument id="192" parent="24">
+    <argument id="191" parent="23">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="193" parent="24">
+    <argument id="192" parent="23">
       <Position>1</Position>
     </argument>
+    <argument id="193" parent="24">
+      <ArgumentDirection>R</ArgumentDirection>
+    </argument>
     <argument id="194" parent="24">
-      <Position>2</Position>
+      <Position>1</Position>
     </argument>
     <argument id="195" parent="25">
       <ArgumentDirection>R</ArgumentDirection>
@@ -500,20 +502,20 @@
     <argument id="196" parent="25">
       <Position>1</Position>
     </argument>
-    <argument id="197" parent="26">
-      <ArgumentDirection>R</ArgumentDirection>
+    <argument id="197" parent="25">
+      <Position>2</Position>
     </argument>
     <argument id="198" parent="26">
-      <Position>1</Position>
+      <ArgumentDirection>R</ArgumentDirection>
     </argument>
     <argument id="199" parent="26">
-      <Position>2</Position>
+      <Position>1</Position>
     </argument>
-    <argument id="200" parent="27">
-      <ArgumentDirection>R</ArgumentDirection>
+    <argument id="200" parent="26">
+      <Position>2</Position>
     </argument>
     <argument id="201" parent="27">
-      <Position>1</Position>
+      <ArgumentDirection>R</ArgumentDirection>
     </argument>
     <argument id="202" parent="28">
       <ArgumentDirection>R</ArgumentDirection>
@@ -524,380 +526,380 @@
     <argument id="204" parent="29">
       <Position>1</Position>
     </argument>
-    <argument id="205" parent="30">
-      <ArgumentDirection>R</ArgumentDirection>
+    <argument id="205" parent="29">
+      <Position>2</Position>
     </argument>
     <argument id="206" parent="30">
-      <Position>1</Position>
-    </argument>
-    <argument id="207" parent="31">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="208" parent="32">
+    <argument id="207" parent="30">
+      <Position>1</Position>
+    </argument>
+    <argument id="208" parent="31">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="209" parent="33">
+    <argument id="209" parent="32">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
     <argument id="210" parent="33">
-      <Position>1</Position>
-    </argument>
-    <argument id="211" parent="33">
-      <Position>2</Position>
+      <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="212" parent="34">
+    <argument id="211" parent="34">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="213" parent="34">
+    <argument id="212" parent="34">
       <Position>1</Position>
     </argument>
-    <argument id="214" parent="34">
+    <argument id="213" parent="34">
       <Position>2</Position>
     </argument>
-    <argument id="215" parent="34">
-      <Position>3</Position>
-    </argument>
-    <argument id="216" parent="35">
+    <argument id="214" parent="35">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="217" parent="36">
-      <ArgumentDirection>R</ArgumentDirection>
-    </argument>
-    <argument id="218" parent="36">
+    <argument id="215" parent="35">
       <Position>1</Position>
     </argument>
-    <argument id="219" parent="37">
+    <argument id="216" parent="36">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="220" parent="37">
+    <argument id="217" parent="36">
       <Position>1</Position>
     </argument>
-    <argument id="221" parent="38">
+    <argument id="218" parent="37">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="222" parent="38">
+    <argument id="219" parent="37">
       <Position>1</Position>
     </argument>
-    <argument id="223" parent="39">
+    <argument id="220" parent="38">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="224" parent="39">
-      <Position>1</Position>
-    </argument>
-    <argument id="225" parent="40">
+    <argument id="221" parent="39">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="226" parent="40">
+    <argument id="222" parent="39">
       <Position>1</Position>
     </argument>
-    <argument id="227" parent="41">
-      <ArgumentDirection>R</ArgumentDirection>
+    <argument id="223" parent="39">
+      <Position>2</Position>
     </argument>
-    <argument id="228" parent="42">
+    <argument id="224" parent="40">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="229" parent="43">
+    <argument id="225" parent="41">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="230" parent="44">
+    <argument id="226" parent="42">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="231" parent="45">
-      <ArgumentDirection>R</ArgumentDirection>
+    <argument id="227" parent="42">
+      <Position>1</Position>
     </argument>
-    <argument id="232" parent="46">
+    <argument id="228" parent="43">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="233" parent="47">
+    <argument id="229" parent="44">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="234" parent="47">
+    <argument id="230" parent="44">
       <Position>1</Position>
     </argument>
-    <argument id="235" parent="48">
-      <ArgumentDirection>R</ArgumentDirection>
-    </argument>
-    <argument id="236" parent="49">
+    <argument id="231" parent="45">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="237" parent="49">
+    <argument id="232" parent="45">
       <Position>1</Position>
     </argument>
-    <argument id="238" parent="49">
-      <Position>2</Position>
-    </argument>
-    <argument id="239" parent="50">
+    <argument id="233" parent="46">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="240" parent="50">
+    <argument id="234" parent="46">
       <Position>1</Position>
     </argument>
-    <argument id="241" parent="51">
+    <argument id="235" parent="47">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="242" parent="51">
+    <argument id="236" parent="47">
       <Position>1</Position>
     </argument>
-    <argument id="243" parent="52">
+    <argument id="237" parent="48">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="244" parent="52">
+    <argument id="238" parent="48">
       <Position>1</Position>
     </argument>
-    <argument id="245" parent="53">
-      <ArgumentDirection>R</ArgumentDirection>
+    <argument id="239" parent="48">
+      <Position>2</Position>
     </argument>
-    <argument id="246" parent="54">
+    <argument id="240" parent="49">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="247" parent="54">
+    <argument id="241" parent="49">
       <Position>1</Position>
     </argument>
-    <argument id="248" parent="55">
+    <argument id="242" parent="49">
+      <Position>2</Position>
+    </argument>
+    <argument id="243" parent="50">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="249" parent="55">
+    <argument id="244" parent="50">
       <Position>1</Position>
     </argument>
-    <argument id="250" parent="55">
+    <argument id="245" parent="50">
       <Position>2</Position>
     </argument>
-    <argument id="251" parent="56">
+    <argument id="246" parent="51">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="252" parent="56">
+    <argument id="247" parent="51">
       <Position>1</Position>
     </argument>
-    <argument id="253" parent="57">
+    <argument id="248" parent="52">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="254" parent="58">
+    <argument id="249" parent="53">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="255" parent="58">
+    <argument id="250" parent="53">
       <Position>1</Position>
     </argument>
-    <argument id="256" parent="58">
+    <argument id="251" parent="53">
       <Position>2</Position>
     </argument>
-    <argument id="257" parent="59">
+    <argument id="252" parent="54">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="258" parent="59">
-      <Position>1</Position>
+    <argument id="253" parent="55">
+      <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="259" parent="59">
-      <Position>2</Position>
+    <argument id="254" parent="55">
+      <Position>1</Position>
     </argument>
-    <argument id="260" parent="60">
+    <argument id="255" parent="56">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="261" parent="60">
+    <argument id="256" parent="56">
       <Position>1</Position>
     </argument>
-    <argument id="262" parent="61">
+    <argument id="257" parent="57">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="263" parent="62">
+    <argument id="258" parent="57">
+      <Position>1</Position>
+    </argument>
+    <argument id="259" parent="58">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="264" parent="62">
+    <argument id="260" parent="58">
       <Position>1</Position>
     </argument>
-    <argument id="265" parent="62">
+    <argument id="261" parent="58">
       <Position>2</Position>
     </argument>
-    <argument id="266" parent="63">
+    <argument id="262" parent="58">
+      <Position>3</Position>
+    </argument>
+    <argument id="263" parent="59">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="267" parent="63">
+    <argument id="264" parent="59">
       <Position>1</Position>
     </argument>
-    <argument id="268" parent="63">
+    <argument id="265" parent="59">
       <Position>2</Position>
     </argument>
-    <argument id="269" parent="63">
+    <argument id="266" parent="59">
       <Position>3</Position>
     </argument>
-    <argument id="270" parent="64">
+    <argument id="267" parent="60">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="271" parent="64">
+    <argument id="268" parent="60">
       <Position>1</Position>
     </argument>
-    <argument id="272" parent="64">
-      <Position>2</Position>
-    </argument>
-    <argument id="273" parent="65">
+    <argument id="269" parent="61">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="274" parent="65">
+    <argument id="270" parent="61">
       <Position>1</Position>
     </argument>
-    <argument id="275" parent="66">
+    <argument id="271" parent="62">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="276" parent="67">
+    <argument id="272" parent="62">
+      <Position>1</Position>
+    </argument>
+    <argument id="273" parent="63">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="277" parent="67">
+    <argument id="274" parent="63">
       <Position>1</Position>
     </argument>
-    <argument id="278" parent="67">
+    <argument id="275" parent="63">
       <Position>2</Position>
     </argument>
-    <argument id="279" parent="68">
-      <ArgumentDirection>R</ArgumentDirection>
-    </argument>
-    <argument id="280" parent="69">
+    <argument id="276" parent="64">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="281" parent="69">
+    <argument id="277" parent="64">
       <Position>1</Position>
     </argument>
-    <argument id="282" parent="70">
+    <argument id="278" parent="65">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="283" parent="70">
+    <argument id="279" parent="65">
       <Position>1</Position>
     </argument>
-    <argument id="284" parent="70">
-      <Position>2</Position>
-    </argument>
-    <argument id="285" parent="71">
+    <argument id="280" parent="66">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="286" parent="72">
-      <ArgumentDirection>R</ArgumentDirection>
+    <argument id="281" parent="66">
+      <Position>1</Position>
     </argument>
-    <argument id="287" parent="73">
+    <argument id="282" parent="67">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="288" parent="73">
+    <argument id="283" parent="67">
       <Position>1</Position>
     </argument>
-    <argument id="289" parent="73">
+    <argument id="284" parent="67">
       <Position>2</Position>
     </argument>
-    <argument id="290" parent="74">
+    <argument id="285" parent="68">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="291" parent="74">
+    <argument id="286" parent="68">
       <Position>1</Position>
     </argument>
-    <argument id="292" parent="75">
-      <ArgumentDirection>R</ArgumentDirection>
-    </argument>
-    <argument id="293" parent="76">
-      <ArgumentDirection>R</ArgumentDirection>
+    <argument id="287" parent="68">
+      <Position>2</Position>
     </argument>
-    <argument id="294" parent="77">
+    <argument id="288" parent="69">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="295" parent="78">
+    <argument id="289" parent="70">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="296" parent="78">
+    <argument id="290" parent="70">
       <Position>1</Position>
     </argument>
-    <argument id="297" parent="78">
-      <Position>2</Position>
-    </argument>
-    <argument id="298" parent="79">
+    <argument id="291" parent="71">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="299" parent="79">
+    <argument id="292" parent="71">
       <Position>1</Position>
     </argument>
-    <argument id="300" parent="80">
+    <argument id="293" parent="72">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="301" parent="81">
+    <argument id="294" parent="72">
+      <Position>1</Position>
+    </argument>
+    <argument id="295" parent="73">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="302" parent="81">
+    <argument id="296" parent="73">
       <Position>1</Position>
     </argument>
-    <argument id="303" parent="81">
+    <argument id="297" parent="73">
       <Position>2</Position>
     </argument>
-    <argument id="304" parent="82">
+    <argument id="298" parent="73">
+      <Position>3</Position>
+    </argument>
+    <argument id="299" parent="74">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="305" parent="82">
+    <argument id="300" parent="74">
       <Position>1</Position>
     </argument>
-    <argument id="306" parent="82">
-      <Position>2</Position>
+    <argument id="301" parent="75">
+      <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="307" parent="82">
-      <Position>3</Position>
+    <argument id="302" parent="75">
+      <Position>1</Position>
+    </argument>
+    <argument id="303" parent="76">
+      <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="308" parent="83">
+    <argument id="304" parent="77">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="309" parent="84">
+    <argument id="305" parent="78">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="310" parent="84">
+    <argument id="306" parent="78">
       <Position>1</Position>
     </argument>
-    <argument id="311" parent="85">
+    <argument id="307" parent="79">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="312" parent="85">
+    <argument id="308" parent="79">
       <Position>1</Position>
     </argument>
-    <argument id="313" parent="85">
-      <Position>2</Position>
+    <argument id="309" parent="80">
+      <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="314" parent="86">
+    <argument id="310" parent="80">
+      <Position>1</Position>
+    </argument>
+    <argument id="311" parent="81">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="315" parent="86">
+    <argument id="312" parent="81">
       <Position>1</Position>
     </argument>
-    <argument id="316" parent="86">
+    <argument id="313" parent="82">
+      <ArgumentDirection>R</ArgumentDirection>
+    </argument>
+    <argument id="314" parent="82">
+      <Position>1</Position>
+    </argument>
+    <argument id="315" parent="82">
       <Position>2</Position>
     </argument>
-    <argument id="317" parent="86">
-      <Position>3</Position>
+    <argument id="316" parent="83">
+      <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="318" parent="87">
+    <argument id="317" parent="84">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="319" parent="87">
+    <argument id="318" parent="84">
       <Position>1</Position>
     </argument>
-    <argument id="320" parent="87">
+    <argument id="319" parent="84">
       <Position>2</Position>
     </argument>
-    <argument id="321" parent="88">
+    <argument id="320" parent="85">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="322" parent="88">
+    <argument id="321" parent="85">
       <Position>1</Position>
     </argument>
-    <argument id="323" parent="89">
+    <argument id="322" parent="86">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="324" parent="89">
+    <argument id="323" parent="86">
       <Position>1</Position>
     </argument>
-    <argument id="325" parent="89">
-      <Position>2</Position>
+    <argument id="324" parent="87">
+      <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="326" parent="89">
-      <Position>3</Position>
+    <argument id="325" parent="87">
+      <Position>1</Position>
+    </argument>
+    <argument id="326" parent="88">
+      <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="327" parent="90">
+    <argument id="327" parent="89">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
     <argument id="328" parent="90">
-      <Position>1</Position>
+      <ArgumentDirection>R</ArgumentDirection>
     </argument>
     <argument id="329" parent="90">
-      <Position>2</Position>
+      <Position>1</Position>
     </argument>
     <argument id="330" parent="91">
       <ArgumentDirection>R</ArgumentDirection>
@@ -908,506 +910,506 @@
     <argument id="332" parent="92">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="333" parent="92">
-      <Position>1</Position>
-    </argument>
-    <argument id="334" parent="93">
+    <argument id="333" parent="93">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="335" parent="93">
+    <argument id="334" parent="93">
       <Position>1</Position>
     </argument>
-    <argument id="336" parent="93">
-      <Position>2</Position>
-    </argument>
-    <argument id="337" parent="94">
+    <argument id="335" parent="94">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="338" parent="94">
-      <Position>1</Position>
-    </argument>
-    <argument id="339" parent="94">
-      <Position>2</Position>
-    </argument>
-    <argument id="340" parent="95">
+    <argument id="336" parent="95">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="341" parent="95">
-      <Position>1</Position>
+    <argument id="337" parent="96">
+      <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="342" parent="96">
+    <argument id="338" parent="97">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="343" parent="96">
+    <argument id="339" parent="97">
       <Position>1</Position>
     </argument>
-    <argument id="344" parent="97">
+    <argument id="340" parent="98">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="345" parent="97">
+    <argument id="341" parent="98">
       <Position>1</Position>
     </argument>
-    <argument id="346" parent="98">
+    <argument id="342" parent="99">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="347" parent="98">
-      <Position>1</Position>
-    </argument>
-    <argument id="348" parent="99">
+    <argument id="343" parent="100">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="349" parent="99">
+    <argument id="344" parent="100">
       <Position>1</Position>
     </argument>
-    <argument id="350" parent="99">
+    <argument id="345" parent="100">
       <Position>2</Position>
     </argument>
-    <argument id="351" parent="100">
+    <argument id="346" parent="101">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="352" parent="100">
+    <argument id="347" parent="101">
       <Position>1</Position>
     </argument>
-    <argument id="353" parent="100">
-      <Position>2</Position>
-    </argument>
-    <argument id="354" parent="101">
+    <argument id="348" parent="102">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="355" parent="101">
+    <argument id="349" parent="102">
       <Position>1</Position>
     </argument>
-    <argument id="356" parent="102">
+    <argument id="350" parent="103">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="357" parent="102">
+    <argument id="351" parent="103">
       <Position>1</Position>
     </argument>
-    <argument id="358" parent="102">
+    <argument id="352" parent="103">
       <Position>2</Position>
     </argument>
-    <argument id="359" parent="103">
-      <ArgumentDirection>R</ArgumentDirection>
+    <argument id="353" parent="103">
+      <Position>3</Position>
     </argument>
-    <argument id="360" parent="104">
+    <argument id="354" parent="104">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="361" parent="104">
-      <Position>1</Position>
-    </argument>
-    <argument id="362" parent="105">
+    <argument id="355" parent="105">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="363" parent="105">
-      <Position>1</Position>
+    <argument id="356" parent="106">
+      <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="364" parent="106">
+    <argument id="357" parent="107">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="365" parent="107">
+    <argument id="358" parent="108">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="366" parent="107">
+    <argument id="359" parent="108">
       <Position>1</Position>
     </argument>
-    <argument id="367" parent="108">
+    <argument id="360" parent="109">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="368" parent="108">
+    <argument id="361" parent="109">
       <Position>1</Position>
     </argument>
-    <argument id="369" parent="108">
+    <argument id="362" parent="109">
       <Position>2</Position>
     </argument>
-    <argument id="370" parent="109">
+    <argument id="363" parent="110">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="371" parent="109">
+    <argument id="364" parent="110">
       <Position>1</Position>
     </argument>
-    <argument id="372" parent="110">
+    <argument id="365" parent="111">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="373" parent="110">
-      <Position>1</Position>
-    </argument>
-    <argument id="374" parent="110">
-      <Position>2</Position>
-    </argument>
-    <argument id="375" parent="111">
+    <argument id="366" parent="112">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="376" parent="111">
+    <argument id="367" parent="112">
       <Position>1</Position>
     </argument>
-    <argument id="377" parent="112">
+    <argument id="368" parent="112">
+      <Position>2</Position>
+    </argument>
+    <argument id="369" parent="113">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="378" parent="112">
+    <argument id="370" parent="113">
       <Position>1</Position>
     </argument>
-    <argument id="379" parent="112">
+    <argument id="371" parent="113">
       <Position>2</Position>
     </argument>
-    <argument id="380" parent="113">
+    <argument id="372" parent="114">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="381" parent="113">
-      <Position>1</Position>
-    </argument>
-    <argument id="382" parent="114">
+    <argument id="373" parent="115">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="383" parent="114">
-      <Position>1</Position>
-    </argument>
-    <argument id="384" parent="115">
+    <argument id="374" parent="116">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="385" parent="115">
+    <argument id="375" parent="116">
       <Position>1</Position>
     </argument>
-    <argument id="386" parent="115">
+    <argument id="376" parent="116">
       <Position>2</Position>
     </argument>
-    <argument id="387" parent="116">
+    <argument id="377" parent="117">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="388" parent="116">
+    <argument id="378" parent="117">
       <Position>1</Position>
     </argument>
-    <argument id="389" parent="116">
+    <argument id="379" parent="117">
       <Position>2</Position>
     </argument>
-    <argument id="390" parent="117">
+    <argument id="380" parent="117">
+      <Position>3</Position>
+    </argument>
+    <argument id="381" parent="118">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="391" parent="117">
+    <argument id="382" parent="118">
       <Position>1</Position>
     </argument>
-    <argument id="392" parent="117">
+    <argument id="383" parent="118">
       <Position>2</Position>
     </argument>
-    <argument id="393" parent="118">
+    <argument id="384" parent="119">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="394" parent="119">
-      <ArgumentDirection>R</ArgumentDirection>
+    <argument id="385" parent="119">
+      <Position>1</Position>
     </argument>
-    <argument id="395" parent="120">
+    <argument id="386" parent="120">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="396" parent="120">
+    <argument id="387" parent="120">
       <Position>1</Position>
     </argument>
-    <argument id="397" parent="120">
+    <argument id="388" parent="120">
       <Position>2</Position>
     </argument>
-    <argument id="398" parent="121">
+    <argument id="389" parent="120">
+      <Position>3</Position>
+    </argument>
+    <argument id="390" parent="121">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="399" parent="121">
-      <Position>1</Position>
+    <argument id="391" parent="122">
+      <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="400" parent="121">
-      <Position>2</Position>
+    <argument id="392" parent="122">
+      <Position>1</Position>
     </argument>
-    <argument id="401" parent="122">
+    <argument id="393" parent="123">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="402" parent="123">
+    <argument id="394" parent="124">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="403" parent="123">
+    <argument id="395" parent="124">
       <Position>1</Position>
     </argument>
-    <argument id="404" parent="124">
+    <argument id="396" parent="125">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="405" parent="124">
+    <argument id="397" parent="125">
       <Position>1</Position>
     </argument>
-    <argument id="406" parent="125">
+    <argument id="398" parent="125">
+      <Position>2</Position>
+    </argument>
+    <argument id="399" parent="126">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="407" parent="125">
+    <argument id="400" parent="126">
       <Position>1</Position>
     </argument>
-    <argument id="408" parent="126">
-      <ArgumentDirection>R</ArgumentDirection>
+    <argument id="401" parent="126">
+      <Position>2</Position>
+    </argument>
+    <argument id="402" parent="126">
+      <Position>3</Position>
     </argument>
-    <argument id="409" parent="127">
+    <argument id="403" parent="127">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="410" parent="127">
+    <argument id="404" parent="127">
       <Position>1</Position>
     </argument>
-    <argument id="411" parent="128">
+    <argument id="405" parent="128">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="412" parent="129">
-      <ArgumentDirection>R</ArgumentDirection>
+    <argument id="406" parent="128">
+      <Position>1</Position>
     </argument>
-    <argument id="413" parent="130">
+    <argument id="407" parent="129">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="414" parent="130">
+    <argument id="408" parent="129">
       <Position>1</Position>
     </argument>
-    <argument id="415" parent="130">
+    <argument id="409" parent="129">
       <Position>2</Position>
     </argument>
-    <argument id="416" parent="130">
-      <Position>3</Position>
-    </argument>
-    <argument id="417" parent="131">
+    <argument id="410" parent="130">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="418" parent="131">
+    <argument id="411" parent="130">
       <Position>1</Position>
     </argument>
-    <argument id="419" parent="131">
-      <Position>2</Position>
+    <argument id="412" parent="131">
+      <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="420" parent="132">
+    <argument id="413" parent="132">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="421" parent="132">
+    <argument id="414" parent="132">
       <Position>1</Position>
     </argument>
-    <argument id="422" parent="133">
+    <argument id="415" parent="133">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="423" parent="133">
+    <argument id="416" parent="133">
       <Position>1</Position>
     </argument>
-    <argument id="424" parent="133">
-      <Position>2</Position>
+    <argument id="417" parent="134">
+      <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="425" parent="134">
+    <argument id="418" parent="135">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="426" parent="134">
+    <argument id="419" parent="135">
       <Position>1</Position>
     </argument>
-    <argument id="427" parent="134">
-      <Position>2</Position>
-    </argument>
-    <argument id="428" parent="135">
+    <argument id="420" parent="136">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="429" parent="136">
-      <ArgumentDirection>R</ArgumentDirection>
+    <argument id="421" parent="136">
+      <Position>1</Position>
     </argument>
-    <argument id="430" parent="137">
+    <argument id="422" parent="137">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="431" parent="137">
+    <argument id="423" parent="137">
       <Position>1</Position>
     </argument>
-    <argument id="432" parent="138">
+    <argument id="424" parent="138">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="433" parent="138">
+    <argument id="425" parent="138">
       <Position>1</Position>
     </argument>
-    <argument id="434" parent="138">
+    <argument id="426" parent="138">
       <Position>2</Position>
     </argument>
-    <argument id="435" parent="139">
+    <argument id="427" parent="139">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="436" parent="139">
+    <argument id="428" parent="139">
       <Position>1</Position>
     </argument>
-    <argument id="437" parent="139">
+    <argument id="429" parent="139">
       <Position>2</Position>
     </argument>
-    <argument id="438" parent="140">
+    <argument id="430" parent="140">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="439" parent="140">
+    <argument id="431" parent="140">
       <Position>1</Position>
     </argument>
-    <argument id="440" parent="141">
+    <argument id="432" parent="141">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="441" parent="141">
+    <argument id="433" parent="141">
       <Position>1</Position>
     </argument>
-    <argument id="442" parent="142">
+    <argument id="434" parent="141">
+      <Position>2</Position>
+    </argument>
+    <argument id="435" parent="142">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="443" parent="142">
+    <argument id="436" parent="142">
       <Position>1</Position>
     </argument>
-    <argument id="444" parent="143">
-      <ArgumentDirection>R</ArgumentDirection>
+    <argument id="437" parent="142">
+      <Position>2</Position>
     </argument>
-    <argument id="445" parent="144">
+    <argument id="438" parent="143">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="446" parent="144">
+    <argument id="439" parent="143">
       <Position>1</Position>
     </argument>
-    <argument id="447" parent="145">
+    <argument id="440" parent="144">
+      <ArgumentDirection>R</ArgumentDirection>
+    </argument>
+    <argument id="441" parent="145">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="448" parent="145">
+    <argument id="442" parent="145">
       <Position>1</Position>
     </argument>
-    <argument id="449" parent="146">
+    <argument id="443" parent="145">
+      <Position>2</Position>
+    </argument>
+    <argument id="444" parent="146">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="450" parent="146">
+    <argument id="445" parent="146">
       <Position>1</Position>
     </argument>
-    <argument id="451" parent="146">
+    <argument id="446" parent="146">
       <Position>2</Position>
     </argument>
-    <argument id="452" parent="147">
+    <argument id="447" parent="147">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="453" parent="148">
-      <ArgumentDirection>R</ArgumentDirection>
+    <argument id="448" parent="147">
+      <Position>1</Position>
     </argument>
-    <argument id="454" parent="149">
+    <argument id="449" parent="148">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="455" parent="149">
+    <argument id="450" parent="148">
       <Position>1</Position>
     </argument>
-    <argument id="456" parent="150">
+    <argument id="451" parent="148">
+      <Position>2</Position>
+    </argument>
+    <argument id="452" parent="149">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="457" parent="150">
+    <argument id="453" parent="149">
       <Position>1</Position>
     </argument>
-    <argument id="458" parent="151">
+    <argument id="454" parent="150">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="459" parent="151">
+    <argument id="455" parent="150">
       <Position>1</Position>
     </argument>
-    <argument id="460" parent="152">
+    <argument id="456" parent="150">
+      <Position>2</Position>
+    </argument>
+    <argument id="457" parent="151">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="461" parent="152">
+    <argument id="458" parent="151">
       <Position>1</Position>
     </argument>
-    <argument id="462" parent="152">
+    <argument id="459" parent="151">
       <Position>2</Position>
     </argument>
-    <argument id="463" parent="153">
+    <argument id="460" parent="152">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="464" parent="154">
+    <argument id="461" parent="153">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="465" parent="154">
+    <argument id="462" parent="153">
       <Position>1</Position>
     </argument>
-    <argument id="466" parent="154">
-      <Position>2</Position>
+    <argument id="463" parent="154">
+      <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="467" parent="154">
-      <Position>3</Position>
+    <argument id="464" parent="155">
+      <ArgumentDirection>R</ArgumentDirection>
+    </argument>
+    <argument id="465" parent="155">
+      <Position>1</Position>
     </argument>
-    <argument id="468" parent="155">
+    <argument id="466" parent="156">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="469" parent="155">
+    <argument id="467" parent="156">
       <Position>1</Position>
     </argument>
-    <argument id="470" parent="155">
+    <argument id="468" parent="156">
       <Position>2</Position>
     </argument>
-    <argument id="471" parent="155">
-      <Position>3</Position>
-    </argument>
-    <argument id="472" parent="156">
+    <argument id="469" parent="157">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="473" parent="156">
+    <argument id="470" parent="157">
       <Position>1</Position>
     </argument>
-    <argument id="474" parent="157">
+    <argument id="471" parent="158">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="475" parent="157">
+    <argument id="472" parent="158">
       <Position>1</Position>
     </argument>
-    <argument id="476" parent="158">
+    <argument id="473" parent="159">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="477" parent="158">
+    <argument id="474" parent="159">
       <Position>1</Position>
     </argument>
-    <argument id="478" parent="159">
+    <argument id="475" parent="160">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="479" parent="159">
+    <argument id="476" parent="160">
       <Position>1</Position>
     </argument>
-    <argument id="480" parent="160">
+    <argument id="477" parent="160">
+      <Position>2</Position>
+    </argument>
+    <argument id="478" parent="161">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="481" parent="161">
+    <argument id="479" parent="161">
+      <Position>1</Position>
+    </argument>
+    <argument id="480" parent="162">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="482" parent="161">
+    <argument id="481" parent="162">
       <Position>1</Position>
     </argument>
-    <argument id="483" parent="162">
+    <argument id="482" parent="163">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="484" parent="163">
+    <argument id="483" parent="164">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="485" parent="163">
+    <argument id="484" parent="164">
       <Position>1</Position>
     </argument>
-    <argument id="486" parent="163">
+    <argument id="485" parent="164">
       <Position>2</Position>
     </argument>
-    <argument id="487" parent="164">
+    <argument id="486" parent="165">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="488" parent="164">
-      <Position>1</Position>
+    <argument id="487" parent="166">
+      <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="489" parent="165">
+    <argument id="488" parent="167">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="490" parent="165">
+    <argument id="489" parent="167">
       <Position>1</Position>
     </argument>
-    <argument id="491" parent="166">
-      <ArgumentDirection>R</ArgumentDirection>
+    <argument id="490" parent="167">
+      <Position>2</Position>
     </argument>
-    <argument id="492" parent="166">
-      <Position>1</Position>
+    <argument id="491" parent="167">
+      <Position>3</Position>
     </argument>
-    <argument id="493" parent="167">
+    <argument id="492" parent="168">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
+    <argument id="493" parent="168">
+      <Position>1</Position>
+    </argument>
     <argument id="494" parent="168">
+      <Position>2</Position>
+    </argument>
+    <argument id="495" parent="169">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="495" parent="168">
+    <argument id="496" parent="169">
       <Position>1</Position>
     </argument>
-    <argument id="496" parent="169">
+    <argument id="497" parent="170">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="497" parent="169">
-      <Position>1</Position>
-    </argument>
     <argument id="498" parent="170">
-      <ArgumentDirection>R</ArgumentDirection>
+      <Position>1</Position>
     </argument>
     <argument id="499" parent="170">
-      <Position>1</Position>
+      <Position>2</Position>
     </argument>
     <argument id="500" parent="171">
       <ArgumentDirection>R</ArgumentDirection>
@@ -1421,70 +1423,5 @@
     <argument id="503" parent="172">
       <Position>1</Position>
     </argument>
-    <table id="504" parent="173" name="Dictionary"/>
-    <table id="505" parent="173" name="settings"/>
-    <table id="506" parent="173" name="sqlite_master">
-      <System>1</System>
-    </table>
-    <column id="507" parent="504" name="guild_id">
-      <DasType>integer|0s</DasType>
-      <Position>1</Position>
-    </column>
-    <column id="508" parent="504" name="word">
-      <DasType>text|0s</DasType>
-      <Position>2</Position>
-    </column>
-    <column id="509" parent="504" name="reading">
-      <Position>3</Position>
-    </column>
-    <column id="510" parent="505" name="id">
-      <DasType>integer|0s</DasType>
-      <NotNull>1</NotNull>
-      <Position>1</Position>
-    </column>
-    <column id="511" parent="505" name="voice">
-      <DasType>TEXT|0s</DasType>
-      <Position>2</Position>
-    </column>
-    <column id="512" parent="505" name="speed">
-      <DasType>real|0s</DasType>
-      <Position>3</Position>
-    </column>
-    <column id="513" parent="505" name="intonation">
-      <DasType>real|0s</DasType>
-      <Position>4</Position>
-    </column>
-    <column id="514" parent="505" name="voiceQualityA">
-      <DasType>real|0s</DasType>
-      <Position>5</Position>
-    </column>
-    <column id="515" parent="505" name="voiceQualityFm">
-      <DasType>real|0s</DasType>
-      <Position>6</Position>
-    </column>
-    <key id="516" parent="505" name="settings_pk">
-      <ColNames>id</ColNames>
-      <Primary>1</Primary>
-    </key>
-    <column id="517" parent="506" name="type">
-      <DasType>TEXT|0s</DasType>
-      <Position>1</Position>
-    </column>
-    <column id="518" parent="506" name="name">
-      <DasType>TEXT|0s</DasType>
-      <Position>2</Position>
-    </column>
-    <column id="519" parent="506" name="tbl_name">
-      <DasType>TEXT|0s</DasType>
-      <Position>3</Position>
-    </column>
-    <column id="520" parent="506" name="rootpage">
-      <DasType>INT|0s</DasType>
-      <Position>4</Position>
-    </column>
-    <column id="521" parent="506" name="sql">
-      <DasType>TEXT|0s</DasType>
-      <Position>5</Position>
-    </column>
   </database-model>
 </dataSource>
\ No newline at end of file
diff --git a/.idea/dataSources/bcae6d7f-dd17-487e-ab3f-743f9b393d89/entities/entities.dat b/.idea/dataSources/bcae6d7f-dd17-487e-ab3f-743f9b393d89/entities/entities.dat
deleted file mode 100644
index 4381c2c8e58dbcfb53472238f0384c00a37f0a1d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4096
zcmbR3vzzZXBLl-fAclbkAmcv}fcPL91VC(L095`TNejbYAm<T3L<LN|b1|}xQTAvE
ojE2By2#kinXb6mkz-S1JhQMeDjE2By2#kinXb6mkz(9on026N%Jpcdz

diff --git a/.idea/dataSources/bcae6d7f-dd17-487e-ab3f-743f9b393d89/entities/entities.dat.len b/.idea/dataSources/bcae6d7f-dd17-487e-ab3f-743f9b393d89/entities/entities.dat.len
deleted file mode 100644
index 24095040dfdacf27b7a8c408d735b3512ae86fdc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8
LcmZQz0D}Yo0B8VV

diff --git a/.idea/dataSources/bcae6d7f-dd17-487e-ab3f-743f9b393d89/entities/entities.dat.values b/.idea/dataSources/bcae6d7f-dd17-487e-ab3f-743f9b393d89/entities/entities.dat.values
deleted file mode 100644
index b7d7387e1eccd17a8db46a2dc6b58c195d0fda51..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5741
zcmeHKdvF`Y8UOa~_9UHjUQ2PJ#EBv&Aun5wZOM`)@{kidel&@d7fDkf;w+u*!>2pv
zbaLz_)L|eG3MGUBZZfpVP=-z^rKADEqdXFlOiH0Jg&{yg3rzz<A1SYa((>r8WIFv5
z|JND#!@u=@_x*PFd+zG5o8FmI2OX-CRjsPEYR0s(Rc)qKwOY0ETHaO-yF<zMtx^Uy
zD0)F%XPcJNt4;&QU=_S!8mPWZ%eE9Oi|WmUBnrcHa0MgNK?*i9h%$&VXkrkjkW4_}
z9dIPMhWa45gAEMA3?d8~8AKVx7&I}6Qy?)!)y54G#uyhgGRC+d${6E<7-NhJniykT
z5NC{WL4q;9B%~4vnEs~ZNbwEz^;O^rHZTY?h%jhm5M>Z!(8M54fixqkJ8lRw#<(ED
z7~_IQ#uyhw8Dm@!V~lY@6Jv}E;*2paNHE5i1hT_JBSE1qT;Gh`<H8*rE#WWtU;j7e
z$p0rt)P)nxZk7vU@ITT1LPpyu3*p!BmGVI&i}}~^Rq{bywEoFC^kK7OHofFZKyx6<
zT7R^@x$?hX#)R*4(fS0`fzYMoR3WEmhNB{R1!|De1IqN|dpNCSQ9VxgYerVgXZqBf
z0@V%hkkqPWY|S(jYq%DC;aYed+e){t!Z*OV+RSV7U<PXFgOAFby#-Cr(p8+Timj|4
z9#AFCu+?7G+FqaU1o)(yTLGhD#?%Wr16o#sH@p(sgsrC40cnS=4%y2=_O~quZ)7>_
zbXfGks~NpF0qFprZyrW_oO#u@spt`K^T^+20mq{t_bKq#Il4@{tDx&wAvjkfIgr0~
zHE<5pg9lA5qdp0%)-V6&dM6@n;N+ZWBhC+~Y8Oh;E%Y|JXXg#zZR|quEUKq=zKg_t
zKvsa)zmh_f{>f)x@0x<5YxeNcE|}_H)dk*I7fdeeg1WX`3a0v&UO*M@3uquc(C=(9
z^*H}rp3}09)s~i{etQH7-F&|~46zpYSd{Zy=t^ojr_jf{C9WH$LoN>PB<K8)<C0vv
zU=I&mK!i^CYdErycP0%bw;ZPV+t(v5!lj*dx1R2Vpz~Uui*dW0mTB4pO7G3EMAVFD
zc=t=-U$zgZW*bkpdKHmM<n_fz(F8Jz_U6?s1=Yx?`%$?+{2k!;BXA?>DWNhl$om@_
zf%_Go;;B*uB;LSV#bupcOV@6y0bvxcanac6TX^9B9ud1zElbxe4}se^|6?%m+VyKY
zSJlv2v<Cjg^GbJKZdIvyInAKIQMAlM96wil*X6Lx0u7-G4d7jB^%ipUS4pd8skP!f
zw6-67vFT`*Q<)2MVO|w-T_eiX;G1&`bP7tw+>Xgk2nL&W!Xzf1yA#UsPMF;H3Xok?
z9^X}zV>e3XHDf2#1QR9AF$uLY7@ow*v$%#ONc3~T`F>6yH2_#fb+#fSiR^}QKJ1`_
zSFQm}P|8+}@U6&2_RtR>3Uu&Ng5=x-jORQ8<T$G3KN851B11fm$i-;Ew8rN-(#biP
zs&p};OZgHG;c8wP?De!2jJE}NMH&&e(lRr*evU%H=t=N1rG^9WoY0*MN1YoKOH;BB
zVwvpY%E|Yzn98V{egQ&q7Ly~0tqkZdt`SG3PceE`zbKJ6p<M36JeDpKsL*mc$mOU>
z{ucJtoIvHSt&pbMsYBhUCK%p~{d57hYa(A(1LP<ymNS@4;Y22sjxy6Ef8<KUHt{Xr
zj}AIBrlPC)j9S691;S^rZ}v6_@}D|A<V}tQ!Xub$L=I|za5pBOIc4TWc|E2B6N)nO
z+lP@5bmP4ejZ?YYjOj4;DQGWogaY9!zR>n9tmI6bF$;!$qnHea3m6=K@;Y{u4wJkc
z4!SZlXVO_Me+ZV!4`Sbf0?hPeF09#@&MLP06CiWB8S;;@Ckyj!%~?jWP!)*Wg?*9J
zP~kldkcD*KR&oP(PXO`(H#rdDu<(`$^AUMLXbVJM5QHuaTLI1j*#_<MX+elP(^<9G
zQsd6rK;)1>X7VESo3HsidP2&oMqW)@iqZcRpA1AE6)Hl5uv+WsQLWF*$$Bm%-zE^g
z7%<6okAw1rk8zzkg!x+XlHjLvzMkLV?$NBgogN(6KpsHN^2-8QS90j9a=J%1P3!k4
zB!9xvkGaiP-^cx<tjEqr(ze;J8rrwjeGm#X&c|dQu%pponY@P0iYe&&lw<o2I8&4p
zeG%2vHHN#(CQ+HM_C-|g-VG)-Fk@ynJ3_(6gBVD+lhuV=YDV$~+VLL-fBD0ZN*ku}
zIMkBQO6em#4)id5*JQ8jaY(5{1J>1Lu|Q)`^j%zyCdxV`*cp8Qn&dOsbrw=Rrk>U5
z>@mzg>h*fg!ibhvbfb_nsqnkl*R%q8B@<GXxm7z0abjZE6VY_uELa(p-YFrWCJ;3-
ze=oXB=+({c`&~q*_3(i}B%zqOu9YmEeamh|&v|-jml;TBOe3Ql@H7XbJ!41yEl`7m
zpHE5lsY83wBDn>Vy+u#+bGTo)`n29Yo&MP>9}7gMVPE`tG$Lv}2EAA?)t-(CE`?G$
z#j093g_4@qa|{;ACML&9-j<FP3&_<mfu4q+h%d*Qk+(NZBrQTneixGqV`>+Q-uok$
z7Ou>j#(i}8R*@Vp1-M<}%cW7!(~4y&!#@PFn{SdwL|@BQFv)urY)|W|(QEfz3*;QC
z3B+y|$qZBs{GD(KIVeibx2Mzid0e}>G8(_mJo0+-Xgj@MEhS?ch`fhlf!H?Dw_yal
z<s-m#IZ%Nkgdoo-5KNPHi%5rJu5COD+)p{~D5TBqE7c5ka^xXu?_(kzN)2ub$8xgc
z9C+Oa5bZK~)tbz8$j^$d?*Mlx^0Xsz8`mVKMc<-NfWtU7pxBwKg~f82NKTBo^8|CJ
z>ohFcQZRosk+kw5IVqCUMQ^yyp|qvu%t11>JrL^`UH=s5d_Y%joZ2CbR*SDy36D-f
zoB6uDdMV#7xU0o&;9K|_=XGrZm^{z3i6<3YO`z$|n2tp+-43hdUt@CnSa}Swym1Zj
z=|OtIXR|aC_u{d=E82iF3%aHl**9Drfu=K<U*t{ly7JM?=0MYFOeT#P@CRl9ISDJ|
zlb8-A&zvk}LQbaZ3+>Zdbb8-QPVPD%nNM@UCknr*L>iDuQ(6N}l1Q#7W#XBNw4l?c
z&m9sXUfQnXqn=W`{x_oQkW;Wy&UlD|O6~eoX^&$Z*#L+;Kikw*TIKeV%1|)=x>zJi
zuNSla`#yrm(m?!|BDu5FT^=r9tZV&;T?A2o-y@RIv2$O_x~(KFWPuf)cEH~ut!sUz
z`LttEAU?}M-XGI@pQSMF;#O(>s{VqP9Hm`qrh}X)hD}%<IHa3OHcit`HF5>ojY9HM
z;ulRxx};b^tE!T^*?X9Nay!W367grjG?g{f@1fH7#IdF)+%hqxn_JaeCN2slDjmhn
z`MU~l*$-fUdP_mEY)x06aE!Q=UfQX9-<rK3n7B)nTo14+#Le^~rw_4u&%!`rvq)Yp
z`Of8Kffugl%5xDfxt``oVo0Pnc`0~Dm~ny~LPsE_89nAvdYWY-y)9W;kQ?ZwDT;I`
zDYr0Ve9ddh7V|kJIgQ*oAr?p^L}8bl$SFh5@MKv-IFR@oCJRe3zQ1}{%&A$LSG2e_
zA;#7^R9qR~hXUGgCAp7Y-a(PhDzyoS&dP%kh{^E47SFzmg4HM{kPsl>;^SOO$eGzG
z;tb07%9U&xryK%)Ethf`cHe?|v&bFv!$l$;oRlLu>xxwV{DfL;>~Rne*C?OIH&vJ3
H^0xLLu+DCH

diff --git a/.idea/dataSources/bcae6d7f-dd17-487e-ab3f-743f9b393d89/entities/entities.dat.values.at b/.idea/dataSources/bcae6d7f-dd17-487e-ab3f-743f9b393d89/entities/entities.dat.values.at
deleted file mode 100644
index 9f0d9e8ce0af7406e2f5a1013ec19c196c211694..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9111
zcmcJV-E-qK6vb1TwrQuk18?xoHw@H{y&u3ZEG+QGFbu<M#<f*f8%J_wxn=jSM~<v)
z?2}x^E9bTIi*$4)oqKg%DUO1RMVTlj^nz!{!PWd^vE(9~B`U91=C6}ylj$GHik*tO
zDEQ5zmrOIY;(}M2r=1@kUD=<WDOqbS*knHW;6*#iORiX|xfDl#b*GE^(|tLa{V6NH
zW_!{|HvFG)zp%?VlQ%aN)72LJPP*d(x_7Yakj`YO`HH_`zG9vX5CiO|HZapN$x>e-
zPX`Dg+1_pfyCu5t75!|0Xp-%T26jud@)iAjfM}BKi3av(dps^nrqaeFR3es_ztv)W
zoBw`YveO4+7xKY#K|yOCZ++)uJMnuZ_Z>Ru$LcdX^hqfnnD0&mVSn`f4o0)xoj~>%
ztNOH5Txc-j**}TmNj8Ef2ap0j-^?t{G4S0E(#E@%9{~Hb-MYJ4YBq8*3U(OvzGQ@~
zOEAi8LLz(<OaMMj94lbmhMCKn$(8Shf%|@KH{rq#e_hCH-zmT=iPZx8os}~^lr@1T
zKDQH|DOMIqI`%OP!3y^WgJ!#qLbLO&Ej$j8{mQQSyje3(6YX2Hgy71=DoM7tN?<n^
zlif2_dFvkF_u&rKR(^`-x4P24UK)Z`6G0@|UJ!wGzH4fGk&W!TA-FuT3X<)u0@$CN
zamj~;s8`oa9iWs6A&s=byHHv&mfo^-IbOC7!TdMw+{~7-Qr~V}?RR<XgpdG;{Q-7k
z9E}_yGw%xs{!geO+1_aZc5~*n;;XUGJR}uj6(rkR1+ebbQSn@O9)$UT%!KSG_VOK9
z+*=2D{Qlt0fqfeg;d?XYI}Cnb#fWUwmJyZUWy$n-o-hadZcC&OtGj}0wn*iw<OOT`
z4^k|0rhN|vI4!Xuz<zJz@X=0jb;UAYbzsPZI$(cjb4IJKkom|~Fb4-G<dJOG3UJ)e
zF6I4pDV40vo8GkjeB%qAe`P0n+)mWgUFM+qP6GzLxyg6R`vik;5}N?5dv8^DwP~e#
zt}`0ovdI2uLw{1~jNNytoAV^k70dlg_XsR?f2@#o^?<2<Z+Kyv$-dzl;K32ecCQbz
zzuM5w8s(;O3-7-13_Jn@cU}0ZzBbd3>_8D%GO?i~+Y2Gdc3+&Rp-l_tcFA0f?Yj|J
zJ+W$%?X8+*d#eVv?JXQv^{R7w$7!=hWd7(j-;i|`oKAebJc5)##2#4Z`$mUv1s6e5
zA%p<?!aBnAz-|Efro9>`TI!@Yz%hvjq#$I!wNZJrR<}rR6Ol9DerOCi=ZTB`_>Z%g
zOcUK(LbF|GK-Ss1HXl+X^z=P5V+>hj|Jg>?H92d+Q}b#cIpxG;YUqU+*!DRyt3|<=
ztav@PIB;bmaKO5@L2Vv&V`u7kfPW+VyS*}x*UA=6t*Xr{u;U-26^SvpHW5Q$TVtKw
zHy^b`dMJ%x=!8aK-64F#lx)6%jC}~f^$Bsnx)gb%tL=(o)BY=ybeZIA@{K(bmkp=o
zl8HV4j^OyMaid-K<T%%KH{(W0{V#=X4H;9MdpMXO<9nGVJ3l(P`5pYKG7S!vq&w?`
lop95pq-3~{$LnS;1v&|9aKY!>xd8Uza$-LtPnDE<@*i-|rt1Iz

diff --git a/.idea/dataSources/bcae6d7f-dd17-487e-ab3f-743f9b393d89/entities/entities.dat.values.s b/.idea/dataSources/bcae6d7f-dd17-487e-ab3f-743f9b393d89/entities/entities.dat.values.s
deleted file mode 100644
index 1d6fe36..0000000
--- a/.idea/dataSources/bcae6d7f-dd17-487e-ab3f-743f9b393d89/entities/entities.dat.values.s
+++ /dev/null
@@ -1 +0,0 @@
-�Y
\ No newline at end of file
diff --git a/.idea/dataSources/bcae6d7f-dd17-487e-ab3f-743f9b393d89/entities/entities.dat_i b/.idea/dataSources/bcae6d7f-dd17-487e-ab3f-743f9b393d89/entities/entities.dat_i
deleted file mode 100644
index 075d1eecbdc543558def7fd8f1bbbb5224c0726e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 32768
zcmeIziN8-}9>DSMEhJ5gtyGLc5~+->5m_Qzh}<h8yM(e!A=h@Z7bQ#9k`gUal%ygp
zl*yj7m`I`_!&oXcZ}S(-AMkj&_s#F#-|w9BdCqyhaVF#3@aNi^XTL}G|GxWH-~Z3y
z{<;xof1yCVh+Mptxp_bH@C?u6$lD|GGH?Be^Erw6ShzvN1)R;luvx>13%QdQaa^N_
zi&?U9#3dZh{LFucW3mqm@<$fp+$KJg*-axZ<!`)<Bbr4NVct6<F6U%k!NScWuH-Tn
zW$6|X#W<dS<zW_QtGgnu;wE0rhAksXa4Som{eNaeDQ09vT*Jp$n%A|`j>}kvb?){W
z|6o~;X&q6Hx3-D6p1-p^yWbOW1Ha^rtlKu?CN5_MUezw*Z_HsuHn=yU5-)8ZQJG6w
zg+)3<ROQ#anV)ow_&X<bim1jCog;4HJXYszT_S3*Kv(C)DXhr`-6CqS+<g(XxtMi$
zZFleC5xNy(;{6epJo5F3u;ek0mO66v^ckE_OB?s~im<ei>wySM8rigjQSZSBOBj`V
zM_9U;OG_6u`$Sl>$lW)>QpE{cnpn~=!jeSY{t=cUDh!CQ6mgoCAf^tqc5FH*Lh{%~
z$)oK<5mLu-N*uEXdyVZMj*v78JQ5*k%%zl(IV7S3H&VjrIy6GU$UQ7Vx)?&~;<88m
zj4LTwj2Z4)Su)$2@*pLOK_eohiE~FrND^;Rl6YX0FP0b`Aw@hx3E~7Lh^1p9TzZtw
ziE!z$j4nMIKNjJVV<%m5R2l0STu+x6RmMfQ#3(yH!X?H&y0qvs!MXFgi4iU-j?kq<
zw@DE$A-2&aMCZxYh{YcFEO9TLa`bv4!YRjbI>i_^#WnK)omz~U>RDjPCnKCn9Hvu=
zR!@1xxQ0$4>Q8g;a0?wW`akU%W%=n54i$^(5HWj(dy-RU`r-|<B79`5ppS~0&qVl$
zSV<odnX@CjHQu4OM)sTtZ;dPGMtDoCq+gAe^L#cB)33yg`PQD*7kD<fi(ZP1XCwSG
zD$w6(?b~x4&4pab=ediEn8y!aU`4*jwp`4?H6vc)uv+e6zEa0~S+8!y%bZ`&Yuw6L
zdClz+ukmg!;}X8kZ@HW|)sJ|Co%tqLa0L%?C2KTrkFhV`=6bH;X}-f!4I@@_FyG};
zuHm12j};q5yw7|20YBtgp5i)YHTD``=X&nvN34EF#K&CDPgtl)#HVb)4eZa2+{n-P
zCqHM|ruJH9@*n(|U$8{8h|SF67B1#ie#33N@y>|t?93fp!JRzFFWI8GwP6mw;=j3@
zSuO05T*Yr#@-A&Ti{G(u%ZNQ3z<=^Zet-7$OwR%z;yy0n58T21ER$t6u`Lg91ApQl
zJjfQUA`UT!KXWht#mnw?FLD5n@J0T@tvt%ot(`mD@EG6VaUS4*Sg?&fgZ+4ti+GBg
zd772(iTITZ`5P~3YxZzB&+upd!4~bT3D+<(9FrL=cCY!*i9DC@GZzmrH=DF~?{fst
z<38qPiw@>LbC{3IcmWG`H2+zj7qTBO;v8Pgj84vxm6@L%Sb*zTkSAG)Jv&<y?&GB_
z(nU*-Wf89C<@}LXuw7Ss0e@mq7VGAV3;0)VXK|k0#INE&Ud>}H!LHriE1bzv{E*kM
z{QcI59eFKxunaSM*lYO(%d&P)GnE5*J-=aj=I>>1V|Cuh=Xn!%u>$XS!2IVstjHs*
z#48@uh}o>dH&~V5@n+`hZT_<dt8ou+VWB>b#UZT0S9vSHVolcWYyNW}YjZy9a3gQy
z)&0z1X0jf$c{_h#eO}(*GtZ%H$k*72yV;m|2Dm2nW)nWgrrgA4tT@p8=Y4F>57~mJ
zco$0!vWIgZGr5>qJi}J3@Q}Te)7YAyvJGntHvid|ZMmK8c>croI#yzPj%5d~W=H<W
zPOSNey@vhSg&WzGf3h3P4sp($&hE@J)cj{P_TVD+<X7y)`oqkBuHb__#NNz$)U4(N
z_T?$|WBK8Z&DI>iwH(Nk9K?3n_9jl{V6NfAEIh*eXCn^bvmDBu9L91Z&3|^_a86`4
z_izLYk23#Ro1-|5qq%`&c!D|XHro8>2OP`dW6XcH<alOt0*`Vc@60j(Ifj#YkdL$Y
zW9B~xaSE4kDl^8K|Lnr2IFr-PzCO<UXJ1a|BF^9z&g37Q#a83Ze@^6VzQsAbc!K%Q
zx}3+^oX^c%z%zW7ohG_hIh_l+j?c5gB*)}DzQA)P+rwFvi}?g!;(9LOQ7&cH<K{mn
z@D;A)tGwU|&kSpE8K30q{DjL{bc$!4&G{yma|KIH^%-o<x44#X^CVZX<CFFfKF!r<
zf6jMV;wkqE$MHSx=li^JnzdwKuH_=GV}YkVldRA6oX?NAogXt}x^v|Ke#*Vvz#=m|
zGpx(c*oU8U7dP>undU#M@e6k2W`52sJZF}f$V_hIcy8yn+`)p+xTiUiU-CG2@w(Zb
zIp%OTkMV1knPU%TOMc5${EkPshgoyYe@@`{JjT5&GtbQ7B>up)+|R1>?G^0B1KiD@
zc*z3yHV5+%U*^wTSkwIHFFef3wH%u-@E4xsQP!w!7IPGjaTAZTXdUyPJ$Zurd6MOB
zvuCgmPxEd5%8a_^KZo;oF6SAhKdC?}kP4&%sX!`_3Zw$5Kq`<5qynixDv%1K0;xbM
zkP4&%sX!`_3Zw$5Kq`<5qynixDv%1K0;xbMkP4&%sX!`_3Zw$5Kq`<5qynixDv%1K
z0;xbMkP4&%sX!`_3Zw$5Kq`<5qynixDv%1K0;xbMkP4&%sX!`_3Zw$5Kq`<5qynix
zDv%1K0;xbMkP4&%sX!`_3Zw$5Kq`<5qynixDv%1K0;xbMkP4&%sX!`_3Zw$5Kq`<5
NqynixD)9do_%D|u-n#$*

diff --git a/.idea/dataSources/bcae6d7f-dd17-487e-ab3f-743f9b393d89/entities/entities.dat_i.len b/.idea/dataSources/bcae6d7f-dd17-487e-ab3f-743f9b393d89/entities/entities.dat_i.len
deleted file mode 100644
index 131e265740f37d77b7c4a3676d2a7704ca3e4a29..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8
McmZQz0D%Su009U9fdBvi

diff --git a/src/main/java/dev/cosgy/textToSpeak/commands/general/JoinCmd.kt b/src/main/java/dev/cosgy/textToSpeak/commands/general/JoinCmd.kt
index 8093646..853b79c 100644
--- a/src/main/java/dev/cosgy/textToSpeak/commands/general/JoinCmd.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/commands/general/JoinCmd.kt
@@ -53,9 +53,13 @@ class JoinCmd(private var bot: Bot) : SlashCommand() {
             builder.addField("読み上げ対象", channel.name, true)
         }
         try {
+            // ボイスチャンネル接続完了のメッセージに現在の設定を表示
             event.guild!!.audioManager.openAudioConnection(userState.channel)
             builder.addField("ボイスチャンネル", String.format("**%s**", userState.channel!!.name), false)
             builder.setDescription("ボイスチャンネルへの接続に成功しました。")
+            builder.addField("設定",
+                "ユーザー名読み上げ:${if (settings.isReadName()) "有効" else "無効"}\n" +
+                    "参加、退出読み上げ:${if (settings.isJoinAndLeaveRead()) "有効" else "無効"}", true)
             event.hook.sendMessageEmbeds(builder.build()).queue()
             ReadChannel.setChannel(event.guild!!.idLong, event.textChannel.idLong)
         } catch (ex: PermissionException) {

From 6d505866a81a296f6baa8fa8f62533cc8016fcad Mon Sep 17 00:00:00 2001
From: kosugikun <>
Date: Sun, 9 Jul 2023 22:09:29 +0900
Subject: [PATCH 23/39] =?UTF-8?q?=E8=B5=B7=E5=8B=95=E6=99=82=E3=81=AE?=
 =?UTF-8?q?=E3=82=B5=E3=83=BC=E3=83=90=E3=83=BC=E8=A8=AD=E5=AE=9A=E8=AA=AD?=
 =?UTF-8?q?=E3=81=BF=E8=BE=BC=E3=81=BF=E6=99=82=E3=81=AB=E8=A8=AD=E5=AE=9A?=
 =?UTF-8?q?=E3=81=8C=E6=AD=A3=E5=B8=B8=E3=81=AB=E8=AA=AD=E3=81=BF=E8=BE=BC?=
 =?UTF-8?q?=E3=82=81=E3=81=AA=E3=81=84=E4=B8=8D=E5=85=B7=E5=90=88=E3=82=92?=
 =?UTF-8?q?=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                        |  4 ++--
 .../java/dev/cosgy/textToSpeak/BotConfig.kt    |  1 -
 .../java/dev/cosgy/textToSpeak/Listener.kt     |  4 ++--
 .../cosgy/textToSpeak/audio/PlayerManager.kt   |  2 +-
 .../commands/admin/GuildSettings.kt            |  4 ++--
 .../textToSpeak/commands/admin/JLReadCmd.kt    |  4 ++--
 .../commands/admin/SetReadNameCmd.kt           |  4 ++--
 .../textToSpeak/commands/general/HelpCmd.kt    |  3 ++-
 .../textToSpeak/listeners/MessageListener.kt   |  4 ++--
 .../dev/cosgy/textToSpeak/settings/Settings.kt |  2 +-
 .../textToSpeak/settings/SettingsManager.kt    | 18 +++++++++---------
 .../dev/cosgy/textToSpeak/utils/OtherUtil.kt   |  3 ++-
 12 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/pom.xml b/pom.xml
index 440eb27..541c22d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
 
     <groupId>dev.cosgy</groupId>
     <artifactId>TextToSpeak</artifactId>
-    <version>0.4.0-beta.3</version>
+    <version>0.4.0-beta.5</version>
     <packaging>jar</packaging>
 
     <repositories>
@@ -66,7 +66,7 @@
         <dependency>
             <groupId>net.dv8tion</groupId>
             <artifactId>JDA</artifactId>
-            <version>5.0.0-beta.10</version>
+            <version>5.0.0-beta.12</version>
         </dependency>
         <dependency>
             <groupId>com.github.walkyst</groupId>
diff --git a/src/main/java/dev/cosgy/textToSpeak/BotConfig.kt b/src/main/java/dev/cosgy/textToSpeak/BotConfig.kt
index a8fb5dc..757e902 100644
--- a/src/main/java/dev/cosgy/textToSpeak/BotConfig.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/BotConfig.kt
@@ -130,7 +130,6 @@ class BotConfig(private val prompt: Prompt) {
                         Prompt.Level.ERROR, CONTEXT,
                         """
                         無効なユーザーIDです！終了します。
-     
                         設定ファイルの場所: ${path!!.toAbsolutePath()}
                         """.trimIndent()
                     )
diff --git a/src/main/java/dev/cosgy/textToSpeak/Listener.kt b/src/main/java/dev/cosgy/textToSpeak/Listener.kt
index 54b2259..5ab6d24 100644
--- a/src/main/java/dev/cosgy/textToSpeak/Listener.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/Listener.kt
@@ -64,7 +64,7 @@ class Listener(private val bot: Bot) : ListenerAdapter() {
         val botMember = event.guild.selfMember
         val settings = bot.settingsManager.getSettings(event.guild)
         if (event.channelLeft != null) {
-            if (settings.isJoinAndLeaveRead() && Objects.requireNonNull(event.guild.selfMember.voiceState)?.channel === event.channelLeft && event.channelLeft!!.members.size > 1) {
+            if (settings!!.isJoinAndLeaveRead() && Objects.requireNonNull(event.guild.selfMember.voiceState)?.channel === event.channelLeft && event.channelLeft!!.members.size > 1) {
                 val file: String? = try {
                     bot.voiceCreation.createVoice(
                         event.guild,
@@ -89,7 +89,7 @@ class Listener(private val bot: Bot) : ListenerAdapter() {
             }
         }
         if (event.channelJoined != null) {
-            if (settings.isJoinAndLeaveRead() && Objects.requireNonNull(event.guild.selfMember.voiceState)?.channel === event.channelJoined) {
+            if (settings!!.isJoinAndLeaveRead() && Objects.requireNonNull(event.guild.selfMember.voiceState)?.channel === event.channelJoined) {
                 val file: String? = try {
                     bot.voiceCreation.createVoice(
                         event.guild,
diff --git a/src/main/java/dev/cosgy/textToSpeak/audio/PlayerManager.kt b/src/main/java/dev/cosgy/textToSpeak/audio/PlayerManager.kt
index 3c8b468..e802f2b 100644
--- a/src/main/java/dev/cosgy/textToSpeak/audio/PlayerManager.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/audio/PlayerManager.kt
@@ -44,7 +44,7 @@ class PlayerManager(val bot: Bot) : DefaultAudioPlayerManager() {
         val handler: AudioHandler?
         if (guild.audioManager.sendingHandler == null) {
             val player = createPlayer()
-            player.volume = bot.settingsManager.getSettings(guild).volume
+            player.volume = bot.settingsManager.getSettings(guild)!!.volume
             handler = AudioHandler(guild, player)
             player.addListener(handler)
             guild.audioManager.sendingHandler = handler
diff --git a/src/main/java/dev/cosgy/textToSpeak/commands/admin/GuildSettings.kt b/src/main/java/dev/cosgy/textToSpeak/commands/admin/GuildSettings.kt
index cdf36eb..be07bb8 100644
--- a/src/main/java/dev/cosgy/textToSpeak/commands/admin/GuildSettings.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/commands/admin/GuildSettings.kt
@@ -39,7 +39,7 @@ class GuildSettings(private val bot: Bot) : AdminCommand() {
         }
         val settings = bot.settingsManager.getSettings(event.guild!!)
         var text = "null"
-        if (settings.getTextChannel(event.guild) != null) {
+        if (settings!!.getTextChannel(event.guild) != null) {
             text = settings.getTextChannel(event.guild)!!.name
         }
         val builder = EmbedBuilder()
@@ -59,7 +59,7 @@ class GuildSettings(private val bot: Bot) : AdminCommand() {
     override fun execute(event: CommandEvent) {
         val settings = bot.settingsManager.getSettings(event.guild)
         var text = "null"
-        if (settings.getTextChannel(event.guild) != null) {
+        if (settings!!.getTextChannel(event.guild) != null) {
             text = settings.getTextChannel(event.guild)!!.name
         }
         val builder = EmbedBuilder()
diff --git a/src/main/java/dev/cosgy/textToSpeak/commands/admin/JLReadCmd.kt b/src/main/java/dev/cosgy/textToSpeak/commands/admin/JLReadCmd.kt
index 8b74c2a..c00d116 100644
--- a/src/main/java/dev/cosgy/textToSpeak/commands/admin/JLReadCmd.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/commands/admin/JLReadCmd.kt
@@ -36,7 +36,7 @@ class JLReadCmd(private val bot: Bot) : AdminCommand() {
             return
         }
         val settings = bot.settingsManager.getSettings(event.guild!!)
-        if (settings.isJoinAndLeaveRead()) {
+        if (settings!!.isJoinAndLeaveRead()) {
             settings.setJoinAndLeaveRead(false)
             event.reply("ボイスチャンネルにユーザーが参加、退出した際の読み上げを無効にしました。").queue()
         } else {
@@ -47,7 +47,7 @@ class JLReadCmd(private val bot: Bot) : AdminCommand() {
 
     override fun execute(event: CommandEvent) {
         val settings = bot.settingsManager.getSettings(event.guild)
-        if (settings.isJoinAndLeaveRead()) {
+        if (settings!!.isJoinAndLeaveRead()) {
             settings.setJoinAndLeaveRead(false)
             event.reply("ボイスチャンネルにユーザーが参加、退出した際の読み上げを無効にしました。")
         } else {
diff --git a/src/main/java/dev/cosgy/textToSpeak/commands/admin/SetReadNameCmd.kt b/src/main/java/dev/cosgy/textToSpeak/commands/admin/SetReadNameCmd.kt
index 575e9c0..7f8dc5f 100644
--- a/src/main/java/dev/cosgy/textToSpeak/commands/admin/SetReadNameCmd.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/commands/admin/SetReadNameCmd.kt
@@ -36,7 +36,7 @@ class SetReadNameCmd(private val bot: Bot) : AdminCommand() {
             return
         }
         val settings = bot.settingsManager.getSettings(event.guild!!)
-        if (settings.isReadName()) {
+        if (settings!!.isReadName()) {
             settings.setReadName(false)
             event.reply("ユーザー名の読み上げを無効にしました。").queue()
         } else {
@@ -47,7 +47,7 @@ class SetReadNameCmd(private val bot: Bot) : AdminCommand() {
 
     override fun execute(event: CommandEvent) {
         val settings = bot.settingsManager.getSettings(event.guild)
-        if (settings.isReadName()) {
+        if (settings!!.isReadName()) {
             settings.setReadName(false)
             event.reply("ユーザー名の読み上げを無効にしました。")
         } else {
diff --git a/src/main/java/dev/cosgy/textToSpeak/commands/general/HelpCmd.kt b/src/main/java/dev/cosgy/textToSpeak/commands/general/HelpCmd.kt
index ead986d..46f94ab 100644
--- a/src/main/java/dev/cosgy/textToSpeak/commands/general/HelpCmd.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/commands/general/HelpCmd.kt
@@ -63,8 +63,9 @@ class HelpCmd(var bot: Bot) : SlashCommand() {
     public override fun execute(event: CommandEvent) {
         val builder = StringBuilder(
             """
+            
             **${event.jda.selfUser.name}** コマンド一覧:
-    
+            
             """.trimIndent()
         )
         var category: Category? = null
diff --git a/src/main/java/dev/cosgy/textToSpeak/listeners/MessageListener.kt b/src/main/java/dev/cosgy/textToSpeak/listeners/MessageListener.kt
index 5bbb0f3..98e4573 100644
--- a/src/main/java/dev/cosgy/textToSpeak/listeners/MessageListener.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/listeners/MessageListener.kt
@@ -47,7 +47,7 @@ class MessageListener(private val bot: Bot) : ListenerAdapter() {
             if (isBot) return
             val guild = event.guild
             val textChannel = event.guildChannel.asTextChannel()
-            var settingText = bot.settingsManager.getSettings(event.guild).getTextChannel(event.guild)
+            var settingText = bot.settingsManager.getSettings(event.guild)!!.getTextChannel(event.guild)
             if (!guild.audioManager.isConnected) {
                 return
             }
@@ -64,7 +64,7 @@ class MessageListener(private val bot: Bot) : ListenerAdapter() {
             // URLを置き換え
             msg = msg.replace("(http://|https://)[\\w.\\-/:#?=&;%~+]+".toRegex(), "ゆーあーるえる")
             if (textChannel === settingText) {
-                if (bot.settingsManager.getSettings(guild).isReadName()) {
+                if (bot.settingsManager.getSettings(guild)!!.isReadName()) {
                     msg = author.name + "  " + msg
                 }
                 val vc = bot.voiceCreation
diff --git a/src/main/java/dev/cosgy/textToSpeak/settings/Settings.kt b/src/main/java/dev/cosgy/textToSpeak/settings/Settings.kt
index 65d6b12..d9f9325 100644
--- a/src/main/java/dev/cosgy/textToSpeak/settings/Settings.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/settings/Settings.kt
@@ -37,7 +37,7 @@ class Settings : GuildSettingsProvider {
     ) {
         this.manager = manager
         try {
-            this.textId = textId!!.toLong()
+            this.textId = textId?.toLong() ?: 0
         } catch (e: NumberFormatException) {
             this.textId = 0
         }
diff --git a/src/main/java/dev/cosgy/textToSpeak/settings/SettingsManager.kt b/src/main/java/dev/cosgy/textToSpeak/settings/SettingsManager.kt
index b820552..3670375 100644
--- a/src/main/java/dev/cosgy/textToSpeak/settings/SettingsManager.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/settings/SettingsManager.kt
@@ -30,18 +30,18 @@ class SettingsManager : GuildSettingsManager<Any?> {
 
     init {
         try {
-            val loadedSettings = JSONObject(Files.readAllBytes(OtherUtil.getPath("serversettings.json")))
-            loadedSettings.keySet().forEach(Consumer { id: String ->
-                val o = loadedSettings.getJSONObject(id)
+            val loadedSettings = JSONObject(String(Files.readAllBytes(OtherUtil.getPath("serversettings.json"))))
+            loadedSettings.keySet().forEach { id ->
+                val value = loadedSettings.getJSONObject(id)
                 settings[id.toLong()] = Settings(
                     this,
-                    if (o.has("text_channel_id")) o.getString("text_channel_id") else null,
-                    if (o.has("prefix")) o.getString("prefix") else null,
-                    if (o.has("volume")) o.getInt("volume") else 50,
-                    o.has("read_name") && o.getBoolean("read_name"),
-                    o.has("join_and_leave_read") && o.getBoolean("join_and_leave_read")
+                    if (value.has("text_channel_id")) value.getString("text_channel_id") else null,
+                    if (value.has("prefix")) value.getString("prefix") else null,
+                    if (value.has("volume")) value.getInt("volume") else 50,
+                    value.has("read_name") && value.getBoolean("read_name"),
+                    value.has("join_and_leave_read") && value.getBoolean("join_and_leave_read")
                 )
-            })
+            }
         } catch (e: IOException) {
             LoggerFactory.getLogger("Settings").warn("サーバー設定を読み込めませんでした(まだ設定がない場合は正常です): $e")
         } catch (e: JSONException) {
diff --git a/src/main/java/dev/cosgy/textToSpeak/utils/OtherUtil.kt b/src/main/java/dev/cosgy/textToSpeak/utils/OtherUtil.kt
index 104c073..570a99f 100644
--- a/src/main/java/dev/cosgy/textToSpeak/utils/OtherUtil.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/utils/OtherUtil.kt
@@ -48,7 +48,8 @@ object OtherUtil {
             try {
                 returnPath =
                     File(TextToSpeak::class.java.protectionDomain.codeSource.location.toURI()).parentFile.path + File.separator + filename
-            } catch (ignored: URISyntaxException) {
+            } catch (ex: URISyntaxException) {
+                ex.printStackTrace()
             }
         }
         return Paths.get(returnPath)

From fd86636cc34b635e5fc1d52d045bc0033cb1d5fc Mon Sep 17 00:00:00 2001
From: kosugikun <>
Date: Sun, 9 Jul 2023 22:33:16 +0900
Subject: [PATCH 24/39] =?UTF-8?q?=E8=BE=9E=E6=9B=B8DB=E3=81=8C=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E3=81=95=E3=82=8C=E3=81=AA=E3=81=84=E4=B8=8D=E5=85=B7?=
 =?UTF-8?q?=E5=90=88=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/dev/cosgy/textToSpeak/audio/Dictionary.kt | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/main/java/dev/cosgy/textToSpeak/audio/Dictionary.kt b/src/main/java/dev/cosgy/textToSpeak/audio/Dictionary.kt
index fc7d934..08d63b6 100644
--- a/src/main/java/dev/cosgy/textToSpeak/audio/Dictionary.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/audio/Dictionary.kt
@@ -124,13 +124,12 @@ class Dictionary private constructor(bot: Bot) {
     }
 
     private fun executeUpdate(guildId: Long, word: String?, reading: String?) {
-        val sql = "INSERT INTO Dictionary VALUES (?,?,?) ON CONFLICT (guild_id, word) DO UPDATE SET reading = ?"
+        val sql = "INSERT OR REPLACE INTO Dictionary(guild_id, word, reading) VALUES (?,?,?)"
         try {
             connection.prepareStatement(sql).use { ps ->
                 ps.setLong(1, guildId)
                 ps.setString(2, word)
                 ps.setString(3, reading)
-                ps.setString(4, reading)
                 ps.executeUpdate()
             }
         } catch (throwables: SQLException) {

From 8d96051b07d430aafbb2134efed4af58c6c22bbd Mon Sep 17 00:00:00 2001
From: kosugikun <>
Date: Sun, 9 Jul 2023 22:36:07 +0900
Subject: [PATCH 25/39] =?UTF-8?q?=E3=82=B3=E3=83=BC=E3=83=89=E3=81=AE?=
 =?UTF-8?q?=E3=82=AF=E3=83=AA=E3=83=BC=E3=83=B3=E3=82=A2=E3=83=83=E3=83=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/dev/cosgy/textToSpeak/Listener.kt               | 2 +-
 src/main/java/dev/cosgy/textToSpeak/audio/PlayerManager.kt    | 2 +-
 .../dev/cosgy/textToSpeak/commands/admin/GuildSettings.kt     | 4 ++--
 .../java/dev/cosgy/textToSpeak/commands/admin/JLReadCmd.kt    | 4 ++--
 .../dev/cosgy/textToSpeak/commands/admin/SetReadNameCmd.kt    | 4 ++--
 .../dev/cosgy/textToSpeak/commands/dictionary/AddWordCmd.kt   | 1 +
 .../dev/cosgy/textToSpeak/commands/general/AboutCommand.kt    | 3 ++-
 .../java/dev/cosgy/textToSpeak/listeners/MessageListener.kt   | 4 ++--
 .../dev/cosgy/textToSpeak/settings/UserSettingsManager.kt     | 2 +-
 9 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/main/java/dev/cosgy/textToSpeak/Listener.kt b/src/main/java/dev/cosgy/textToSpeak/Listener.kt
index 5ab6d24..f3c3923 100644
--- a/src/main/java/dev/cosgy/textToSpeak/Listener.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/Listener.kt
@@ -64,7 +64,7 @@ class Listener(private val bot: Bot) : ListenerAdapter() {
         val botMember = event.guild.selfMember
         val settings = bot.settingsManager.getSettings(event.guild)
         if (event.channelLeft != null) {
-            if (settings!!.isJoinAndLeaveRead() && Objects.requireNonNull(event.guild.selfMember.voiceState)?.channel === event.channelLeft && event.channelLeft!!.members.size > 1) {
+            if (settings.isJoinAndLeaveRead() && Objects.requireNonNull(event.guild.selfMember.voiceState)?.channel === event.channelLeft && event.channelLeft!!.members.size > 1) {
                 val file: String? = try {
                     bot.voiceCreation.createVoice(
                         event.guild,
diff --git a/src/main/java/dev/cosgy/textToSpeak/audio/PlayerManager.kt b/src/main/java/dev/cosgy/textToSpeak/audio/PlayerManager.kt
index e802f2b..3c8b468 100644
--- a/src/main/java/dev/cosgy/textToSpeak/audio/PlayerManager.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/audio/PlayerManager.kt
@@ -44,7 +44,7 @@ class PlayerManager(val bot: Bot) : DefaultAudioPlayerManager() {
         val handler: AudioHandler?
         if (guild.audioManager.sendingHandler == null) {
             val player = createPlayer()
-            player.volume = bot.settingsManager.getSettings(guild)!!.volume
+            player.volume = bot.settingsManager.getSettings(guild).volume
             handler = AudioHandler(guild, player)
             player.addListener(handler)
             guild.audioManager.sendingHandler = handler
diff --git a/src/main/java/dev/cosgy/textToSpeak/commands/admin/GuildSettings.kt b/src/main/java/dev/cosgy/textToSpeak/commands/admin/GuildSettings.kt
index be07bb8..cdf36eb 100644
--- a/src/main/java/dev/cosgy/textToSpeak/commands/admin/GuildSettings.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/commands/admin/GuildSettings.kt
@@ -39,7 +39,7 @@ class GuildSettings(private val bot: Bot) : AdminCommand() {
         }
         val settings = bot.settingsManager.getSettings(event.guild!!)
         var text = "null"
-        if (settings!!.getTextChannel(event.guild) != null) {
+        if (settings.getTextChannel(event.guild) != null) {
             text = settings.getTextChannel(event.guild)!!.name
         }
         val builder = EmbedBuilder()
@@ -59,7 +59,7 @@ class GuildSettings(private val bot: Bot) : AdminCommand() {
     override fun execute(event: CommandEvent) {
         val settings = bot.settingsManager.getSettings(event.guild)
         var text = "null"
-        if (settings!!.getTextChannel(event.guild) != null) {
+        if (settings.getTextChannel(event.guild) != null) {
             text = settings.getTextChannel(event.guild)!!.name
         }
         val builder = EmbedBuilder()
diff --git a/src/main/java/dev/cosgy/textToSpeak/commands/admin/JLReadCmd.kt b/src/main/java/dev/cosgy/textToSpeak/commands/admin/JLReadCmd.kt
index c00d116..8b74c2a 100644
--- a/src/main/java/dev/cosgy/textToSpeak/commands/admin/JLReadCmd.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/commands/admin/JLReadCmd.kt
@@ -36,7 +36,7 @@ class JLReadCmd(private val bot: Bot) : AdminCommand() {
             return
         }
         val settings = bot.settingsManager.getSettings(event.guild!!)
-        if (settings!!.isJoinAndLeaveRead()) {
+        if (settings.isJoinAndLeaveRead()) {
             settings.setJoinAndLeaveRead(false)
             event.reply("ボイスチャンネルにユーザーが参加、退出した際の読み上げを無効にしました。").queue()
         } else {
@@ -47,7 +47,7 @@ class JLReadCmd(private val bot: Bot) : AdminCommand() {
 
     override fun execute(event: CommandEvent) {
         val settings = bot.settingsManager.getSettings(event.guild)
-        if (settings!!.isJoinAndLeaveRead()) {
+        if (settings.isJoinAndLeaveRead()) {
             settings.setJoinAndLeaveRead(false)
             event.reply("ボイスチャンネルにユーザーが参加、退出した際の読み上げを無効にしました。")
         } else {
diff --git a/src/main/java/dev/cosgy/textToSpeak/commands/admin/SetReadNameCmd.kt b/src/main/java/dev/cosgy/textToSpeak/commands/admin/SetReadNameCmd.kt
index 7f8dc5f..575e9c0 100644
--- a/src/main/java/dev/cosgy/textToSpeak/commands/admin/SetReadNameCmd.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/commands/admin/SetReadNameCmd.kt
@@ -36,7 +36,7 @@ class SetReadNameCmd(private val bot: Bot) : AdminCommand() {
             return
         }
         val settings = bot.settingsManager.getSettings(event.guild!!)
-        if (settings!!.isReadName()) {
+        if (settings.isReadName()) {
             settings.setReadName(false)
             event.reply("ユーザー名の読み上げを無効にしました。").queue()
         } else {
@@ -47,7 +47,7 @@ class SetReadNameCmd(private val bot: Bot) : AdminCommand() {
 
     override fun execute(event: CommandEvent) {
         val settings = bot.settingsManager.getSettings(event.guild)
-        if (settings!!.isReadName()) {
+        if (settings.isReadName()) {
             settings.setReadName(false)
             event.reply("ユーザー名の読み上げを無効にしました。")
         } else {
diff --git a/src/main/java/dev/cosgy/textToSpeak/commands/dictionary/AddWordCmd.kt b/src/main/java/dev/cosgy/textToSpeak/commands/dictionary/AddWordCmd.kt
index d98a46d..9028169 100644
--- a/src/main/java/dev/cosgy/textToSpeak/commands/dictionary/AddWordCmd.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/commands/dictionary/AddWordCmd.kt
@@ -95,6 +95,7 @@ class AddWordCmd(private val bot: Bot) : SlashCommand() {
 
     companion object {
         private val SUCCESS_COLOR = Color(0, 163, 129)
+
         //private val ERROR_COLOR = Color.RED
         //private const val INVALID_ARGS_MESSAGE = "コマンドが無効です。単語と読み方の２つを入力して実行して下さい。"
         //private const val USAGE_MESSAGE = "使用方法: /addword <単語> <読み方>"
diff --git a/src/main/java/dev/cosgy/textToSpeak/commands/general/AboutCommand.kt b/src/main/java/dev/cosgy/textToSpeak/commands/general/AboutCommand.kt
index a57641b..7e5b1af 100644
--- a/src/main/java/dev/cosgy/textToSpeak/commands/general/AboutCommand.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/commands/general/AboutCommand.kt
@@ -88,7 +88,8 @@ class AboutCommand(private val color: Color, private val description: String, va
                 "ステータス", """${jda.guilds.size} サーバー
                     |1シャード""".trimMargin(), true
             )
-            builder.addField("ユーザー", """${jda.users.size} ユニーク
+            builder.addField(
+                "ユーザー", """${jda.users.size} ユニーク
                 |${jda.guilds.stream().mapToInt { g: Guild -> g.members.size }.sum()} 合計""".trimMargin(), true
             )
             builder.addField(
diff --git a/src/main/java/dev/cosgy/textToSpeak/listeners/MessageListener.kt b/src/main/java/dev/cosgy/textToSpeak/listeners/MessageListener.kt
index 98e4573..5bbb0f3 100644
--- a/src/main/java/dev/cosgy/textToSpeak/listeners/MessageListener.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/listeners/MessageListener.kt
@@ -47,7 +47,7 @@ class MessageListener(private val bot: Bot) : ListenerAdapter() {
             if (isBot) return
             val guild = event.guild
             val textChannel = event.guildChannel.asTextChannel()
-            var settingText = bot.settingsManager.getSettings(event.guild)!!.getTextChannel(event.guild)
+            var settingText = bot.settingsManager.getSettings(event.guild).getTextChannel(event.guild)
             if (!guild.audioManager.isConnected) {
                 return
             }
@@ -64,7 +64,7 @@ class MessageListener(private val bot: Bot) : ListenerAdapter() {
             // URLを置き換え
             msg = msg.replace("(http://|https://)[\\w.\\-/:#?=&;%~+]+".toRegex(), "ゆーあーるえる")
             if (textChannel === settingText) {
-                if (bot.settingsManager.getSettings(guild)!!.isReadName()) {
+                if (bot.settingsManager.getSettings(guild).isReadName()) {
                     msg = author.name + "  " + msg
                 }
                 val vc = bot.voiceCreation
diff --git a/src/main/java/dev/cosgy/textToSpeak/settings/UserSettingsManager.kt b/src/main/java/dev/cosgy/textToSpeak/settings/UserSettingsManager.kt
index 9cec6d1..12dd607 100644
--- a/src/main/java/dev/cosgy/textToSpeak/settings/UserSettingsManager.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/settings/UserSettingsManager.kt
@@ -64,7 +64,7 @@ class UserSettingsManager {
     }
 
     fun getSettings(userId: Long): UserSettings {
-        return settings.computeIfAbsent(userId) { _ : Long -> createDefaultSettings(userId) }
+        return settings.computeIfAbsent(userId) { _: Long -> createDefaultSettings(userId) }
     }
 
     private fun createDefaultSettings(userId: Long): UserSettings {

From 71922b1308dd2510db582e60a2ac9758ad92bff3 Mon Sep 17 00:00:00 2001
From: kosugikun <>
Date: Sun, 9 Jul 2023 22:41:30 +0900
Subject: [PATCH 26/39] =?UTF-8?q?=E8=84=86=E5=BC=B1=E6=80=A7=E3=81=AE?=
 =?UTF-8?q?=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                         | 4 ++--
 src/main/java/dev/cosgy/textToSpeak/Listener.kt | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 541c22d..0eff3ac 100644
--- a/pom.xml
+++ b/pom.xml
@@ -119,12 +119,12 @@
         <dependency>
             <groupId>org.xerial</groupId>
             <artifactId>sqlite-jdbc</artifactId>
-            <version>3.36.0.3</version>
+            <version>3.42.0.0</version>
         </dependency>
         <dependency>
             <groupId>org.json</groupId>
             <artifactId>json</artifactId>
-            <version>20220924</version>
+            <version>20230227</version>
         </dependency>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
diff --git a/src/main/java/dev/cosgy/textToSpeak/Listener.kt b/src/main/java/dev/cosgy/textToSpeak/Listener.kt
index f3c3923..54b2259 100644
--- a/src/main/java/dev/cosgy/textToSpeak/Listener.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/Listener.kt
@@ -89,7 +89,7 @@ class Listener(private val bot: Bot) : ListenerAdapter() {
             }
         }
         if (event.channelJoined != null) {
-            if (settings!!.isJoinAndLeaveRead() && Objects.requireNonNull(event.guild.selfMember.voiceState)?.channel === event.channelJoined) {
+            if (settings.isJoinAndLeaveRead() && Objects.requireNonNull(event.guild.selfMember.voiceState)?.channel === event.channelJoined) {
                 val file: String? = try {
                     bot.voiceCreation.createVoice(
                         event.guild,

From 4572efbb4a6596c773b8cca02266a86985670658 Mon Sep 17 00:00:00 2001
From: kosugikun <>
Date: Mon, 10 Jul 2023 00:50:05 +0900
Subject: [PATCH 27/39] =?UTF-8?q?=E3=83=99=E3=83=BC=E3=82=BF=E7=89=88?=
 =?UTF-8?q?=E3=81=AE=E6=9C=80=E6=96=B0=E3=83=90=E3=83=BC=E3=82=B8=E3=83=A7?=
 =?UTF-8?q?=E3=83=B3=E7=A2=BA=E8=AA=8D=E6=A9=9F=E8=83=BD=E3=82=92=E5=AE=9F?=
 =?UTF-8?q?=E8=A3=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../648c6ef7-2bba-4e14-b21f-f6619a5657a5.xml  |  4 +-
 .../dev/cosgy/textToSpeak/utils/OtherUtil.kt  | 97 ++++++++++++++++++-
 2 files changed, 94 insertions(+), 7 deletions(-)

diff --git a/.idea/dataSources/648c6ef7-2bba-4e14-b21f-f6619a5657a5.xml b/.idea/dataSources/648c6ef7-2bba-4e14-b21f-f6619a5657a5.xml
index e07f1dd..e1eb24c 100644
--- a/.idea/dataSources/648c6ef7-2bba-4e14-b21f-f6619a5657a5.xml
+++ b/.idea/dataSources/648c6ef7-2bba-4e14-b21f-f6619a5657a5.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <dataSource name="UserData">
   <database-model serializer="dbm" dbms="SQLITE" family-id="SQLITE" format-version="4.48">
-    <root id="1">
-      <ServerVersion>3.40.1</ServerVersion>
-    </root>
+    <root id="1"/>
     <collation id="2" parent="1" name="RTRIM"/>
     <collation id="3" parent="1" name="NOCASE"/>
     <collation id="4" parent="1" name="BINARY"/>
diff --git a/src/main/java/dev/cosgy/textToSpeak/utils/OtherUtil.kt b/src/main/java/dev/cosgy/textToSpeak/utils/OtherUtil.kt
index 570a99f..72e5c85 100644
--- a/src/main/java/dev/cosgy/textToSpeak/utils/OtherUtil.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/utils/OtherUtil.kt
@@ -33,12 +33,17 @@ import java.net.URL
 import java.nio.file.Path
 import java.nio.file.Paths
 import java.util.*
+import org.json.JSONArray
 
 object OtherUtil {
     const val NEW_VERSION_AVAILABLE = ("利用可能な新しいバージョンがあります!\n"
             + "現在のバージョン: %s\n"
             + "最新のバージョン: %s\n\n"
             + " https://github.com/Cosgy-Dev/TextToSpeakBot/releases/latest から最新バージョンをダウンロードして下さい。")
+    const val NEW_BETA_VERSION_AVAILABLE = ("利用可能な新しいベータバージョンがあります!\n"
+            + "現在のバージョン: %s\n"
+            + "最新のバージョン: %s\n\n"
+            + " https://github.com/Cosgy-Dev/TextToSpeakBot/releases から最新バージョンをダウンロードして下さい。")
     private const val WINDOWS_INVALID_PATH = "c:\\windows\\system32\\"
     fun getPath(path: String): Path {
         // special logic to prevent trying to access system32
@@ -144,10 +149,27 @@ object OtherUtil {
         // Get current version number
         val version = currentVersion
 
-        // Check for new version
-        val latestVersion = latestVersion
-        if (latestVersion != null && latestVersion != version && TextToSpeak.CHECK_UPDATE) {
-            prompt.alert(Prompt.Level.WARNING, "Version", String.format(NEW_VERSION_AVAILABLE, version, latestVersion))
+        if(!isBetaVersion(version)) {
+            // Check for new version
+            val latestVersion = latestVersion
+            if (latestVersion != null && latestVersion != version && TextToSpeak.CHECK_UPDATE) {
+                prompt.alert(
+                    Prompt.Level.WARNING,
+                    "Version",
+                    String.format(NEW_VERSION_AVAILABLE, version, latestVersion)
+                )
+            }
+        }else{
+            val latestBeta = latestBetaVersion
+            if(latestBeta != null && compareVersions(version, latestBeta) == 0){
+                prompt.alert(Prompt.Level.INFO, "Beta Version", "最新のベータバージョンを使用中です。")
+            }else{
+                prompt.alert(
+                    Prompt.Level.WARNING,
+                    "Beta Version",
+                    String.format(NEW_BETA_VERSION_AVAILABLE, version, latestBetaVersion)
+                )
+            }
         }
 
         // Return the current version
@@ -185,4 +207,71 @@ object OtherUtil {
             }
             return null
         }
+
+    private val latestBetaVersion: String?
+        get() {
+            try {
+                val client = OkHttpClient()
+
+                val request = Request.Builder()
+                    .url("https://api.github.com/repos/Cosgy-Dev/TextToSpeakBot/releases")
+                    .build()
+
+                val response = client.newCall(request).execute()
+                val body = response.body?.string()
+                val releases = JSONArray(body)
+
+                var latestBetaTag: String? = null
+                for (i in 0 until releases.length()) {
+                    val release = releases.getJSONObject(i)
+                    val isPrerelease = release.getBoolean("prerelease")
+
+                    if (isPrerelease) {
+                        val tagName = release.getString("tag_name")
+                        if (latestBetaTag == null || compareVersions(tagName, latestBetaTag) > 0) {
+                            latestBetaTag = tagName
+                        }
+                    }
+                }
+
+                return latestBetaTag ?: "ベータリリースなし"
+            } catch (e: Exception) {
+                println("Failed to retrieve releases: ${e.message}")
+            }
+            return null
+        }
+
+    private fun isBetaVersion(version: String): Boolean {
+        val versionParts = version.split("-")
+        return versionParts.lastOrNull()?.startsWith("beta") ?: false
+    }
+
+
+    private fun compareVersions(version1: String, version2: String): Int {
+        val parts1 = version1.split("[.-]".toRegex()).toTypedArray()
+        val parts2 = version2.split("[.-]".toRegex()).toTypedArray()
+        val length = maxOf(parts1.size, parts2.size)
+
+        for (i in 0 until length) {
+            val part1 = if (i < parts1.size) parseVersionPart(parts1[i]) else 0
+            val part2 = if (i < parts2.size) parseVersionPart(parts2[i]) else 0
+
+            if (part1 < part2) {
+                return -1
+            } else if (part1 > part2) {
+                return 1
+            }
+        }
+
+        return 0
+    }
+
+    private fun parseVersionPart(part: String): Int {
+        return if (part.matches("\\d+".toRegex())) {
+            part.toInt()
+        } else {
+            0
+        }
+    }
+
 }
\ No newline at end of file

From 3f6c9f1ddb1d04fbaea9252803b80846b6fb32b7 Mon Sep 17 00:00:00 2001
From: kosugikun <>
Date: Mon, 10 Jul 2023 21:27:40 +0900
Subject: [PATCH 28/39] =?UTF-8?q?=E8=AA=AD=E3=81=BF=E4=B8=8A=E3=81=92?=
 =?UTF-8?q?=E3=82=8B=E3=83=A1=E3=83=83=E3=82=BB=E3=83=BC=E3=82=B8=E3=81=AE?=
 =?UTF-8?q?=E6=94=B9=E8=A1=8C=E3=82=B3=E3=83=BC=E3=83=89=E3=82=92=E5=89=8A?=
 =?UTF-8?q?=E9=99=A4=E3=81=99=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=E5=A4=89?=
 =?UTF-8?q?=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/dev/cosgy/textToSpeak/audio/VoiceCreation.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/dev/cosgy/textToSpeak/audio/VoiceCreation.kt b/src/main/java/dev/cosgy/textToSpeak/audio/VoiceCreation.kt
index 404745a..b4cac22 100644
--- a/src/main/java/dev/cosgy/textToSpeak/audio/VoiceCreation.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/audio/VoiceCreation.kt
@@ -58,7 +58,7 @@ class VoiceCreation( // 各種設定の値を保持するためのフィール
 
         toKatakanaIfEnglishExists(dicMsg)
 
-        val tmpFilePath = createTmpTextFile(guildId, fileId, dicMsg)
+        val tmpFilePath = createTmpTextFile(guildId, fileId, dicMsg.replace("\n", ""))
 
 
         // コマンドを生成して実行する

From a857f0a7a8a6c70ebb6db682f4b603ae6d6b033b Mon Sep 17 00:00:00 2001
From: kosugikun <>
Date: Mon, 10 Jul 2023 21:50:30 +0900
Subject: [PATCH 29/39] =?UTF-8?q?Windows=E7=92=B0=E5=A2=83=E3=81=A7UTF-8?=
 =?UTF-8?q?=E3=82=92=E5=BC=B7=E5=88=B6=E7=9A=84=E3=81=AB=E4=BD=BF=E7=94=A8?=
 =?UTF-8?q?=E3=81=99=E3=82=8B=E8=A8=AD=E5=AE=9A=E3=82=92=E8=BF=BD=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/encodings.xml                                        | 1 -
 pom.xml                                                    | 2 +-
 src/main/java/dev/cosgy/textToSpeak/BotConfig.kt           | 4 ++++
 src/main/java/dev/cosgy/textToSpeak/audio/VoiceCreation.kt | 6 +++++-
 src/main/resources/reference.conf                          | 4 ++++
 5 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index 146230b..c79ede3 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -3,6 +3,5 @@
   <component name="Encoding" native2AsciiForPropertiesFiles="true">
     <file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/src/main/resources" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/src/main/resources/reference.conf" charset="ISO-8859-1" />
   </component>
 </project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 0eff3ac..84dbe8b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
 
     <groupId>dev.cosgy</groupId>
     <artifactId>TextToSpeak</artifactId>
-    <version>0.4.0-beta.5</version>
+    <version>0.4.0-beta.6</version>
     <packaging>jar</packaging>
 
     <repositories>
diff --git a/src/main/java/dev/cosgy/textToSpeak/BotConfig.kt b/src/main/java/dev/cosgy/textToSpeak/BotConfig.kt
index 757e902..a6079fa 100644
--- a/src/main/java/dev/cosgy/textToSpeak/BotConfig.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/BotConfig.kt
@@ -57,6 +57,9 @@ class BotConfig(private val prompt: Prompt) {
     var isValid = false
         private set
 
+    var isForceUTF8 = false
+        private set
+
     fun load() {
         isValid = false
         try {
@@ -85,6 +88,7 @@ class BotConfig(private val prompt: Prompt) {
             maxMessageCount = config.getInt("maxmessagecount")
             winJTalkDir = config.getString("winjtalkdir")
             helpToDm = config.getBoolean("helptodm")
+            isForceUTF8 = config.getBoolean("forceutf-8")
             dBots = ownerId == 334091398263341056
             var write = false
 
diff --git a/src/main/java/dev/cosgy/textToSpeak/audio/VoiceCreation.kt b/src/main/java/dev/cosgy/textToSpeak/audio/VoiceCreation.kt
index b4cac22..6d38f6a 100644
--- a/src/main/java/dev/cosgy/textToSpeak/audio/VoiceCreation.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/audio/VoiceCreation.kt
@@ -121,7 +121,11 @@ class VoiceCreation( // 各種設定の値を保持するためのフィール
 
     private val characterCode: String
         // 文字コードを取得するメソッド
-        get() = if (IS_WINDOWS) "Shift-JIS" else "UTF-8"
+        get(){
+            if(!IS_WINDOWS) return "UTF-8"
+
+            return if(bot.config.isForceUTF8) "UTF-8" else "Shift-JIS"
+        }
 
     // コマンドを生成するメソッド
     private fun getCommand(settings: UserSettings?, tmpFilePath: String, fileName: String): Array<String?> {
diff --git a/src/main/resources/reference.conf b/src/main/resources/reference.conf
index 5fd4596..cfc715d 100644
--- a/src/main/resources/reference.conf
+++ b/src/main/resources/reference.conf
@@ -76,4 +76,8 @@ maxmessagecount = 0
 // Windows環境でのホストは、推奨していません。
 winjtalkdir = ""
 
+// ファイルを保存する際に文字コードを強制的にUTF-8にします。
+// この設定はWindowsのみで有効です。
+forceutf-8 = false
+
 /// END OF YOMIAGEBOT CONFIG ///
\ No newline at end of file

From 0233082fe7cf11e6c68f2f6c1489f93b192bce46 Mon Sep 17 00:00:00 2001
From: kosugikun <33971692+kosugikun@users.noreply.github.com>
Date: Mon, 17 Jul 2023 22:20:38 +0900
Subject: [PATCH 30/39] =?UTF-8?q?=E8=A8=80=E8=AA=9E=E5=A4=89=E6=9B=B4?=
 =?UTF-8?q?=E6=A9=9F=E8=83=BD=E3=81=AE=E5=89=8A=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/dev/cosgy/textToSpeak/Bot.kt     |  5 -----
 .../java/dev/cosgy/textToSpeak/TextToSpeak.kt  |  4 ++--
 src/main/java/dev/cosgy/textToSpeak/gui/GUI.kt |  2 +-
 src/main/resources/lang/yomiage.properties     | 18 ------------------
 src/main/resources/lang/yomiage_en.properties  | 18 ------------------
 src/main/resources/lang/yomiage_ja.properties  | 18 ------------------
 6 files changed, 3 insertions(+), 62 deletions(-)
 delete mode 100644 src/main/resources/lang/yomiage.properties
 delete mode 100644 src/main/resources/lang/yomiage_en.properties
 delete mode 100644 src/main/resources/lang/yomiage_ja.properties

diff --git a/src/main/java/dev/cosgy/textToSpeak/Bot.kt b/src/main/java/dev/cosgy/textToSpeak/Bot.kt
index d13937b..a76ddca 100644
--- a/src/main/java/dev/cosgy/textToSpeak/Bot.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/Bot.kt
@@ -37,7 +37,6 @@ import kotlin.system.exitProcess
 
 class Bot(val waiter: EventWaiter, val config: BotConfig, val settingsManager: SettingsManager) {
     val threadpool: ScheduledExecutorService = Executors.newSingleThreadScheduledExecutor()
-    private val lang: ResourceBundle = ResourceBundle.getBundle("lang.yomiage", Locale.JAPAN)
     val playerManager: PlayerManager = PlayerManager(this)
     val voiceCreation: VoiceCreation
     val userSettingsManager: UserSettingsManager
@@ -139,10 +138,6 @@ class Bot(val waiter: EventWaiter, val config: BotConfig, val settingsManager: S
         this.gui = gui
     }
 
-    fun getLang(): ResourceBundle {
-        return lang
-    }
-
     companion object {
         var INSTANCE: Bot? = null
     }
diff --git a/src/main/java/dev/cosgy/textToSpeak/TextToSpeak.kt b/src/main/java/dev/cosgy/textToSpeak/TextToSpeak.kt
index d15ccb6..4579036 100644
--- a/src/main/java/dev/cosgy/textToSpeak/TextToSpeak.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/TextToSpeak.kt
@@ -122,7 +122,7 @@ object TextToSpeak {
         Bot.INSTANCE = bot
         val aboutCommand = AboutCommand(
             Color.BLUE.brighter(),
-            bot.getLang().getString("appName") + "(v" + version + ")",
+            "TextToSpeak Bot by Cosgy Dev(V$version)",
             *RECOMMENDED_PERMS
         )
         aboutCommand.setIsAuthor(false)
@@ -208,7 +208,7 @@ object TextToSpeak {
                         Botトークンでのログインに失敗しました。
                         正しいBotトークンが設定されていることを確認してください。(CLIENT SECRET ではありません!)
                         設定ファイルの場所；${config.configLocation}
-                    """.trimIndent()
+                """.trimIndent()
             )
             exitProcess(1)
         } catch (ex: IllegalArgumentException) {
diff --git a/src/main/java/dev/cosgy/textToSpeak/gui/GUI.kt b/src/main/java/dev/cosgy/textToSpeak/gui/GUI.kt
index ac7bf84..5fb2efe 100644
--- a/src/main/java/dev/cosgy/textToSpeak/gui/GUI.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/gui/GUI.kt
@@ -58,7 +58,7 @@ class GUI(private val bot: Bot) : JFrame() {
 
 
         defaultCloseOperation = EXIT_ON_CLOSE
-        title = bot.getLang().getString("appName")
+        title = "TextToSpeak Bot by Cosgy Dev"
         val tabs = JTabbedPane()
         tabs.add("コンソール", console)
 
diff --git a/src/main/resources/lang/yomiage.properties b/src/main/resources/lang/yomiage.properties
deleted file mode 100644
index 24718b0..0000000
--- a/src/main/resources/lang/yomiage.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-##########################################################################################
-#  Copyright 2023 Cosgy Dev                                                              #
-#                                                                                        #
-#     Licensed under the Apache License, Version 2.0 (the "License");                    #
-#     you may not use this file except in compliance with the License.                   #
-#     You may obtain a copy of the License at                                            #
-#                                                                                        #
-#        http://www.apache.org/licenses/LICENSE-2.0                                      #
-#                                                                                        #
-#     Unless required by applicable law or agreed to in writing, software                #
-#     distributed under the License is distributed on an "AS IS" BASIS,                  #
-#     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.           #
-#     See the License for the specific language governing permissions and                #
-#     limitations under the License.                                                     #
-##########################################################################################
-appName=\u8AAD\u307F\u4E0A\u3052\u30DC\u30C3\u30C8 by Cosgy Dev
-categoryAdmin="\u7BA1\u7406"
-categorySetting="\u8A2D\u5B9A"
\ No newline at end of file
diff --git a/src/main/resources/lang/yomiage_en.properties b/src/main/resources/lang/yomiage_en.properties
deleted file mode 100644
index 65f6513..0000000
--- a/src/main/resources/lang/yomiage_en.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-##########################################################################################
-#  Copyright 2023 Cosgy Dev                                                              #
-#                                                                                        #
-#     Licensed under the Apache License, Version 2.0 (the "License");                    #
-#     you may not use this file except in compliance with the License.                   #
-#     You may obtain a copy of the License at                                            #
-#                                                                                        #
-#        http://www.apache.org/licenses/LICENSE-2.0                                      #
-#                                                                                        #
-#     Unless required by applicable law or agreed to in writing, software                #
-#     distributed under the License is distributed on an "AS IS" BASIS,                  #
-#     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.           #
-#     See the License for the specific language governing permissions and                #
-#     limitations under the License.                                                     #
-##########################################################################################
-appName=Yomiage Bot by Cosgy Dev
-categoryAdmin="Admin"
-categorySetting="Setting"
\ No newline at end of file
diff --git a/src/main/resources/lang/yomiage_ja.properties b/src/main/resources/lang/yomiage_ja.properties
deleted file mode 100644
index 24718b0..0000000
--- a/src/main/resources/lang/yomiage_ja.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-##########################################################################################
-#  Copyright 2023 Cosgy Dev                                                              #
-#                                                                                        #
-#     Licensed under the Apache License, Version 2.0 (the "License");                    #
-#     you may not use this file except in compliance with the License.                   #
-#     You may obtain a copy of the License at                                            #
-#                                                                                        #
-#        http://www.apache.org/licenses/LICENSE-2.0                                      #
-#                                                                                        #
-#     Unless required by applicable law or agreed to in writing, software                #
-#     distributed under the License is distributed on an "AS IS" BASIS,                  #
-#     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.           #
-#     See the License for the specific language governing permissions and                #
-#     limitations under the License.                                                     #
-##########################################################################################
-appName=\u8AAD\u307F\u4E0A\u3052\u30DC\u30C3\u30C8 by Cosgy Dev
-categoryAdmin="\u7BA1\u7406"
-categorySetting="\u8A2D\u5B9A"
\ No newline at end of file

From 9a299fb9ae2363d36b13716c4756db63126fa308 Mon Sep 17 00:00:00 2001
From: kosugikun <33971692+kosugikun@users.noreply.github.com>
Date: Mon, 17 Jul 2023 22:27:04 +0900
Subject: [PATCH 31/39] =?UTF-8?q?=E3=83=99=E3=83=BC=E3=82=BF=E3=83=90?=
 =?UTF-8?q?=E3=83=BC=E3=82=B8=E3=83=A7=E3=83=B3=E3=81=AE=E3=82=A2=E3=83=83?=
 =?UTF-8?q?=E3=83=97=E3=83=87=E3=83=BC=E3=83=88=E9=80=9A=E7=9F=A5=E3=81=A7?=
 =?UTF-8?q?=E9=80=81=E4=BF=A1=E3=81=95=E3=82=8C=E3=82=8BURL=E3=82=92?=
 =?UTF-8?q?=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/resourceBundles.xml                          | 14 --------------
 .../java/dev/cosgy/textToSpeak/utils/OtherUtil.kt  |  4 ++--
 2 files changed, 2 insertions(+), 16 deletions(-)
 delete mode 100644 .idea/resourceBundles.xml

diff --git a/.idea/resourceBundles.xml b/.idea/resourceBundles.xml
deleted file mode 100644
index 5767f32..0000000
--- a/.idea/resourceBundles.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ResourceBundleManager">
-    <file url="file://$PROJECT_DIR$/src/main/resources/lang/yomiage.properties" />
-    <file url="file://$PROJECT_DIR$/src/main/resources/lang/yomiage_en.properties" />
-    <file url="file://$PROJECT_DIR$/src/main/resources/lang/yomiage_ja.properties" />
-    <custom-resource-bundle>
-      <file value="file://$PROJECT_DIR$/src/main/resources/lang/yomiage.properties" />
-      <file value="file://$PROJECT_DIR$/src/main/resources/lang/yomiage_en.properties" />
-      <file value="file://$PROJECT_DIR$/src/main/resources/lang/yomiage_ja.properties" />
-      <base-name>yomiage</base-name>
-    </custom-resource-bundle>
-  </component>
-</project>
\ No newline at end of file
diff --git a/src/main/java/dev/cosgy/textToSpeak/utils/OtherUtil.kt b/src/main/java/dev/cosgy/textToSpeak/utils/OtherUtil.kt
index 72e5c85..51745f0 100644
--- a/src/main/java/dev/cosgy/textToSpeak/utils/OtherUtil.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/utils/OtherUtil.kt
@@ -43,7 +43,7 @@ object OtherUtil {
     const val NEW_BETA_VERSION_AVAILABLE = ("利用可能な新しいベータバージョンがあります!\n"
             + "現在のバージョン: %s\n"
             + "最新のバージョン: %s\n\n"
-            + " https://github.com/Cosgy-Dev/TextToSpeakBot/releases から最新バージョンをダウンロードして下さい。")
+            + " https://github.com/Cosgy-Dev/TextToSpeakBot/releases/tag/%s から最新バージョンをダウンロードして下さい。")
     private const val WINDOWS_INVALID_PATH = "c:\\windows\\system32\\"
     fun getPath(path: String): Path {
         // special logic to prevent trying to access system32
@@ -167,7 +167,7 @@ object OtherUtil {
                 prompt.alert(
                     Prompt.Level.WARNING,
                     "Beta Version",
-                    String.format(NEW_BETA_VERSION_AVAILABLE, version, latestBetaVersion)
+                    String.format(NEW_BETA_VERSION_AVAILABLE, version, latestBetaVersion, latestBetaVersion)
                 )
             }
         }

From dfab08e30bf211b9381c292b4f7cfd7b189bbfed Mon Sep 17 00:00:00 2001
From: kosugikun <33971692+kosugikun@users.noreply.github.com>
Date: Mon, 17 Jul 2023 22:28:48 +0900
Subject: [PATCH 32/39] =?UTF-8?q?=E5=BF=85=E8=A6=81=E3=81=AA=E3=81=84?=
 =?UTF-8?q?=E3=83=A1=E3=82=BE=E3=83=83=E3=83=88=E3=82=92=E5=89=8A=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dev/cosgy/textToSpeak/utils/OtherUtil.kt  | 22 -------------------
 1 file changed, 22 deletions(-)

diff --git a/src/main/java/dev/cosgy/textToSpeak/utils/OtherUtil.kt b/src/main/java/dev/cosgy/textToSpeak/utils/OtherUtil.kt
index 51745f0..577ce20 100644
--- a/src/main/java/dev/cosgy/textToSpeak/utils/OtherUtil.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/utils/OtherUtil.kt
@@ -87,28 +87,6 @@ object OtherUtil {
         return into.toString("utf-8")
     }
 
-    /**
-     * URLから画像データをロード
-     *
-     * @param url 画像のURL
-     * @return URLのinputstream
-     */
-    fun imageFromUrl(url: String?): InputStream? {
-        if (url == null) return null
-        try {
-            val u = URL(url)
-            val urlConnection = u.openConnection()
-            urlConnection.setRequestProperty(
-                "user-agent",
-                "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.87 Safari/537.36"
-            )
-            return urlConnection.getInputStream()
-        } catch (ignore: IOException) {
-        } catch (ignore: IllegalArgumentException) {
-        }
-        return null
-    }
-
     /**
      * 文字列からアクティビティを解析
      *

From 29f33304a166fee11b4af9f3aa60f1f5f968827b Mon Sep 17 00:00:00 2001
From: kosugikun <33971692+kosugikun@users.noreply.github.com>
Date: Mon, 17 Jul 2023 22:54:49 +0900
Subject: [PATCH 33/39] =?UTF-8?q?=E5=87=A6=E7=90=86=E3=81=AE=E6=9C=80?=
 =?UTF-8?q?=E9=81=A9=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/dev/cosgy/textToSpeak/audio/VoiceCreation.kt |  6 +++---
 .../dev/cosgy/textToSpeak/commands/admin/JLReadCmd.kt |  9 ++-------
 .../textToSpeak/commands/admin/SetReadNameCmd.kt      |  9 ++-------
 .../dev/cosgy/textToSpeak/commands/general/JoinCmd.kt |  6 ++++--
 .../java/dev/cosgy/textToSpeak/utils/OtherUtil.kt     | 11 +++++------
 5 files changed, 16 insertions(+), 25 deletions(-)

diff --git a/src/main/java/dev/cosgy/textToSpeak/audio/VoiceCreation.kt b/src/main/java/dev/cosgy/textToSpeak/audio/VoiceCreation.kt
index 6d38f6a..2101a76 100644
--- a/src/main/java/dev/cosgy/textToSpeak/audio/VoiceCreation.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/audio/VoiceCreation.kt
@@ -121,10 +121,10 @@ class VoiceCreation( // 各種設定の値を保持するためのフィール
 
     private val characterCode: String
         // 文字コードを取得するメソッド
-        get(){
-            if(!IS_WINDOWS) return "UTF-8"
+        get() {
+            if (!IS_WINDOWS) return "UTF-8"
 
-            return if(bot.config.isForceUTF8) "UTF-8" else "Shift-JIS"
+            return if (bot.config.isForceUTF8) "UTF-8" else "Shift-JIS"
         }
 
     // コマンドを生成するメソッド
diff --git a/src/main/java/dev/cosgy/textToSpeak/commands/admin/JLReadCmd.kt b/src/main/java/dev/cosgy/textToSpeak/commands/admin/JLReadCmd.kt
index d70f3ad..ce31623 100644
--- a/src/main/java/dev/cosgy/textToSpeak/commands/admin/JLReadCmd.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/commands/admin/JLReadCmd.kt
@@ -61,12 +61,7 @@ class JLReadCmd(private val bot: Bot) : AdminCommand() {
     override fun execute(event: CommandEvent) {
         val settings = bot.settingsManager.getSettings(event.guild)
 
-        if (settings.isJoinAndLeaveRead()) {
-            settings.setJoinAndLeaveRead(false)
-            event.reply("ボイスチャンネルにユーザーが参加、退出した際の読み上げを無効にしました。")
-        } else {
-            settings.setJoinAndLeaveRead(true)
-            event.reply("ボイスチャンネルにユーザーが参加、退出した際の読み上げを有効にしました。")
-        }
+        settings.setJoinAndLeaveRead(!settings.isJoinAndLeaveRead())
+        event.reply("ボイスチャンネルにユーザーが参加、退出した際の読み上げを${if (settings.isJoinAndLeaveRead()) "有効" else "無効"}にしました。")
     }
 }
\ No newline at end of file
diff --git a/src/main/java/dev/cosgy/textToSpeak/commands/admin/SetReadNameCmd.kt b/src/main/java/dev/cosgy/textToSpeak/commands/admin/SetReadNameCmd.kt
index 016991a..77a0423 100644
--- a/src/main/java/dev/cosgy/textToSpeak/commands/admin/SetReadNameCmd.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/commands/admin/SetReadNameCmd.kt
@@ -43,13 +43,8 @@ class SetReadNameCmd(private val bot: Bot) : AdminCommand() {
         val settings = bot.settingsManager.getSettings(event.guild!!)
 
         if (event.getOption("value") == null) {
-            if (settings.isReadName()) {
-                settings.setReadName(false)
-                event.reply("ユーザー名の読み上げを無効にしました。").queue()
-            } else {
-                settings.setReadName(true)
-                event.reply("ユーザー名の読み上げを有効にしました。").queue()
-            }
+            settings.setReadName(!settings.isReadName())
+            event.reply("ユーザー名の読み上げを${if (settings.isReadName()) "有効" else "無効"}にしました。").queue()
         } else {
             val args = event.getOption("value")!!.asBoolean
 
diff --git a/src/main/java/dev/cosgy/textToSpeak/commands/general/JoinCmd.kt b/src/main/java/dev/cosgy/textToSpeak/commands/general/JoinCmd.kt
index 853b79c..c95366b 100644
--- a/src/main/java/dev/cosgy/textToSpeak/commands/general/JoinCmd.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/commands/general/JoinCmd.kt
@@ -57,9 +57,11 @@ class JoinCmd(private var bot: Bot) : SlashCommand() {
             event.guild!!.audioManager.openAudioConnection(userState.channel)
             builder.addField("ボイスチャンネル", String.format("**%s**", userState.channel!!.name), false)
             builder.setDescription("ボイスチャンネルへの接続に成功しました。")
-            builder.addField("設定",
+            builder.addField(
+                "設定",
                 "ユーザー名読み上げ:${if (settings.isReadName()) "有効" else "無効"}\n" +
-                    "参加、退出読み上げ:${if (settings.isJoinAndLeaveRead()) "有効" else "無効"}", true)
+                        "参加、退出読み上げ:${if (settings.isJoinAndLeaveRead()) "有効" else "無効"}", true
+            )
             event.hook.sendMessageEmbeds(builder.build()).queue()
             ReadChannel.setChannel(event.guild!!.idLong, event.textChannel.idLong)
         } catch (ex: PermissionException) {
diff --git a/src/main/java/dev/cosgy/textToSpeak/utils/OtherUtil.kt b/src/main/java/dev/cosgy/textToSpeak/utils/OtherUtil.kt
index 577ce20..102c075 100644
--- a/src/main/java/dev/cosgy/textToSpeak/utils/OtherUtil.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/utils/OtherUtil.kt
@@ -21,6 +21,7 @@ import net.dv8tion.jda.api.OnlineStatus
 import net.dv8tion.jda.api.entities.Activity
 import okhttp3.OkHttpClient
 import okhttp3.Request
+import org.json.JSONArray
 import org.json.JSONException
 import org.json.JSONObject
 import org.slf4j.LoggerFactory
@@ -29,11 +30,9 @@ import java.io.File
 import java.io.IOException
 import java.io.InputStream
 import java.net.URISyntaxException
-import java.net.URL
 import java.nio.file.Path
 import java.nio.file.Paths
 import java.util.*
-import org.json.JSONArray
 
 object OtherUtil {
     const val NEW_VERSION_AVAILABLE = ("利用可能な新しいバージョンがあります!\n"
@@ -127,7 +126,7 @@ object OtherUtil {
         // Get current version number
         val version = currentVersion
 
-        if(!isBetaVersion(version)) {
+        if (!isBetaVersion(version)) {
             // Check for new version
             val latestVersion = latestVersion
             if (latestVersion != null && latestVersion != version && TextToSpeak.CHECK_UPDATE) {
@@ -137,11 +136,11 @@ object OtherUtil {
                     String.format(NEW_VERSION_AVAILABLE, version, latestVersion)
                 )
             }
-        }else{
+        } else {
             val latestBeta = latestBetaVersion
-            if(latestBeta != null && compareVersions(version, latestBeta) == 0){
+            if (latestBeta != null && compareVersions(version, latestBeta) == 0) {
                 prompt.alert(Prompt.Level.INFO, "Beta Version", "最新のベータバージョンを使用中です。")
-            }else{
+            } else {
                 prompt.alert(
                     Prompt.Level.WARNING,
                     "Beta Version",

From 56a666840c54bd5a01be360ca765532f0f442088 Mon Sep 17 00:00:00 2001
From: kosugikun <33971692+kosugikun@users.noreply.github.com>
Date: Tue, 18 Jul 2023 00:05:46 +0900
Subject: [PATCH 34/39] =?UTF-8?q?=E7=B4=B0=E3=81=8B=E3=81=AA=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../648c6ef7-2bba-4e14-b21f-f6619a5657a5.xml  | 1251 +++++++++--------
 .../commands/admin/SetReadNameCmd.kt          |   12 +-
 .../textToSpeak/commands/admin/SettcCmd.kt    |   18 +-
 .../commands/dictionary/AddWordCmd.kt         |    4 +-
 .../commands/dictionary/DlWordCmd.kt          |    8 +-
 .../textToSpeak/commands/general/JoinCmd.kt   |    2 +-
 .../commands/general/SetIntonationCmd.kt      |    4 +-
 .../commands/general/SetSpeedCmd.kt           |    4 +-
 .../commands/general/SetVoiceQualityA.kt      |    4 +-
 .../commands/general/SetVoiceQualityFm.kt     |    4 +-
 .../cosgy/textToSpeak/settings/Settings.kt    |    1 -
 11 files changed, 687 insertions(+), 625 deletions(-)

diff --git a/.idea/dataSources/648c6ef7-2bba-4e14-b21f-f6619a5657a5.xml b/.idea/dataSources/648c6ef7-2bba-4e14-b21f-f6619a5657a5.xml
index e1eb24c..088cbfa 100644
--- a/.idea/dataSources/648c6ef7-2bba-4e14-b21f-f6619a5657a5.xml
+++ b/.idea/dataSources/648c6ef7-2bba-4e14-b21f-f6619a5657a5.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <dataSource name="UserData">
   <database-model serializer="dbm" dbms="SQLITE" family-id="SQLITE" format-version="4.48">
-    <root id="1"/>
+    <root id="1">
+      <ServerVersion>3.40.1</ServerVersion>
+    </root>
     <collation id="2" parent="1" name="RTRIM"/>
     <collation id="3" parent="1" name="NOCASE"/>
     <collation id="4" parent="1" name="BINARY"/>
@@ -16,416 +18,416 @@
     <package id="13" parent="1" name="fts5"/>
     <package id="14" parent="1" name="rtree"/>
     <package id="15" parent="1" name="dbstat"/>
-    <routine id="16" parent="1" name="pow">
+    <routine id="16" parent="1" name="julianday">
       <Deterministic>1</Deterministic>
+      <Variadic>1</Variadic>
     </routine>
-    <routine id="17" parent="1" name="group_concat">
-      <FunctionType>window</FunctionType>
-    </routine>
-    <routine id="18" parent="1" name="json_type">
+    <routine id="17" parent="1" name="json_array">
       <Deterministic>1</Deterministic>
+      <Variadic>1</Variadic>
     </routine>
-    <routine id="19" parent="1" name="julianday">
+    <routine id="18" parent="1" name="json_remove">
       <Deterministic>1</Deterministic>
       <Variadic>1</Variadic>
     </routine>
-    <routine id="20" parent="1" name="ntile">
-      <FunctionType>window</FunctionType>
-    </routine>
-    <routine id="21" parent="1" name="nullif">
+    <routine id="19" parent="1" name="json_object">
       <Deterministic>1</Deterministic>
+      <Variadic>1</Variadic>
     </routine>
-    <routine id="22" parent="1" name="sqlite_compileoption_get"/>
-    <routine id="23" parent="1" name="json_valid">
+    <routine id="20" parent="1" name="json_insert">
       <Deterministic>1</Deterministic>
+      <Variadic>1</Variadic>
     </routine>
-    <routine id="24" parent="1" name="json_quote">
+    <routine id="21" parent="1" name="printf">
       <Deterministic>1</Deterministic>
+      <Variadic>1</Variadic>
     </routine>
-    <routine id="25" parent="1" name="json_patch">
+    <routine id="22" parent="1" name="json_replace">
       <Deterministic>1</Deterministic>
+      <Variadic>1</Variadic>
     </routine>
-    <routine id="26" parent="1" name="-&gt;">
+    <routine id="23" parent="1" name="json_extract">
       <Deterministic>1</Deterministic>
+      <Variadic>1</Variadic>
     </routine>
-    <routine id="27" parent="1" name="json_array">
+    <routine id="24" parent="1" name="time">
       <Deterministic>1</Deterministic>
       <Variadic>1</Variadic>
     </routine>
-    <routine id="28" parent="1" name="current_timestamp"/>
-    <routine id="29" parent="1" name="power">
+    <routine id="25" parent="1" name="strftime">
       <Deterministic>1</Deterministic>
+      <Variadic>1</Variadic>
     </routine>
-    <routine id="30" parent="1" name="sqlite_compileoption_used"/>
-    <routine id="31" parent="1" name="json_remove">
+    <routine id="26" parent="1" name="char">
       <Deterministic>1</Deterministic>
       <Variadic>1</Variadic>
     </routine>
-    <routine id="32" parent="1" name="json_object">
+    <routine id="27" parent="1" name="unixepoch">
       <Deterministic>1</Deterministic>
       <Variadic>1</Variadic>
     </routine>
-    <routine id="33" parent="1" name="json_insert">
+    <routine id="28" parent="1" name="date">
       <Deterministic>1</Deterministic>
       <Variadic>1</Variadic>
     </routine>
-    <routine id="34" parent="1" name="-&gt;&gt;">
+    <routine id="29" parent="1" name="coalesce">
       <Deterministic>1</Deterministic>
+      <Variadic>1</Variadic>
     </routine>
-    <routine id="35" parent="1" name="sin">
+    <routine id="30" parent="1" name="format">
       <Deterministic>1</Deterministic>
+      <Variadic>1</Variadic>
     </routine>
-    <routine id="36" parent="1" name="sum">
-      <FunctionType>window</FunctionType>
-    </routine>
-    <routine id="37" parent="1" name="quote">
+    <routine id="31" parent="1" name="datetime">
       <Deterministic>1</Deterministic>
+      <Variadic>1</Variadic>
     </routine>
-    <routine id="38" parent="1" name="printf">
+    <routine id="32" parent="1" name="max">
       <Deterministic>1</Deterministic>
       <Variadic>1</Variadic>
     </routine>
-    <routine id="39" parent="1" name="likelihood">
+    <routine id="33" parent="1" name="min">
       <Deterministic>1</Deterministic>
+      <Variadic>1</Variadic>
     </routine>
-    <routine id="40" parent="1" name="json_replace">
+    <routine id="34" parent="1" name="json_set">
       <Deterministic>1</Deterministic>
       <Variadic>1</Variadic>
     </routine>
-    <routine id="41" parent="1" name="json_extract">
-      <Deterministic>1</Deterministic>
+    <routine id="35" parent="1" name="regexp">
+      <Variadic>1</Variadic>
+    </routine>
+    <routine id="36" parent="1" name="snippet">
       <Variadic>1</Variadic>
     </routine>
-    <routine id="42" parent="1" name="last_value">
+    <routine id="37" parent="1" name="rtreecheck">
+      <Variadic>1</Variadic>
+    </routine>
+    <routine id="38" parent="1" name="highlight">
+      <Variadic>1</Variadic>
+    </routine>
+    <routine id="39" parent="1" name="bm25">
+      <Variadic>1</Variadic>
+    </routine>
+    <routine id="40" parent="1" name="lag">
       <FunctionType>window</FunctionType>
     </routine>
-    <routine id="43" parent="1" name="rank">
+    <routine id="41" parent="1" name="lead">
       <FunctionType>window</FunctionType>
     </routine>
-    <routine id="44" parent="1" name="sign">
+    <routine id="42" parent="1" name="matchinfo"/>
+    <routine id="43" parent="1" name="charindex"/>
+    <routine id="44" parent="1" name="fts3_tokenizer"/>
+    <routine id="45" parent="1" name="pow">
       <Deterministic>1</Deterministic>
     </routine>
-    <routine id="45" parent="1" name="sqrt">
+    <routine id="46" parent="1" name="group_concat">
+      <FunctionType>window</FunctionType>
+    </routine>
+    <routine id="47" parent="1" name="json_type">
       <Deterministic>1</Deterministic>
     </routine>
-    <routine id="46" parent="1" name="sinh">
+    <routine id="48" parent="1" name="ntile">
+      <FunctionType>window</FunctionType>
+    </routine>
+    <routine id="49" parent="1" name="nullif">
       <Deterministic>1</Deterministic>
     </routine>
-    <routine id="47" parent="1" name="tan">
+    <routine id="50" parent="1" name="sqlite_compileoption_get"/>
+    <routine id="51" parent="1" name="json_valid">
       <Deterministic>1</Deterministic>
     </routine>
-    <routine id="48" parent="1" name="round">
+    <routine id="52" parent="1" name="json_quote">
       <Deterministic>1</Deterministic>
     </routine>
-    <routine id="49" parent="1" name="rtrim">
+    <routine id="53" parent="1" name="json_patch">
       <Deterministic>1</Deterministic>
     </routine>
-    <routine id="50" parent="1" name="nth_value">
-      <FunctionType>window</FunctionType>
+    <routine id="54" parent="1" name="-&gt;">
+      <Deterministic>1</Deterministic>
     </routine>
-    <routine id="51" parent="1" name="tanh">
+    <routine id="55" parent="1" name="current_timestamp"/>
+    <routine id="56" parent="1" name="power">
       <Deterministic>1</Deterministic>
     </routine>
-    <routine id="52" parent="1" name="random"/>
-    <routine id="53" parent="1" name="trim">
+    <routine id="57" parent="1" name="sqlite_compileoption_used"/>
+    <routine id="58" parent="1" name="-&gt;&gt;">
       <Deterministic>1</Deterministic>
     </routine>
-    <routine id="54" parent="1" name="time">
+    <routine id="59" parent="1" name="sin">
       <Deterministic>1</Deterministic>
-      <Variadic>1</Variadic>
     </routine>
-    <routine id="55" parent="1" name="radians">
+    <routine id="60" parent="1" name="sum">
+      <FunctionType>window</FunctionType>
+    </routine>
+    <routine id="61" parent="1" name="quote">
       <Deterministic>1</Deterministic>
     </routine>
-    <routine id="56" parent="1" name="trunc">
+    <routine id="62" parent="1" name="likelihood">
       <Deterministic>1</Deterministic>
     </routine>
-    <routine id="57" parent="1" name="total">
+    <routine id="63" parent="1" name="last_value">
+      <FunctionType>window</FunctionType>
+    </routine>
+    <routine id="64" parent="1" name="rank">
       <FunctionType>window</FunctionType>
     </routine>
-    <routine id="58" parent="1" name="substr">
+    <routine id="65" parent="1" name="sign">
       <Deterministic>1</Deterministic>
     </routine>
-    <routine id="59" parent="1" name="replace">
+    <routine id="66" parent="1" name="sqrt">
       <Deterministic>1</Deterministic>
     </routine>
-    <routine id="60" parent="1" name="upper">
+    <routine id="67" parent="1" name="sinh">
       <Deterministic>1</Deterministic>
     </routine>
-    <routine id="61" parent="1" name="subtype">
+    <routine id="68" parent="1" name="tan">
       <Deterministic>1</Deterministic>
     </routine>
-    <routine id="62" parent="1" name="typeof">
+    <routine id="69" parent="1" name="round">
       <Deterministic>1</Deterministic>
     </routine>
-    <routine id="63" parent="1" name="load_extension"/>
-    <routine id="64" parent="1" name="json_group_array">
+    <routine id="70" parent="1" name="rtrim">
       <Deterministic>1</Deterministic>
-      <FunctionType>window</FunctionType>
     </routine>
-    <routine id="65" parent="1" name="avg">
+    <routine id="71" parent="1" name="nth_value">
       <FunctionType>window</FunctionType>
     </routine>
-    <routine id="66" parent="1" name="abs">
+    <routine id="72" parent="1" name="tanh">
       <Deterministic>1</Deterministic>
     </routine>
-    <routine id="67" parent="1" name="json_group_object">
+    <routine id="73" parent="1" name="random"/>
+    <routine id="74" parent="1" name="trim">
       <Deterministic>1</Deterministic>
-      <FunctionType>window</FunctionType>
     </routine>
-    <routine id="68" parent="1" name="json_array_length">
+    <routine id="75" parent="1" name="radians">
       <Deterministic>1</Deterministic>
     </routine>
-    <routine id="69" parent="1" name="strftime">
+    <routine id="76" parent="1" name="trunc">
       <Deterministic>1</Deterministic>
-      <Variadic>1</Variadic>
     </routine>
-    <routine id="70" parent="1" name="atan">
+    <routine id="77" parent="1" name="total">
+      <FunctionType>window</FunctionType>
+    </routine>
+    <routine id="78" parent="1" name="substr">
       <Deterministic>1</Deterministic>
     </routine>
-    <routine id="71" parent="1" name="asin">
+    <routine id="79" parent="1" name="replace">
       <Deterministic>1</Deterministic>
     </routine>
-    <routine id="72" parent="1" name="acos">
+    <routine id="80" parent="1" name="upper">
       <Deterministic>1</Deterministic>
     </routine>
-    <routine id="73" parent="1" name="substring">
+    <routine id="81" parent="1" name="subtype">
       <Deterministic>1</Deterministic>
     </routine>
-    <routine id="74" parent="1" name="randomblob"/>
-    <routine id="75" parent="1" name="unicode">
+    <routine id="82" parent="1" name="typeof">
       <Deterministic>1</Deterministic>
     </routine>
-    <routine id="76" parent="1" name="percent_rank">
+    <routine id="83" parent="1" name="load_extension"/>
+    <routine id="84" parent="1" name="json_group_array">
+      <Deterministic>1</Deterministic>
       <FunctionType>window</FunctionType>
     </routine>
-    <routine id="77" parent="1" name="row_number">
+    <routine id="85" parent="1" name="avg">
       <FunctionType>window</FunctionType>
     </routine>
-    <routine id="78" parent="1" name="atanh">
+    <routine id="86" parent="1" name="abs">
       <Deterministic>1</Deterministic>
     </routine>
-    <routine id="79" parent="1" name="asinh">
+    <routine id="87" parent="1" name="json_group_object">
       <Deterministic>1</Deterministic>
+      <FunctionType>window</FunctionType>
     </routine>
-    <routine id="80" parent="1" name="acosh">
+    <routine id="88" parent="1" name="json_array_length">
       <Deterministic>1</Deterministic>
     </routine>
-    <routine id="81" parent="1" name="cos">
+    <routine id="89" parent="1" name="atan">
       <Deterministic>1</Deterministic>
     </routine>
-    <routine id="82" parent="1" name="atan2">
+    <routine id="90" parent="1" name="asin">
       <Deterministic>1</Deterministic>
     </routine>
-    <routine id="83" parent="1" name="last_insert_rowid"/>
-    <routine id="84" parent="1" name="sqlite_log">
+    <routine id="91" parent="1" name="acos">
       <Deterministic>1</Deterministic>
     </routine>
-    <routine id="85" parent="1" name="unlikely">
+    <routine id="92" parent="1" name="substring">
       <Deterministic>1</Deterministic>
     </routine>
-    <routine id="86" parent="1" name="cosh">
+    <routine id="93" parent="1" name="randomblob"/>
+    <routine id="94" parent="1" name="unicode">
       <Deterministic>1</Deterministic>
     </routine>
-    <routine id="87" parent="1" name="ceil">
-      <Deterministic>1</Deterministic>
+    <routine id="95" parent="1" name="percent_rank">
+      <FunctionType>window</FunctionType>
     </routine>
-    <routine id="88" parent="1" name="char">
-      <Deterministic>1</Deterministic>
-      <Variadic>1</Variadic>
+    <routine id="96" parent="1" name="row_number">
+      <FunctionType>window</FunctionType>
     </routine>
-    <routine id="89" parent="1" name="unixepoch">
+    <routine id="97" parent="1" name="atanh">
       <Deterministic>1</Deterministic>
-      <Variadic>1</Variadic>
     </routine>
-    <routine id="90" parent="1" name="exp">
+    <routine id="98" parent="1" name="asinh">
       <Deterministic>1</Deterministic>
     </routine>
-    <routine id="91" parent="1" name="count">
-      <FunctionType>window</FunctionType>
-    </routine>
-    <routine id="92" parent="1" name="date">
+    <routine id="99" parent="1" name="acosh">
       <Deterministic>1</Deterministic>
-      <Variadic>1</Variadic>
     </routine>
-    <routine id="93" parent="1" name="ceiling">
+    <routine id="100" parent="1" name="cos">
       <Deterministic>1</Deterministic>
     </routine>
-    <routine id="94" parent="1" name="total_changes"/>
-    <routine id="95" parent="1" name="changes"/>
-    <routine id="96" parent="1" name="sqlite_version"/>
-    <routine id="97" parent="1" name="degrees">
+    <routine id="101" parent="1" name="atan2">
       <Deterministic>1</Deterministic>
     </routine>
-    <routine id="98" parent="1" name="floor">
+    <routine id="102" parent="1" name="last_insert_rowid"/>
+    <routine id="103" parent="1" name="sqlite_log">
       <Deterministic>1</Deterministic>
     </routine>
-    <routine id="99" parent="1" name="coalesce">
+    <routine id="104" parent="1" name="unlikely">
       <Deterministic>1</Deterministic>
-      <Variadic>1</Variadic>
     </routine>
-    <routine id="100" parent="1" name="glob">
+    <routine id="105" parent="1" name="cosh">
       <Deterministic>1</Deterministic>
     </routine>
-    <routine id="101" parent="1" name="zeroblob">
+    <routine id="106" parent="1" name="ceil">
       <Deterministic>1</Deterministic>
     </routine>
-    <routine id="102" parent="1" name="hex">
+    <routine id="107" parent="1" name="exp">
       <Deterministic>1</Deterministic>
     </routine>
-    <routine id="103" parent="1" name="iif">
+    <routine id="108" parent="1" name="count">
+      <FunctionType>window</FunctionType>
+    </routine>
+    <routine id="109" parent="1" name="ceiling">
       <Deterministic>1</Deterministic>
     </routine>
-    <routine id="104" parent="1" name="sqlite_source_id"/>
-    <routine id="105" parent="1" name="format">
+    <routine id="110" parent="1" name="total_changes"/>
+    <routine id="111" parent="1" name="changes"/>
+    <routine id="112" parent="1" name="sqlite_version"/>
+    <routine id="113" parent="1" name="degrees">
       <Deterministic>1</Deterministic>
-      <Variadic>1</Variadic>
     </routine>
-    <routine id="106" parent="1" name="datetime">
+    <routine id="114" parent="1" name="floor">
       <Deterministic>1</Deterministic>
-      <Variadic>1</Variadic>
     </routine>
-    <routine id="107" parent="1" name="cume_dist">
-      <FunctionType>window</FunctionType>
+    <routine id="115" parent="1" name="glob">
+      <Deterministic>1</Deterministic>
     </routine>
-    <routine id="108" parent="1" name="ln">
+    <routine id="116" parent="1" name="zeroblob">
       <Deterministic>1</Deterministic>
     </routine>
-    <routine id="109" parent="1" name="instr">
+    <routine id="117" parent="1" name="hex">
       <Deterministic>1</Deterministic>
     </routine>
-    <routine id="110" parent="1" name="json">
+    <routine id="118" parent="1" name="iif">
       <Deterministic>1</Deterministic>
     </routine>
-    <routine id="111" parent="1" name="dense_rank">
+    <routine id="119" parent="1" name="sqlite_source_id"/>
+    <routine id="120" parent="1" name="cume_dist">
       <FunctionType>window</FunctionType>
     </routine>
-    <routine id="112" parent="1" name="log">
+    <routine id="121" parent="1" name="ln">
       <Deterministic>1</Deterministic>
     </routine>
-    <routine id="113" parent="1" name="ifnull">
+    <routine id="122" parent="1" name="instr">
       <Deterministic>1</Deterministic>
     </routine>
-    <routine id="114" parent="1" name="current_date"/>
-    <routine id="115" parent="1" name="current_time"/>
-    <routine id="116" parent="1" name="lag">
-      <FunctionType>window</FunctionType>
+    <routine id="123" parent="1" name="json">
+      <Deterministic>1</Deterministic>
     </routine>
-    <routine id="117" parent="1" name="lag">
+    <routine id="124" parent="1" name="dense_rank">
       <FunctionType>window</FunctionType>
     </routine>
-    <routine id="118" parent="1" name="mod">
+    <routine id="125" parent="1" name="log">
       <Deterministic>1</Deterministic>
     </routine>
-    <routine id="119" parent="1" name="log2">
+    <routine id="126" parent="1" name="ifnull">
       <Deterministic>1</Deterministic>
     </routine>
-    <routine id="120" parent="1" name="like">
-      <Deterministic>1</Deterministic>
+    <routine id="127" parent="1" name="current_date"/>
+    <routine id="128" parent="1" name="current_time"/>
+    <routine id="129" parent="1" name="lag">
+      <FunctionType>window</FunctionType>
     </routine>
-    <routine id="121" parent="1" name="max">
+    <routine id="130" parent="1" name="mod">
       <Deterministic>1</Deterministic>
-      <Variadic>1</Variadic>
     </routine>
-    <routine id="122" parent="1" name="max">
-      <FunctionType>window</FunctionType>
+    <routine id="131" parent="1" name="log2">
+      <Deterministic>1</Deterministic>
     </routine>
-    <routine id="123" parent="1" name="min">
+    <routine id="132" parent="1" name="like">
       <Deterministic>1</Deterministic>
-      <Variadic>1</Variadic>
     </routine>
-    <routine id="124" parent="1" name="min">
+    <routine id="133" parent="1" name="max">
       <FunctionType>window</FunctionType>
     </routine>
-    <routine id="125" parent="1" name="lead">
+    <routine id="134" parent="1" name="min">
       <FunctionType>window</FunctionType>
     </routine>
-    <routine id="126" parent="1" name="lead">
+    <routine id="135" parent="1" name="lead">
       <FunctionType>window</FunctionType>
     </routine>
-    <routine id="127" parent="1" name="log10">
+    <routine id="136" parent="1" name="log10">
       <Deterministic>1</Deterministic>
     </routine>
-    <routine id="128" parent="1" name="lower">
+    <routine id="137" parent="1" name="lower">
       <Deterministic>1</Deterministic>
     </routine>
-    <routine id="129" parent="1" name="ltrim">
+    <routine id="138" parent="1" name="ltrim">
       <Deterministic>1</Deterministic>
     </routine>
-    <routine id="130" parent="1" name="first_value">
+    <routine id="139" parent="1" name="first_value">
       <FunctionType>window</FunctionType>
     </routine>
-    <routine id="131" parent="1" name="pi">
+    <routine id="140" parent="1" name="pi">
       <Deterministic>1</Deterministic>
     </routine>
-    <routine id="132" parent="1" name="length">
+    <routine id="141" parent="1" name="length">
       <Deterministic>1</Deterministic>
     </routine>
-    <routine id="133" parent="1" name="likely">
+    <routine id="142" parent="1" name="likely">
       <Deterministic>1</Deterministic>
     </routine>
-    <routine id="134" parent="1" name="json_set">
-      <Deterministic>1</Deterministic>
-      <Variadic>1</Variadic>
-    </routine>
-    <routine id="135" parent="1" name="upper_quartile">
+    <routine id="143" parent="1" name="upper_quartile">
       <FunctionType>aggregate</FunctionType>
     </routine>
-    <routine id="136" parent="1" name="median">
+    <routine id="144" parent="1" name="median">
       <FunctionType>aggregate</FunctionType>
     </routine>
-    <routine id="137" parent="1" name="stdev">
+    <routine id="145" parent="1" name="stdev">
       <FunctionType>aggregate</FunctionType>
     </routine>
-    <routine id="138" parent="1" name="rightstr"/>
-    <routine id="139" parent="1" name="leftstr"/>
-    <routine id="140" parent="1" name="mode">
+    <routine id="146" parent="1" name="rightstr"/>
+    <routine id="147" parent="1" name="leftstr"/>
+    <routine id="148" parent="1" name="mode">
       <FunctionType>aggregate</FunctionType>
     </routine>
-    <routine id="141" parent="1" name="replicate"/>
-    <routine id="142" parent="1" name="padl"/>
-    <routine id="143" parent="1" name="square"/>
-    <routine id="144" parent="1" name="regexp">
-      <Variadic>1</Variadic>
-    </routine>
-    <routine id="145" parent="1" name="strfilter"/>
-    <routine id="146" parent="1" name="difference"/>
-    <routine id="147" parent="1" name="lower_quartile">
+    <routine id="149" parent="1" name="replicate"/>
+    <routine id="150" parent="1" name="padl"/>
+    <routine id="151" parent="1" name="square"/>
+    <routine id="152" parent="1" name="strfilter"/>
+    <routine id="153" parent="1" name="difference"/>
+    <routine id="154" parent="1" name="lower_quartile">
       <FunctionType>aggregate</FunctionType>
     </routine>
-    <routine id="148" parent="1" name="padr"/>
-    <routine id="149" parent="1" name="rtreedepth"/>
-    <routine id="150" parent="1" name="atn2"/>
-    <routine id="151" parent="1" name="match"/>
-    <routine id="152" parent="1" name="snippet">
-      <Variadic>1</Variadic>
-    </routine>
-    <routine id="153" parent="1" name="coth"/>
-    <routine id="154" parent="1" name="fts5_source_id"/>
-    <routine id="155" parent="1" name="offsets"/>
-    <routine id="156" parent="1" name="matchinfo"/>
-    <routine id="157" parent="1" name="matchinfo"/>
-    <routine id="158" parent="1" name="variance">
+    <routine id="155" parent="1" name="padr"/>
+    <routine id="156" parent="1" name="rtreedepth"/>
+    <routine id="157" parent="1" name="atn2"/>
+    <routine id="158" parent="1" name="match"/>
+    <routine id="159" parent="1" name="coth"/>
+    <routine id="160" parent="1" name="fts5_source_id"/>
+    <routine id="161" parent="1" name="offsets"/>
+    <routine id="162" parent="1" name="matchinfo"/>
+    <routine id="163" parent="1" name="variance">
       <FunctionType>aggregate</FunctionType>
     </routine>
-    <routine id="159" parent="1" name="optimize"/>
-    <routine id="160" parent="1" name="padc"/>
-    <routine id="161" parent="1" name="proper"/>
-    <routine id="162" parent="1" name="reverse"/>
-    <routine id="163" parent="1" name="rtreecheck">
-      <Variadic>1</Variadic>
-    </routine>
-    <routine id="164" parent="1" name="rtreenode"/>
-    <routine id="165" parent="1" name="highlight">
-      <Variadic>1</Variadic>
-    </routine>
-    <routine id="166" parent="1" name="bm25">
-      <Variadic>1</Variadic>
-    </routine>
-    <routine id="167" parent="1" name="charindex"/>
-    <routine id="168" parent="1" name="charindex"/>
-    <routine id="169" parent="1" name="cot"/>
-    <routine id="170" parent="1" name="fts3_tokenizer"/>
+    <routine id="164" parent="1" name="optimize"/>
+    <routine id="165" parent="1" name="padc"/>
+    <routine id="166" parent="1" name="proper"/>
+    <routine id="167" parent="1" name="reverse"/>
+    <routine id="168" parent="1" name="rtreenode"/>
+    <routine id="169" parent="1" name="charindex"/>
+    <routine id="170" parent="1" name="cot"/>
     <routine id="171" parent="1" name="fts3_tokenizer"/>
     <routine id="172" parent="1" name="fts5"/>
     <schema id="173" parent="1" name="main">
@@ -434,602 +436,602 @@
     <argument id="174" parent="16">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="175" parent="16">
-      <Position>1</Position>
-    </argument>
-    <argument id="176" parent="16">
-      <Position>2</Position>
-    </argument>
-    <argument id="177" parent="17">
+    <argument id="175" parent="17">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="178" parent="17">
-      <Position>1</Position>
-    </argument>
-    <argument id="179" parent="17">
-      <Position>2</Position>
-    </argument>
-    <argument id="180" parent="18">
+    <argument id="176" parent="18">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="181" parent="18">
-      <Position>1</Position>
-    </argument>
-    <argument id="182" parent="18">
-      <Position>2</Position>
+    <argument id="177" parent="19">
+      <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="183" parent="19">
+    <argument id="178" parent="20">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="184" parent="20">
+    <argument id="179" parent="21">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="185" parent="20">
-      <Position>1</Position>
+    <argument id="180" parent="22">
+      <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="186" parent="21">
+    <argument id="181" parent="23">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="187" parent="21">
-      <Position>1</Position>
+    <argument id="182" parent="24">
+      <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="188" parent="21">
-      <Position>2</Position>
+    <argument id="183" parent="25">
+      <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="189" parent="22">
+    <argument id="184" parent="26">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="190" parent="22">
-      <Position>1</Position>
+    <argument id="185" parent="27">
+      <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="191" parent="23">
+    <argument id="186" parent="28">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="192" parent="23">
-      <Position>1</Position>
+    <argument id="187" parent="29">
+      <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="193" parent="24">
+    <argument id="188" parent="30">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="194" parent="24">
-      <Position>1</Position>
+    <argument id="189" parent="31">
+      <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="195" parent="25">
+    <argument id="190" parent="32">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="196" parent="25">
-      <Position>1</Position>
+    <argument id="191" parent="33">
+      <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="197" parent="25">
-      <Position>2</Position>
+    <argument id="192" parent="34">
+      <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="198" parent="26">
+    <argument id="193" parent="35">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="199" parent="26">
-      <Position>1</Position>
+    <argument id="194" parent="36">
+      <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="200" parent="26">
-      <Position>2</Position>
+    <argument id="195" parent="37">
+      <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="201" parent="27">
+    <argument id="196" parent="38">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="202" parent="28">
+    <argument id="197" parent="39">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="203" parent="29">
+    <argument id="198" parent="40">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="204" parent="29">
+    <argument id="199" parent="40">
       <Position>1</Position>
     </argument>
-    <argument id="205" parent="29">
+    <argument id="200" parent="40">
       <Position>2</Position>
     </argument>
-    <argument id="206" parent="30">
+    <argument id="201" parent="40">
+      <Position>3</Position>
+    </argument>
+    <argument id="202" parent="41">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="207" parent="30">
+    <argument id="203" parent="41">
       <Position>1</Position>
     </argument>
-    <argument id="208" parent="31">
-      <ArgumentDirection>R</ArgumentDirection>
-    </argument>
-    <argument id="209" parent="32">
-      <ArgumentDirection>R</ArgumentDirection>
+    <argument id="204" parent="41">
+      <Position>2</Position>
     </argument>
-    <argument id="210" parent="33">
-      <ArgumentDirection>R</ArgumentDirection>
+    <argument id="205" parent="41">
+      <Position>3</Position>
     </argument>
-    <argument id="211" parent="34">
+    <argument id="206" parent="42">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="212" parent="34">
+    <argument id="207" parent="42">
       <Position>1</Position>
     </argument>
-    <argument id="213" parent="34">
+    <argument id="208" parent="42">
       <Position>2</Position>
     </argument>
-    <argument id="214" parent="35">
+    <argument id="209" parent="43">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="215" parent="35">
+    <argument id="210" parent="43">
       <Position>1</Position>
     </argument>
-    <argument id="216" parent="36">
-      <ArgumentDirection>R</ArgumentDirection>
+    <argument id="211" parent="43">
+      <Position>2</Position>
     </argument>
-    <argument id="217" parent="36">
-      <Position>1</Position>
+    <argument id="212" parent="43">
+      <Position>3</Position>
     </argument>
-    <argument id="218" parent="37">
+    <argument id="213" parent="44">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="219" parent="37">
+    <argument id="214" parent="44">
       <Position>1</Position>
     </argument>
-    <argument id="220" parent="38">
-      <ArgumentDirection>R</ArgumentDirection>
+    <argument id="215" parent="44">
+      <Position>2</Position>
     </argument>
-    <argument id="221" parent="39">
+    <argument id="216" parent="45">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="222" parent="39">
+    <argument id="217" parent="45">
       <Position>1</Position>
     </argument>
-    <argument id="223" parent="39">
+    <argument id="218" parent="45">
       <Position>2</Position>
     </argument>
-    <argument id="224" parent="40">
+    <argument id="219" parent="46">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="225" parent="41">
-      <ArgumentDirection>R</ArgumentDirection>
+    <argument id="220" parent="46">
+      <Position>1</Position>
+    </argument>
+    <argument id="221" parent="46">
+      <Position>2</Position>
     </argument>
-    <argument id="226" parent="42">
+    <argument id="222" parent="47">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="227" parent="42">
+    <argument id="223" parent="47">
       <Position>1</Position>
     </argument>
-    <argument id="228" parent="43">
+    <argument id="224" parent="47">
+      <Position>2</Position>
+    </argument>
+    <argument id="225" parent="48">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="229" parent="44">
+    <argument id="226" parent="48">
+      <Position>1</Position>
+    </argument>
+    <argument id="227" parent="49">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="230" parent="44">
+    <argument id="228" parent="49">
       <Position>1</Position>
     </argument>
-    <argument id="231" parent="45">
+    <argument id="229" parent="49">
+      <Position>2</Position>
+    </argument>
+    <argument id="230" parent="50">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="232" parent="45">
+    <argument id="231" parent="50">
       <Position>1</Position>
     </argument>
-    <argument id="233" parent="46">
+    <argument id="232" parent="51">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="234" parent="46">
+    <argument id="233" parent="51">
       <Position>1</Position>
     </argument>
-    <argument id="235" parent="47">
+    <argument id="234" parent="52">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="236" parent="47">
+    <argument id="235" parent="52">
       <Position>1</Position>
     </argument>
-    <argument id="237" parent="48">
+    <argument id="236" parent="53">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="238" parent="48">
+    <argument id="237" parent="53">
       <Position>1</Position>
     </argument>
-    <argument id="239" parent="48">
+    <argument id="238" parent="53">
       <Position>2</Position>
     </argument>
-    <argument id="240" parent="49">
+    <argument id="239" parent="54">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="241" parent="49">
+    <argument id="240" parent="54">
       <Position>1</Position>
     </argument>
-    <argument id="242" parent="49">
+    <argument id="241" parent="54">
       <Position>2</Position>
     </argument>
-    <argument id="243" parent="50">
+    <argument id="242" parent="55">
+      <ArgumentDirection>R</ArgumentDirection>
+    </argument>
+    <argument id="243" parent="56">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="244" parent="50">
+    <argument id="244" parent="56">
       <Position>1</Position>
     </argument>
-    <argument id="245" parent="50">
+    <argument id="245" parent="56">
       <Position>2</Position>
     </argument>
-    <argument id="246" parent="51">
+    <argument id="246" parent="57">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="247" parent="51">
+    <argument id="247" parent="57">
       <Position>1</Position>
     </argument>
-    <argument id="248" parent="52">
-      <ArgumentDirection>R</ArgumentDirection>
-    </argument>
-    <argument id="249" parent="53">
+    <argument id="248" parent="58">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="250" parent="53">
+    <argument id="249" parent="58">
       <Position>1</Position>
     </argument>
-    <argument id="251" parent="53">
+    <argument id="250" parent="58">
       <Position>2</Position>
     </argument>
-    <argument id="252" parent="54">
+    <argument id="251" parent="59">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="253" parent="55">
-      <ArgumentDirection>R</ArgumentDirection>
-    </argument>
-    <argument id="254" parent="55">
+    <argument id="252" parent="59">
       <Position>1</Position>
     </argument>
-    <argument id="255" parent="56">
+    <argument id="253" parent="60">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="256" parent="56">
+    <argument id="254" parent="60">
       <Position>1</Position>
     </argument>
-    <argument id="257" parent="57">
+    <argument id="255" parent="61">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="258" parent="57">
+    <argument id="256" parent="61">
       <Position>1</Position>
     </argument>
-    <argument id="259" parent="58">
+    <argument id="257" parent="62">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="260" parent="58">
+    <argument id="258" parent="62">
       <Position>1</Position>
     </argument>
-    <argument id="261" parent="58">
+    <argument id="259" parent="62">
       <Position>2</Position>
     </argument>
-    <argument id="262" parent="58">
-      <Position>3</Position>
-    </argument>
-    <argument id="263" parent="59">
+    <argument id="260" parent="63">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="264" parent="59">
+    <argument id="261" parent="63">
       <Position>1</Position>
     </argument>
-    <argument id="265" parent="59">
-      <Position>2</Position>
-    </argument>
-    <argument id="266" parent="59">
-      <Position>3</Position>
+    <argument id="262" parent="64">
+      <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="267" parent="60">
+    <argument id="263" parent="65">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="268" parent="60">
+    <argument id="264" parent="65">
       <Position>1</Position>
     </argument>
-    <argument id="269" parent="61">
+    <argument id="265" parent="66">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="270" parent="61">
+    <argument id="266" parent="66">
       <Position>1</Position>
     </argument>
-    <argument id="271" parent="62">
+    <argument id="267" parent="67">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="272" parent="62">
+    <argument id="268" parent="67">
       <Position>1</Position>
     </argument>
-    <argument id="273" parent="63">
+    <argument id="269" parent="68">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="274" parent="63">
+    <argument id="270" parent="68">
       <Position>1</Position>
     </argument>
-    <argument id="275" parent="63">
-      <Position>2</Position>
-    </argument>
-    <argument id="276" parent="64">
+    <argument id="271" parent="69">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="277" parent="64">
+    <argument id="272" parent="69">
       <Position>1</Position>
     </argument>
-    <argument id="278" parent="65">
+    <argument id="273" parent="69">
+      <Position>2</Position>
+    </argument>
+    <argument id="274" parent="70">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="279" parent="65">
+    <argument id="275" parent="70">
       <Position>1</Position>
     </argument>
-    <argument id="280" parent="66">
+    <argument id="276" parent="70">
+      <Position>2</Position>
+    </argument>
+    <argument id="277" parent="71">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="281" parent="66">
+    <argument id="278" parent="71">
       <Position>1</Position>
     </argument>
-    <argument id="282" parent="67">
+    <argument id="279" parent="71">
+      <Position>2</Position>
+    </argument>
+    <argument id="280" parent="72">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="283" parent="67">
+    <argument id="281" parent="72">
       <Position>1</Position>
     </argument>
-    <argument id="284" parent="67">
-      <Position>2</Position>
+    <argument id="282" parent="73">
+      <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="285" parent="68">
+    <argument id="283" parent="74">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="286" parent="68">
+    <argument id="284" parent="74">
       <Position>1</Position>
     </argument>
-    <argument id="287" parent="68">
+    <argument id="285" parent="74">
       <Position>2</Position>
     </argument>
-    <argument id="288" parent="69">
+    <argument id="286" parent="75">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="289" parent="70">
+    <argument id="287" parent="75">
+      <Position>1</Position>
+    </argument>
+    <argument id="288" parent="76">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="290" parent="70">
+    <argument id="289" parent="76">
       <Position>1</Position>
     </argument>
-    <argument id="291" parent="71">
+    <argument id="290" parent="77">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="292" parent="71">
+    <argument id="291" parent="77">
       <Position>1</Position>
     </argument>
-    <argument id="293" parent="72">
+    <argument id="292" parent="78">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="294" parent="72">
+    <argument id="293" parent="78">
       <Position>1</Position>
     </argument>
-    <argument id="295" parent="73">
+    <argument id="294" parent="78">
+      <Position>2</Position>
+    </argument>
+    <argument id="295" parent="78">
+      <Position>3</Position>
+    </argument>
+    <argument id="296" parent="79">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="296" parent="73">
+    <argument id="297" parent="79">
       <Position>1</Position>
     </argument>
-    <argument id="297" parent="73">
+    <argument id="298" parent="79">
       <Position>2</Position>
     </argument>
-    <argument id="298" parent="73">
+    <argument id="299" parent="79">
       <Position>3</Position>
     </argument>
-    <argument id="299" parent="74">
+    <argument id="300" parent="80">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="300" parent="74">
+    <argument id="301" parent="80">
       <Position>1</Position>
     </argument>
-    <argument id="301" parent="75">
+    <argument id="302" parent="81">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="302" parent="75">
+    <argument id="303" parent="81">
       <Position>1</Position>
     </argument>
-    <argument id="303" parent="76">
+    <argument id="304" parent="82">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="304" parent="77">
-      <ArgumentDirection>R</ArgumentDirection>
+    <argument id="305" parent="82">
+      <Position>1</Position>
     </argument>
-    <argument id="305" parent="78">
+    <argument id="306" parent="83">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="306" parent="78">
+    <argument id="307" parent="83">
       <Position>1</Position>
     </argument>
-    <argument id="307" parent="79">
+    <argument id="308" parent="83">
+      <Position>2</Position>
+    </argument>
+    <argument id="309" parent="84">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="308" parent="79">
+    <argument id="310" parent="84">
       <Position>1</Position>
     </argument>
-    <argument id="309" parent="80">
+    <argument id="311" parent="85">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="310" parent="80">
+    <argument id="312" parent="85">
       <Position>1</Position>
     </argument>
-    <argument id="311" parent="81">
+    <argument id="313" parent="86">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="312" parent="81">
+    <argument id="314" parent="86">
       <Position>1</Position>
     </argument>
-    <argument id="313" parent="82">
+    <argument id="315" parent="87">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="314" parent="82">
+    <argument id="316" parent="87">
       <Position>1</Position>
     </argument>
-    <argument id="315" parent="82">
+    <argument id="317" parent="87">
       <Position>2</Position>
     </argument>
-    <argument id="316" parent="83">
+    <argument id="318" parent="88">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="317" parent="84">
-      <ArgumentDirection>R</ArgumentDirection>
-    </argument>
-    <argument id="318" parent="84">
+    <argument id="319" parent="88">
       <Position>1</Position>
     </argument>
-    <argument id="319" parent="84">
+    <argument id="320" parent="88">
       <Position>2</Position>
     </argument>
-    <argument id="320" parent="85">
+    <argument id="321" parent="89">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="321" parent="85">
+    <argument id="322" parent="89">
       <Position>1</Position>
     </argument>
-    <argument id="322" parent="86">
+    <argument id="323" parent="90">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="323" parent="86">
+    <argument id="324" parent="90">
       <Position>1</Position>
     </argument>
-    <argument id="324" parent="87">
+    <argument id="325" parent="91">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="325" parent="87">
+    <argument id="326" parent="91">
       <Position>1</Position>
     </argument>
-    <argument id="326" parent="88">
+    <argument id="327" parent="92">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="327" parent="89">
-      <ArgumentDirection>R</ArgumentDirection>
+    <argument id="328" parent="92">
+      <Position>1</Position>
     </argument>
-    <argument id="328" parent="90">
-      <ArgumentDirection>R</ArgumentDirection>
+    <argument id="329" parent="92">
+      <Position>2</Position>
     </argument>
-    <argument id="329" parent="90">
-      <Position>1</Position>
+    <argument id="330" parent="92">
+      <Position>3</Position>
     </argument>
-    <argument id="330" parent="91">
+    <argument id="331" parent="93">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="331" parent="91">
+    <argument id="332" parent="93">
       <Position>1</Position>
     </argument>
-    <argument id="332" parent="92">
+    <argument id="333" parent="94">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="333" parent="93">
-      <ArgumentDirection>R</ArgumentDirection>
-    </argument>
-    <argument id="334" parent="93">
+    <argument id="334" parent="94">
       <Position>1</Position>
     </argument>
-    <argument id="335" parent="94">
+    <argument id="335" parent="95">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="336" parent="95">
+    <argument id="336" parent="96">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="337" parent="96">
+    <argument id="337" parent="97">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
     <argument id="338" parent="97">
-      <ArgumentDirection>R</ArgumentDirection>
-    </argument>
-    <argument id="339" parent="97">
       <Position>1</Position>
     </argument>
-    <argument id="340" parent="98">
+    <argument id="339" parent="98">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="341" parent="98">
+    <argument id="340" parent="98">
       <Position>1</Position>
     </argument>
-    <argument id="342" parent="99">
+    <argument id="341" parent="99">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
+    <argument id="342" parent="99">
+      <Position>1</Position>
+    </argument>
     <argument id="343" parent="100">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
     <argument id="344" parent="100">
       <Position>1</Position>
     </argument>
-    <argument id="345" parent="100">
-      <Position>2</Position>
+    <argument id="345" parent="101">
+      <ArgumentDirection>R</ArgumentDirection>
     </argument>
     <argument id="346" parent="101">
-      <ArgumentDirection>R</ArgumentDirection>
+      <Position>1</Position>
     </argument>
     <argument id="347" parent="101">
-      <Position>1</Position>
+      <Position>2</Position>
     </argument>
     <argument id="348" parent="102">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="349" parent="102">
-      <Position>1</Position>
-    </argument>
-    <argument id="350" parent="103">
+    <argument id="349" parent="103">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="351" parent="103">
+    <argument id="350" parent="103">
       <Position>1</Position>
     </argument>
-    <argument id="352" parent="103">
+    <argument id="351" parent="103">
       <Position>2</Position>
     </argument>
-    <argument id="353" parent="103">
-      <Position>3</Position>
+    <argument id="352" parent="104">
+      <ArgumentDirection>R</ArgumentDirection>
+    </argument>
+    <argument id="353" parent="104">
+      <Position>1</Position>
     </argument>
-    <argument id="354" parent="104">
+    <argument id="354" parent="105">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
     <argument id="355" parent="105">
-      <ArgumentDirection>R</ArgumentDirection>
+      <Position>1</Position>
     </argument>
     <argument id="356" parent="106">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="357" parent="107">
-      <ArgumentDirection>R</ArgumentDirection>
+    <argument id="357" parent="106">
+      <Position>1</Position>
     </argument>
-    <argument id="358" parent="108">
+    <argument id="358" parent="107">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="359" parent="108">
+    <argument id="359" parent="107">
       <Position>1</Position>
     </argument>
-    <argument id="360" parent="109">
+    <argument id="360" parent="108">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="361" parent="109">
+    <argument id="361" parent="108">
       <Position>1</Position>
     </argument>
     <argument id="362" parent="109">
-      <Position>2</Position>
-    </argument>
-    <argument id="363" parent="110">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="364" parent="110">
+    <argument id="363" parent="109">
       <Position>1</Position>
     </argument>
+    <argument id="364" parent="110">
+      <ArgumentDirection>R</ArgumentDirection>
+    </argument>
     <argument id="365" parent="111">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
     <argument id="366" parent="112">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="367" parent="112">
-      <Position>1</Position>
+    <argument id="367" parent="113">
+      <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="368" parent="112">
-      <Position>2</Position>
+    <argument id="368" parent="113">
+      <Position>1</Position>
     </argument>
-    <argument id="369" parent="113">
+    <argument id="369" parent="114">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="370" parent="113">
+    <argument id="370" parent="114">
       <Position>1</Position>
     </argument>
-    <argument id="371" parent="113">
-      <Position>2</Position>
-    </argument>
-    <argument id="372" parent="114">
+    <argument id="371" parent="115">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
+    <argument id="372" parent="115">
+      <Position>1</Position>
+    </argument>
     <argument id="373" parent="115">
-      <ArgumentDirection>R</ArgumentDirection>
+      <Position>2</Position>
     </argument>
     <argument id="374" parent="116">
       <ArgumentDirection>R</ArgumentDirection>
@@ -1037,275 +1039,275 @@
     <argument id="375" parent="116">
       <Position>1</Position>
     </argument>
-    <argument id="376" parent="116">
-      <Position>2</Position>
+    <argument id="376" parent="117">
+      <ArgumentDirection>R</ArgumentDirection>
     </argument>
     <argument id="377" parent="117">
+      <Position>1</Position>
+    </argument>
+    <argument id="378" parent="118">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="378" parent="117">
+    <argument id="379" parent="118">
       <Position>1</Position>
     </argument>
-    <argument id="379" parent="117">
+    <argument id="380" parent="118">
       <Position>2</Position>
     </argument>
-    <argument id="380" parent="117">
+    <argument id="381" parent="118">
       <Position>3</Position>
     </argument>
-    <argument id="381" parent="118">
+    <argument id="382" parent="119">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="382" parent="118">
-      <Position>1</Position>
-    </argument>
-    <argument id="383" parent="118">
-      <Position>2</Position>
+    <argument id="383" parent="120">
+      <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="384" parent="119">
+    <argument id="384" parent="121">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="385" parent="119">
+    <argument id="385" parent="121">
       <Position>1</Position>
     </argument>
-    <argument id="386" parent="120">
+    <argument id="386" parent="122">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="387" parent="120">
+    <argument id="387" parent="122">
       <Position>1</Position>
     </argument>
-    <argument id="388" parent="120">
+    <argument id="388" parent="122">
       <Position>2</Position>
     </argument>
-    <argument id="389" parent="120">
-      <Position>3</Position>
-    </argument>
-    <argument id="390" parent="121">
-      <ArgumentDirection>R</ArgumentDirection>
-    </argument>
-    <argument id="391" parent="122">
+    <argument id="389" parent="123">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="392" parent="122">
+    <argument id="390" parent="123">
       <Position>1</Position>
     </argument>
-    <argument id="393" parent="123">
+    <argument id="391" parent="124">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="394" parent="124">
+    <argument id="392" parent="125">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="395" parent="124">
+    <argument id="393" parent="125">
       <Position>1</Position>
     </argument>
-    <argument id="396" parent="125">
+    <argument id="394" parent="125">
+      <Position>2</Position>
+    </argument>
+    <argument id="395" parent="126">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="397" parent="125">
+    <argument id="396" parent="126">
       <Position>1</Position>
     </argument>
-    <argument id="398" parent="125">
+    <argument id="397" parent="126">
       <Position>2</Position>
     </argument>
-    <argument id="399" parent="126">
+    <argument id="398" parent="127">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="400" parent="126">
+    <argument id="399" parent="128">
+      <ArgumentDirection>R</ArgumentDirection>
+    </argument>
+    <argument id="400" parent="129">
+      <ArgumentDirection>R</ArgumentDirection>
+    </argument>
+    <argument id="401" parent="129">
       <Position>1</Position>
     </argument>
-    <argument id="401" parent="126">
+    <argument id="402" parent="129">
       <Position>2</Position>
     </argument>
-    <argument id="402" parent="126">
-      <Position>3</Position>
-    </argument>
-    <argument id="403" parent="127">
+    <argument id="403" parent="130">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="404" parent="127">
+    <argument id="404" parent="130">
       <Position>1</Position>
     </argument>
-    <argument id="405" parent="128">
+    <argument id="405" parent="130">
+      <Position>2</Position>
+    </argument>
+    <argument id="406" parent="131">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="406" parent="128">
+    <argument id="407" parent="131">
       <Position>1</Position>
     </argument>
-    <argument id="407" parent="129">
+    <argument id="408" parent="132">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="408" parent="129">
+    <argument id="409" parent="132">
       <Position>1</Position>
     </argument>
-    <argument id="409" parent="129">
+    <argument id="410" parent="132">
       <Position>2</Position>
     </argument>
-    <argument id="410" parent="130">
+    <argument id="411" parent="132">
+      <Position>3</Position>
+    </argument>
+    <argument id="412" parent="133">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="411" parent="130">
+    <argument id="413" parent="133">
       <Position>1</Position>
     </argument>
-    <argument id="412" parent="131">
+    <argument id="414" parent="134">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="413" parent="132">
-      <ArgumentDirection>R</ArgumentDirection>
-    </argument>
-    <argument id="414" parent="132">
+    <argument id="415" parent="134">
       <Position>1</Position>
     </argument>
-    <argument id="415" parent="133">
+    <argument id="416" parent="135">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="416" parent="133">
+    <argument id="417" parent="135">
       <Position>1</Position>
     </argument>
-    <argument id="417" parent="134">
-      <ArgumentDirection>R</ArgumentDirection>
-    </argument>
     <argument id="418" parent="135">
-      <ArgumentDirection>R</ArgumentDirection>
-    </argument>
-    <argument id="419" parent="135">
-      <Position>1</Position>
+      <Position>2</Position>
     </argument>
-    <argument id="420" parent="136">
+    <argument id="419" parent="136">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="421" parent="136">
+    <argument id="420" parent="136">
       <Position>1</Position>
     </argument>
-    <argument id="422" parent="137">
+    <argument id="421" parent="137">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="423" parent="137">
+    <argument id="422" parent="137">
       <Position>1</Position>
     </argument>
-    <argument id="424" parent="138">
+    <argument id="423" parent="138">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="425" parent="138">
+    <argument id="424" parent="138">
       <Position>1</Position>
     </argument>
-    <argument id="426" parent="138">
+    <argument id="425" parent="138">
       <Position>2</Position>
     </argument>
-    <argument id="427" parent="139">
+    <argument id="426" parent="139">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="428" parent="139">
+    <argument id="427" parent="139">
       <Position>1</Position>
     </argument>
-    <argument id="429" parent="139">
-      <Position>2</Position>
+    <argument id="428" parent="140">
+      <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="430" parent="140">
+    <argument id="429" parent="141">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="431" parent="140">
+    <argument id="430" parent="141">
       <Position>1</Position>
     </argument>
-    <argument id="432" parent="141">
+    <argument id="431" parent="142">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="433" parent="141">
+    <argument id="432" parent="142">
       <Position>1</Position>
     </argument>
-    <argument id="434" parent="141">
-      <Position>2</Position>
-    </argument>
-    <argument id="435" parent="142">
+    <argument id="433" parent="143">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="436" parent="142">
+    <argument id="434" parent="143">
       <Position>1</Position>
     </argument>
-    <argument id="437" parent="142">
-      <Position>2</Position>
-    </argument>
-    <argument id="438" parent="143">
+    <argument id="435" parent="144">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="439" parent="143">
+    <argument id="436" parent="144">
       <Position>1</Position>
     </argument>
-    <argument id="440" parent="144">
+    <argument id="437" parent="145">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="441" parent="145">
+    <argument id="438" parent="145">
+      <Position>1</Position>
+    </argument>
+    <argument id="439" parent="146">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="442" parent="145">
+    <argument id="440" parent="146">
       <Position>1</Position>
     </argument>
-    <argument id="443" parent="145">
+    <argument id="441" parent="146">
       <Position>2</Position>
     </argument>
-    <argument id="444" parent="146">
+    <argument id="442" parent="147">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="445" parent="146">
+    <argument id="443" parent="147">
       <Position>1</Position>
     </argument>
-    <argument id="446" parent="146">
+    <argument id="444" parent="147">
       <Position>2</Position>
     </argument>
-    <argument id="447" parent="147">
+    <argument id="445" parent="148">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="448" parent="147">
+    <argument id="446" parent="148">
       <Position>1</Position>
     </argument>
-    <argument id="449" parent="148">
+    <argument id="447" parent="149">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="450" parent="148">
+    <argument id="448" parent="149">
       <Position>1</Position>
     </argument>
-    <argument id="451" parent="148">
+    <argument id="449" parent="149">
       <Position>2</Position>
     </argument>
-    <argument id="452" parent="149">
+    <argument id="450" parent="150">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="453" parent="149">
+    <argument id="451" parent="150">
       <Position>1</Position>
     </argument>
-    <argument id="454" parent="150">
+    <argument id="452" parent="150">
+      <Position>2</Position>
+    </argument>
+    <argument id="453" parent="151">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="455" parent="150">
+    <argument id="454" parent="151">
       <Position>1</Position>
     </argument>
-    <argument id="456" parent="150">
-      <Position>2</Position>
-    </argument>
-    <argument id="457" parent="151">
+    <argument id="455" parent="152">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="458" parent="151">
+    <argument id="456" parent="152">
       <Position>1</Position>
     </argument>
-    <argument id="459" parent="151">
+    <argument id="457" parent="152">
       <Position>2</Position>
     </argument>
-    <argument id="460" parent="152">
+    <argument id="458" parent="153">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="461" parent="153">
+    <argument id="459" parent="153">
+      <Position>1</Position>
+    </argument>
+    <argument id="460" parent="153">
+      <Position>2</Position>
+    </argument>
+    <argument id="461" parent="154">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="462" parent="153">
+    <argument id="462" parent="154">
       <Position>1</Position>
     </argument>
-    <argument id="463" parent="154">
+    <argument id="463" parent="155">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
     <argument id="464" parent="155">
-      <ArgumentDirection>R</ArgumentDirection>
+      <Position>1</Position>
     </argument>
     <argument id="465" parent="155">
-      <Position>1</Position>
+      <Position>2</Position>
     </argument>
     <argument id="466" parent="156">
       <ArgumentDirection>R</ArgumentDirection>
@@ -1313,14 +1315,14 @@
     <argument id="467" parent="156">
       <Position>1</Position>
     </argument>
-    <argument id="468" parent="156">
-      <Position>2</Position>
+    <argument id="468" parent="157">
+      <ArgumentDirection>R</ArgumentDirection>
     </argument>
     <argument id="469" parent="157">
-      <ArgumentDirection>R</ArgumentDirection>
+      <Position>1</Position>
     </argument>
     <argument id="470" parent="157">
-      <Position>1</Position>
+      <Position>2</Position>
     </argument>
     <argument id="471" parent="158">
       <ArgumentDirection>R</ArgumentDirection>
@@ -1328,62 +1330,62 @@
     <argument id="472" parent="158">
       <Position>1</Position>
     </argument>
-    <argument id="473" parent="159">
-      <ArgumentDirection>R</ArgumentDirection>
+    <argument id="473" parent="158">
+      <Position>2</Position>
     </argument>
     <argument id="474" parent="159">
-      <Position>1</Position>
-    </argument>
-    <argument id="475" parent="160">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="476" parent="160">
+    <argument id="475" parent="159">
       <Position>1</Position>
     </argument>
-    <argument id="477" parent="160">
-      <Position>2</Position>
+    <argument id="476" parent="160">
+      <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="478" parent="161">
+    <argument id="477" parent="161">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="479" parent="161">
+    <argument id="478" parent="161">
       <Position>1</Position>
     </argument>
-    <argument id="480" parent="162">
+    <argument id="479" parent="162">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="481" parent="162">
+    <argument id="480" parent="162">
       <Position>1</Position>
     </argument>
-    <argument id="482" parent="163">
+    <argument id="481" parent="163">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
+    <argument id="482" parent="163">
+      <Position>1</Position>
+    </argument>
     <argument id="483" parent="164">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
     <argument id="484" parent="164">
       <Position>1</Position>
     </argument>
-    <argument id="485" parent="164">
-      <Position>2</Position>
+    <argument id="485" parent="165">
+      <ArgumentDirection>R</ArgumentDirection>
     </argument>
     <argument id="486" parent="165">
-      <ArgumentDirection>R</ArgumentDirection>
+      <Position>1</Position>
     </argument>
-    <argument id="487" parent="166">
-      <ArgumentDirection>R</ArgumentDirection>
+    <argument id="487" parent="165">
+      <Position>2</Position>
     </argument>
-    <argument id="488" parent="167">
+    <argument id="488" parent="166">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="489" parent="167">
+    <argument id="489" parent="166">
       <Position>1</Position>
     </argument>
     <argument id="490" parent="167">
-      <Position>2</Position>
+      <ArgumentDirection>R</ArgumentDirection>
     </argument>
     <argument id="491" parent="167">
-      <Position>3</Position>
+      <Position>1</Position>
     </argument>
     <argument id="492" parent="168">
       <ArgumentDirection>R</ArgumentDirection>
@@ -1400,14 +1402,14 @@
     <argument id="496" parent="169">
       <Position>1</Position>
     </argument>
-    <argument id="497" parent="170">
-      <ArgumentDirection>R</ArgumentDirection>
+    <argument id="497" parent="169">
+      <Position>2</Position>
     </argument>
     <argument id="498" parent="170">
-      <Position>1</Position>
+      <ArgumentDirection>R</ArgumentDirection>
     </argument>
     <argument id="499" parent="170">
-      <Position>2</Position>
+      <Position>1</Position>
     </argument>
     <argument id="500" parent="171">
       <ArgumentDirection>R</ArgumentDirection>
@@ -1421,5 +1423,70 @@
     <argument id="503" parent="172">
       <Position>1</Position>
     </argument>
+    <table id="504" parent="173" name="Dictionary"/>
+    <table id="505" parent="173" name="settings"/>
+    <table id="506" parent="173" name="sqlite_master">
+      <System>1</System>
+    </table>
+    <column id="507" parent="504" name="guild_id">
+      <DasType>integer|0s</DasType>
+      <Position>1</Position>
+    </column>
+    <column id="508" parent="504" name="word">
+      <DasType>text|0s</DasType>
+      <Position>2</Position>
+    </column>
+    <column id="509" parent="504" name="reading">
+      <Position>3</Position>
+    </column>
+    <column id="510" parent="505" name="id">
+      <DasType>integer|0s</DasType>
+      <NotNull>1</NotNull>
+      <Position>1</Position>
+    </column>
+    <column id="511" parent="505" name="voice">
+      <DasType>TEXT|0s</DasType>
+      <Position>2</Position>
+    </column>
+    <column id="512" parent="505" name="speed">
+      <DasType>real|0s</DasType>
+      <Position>3</Position>
+    </column>
+    <column id="513" parent="505" name="intonation">
+      <DasType>real|0s</DasType>
+      <Position>4</Position>
+    </column>
+    <column id="514" parent="505" name="voiceQualityA">
+      <DasType>real|0s</DasType>
+      <Position>5</Position>
+    </column>
+    <column id="515" parent="505" name="voiceQualityFm">
+      <DasType>real|0s</DasType>
+      <Position>6</Position>
+    </column>
+    <key id="516" parent="505" name="settings_pk">
+      <ColNames>id</ColNames>
+      <Primary>1</Primary>
+    </key>
+    <column id="517" parent="506" name="type">
+      <DasType>TEXT|0s</DasType>
+      <Position>1</Position>
+    </column>
+    <column id="518" parent="506" name="name">
+      <DasType>TEXT|0s</DasType>
+      <Position>2</Position>
+    </column>
+    <column id="519" parent="506" name="tbl_name">
+      <DasType>TEXT|0s</DasType>
+      <Position>3</Position>
+    </column>
+    <column id="520" parent="506" name="rootpage">
+      <DasType>INT|0s</DasType>
+      <Position>4</Position>
+    </column>
+    <column id="521" parent="506" name="sql">
+      <DasType>TEXT|0s</DasType>
+      <Position>5</Position>
+    </column>
   </database-model>
 </dataSource>
\ No newline at end of file
diff --git a/src/main/java/dev/cosgy/textToSpeak/commands/admin/SetReadNameCmd.kt b/src/main/java/dev/cosgy/textToSpeak/commands/admin/SetReadNameCmd.kt
index 77a0423..4206a3c 100644
--- a/src/main/java/dev/cosgy/textToSpeak/commands/admin/SetReadNameCmd.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/commands/admin/SetReadNameCmd.kt
@@ -36,7 +36,7 @@ class SetReadNameCmd(private val bot: Bot) : AdminCommand() {
 
     override fun execute(event: SlashCommandEvent) {
         if (!checkAdminPermission(event.client, event)) {
-            event.reply(event.client.warning + "権限がないため実行できません。").queue()
+            event.reply("${event.client.warning}権限がないため実行できません。").queue()
             return
         }
 
@@ -56,12 +56,8 @@ class SetReadNameCmd(private val bot: Bot) : AdminCommand() {
 
     override fun execute(event: CommandEvent) {
         val settings = bot.settingsManager.getSettings(event.guild)
-        if (settings.isReadName()) {
-            settings.setReadName(false)
-            event.reply("ユーザー名の読み上げを無効にしました。")
-        } else {
-            settings.setReadName(true)
-            event.reply("ユーザー名の読み上げを有効にしました。")
-        }
+
+        settings.setReadName(!settings.isReadName())
+        event.reply("ユーザー名の読み上げを${if (settings.isReadName()) "有効" else "無効"}にしました。")
     }
 }
\ No newline at end of file
diff --git a/src/main/java/dev/cosgy/textToSpeak/commands/admin/SettcCmd.kt b/src/main/java/dev/cosgy/textToSpeak/commands/admin/SettcCmd.kt
index 2e3cf23..00e6d0b 100644
--- a/src/main/java/dev/cosgy/textToSpeak/commands/admin/SettcCmd.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/commands/admin/SettcCmd.kt
@@ -43,21 +43,21 @@ class SettcCmd(bot: Bot?) : AdminCommand() {
     override fun execute(event: SlashCommandEvent) {}
     override fun execute(event: CommandEvent) {
         if (event.args.isEmpty()) {
-            event.reply(event.client.error + "チャンネルまたはNONEを含めてください。")
+            event.reply("${event.client.error}チャンネルまたはNONEを含めてください。")
             return
         }
         val s = event.client.getSettingsFor<Settings>(event.guild)
         if (event.args.lowercase(Locale.getDefault()).matches("(none|なし)".toRegex())) {
             s.setTextChannel(null)
-            event.reply(event.client.success + "読み上げをするチャンネルの設定を無効にしました。")
+            event.reply("${event.client.success}読み上げをするチャンネルの設定を無効にしました。")
         } else {
             val list = FinderUtil.findTextChannels(event.args, event.guild)
-            if (list.isEmpty()) event.reply(event.client.warning + "一致するチャンネルが見つかりませんでした \"" + event.args + "\"") else if (list.size > 1) event.reply(
+            if (list.isEmpty()) event.reply("${event.client.warning}一致するチャンネルが見つかりませんでした ${event.args}") else if (list.size > 1) event.reply(
                 event.client.warning + FormatUtil.listOfTChannels(list, event.args)
             ) else {
                 s.setTextChannel(list[0])
                 log.info("読み上げを行うチャンネルを設定しました。")
-                event.reply(event.client.success + "読み上げるチャンネルを<#" + list[0].id + ">に設定しました。")
+                event.reply("${event.client.success}読み上げるチャンネルを<#${list[0].id}>に設定しました。")
             }
         }
     }
@@ -74,13 +74,13 @@ class SettcCmd(bot: Bot?) : AdminCommand() {
         override fun execute(event: SlashCommandEvent) {
             val s = event.client.getSettingsFor<Settings>(event.guild)
             if (event.getOption("channel")!!.channelType != ChannelType.TEXT) {
-                event.reply(event.client.error + "テキストチャンネルを設定して下さい。").queue()
+                event.reply("${event.client.error}テキストチャンネルを設定して下さい。").queue()
                 return
             }
             val channelId = event.getOption("channel")!!.asLong
             val tc = event.guild!!.getTextChannelById(channelId)
             s.setTextChannel(tc)
-            event.reply(event.client.success + "読み上げるチャンネルを<#" + tc!!.id + ">に設定しました。").queue()
+            event.reply( "${event.client.success}読み上げるチャンネルを<#${tc!!.id}>に設定しました。").queue()
         }
     }
 
@@ -92,18 +92,18 @@ class SettcCmd(bot: Bot?) : AdminCommand() {
 
         override fun execute(event: SlashCommandEvent) {
             if (!checkAdminPermission(event.client, event)) {
-                event.reply(event.client.warning + "権限がないため実行できません。").queue()
+                event.reply(  "${event.client.warning}権限がないため実行できません。").queue()
                 return
             }
             val s = event.client.getSettingsFor<Settings>(event.guild)
             s.setTextChannel(null)
-            event.reply(event.client.success + "読み上げるチャンネル設定をリセットしました。").queue()
+            event.reply("${event.client.success}読み上げるチャンネル設定をリセットしました。").queue()
         }
 
         override fun execute(event: CommandEvent) {
             val s = event.client.getSettingsFor<Settings>(event.guild)
             s.setTextChannel(null)
-            event.reply(event.client.success + "読み上げるチャンネル設定をリセットしました。")
+            event.reply("${event.client.success}読み上げるチャンネル設定をリセットしました。")
         }
     }
 }
\ No newline at end of file
diff --git a/src/main/java/dev/cosgy/textToSpeak/commands/dictionary/AddWordCmd.kt b/src/main/java/dev/cosgy/textToSpeak/commands/dictionary/AddWordCmd.kt
index 9028169..3ae8777 100644
--- a/src/main/java/dev/cosgy/textToSpeak/commands/dictionary/AddWordCmd.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/commands/dictionary/AddWordCmd.kt
@@ -78,8 +78,8 @@ class AddWordCmd(private val bot: Bot) : SlashCommand() {
         val builder = EmbedBuilder()
             .setColor(SUCCESS_COLOR)
             .setTitle("単語を追加しました。")
-            .addField("単語", "```" + event.getOption("word")!!.asString + "```", false)
-            .addField("読み", "```" + event.getOption("reading")!!.asString + "```", false)
+            .addField("単語", "```${event.getOption("word")!!.asString}```", false)
+            .addField("読み", "```${event.getOption("reading")!!.asString}```", false)
         event.hook.sendMessageEmbeds(builder.build()).queue()
     }
 
diff --git a/src/main/java/dev/cosgy/textToSpeak/commands/dictionary/DlWordCmd.kt b/src/main/java/dev/cosgy/textToSpeak/commands/dictionary/DlWordCmd.kt
index 833d525..04dd2aa 100644
--- a/src/main/java/dev/cosgy/textToSpeak/commands/dictionary/DlWordCmd.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/commands/dictionary/DlWordCmd.kt
@@ -38,12 +38,12 @@ class DlWordCmd(private val bot: Bot) : SlashCommand() {
         val words = bot.dictionary?.getWords(event.guild!!.idLong)
         val args = event.getOption("word")!!.asString
         if (!words!!.containsKey(args)) {
-            event.reply(args + "は、辞書に登録されていません。").queue()
+            event.reply("${args}は、辞書に登録されていません。").queue()
             return
         }
         val result = bot.dictionary?.deleteDictionary(event.guild!!.idLong, args)
         if (result == true) {
-            event.reply(String.format("単語(%s)を削除しました。", args)).queue()
+            event.reply("単語(${args})を削除しました。").queue()
         } else {
             event.reply("削除中に問題が発生しました。").setEphemeral(true).queue()
         }
@@ -61,12 +61,12 @@ class DlWordCmd(private val bot: Bot) : SlashCommand() {
         val words = bot.dictionary?.getWords(event.guild.idLong)
         val args = event.args
         if (!words!!.containsKey(args)) {
-            event.reply(args + "は、辞書に登録されていません。")
+            event.reply("${args}は、辞書に登録されていません。")
             return
         }
         val result = bot.dictionary?.deleteDictionary(event.guild.idLong, args)
         if (result == true) {
-            event.reply(String.format("単語(%s)を削除しました。", args))
+            event.reply("単語(${args})を削除しました。")
         } else {
             event.reply("削除中に問題が発生しました。")
         }
diff --git a/src/main/java/dev/cosgy/textToSpeak/commands/general/JoinCmd.kt b/src/main/java/dev/cosgy/textToSpeak/commands/general/JoinCmd.kt
index c95366b..92cebce 100644
--- a/src/main/java/dev/cosgy/textToSpeak/commands/general/JoinCmd.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/commands/general/JoinCmd.kt
@@ -60,7 +60,7 @@ class JoinCmd(private var bot: Bot) : SlashCommand() {
             builder.addField(
                 "設定",
                 "ユーザー名読み上げ:${if (settings.isReadName()) "有効" else "無効"}\n" +
-                        "参加、退出読み上げ:${if (settings.isJoinAndLeaveRead()) "有効" else "無効"}", true
+                      "参加、退出読み上げ:${if (settings.isJoinAndLeaveRead()) "有効" else "無効"}", true
             )
             event.hook.sendMessageEmbeds(builder.build()).queue()
             ReadChannel.setChannel(event.guild!!.idLong, event.textChannel.idLong)
diff --git a/src/main/java/dev/cosgy/textToSpeak/commands/general/SetIntonationCmd.kt b/src/main/java/dev/cosgy/textToSpeak/commands/general/SetIntonationCmd.kt
index 602a5cc..bea3200 100644
--- a/src/main/java/dev/cosgy/textToSpeak/commands/general/SetIntonationCmd.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/commands/general/SetIntonationCmd.kt
@@ -43,7 +43,7 @@ class SetIntonationCmd(private val bot: Bot) : SlashCommand() {
 
         val settings = bot.userSettingsManager.getSettings(event.user.idLong)
         settings.intonationSetting = bd.toFloat()
-        event.reply("F0系列内変動の重みを $bd に設定しました。").queue()
+        event.reply("F0系列内変動の重みを${bd}に設定しました。").queue()
     }
 
     override fun execute(event: CommandEvent) {
@@ -65,6 +65,6 @@ class SetIntonationCmd(private val bot: Bot) : SlashCommand() {
 
         val settings = bot.userSettingsManager.getSettings(event.author.idLong)
         settings.intonationSetting = bd.toFloat()
-        event.reply("F0系列内変動の重みを $bd に設定しました。")
+        event.reply("F0系列内変動の重みを${bd}に設定しました。")
     }
 }
diff --git a/src/main/java/dev/cosgy/textToSpeak/commands/general/SetSpeedCmd.kt b/src/main/java/dev/cosgy/textToSpeak/commands/general/SetSpeedCmd.kt
index 47599bc..89fa572 100644
--- a/src/main/java/dev/cosgy/textToSpeak/commands/general/SetSpeedCmd.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/commands/general/SetSpeedCmd.kt
@@ -49,7 +49,7 @@ class SetSpeedCmd(private val bot: Bot) : SlashCommand() {
         }
         val settings = bot.userSettingsManager.getSettings(event.user.idLong)
         settings.speedSetting = bd.toFloat()
-        event.reply("速度を $bd に設定しました。").queue()
+        event.reply("速度を${bd}に設定しました。").queue()
     }
 
     override fun execute(event: CommandEvent) {
@@ -74,7 +74,7 @@ class SetSpeedCmd(private val bot: Bot) : SlashCommand() {
         }
         val settings = bot.userSettingsManager.getSettings(event.author.idLong)
         settings.speedSetting = bd.toFloat()
-        event.reply("速度を $bd に設定しました。")
+        event.reply("速度を${bd}に設定しました。")
     }
 
     fun help(event: CommandEvent?) {
diff --git a/src/main/java/dev/cosgy/textToSpeak/commands/general/SetVoiceQualityA.kt b/src/main/java/dev/cosgy/textToSpeak/commands/general/SetVoiceQualityA.kt
index 8f87da2..c76f963 100644
--- a/src/main/java/dev/cosgy/textToSpeak/commands/general/SetVoiceQualityA.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/commands/general/SetVoiceQualityA.kt
@@ -59,7 +59,7 @@ class SetVoiceQualityA(private var bot: Bot) : SlashCommand() {
         }
         val settings = bot.userSettingsManager.getSettings(event.user.idLong)
         settings.voiceQualityASetting = bd!!.toFloat()
-        event.reply("オールパス値を $bd に設定しました。").queue()
+        event.reply("オールパス値を${bd}に設定しました。").queue()
     }
 
     override fun execute(event: CommandEvent) {
@@ -85,6 +85,6 @@ class SetVoiceQualityA(private var bot: Bot) : SlashCommand() {
         }
         val settings = bot.userSettingsManager.getSettings(event.author.idLong)
         settings.voiceQualityASetting = bd!!.toFloat()
-        event.reply("オールパス値を $bd に設定しました。")
+        event.reply("オールパス値を${bd}に設定しました。")
     }
 }
\ No newline at end of file
diff --git a/src/main/java/dev/cosgy/textToSpeak/commands/general/SetVoiceQualityFm.kt b/src/main/java/dev/cosgy/textToSpeak/commands/general/SetVoiceQualityFm.kt
index 76748a0..397a28a 100644
--- a/src/main/java/dev/cosgy/textToSpeak/commands/general/SetVoiceQualityFm.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/commands/general/SetVoiceQualityFm.kt
@@ -60,7 +60,7 @@ class SetVoiceQualityFm(private var bot: Bot) : SlashCommand() {
         }
         val settings = bot.userSettingsManager.getSettings(event.user.idLong)
         bd?.let { settings.voiceQualityFmSetting = it.toFloat() }
-        event.reply("追加ハーフトーンを" + bd + "に設定しました。").queue()
+        event.reply("追加ハーフトーンを${bd}に設定しました。").queue()
     }
 
     override fun execute(event: CommandEvent) {
@@ -96,6 +96,6 @@ class SetVoiceQualityFm(private var bot: Bot) : SlashCommand() {
         }
         val settings = bot.userSettingsManager.getSettings(event.author.idLong)
         bd?.let { settings.voiceQualityFmSetting = it.toFloat() }
-        event.reply("追加ハーフトーンを $bd に設定しました。")
+        event.reply("追加ハーフトーンを${bd}に設定しました。")
     }
 }
\ No newline at end of file
diff --git a/src/main/java/dev/cosgy/textToSpeak/settings/Settings.kt b/src/main/java/dev/cosgy/textToSpeak/settings/Settings.kt
index d9f9325..6ba0e09 100644
--- a/src/main/java/dev/cosgy/textToSpeak/settings/Settings.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/settings/Settings.kt
@@ -76,7 +76,6 @@ class Settings : GuildSettingsProvider {
         return if (prefix == null) emptySet() else setOf(prefix)
     }
 
-
     fun isReadName(): Boolean {
         return readName
     }

From 903ccbad4d4a3e698ecbf06d6b4ec65d6978f639 Mon Sep 17 00:00:00 2001
From: kosugikun <33971692+kosugikun@users.noreply.github.com>
Date: Tue, 18 Jul 2023 00:29:25 +0900
Subject: [PATCH 35/39] =?UTF-8?q?CircleCI=E3=81=A7=E4=BD=BF=E7=94=A8?=
 =?UTF-8?q?=E3=81=99=E3=82=8BJDK=E3=83=90=E3=83=BC=E3=82=B8=E3=83=A7?=
 =?UTF-8?q?=E3=83=B3=E3=82=92Java20=E3=81=AB=E5=A4=89=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .circleci/config.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 61c86a0..550c46f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -4,7 +4,7 @@ jobs:
   build:
     docker:
       # specify the version you desire here
-      - image: circleci/openjdk:8u171-jdk
+      - image: circleci/openjdk:20.0.1
 
       # Specify service dependencies here if necessary
       # CircleCI maintains a library of pre-built images
@@ -19,6 +19,7 @@ jobs:
 
     steps:
       - checkout
+      - run: java --version
 
       # Download and cache dependencies
       - restore_cache:

From d6e3121a680ea9ea9e1d471ee7cb9831a403fe81 Mon Sep 17 00:00:00 2001
From: kosugikun <33971692+kosugikun@users.noreply.github.com>
Date: Tue, 18 Jul 2023 00:55:10 +0900
Subject: [PATCH 36/39] =?UTF-8?q?CircleCI=E3=81=AE=E3=82=A4=E3=83=A1?=
 =?UTF-8?q?=E3=83=BC=E3=82=B8=E8=A8=AD=E5=AE=9A=E3=81=8C=E9=96=93=E9=81=95?=
 =?UTF-8?q?=E3=81=A3=E3=81=A6=E3=81=84=E3=81=9F=E3=81=AE=E3=81=A7=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 550c46f..27d5032 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -4,7 +4,7 @@ jobs:
   build:
     docker:
       # specify the version you desire here
-      - image: circleci/openjdk:20.0.1
+      - image: cimg/openjdk:20.0.1
 
       # Specify service dependencies here if necessary
       # CircleCI maintains a library of pre-built images

From dfe57740ace2efb32ee14f39350fb6e43a6e2fa4 Mon Sep 17 00:00:00 2001
From: kosugikun <33971692+kosugikun@users.noreply.github.com>
Date: Tue, 18 Jul 2023 01:28:33 +0900
Subject: [PATCH 37/39] =?UTF-8?q?=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/dataSources/648c6ef7-2bba-4e14-b21f-f6619a5657a5.xml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.idea/dataSources/648c6ef7-2bba-4e14-b21f-f6619a5657a5.xml b/.idea/dataSources/648c6ef7-2bba-4e14-b21f-f6619a5657a5.xml
index 088cbfa..c4f4622 100644
--- a/.idea/dataSources/648c6ef7-2bba-4e14-b21f-f6619a5657a5.xml
+++ b/.idea/dataSources/648c6ef7-2bba-4e14-b21f-f6619a5657a5.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <dataSource name="UserData">
   <database-model serializer="dbm" dbms="SQLITE" family-id="SQLITE" format-version="4.48">
-    <root id="1">
-      <ServerVersion>3.40.1</ServerVersion>
-    </root>
+    <root id="1"/>
     <collation id="2" parent="1" name="RTRIM"/>
     <collation id="3" parent="1" name="NOCASE"/>
     <collation id="4" parent="1" name="BINARY"/>

From cd8bd62f28c6f70539418969a48ec1f6d2bbb9ad Mon Sep 17 00:00:00 2001
From: kosugikun <33971692+kosugikun@users.noreply.github.com>
Date: Tue, 18 Jul 2023 01:31:32 +0900
Subject: [PATCH 38/39] =?UTF-8?q?=E4=B8=8D=E8=A6=81=E3=81=AA=E3=82=B3?=
 =?UTF-8?q?=E3=83=A1=E3=83=B3=E3=83=88=E3=82=A2=E3=82=A6=E3=83=88=E3=82=92?=
 =?UTF-8?q?=E5=89=8A=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .circleci/config.yml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 27d5032..61341e8 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -6,11 +6,6 @@ jobs:
       # specify the version you desire here
       - image: cimg/openjdk:20.0.1
 
-      # Specify service dependencies here if necessary
-      # CircleCI maintains a library of pre-built images
-      # documented at https://circleci.com/docs/2.0/circleci-images/
-      # - image: circleci/postgres:9.4
-
     working_directory: ~/repo
 
     environment:

From bbeb5197502d6b70ecb461d5a75cacca8491b688 Mon Sep 17 00:00:00 2001
From: kosugikun <33971692+kosugikun@users.noreply.github.com>
Date: Tue, 18 Jul 2023 01:56:46 +0900
Subject: [PATCH 39/39] =?UTF-8?q?=E3=82=AF=E3=83=AA=E3=83=BC=E3=83=B3?=
 =?UTF-8?q?=E3=82=A2=E3=83=83=E3=83=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/dev/cosgy/textToSpeak/commands/admin/SettcCmd.kt     | 4 ++--
 .../java/dev/cosgy/textToSpeak/commands/general/JoinCmd.kt    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/dev/cosgy/textToSpeak/commands/admin/SettcCmd.kt b/src/main/java/dev/cosgy/textToSpeak/commands/admin/SettcCmd.kt
index 00e6d0b..81bc898 100644
--- a/src/main/java/dev/cosgy/textToSpeak/commands/admin/SettcCmd.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/commands/admin/SettcCmd.kt
@@ -80,7 +80,7 @@ class SettcCmd(bot: Bot?) : AdminCommand() {
             val channelId = event.getOption("channel")!!.asLong
             val tc = event.guild!!.getTextChannelById(channelId)
             s.setTextChannel(tc)
-            event.reply( "${event.client.success}読み上げるチャンネルを<#${tc!!.id}>に設定しました。").queue()
+            event.reply("${event.client.success}読み上げるチャンネルを<#${tc!!.id}>に設定しました。").queue()
         }
     }
 
@@ -92,7 +92,7 @@ class SettcCmd(bot: Bot?) : AdminCommand() {
 
         override fun execute(event: SlashCommandEvent) {
             if (!checkAdminPermission(event.client, event)) {
-                event.reply(  "${event.client.warning}権限がないため実行できません。").queue()
+                event.reply("${event.client.warning}権限がないため実行できません。").queue()
                 return
             }
             val s = event.client.getSettingsFor<Settings>(event.guild)
diff --git a/src/main/java/dev/cosgy/textToSpeak/commands/general/JoinCmd.kt b/src/main/java/dev/cosgy/textToSpeak/commands/general/JoinCmd.kt
index 92cebce..c95366b 100644
--- a/src/main/java/dev/cosgy/textToSpeak/commands/general/JoinCmd.kt
+++ b/src/main/java/dev/cosgy/textToSpeak/commands/general/JoinCmd.kt
@@ -60,7 +60,7 @@ class JoinCmd(private var bot: Bot) : SlashCommand() {
             builder.addField(
                 "設定",
                 "ユーザー名読み上げ:${if (settings.isReadName()) "有効" else "無効"}\n" +
-                      "参加、退出読み上げ:${if (settings.isJoinAndLeaveRead()) "有効" else "無効"}", true
+                        "参加、退出読み上げ:${if (settings.isJoinAndLeaveRead()) "有効" else "無効"}", true
             )
             event.hook.sendMessageEmbeds(builder.build()).queue()
             ReadChannel.setChannel(event.guild!!.idLong, event.textChannel.idLong)