From d0822df743fc923639686a45fdefd22f892a67c2 Mon Sep 17 00:00:00 2001 From: Shadowrs Date: Mon, 3 Sep 2018 03:31:22 +0100 Subject: [PATCH] Add missing 'enabled' state to various AbstractDebuggers + only send debug info if when enabled --- src/main/java/org/rev317/min/debug/DBank.java | 31 +++++++++----- .../org/rev317/min/debug/DGroundItems.java | 34 +++++++++++---- src/main/java/org/rev317/min/debug/DNpcs.java | 28 +++++++++++-- .../java/org/rev317/min/debug/DPlayers.java | 28 +++++++++++-- .../org/rev317/min/debug/DSceneObjects.java | 41 ++++++++++++++----- .../java/org/rev317/min/debug/DSkills.java | 11 +++-- 6 files changed, 134 insertions(+), 39 deletions(-) diff --git a/src/main/java/org/rev317/min/debug/DBank.java b/src/main/java/org/rev317/min/debug/DBank.java index 234c17c..ae58a82 100644 --- a/src/main/java/org/rev317/min/debug/DBank.java +++ b/src/main/java/org/rev317/min/debug/DBank.java @@ -1,6 +1,7 @@ package org.rev317.min.debug; import org.parabot.core.paint.AbstractDebugger; +import org.parabot.core.ui.Logger; import org.rev317.min.api.methods.Bank; import org.rev317.min.api.wrappers.Item; @@ -8,28 +9,38 @@ import java.awt.*; public class DBank extends AbstractDebugger { + private boolean enabled; + @Override public void paint(Graphics g) { + if (!Bank.isOpen()) { + return; + } } @Override public boolean isEnabled() { - return false; + return enabled; } @Override public void toggle() { - if (!Bank.isOpen()) { - return; - } + enabled = !enabled; - Item[] items; - if ((items = Bank.getBankItems()) != null) { - for (int i = items.length - 1; i >= 0; i--) { - System.out.println("ID: " + items[i].getId() - + " Stack: " + items[i].getStackSize() - + " Slot: " + items[i].getSlot()); + if (enabled) { + if (!Bank.isOpen()) { + Logger.addMessage("The bank is not open, cannot debug."); + return; + } + + Item[] items; + if ((items = Bank.getBankItems()) != null) { + for (int i = items.length - 1; i >= 0; i--) { + System.out.println("ID: " + items[i].getId() + + " Stack: " + items[i].getStackSize() + + " Slot: " + items[i].getSlot()); + } } } } diff --git a/src/main/java/org/rev317/min/debug/DGroundItems.java b/src/main/java/org/rev317/min/debug/DGroundItems.java index aad7ee2..a3970f0 100644 --- a/src/main/java/org/rev317/min/debug/DGroundItems.java +++ b/src/main/java/org/rev317/min/debug/DGroundItems.java @@ -1,31 +1,49 @@ package org.rev317.min.debug; +import org.parabot.core.Context; import org.parabot.core.paint.AbstractDebugger; +import org.parabot.core.paint.PaintDebugger; +import org.parabot.core.ui.Logger; import org.rev317.min.api.methods.GroundItems; +import org.rev317.min.api.methods.Interfaces; import org.rev317.min.api.wrappers.GroundItem; import java.awt.*; public class DGroundItems extends AbstractDebugger { + private boolean enabled; + private long lastCheck = System.currentTimeMillis(); + private int cached; + @Override public void paint(Graphics g) { - + if (System.currentTimeMillis() - lastCheck > 1000L) { + lastCheck = System.currentTimeMillis(); + cached = GroundItems.getGroundItems().length; + } + PaintDebugger p = Context.getInstance().getPaintDebugger(); + p.addLine("Close Ground Items: " + cached); } @Override public boolean isEnabled() { - return false; + return enabled; } @Override public void toggle() { - GroundItem[] items = GroundItems.getNearest(); - if (items == null || items.length == 0) { - return; - } - for (GroundItem item : items) { - System.out.println("ID: " + item.getId() + " Location: " + item.getLocation()); + enabled = !enabled; + + if (enabled) { + GroundItem[] items = GroundItems.getNearest(); + if (items == null || items.length == 0) { + Logger.addMessage("There are no Ground Items close to you."); + return; + } + for (GroundItem item : items) { + System.out.println("ID: " + item.getId() + " Location: " + item.getLocation()); + } } } } diff --git a/src/main/java/org/rev317/min/debug/DNpcs.java b/src/main/java/org/rev317/min/debug/DNpcs.java index cd6a6ea..e6855a1 100644 --- a/src/main/java/org/rev317/min/debug/DNpcs.java +++ b/src/main/java/org/rev317/min/debug/DNpcs.java @@ -1,27 +1,47 @@ package org.rev317.min.debug; +import org.parabot.core.Context; import org.parabot.core.paint.AbstractDebugger; +import org.parabot.core.paint.PaintDebugger; +import org.parabot.core.ui.Logger; import org.rev317.min.api.methods.Npcs; +import org.rev317.min.api.methods.Players; import org.rev317.min.api.wrappers.Npc; import java.awt.*; public class DNpcs extends AbstractDebugger { + private boolean enabled; + private long lastCheck = System.currentTimeMillis(); + private int cached; + @Override public void paint(Graphics g) { - + if (System.currentTimeMillis() - lastCheck > 1000L) { + lastCheck = System.currentTimeMillis(); + cached = Npcs.getNearest().length; + } + PaintDebugger p = Context.getInstance().getPaintDebugger(); + p.addLine("Close NPCs: " + cached); } @Override public boolean isEnabled() { - return false; + return enabled; } @Override public void toggle() { - for (Npc n : Npcs.getNearest()) { - System.out.println("ID: " + n.getDef().getId() + " Distance: " + n.distanceTo() + " Location: " + n.getLocation().toString()); + enabled = !enabled; + if (enabled) { + if (Npcs.getNearest().length == 0) { + Logger.addMessage("There are no NPCs close to you."); + return; + } + for (Npc n : Npcs.getNearest()) { + System.out.println("ID: " + n.getDef().getId() + " Distance: " + n.distanceTo() + " Location: " + n.getLocation().toString()); + } } } } diff --git a/src/main/java/org/rev317/min/debug/DPlayers.java b/src/main/java/org/rev317/min/debug/DPlayers.java index 859416a..56aa38f 100644 --- a/src/main/java/org/rev317/min/debug/DPlayers.java +++ b/src/main/java/org/rev317/min/debug/DPlayers.java @@ -1,6 +1,10 @@ package org.rev317.min.debug; +import org.parabot.core.Context; import org.parabot.core.paint.AbstractDebugger; +import org.parabot.core.paint.PaintDebugger; +import org.parabot.core.ui.Logger; +import org.rev317.min.api.methods.GroundItems; import org.rev317.min.api.methods.Players; import org.rev317.min.api.wrappers.Player; @@ -10,19 +14,37 @@ import java.awt.*; * @author JKetelaar */ public class DPlayers extends AbstractDebugger { + + private boolean enabled = false; + private long lastCheck = System.currentTimeMillis(); + private int cachedClosePlayerCount; + @Override public void toggle() { - for (Player player : Players.getNearest()) { - System.out.println("Username: " + player.getName() + " Index: " + player.getIndex() + " Distance: " + player.distanceTo() + " Location: " + player.getLocation().toString()); + enabled = !enabled; + if (enabled) { + if (Players.getNearest().length == 0) { + Logger.addMessage("There are no Players close to you."); + return; + } + for (Player player : Players.getNearest()) { + System.out.println("Username: " + player.getName() + " Index: " + player.getIndex() + " Distance: " + player.distanceTo() + " Location: " + player.getLocation().toString()); + } } } @Override public boolean isEnabled() { - return false; + return enabled; } @Override public void paint(Graphics graphics) { + if (System.currentTimeMillis() - lastCheck > 1000L) { + lastCheck = System.currentTimeMillis(); + cachedClosePlayerCount = Players.getNearest().length; + } + PaintDebugger p = Context.getInstance().getPaintDebugger(); + p.addLine("Close Players: " + cachedClosePlayerCount); } } diff --git a/src/main/java/org/rev317/min/debug/DSceneObjects.java b/src/main/java/org/rev317/min/debug/DSceneObjects.java index eab9421..385aa94 100644 --- a/src/main/java/org/rev317/min/debug/DSceneObjects.java +++ b/src/main/java/org/rev317/min/debug/DSceneObjects.java @@ -1,6 +1,10 @@ package org.rev317.min.debug; +import org.parabot.core.Context; import org.parabot.core.paint.AbstractDebugger; +import org.parabot.core.paint.PaintDebugger; +import org.parabot.core.ui.Logger; +import org.rev317.min.api.methods.GroundItems; import org.rev317.min.api.methods.SceneObjects; import org.rev317.min.api.wrappers.SceneObject; @@ -8,28 +12,43 @@ import java.awt.*; public class DSceneObjects extends AbstractDebugger { + private boolean enabled; + private long lastCheck = System.currentTimeMillis(); + private int cached; + @Override public void paint(Graphics g) { + if (System.currentTimeMillis() - lastCheck > 1000L) { + lastCheck = System.currentTimeMillis(); + cached = SceneObjects.getNearest().length; + } + PaintDebugger p = Context.getInstance().getPaintDebugger(); + p.addLine("Close SceneObjects: " + cached); } @Override public boolean isEnabled() { - return false; + return enabled; } @Override public void toggle() { - SceneObject[] objects = SceneObjects.getNearest(); - if (objects == null || objects.length == 0) { - return; - } + enabled = !enabled; - for (int i = objects.length - 1; i >= 0; i--) { - System.out.println( - " ID: " + objects[i].getId() + - " UID: " + objects[i].getHash() + - " Location: " + objects[i].getLocation() + - " Distance: " + objects[i].distanceTo()); + if (enabled) { + SceneObject[] objects = SceneObjects.getNearest(); + if (objects == null || objects.length == 0) { + Logger.addMessage("There are no GameObjects around you."); + return; + } + + for (int i = objects.length - 1; i >= 0; i--) { + System.out.println( + " ID: " + objects[i].getId() + + " UID: " + objects[i].getHash() + + " Location: " + objects[i].getLocation() + + " Distance: " + objects[i].distanceTo()); + } } } } diff --git a/src/main/java/org/rev317/min/debug/DSkills.java b/src/main/java/org/rev317/min/debug/DSkills.java index 288efe3..2c7092f 100644 --- a/src/main/java/org/rev317/min/debug/DSkills.java +++ b/src/main/java/org/rev317/min/debug/DSkills.java @@ -7,16 +7,21 @@ import java.awt.*; public class DSkills extends AbstractDebugger { + private boolean enabled; + @Override public void toggle() { - for (Skill skill : Skill.values()){ - System.out.println(String.format("%s level: %d / %d", skill.getName(), skill.getLevel(), skill.getRealLevel())); + enabled = !enabled; + if (enabled) { + for (Skill skill : Skill.values()) { + System.out.println(String.format("%s level: %d / %d (exp: %s)", skill.getName(), skill.getLevel(), skill.getRealLevel(), skill.getExperience())); + } } } @Override public boolean isEnabled() { - return false; + return enabled; } @Override