diff --git a/plugins.json b/plugins.json index 7b22ec40..9e00c0f8 100644 --- a/plugins.json +++ b/plugins.json @@ -1 +1 @@ -[{"projectUrl":"","provider":"illumine","name":"BotUtils","description":"Illumine - Utils required for plugins to function with added automation","id":"botutils-plugin","releases":[{"date":"2020-07-01","sha512sum":"7B59FDB7A5D65500F34305ADC25CD21B575B3496AD51C43F90729A5D80641D49F0DF0F5B1DF11DFB7C94B5BDAAD5F0634459433B3831B0283BF971DFA119A112","version":"1.2.0","url":"https://github.com/illumineawake/illu-plugins/blob/master/release/botutils-1.2.0.jar?raw=true","requires":"0.0.1"}]}, {"projectUrl":"","provider":"illumine","name":"Rooftop Agility","description":"Illumine automated rooftop agility plugin","id":"rooftopagility-plugin","releases":[{"date":"2020-07-01","sha512sum":"703A8875EE78AB024CEFE1B03A4FDB111B93F703C393D0F74E6ED25A4A0D5F01884AD39900B64C2F4D64E117FB40F70630A1F1D95D516DCD1AAB29833900219A","version":"1.3.0","url":"https://github.com/illumineawake/illu-plugins/blob/master/release/rooftopagility-1.3.0.jar?raw=true","requires":"0.0.1"}]}, {"projectUrl":"","provider":"illumine","name":"Tick Eat","description":"Illumine auto eat food below given HP on tick","id":"tickeat-plugin","releases":[{"date":"2020-07-01","sha512sum":"E18B44DBB8D0ABFFD0CD81C5B6A96E0FCCD858FF92DC82903F8661D5011E67BC2599A10623E5E3C99DABAA83E3E02A74C3E71956492695A906F8A52F28D07558","version":"1.1.0","url":"https://github.com/illumineawake/illu-plugins/blob/master/release/tickeat-1.1.0.jar?raw=true","requires":"0.0.1"}]}] +[{"projectUrl":"","provider":"illumine","name":"BotUtils","description":"Illumine - Utils required for plugins to function with added automation","id":"botutils-plugin","releases":[{"date":"2020-07-02","sha512sum":"7B59FDB7A5D65500F34305ADC25CD21B575B3496AD51C43F90729A5D80641D49F0DF0F5B1DF11DFB7C94B5BDAAD5F0634459433B3831B0283BF971DFA119A112","version":"1.2.0","url":"https://github.com/illumineawake/illu-plugins/blob/master/release/botutils-1.2.0.jar?raw=true","requires":"0.0.1"}]}, {"projectUrl":"","provider":"illumine","name":"Quick Eater","description":"Illumine - auto eat food below configured HP","id":"quickeater-plugin","releases":[{"date":"2020-07-02","sha512sum":"02F7CAC41B34ED1C16F859E8D117AB3A74B42C7DB597AF4E5A4E8BC606399E6A7E03206F5A7856BECBEC415B2185C921C9DD676AF739FC2FDCA356DB17DAD21F","version":"1.2.0","url":"https://github.com/illumineawake/illu-plugins/blob/master/release/quickeater-1.2.0.jar?raw=true","requires":"0.0.1"}]}, {"projectUrl":"","provider":"illumine","name":"Rooftop Agility","description":"Illumine automated rooftop agility plugin","id":"rooftopagility-plugin","releases":[{"date":"2020-07-02","sha512sum":"72363EE1978716017FC5D735738E990D36C39D60E855CFA7676C0997E70B6AC8918DB2D87A67FDEC4D9F8BE0225EA23F892AA6A440CFD3B14B95192C9C1F4219","version":"1.3.1","url":"https://github.com/illumineawake/illu-plugins/blob/master/release/rooftopagility-1.3.1.jar?raw=true","requires":"0.0.1"}]}] diff --git a/tickeat/tickeat.gradle.kts b/quickeater/quickeater.gradle.kts similarity index 93% rename from tickeat/tickeat.gradle.kts rename to quickeater/quickeater.gradle.kts index b23d1a9b..b37a4f09 100644 --- a/tickeat/tickeat.gradle.kts +++ b/quickeater/quickeater.gradle.kts @@ -23,10 +23,10 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -version = "1.1.0" +version = "1.2.0" -project.extra["PluginName"] = "Tick Eat" -project.extra["PluginDescription"] = "Illumine auto eat food below given HP on tick" +project.extra["PluginName"] = "Quick Eater" +project.extra["PluginDescription"] = "Illumine - auto eat food below configured HP" dependencies { compileOnly(project(":botutils")) diff --git a/tickeat/src/main/java/net/runelite/client/plugins/tickeat/TickEatConfiguration.java b/quickeater/src/main/java/net/runelite/client/plugins/quickeater/QuickEaterConfiguration.java similarity index 87% rename from tickeat/src/main/java/net/runelite/client/plugins/tickeat/TickEatConfiguration.java rename to quickeater/src/main/java/net/runelite/client/plugins/quickeater/QuickEaterConfiguration.java index 2513e281..d8427546 100644 --- a/tickeat/src/main/java/net/runelite/client/plugins/tickeat/TickEatConfiguration.java +++ b/quickeater/src/main/java/net/runelite/client/plugins/quickeater/QuickEaterConfiguration.java @@ -23,18 +23,14 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.client.plugins.tickeat; +package net.runelite.client.plugins.quickeater; -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("TickEat") -public interface TickEatConfiguration extends Config +@ConfigGroup("QuickEater") +public interface QuickEaterConfiguration extends Config { @ConfigItem( diff --git a/tickeat/src/main/java/net/runelite/client/plugins/tickeat/TickEatPlugin.java b/quickeater/src/main/java/net/runelite/client/plugins/quickeater/QuickEaterPlugin.java similarity index 85% rename from tickeat/src/main/java/net/runelite/client/plugins/tickeat/TickEatPlugin.java rename to quickeater/src/main/java/net/runelite/client/plugins/quickeater/QuickEaterPlugin.java index 7c7d9c42..cc52d5b9 100644 --- a/tickeat/src/main/java/net/runelite/client/plugins/tickeat/TickEatPlugin.java +++ b/quickeater/src/main/java/net/runelite/client/plugins/quickeater/QuickEaterPlugin.java @@ -23,17 +23,15 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.client.plugins.tickeat; +package net.runelite.client.plugins.quickeater; import com.google.inject.Provides; import javax.inject.Inject; import lombok.extern.slf4j.Slf4j; import net.runelite.api.*; -import net.runelite.api.coords.WorldPoint; import net.runelite.api.events.*; 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.plugins.Plugin; import net.runelite.client.plugins.PluginDependency; @@ -46,20 +44,20 @@ import org.pf4j.Extension; @Extension @PluginDependency(BotUtils.class) @PluginDescriptor( - name = "Tick Eater", + name = "Quick Eater", enabledByDefault = false, - description = "Illumine tick eater", - tags = {"tick"}, + description = "Illumine - auto eat food below configured HP", + tags = {"illumine","auto","bot","eat","food"}, type = PluginType.UTILITY ) @Slf4j -public class TickEatPlugin extends Plugin +public class QuickEaterPlugin extends Plugin { @Inject private Client client; @Inject - private TickEatConfiguration config; + private QuickEaterConfiguration config; @Inject private BotUtils utils; @@ -73,9 +71,9 @@ public class TickEatPlugin extends Plugin MenuEntry targetMenu; @Provides - TickEatConfiguration provideConfig(ConfigManager configManager) + QuickEaterConfiguration provideConfig(ConfigManager configManager) { - return configManager.getConfig(TickEatConfiguration.class); + return configManager.getConfig(QuickEaterConfiguration.class); } @Override @@ -87,7 +85,7 @@ public class TickEatPlugin extends Plugin @Override protected void shutDown() { - configManager.setConfiguration("TickEat", "startBot", false); + } @@ -118,7 +116,7 @@ public class TickEatPlugin extends Plugin } if (utils.getRandomEvent()) //for random events { - log.info("Powerskiller not overriding due to random event"); + log.debug("Quick Eater not overriding due to random event"); return; } else diff --git a/release/quickeater-1.2.0.jar b/release/quickeater-1.2.0.jar new file mode 100644 index 00000000..2203d9eb Binary files /dev/null and b/release/quickeater-1.2.0.jar differ diff --git a/release/rooftopagility-1.3.0.jar b/release/rooftopagility-1.3.1.jar similarity index 74% rename from release/rooftopagility-1.3.0.jar rename to release/rooftopagility-1.3.1.jar index 2968a830..3ffa9bd7 100644 Binary files a/release/rooftopagility-1.3.0.jar and b/release/rooftopagility-1.3.1.jar differ diff --git a/release/tickeat-1.1.0.jar b/release/tickeat-1.1.0.jar deleted file mode 100644 index 45c181d1..00000000 Binary files a/release/tickeat-1.1.0.jar and /dev/null differ diff --git a/rooftopagility/rooftopagility.gradle.kts b/rooftopagility/rooftopagility.gradle.kts index d1a4732d..f1e1338b 100644 --- a/rooftopagility/rooftopagility.gradle.kts +++ b/rooftopagility/rooftopagility.gradle.kts @@ -23,7 +23,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -version = "1.3.0" +version = "1.3.1" project.extra["PluginName"] = "Rooftop Agility" project.extra["PluginDescription"] = "Illumine automated rooftop agility plugin" diff --git a/rooftopagility/src/main/java/net/runelite/client/plugins/rooftopagility/RooftopAgilityOverlay.java b/rooftopagility/src/main/java/net/runelite/client/plugins/rooftopagility/RooftopAgilityOverlay.java index 8fb5aebf..5b99d62d 100644 --- a/rooftopagility/src/main/java/net/runelite/client/plugins/rooftopagility/RooftopAgilityOverlay.java +++ b/rooftopagility/src/main/java/net/runelite/client/plugins/rooftopagility/RooftopAgilityOverlay.java @@ -7,6 +7,7 @@ import java.time.Duration; import java.time.Instant; import javax.inject.Inject; import javax.inject.Singleton; +import lombok.extern.slf4j.Slf4j; import net.runelite.api.Client; import static net.runelite.api.MenuOpcode.RUNELITE_OVERLAY_CONFIG; import static net.runelite.client.ui.overlay.OverlayManager.OPTION_CONFIGURE; @@ -19,6 +20,7 @@ import net.runelite.client.ui.overlay.components.table.TableComponent; import net.runelite.client.util.ColorUtil; import static org.apache.commons.lang3.time.DurationFormatUtils.formatDuration; +@Slf4j @Singleton class RooftopAgilityOverlay extends OverlayPanel { @@ -45,6 +47,7 @@ class RooftopAgilityOverlay extends OverlayPanel { if (plugin.botTimer == null || !plugin.startAgility || !config.enableUI()) { + log.debug("Overlay conditions not met, not starting overlay"); return null; } TableComponent tableComponent = new TableComponent(); 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 7b18a7c4..d2cf58d6 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 @@ -186,7 +186,7 @@ public class RooftopAgilityPlugin extends Plugin RooftopAgilityObstacles obstacle = RooftopAgilityObstacles.getObstacle(client.getLocalPlayer().getWorldLocation()); if (obstacle != null) { - log.info(String.valueOf(obstacle.getObstacleId())); + log.debug(String.valueOf(obstacle.getObstacleId())); if (obstacle.getObstacleType() == RooftopAgilityObstacleType.DECORATION) { @@ -221,7 +221,7 @@ public class RooftopAgilityPlugin extends Plugin } else { - log.info("Not in obstacle area"); + log.debug("Not in obstacle area"); } } @@ -263,7 +263,7 @@ public class RooftopAgilityPlugin extends Plugin { if (!REGION_IDS.contains(client.getLocalPlayer().getWorldLocation().getRegionID())) { - log.info("not in agility course region"); + log.debug("not in agility course region"); return; } marksPerHour = (int) getMarksPH(); @@ -277,7 +277,7 @@ public class RooftopAgilityPlugin extends Plugin timeout--; return; case MARK_OF_GRACE: - log.info("Picking up mark of grace"); + log.debug("Picking up mark of grace"); targetMenu = new MenuEntry("", "", ItemID.MARK_OF_GRACE, 20, markOfGraceTile.getSceneLocation().getX(), markOfGraceTile.getSceneLocation().getY(), false); sleepDelay(); utils.clickRandomPointCenter(-100, 100); @@ -293,7 +293,7 @@ public class RooftopAgilityPlugin extends Plugin } else { - //log.info("client/ player is null or bot isn't started"); + log.debug("client/ player is null or bot isn't started"); return; } } @@ -324,7 +324,7 @@ public class RooftopAgilityPlugin extends Plugin if (item.getId() == ItemID.MARK_OF_GRACE) { - log.info("Mark of grace spawned"); + log.debug("Mark of grace spawned"); markOfGrace = item; markOfGraceTile = tile; WidgetItem mogInventory = utils.getInventoryWidgetItem(ItemID.MARK_OF_GRACE); @@ -345,7 +345,7 @@ public class RooftopAgilityPlugin extends Plugin if (item.getId() == ItemID.MARK_OF_GRACE) { - log.info("Mark of grace despawned"); + log.debug("Mark of grace despawned"); markOfGrace = null; } } diff --git a/settings.gradle.kts b/settings.gradle.kts index fc0e17d9..7825f07d 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -27,7 +27,7 @@ rootProject.name = "Illumine Plugins" include(":botutils") include(":rooftopagility") -include(":tickeat") +include(":quickeater") for (project in rootProject.children) { project.apply {