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

Merge pull request #2747 from Abextm/revert-varbit-event-defer

Browse Source 
Revert #2530 "Make VarbitChanged only fire once..."
This commit is contained in:
Adam
2018-05-15 10:07:10 -04:00
committed by GitHub
parent 01fc179664 669b0a0ab9
commit a72d010794
3 changed files with 3 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
runelite-api/src/main/java/net/runelite/api/Client.java
View File

@@ -192,8 +192,6 @@ public interface Client extends GameEngine
@VisibleForDevtools @VisibleForDevtools
void setVarbitValue(int varbit, int value); void setVarbitValue(int varbit, int value);
boolean shouldPostVarbitEvent();
HashTable getWidgetFlags(); HashTable getWidgetFlags();
HashTable getComponentTable(); HashTable getComponentTable();

7
runelite-client/src/main/java/net/runelite/client/callback/Hooks.java
View File

@@ -64,7 +64,6 @@ import net.runelite.api.events.MenuOptionClicked;
import net.runelite.api.events.PostItemComposition; import net.runelite.api.events.PostItemComposition;
import net.runelite.api.events.ProjectileMoved; import net.runelite.api.events.ProjectileMoved;
import net.runelite.api.events.SetMessage; import net.runelite.api.events.SetMessage;
import net.runelite.api.events.VarbitChanged;
import net.runelite.api.widgets.Widget; import net.runelite.api.widgets.Widget;
import static net.runelite.api.widgets.WidgetInfo.WORLD_MAP_VIEW; import static net.runelite.api.widgets.WidgetInfo.WORLD_MAP_VIEW;
import net.runelite.client.Notifier; import net.runelite.client.Notifier;
@@ -103,7 +102,6 @@ public class Hooks
private static final GameTick tick = new GameTick(); private static final GameTick tick = new GameTick();
private static final DrawManager renderHooks = injector.getInstance(DrawManager.class); private static final DrawManager renderHooks = injector.getInstance(DrawManager.class);
private static final Notifier notifier = injector.getInstance(Notifier.class); private static final Notifier notifier = injector.getInstance(Notifier.class);
private static final VarbitChanged varbitChanged = new VarbitChanged();
private static Dimension lastStretchedDimensions; private static Dimension lastStretchedDimensions;
private static BufferedImage stretchedImage; private static BufferedImage stretchedImage;
@@ -118,11 +116,6 @@ public class Hooks
{ {
shouldProcessGameTick = false; shouldProcessGameTick = false;
if (client.shouldPostVarbitEvent())
{
eventBus.post(varbitChanged);
}
_deferredEventBus.replay(); _deferredEventBus.replay();
eventBus.post(tick); eventBus.post(tick);

16
runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java
View File

@@ -78,6 +78,7 @@ import net.runelite.api.events.PlayerMenuOptionsChanged;
import net.runelite.api.events.PlayerSpawned; import net.runelite.api.events.PlayerSpawned;
import net.runelite.api.events.ResizeableChanged; import net.runelite.api.events.ResizeableChanged;
import net.runelite.api.events.UsernameChanged; import net.runelite.api.events.UsernameChanged;
import net.runelite.api.events.VarbitChanged;
import net.runelite.api.events.WidgetLoaded; import net.runelite.api.events.WidgetLoaded;
import net.runelite.api.mixins.Copy; import net.runelite.api.mixins.Copy;
import net.runelite.api.mixins.FieldHook; import net.runelite.api.mixins.FieldHook;
@@ -135,9 +136,6 @@ public abstract class RSClientMixin implements RSClient
@Inject @Inject
private static int inventoryDragDelay; private static int inventoryDragDelay;
@Inject
private static boolean hasVarbitChanged;
@Inject @Inject
private static int oldMenuEntryCount; private static int oldMenuEntryCount;
@@ -872,16 +870,8 @@ public abstract class RSClientMixin implements RSClient
@Inject @Inject
public static void settingsChanged(int idx) public static void settingsChanged(int idx)
{ {
hasVarbitChanged = true; VarbitChanged varbitChanged = new VarbitChanged();
} eventBus.post(varbitChanged);
@Inject
@Override
public boolean shouldPostVarbitEvent()
{
boolean ret = hasVarbitChanged;
hasVarbitChanged = false;
return ret;
} }
@FieldHook("isResized") @FieldHook("isResized")