Merge Varcs into Client::getVar

This commit is contained in:
Max Weber
2018-04-30 16:17:04 -06:00
parent 33d6b9bdb7
commit 7f190f2534
8 changed files with 23 additions and 94 deletions

View File

@@ -34,7 +34,6 @@ import javax.inject.Singleton;
import lombok.extern.slf4j.Slf4j;
import net.runelite.api.Client;
import net.runelite.api.VarClientStr;
import net.runelite.api.Varcs;
import net.runelite.api.events.CommandExecuted;
import net.runelite.api.events.ScriptCallbackEvent;
@@ -62,8 +61,7 @@ public class CommandManager
}
Client client = clientProvider.get();
Varcs varcs = client.getVarcs();
String typedText = varcs.getStrVar(VarClientStr.CHATBOX_TYPED_TEXT).substring(2); // strip ::
String typedText = client.getVar(VarClientStr.CHATBOX_TYPED_TEXT).substring(2); // strip ::
log.debug("Command: {}", typedText);

View File

@@ -31,7 +31,6 @@ import javax.inject.Inject;
import net.runelite.api.Client;
import net.runelite.api.MenuEntry;
import net.runelite.api.VarClientInt;
import net.runelite.api.Varcs;
import net.runelite.api.widgets.Widget;
import net.runelite.api.widgets.WidgetInfo;
import net.runelite.client.ui.overlay.Overlay;
@@ -112,8 +111,7 @@ class MouseHighlightOverlay extends Overlay
if (widget != null)
{
// If this varc is set, some CS is showing tooltip
Varcs varcs = client.getVarcs();
int tooltipTimeout = varcs.getIntVar(VarClientInt.TOOLTIP_TIMEOUT);
int tooltipTimeout = client.getVar(VarClientInt.TOOLTIP_TIMEOUT);
if (tooltipTimeout > client.getGameCycle())
{
return null;