From ea1d610f1d429b676928077b70e83a466f9009cb Mon Sep 17 00:00:00 2001 From: Tomas Slusny Date: Thu, 15 Mar 2018 16:33:03 +0100 Subject: [PATCH 1/4] Fix AgilityPlugin naming conventions Methods should never start with uppercase letter. Signed-off-by: Tomas Slusny --- .../plugins/agilityplugin/AgilityPlugin.java | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/agilityplugin/AgilityPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/agilityplugin/AgilityPlugin.java index 7ba6309f28..d097ce1e94 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/agilityplugin/AgilityPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/agilityplugin/AgilityPlugin.java @@ -70,73 +70,73 @@ public class AgilityPlugin extends Plugin // This code, brought to you, in part, by the letters C and V // ... and the words "search" and "replace" @Subscribe - public void GameObjectSpawned(GameObjectSpawned event) + public void onGameObjectSpawned(GameObjectSpawned event) { onTileObject(event.getTile(), null, event.getGameObject()); } @Subscribe - public void GameObjectChanged(GameObjectChanged event) + public void onGameObjectChanged(GameObjectChanged event) { onTileObject(event.getTile(), event.getPrevious(), event.getGameObject()); } @Subscribe - public void GameObjectDeSpawned(GameObjectDespawned event) + public void onGameObjectDeSpawned(GameObjectDespawned event) { onTileObject(event.getTile(), event.getGameObject(), null); } @Subscribe - public void GroundObjectSpawned(GroundObjectSpawned event) + public void onGroundObjectSpawned(GroundObjectSpawned event) { onTileObject(event.getTile(), null, event.getGroundObject()); } @Subscribe - public void GroundObjectChanged(GroundObjectChanged event) + public void onGroundObjectChanged(GroundObjectChanged event) { onTileObject(event.getTile(), event.getPrevious(), event.getGroundObject()); } @Subscribe - public void GroundObjectDeSpawned(GroundObjectDespawned event) + public void onGroundObjectDeSpawned(GroundObjectDespawned event) { onTileObject(event.getTile(), event.getGroundObject(), null); } @Subscribe - public void WallObjectSpawned(WallObjectSpawned event) + public void onWallObjectSpawned(WallObjectSpawned event) { onTileObject(event.getTile(), null, event.getWallObject()); } @Subscribe - public void WallObjectChanged(WallObjectChanged event) + public void onWallObjectChanged(WallObjectChanged event) { onTileObject(event.getTile(), event.getPrevious(), event.getWallObject()); } @Subscribe - public void WallObjectDeSpawned(WallObjectDespawned event) + public void onWallObjectDeSpawned(WallObjectDespawned event) { onTileObject(event.getTile(), event.getWallObject(), null); } @Subscribe - public void DecorativeObjectSpawned(DecorativeObjectSpawned event) + public void onDecorativeObjectSpawned(DecorativeObjectSpawned event) { onTileObject(event.getTile(), null, event.getDecorativeObject()); } @Subscribe - public void DecorativeObjectChanged(DecorativeObjectChanged event) + public void onDecorativeObjectChanged(DecorativeObjectChanged event) { onTileObject(event.getTile(), event.getPrevious(), event.getDecorativeObject()); } @Subscribe - public void DecorativeObjectDeSpawned(DecorativeObjectDespawned event) + public void onDecorativeObjectDeSpawned(DecorativeObjectDespawned event) { onTileObject(event.getTile(), event.getDecorativeObject(), null); } From a8daa0156e4dae3631ac764c64d3dea0aca78642 Mon Sep 17 00:00:00 2001 From: Tomas Slusny Date: Thu, 15 Mar 2018 16:34:19 +0100 Subject: [PATCH 2/4] Fix Herbiboar plugin naming conventions Methods should never start with uppercase letter. Signed-off-by: Tomas Slusny --- .../client/plugins/herbiboars/Herbiboars.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/herbiboars/Herbiboars.java b/runelite-client/src/main/java/net/runelite/client/plugins/herbiboars/Herbiboars.java index 83db589438..b4aa623ccc 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/herbiboars/Herbiboars.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/herbiboars/Herbiboars.java @@ -232,37 +232,37 @@ public class Herbiboars extends Plugin } @Subscribe - public void GameObjectSpawned(GameObjectSpawned event) + public void onGameObjectSpawned(GameObjectSpawned event) { onGameObject(event.getTile(), null, event.getGameObject()); } @Subscribe - public void GameObjectChanged(GameObjectChanged event) + public void onGameObjectChanged(GameObjectChanged event) { onGameObject(event.getTile(), event.getPrevious(), event.getGameObject()); } @Subscribe - public void GameObjectDeSpawned(GameObjectDespawned event) + public void onGameObjectDeSpawned(GameObjectDespawned event) { onGameObject(event.getTile(), event.getGameObject(), null); } @Subscribe - public void GroundObjectSpawned(GroundObjectSpawned event) + public void onGroundObjectSpawned(GroundObjectSpawned event) { onGroundObject(event.getTile(), null, event.getGroundObject()); } @Subscribe - public void GroundObjectChanged(GroundObjectChanged event) + public void onGroundObjectChanged(GroundObjectChanged event) { onGroundObject(event.getTile(), event.getPrevious(), event.getGroundObject()); } @Subscribe - public void GroundObjectDeSpawned(GroundObjectDespawned event) + public void onGroundObjectDeSpawned(GroundObjectDespawned event) { onGroundObject(event.getTile(), event.getGroundObject(), null); } From 5a7792d1ac1d32851d65e549b65e9b7a710656b5 Mon Sep 17 00:00:00 2001 From: Tomas Slusny Date: Thu, 15 Mar 2018 16:35:51 +0100 Subject: [PATCH 3/4] Correctly name Herbiboar classes - Rename Herbiboars to HerbiboarPlugin - Rename HerbiboarsOverlay to HerbiboarOverlay - Rename "Herbiboars" to "Herbiboar" plugin name Signed-off-by: Tomas Slusny --- .../{HerbiboarsOverlay.java => HerbiboarOverlay.java} | 6 +++--- .../herbiboars/{Herbiboars.java => HerbiboarPlugin.java} | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) rename runelite-client/src/main/java/net/runelite/client/plugins/herbiboars/{HerbiboarsOverlay.java => HerbiboarOverlay.java} (96%) rename runelite-client/src/main/java/net/runelite/client/plugins/herbiboars/{Herbiboars.java => HerbiboarPlugin.java} (98%) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/herbiboars/HerbiboarsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/herbiboars/HerbiboarOverlay.java similarity index 96% rename from runelite-client/src/main/java/net/runelite/client/plugins/herbiboars/HerbiboarsOverlay.java rename to runelite-client/src/main/java/net/runelite/client/plugins/herbiboars/HerbiboarOverlay.java index fc87cdb943..d319fd6275 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/herbiboars/HerbiboarsOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/herbiboars/HerbiboarOverlay.java @@ -40,14 +40,14 @@ import net.runelite.client.ui.overlay.OverlayLayer; import net.runelite.client.ui.overlay.OverlayPosition; import net.runelite.client.ui.overlay.OverlayUtil; -class HerbiboarsOverlay extends Overlay +class HerbiboarOverlay extends Overlay { private final Client client; - private final Herbiboars plugin; + private final HerbiboarPlugin plugin; private final HerbiboarConfig config; @Inject - public HerbiboarsOverlay(Client client, Herbiboars plugin, HerbiboarConfig config) + public HerbiboarOverlay(Client client, HerbiboarPlugin plugin, HerbiboarConfig config) { setPosition(OverlayPosition.DYNAMIC); setLayer(OverlayLayer.ABOVE_WIDGETS); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/herbiboars/Herbiboars.java b/runelite-client/src/main/java/net/runelite/client/plugins/herbiboars/HerbiboarPlugin.java similarity index 98% rename from runelite-client/src/main/java/net/runelite/client/plugins/herbiboars/Herbiboars.java rename to runelite-client/src/main/java/net/runelite/client/plugins/herbiboars/HerbiboarPlugin.java index b4aa623ccc..041910cd89 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/herbiboars/Herbiboars.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/herbiboars/HerbiboarPlugin.java @@ -61,9 +61,9 @@ import net.runelite.client.ui.overlay.Overlay; @Slf4j @PluginDescriptor( - name = "Herbiboars" + name = "Herbiboar" ) -public class Herbiboars extends Plugin +public class HerbiboarPlugin extends Plugin { private static final List END_LOCATIONS = Arrays.asList( new WorldPoint(3693, 3798, 0), @@ -96,7 +96,7 @@ public class Herbiboars extends Plugin private Client client; @Inject - private HerbiboarsOverlay overlay; + private HerbiboarOverlay overlay; @Inject private HerbiboarConfig config;; From 1bd796bee5e3003de95b7795b4f387087458a708 Mon Sep 17 00:00:00 2001 From: Tomas Slusny Date: Thu, 15 Mar 2018 16:37:45 +0100 Subject: [PATCH 4/4] Remove unused variables in Herbiboar plugin Signed-off-by: Tomas Slusny --- .../runelite/client/plugins/herbiboars/HerbiboarOverlay.java | 5 +---- .../runelite/client/plugins/herbiboars/HerbiboarPlugin.java | 3 --- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/herbiboars/HerbiboarOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/herbiboars/HerbiboarOverlay.java index d319fd6275..99fd396b0b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/herbiboars/HerbiboarOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/herbiboars/HerbiboarOverlay.java @@ -31,7 +31,6 @@ import java.awt.Graphics2D; import java.awt.geom.Area; import java.util.Map; import java.util.Set; -import net.runelite.api.Client; import net.runelite.api.Tile; import net.runelite.api.TileObject; import net.runelite.api.coords.WorldPoint; @@ -42,16 +41,14 @@ import net.runelite.client.ui.overlay.OverlayUtil; class HerbiboarOverlay extends Overlay { - private final Client client; private final HerbiboarPlugin plugin; private final HerbiboarConfig config; @Inject - public HerbiboarOverlay(Client client, HerbiboarPlugin plugin, HerbiboarConfig config) + public HerbiboarOverlay(HerbiboarPlugin plugin, HerbiboarConfig config) { setPosition(OverlayPosition.DYNAMIC); setLayer(OverlayLayer.ABOVE_WIDGETS); - this.client = client; this.plugin = plugin; this.config = config; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/herbiboars/HerbiboarPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/herbiboars/HerbiboarPlugin.java index 041910cd89..0d4dd05b11 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/herbiboars/HerbiboarPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/herbiboars/HerbiboarPlugin.java @@ -98,9 +98,6 @@ public class HerbiboarPlugin extends Plugin @Inject private HerbiboarOverlay overlay; - @Inject - private HerbiboarConfig config;; - @Override public Overlay getOverlay() {