From 4c59703679af75893fcfb23a153cd258a913f9d7 Mon Sep 17 00:00:00 2001 From: Hykilpikonna Date: Mon, 3 Sep 2018 10:42:29 -0400 Subject: [PATCH] =?UTF-8?q?[O]=20=E4=BC=98=E5=8C=96=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cc/moecraft/icq/plugins/osubot/Main.java | 6 ++++-- .../icq/plugins/osubot/commands/OsuCommandBase.java | 1 - .../plugins/osubot/commands/osu/CommandRecent.java | 1 - .../plugins/osubot/commands/setid/CommandSetId.java | 3 +-- .../plugins/osubot/commands/setid/CommandVerify.java | 1 - .../icq/plugins/osubot/database/model/DwMap.java | 2 +- .../icq/plugins/osubot/database/model/DwOsu.java | 2 +- .../icq/plugins/osubot/database/model/HoUserData.java | 2 +- .../plugins/osubot/database/model/HoUserSettings.java | 2 +- .../plugins/osubot/database/model/base/BaseDwMap.java | 2 +- .../plugins/osubot/database/model/base/BaseDwOsu.java | 2 +- .../osubot/database/model/base/BaseHoUserData.java | 2 +- .../database/model/base/BaseHoUserSettings.java | 2 +- .../plugins/osubot/database/service/DwMapService.java | 2 +- .../plugins/osubot/database/service/DwOsuService.java | 2 +- .../osubot/database/service/HoUserDataService.java | 2 +- .../database/service/HoUserSettingsService.java | 3 +-- .../database/service/impl/DwMapServiceImpl.java | 4 ++-- .../database/service/impl/DwOsuServiceImpl.java | 4 ++-- .../database/service/impl/HoUserDataServiceImpl.java | 4 ++-- .../service/impl/HoUserSettingsServiceImpl.java | 4 ++-- .../cc/moecraft/icq/plugins/osubot/osu/Koohii.java | 4 ++-- .../icq/plugins/osubot/osu/publicapi/OPAUtils.java | 2 +- .../icq/plugins/osubot/osu/publicapi/OPAWrapper.java | 11 ++++++++--- .../moecraft/icq/plugins/osubot/utils/JbootUtils.java | 1 - .../icq/plugins/osubot/utils/KoohiiUtils.java | 2 -- .../icq/plugins/osubot/utils/ResourceFileUtils.java | 1 - src/main/java/cc/moecraft/irc/PircSender.java | 1 - src/main/java/org/pircbotx/dcc/Chat.java | 1 - 29 files changed, 36 insertions(+), 40 deletions(-) diff --git a/src/main/java/cc/moecraft/icq/plugins/osubot/Main.java b/src/main/java/cc/moecraft/icq/plugins/osubot/Main.java index 41ca4e7..73a28f3 100644 --- a/src/main/java/cc/moecraft/icq/plugins/osubot/Main.java +++ b/src/main/java/cc/moecraft/icq/plugins/osubot/Main.java @@ -6,8 +6,10 @@ import cc.moecraft.icq.plugins.osubot.browser.OsuBrowserManager; import cc.moecraft.icq.plugins.osubot.commands.irc.CommandIrcServerInfo; import cc.moecraft.icq.plugins.osubot.commands.irc.CommandIrcStatus; -import cc.moecraft.icq.plugins.osubot.commands.misc.TestCommand; -import cc.moecraft.icq.plugins.osubot.commands.osu.*; +import cc.moecraft.icq.plugins.osubot.commands.osu.CommandHelp; +import cc.moecraft.icq.plugins.osubot.commands.osu.CommandRecent; +import cc.moecraft.icq.plugins.osubot.commands.osu.CommandSkills; +import cc.moecraft.icq.plugins.osubot.commands.osu.CommandStats; import cc.moecraft.icq.plugins.osubot.commands.setid.CommandSetId; import cc.moecraft.icq.plugins.osubot.commands.setid.CommandVerify; import cc.moecraft.icq.plugins.osubot.utils.JbootUtils; diff --git a/src/main/java/cc/moecraft/icq/plugins/osubot/commands/OsuCommandBase.java b/src/main/java/cc/moecraft/icq/plugins/osubot/commands/OsuCommandBase.java index 8b7d11c..3c237ca 100644 --- a/src/main/java/cc/moecraft/icq/plugins/osubot/commands/OsuCommandBase.java +++ b/src/main/java/cc/moecraft/icq/plugins/osubot/commands/OsuCommandBase.java @@ -8,7 +8,6 @@ import cc.moecraft.icq.plugins.osubot.osu.exceptions.UserNotFoundException; import cc.moecraft.icq.sender.message.components.ComponentImage; import cc.moecraft.icq.user.User; -import cc.moecraft.utils.ArrayUtils; import cn.hutool.http.HttpException; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/cc/moecraft/icq/plugins/osubot/commands/osu/CommandRecent.java b/src/main/java/cc/moecraft/icq/plugins/osubot/commands/osu/CommandRecent.java index 9617bbb..9b0811c 100644 --- a/src/main/java/cc/moecraft/icq/plugins/osubot/commands/osu/CommandRecent.java +++ b/src/main/java/cc/moecraft/icq/plugins/osubot/commands/osu/CommandRecent.java @@ -4,7 +4,6 @@ import cc.moecraft.icq.event.events.message.EventMessage; import cc.moecraft.icq.plugins.osubot.Main; import cc.moecraft.icq.plugins.osubot.browser.browsers.RecentBrowser; -import cc.moecraft.icq.plugins.osubot.browser.browsers.SkillsBrowser; import cc.moecraft.icq.plugins.osubot.commands.OsuCommandBase; import cc.moecraft.icq.plugins.osubot.osu.exceptions.RecentScoreNotEnoughException; import cc.moecraft.icq.plugins.osubot.osu.exceptions.UnsupportedModeException; diff --git a/src/main/java/cc/moecraft/icq/plugins/osubot/commands/setid/CommandSetId.java b/src/main/java/cc/moecraft/icq/plugins/osubot/commands/setid/CommandSetId.java index ed0b593..d0dd7ef 100644 --- a/src/main/java/cc/moecraft/icq/plugins/osubot/commands/setid/CommandSetId.java +++ b/src/main/java/cc/moecraft/icq/plugins/osubot/commands/setid/CommandSetId.java @@ -10,11 +10,10 @@ import cc.moecraft.icq.plugins.osubot.osu.exceptions.UserNotFoundException; import cc.moecraft.icq.plugins.osubot.osu.webapi.OWAUserData; import cc.moecraft.icq.plugins.osubot.osu.webapi.OWAUtils; -import cc.moecraft.utils.MathUtils; -import cc.moecraft.icq.plugins.permissions.Permissions; import cc.moecraft.icq.sender.message.MessageBuilder; import cc.moecraft.icq.user.User; import cc.moecraft.utils.ArrayUtils; +import cc.moecraft.utils.MathUtils; import cn.hutool.http.HttpException; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/cc/moecraft/icq/plugins/osubot/commands/setid/CommandVerify.java b/src/main/java/cc/moecraft/icq/plugins/osubot/commands/setid/CommandVerify.java index 9206887..430266b 100644 --- a/src/main/java/cc/moecraft/icq/plugins/osubot/commands/setid/CommandVerify.java +++ b/src/main/java/cc/moecraft/icq/plugins/osubot/commands/setid/CommandVerify.java @@ -1,7 +1,6 @@ package cc.moecraft.icq.plugins.osubot.commands.setid; import cc.moecraft.icq.command.CommandProperties; -import cc.moecraft.icq.command.interfaces.EverywhereCommand; import cc.moecraft.icq.event.events.message.EventMessage; import cc.moecraft.icq.plugins.osubot.commands.OsuCommandBase; import cc.moecraft.icq.plugins.osubot.database.ServiceInstanceManager; diff --git a/src/main/java/cc/moecraft/icq/plugins/osubot/database/model/DwMap.java b/src/main/java/cc/moecraft/icq/plugins/osubot/database/model/DwMap.java index 1817e7c..885d348 100644 --- a/src/main/java/cc/moecraft/icq/plugins/osubot/database/model/DwMap.java +++ b/src/main/java/cc/moecraft/icq/plugins/osubot/database/model/DwMap.java @@ -1,7 +1,7 @@ package cc.moecraft.icq.plugins.osubot.database.model; -import io.jboot.db.annotation.Table; import cc.moecraft.icq.plugins.osubot.database.model.base.BaseDwMap; +import io.jboot.db.annotation.Table; /** * Generated by Jboot. diff --git a/src/main/java/cc/moecraft/icq/plugins/osubot/database/model/DwOsu.java b/src/main/java/cc/moecraft/icq/plugins/osubot/database/model/DwOsu.java index 44af31c..48b6641 100644 --- a/src/main/java/cc/moecraft/icq/plugins/osubot/database/model/DwOsu.java +++ b/src/main/java/cc/moecraft/icq/plugins/osubot/database/model/DwOsu.java @@ -1,7 +1,7 @@ package cc.moecraft.icq.plugins.osubot.database.model; -import io.jboot.db.annotation.Table; import cc.moecraft.icq.plugins.osubot.database.model.base.BaseDwOsu; +import io.jboot.db.annotation.Table; /** * Generated by Jboot. diff --git a/src/main/java/cc/moecraft/icq/plugins/osubot/database/model/HoUserData.java b/src/main/java/cc/moecraft/icq/plugins/osubot/database/model/HoUserData.java index 8d34d35..a6fccf7 100644 --- a/src/main/java/cc/moecraft/icq/plugins/osubot/database/model/HoUserData.java +++ b/src/main/java/cc/moecraft/icq/plugins/osubot/database/model/HoUserData.java @@ -1,7 +1,7 @@ package cc.moecraft.icq.plugins.osubot.database.model; -import io.jboot.db.annotation.Table; import cc.moecraft.icq.plugins.osubot.database.model.base.BaseHoUserData; +import io.jboot.db.annotation.Table; /** * Generated by Jboot. diff --git a/src/main/java/cc/moecraft/icq/plugins/osubot/database/model/HoUserSettings.java b/src/main/java/cc/moecraft/icq/plugins/osubot/database/model/HoUserSettings.java index 9eeb307..2ade533 100644 --- a/src/main/java/cc/moecraft/icq/plugins/osubot/database/model/HoUserSettings.java +++ b/src/main/java/cc/moecraft/icq/plugins/osubot/database/model/HoUserSettings.java @@ -1,7 +1,7 @@ package cc.moecraft.icq.plugins.osubot.database.model; -import io.jboot.db.annotation.Table; import cc.moecraft.icq.plugins.osubot.database.model.base.BaseHoUserSettings; +import io.jboot.db.annotation.Table; /** * Generated by Jboot. diff --git a/src/main/java/cc/moecraft/icq/plugins/osubot/database/model/base/BaseDwMap.java b/src/main/java/cc/moecraft/icq/plugins/osubot/database/model/base/BaseDwMap.java index aa1b49f..44586f3 100644 --- a/src/main/java/cc/moecraft/icq/plugins/osubot/database/model/base/BaseDwMap.java +++ b/src/main/java/cc/moecraft/icq/plugins/osubot/database/model/base/BaseDwMap.java @@ -1,7 +1,7 @@ package cc.moecraft.icq.plugins.osubot.database.model.base; -import io.jboot.db.model.JbootModel; import com.jfinal.plugin.activerecord.IBean; +import io.jboot.db.model.JbootModel; /** * Generated by Jboot, do not modify this file. diff --git a/src/main/java/cc/moecraft/icq/plugins/osubot/database/model/base/BaseDwOsu.java b/src/main/java/cc/moecraft/icq/plugins/osubot/database/model/base/BaseDwOsu.java index 3955ddb..1d42e93 100644 --- a/src/main/java/cc/moecraft/icq/plugins/osubot/database/model/base/BaseDwOsu.java +++ b/src/main/java/cc/moecraft/icq/plugins/osubot/database/model/base/BaseDwOsu.java @@ -1,7 +1,7 @@ package cc.moecraft.icq.plugins.osubot.database.model.base; -import io.jboot.db.model.JbootModel; import com.jfinal.plugin.activerecord.IBean; +import io.jboot.db.model.JbootModel; /** * Generated by Jboot, do not modify this file. diff --git a/src/main/java/cc/moecraft/icq/plugins/osubot/database/model/base/BaseHoUserData.java b/src/main/java/cc/moecraft/icq/plugins/osubot/database/model/base/BaseHoUserData.java index 2bd458f..f20feba 100644 --- a/src/main/java/cc/moecraft/icq/plugins/osubot/database/model/base/BaseHoUserData.java +++ b/src/main/java/cc/moecraft/icq/plugins/osubot/database/model/base/BaseHoUserData.java @@ -1,7 +1,7 @@ package cc.moecraft.icq.plugins.osubot.database.model.base; -import io.jboot.db.model.JbootModel; import com.jfinal.plugin.activerecord.IBean; +import io.jboot.db.model.JbootModel; /** * Generated by Jboot, do not modify this file. diff --git a/src/main/java/cc/moecraft/icq/plugins/osubot/database/model/base/BaseHoUserSettings.java b/src/main/java/cc/moecraft/icq/plugins/osubot/database/model/base/BaseHoUserSettings.java index faaa909..52d9ab4 100644 --- a/src/main/java/cc/moecraft/icq/plugins/osubot/database/model/base/BaseHoUserSettings.java +++ b/src/main/java/cc/moecraft/icq/plugins/osubot/database/model/base/BaseHoUserSettings.java @@ -1,7 +1,7 @@ package cc.moecraft.icq.plugins.osubot.database.model.base; -import io.jboot.db.model.JbootModel; import com.jfinal.plugin.activerecord.IBean; +import io.jboot.db.model.JbootModel; /** * Generated by Jboot, do not modify this file. diff --git a/src/main/java/cc/moecraft/icq/plugins/osubot/database/service/DwMapService.java b/src/main/java/cc/moecraft/icq/plugins/osubot/database/service/DwMapService.java index fb3662e..7258975 100644 --- a/src/main/java/cc/moecraft/icq/plugins/osubot/database/service/DwMapService.java +++ b/src/main/java/cc/moecraft/icq/plugins/osubot/database/service/DwMapService.java @@ -1,8 +1,8 @@ package cc.moecraft.icq.plugins.osubot.database.service; +import cc.moecraft.icq.plugins.osubot.database.model.DwMap; import com.jfinal.plugin.activerecord.Model; import com.jfinal.plugin.activerecord.Page; -import cc.moecraft.icq.plugins.osubot.database.model.DwMap; import java.util.List; diff --git a/src/main/java/cc/moecraft/icq/plugins/osubot/database/service/DwOsuService.java b/src/main/java/cc/moecraft/icq/plugins/osubot/database/service/DwOsuService.java index 64d0cb4..10dec42 100644 --- a/src/main/java/cc/moecraft/icq/plugins/osubot/database/service/DwOsuService.java +++ b/src/main/java/cc/moecraft/icq/plugins/osubot/database/service/DwOsuService.java @@ -1,8 +1,8 @@ package cc.moecraft.icq.plugins.osubot.database.service; +import cc.moecraft.icq.plugins.osubot.database.model.DwOsu; import com.jfinal.plugin.activerecord.Model; import com.jfinal.plugin.activerecord.Page; -import cc.moecraft.icq.plugins.osubot.database.model.DwOsu; import java.util.List; diff --git a/src/main/java/cc/moecraft/icq/plugins/osubot/database/service/HoUserDataService.java b/src/main/java/cc/moecraft/icq/plugins/osubot/database/service/HoUserDataService.java index 21f768e..8e8540f 100644 --- a/src/main/java/cc/moecraft/icq/plugins/osubot/database/service/HoUserDataService.java +++ b/src/main/java/cc/moecraft/icq/plugins/osubot/database/service/HoUserDataService.java @@ -1,8 +1,8 @@ package cc.moecraft.icq.plugins.osubot.database.service; +import cc.moecraft.icq.plugins.osubot.database.model.HoUserData; import com.jfinal.plugin.activerecord.Model; import com.jfinal.plugin.activerecord.Page; -import cc.moecraft.icq.plugins.osubot.database.model.HoUserData; import java.util.List; diff --git a/src/main/java/cc/moecraft/icq/plugins/osubot/database/service/HoUserSettingsService.java b/src/main/java/cc/moecraft/icq/plugins/osubot/database/service/HoUserSettingsService.java index d51d42f..2783910 100644 --- a/src/main/java/cc/moecraft/icq/plugins/osubot/database/service/HoUserSettingsService.java +++ b/src/main/java/cc/moecraft/icq/plugins/osubot/database/service/HoUserSettingsService.java @@ -1,9 +1,8 @@ package cc.moecraft.icq.plugins.osubot.database.service; -import cc.moecraft.icq.plugins.osubot.database.model.HoUserData; +import cc.moecraft.icq.plugins.osubot.database.model.HoUserSettings; import com.jfinal.plugin.activerecord.Model; import com.jfinal.plugin.activerecord.Page; -import cc.moecraft.icq.plugins.osubot.database.model.HoUserSettings; import java.util.List; diff --git a/src/main/java/cc/moecraft/icq/plugins/osubot/database/service/impl/DwMapServiceImpl.java b/src/main/java/cc/moecraft/icq/plugins/osubot/database/service/impl/DwMapServiceImpl.java index 3d0f87f..90c4c2f 100644 --- a/src/main/java/cc/moecraft/icq/plugins/osubot/database/service/impl/DwMapServiceImpl.java +++ b/src/main/java/cc/moecraft/icq/plugins/osubot/database/service/impl/DwMapServiceImpl.java @@ -1,8 +1,8 @@ package cc.moecraft.icq.plugins.osubot.database.service.impl; -import io.jboot.aop.annotation.Bean; -import cc.moecraft.icq.plugins.osubot.database.service.DwMapService; import cc.moecraft.icq.plugins.osubot.database.model.DwMap; +import cc.moecraft.icq.plugins.osubot.database.service.DwMapService; +import io.jboot.aop.annotation.Bean; import io.jboot.service.JbootServiceBase; import javax.inject.Singleton; diff --git a/src/main/java/cc/moecraft/icq/plugins/osubot/database/service/impl/DwOsuServiceImpl.java b/src/main/java/cc/moecraft/icq/plugins/osubot/database/service/impl/DwOsuServiceImpl.java index 4d8aea0..604f663 100644 --- a/src/main/java/cc/moecraft/icq/plugins/osubot/database/service/impl/DwOsuServiceImpl.java +++ b/src/main/java/cc/moecraft/icq/plugins/osubot/database/service/impl/DwOsuServiceImpl.java @@ -1,8 +1,8 @@ package cc.moecraft.icq.plugins.osubot.database.service.impl; -import io.jboot.aop.annotation.Bean; -import cc.moecraft.icq.plugins.osubot.database.service.DwOsuService; import cc.moecraft.icq.plugins.osubot.database.model.DwOsu; +import cc.moecraft.icq.plugins.osubot.database.service.DwOsuService; +import io.jboot.aop.annotation.Bean; import io.jboot.service.JbootServiceBase; import javax.inject.Singleton; diff --git a/src/main/java/cc/moecraft/icq/plugins/osubot/database/service/impl/HoUserDataServiceImpl.java b/src/main/java/cc/moecraft/icq/plugins/osubot/database/service/impl/HoUserDataServiceImpl.java index 851d78d..77eb174 100644 --- a/src/main/java/cc/moecraft/icq/plugins/osubot/database/service/impl/HoUserDataServiceImpl.java +++ b/src/main/java/cc/moecraft/icq/plugins/osubot/database/service/impl/HoUserDataServiceImpl.java @@ -1,8 +1,8 @@ package cc.moecraft.icq.plugins.osubot.database.service.impl; -import io.jboot.aop.annotation.Bean; -import cc.moecraft.icq.plugins.osubot.database.service.HoUserDataService; import cc.moecraft.icq.plugins.osubot.database.model.HoUserData; +import cc.moecraft.icq.plugins.osubot.database.service.HoUserDataService; +import io.jboot.aop.annotation.Bean; import io.jboot.service.JbootServiceBase; import javax.inject.Singleton; diff --git a/src/main/java/cc/moecraft/icq/plugins/osubot/database/service/impl/HoUserSettingsServiceImpl.java b/src/main/java/cc/moecraft/icq/plugins/osubot/database/service/impl/HoUserSettingsServiceImpl.java index 5a7f75b..c1a3543 100644 --- a/src/main/java/cc/moecraft/icq/plugins/osubot/database/service/impl/HoUserSettingsServiceImpl.java +++ b/src/main/java/cc/moecraft/icq/plugins/osubot/database/service/impl/HoUserSettingsServiceImpl.java @@ -1,8 +1,8 @@ package cc.moecraft.icq.plugins.osubot.database.service.impl; -import io.jboot.aop.annotation.Bean; -import cc.moecraft.icq.plugins.osubot.database.service.HoUserSettingsService; import cc.moecraft.icq.plugins.osubot.database.model.HoUserSettings; +import cc.moecraft.icq.plugins.osubot.database.service.HoUserSettingsService; +import io.jboot.aop.annotation.Bean; import io.jboot.service.JbootServiceBase; import javax.inject.Singleton; diff --git a/src/main/java/cc/moecraft/icq/plugins/osubot/osu/Koohii.java b/src/main/java/cc/moecraft/icq/plugins/osubot/osu/Koohii.java index 1f2f14a..4c91ae5 100644 --- a/src/main/java/cc/moecraft/icq/plugins/osubot/osu/Koohii.java +++ b/src/main/java/cc/moecraft/icq/plugins/osubot/osu/Koohii.java @@ -1,9 +1,9 @@ package cc.moecraft.icq.plugins.osubot.osu; -import java.util.ArrayList; -import java.util.Collections; import java.io.BufferedReader; import java.io.IOException; +import java.util.ArrayList; +import java.util.Collections; /** * pure java implementation of github.com/Francesco149/oppai-ng . diff --git a/src/main/java/cc/moecraft/icq/plugins/osubot/osu/publicapi/OPAUtils.java b/src/main/java/cc/moecraft/icq/plugins/osubot/osu/publicapi/OPAUtils.java index d761649..507a2dd 100644 --- a/src/main/java/cc/moecraft/icq/plugins/osubot/osu/publicapi/OPAUtils.java +++ b/src/main/java/cc/moecraft/icq/plugins/osubot/osu/publicapi/OPAUtils.java @@ -1,11 +1,11 @@ package cc.moecraft.icq.plugins.osubot.osu.publicapi; import cc.moecraft.icq.plugins.osubot.Main; +import cc.moecraft.icq.plugins.osubot.osu.exceptions.JsonEmptyException; import cc.moecraft.icq.plugins.osubot.osu.publicapi.data.OPADataBase; import cc.moecraft.icq.plugins.osubot.osu.publicapi.parameters.OPAParamsBase; import cc.moecraft.icq.plugins.osubot.osu.publicapi.parameters.OPAUserParams; import cc.moecraft.icq.plugins.osubot.osu.publicapi.parameters.tags.OPAParameter; -import cc.moecraft.icq.plugins.osubot.osu.exceptions.JsonEmptyException; import cc.moecraft.utils.DownloadUtils; import cc.moecraft.utils.JsonUtils; import cc.moecraft.utils.ReflectUtils; diff --git a/src/main/java/cc/moecraft/icq/plugins/osubot/osu/publicapi/OPAWrapper.java b/src/main/java/cc/moecraft/icq/plugins/osubot/osu/publicapi/OPAWrapper.java index b349bd9..633cbf2 100644 --- a/src/main/java/cc/moecraft/icq/plugins/osubot/osu/publicapi/OPAWrapper.java +++ b/src/main/java/cc/moecraft/icq/plugins/osubot/osu/publicapi/OPAWrapper.java @@ -1,13 +1,18 @@ package cc.moecraft.icq.plugins.osubot.osu.publicapi; -import cc.moecraft.icq.plugins.osubot.osu.publicapi.data.*; -import cc.moecraft.icq.plugins.osubot.osu.publicapi.parameters.*; import cc.moecraft.icq.plugins.osubot.osu.exceptions.BeatmapScoreNotEnoughException; import cc.moecraft.icq.plugins.osubot.osu.exceptions.JsonEmptyException; import cc.moecraft.icq.plugins.osubot.osu.exceptions.RecentScoreNotEnoughException; +import cc.moecraft.icq.plugins.osubot.osu.publicapi.data.OPABeatmapData; +import cc.moecraft.icq.plugins.osubot.osu.publicapi.data.OPAUserBestData; +import cc.moecraft.icq.plugins.osubot.osu.publicapi.data.OPAUserRecentData; +import cc.moecraft.icq.plugins.osubot.osu.publicapi.data.OPAUserScoreData; +import cc.moecraft.icq.plugins.osubot.osu.publicapi.parameters.OPABeatmapParams; +import cc.moecraft.icq.plugins.osubot.osu.publicapi.parameters.OPAUserBestParams; +import cc.moecraft.icq.plugins.osubot.osu.publicapi.parameters.OPAUserRecentParams; +import cc.moecraft.icq.plugins.osubot.osu.publicapi.parameters.OPAUserScoreParams; import lombok.AllArgsConstructor; -import javax.swing.text.html.parser.Parser; import java.util.ArrayList; /** diff --git a/src/main/java/cc/moecraft/icq/plugins/osubot/utils/JbootUtils.java b/src/main/java/cc/moecraft/icq/plugins/osubot/utils/JbootUtils.java index 12a4323..e2a70ab 100644 --- a/src/main/java/cc/moecraft/icq/plugins/osubot/utils/JbootUtils.java +++ b/src/main/java/cc/moecraft/icq/plugins/osubot/utils/JbootUtils.java @@ -2,7 +2,6 @@ import com.jfinal.config.JFinalConfig; import com.jfinal.core.JFinal; -import io.jboot.Jboot; import io.jboot.web.JbootAppConfig; import lombok.Getter; diff --git a/src/main/java/cc/moecraft/icq/plugins/osubot/utils/KoohiiUtils.java b/src/main/java/cc/moecraft/icq/plugins/osubot/utils/KoohiiUtils.java index e4e6e4a..d48c4b8 100644 --- a/src/main/java/cc/moecraft/icq/plugins/osubot/utils/KoohiiUtils.java +++ b/src/main/java/cc/moecraft/icq/plugins/osubot/utils/KoohiiUtils.java @@ -1,6 +1,5 @@ package cc.moecraft.icq.plugins.osubot.utils; -import cc.moecraft.icq.plugins.osubot.osu.Koohii; import cc.moecraft.icq.plugins.osubot.osu.Mode; import cc.moecraft.icq.plugins.osubot.osu.Mods; import cc.moecraft.icq.plugins.osubot.osu.exceptions.UnsupportedModeException; @@ -12,7 +11,6 @@ import java.io.BufferedReader; import java.io.IOException; import java.io.StringReader; -import java.io.UnsupportedEncodingException; import static cc.moecraft.icq.plugins.osubot.osu.Koohii.*; diff --git a/src/main/java/cc/moecraft/icq/plugins/osubot/utils/ResourceFileUtils.java b/src/main/java/cc/moecraft/icq/plugins/osubot/utils/ResourceFileUtils.java index 496f771..22d618e 100644 --- a/src/main/java/cc/moecraft/icq/plugins/osubot/utils/ResourceFileUtils.java +++ b/src/main/java/cc/moecraft/icq/plugins/osubot/utils/ResourceFileUtils.java @@ -1,7 +1,6 @@ package cc.moecraft.icq.plugins.osubot.utils; import cc.moecraft.icq.plugins.osubot.Main; -import org.apache.commons.io.FilenameUtils; import org.rauschig.jarchivelib.Archiver; import org.rauschig.jarchivelib.ArchiverFactory; diff --git a/src/main/java/cc/moecraft/irc/PircSender.java b/src/main/java/cc/moecraft/irc/PircSender.java index b6d568e..9a78e6e 100644 --- a/src/main/java/cc/moecraft/irc/PircSender.java +++ b/src/main/java/cc/moecraft/irc/PircSender.java @@ -5,7 +5,6 @@ import org.pircbotx.Configuration; import org.pircbotx.PircBotX; import org.pircbotx.exception.IrcException; -import org.pircbotx.output.OutputIRC; import java.io.IOException; diff --git a/src/main/java/org/pircbotx/dcc/Chat.java b/src/main/java/org/pircbotx/dcc/Chat.java index f26f89a..176a60c 100644 --- a/src/main/java/org/pircbotx/dcc/Chat.java +++ b/src/main/java/org/pircbotx/dcc/Chat.java @@ -17,7 +17,6 @@ */ package org.pircbotx.dcc; -import cc.moecraft.icq.plugins.osubot.Main; import lombok.Getter; import lombok.extern.slf4j.Slf4j; import org.pircbotx.User;