[O] 优化导入

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;

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;
 

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;

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;

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;

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.

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.

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.

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.

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.

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.

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.

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.

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;
 

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;
 

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;
 

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;
 

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;

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;

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;

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;

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 .

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;

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;
 
 /**

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;
 

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.*;
 

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;
 

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;
 

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;