From cf5fa63804e27f5c4935b353bef0f6cc7b1cba8d Mon Sep 17 00:00:00 2001 From: Ganom Date: Sat, 20 Apr 2019 22:50:43 -0400 Subject: [PATCH 1/4] Adding type to PlankMake --- .../client/plugins/plankmakehelper/PlankMakePlugin.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/plankmakehelper/PlankMakePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/plankmakehelper/PlankMakePlugin.java index 4c5a72001e..87c35c17b1 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/plankmakehelper/PlankMakePlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/plankmakehelper/PlankMakePlugin.java @@ -10,7 +10,8 @@ import javax.inject.Inject; @PluginDescriptor( name = "Plank Make Helper", description = "Highlights planks and plank make spell", - tags = {"overlay", "plankmaking", "lunar", "money", "moneymaking", "gp"} + tags = {"overlay", "plankmaking", "lunar", "money", "moneymaking", "gp"}, + type = "utility" ) public class PlankMakePlugin extends Plugin { From f243494b4fd9e6e5849edcb284b1bcb9602dc541 Mon Sep 17 00:00:00 2001 From: Ganom Date: Sat, 20 Apr 2019 22:51:02 -0400 Subject: [PATCH 2/4] Adding type to PvpTools --- .../net/runelite/client/plugins/pvptools/PvpToolsPlugin.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PvpToolsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PvpToolsPlugin.java index b36894ab54..47aee1f8b6 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PvpToolsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PvpToolsPlugin.java @@ -69,7 +69,8 @@ import org.apache.commons.lang3.ArrayUtils; @PluginDescriptor( name = "PvP Tools", description = "Enable the PvP Tools panel", - tags = {"panel", "pvp", "pk", "pklite"} + tags = {"panel", "pvp", "pk", "pklite"}, + type = "PVP" ) public class PvpToolsPlugin extends Plugin { From 480168e843f0f46dca54662f7a800cc22aaee660 Mon Sep 17 00:00:00 2001 From: Ganom Date: Sat, 20 Apr 2019 22:52:36 -0400 Subject: [PATCH 3/4] Removing next hit notifier as its redundant --- .../NextHitNotifierConfig.java | 11 -- .../NextHitNotifierOverlay.java | 59 --------- .../NextHitNotifierPlugin.java | 117 ------------------ 3 files changed, 187 deletions(-) delete mode 100644 runelite-client/src/main/java/net/runelite/client/plugins/nexthitnotifier/NextHitNotifierConfig.java delete mode 100644 runelite-client/src/main/java/net/runelite/client/plugins/nexthitnotifier/NextHitNotifierOverlay.java delete mode 100644 runelite-client/src/main/java/net/runelite/client/plugins/nexthitnotifier/NextHitNotifierPlugin.java diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/nexthitnotifier/NextHitNotifierConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/nexthitnotifier/NextHitNotifierConfig.java deleted file mode 100644 index 8bce5b84b7..0000000000 --- a/runelite-client/src/main/java/net/runelite/client/plugins/nexthitnotifier/NextHitNotifierConfig.java +++ /dev/null @@ -1,11 +0,0 @@ -package net.runelite.client.plugins.nexthitnotifier; - - -import net.runelite.client.config.Config; -import net.runelite.client.config.ConfigGroup; - -@ConfigGroup("nexthitnotifier") -public interface NextHitNotifierConfig extends Config -{ - -} diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/nexthitnotifier/NextHitNotifierOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/nexthitnotifier/NextHitNotifierOverlay.java deleted file mode 100644 index fe47f37307..0000000000 --- a/runelite-client/src/main/java/net/runelite/client/plugins/nexthitnotifier/NextHitNotifierOverlay.java +++ /dev/null @@ -1,59 +0,0 @@ -package net.runelite.client.plugins.nexthitnotifier; - -import net.runelite.api.Client; -import net.runelite.client.ui.overlay.Overlay; -import net.runelite.client.ui.overlay.OverlayPosition; -import net.runelite.client.ui.overlay.components.PanelComponent; -import net.runelite.client.ui.overlay.components.TitleComponent; -import net.runelite.client.util.MiscUtils; - -import javax.inject.Inject; -import java.awt.*; - -public class NextHitNotifierOverlay extends Overlay -{ - private final Client client; - private final NextHitNotifierPlugin plugin; - private final NextHitNotifierConfig config; - - private final PanelComponent panelComponent = new PanelComponent(); - private final Dimension panelSize = new Dimension(48, 0); - - @Inject - private NextHitNotifierOverlay(Client client, NextHitNotifierPlugin plugin, NextHitNotifierConfig config) - { - setPosition(OverlayPosition.BOTTOM_LEFT); - //setPosition(OverlayPosition.DYNAMIC); - //setPosition(OverlayPosition.DETACHED); - - this.client = client; - this.plugin = plugin; - this.config = config; - } - - @Override - public Dimension render(Graphics2D graphics) - { - panelComponent.getChildren().clear(); - panelComponent.setPreferredSize(panelSize); - - String lastHitText = Integer.toString(plugin.lastHit); - int lastHit = plugin.lastHit; - - if (plugin.showTime < 0) - { - lastHitText = "0"; - lastHit = 0; - } - - int g = (int)MiscUtils.clamp((float)Math.floor(lastHit / 30.f) * 255.f, 0.f, 255.f); - int r = 255 - g; - - Color textColor = Color.getHSBColor(Color.RGBtoHSB(r, g, 0, null)[0], 1.f, 1.f); - - panelComponent.getChildren().add(TitleComponent.builder().text("Next hit:").color(Color.YELLOW).build()); - panelComponent.getChildren().add(TitleComponent.builder().text(lastHitText).color(textColor).build()); - - return panelComponent.render(graphics); - } -} \ No newline at end of file diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/nexthitnotifier/NextHitNotifierPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/nexthitnotifier/NextHitNotifierPlugin.java deleted file mode 100644 index ce6c1ca925..0000000000 --- a/runelite-client/src/main/java/net/runelite/client/plugins/nexthitnotifier/NextHitNotifierPlugin.java +++ /dev/null @@ -1,117 +0,0 @@ -package net.runelite.client.plugins.nexthitnotifier; - -import net.runelite.client.eventbus.Subscribe; -import com.google.inject.Provides; -import net.runelite.api.Client; -import net.runelite.api.GameState; -import net.runelite.api.Skill; -import net.runelite.api.events.ExperienceChanged; -import net.runelite.api.events.GameStateChanged; -import net.runelite.api.events.GameTick; -import net.runelite.client.config.ConfigManager; -import net.runelite.client.plugins.Plugin; -import net.runelite.client.plugins.PluginDescriptor; -import net.runelite.client.ui.overlay.OverlayManager; - -import javax.inject.Inject; - -@PluginDescriptor( - name = "Next Hit Notifier", - description = "Shows estimated next hit based on xp drop.", - tags = { "experience", "damage", "overlay", "pking", "bogla" }, - enabledByDefault = false, - type = "utility" -) -public class NextHitNotifierPlugin extends Plugin -{ - @Inject - private Client client; - - @Inject - private OverlayManager overlayManager; - - @Inject - private NextHitNotifierOverlay overlay; - - private int lastHpXp = 0; - int lastHit = 0; - int showTime = 0; - - @Provides - NextHitNotifierConfig getConfig(ConfigManager configManager) - { - return configManager.getConfig(NextHitNotifierConfig.class); - } - - @Override - protected void startUp() throws Exception - { - overlayManager.add(overlay); - } - - @Override - protected void shutDown() throws Exception - { - overlayManager.remove(overlay); - } - - @Subscribe - public void onGameStateChanged(GameStateChanged event) - { - if (event.getGameState() == GameState.LOGGED_IN) - { - lastHpXp = client.getSkillExperience(Skill.HITPOINTS); - lastHit = 0; - showTime = 0; - } - else - { - lastHpXp = 0; - lastHit = 0; - showTime = 0; - } - } - - @Subscribe - public void onGameTick(GameTick event) - { - if (showTime > 0) - showTime--; - else - lastHit = 0; - } - - @Subscribe - public void onExperienceChanged(ExperienceChanged event) - { - if (client.getGameState() != GameState.LOGGED_IN) - { - lastHpXp = 0; - lastHit = 0; - showTime = 0; - return; - } - - final Skill skill = event.getSkill(); - - if (skill != Skill.HITPOINTS) - return; - - final int currentXp = client.getSkillExperience(skill); - - int gainedXp = currentXp - lastHpXp; - - //filter out big xp drops (such as login) - if (gainedXp > 1000) - { - lastHpXp = client.getSkillExperience(skill); - return; - } - - lastHit = (int)Math.rint(gainedXp / 1.33f); - lastHpXp = currentXp; - showTime = 3; - } - - -} From 428b6dc4dd3bd22a4c5c0a9f1fb70f1a147e4dca Mon Sep 17 00:00:00 2001 From: Ganom Date: Sat, 20 Apr 2019 22:55:05 -0400 Subject: [PATCH 4/4] Fixing issue where you were locked in nylo room --- .../java/net/runelite/client/plugins/ztob/TheatrePlugin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/ztob/TheatrePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/ztob/TheatrePlugin.java index 3eb223c0c6..fe91da0930 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/ztob/TheatrePlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/ztob/TheatrePlugin.java @@ -301,7 +301,7 @@ public class TheatrePlugin extends Plugin { } } - if (pOptionToReplace.equals("CANCEL") || pOptionToReplace.equals("WALK HERE") || pOptionToReplace.equals("PASS")) { + if (!pOptionToReplace.equals("ATTACK")) { return; } int Id = 0;