ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Even more fixes/improvements (#357)

Browse Source 
* Check if menu is open for spellbook mouse listener, use MiscUtils.clamp

* Remove copied methods to just use them, save 31 bits of memory
This commit is contained in:
Lucwousin
2019-05-22 04:06:48 +02:00
committed by Kyleeld
parent f02af964a5
commit 5679eff9c4
2 changed files with 32 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
runelite-client/src/main/java/net/runelite/client/plugins/batools/BAToolsPlugin.java
View File

@@ -41,7 +41,6 @@ import lombok.extern.slf4j.Slf4j;
import net.runelite.api.Actor;
import net.runelite.api.ChatMessageType;
import net.runelite.api.Client;
import static net.runelite.api.Constants.CHUNK_SIZE;
import net.runelite.api.ItemID;
import net.runelite.api.MenuEntry;
import net.runelite.api.NPC;
@@ -102,11 +101,12 @@ import org.apache.commons.lang3.ArrayUtils;
)
public class BAToolsPlugin extends Plugin implements KeyListener
{
private int inGameBit = 0;
private boolean inGame;
private int tickNum;
private int pastCall = 0;
private int currentWave = 1;
private static final int BA_WAVE_NUM_INDEX = 2;
private static final WorldPoint healerSpawnPoint = new WorldPoint(1898, 1586, 0);
private final List<MenuEntry> entries = new ArrayList<>();
private ImmutableMap<WidgetInfo, Boolean> originalAttackStyles;
private HashMap<Integer, Instant> foodPressed = new HashMap<>();
@@ -165,7 +165,7 @@ public class BAToolsPlugin extends Plugin implements KeyListener
{
removeCounter();
healers.clear();
inGameBit = 0;
inGame = false;
lastInteracted = null;
overlayManager.remove(overlay);
keyManager.unregisterKeyListener(this);
@@ -198,7 +198,7 @@ public class BAToolsPlugin extends Plugin implements KeyListener
}
pastCall = callWidget.getTextColor();
}
if (inGameBit == 1 && config.defTimer())
if (inGame && config.defTimer())
{
if (tickNum > 9)
{
@@ -218,7 +218,7 @@ public class BAToolsPlugin extends Plugin implements KeyListener
if (config.attackStyles()
&& weapon != null
&& inGameBit == 1
&& inGame
&& weapon.getText().contains("Crystal halberd") || weapon.getText().contains("Dragon claws")
&& client.getWidget(BA_ATK_LISTEN_TEXT) != null)
{
@@ -319,13 +319,14 @@ public class BAToolsPlugin extends Plugin implements KeyListener
@Subscribe
public void onVarbitChanged(VarbitChanged event)
{
int inGame = client.getVar(Varbits.IN_GAME_BA);
int inGameBit = client.getVar(Varbits.IN_GAME_BA);
if (inGameBit != inGame)
if (inGameBit == 1 && !inGame ||
inGameBit == 0 && inGame)
{
inGameBit = inGame;
inGame = inGameBit == 1;
if (inGameBit == 0)
if (!inGame)
{
pastCall = 0;
removeCounter();
@@ -356,7 +357,7 @@ public class BAToolsPlugin extends Plugin implements KeyListener
{
NPC npc = event.getNpc();
if (isNpcHealer(npc.getId()))
if (inGame && isNpcHealer(npc.getId()))
{
if (checkNewSpawn(npc) || Duration.between(wave_start, Instant.now()).getSeconds() < 16)
{
@@ -576,7 +577,7 @@ public class BAToolsPlugin extends Plugin implements KeyListener
}
if (inGameBit == 1 && config.healerMenuOption() && event.getTarget().contains("Penance Healer"))
if (inGame && config.healerMenuOption() && event.getTarget().contains("Penance Healer"))
{
MenuEntry[] menuEntries = client.getMenuEntries();
@@ -600,7 +601,7 @@ public class BAToolsPlugin extends Plugin implements KeyListener
client.setMenuEntries(menuEntries);
}
if (client.getWidget(BA_COLL_LISTEN_TEXT) != null && inGameBit == 1 && config.eggBoi() && event.getTarget().endsWith("egg") && shiftDown)
if (client.getWidget(BA_COLL_LISTEN_TEXT) != null && inGame && config.eggBoi() && event.getTarget().endsWith("egg") && shiftDown)
{
String[] currentCall = client.getWidget(BA_COLL_LISTEN_TEXT).getText().split(" ");
@@ -626,7 +627,7 @@ public class BAToolsPlugin extends Plugin implements KeyListener
client.setMenuEntries(entries.toArray(new MenuEntry[0]));
}
if (client.getWidget(BA_HEAL_LISTEN_TEXT) != null && inGameBit == 1 && config.osHelp() && event.getTarget().equals("<col=ffff>Healer item machine") && shiftDown)
if (client.getWidget(BA_HEAL_LISTEN_TEXT) != null && inGame && config.osHelp() && event.getTarget().equals("<col=ffff>Healer item machine") && shiftDown)
{
String[] currentCall = client.getWidget(BA_HEAL_LISTEN_TEXT).getText().split(" ");
@@ -756,59 +757,13 @@ public class BAToolsPlugin extends Plugin implements KeyListener
return -1;
}
private static WorldPoint rotate(WorldPoint point, int rotation)
{
int chunkX = point.getX() & -CHUNK_SIZE;
int chunkY = point.getY() & -CHUNK_SIZE;
int x = point.getX() & (CHUNK_SIZE - 1);
int y = point.getY() & (CHUNK_SIZE - 1);
switch (rotation)
{
case 1:
return new WorldPoint(chunkX + y, chunkY + (CHUNK_SIZE - 1 - x), point.getPlane());
case 2:
return new WorldPoint(chunkX + (CHUNK_SIZE - 1 - x), chunkY + (CHUNK_SIZE - 1 - y), point.getPlane());
case 3:
return new WorldPoint(chunkX + (CHUNK_SIZE - 1 - y), chunkY + x, point.getPlane());
}
return point;
}
private boolean checkNewSpawn(NPC npc)
{
int regionId = 7509;
int regionX = 42;
int regionY = 46;
int z = 0;
// world point of the tile marker
WorldPoint worldPoint = new WorldPoint(
((regionId >>> 8) << 6) + regionX,
((regionId & 0xff) << 6) + regionY,
z
);
int[][][] instanceTemplateChunks = client.getInstanceTemplateChunks();
for (int x = 0; x < instanceTemplateChunks[z].length; ++x)
for (WorldPoint p : WorldPoint.toLocalInstance(client, healerSpawnPoint))
{
for (int y = 0; y < instanceTemplateChunks[z][x].length; ++y)
if (p.distanceTo(npc.getWorldLocation()) < 5)
{
int chunkData = instanceTemplateChunks[z][x][y];
int rotation = chunkData >> 1 & 0x3;
int templateChunkY = (chunkData >> 3 & 0x7FF) * CHUNK_SIZE;
int templateChunkX = (chunkData >> 14 & 0x3FF) * CHUNK_SIZE;
if (worldPoint.getX() >= templateChunkX && worldPoint.getX() < templateChunkX + CHUNK_SIZE
&& worldPoint.getY() >= templateChunkY && worldPoint.getY() < templateChunkY + CHUNK_SIZE)
{
WorldPoint p = new WorldPoint(client.getBaseX() + x * CHUNK_SIZE + (worldPoint.getX() & (CHUNK_SIZE - 1)),
client.getBaseY() + y * CHUNK_SIZE + (worldPoint.getY() & (CHUNK_SIZE - 1)),
worldPoint.getPlane());
p = rotate(p, rotation);
if (p.distanceTo(npc.getWorldLocation()) < 5)
{
return true;
}
}
return true;
}
}
return false;

29
runelite-client/src/main/java/net/runelite/client/plugins/spellbook/SpellbookPlugin.java
View File

@@ -56,6 +56,7 @@ import net.runelite.client.eventbus.Subscribe;
import net.runelite.client.input.MouseManager;
import net.runelite.client.menus.MenuManager;
import net.runelite.client.menus.WidgetMenuOption;
import static net.runelite.client.util.MiscUtils.clamp;
import net.runelite.client.plugins.Plugin;
import net.runelite.client.plugins.PluginDescriptor;
import net.runelite.client.plugins.PluginType;
@@ -308,7 +309,9 @@ public class SpellbookPlugin extends Plugin
@Subscribe
public void onScriptCallbackEvent(ScriptCallbackEvent event)
{
if (client.getVar(Varbits.FILTER_SPELLBOOK) != 0 || !config.enableMobile() || !event.getEventName().toLowerCase().contains("spell"))
if (client.getVar(Varbits.FILTER_SPELLBOOK) != 0
|| !config.enableMobile()
|| !event.getEventName().toLowerCase().contains("spell"))
{
return;
}
@@ -363,7 +366,7 @@ public class SpellbookPlugin extends Plugin
else if ("resizeSpell".equals(event.getEventName()))
{
int size = config.size();
int columns = clamp(FULL_WIDTH / size, 3, 2);
int columns = clamp(FULL_WIDTH / size, 2, 3);
iStack[iStackSize - 2] = size;
iStack[iStackSize - 1] = columns;
@@ -399,7 +402,7 @@ public class SpellbookPlugin extends Plugin
Spell spell = spells.get(widget);
int newSize = clamp(trueSize(spell), FULL_WIDTH, 0);
int newSize = clamp(trueSize(spell), 0, FULL_WIDTH);
iStack[iStackSize - 3] = newSize;
iStack[iStackSize - 2] = newSize;
@@ -509,7 +512,10 @@ public class SpellbookPlugin extends Plugin
boolean isOnSpellWidget(java.awt.Point point)
{
Widget boundsWidget = client.getWidget(WidgetInfo.SPELLBOOK_FILTERED_BOUNDS);
if (client.getVar(VarClientInt.INVENTORY_TAB) != 6 || boundsWidget == null || !boundsWidget.getBounds().contains(point))
if (client.getVar(VarClientInt.INVENTORY_TAB) != 6
|| client.isMenuOpen()
|| boundsWidget == null
|| !boundsWidget.getBounds().contains(point))
{
return false;
}
@@ -549,8 +555,8 @@ public class SpellbookPlugin extends Plugin
int y = point.y - draggingLocation.getY() - parentPos.getY();
int size = draggingWidget.getWidth();
x = clamp(x, FULL_WIDTH - size, 0);
y = clamp(y, FULL_HEIGHT - size, 0);
x = clamp(x, 0, FULL_WIDTH - size);
y = clamp(y, 0, FULL_HEIGHT - size);
int draggedID = draggingWidget.getId();
Spell n = spells.get(draggedID);
@@ -606,14 +612,14 @@ public class SpellbookPlugin extends Plugin
if (trueSize(scrolledSpell) > FULL_WIDTH - 2)
{
scrolledSpell.setX(0);
scrolledSpell.setY(clamp(scrolledSpell.getY(), FULL_HEIGHT - FULL_WIDTH, 0));
scrolledSpell.setY(clamp(scrolledSpell.getY(), 0, FULL_HEIGHT - FULL_WIDTH));
return;
}
scrolledSpell.setSize(scrolledSpell.getSize() + 1);
scrolledSpell.setX(clamp(scrolledSpell.getX() - 1, FULL_WIDTH - trueSize(scrolledSpell), 0));
scrolledSpell.setY(clamp(scrolledSpell.getY() - 1, FULL_HEIGHT - trueSize(scrolledSpell), 0));
scrolledSpell.setX(clamp(scrolledSpell.getX() - 1, 0, FULL_WIDTH - trueSize(scrolledSpell)));
scrolledSpell.setY(clamp(scrolledSpell.getY() - 1, 0, FULL_HEIGHT - trueSize(scrolledSpell)));
tmp.put(scrolledWidgetId, scrolledSpell);
@@ -655,11 +661,6 @@ public class SpellbookPlugin extends Plugin
runRebuild();
}
private static int clamp(int i, int upper, int lower)
{
return Math.min(Math.max(i, lower), upper);
}
void decreaseSize(java.awt.Point point)
{
Widget scrolledWidget = currentWidget(point);