diff --git a/archive/autoclickillumine/src/main/java/net/runelite/client/plugins/autoclickillumine/AutoClickIllumine.java b/archive/autoclickillumine/src/main/java/net/runelite/client/plugins/autoclickillumine/AutoClickIllumine.java index 36a0b493..b11a5d3d 100644 --- a/archive/autoclickillumine/src/main/java/net/runelite/client/plugins/autoclickillumine/AutoClickIllumine.java +++ b/archive/autoclickillumine/src/main/java/net/runelite/client/plugins/autoclickillumine/AutoClickIllumine.java @@ -6,9 +6,7 @@ package net.runelite.client.plugins.autoclickillumine; import com.google.inject.Provides; - import java.util.ArrayList; -import java.util.Comparator; import java.util.List; import java.util.Random; import java.util.concurrent.ExecutorService; @@ -20,14 +18,14 @@ import lombok.Setter; import lombok.extern.slf4j.Slf4j; import net.runelite.api.Client; import net.runelite.api.GameState; +import net.runelite.api.NPC; import net.runelite.api.Point; import net.runelite.api.Skill; -import net.runelite.api.NPC; -import net.runelite.client.game.ItemManager; import net.runelite.api.widgets.Widget; import net.runelite.api.widgets.WidgetInfo; import net.runelite.api.widgets.WidgetItem; import net.runelite.client.config.ConfigManager; +import net.runelite.client.game.ItemManager; import net.runelite.client.input.KeyManager; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDependency; diff --git a/archive/blackjackillumine/blackjackillumine.gradle.kts b/archive/blackjackillumine/blackjackillumine.gradle.kts index aa5513ff..ad89dbc3 100644 --- a/archive/blackjackillumine/blackjackillumine.gradle.kts +++ b/archive/blackjackillumine/blackjackillumine.gradle.kts @@ -1,5 +1,3 @@ -import ProjectVersions.openosrsVersion; - /* * Copyright (c) 2019 Owain van Brakel * All rights reserved. diff --git a/archive/blackjackillumine/src/main/java/net/runelite/client/plugins/blackjackillumine/BlackjackIllumine.java b/archive/blackjackillumine/src/main/java/net/runelite/client/plugins/blackjackillumine/BlackjackIllumine.java index e09b416a..a868ffae 100644 --- a/archive/blackjackillumine/src/main/java/net/runelite/client/plugins/blackjackillumine/BlackjackIllumine.java +++ b/archive/blackjackillumine/src/main/java/net/runelite/client/plugins/blackjackillumine/BlackjackIllumine.java @@ -27,19 +27,23 @@ package net.runelite.client.plugins.blackjackillumine; import com.google.inject.Provides; +import java.util.ArrayList; +import java.util.List; +import java.util.Random; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.TimeUnit; import javax.inject.Inject; - import lombok.extern.slf4j.Slf4j; -import net.runelite.api.*; import net.runelite.api.Point; -import net.runelite.api.events.*; import net.runelite.api.util.Text; import net.runelite.api.widgets.WidgetItem; import net.runelite.client.Notifier; import net.runelite.client.config.ConfigManager; import net.runelite.client.eventbus.EventBus; import net.runelite.client.eventbus.Subscribe; -import net.runelite.client.game.NPCManager; +import net.runelite.client.input.KeyManager; import net.runelite.client.menus.AbstractComparableEntry; import net.runelite.client.menus.MenuManager; import net.runelite.client.plugins.Plugin; @@ -48,21 +52,9 @@ import net.runelite.client.plugins.PluginDescriptor; import net.runelite.client.plugins.PluginType; import net.runelite.client.plugins.botutils.BotUtils; import net.runelite.client.util.HotkeyListener; -import net.runelite.client.input.KeyManager; import org.apache.commons.lang3.RandomUtils; import org.pf4j.Extension; -import java.awt.*; -import java.util.ArrayList; -import java.util.List; -import java.util.Random; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.concurrent.ScheduledExecutorService; -import java.util.concurrent.TimeUnit; - -import static java.awt.event.InputEvent.BUTTON1_DOWN_MASK; - /** * Authors gazivodag longstreet */ diff --git a/archive/blastfurnacebot/src/main/java/net/runelite/client/plugins/blastfurnacebot/BlastFurnaceBotPlugin.java b/archive/blastfurnacebot/src/main/java/net/runelite/client/plugins/blastfurnacebot/BlastFurnaceBotPlugin.java index 1dd5b5b1..6f1f3d41 100644 --- a/archive/blastfurnacebot/src/main/java/net/runelite/client/plugins/blastfurnacebot/BlastFurnaceBotPlugin.java +++ b/archive/blastfurnacebot/src/main/java/net/runelite/client/plugins/blastfurnacebot/BlastFurnaceBotPlugin.java @@ -26,25 +26,19 @@ package net.runelite.client.plugins.blastfurnacebot; import com.google.inject.Provides; - import java.awt.event.KeyEvent; import java.time.Duration; import java.time.Instant; import java.util.ArrayList; import java.util.List; import javax.inject.Inject; - import lombok.AccessLevel; import lombok.Getter; import lombok.extern.slf4j.Slf4j; - -import net.runelite.api.*; - import static net.runelite.api.NullObjectID.NULL_29330; import static net.runelite.api.NullObjectID.NULL_9092; - +import static net.runelite.api.ObjectID.*; import net.runelite.api.coords.LocalPoint; -import net.runelite.api.events.*; import net.runelite.api.util.Text; import net.runelite.api.widgets.Widget; import net.runelite.api.widgets.WidgetID; @@ -58,10 +52,7 @@ import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDependency; import net.runelite.client.plugins.PluginDescriptor; import net.runelite.client.plugins.PluginType; - -import static net.runelite.api.ObjectID.*; import static net.runelite.client.plugins.blastfurnacebot.BlastFurnaceState.*; - import net.runelite.client.plugins.botutils.BotUtils; import net.runelite.client.ui.overlay.OverlayManager; import net.runelite.client.ui.overlay.infobox.InfoBoxManager; diff --git a/archive/blastfurnacebot/src/main/java/net/runelite/client/plugins/blastfurnacebot/BotOverlay.java b/archive/blastfurnacebot/src/main/java/net/runelite/client/plugins/blastfurnacebot/BotOverlay.java index 28bffde8..4ba302a9 100644 --- a/archive/blastfurnacebot/src/main/java/net/runelite/client/plugins/blastfurnacebot/BotOverlay.java +++ b/archive/blastfurnacebot/src/main/java/net/runelite/client/plugins/blastfurnacebot/BotOverlay.java @@ -3,8 +3,6 @@ package net.runelite.client.plugins.blastfurnacebot; import java.awt.Dimension; import java.awt.Graphics2D; import java.awt.Rectangle; -import java.awt.image.BufferedImage; -import java.text.NumberFormat; import java.time.Duration; import java.time.Instant; import javax.inject.Inject; diff --git a/archive/essencehighlighter/essencehighlighter.gradle.kts b/archive/essencehighlighter/essencehighlighter.gradle.kts index 2d3c964c..44a6d440 100644 --- a/archive/essencehighlighter/essencehighlighter.gradle.kts +++ b/archive/essencehighlighter/essencehighlighter.gradle.kts @@ -1,5 +1,3 @@ -import ProjectVersions.openosrsVersion - /* * Copyright (c) 2019 Owain van Brakel * All rights reserved. diff --git a/archive/essencehighlighter/src/main/java/net/runelite/client/plugins/essencehighlighter/DenseEssenceHighlighter.java b/archive/essencehighlighter/src/main/java/net/runelite/client/plugins/essencehighlighter/DenseEssenceHighlighter.java index f889f1b7..b6c305aa 100644 --- a/archive/essencehighlighter/src/main/java/net/runelite/client/plugins/essencehighlighter/DenseEssenceHighlighter.java +++ b/archive/essencehighlighter/src/main/java/net/runelite/client/plugins/essencehighlighter/DenseEssenceHighlighter.java @@ -26,28 +26,19 @@ package net.runelite.client.plugins.essencehighlighter; import javax.inject.Inject; - import lombok.extern.slf4j.Slf4j; -import net.runelite.api.*; -import net.runelite.api.Point; -import net.runelite.api.coords.LocalPoint; -import net.runelite.client.game.SkillIconManager; - -import net.runelite.client.ui.overlay.Overlay; -import net.runelite.client.ui.overlay.OverlayLayer; -import net.runelite.client.ui.overlay.OverlayPosition; -import net.runelite.client.ui.overlay.OverlayUtil; - import net.runelite.api.Client; import net.runelite.api.GameObject; import net.runelite.api.InventoryID; import net.runelite.api.Item; -import net.runelite.client.ui.overlay.components.ImageComponent; - - -import java.awt.*; - import static net.runelite.api.ItemID.*; +import net.runelite.api.Point; +import net.runelite.api.coords.LocalPoint; +import net.runelite.client.game.SkillIconManager; +import net.runelite.client.ui.overlay.Overlay; +import net.runelite.client.ui.overlay.OverlayLayer; +import net.runelite.client.ui.overlay.OverlayPosition; +import net.runelite.client.ui.overlay.OverlayUtil; @Slf4j diff --git a/archive/essencehighlighter/src/main/java/net/runelite/client/plugins/essencehighlighter/DenseEssencePlugin.java b/archive/essencehighlighter/src/main/java/net/runelite/client/plugins/essencehighlighter/DenseEssencePlugin.java index b6871f42..a05c8027 100644 --- a/archive/essencehighlighter/src/main/java/net/runelite/client/plugins/essencehighlighter/DenseEssencePlugin.java +++ b/archive/essencehighlighter/src/main/java/net/runelite/client/plugins/essencehighlighter/DenseEssencePlugin.java @@ -26,7 +26,6 @@ package net.runelite.client.plugins.essencehighlighter; import com.google.inject.Provides; import java.util.HashSet; - import java.util.Set; import javax.inject.Inject; import lombok.AccessLevel; @@ -37,9 +36,8 @@ import net.runelite.api.DecorativeObject; import net.runelite.api.GameObject; import net.runelite.api.GameState; import net.runelite.api.NPC; +import static net.runelite.api.NullItemID.NULL_8975; import net.runelite.api.NullObjectID; -import net.runelite.api.Varbits; -import net.runelite.client.events.ConfigChanged; import net.runelite.api.events.GameObjectDespawned; import net.runelite.api.events.GameObjectSpawned; import net.runelite.api.events.GameStateChanged; @@ -48,12 +46,11 @@ import net.runelite.api.events.VarbitChanged; import net.runelite.client.Notifier; import net.runelite.client.config.ConfigManager; import net.runelite.client.eventbus.Subscribe; +import net.runelite.client.events.ConfigChanged; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; import net.runelite.client.plugins.PluginType; import net.runelite.client.ui.overlay.OverlayManager; - -import static net.runelite.api.NullItemID.NULL_8975; import org.pf4j.Extension; @Extension diff --git a/archive/essencehighlighter/src/main/java/net/runelite/client/plugins/essencehighlighter/EssenceConfig.java b/archive/essencehighlighter/src/main/java/net/runelite/client/plugins/essencehighlighter/EssenceConfig.java index 26d4fb96..d09e34bc 100644 --- a/archive/essencehighlighter/src/main/java/net/runelite/client/plugins/essencehighlighter/EssenceConfig.java +++ b/archive/essencehighlighter/src/main/java/net/runelite/client/plugins/essencehighlighter/EssenceConfig.java @@ -29,9 +29,6 @@ import net.runelite.client.config.Config; import net.runelite.client.config.ConfigGroup; import net.runelite.client.config.ConfigItem; -import javax.swing.*; -import java.awt.*; - @ConfigGroup("EssenceHighlighter") public interface EssenceConfig extends Config { diff --git a/archive/motherlodebot/src/main/java/net/runelite/client/plugins/motherlodebot/MotherlodeBotConfiguration.java b/archive/motherlodebot/src/main/java/net/runelite/client/plugins/motherlodebot/MotherlodeBotConfiguration.java index 9fc1d73b..6cacf28a 100644 --- a/archive/motherlodebot/src/main/java/net/runelite/client/plugins/motherlodebot/MotherlodeBotConfiguration.java +++ b/archive/motherlodebot/src/main/java/net/runelite/client/plugins/motherlodebot/MotherlodeBotConfiguration.java @@ -25,13 +25,8 @@ */ package net.runelite.client.plugins.motherlodebot; -import javax.swing.JButton; -import javax.swing.JPanel; import net.runelite.client.config.Config; import net.runelite.client.config.ConfigGroup; -import net.runelite.client.config.ConfigItem; -import net.runelite.client.config.Range; -import net.runelite.client.config.Units; @ConfigGroup("MotherlodeBot") public interface MotherlodeBotConfiguration extends Config diff --git a/archive/motherlodebot/src/main/java/net/runelite/client/plugins/motherlodebot/MotherlodeBotPlugin.java b/archive/motherlodebot/src/main/java/net/runelite/client/plugins/motherlodebot/MotherlodeBotPlugin.java index 5d444e83..d7f9a3e4 100644 --- a/archive/motherlodebot/src/main/java/net/runelite/client/plugins/motherlodebot/MotherlodeBotPlugin.java +++ b/archive/motherlodebot/src/main/java/net/runelite/client/plugins/motherlodebot/MotherlodeBotPlugin.java @@ -26,9 +26,12 @@ package net.runelite.client.plugins.motherlodebot; import com.google.inject.Provides; +import java.util.concurrent.ArrayBlockingQueue; +import java.util.concurrent.BlockingQueue; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.concurrent.TimeUnit; import javax.inject.Inject; import lombok.extern.slf4j.Slf4j; -import net.runelite.api.*; import static net.runelite.api.ObjectID.ORE_VEIN_26661; import static net.runelite.api.ObjectID.ORE_VEIN_26662; import static net.runelite.api.ObjectID.ORE_VEIN_26663; @@ -38,27 +41,17 @@ import static net.runelite.api.ObjectID.ROCKFALL_26680; import net.runelite.api.coords.LocalPoint; import net.runelite.api.coords.WorldArea; import net.runelite.api.coords.WorldPoint; -import net.runelite.api.events.*; import net.runelite.api.queries.GameObjectQuery; import net.runelite.api.queries.WallObjectQuery; -import net.runelite.api.widgets.Widget; -import net.runelite.api.widgets.WidgetInfo; -import net.runelite.api.widgets.WidgetItem; import net.runelite.client.config.ConfigManager; import net.runelite.client.eventbus.Subscribe; -import net.runelite.client.events.ConfigChanged; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDependency; import net.runelite.client.plugins.PluginDescriptor; import net.runelite.client.plugins.PluginType; import net.runelite.client.plugins.botutils.BotUtils; -import org.pf4j.Extension; -import java.util.*; -import java.util.concurrent.ArrayBlockingQueue; -import java.util.concurrent.BlockingQueue; -import java.util.concurrent.ThreadPoolExecutor; -import java.util.concurrent.TimeUnit; import static net.runelite.client.plugins.motherlodebot.MotherlodeBotState.*; +import org.pf4j.Extension; @Extension diff --git a/archive/powerskiller/src/main/java/net/runelite/client/plugins/powerskiller/PowerSkillerConfiguration.java b/archive/powerskiller/src/main/java/net/runelite/client/plugins/powerskiller/PowerSkillerConfiguration.java index b6d43f65..a3e61759 100644 --- a/archive/powerskiller/src/main/java/net/runelite/client/plugins/powerskiller/PowerSkillerConfiguration.java +++ b/archive/powerskiller/src/main/java/net/runelite/client/plugins/powerskiller/PowerSkillerConfiguration.java @@ -25,13 +25,9 @@ */ package net.runelite.client.plugins.powerskiller; -import javax.swing.JButton; -import javax.swing.JPanel; import net.runelite.client.config.Config; import net.runelite.client.config.ConfigGroup; import net.runelite.client.config.ConfigItem; -import net.runelite.client.config.Range; -import net.runelite.client.config.Units; @ConfigGroup("PowerSkiller") public interface PowerSkillerConfiguration extends Config diff --git a/archive/powerskiller/src/main/java/net/runelite/client/plugins/powerskiller/PowerSkillerPlugin.java b/archive/powerskiller/src/main/java/net/runelite/client/plugins/powerskiller/PowerSkillerPlugin.java index ba2ac491..3bca7098 100644 --- a/archive/powerskiller/src/main/java/net/runelite/client/plugins/powerskiller/PowerSkillerPlugin.java +++ b/archive/powerskiller/src/main/java/net/runelite/client/plugins/powerskiller/PowerSkillerPlugin.java @@ -26,12 +26,13 @@ package net.runelite.client.plugins.powerskiller; import com.google.inject.Provides; +import java.util.concurrent.ArrayBlockingQueue; +import java.util.concurrent.BlockingQueue; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.concurrent.TimeUnit; import javax.inject.Inject; import lombok.extern.slf4j.Slf4j; -import net.runelite.api.*; -import net.runelite.api.coords.LocalPoint; import net.runelite.api.coords.WorldPoint; -import net.runelite.api.events.*; import net.runelite.api.widgets.Widget; import net.runelite.api.widgets.WidgetInfo; import net.runelite.api.widgets.WidgetItem; @@ -43,13 +44,8 @@ import net.runelite.client.plugins.PluginDependency; import net.runelite.client.plugins.PluginDescriptor; import net.runelite.client.plugins.PluginType; import net.runelite.client.plugins.botutils.BotUtils; -import org.pf4j.Extension; -import java.util.*; -import java.util.concurrent.ArrayBlockingQueue; -import java.util.concurrent.BlockingQueue; -import java.util.concurrent.ThreadPoolExecutor; -import java.util.concurrent.TimeUnit; import static net.runelite.client.plugins.powerskiller.PowerSkillerState.*; +import org.pf4j.Extension; @Extension diff --git a/archive/randomhandler/src/main/java/net/runelite/client/plugins/randomhandler/RandomHandlerPlugin.java b/archive/randomhandler/src/main/java/net/runelite/client/plugins/randomhandler/RandomHandlerPlugin.java index b7408c4c..ccdcb1e7 100644 --- a/archive/randomhandler/src/main/java/net/runelite/client/plugins/randomhandler/RandomHandlerPlugin.java +++ b/archive/randomhandler/src/main/java/net/runelite/client/plugins/randomhandler/RandomHandlerPlugin.java @@ -30,7 +30,6 @@ import java.util.Arrays; import java.util.Set; import javax.inject.Inject; import lombok.extern.slf4j.Slf4j; -import net.runelite.api.*; import net.runelite.api.events.InteractingChanged; import net.runelite.api.events.MenuEntryAdded; import net.runelite.api.events.MenuOptionClicked; diff --git a/archive/test/src/main/java/net/runelite/client/plugins/test/TestPlugin.java b/archive/test/src/main/java/net/runelite/client/plugins/test/TestPlugin.java index aa1a3a75..50cb074f 100644 --- a/archive/test/src/main/java/net/runelite/client/plugins/test/TestPlugin.java +++ b/archive/test/src/main/java/net/runelite/client/plugins/test/TestPlugin.java @@ -26,12 +26,8 @@ package net.runelite.client.plugins.test; import com.google.inject.Provides; - -import io.reactivex.rxjava3.schedulers.Schedulers; -import java.awt.event.KeyEvent; -import static java.awt.event.KeyEvent.VK_ENTER; -import java.time.Instant; -import java.util.Collection; +import java.util.ArrayList; +import java.util.List; import java.util.Random; import java.util.Set; import java.util.concurrent.ArrayBlockingQueue; @@ -40,56 +36,28 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import javax.inject.Inject; import lombok.extern.slf4j.Slf4j; -import net.runelite.api.*; import static net.runelite.api.ObjectID.*; -import static net.runelite.api.Varbits.BLAST_FURNACE_COFFER; - import net.runelite.api.coords.LocalPoint; import net.runelite.api.coords.WorldArea; import net.runelite.api.coords.WorldPoint; -import net.runelite.api.events.*; - -import net.runelite.api.geometry.Shapes; -import net.runelite.api.queries.ActorQuery; -import net.runelite.api.queries.BankItemQuery; -import net.runelite.api.queries.GameObjectQuery; -import net.runelite.api.queries.InventoryItemQuery; -import net.runelite.api.queries.InventoryWidgetItemQuery; -import net.runelite.api.queries.PlayerQuery; -import net.runelite.api.queries.TileQuery; -import net.runelite.api.queries.WidgetItemQuery; -import net.runelite.api.util.Text; import net.runelite.api.widgets.Widget; import net.runelite.api.widgets.WidgetInfo; - -import net.runelite.api.queries.NPCQuery; - -import net.runelite.api.widgets.WidgetItem; import net.runelite.client.config.ConfigManager; import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.ConfigChanged; import net.runelite.client.game.ItemManager; -import net.runelite.client.menus.InventoryComparableEntry; -import net.runelite.client.menus.MenuManager; -import net.runelite.client.menus.WidgetMenuOption; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDependency; import net.runelite.client.plugins.PluginDescriptor; import net.runelite.client.plugins.PluginManager; import net.runelite.client.plugins.PluginType; import net.runelite.client.plugins.botutils.BotUtils; +import net.runelite.client.ui.overlay.infobox.InfoBoxManager; +import org.pf4j.Extension; + /*import net.runelite.client.rsb.methods.Tiles; import net.runelite.client.rsb.wrappers.RSArea; import net.runelite.client.rsb.wrappers.RSTile;*/ -import net.runelite.client.ui.overlay.infobox.InfoBoxManager; -import net.runelite.client.util.QuantityFormatter; -import net.runelite.http.api.ge.GrandExchangeClient; -import net.runelite.http.api.osbuddy.OSBGrandExchangeClient; -import net.runelite.http.api.osbuddy.OSBGrandExchangeResult; -import org.pf4j.Extension; - -import java.util.ArrayList; -import java.util.List; /*import net.runelite.client.rsb.methods.*; import net.runelite.client.rsb.botLauncher.*;*/ diff --git a/archive/test/src/main/java/net/runelite/client/plugins/test/TestPluginConfiguration.java b/archive/test/src/main/java/net/runelite/client/plugins/test/TestPluginConfiguration.java index 8aa489ff..83a8cc79 100644 --- a/archive/test/src/main/java/net/runelite/client/plugins/test/TestPluginConfiguration.java +++ b/archive/test/src/main/java/net/runelite/client/plugins/test/TestPluginConfiguration.java @@ -26,7 +26,6 @@ package net.runelite.client.plugins.test; import java.util.function.Consumer; -import net.runelite.client.config.Alpha; import net.runelite.client.config.Config; import net.runelite.client.config.ConfigGroup; import net.runelite.client.config.ConfigItem; diff --git a/botutils/botutils.gradle.kts b/botutils/botutils.gradle.kts index d08896f2..5435aaaa 100644 --- a/botutils/botutils.gradle.kts +++ b/botutils/botutils.gradle.kts @@ -1,5 +1,3 @@ -import ProjectVersions.openosrsVersion - /* * Copyright (c) 2019 Owain van Brakel * All rights reserved. @@ -25,7 +23,7 @@ import ProjectVersions.openosrsVersion * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -version = "4.8.2" +version = "4.8.3" project.extra["PluginName"] = "BotUtils" project.extra["PluginDescription"] = "Illumine - Utils required for plugins to function with added automation" diff --git a/botutils/src/main/java/net/runelite/client/plugins/botutils/BotUtils.java b/botutils/src/main/java/net/runelite/client/plugins/botutils/BotUtils.java index 605283a0..0689b2df 100644 --- a/botutils/src/main/java/net/runelite/client/plugins/botutils/BotUtils.java +++ b/botutils/src/main/java/net/runelite/client/plugins/botutils/BotUtils.java @@ -6,12 +6,13 @@ package net.runelite.client.plugins.botutils; import com.google.gson.Gson; +import com.google.inject.Provides; import java.awt.Dimension; import java.awt.Rectangle; import java.awt.event.KeyEvent; +import static java.awt.event.KeyEvent.VK_ENTER; import java.awt.event.MouseEvent; import java.io.IOException; -import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.util.ArrayList; import java.util.Arrays; @@ -28,7 +29,6 @@ import java.util.stream.Collectors; import javax.annotation.Nullable; import javax.inject.Inject; import javax.inject.Singleton; -import com.google.inject.Provides; import lombok.extern.slf4j.Slf4j; import net.runelite.api.ChatMessageType; import net.runelite.api.Client; @@ -77,10 +77,7 @@ import net.runelite.client.game.ItemManager; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; import net.runelite.client.plugins.PluginType; - -import static java.awt.event.KeyEvent.VK_ENTER; import static net.runelite.client.plugins.botutils.Banks.ALL_BANKS; - import net.runelite.http.api.ge.GrandExchangeClient; import net.runelite.http.api.osbuddy.OSBGrandExchangeClient; import net.runelite.http.api.osbuddy.OSBGrandExchangeResult; @@ -913,7 +910,7 @@ public class BotUtils extends Plugin mouseEvent(503, p); } - public int getRandomIntBetweenRange(int min, int max) + public static int getRandomIntBetweenRange(int min, int max) { //return (int) ((Math.random() * ((max - min) + 1)) + min); //This does not allow return of negative values return ThreadLocalRandom.current().nextInt(min, max + 1); diff --git a/botutils/src/main/java/net/runelite/client/plugins/botutils/MouseUtils.java b/botutils/src/main/java/net/runelite/client/plugins/botutils/MouseUtils.java new file mode 100644 index 00000000..c385ef17 --- /dev/null +++ b/botutils/src/main/java/net/runelite/client/plugins/botutils/MouseUtils.java @@ -0,0 +1,123 @@ +package net.runelite.client.plugins.botutils; + +import java.awt.Dimension; +import java.awt.Rectangle; +import java.awt.event.MouseEvent; +import javax.inject.Inject; +import javax.inject.Singleton; +import lombok.extern.slf4j.Slf4j; +import net.runelite.api.Client; +import net.runelite.api.Point; +import static net.runelite.client.plugins.botutils.BotUtils.getRandomIntBetweenRange; +import org.jetbrains.annotations.NotNull; + +@Slf4j +@Singleton +public class MouseUtils +{ + + @Inject + private Client client; + + @Inject + private BotUtilsConfig config; + + + private void mouseEvent(int id, @NotNull Point point) + { + MouseEvent e = new MouseEvent( + client.getCanvas(), id, + System.currentTimeMillis(), + 0, point.getX(), point.getY(), + 1, false, 1 + ); + + client.getCanvas().dispatchEvent(e); + } + + /** + * This method must be called on a new + * thread, if you try to call it on + * {@link net.runelite.client.callback.ClientThread} + * it will result in a crash/desynced thread. + */ + public void click(Client client, Rectangle rectangle) + { + assert !client.isClientThread(); + + Point point = getClickPoint(rectangle); + click(point); + } + + public void click(Point p) + { + assert !client.isClientThread(); + + if (client.isStretchedEnabled()) + { + final Dimension stretched = client.getStretchedDimensions(); + final Dimension real = client.getRealDimensions(); + final double width = (stretched.width / real.getWidth()); + final double height = (stretched.height / real.getHeight()); + final Point point = new Point((int) (p.getX() * width), (int) (p.getY() * height)); + mouseEvent(501, point); + mouseEvent(502, point); + mouseEvent(500, point); + return; + } + mouseEvent(501, p); + mouseEvent(502, p); + mouseEvent(500, p); + } + + public void moveClick(Rectangle rectangle) + { + assert !client.isClientThread(); + + Point point = getClickPoint(rectangle); + moveClick(point); + } + + public void moveClick(Point p) + { + assert !client.isClientThread(); + + if (client.isStretchedEnabled()) + { + final Dimension stretched = client.getStretchedDimensions(); + final Dimension real = client.getRealDimensions(); + final double width = (stretched.width / real.getWidth()); + final double height = (stretched.height / real.getHeight()); + final Point point = new Point((int) (p.getX() * width), (int) (p.getY() * height)); + mouseEvent(504, point); + mouseEvent(505, point); + mouseEvent(503, point); + mouseEvent(501, point); + mouseEvent(502, point); + mouseEvent(500, point); + return; + } + mouseEvent(504, p); + mouseEvent(505, p); + mouseEvent(503, p); + mouseEvent(501, p); + mouseEvent(502, p); + mouseEvent(500, p); + } + + public Point getClickPoint(@NotNull Rectangle rect) + { + final int x = (int) (rect.getX() + getRandomIntBetweenRange((int) rect.getWidth() / 6 * -1, (int) rect.getWidth() / 6) + rect.getWidth() / 2); + final int y = (int) (rect.getY() + getRandomIntBetweenRange((int) rect.getHeight() / 6 * -1, (int) rect.getHeight() / 6) + rect.getHeight() / 2); + + return new Point(x, y); + } + + public void moveMouseEvent(Rectangle rectangle) + { + assert !client.isClientThread(); + + Point point = getClickPoint(rectangle); + moveClick(point); + } +} diff --git a/buildSrc/src/main/kotlin/BootstrapTask.kt b/buildSrc/src/main/kotlin/BootstrapTask.kt index 2ef7986c..bf23a4cd 100644 --- a/buildSrc/src/main/kotlin/BootstrapTask.kt +++ b/buildSrc/src/main/kotlin/BootstrapTask.kt @@ -1,8 +1,4 @@ import com.savvasdalkitsis.jsonmerger.JsonMerger -import okhttp3.Call -import okhttp3.Callback -import okhttp3.OkHttpClient -import okhttp3.Request import org.gradle.api.DefaultTask import org.gradle.api.tasks.TaskAction import org.gradle.kotlin.dsl.extra diff --git a/magiccaster/magiccaster.gradle.kts b/magiccaster/magiccaster.gradle.kts index 01048047..da3a3ef4 100644 --- a/magiccaster/magiccaster.gradle.kts +++ b/magiccaster/magiccaster.gradle.kts @@ -23,7 +23,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -version = "2.8.0" +version = "2.8.1" project.extra["PluginName"] = "Magic Caster" project.extra["PluginDescription"] = "Illumine automated magic caster" diff --git a/magiccaster/src/main/java/net/runelite/client/plugins/magiccaster/MagicCasterPlugin.java b/magiccaster/src/main/java/net/runelite/client/plugins/magiccaster/MagicCasterPlugin.java index 34946d8a..0c7bc54b 100644 --- a/magiccaster/src/main/java/net/runelite/client/plugins/magiccaster/MagicCasterPlugin.java +++ b/magiccaster/src/main/java/net/runelite/client/plugins/magiccaster/MagicCasterPlugin.java @@ -30,12 +30,12 @@ import com.owain.chinbreakhandler.ChinBreakHandler; import java.time.Instant; import javax.inject.Inject; import lombok.extern.slf4j.Slf4j; +import net.runelite.api.AnimationID; +import net.runelite.api.ChatMessageType; import net.runelite.api.Client; +import net.runelite.api.GameState; import net.runelite.api.MenuEntry; import net.runelite.api.MenuOpcode; -import net.runelite.api.GameState; -import net.runelite.api.ChatMessageType; -import net.runelite.api.AnimationID; import net.runelite.api.NPC; import net.runelite.api.Player; import net.runelite.api.coords.LocalPoint; @@ -45,7 +45,6 @@ import net.runelite.api.events.ConfigButtonClicked; import net.runelite.api.events.GameStateChanged; import net.runelite.api.events.GameTick; import net.runelite.api.queries.NPCQuery; -import net.runelite.api.widgets.Widget; import net.runelite.api.widgets.WidgetInfo; import net.runelite.api.widgets.WidgetItem; import net.runelite.client.config.ConfigManager; @@ -58,9 +57,15 @@ import net.runelite.client.plugins.PluginManager; import net.runelite.client.plugins.PluginType; import net.runelite.client.plugins.botutils.BotUtils; import net.runelite.client.plugins.botutils.ContainerUtils; +import static net.runelite.client.plugins.magiccaster.MagicCasterState.FIND_ITEM; +import static net.runelite.client.plugins.magiccaster.MagicCasterState.FIND_NPC; +import static net.runelite.client.plugins.magiccaster.MagicCasterState.HANDLE_BREAK; +import static net.runelite.client.plugins.magiccaster.MagicCasterState.IDLING; +import static net.runelite.client.plugins.magiccaster.MagicCasterState.ITEM_NOT_FOUND; +import static net.runelite.client.plugins.magiccaster.MagicCasterState.MOVING; +import static net.runelite.client.plugins.magiccaster.MagicCasterState.NPC_NOT_FOUND; import net.runelite.client.ui.overlay.OverlayManager; import org.pf4j.Extension; -import static net.runelite.client.plugins.magiccaster.MagicCasterState.*; @Extension diff --git a/menudebugger/menudebugger.gradle.kts b/menudebugger/menudebugger.gradle.kts index e7f22ec6..835c41b5 100644 --- a/menudebugger/menudebugger.gradle.kts +++ b/menudebugger/menudebugger.gradle.kts @@ -23,7 +23,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -version = "0.0.3" +version = "0.0.4" project.extra["PluginName"] = "Menu Debugger Plugin" project.extra["PluginDescription"] = "Illumine - Menu Debugger plugin" diff --git a/menudebugger/src/main/java/net/runelite/client/plugins/menudebugger/MenuDebuggerConfig.java b/menudebugger/src/main/java/net/runelite/client/plugins/menudebugger/MenuDebuggerConfig.java index a17406d1..e34e6bf4 100644 --- a/menudebugger/src/main/java/net/runelite/client/plugins/menudebugger/MenuDebuggerConfig.java +++ b/menudebugger/src/main/java/net/runelite/client/plugins/menudebugger/MenuDebuggerConfig.java @@ -25,16 +25,12 @@ */ package net.runelite.client.plugins.menudebugger; -import java.time.Instant; -import java.util.function.Consumer; import net.runelite.client.config.Button; import net.runelite.client.config.Config; import net.runelite.client.config.ConfigGroup; import net.runelite.client.config.ConfigItem; import net.runelite.client.config.ConfigSection; -import net.runelite.client.config.ConfigTitleSection; import net.runelite.client.config.Range; -import net.runelite.client.config.Title; @ConfigGroup("MenuDebugger") public interface MenuDebuggerConfig extends Config diff --git a/menudebugger/src/main/java/net/runelite/client/plugins/menudebugger/MenuDebuggerPlugin.java b/menudebugger/src/main/java/net/runelite/client/plugins/menudebugger/MenuDebuggerPlugin.java index 7be55345..7b76ccc6 100644 --- a/menudebugger/src/main/java/net/runelite/client/plugins/menudebugger/MenuDebuggerPlugin.java +++ b/menudebugger/src/main/java/net/runelite/client/plugins/menudebugger/MenuDebuggerPlugin.java @@ -26,23 +26,21 @@ package net.runelite.client.plugins.menudebugger; import com.google.inject.Provides; - import java.time.Instant; -import java.util.*; -import java.util.concurrent.*; +import java.util.ArrayList; +import java.util.List; +import java.util.concurrent.ExecutorService; import javax.inject.Inject; - import lombok.extern.slf4j.Slf4j; import net.runelite.api.Client; import net.runelite.api.GameObject; import net.runelite.api.GameState; import net.runelite.api.Item; +import net.runelite.api.MenuEntry; import net.runelite.api.Player; -import net.runelite.api.Point; import net.runelite.api.coords.LocalPoint; import net.runelite.api.events.ConfigButtonClicked; import net.runelite.api.events.GameTick; -import net.runelite.api.MenuEntry; import net.runelite.api.events.MenuOptionClicked; import net.runelite.client.config.ConfigManager; import net.runelite.client.eventbus.Subscribe; diff --git a/powerfighter/powerfighter.gradle.kts b/powerfighter/powerfighter.gradle.kts index ed7378b8..59f40c84 100644 --- a/powerfighter/powerfighter.gradle.kts +++ b/powerfighter/powerfighter.gradle.kts @@ -23,7 +23,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -version = "2.0.0" +version = "2.0.1" project.extra["PluginName"] = "Powerfighter Plugin" project.extra["PluginDescription"] = "Illumine - Powerfighter plugin" diff --git a/powerfighter/src/main/java/net/runelite/client/plugins/powerfighter/PowerFighterConfig.java b/powerfighter/src/main/java/net/runelite/client/plugins/powerfighter/PowerFighterConfig.java index 65153c60..f47348b0 100644 --- a/powerfighter/src/main/java/net/runelite/client/plugins/powerfighter/PowerFighterConfig.java +++ b/powerfighter/src/main/java/net/runelite/client/plugins/powerfighter/PowerFighterConfig.java @@ -25,7 +25,14 @@ */ package net.runelite.client.plugins.powerfighter; -import net.runelite.client.config.*; +import net.runelite.client.config.Button; +import net.runelite.client.config.Config; +import net.runelite.client.config.ConfigGroup; +import net.runelite.client.config.ConfigItem; +import net.runelite.client.config.ConfigSection; +import net.runelite.client.config.ConfigTitleSection; +import net.runelite.client.config.Range; +import net.runelite.client.config.Title; @ConfigGroup("PowerFighter") public interface PowerFighterConfig extends Config diff --git a/powerfighter/src/main/java/net/runelite/client/plugins/powerfighter/PowerFighterPlugin.java b/powerfighter/src/main/java/net/runelite/client/plugins/powerfighter/PowerFighterPlugin.java index 830f8597..e99a1c74 100644 --- a/powerfighter/src/main/java/net/runelite/client/plugins/powerfighter/PowerFighterPlugin.java +++ b/powerfighter/src/main/java/net/runelite/client/plugins/powerfighter/PowerFighterPlugin.java @@ -39,10 +39,30 @@ import java.util.stream.Collectors; import java.util.stream.Stream; import javax.inject.Inject; import lombok.extern.slf4j.Slf4j; -import net.runelite.api.*; +import net.runelite.api.ChatMessageType; +import net.runelite.api.Client; +import net.runelite.api.GameState; +import net.runelite.api.InventoryID; +import net.runelite.api.Item; +import net.runelite.api.ItemContainer; +import net.runelite.api.ItemDefinition; +import net.runelite.api.ItemID; +import net.runelite.api.MenuEntry; +import net.runelite.api.MenuOpcode; +import net.runelite.api.NPC; +import net.runelite.api.Player; +import net.runelite.api.Skill; +import net.runelite.api.TileItem; import net.runelite.api.coords.LocalPoint; import net.runelite.api.coords.WorldPoint; -import net.runelite.api.events.*; +import net.runelite.api.events.ActorDeath; +import net.runelite.api.events.ChatMessage; +import net.runelite.api.events.ConfigButtonClicked; +import net.runelite.api.events.GameStateChanged; +import net.runelite.api.events.GameTick; +import net.runelite.api.events.ItemContainerChanged; +import net.runelite.api.events.ItemDespawned; +import net.runelite.api.events.ItemSpawned; import net.runelite.api.widgets.WidgetInfo; import net.runelite.api.widgets.WidgetItem; import net.runelite.client.callback.ClientThread; @@ -53,7 +73,6 @@ import net.runelite.client.plugins.PluginDependency; import net.runelite.client.plugins.PluginDescriptor; import net.runelite.client.plugins.PluginType; import net.runelite.client.plugins.botutils.BotUtils; - import net.runelite.client.ui.overlay.OverlayManager; import net.runelite.http.api.osbuddy.OSBGrandExchangeResult; import org.pf4j.Extension; diff --git a/powerskiller/powerskiller.gradle.kts b/powerskiller/powerskiller.gradle.kts index 05a3e81d..32493360 100644 --- a/powerskiller/powerskiller.gradle.kts +++ b/powerskiller/powerskiller.gradle.kts @@ -23,7 +23,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -version = "4.8.0" +version = "4.8.1" project.extra["PluginName"] = "Power Skiller" project.extra["PluginDescription"] = "Illumine auto power skiller plugin" diff --git a/powerskiller/src/main/java/net/runelite/client/plugins/powerskiller/PowerSkillerConfiguration.java b/powerskiller/src/main/java/net/runelite/client/plugins/powerskiller/PowerSkillerConfiguration.java index 05ea58f6..9dc29930 100644 --- a/powerskiller/src/main/java/net/runelite/client/plugins/powerskiller/PowerSkillerConfiguration.java +++ b/powerskiller/src/main/java/net/runelite/client/plugins/powerskiller/PowerSkillerConfiguration.java @@ -25,8 +25,6 @@ */ package net.runelite.client.plugins.powerskiller; -import java.time.Instant; -import java.util.function.Consumer; import net.runelite.client.config.Button; import net.runelite.client.config.Config; import net.runelite.client.config.ConfigGroup; diff --git a/powerskiller/src/main/java/net/runelite/client/plugins/powerskiller/PowerSkillerOverlay.java b/powerskiller/src/main/java/net/runelite/client/plugins/powerskiller/PowerSkillerOverlay.java index 3ea5c22c..178befc5 100644 --- a/powerskiller/src/main/java/net/runelite/client/plugins/powerskiller/PowerSkillerOverlay.java +++ b/powerskiller/src/main/java/net/runelite/client/plugins/powerskiller/PowerSkillerOverlay.java @@ -9,8 +9,8 @@ import javax.inject.Inject; import javax.inject.Singleton; import lombok.extern.slf4j.Slf4j; import net.runelite.api.Client; -import net.runelite.api.Perspective; import static net.runelite.api.MenuOpcode.RUNELITE_OVERLAY_CONFIG; +import net.runelite.api.Perspective; import net.runelite.api.coords.LocalPoint; import static net.runelite.client.ui.overlay.OverlayManager.OPTION_CONFIGURE; import net.runelite.client.ui.overlay.OverlayMenuEntry; diff --git a/powerskiller/src/main/java/net/runelite/client/plugins/powerskiller/PowerSkillerPlugin.java b/powerskiller/src/main/java/net/runelite/client/plugins/powerskiller/PowerSkillerPlugin.java index a016123f..e7ca348f 100644 --- a/powerskiller/src/main/java/net/runelite/client/plugins/powerskiller/PowerSkillerPlugin.java +++ b/powerskiller/src/main/java/net/runelite/client/plugins/powerskiller/PowerSkillerPlugin.java @@ -31,30 +31,29 @@ import java.awt.Rectangle; import java.time.Instant; import java.util.Collection; import java.util.HashSet; -import java.util.List; import java.util.Set; import javax.inject.Inject; import lombok.extern.slf4j.Slf4j; import net.runelite.api.Client; import net.runelite.api.GameObject; +import net.runelite.api.GameState; import net.runelite.api.MenuEntry; +import net.runelite.api.MenuOpcode; import net.runelite.api.NPC; import net.runelite.api.NullObjectID; import net.runelite.api.ObjectID; import net.runelite.api.Player; -import net.runelite.api.GameState; -import net.runelite.api.MenuOpcode; import net.runelite.api.WallObject; import net.runelite.api.coords.LocalPoint; import net.runelite.api.coords.WorldArea; import net.runelite.api.coords.WorldPoint; +import net.runelite.api.events.ConfigButtonClicked; +import net.runelite.api.events.GameObjectDespawned; import net.runelite.api.events.GameStateChanged; import net.runelite.api.events.GameTick; import net.runelite.api.events.ItemContainerChanged; -import net.runelite.api.events.GameObjectDespawned; -import net.runelite.api.events.ConfigButtonClicked; -import net.runelite.api.events.NpcDefinitionChanged; import net.runelite.api.events.MenuOptionClicked; +import net.runelite.api.events.NpcDefinitionChanged; import net.runelite.api.widgets.Widget; import net.runelite.client.config.ConfigManager; import net.runelite.client.eventbus.Subscribe; @@ -65,9 +64,9 @@ import net.runelite.client.plugins.PluginDescriptor; import net.runelite.client.plugins.PluginManager; import net.runelite.client.plugins.PluginType; import net.runelite.client.plugins.botutils.BotUtils; +import static net.runelite.client.plugins.powerskiller.PowerSkillerState.*; import net.runelite.client.ui.overlay.OverlayManager; import org.pf4j.Extension; -import static net.runelite.client.plugins.powerskiller.PowerSkillerState.*; @Extension diff --git a/quickeater/quickeater.gradle.kts b/quickeater/quickeater.gradle.kts index e3f68fd4..4696f83d 100644 --- a/quickeater/quickeater.gradle.kts +++ b/quickeater/quickeater.gradle.kts @@ -23,7 +23,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -version = "3.2.0" +version = "3.3.1" project.extra["PluginName"] = "Quick Eater" project.extra["PluginDescription"] = "Illumine - auto eat food, consume potions and equip items" diff --git a/quickeater/src/main/java/net/runelite/client/plugins/quickeater/QuickEaterPlugin.java b/quickeater/src/main/java/net/runelite/client/plugins/quickeater/QuickEaterPlugin.java index a95bdedc..b44abf19 100644 --- a/quickeater/src/main/java/net/runelite/client/plugins/quickeater/QuickEaterPlugin.java +++ b/quickeater/src/main/java/net/runelite/client/plugins/quickeater/QuickEaterPlugin.java @@ -40,7 +40,6 @@ import net.runelite.api.VarPlayer; import net.runelite.api.events.ChatMessage; import net.runelite.api.events.GameStateChanged; import net.runelite.api.events.GameTick; -import net.runelite.api.events.HitsplatApplied; import net.runelite.api.events.StatChanged; import net.runelite.api.events.VarbitChanged; import net.runelite.api.widgets.WidgetInfo; @@ -98,15 +97,18 @@ public class QuickEaterPlugin extends Plugin ItemID.SUPER_STRENGTH1, ItemID.SUPER_STRENGTH2, ItemID.SUPER_STRENGTH3, ItemID.SUPER_STRENGTH4, ItemID.DIVINE_SUPER_STRENGTH_POTION1, ItemID.DIVINE_SUPER_STRENGTH_POTION2, ItemID.DIVINE_SUPER_STRENGTH_POTION3, ItemID.DIVINE_SUPER_STRENGTH_POTION4, ItemID.DIVINE_SUPER_COMBAT_POTION1, ItemID.DIVINE_SUPER_COMBAT_POTION2, ItemID.DIVINE_SUPER_COMBAT_POTION3, ItemID.DIVINE_SUPER_COMBAT_POTION4, - ItemID.SUPER_COMBAT_POTION1, ItemID.SUPER_COMBAT_POTION2, ItemID.SUPER_COMBAT_POTION3, ItemID.SUPER_COMBAT_POTION4); + ItemID.COMBAT_POTION1, ItemID.COMBAT_POTION2, ItemID.COMBAT_POTION3, ItemID.COMBAT_POTION4, + ItemID.SUPER_COMBAT_POTION1, ItemID.SUPER_COMBAT_POTION2, ItemID.SUPER_COMBAT_POTION3, ItemID.SUPER_COMBAT_POTION4); private final Set ATTACK_SET = Set.of(ItemID.ATTACK_POTION1, ItemID.ATTACK_POTION2, ItemID.ATTACK_POTION3, ItemID.ATTACK_POTION4, ItemID.SUPER_ATTACK1, ItemID.SUPER_ATTACK2, ItemID.SUPER_ATTACK3, ItemID.SUPER_ATTACK4, ItemID.DIVINE_SUPER_ATTACK_POTION1, ItemID.DIVINE_SUPER_ATTACK_POTION2, ItemID.DIVINE_SUPER_ATTACK_POTION3, ItemID.DIVINE_SUPER_ATTACK_POTION4, ItemID.DIVINE_SUPER_COMBAT_POTION1, ItemID.DIVINE_SUPER_COMBAT_POTION2, ItemID.DIVINE_SUPER_COMBAT_POTION3, ItemID.DIVINE_SUPER_COMBAT_POTION4, - ItemID.SUPER_COMBAT_POTION1, ItemID.SUPER_COMBAT_POTION2, ItemID.SUPER_COMBAT_POTION3, ItemID.SUPER_COMBAT_POTION4); + ItemID.COMBAT_POTION1, ItemID.COMBAT_POTION2, ItemID.COMBAT_POTION3, ItemID.COMBAT_POTION4, + ItemID.SUPER_COMBAT_POTION1, ItemID.SUPER_COMBAT_POTION2, ItemID.SUPER_COMBAT_POTION3, ItemID.SUPER_COMBAT_POTION4); private final Set DEFENCE_SET = Set.of(ItemID.DEFENCE_POTION1, ItemID.DEFENCE_POTION2, ItemID.DEFENCE_POTION3, ItemID.DEFENCE_POTION4, ItemID.SUPER_DEFENCE1, ItemID.SUPER_DEFENCE2, ItemID.SUPER_DEFENCE3, ItemID.SUPER_DEFENCE4, ItemID.DIVINE_SUPER_DEFENCE_POTION1, ItemID.DIVINE_SUPER_DEFENCE_POTION2, ItemID.DIVINE_SUPER_DEFENCE_POTION3, ItemID.DIVINE_SUPER_DEFENCE_POTION4, + ItemID.COMBAT_POTION1, ItemID.COMBAT_POTION2, ItemID.COMBAT_POTION3, ItemID.COMBAT_POTION4, ItemID.DIVINE_SUPER_COMBAT_POTION1, ItemID.DIVINE_SUPER_COMBAT_POTION2, ItemID.DIVINE_SUPER_COMBAT_POTION3, ItemID.DIVINE_SUPER_COMBAT_POTION4, ItemID.SUPER_COMBAT_POTION1, ItemID.SUPER_COMBAT_POTION2, ItemID.SUPER_COMBAT_POTION3, ItemID.SUPER_COMBAT_POTION4); private final Set RANGED_SET = Set.of(ItemID.RANGING_POTION1, ItemID.RANGING_POTION2, ItemID.RANGING_POTION3, ItemID.RANGING_POTION4, diff --git a/release/botutils-4.8.2.jar b/release/botutils-4.8.2.jar index 2afb5fb9..0e07f0e8 100644 Binary files a/release/botutils-4.8.2.jar and b/release/botutils-4.8.2.jar differ diff --git a/release/combinationrunecrafter-1.9.0.jar b/release/combinationrunecrafter-1.9.0.jar index bcd1593d..b2b1e3b2 100644 Binary files a/release/combinationrunecrafter-1.9.0.jar and b/release/combinationrunecrafter-1.9.0.jar differ diff --git a/release/powerfighter-2.0.0.jar b/release/powerfighter-2.0.0.jar index 2fc9c22d..d21ea5cb 100644 Binary files a/release/powerfighter-2.0.0.jar and b/release/powerfighter-2.0.0.jar differ diff --git a/release/quickeater-3.2.0.jar b/release/quickeater-3.2.0.jar deleted file mode 100644 index 9b19a7d9..00000000 Binary files a/release/quickeater-3.2.0.jar and /dev/null differ diff --git a/release/quickeater-3.3.0.jar b/release/quickeater-3.3.0.jar new file mode 100644 index 00000000..090a0132 Binary files /dev/null and b/release/quickeater-3.3.0.jar differ diff --git a/rooftopagility/src/main/java/net/runelite/client/plugins/rooftopagility/Portals.java b/rooftopagility/src/main/java/net/runelite/client/plugins/rooftopagility/Portals.java index e752bb4e..9768e794 100644 --- a/rooftopagility/src/main/java/net/runelite/client/plugins/rooftopagility/Portals.java +++ b/rooftopagility/src/main/java/net/runelite/client/plugins/rooftopagility/Portals.java @@ -2,8 +2,12 @@ package net.runelite.client.plugins.rooftopagility; import lombok.AccessLevel; import lombok.Getter; - -import static net.runelite.api.NullObjectID.*; +import static net.runelite.api.NullObjectID.NULL_36241; +import static net.runelite.api.NullObjectID.NULL_36242; +import static net.runelite.api.NullObjectID.NULL_36243; +import static net.runelite.api.NullObjectID.NULL_36244; +import static net.runelite.api.NullObjectID.NULL_36245; +import static net.runelite.api.NullObjectID.NULL_36246; public enum Portals { diff --git a/rooftopagility/src/main/java/net/runelite/client/plugins/rooftopagility/RooftopAgilityPlugin.java b/rooftopagility/src/main/java/net/runelite/client/plugins/rooftopagility/RooftopAgilityPlugin.java index e1358a37..3e8ed0dc 100644 --- a/rooftopagility/src/main/java/net/runelite/client/plugins/rooftopagility/RooftopAgilityPlugin.java +++ b/rooftopagility/src/main/java/net/runelite/client/plugins/rooftopagility/RooftopAgilityPlugin.java @@ -27,28 +27,17 @@ package net.runelite.client.plugins.rooftopagility; import com.google.inject.Provides; import com.owain.chinbreakhandler.ChinBreakHandler; - import java.time.Duration; import java.time.Instant; import java.util.HashSet; import java.util.List; import java.util.Set; import javax.inject.Inject; - import lombok.extern.slf4j.Slf4j; import net.runelite.api.Client; -import net.runelite.api.coords.LocalPoint; -import net.runelite.api.coords.WorldPoint; import net.runelite.api.DecorativeObject; -import net.runelite.api.events.ConfigButtonClicked; -import net.runelite.api.events.GameStateChanged; -import net.runelite.api.events.ItemContainerChanged; -import net.runelite.api.events.ItemDespawned; -import net.runelite.api.events.ItemSpawned; -import net.runelite.api.events.GameTick; -import net.runelite.api.events.MenuOptionClicked; -import net.runelite.api.GameState; import net.runelite.api.GameObject; +import net.runelite.api.GameState; import net.runelite.api.GroundObject; import net.runelite.api.ItemID; import net.runelite.api.MenuEntry; @@ -58,6 +47,15 @@ import net.runelite.api.Skill; import net.runelite.api.Tile; import net.runelite.api.TileItem; import net.runelite.api.Varbits; +import net.runelite.api.coords.LocalPoint; +import net.runelite.api.coords.WorldPoint; +import net.runelite.api.events.ConfigButtonClicked; +import net.runelite.api.events.GameStateChanged; +import net.runelite.api.events.GameTick; +import net.runelite.api.events.ItemContainerChanged; +import net.runelite.api.events.ItemDespawned; +import net.runelite.api.events.ItemSpawned; +import net.runelite.api.events.MenuOptionClicked; import net.runelite.api.widgets.Widget; import net.runelite.api.widgets.WidgetInfo; import net.runelite.api.widgets.WidgetItem; @@ -71,11 +69,10 @@ import net.runelite.client.plugins.PluginDescriptor; import net.runelite.client.plugins.PluginManager; import net.runelite.client.plugins.PluginType; import net.runelite.client.plugins.botutils.BotUtils; +import static net.runelite.client.plugins.rooftopagility.RooftopAgilityState.*; import net.runelite.client.ui.overlay.OverlayManager; import org.pf4j.Extension; -import static net.runelite.client.plugins.rooftopagility.RooftopAgilityState.*; - @Extension @PluginDependency(BotUtils.class) diff --git a/worldwalker/src/main/java/net/runelite/client/plugins/worldwalker/WorldWalkerConfig.java b/worldwalker/src/main/java/net/runelite/client/plugins/worldwalker/WorldWalkerConfig.java index fbabec9d..b3754b20 100644 --- a/worldwalker/src/main/java/net/runelite/client/plugins/worldwalker/WorldWalkerConfig.java +++ b/worldwalker/src/main/java/net/runelite/client/plugins/worldwalker/WorldWalkerConfig.java @@ -25,7 +25,14 @@ */ package net.runelite.client.plugins.worldwalker; -import net.runelite.client.config.*; +import net.runelite.client.config.Button; +import net.runelite.client.config.Config; +import net.runelite.client.config.ConfigGroup; +import net.runelite.client.config.ConfigItem; +import net.runelite.client.config.ConfigSection; +import net.runelite.client.config.ConfigTitleSection; +import net.runelite.client.config.Range; +import net.runelite.client.config.Title; @ConfigGroup("WorldWalker") public interface WorldWalkerConfig extends Config diff --git a/worldwalker/src/main/java/net/runelite/client/plugins/worldwalker/WorldWalkerPlugin.java b/worldwalker/src/main/java/net/runelite/client/plugins/worldwalker/WorldWalkerPlugin.java index 81876235..f742b0bd 100644 --- a/worldwalker/src/main/java/net/runelite/client/plugins/worldwalker/WorldWalkerPlugin.java +++ b/worldwalker/src/main/java/net/runelite/client/plugins/worldwalker/WorldWalkerPlugin.java @@ -26,20 +26,16 @@ package net.runelite.client.plugins.worldwalker; import com.google.inject.Provides; -import java.time.Duration; import java.time.Instant; import javax.inject.Inject; import lombok.extern.slf4j.Slf4j; import net.runelite.api.Client; import net.runelite.api.GameState; -import net.runelite.api.MenuEntry; import net.runelite.api.Player; -import net.runelite.api.World; import net.runelite.api.coords.LocalPoint; import net.runelite.api.coords.WorldPoint; import net.runelite.api.events.ConfigButtonClicked; import net.runelite.api.events.GameTick; -import net.runelite.api.events.MenuOptionClicked; import net.runelite.client.config.ConfigManager; import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.ConfigChanged; @@ -48,8 +44,6 @@ import net.runelite.client.plugins.PluginDependency; import net.runelite.client.plugins.PluginDescriptor; import net.runelite.client.plugins.PluginType; import net.runelite.client.plugins.botutils.BotUtils; -import static net.runelite.client.plugins.worldwalker.WorldWalkerState.*; - import net.runelite.client.ui.overlay.OverlayManager; import org.pf4j.Extension; diff --git a/worldwalker/worldwalker.gradle.kts b/worldwalker/worldwalker.gradle.kts index f2253938..2173fc9f 100644 --- a/worldwalker/worldwalker.gradle.kts +++ b/worldwalker/worldwalker.gradle.kts @@ -23,7 +23,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -version = "1.0.3" +version = "1.0.4" project.extra["PluginName"] = "World Walker Plugin" project.extra["PluginDescription"] = "Illumine - World Walker plugin"