From 00de080ac273a7111ae785a275581f4064a73973 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 14:31:34 +0200 Subject: [PATCH] babyhydra: Merge nested is statements --- .../hydra/BabyHydraIndicatorOverlay.java | 15 ++-- .../plugins/hydra/BabyHydraOverlay.java | 63 +++++++------ .../client/plugins/hydra/BabyHydraPlugin.java | 19 ++-- .../plugins/hydra/BabyHydraPrayOverlay.java | 90 +++++++++---------- 4 files changed, 83 insertions(+), 104 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraIndicatorOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraIndicatorOverlay.java index 610352bd86..751db82ee1 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraIndicatorOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraIndicatorOverlay.java @@ -53,17 +53,14 @@ public class BabyHydraIndicatorOverlay extends Overlay @Override public Dimension render(Graphics2D graphics) { - if (plugin.getHydra() != null) + if (plugin.getHydra() != null && plugin.getHydras().containsKey(plugin.getHydra().getIndex())) { - if (plugin.getHydras().containsKey(plugin.getHydra().getIndex())) + int val = plugin.getHydras().get(plugin.getHydra().getIndex()); + if (val != 0) { - int val = plugin.getHydras().get(plugin.getHydra().getIndex()); - if (val != 0) - { - panelComponent.getChildren().clear(); - panelComponent.getChildren().add(LineComponent.builder().right(Integer.toString(val)).build()); - return panelComponent.render(graphics); - } + panelComponent.getChildren().clear(); + panelComponent.getChildren().add(LineComponent.builder().right(Integer.toString(val)).build()); + return panelComponent.render(graphics); } } return null; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraOverlay.java index 58456a4ef3..3e392cd878 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraOverlay.java @@ -65,52 +65,49 @@ public class BabyHydraOverlay extends Overlay { continue; } - if (hydra.getName().equalsIgnoreCase("Hydra")) + if (hydra.getName().equalsIgnoreCase("Hydra") && plugin.getHydras().containsKey(hydra.getIndex())) { - if (plugin.getHydras().containsKey(hydra.getIndex())) + int val = plugin.getHydras().get(hydra.getIndex()); + if (val != 0) { - int val = plugin.getHydras().get(hydra.getIndex()); - if (val != 0) + if (plugin.isBoldText()) { - if (plugin.isBoldText()) - { - graphics.setFont(FontManager.getRunescapeBoldFont()); - } - if (plugin.getHydraattacks().containsKey(hydra.getIndex())) - { - int attack = plugin.getHydraattacks().get(hydra.getIndex()); + graphics.setFont(FontManager.getRunescapeBoldFont()); + } + if (plugin.getHydraattacks().containsKey(hydra.getIndex())) + { + int attack = plugin.getHydraattacks().get(hydra.getIndex()); - Point textLocation = hydra.getCanvasTextLocation(graphics, "TEMP!!", hydra.getLogicalHeight() + 100); + Point textLocation = hydra.getCanvasTextLocation(graphics, "TEMP!!", hydra.getLogicalHeight() + 100); - if (textLocation != null && attack == 8261) + if (textLocation != null && attack == 8261) + { + if (val == 3) { - if (val == 3) - { - OverlayUtil.renderTextLocation(graphics, textLocation, "MAGE", Color.BLUE); - } - else - { - OverlayUtil.renderTextLocation(graphics, textLocation, "RANGE", Color.GREEN); - } + OverlayUtil.renderTextLocation(graphics, textLocation, "MAGE", Color.BLUE); } - else if (textLocation != null && attack == 8262) + else { - if (val == 3) - { - OverlayUtil.renderTextLocation(graphics, textLocation, "RANGE", Color.GREEN); - } - else - { - OverlayUtil.renderTextLocation(graphics, textLocation, "MAGE", Color.BLUE); - } + OverlayUtil.renderTextLocation(graphics, textLocation, "RANGE", Color.GREEN); } } - Point hydraPoint = hydra.getCanvasTextLocation(graphics, Integer.toString(val), hydra.getLogicalHeight() + 40); - if (hydraPoint != null) + else if (textLocation != null && attack == 8262) { - OverlayUtil.renderTextLocation(graphics, hydraPoint, Integer.toString(val), Color.WHITE); + if (val == 3) + { + OverlayUtil.renderTextLocation(graphics, textLocation, "RANGE", Color.GREEN); + } + else + { + OverlayUtil.renderTextLocation(graphics, textLocation, "MAGE", Color.BLUE); + } } } + Point hydraPoint = hydra.getCanvasTextLocation(graphics, Integer.toString(val), hydra.getLogicalHeight() + 40); + if (hydraPoint != null) + { + OverlayUtil.renderTextLocation(graphics, hydraPoint, Integer.toString(val), Color.WHITE); + } } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraPlugin.java index c0c6e28536..8c2f0fff42 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraPlugin.java @@ -159,15 +159,9 @@ public class BabyHydraPlugin extends Plugin public void onNpcSpawned(NpcSpawned event) { NPC hydra = event.getNpc(); - if (hydra.getCombatLevel() != 0 && hydra.getName() != null) + if (hydra.getCombatLevel() != 0 && hydra.getName() != null && hydra.getName().equalsIgnoreCase("Hydra") && !hydras.containsKey(hydra.getIndex())) { - if (hydra.getName().equalsIgnoreCase("Hydra")) - { - if (!hydras.containsKey(hydra.getIndex())) - { - hydras.put(hydra.getIndex(), 3); - } - } + hydras.put(hydra.getIndex(), 3); } } @@ -175,13 +169,10 @@ public class BabyHydraPlugin extends Plugin public void onNpcDespawned(NpcDespawned event) { NPC hydra = event.getNpc(); - if (hydra.getCombatLevel() != 0 && hydra.getName() != null) + if (hydra.getCombatLevel() != 0 && hydra.getName() != null && hydra.getName().equalsIgnoreCase("Hydra")) { - if (hydra.getName().equalsIgnoreCase("Hydra")) - { - hydras.remove(hydra.getIndex()); - hydraattacks.remove(hydra.getIndex()); - } + hydras.remove(hydra.getIndex()); + hydraattacks.remove(hydra.getIndex()); } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraPrayOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraPrayOverlay.java index cf56196e21..193522eeb0 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraPrayOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraPrayOverlay.java @@ -78,62 +78,56 @@ public class BabyHydraPrayOverlay extends Overlay PRAY_RANGED = spriteManager.getSprite(SpriteID.PRAYER_PROTECT_FROM_MISSILES, 0); } - if (plugin.getHydra() != null) + if (plugin.getHydra() != null && plugin.getHydras().containsKey(plugin.getHydra().getIndex())) { - if (plugin.getHydras().containsKey(plugin.getHydra().getIndex())) + int val = plugin.getHydras().get(plugin.getHydra().getIndex()); + if (val != 0 && plugin.getHydraattacks().containsKey(plugin.getHydra().getIndex())) { - int val = plugin.getHydras().get(plugin.getHydra().getIndex()); - if (val != 0) + int attack = plugin.getHydraattacks().get(plugin.getHydra().getIndex()); + if (attack == 8261) { - if (plugin.getHydraattacks().containsKey(plugin.getHydra().getIndex())) + if (val == 3) { - int attack = plugin.getHydraattacks().get(plugin.getHydra().getIndex()); - if (attack == 8261) - { - if (val == 3) - { - imagePanelComponent.getChildren().clear(); - imagePanelComponent.getChildren().add(new ImageComponent(PRAY_MAGE)); - imagePanelComponent.setBackgroundColor(client.isPrayerActive(Prayer.PROTECT_FROM_MAGIC) - ? ComponentConstants.STANDARD_BACKGROUND_COLOR - : NOT_ACTIVATED_BACKGROUND_COLOR); + imagePanelComponent.getChildren().clear(); + imagePanelComponent.getChildren().add(new ImageComponent(PRAY_MAGE)); + imagePanelComponent.setBackgroundColor(client.isPrayerActive(Prayer.PROTECT_FROM_MAGIC) + ? ComponentConstants.STANDARD_BACKGROUND_COLOR + : NOT_ACTIVATED_BACKGROUND_COLOR); - return imagePanelComponent.render(graphics); - } - else - { - imagePanelComponent.getChildren().clear(); - imagePanelComponent.getChildren().add(new ImageComponent(PRAY_RANGED)); - imagePanelComponent.setBackgroundColor(client.isPrayerActive(Prayer.PROTECT_FROM_MISSILES) - ? ComponentConstants.STANDARD_BACKGROUND_COLOR - : NOT_ACTIVATED_BACKGROUND_COLOR); + return imagePanelComponent.render(graphics); + } + else + { + imagePanelComponent.getChildren().clear(); + imagePanelComponent.getChildren().add(new ImageComponent(PRAY_RANGED)); + imagePanelComponent.setBackgroundColor(client.isPrayerActive(Prayer.PROTECT_FROM_MISSILES) + ? ComponentConstants.STANDARD_BACKGROUND_COLOR + : NOT_ACTIVATED_BACKGROUND_COLOR); - return imagePanelComponent.render(graphics); - } - } - else if (attack == 8262) - { - if (val == 3) - { - imagePanelComponent.getChildren().clear(); - imagePanelComponent.getChildren().add(new ImageComponent(PRAY_RANGED)); - imagePanelComponent.setBackgroundColor(client.isPrayerActive(Prayer.PROTECT_FROM_MISSILES) - ? ComponentConstants.STANDARD_BACKGROUND_COLOR - : NOT_ACTIVATED_BACKGROUND_COLOR); + return imagePanelComponent.render(graphics); + } + } + else if (attack == 8262) + { + if (val == 3) + { + imagePanelComponent.getChildren().clear(); + imagePanelComponent.getChildren().add(new ImageComponent(PRAY_RANGED)); + imagePanelComponent.setBackgroundColor(client.isPrayerActive(Prayer.PROTECT_FROM_MISSILES) + ? ComponentConstants.STANDARD_BACKGROUND_COLOR + : NOT_ACTIVATED_BACKGROUND_COLOR); - return imagePanelComponent.render(graphics); - } - else - { - imagePanelComponent.getChildren().clear(); - imagePanelComponent.getChildren().add(new ImageComponent(PRAY_MAGE)); - imagePanelComponent.setBackgroundColor(client.isPrayerActive(Prayer.PROTECT_FROM_MAGIC) - ? ComponentConstants.STANDARD_BACKGROUND_COLOR - : NOT_ACTIVATED_BACKGROUND_COLOR); + return imagePanelComponent.render(graphics); + } + else + { + imagePanelComponent.getChildren().clear(); + imagePanelComponent.getChildren().add(new ImageComponent(PRAY_MAGE)); + imagePanelComponent.setBackgroundColor(client.isPrayerActive(Prayer.PROTECT_FROM_MAGIC) + ? ComponentConstants.STANDARD_BACKGROUND_COLOR + : NOT_ACTIVATED_BACKGROUND_COLOR); - return imagePanelComponent.render(graphics); - } - } + return imagePanelComponent.render(graphics); } } }