Optimise imports

Explv · Explv · commit 0ea5bd98a780 · 2021-05-15T09:54:56.000+01:00
diff --git a/src/main/java/activities/eating/Eating.java b/src/main/java/activities/eating/Eating.java
@@ -1,8 +1,8 @@
 package activities.eating;
 
 import org.osbot.rs07.api.ui.Skill;
-import util.executable.Executable;
 import util.Sleep;
+import util.executable.Executable;
 
 public class Eating extends Executable {
 
diff --git a/src/main/java/activities/quests/CooksAssistant.java b/src/main/java/activities/quests/CooksAssistant.java
@@ -3,8 +3,6 @@
 import activities.activity.Activity;
 import activities.banking.DepositAllBanking;
 import org.osbot.rs07.api.map.Area;
-import org.osbot.rs07.api.map.Position;
-import org.osbot.rs07.api.model.GroundItem;
 import org.osbot.rs07.api.model.RS2Object;
 import org.osbot.rs07.api.ui.Tab;
 import util.Sleep;
diff --git a/src/main/java/activities/quests/DialogueCompleter.java b/src/main/java/activities/quests/DialogueCompleter.java
@@ -4,8 +4,8 @@
 import org.osbot.rs07.api.model.NPC;
 import org.osbot.rs07.event.WebWalkEvent;
 import org.osbot.rs07.utility.Condition;
-import util.executable.Executable;
 import util.Sleep;
+import util.executable.Executable;
 import util.executable.ExecutionFailedException;
 
 import java.util.stream.Stream;
diff --git a/src/main/java/activities/skills/agility/AgilityActivity.java b/src/main/java/activities/skills/agility/AgilityActivity.java
@@ -3,17 +3,16 @@
 import activities.activity.Activity;
 import activities.activity.ActivityType;
 import activities.banking.DepositAllBanking;
-import activities.banking.ItemReqBanking;
 import org.osbot.rs07.api.model.GroundItem;
 import org.osbot.rs07.api.model.RS2Object;
 import org.osbot.rs07.api.ui.Skill;
 import org.osbot.rs07.api.ui.Tab;
-import org.osbot.rs07.event.*;
+import org.osbot.rs07.event.WalkingEvent;
+import org.osbot.rs07.event.WebWalkEvent;
 import org.osbot.rs07.utility.Condition;
-import util.executable.Executable;
 import util.Sleep;
+import util.executable.Executable;
 import util.executable.ExecutionFailedException;
-import util.item_requirement.ItemReq;
 
 import java.awt.*;
 import java.util.Arrays;
diff --git a/src/main/java/activities/skills/cooking/CookingActivity.java b/src/main/java/activities/skills/cooking/CookingActivity.java
@@ -6,8 +6,8 @@
 import org.osbot.rs07.api.model.RS2Object;
 import org.osbot.rs07.event.WebWalkEvent;
 import org.osbot.rs07.utility.Condition;
-import util.executable.Executable;
 import util.Sleep;
+import util.executable.Executable;
 import util.item_requirement.ItemReq;
 
 public class CookingActivity extends Activity {
diff --git a/src/main/java/activities/skills/crafting/CraftingActivity.java b/src/main/java/activities/skills/crafting/CraftingActivity.java
@@ -5,9 +5,9 @@
 import activities.banking.Bank;
 import activities.banking.ItemReqBanking;
 import org.osbot.rs07.api.ui.RS2Widget;
-import util.executable.Executable;
 import util.Location;
 import util.Sleep;
+import util.executable.Executable;
 import util.item_requirement.ItemReq;
 import util.widget.CachedWidget;
 
diff --git a/src/main/java/activities/skills/firemaking/FiremakingActivity.java b/src/main/java/activities/skills/firemaking/FiremakingActivity.java
@@ -6,12 +6,11 @@
 import org.osbot.rs07.api.map.Position;
 import org.osbot.rs07.api.model.GroundDecoration;
 import org.osbot.rs07.api.model.RS2Object;
-import org.osbot.rs07.event.Event;
 import org.osbot.rs07.event.WalkingEvent;
-import util.executable.BlockingExecutable;
-import util.executable.Executable;
 import util.Location;
 import util.Sleep;
+import util.executable.BlockingExecutable;
+import util.executable.Executable;
 import util.item_requirement.ItemReq;
 
 import java.util.*;
diff --git a/src/main/java/activities/skills/fishing/FishingActivity.java b/src/main/java/activities/skills/fishing/FishingActivity.java
@@ -5,9 +5,9 @@
 import activities.banking.DepositAllBanking;
 import activities.banking.ItemReqBanking;
 import org.osbot.rs07.api.model.NPC;
-import util.executable.Executable;
 import util.ResourceMode;
 import util.Sleep;
+import util.executable.Executable;
 import util.item_requirement.ItemReq;
 
 import java.util.ArrayList;
diff --git a/src/main/java/activities/skills/fletching/FletchingActivity.java b/src/main/java/activities/skills/fletching/FletchingActivity.java
@@ -3,8 +3,8 @@
 import activities.activity.Activity;
 import activities.activity.ActivityType;
 import activities.banking.ItemReqBanking;
-import util.executable.Executable;
 import util.Sleep;
+import util.executable.Executable;
 import util.item_requirement.ItemReq;
 
 
diff --git a/src/main/java/activities/skills/herblore/herb_cleaning/HerbCleaningActivity.java b/src/main/java/activities/skills/herblore/herb_cleaning/HerbCleaningActivity.java
@@ -3,8 +3,8 @@
 import activities.activity.Activity;
 import activities.activity.ActivityType;
 import activities.banking.ItemReqBanking;
-import util.executable.Executable;
 import util.Sleep;
+import util.executable.Executable;
 import util.item_requirement.ItemReq;
 
 public class HerbCleaningActivity extends Activity {
diff --git a/src/main/java/activities/skills/herblore/potion_making/PotionMakingActivity.java b/src/main/java/activities/skills/herblore/potion_making/PotionMakingActivity.java
@@ -3,8 +3,8 @@
 import activities.activity.Activity;
 import activities.activity.ActivityType;
 import activities.banking.ItemReqBanking;
-import util.executable.Executable;
 import util.Sleep;
+import util.executable.Executable;
 import util.item_requirement.ItemReq;
 
 
diff --git a/src/main/java/activities/skills/mining/MiningActivity.java b/src/main/java/activities/skills/mining/MiningActivity.java
@@ -9,9 +9,9 @@
 import org.osbot.rs07.api.model.Entity;
 import org.osbot.rs07.api.model.RS2Object;
 import org.osbot.rs07.api.ui.EquipmentSlot;
-import util.executable.Executable;
 import util.ResourceMode;
 import util.Sleep;
+import util.executable.Executable;
 
 import java.util.Arrays;
 import java.util.List;
diff --git a/src/main/java/activities/skills/mining/RuneEssMiningActivity.java b/src/main/java/activities/skills/mining/RuneEssMiningActivity.java
@@ -4,9 +4,9 @@
 import org.osbot.rs07.api.model.Entity;
 import org.osbot.rs07.api.model.RS2Object;
 import org.osbot.rs07.event.WalkingEvent;
-import util.executable.Executable;
 import util.ResourceMode;
 import util.Sleep;
+import util.executable.Executable;
 
 import java.util.Comparator;
 import java.util.Optional;
diff --git a/src/main/java/activities/skills/ranged/RangeGuildActivity.java b/src/main/java/activities/skills/ranged/RangeGuildActivity.java
@@ -7,8 +7,8 @@
 import org.osbot.rs07.api.model.NPC;
 import org.osbot.rs07.api.model.RS2Object;
 import org.osbot.rs07.api.ui.EquipmentSlot;
-import util.executable.Executable;
 import util.Sleep;
+import util.executable.Executable;
 import util.item_requirement.ItemReq;
 
 public class RangeGuildActivity extends Activity {
diff --git a/src/main/java/activities/skills/runecrafting/RunecraftingActivity.java b/src/main/java/activities/skills/runecrafting/RunecraftingActivity.java
@@ -3,8 +3,8 @@
 import activities.banking.Banking;
 import activities.banking.ItemReqBanking;
 import org.osbot.rs07.api.ui.EquipmentSlot;
-import util.executable.Executable;
 import util.Sleep;
+import util.executable.Executable;
 import util.item_requirement.ItemReq;
 
 public class RunecraftingActivity extends RunecraftingBase {
diff --git a/src/main/java/activities/skills/smithing/cannonballs/CannonballActivity.java b/src/main/java/activities/skills/smithing/cannonballs/CannonballActivity.java
@@ -4,8 +4,8 @@
 import activities.activity.ActivityType;
 import activities.banking.ItemReqBanking;
 import activities.skills.smithing.smelting.SmeltLocation;
-import util.executable.Executable;
 import util.Sleep;
+import util.executable.Executable;
 import util.item_requirement.ItemReq;
 
 public class CannonballActivity extends Activity {
diff --git a/src/main/java/activities/skills/smithing/item_making/SmithItemMakingActivity.java b/src/main/java/activities/skills/smithing/item_making/SmithItemMakingActivity.java
@@ -5,8 +5,8 @@
 import activities.banking.ItemReqBanking;
 import activities.skills.smithing.Bar;
 import org.osbot.rs07.api.ui.RS2Widget;
-import util.executable.Executable;
 import util.Sleep;
+import util.executable.Executable;
 import util.item_requirement.ItemReq;
 import util.widget.CachedWidget;
 
diff --git a/src/main/java/activities/skills/smithing/smelting/SmeltingActivity.java b/src/main/java/activities/skills/smithing/smelting/SmeltingActivity.java
@@ -4,8 +4,8 @@
 import activities.activity.ActivityType;
 import activities.banking.ItemReqBanking;
 import activities.skills.smithing.Bar;
-import util.executable.Executable;
 import util.Sleep;
+import util.executable.Executable;
 import util.item_requirement.ItemReq;
 
 public class SmeltingActivity extends Activity {
diff --git a/src/main/java/activities/skills/thieving/ThievingActivity.java b/src/main/java/activities/skills/thieving/ThievingActivity.java
@@ -10,10 +10,10 @@
 import org.osbot.rs07.api.model.NPC;
 import org.osbot.rs07.api.model.RS2Object;
 import org.osbot.rs07.event.WalkingEvent;
-import util.executable.Executable;
 import util.Location;
 import util.ResourceMode;
 import util.Sleep;
+import util.executable.Executable;
 import util.executable.ExecutionFailedException;
 
 public class ThievingActivity extends Activity {
diff --git a/src/main/java/activities/skills/woodcutting/Axe.java b/src/main/java/activities/skills/woodcutting/Axe.java
@@ -1,7 +1,6 @@
 package activities.skills.woodcutting;
 
 import org.osbot.rs07.api.Skills;
-import org.osbot.rs07.api.ui.EquipmentSlot;
 import org.osbot.rs07.api.ui.Skill;
 import util.Tool;
 
diff --git a/src/main/java/activities/tutorial_island/RuneScapeGuideSection.java b/src/main/java/activities/tutorial_island/RuneScapeGuideSection.java
@@ -3,11 +3,9 @@
 import org.osbot.rs07.api.Configs;
 import org.osbot.rs07.api.ui.RS2Widget;
 import org.osbot.rs07.api.ui.Tab;
-import org.osbot.rs07.event.Event;
 import org.osbot.rs07.script.MethodProvider;
 import util.Sleep;
 import util.event.ConfigureClientEvent;
-import util.event.DisableAudioEvent;
 import util.widget.CachedWidget;
 import util.widget.filters.WidgetActionFilter;
 
diff --git a/src/main/java/activities/tutorial_island/TutorialSection.java b/src/main/java/activities/tutorial_island/TutorialSection.java
@@ -2,7 +2,6 @@
 
 import org.osbot.rs07.api.model.NPC;
 import org.osbot.rs07.api.ui.RS2Widget;
-import org.osbot.rs07.script.MethodProvider;
 import util.Sleep;
 import util.executable.Executable;
 
diff --git a/src/main/java/paint/Paint.java b/src/main/java/paint/Paint.java
@@ -4,7 +4,6 @@
 import org.osbot.rs07.api.ui.Skill;
 import org.osbot.rs07.canvas.paint.Painter;
 import org.osbot.rs07.input.mouse.BotMouseListener;
-import script.AIO;
 import tasks.Task;
 import util.PaintUtil;
 import util.RSUnits;
@@ -15,8 +14,6 @@
 import java.awt.*;
 import java.awt.event.MouseEvent;
 
-import static jdk.nashorn.internal.runtime.regexp.joni.Config.log;
-
 public class Paint implements Painter {
 
     private final Bot bot;
diff --git a/src/main/java/script/AIO.java b/src/main/java/script/AIO.java
@@ -13,7 +13,7 @@
 import tasks.Task;
 import tasks.TutorialIslandTask;
 import tasks.task_executor.TaskExecutor;
-import util.custom_method_provider.*;
+import util.custom_method_provider.CustomMethodProvider;
 import util.event.ConfigureClientEvent;
 
 import java.awt.*;
diff --git a/src/main/java/tasks/LoopTask.java b/src/main/java/tasks/LoopTask.java
@@ -6,7 +6,10 @@
 import util.Copyable;
 
 import java.time.LocalDateTime;
-import java.util.*;
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Queue;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
diff --git a/src/main/java/tasks/task_executor/TaskExecutor.java b/src/main/java/tasks/task_executor/TaskExecutor.java
@@ -7,7 +7,6 @@
 import util.executable.ExecutionFailedException;
 
 import java.util.*;
-import java.util.List;
 
 public final class TaskExecutor extends Executable {
 
diff --git a/src/main/java/util/custom_method_provider/ExtendedCamera.java b/src/main/java/util/custom_method_provider/ExtendedCamera.java
@@ -1,8 +1,6 @@
 package util.custom_method_provider;
 
-import org.osbot.CON;
 import org.osbot.rs07.api.Camera;
-import org.osbot.rs07.api.Settings;
 import org.osbot.rs07.api.model.Entity;
 import org.osbot.rs07.api.ui.RS2Widget;
 import org.osbot.rs07.api.ui.Tab;
diff --git a/src/main/java/util/custom_method_provider/ExtendedGroundItems.java b/src/main/java/util/custom_method_provider/ExtendedGroundItems.java
@@ -3,7 +3,6 @@
 import org.osbot.rs07.api.GroundItems;
 import org.osbot.rs07.api.model.GroundItem;
 import org.osbot.rs07.event.InteractionEvent;
-import org.osbot.rs07.script.MethodProvider;
 import util.Sleep;
 
 public class ExtendedGroundItems extends GroundItems {
diff --git a/src/main/java/util/custom_method_provider/ExtendedInventory.java b/src/main/java/util/custom_method_provider/ExtendedInventory.java
@@ -1,7 +1,6 @@
 package util.custom_method_provider;
 
 import org.osbot.rs07.api.Inventory;
-import org.osbot.rs07.script.MethodProvider;
 import util.Sleep;
 
 public class ExtendedInventory extends Inventory {
diff --git a/src/main/java/util/custom_method_provider/ExtendedNPCS.java b/src/main/java/util/custom_method_provider/ExtendedNPCS.java
@@ -2,7 +2,6 @@
 
 import org.osbot.rs07.api.NPCS;
 import org.osbot.rs07.api.model.NPC;
-import org.osbot.rs07.script.MethodProvider;
 
 public class ExtendedNPCS extends NPCS {
 
diff --git a/src/main/java/util/event/ConfigureClientEvent.java b/src/main/java/util/event/ConfigureClientEvent.java
@@ -1,8 +1,6 @@
 package util.event;
 
 import org.osbot.rs07.api.Display;
-import org.osbot.rs07.api.ui.RS2Widget;
-import org.osbot.rs07.api.ui.Tab;
 import util.custom_method_provider.ExtendedSettings;
 import util.executable.BlockingExecutable;
 
diff --git a/src/main/java/util/file_managers/ResourceManager.java b/src/main/java/util/file_managers/ResourceManager.java
@@ -4,6 +4,7 @@
 import java.net.URL;
 import java.nio.channels.Channels;
 import java.nio.channels.ReadableByteChannel;
+import java.nio.file.FileSystem;
 import java.nio.file.*;
 import java.util.Enumeration;
 import java.util.zip.ZipEntry;
