Merge branch 'master' into runelite-master-1
This commit is contained in:
@@ -251,7 +251,7 @@ public abstract class RSActorMixin implements RSActor
|
||||
{
|
||||
client.getLogger().debug("You died!");
|
||||
|
||||
LocalPlayerDeath event = new LocalPlayerDeath();
|
||||
LocalPlayerDeath event = LocalPlayerDeath.INSTANCE;
|
||||
client.getCallbacks().post(event);
|
||||
}
|
||||
else if (this instanceof RSNPC)
|
||||
|
||||
@@ -1094,14 +1094,14 @@ public abstract class RSClientMixin implements RSClient
|
||||
@Inject
|
||||
public static void canvasWidthChanged(int idx)
|
||||
{
|
||||
client.getCallbacks().post(new CanvasSizeChanged());
|
||||
client.getCallbacks().post(CanvasSizeChanged.INSTANCE);
|
||||
}
|
||||
|
||||
@FieldHook("canvasHeight")
|
||||
@Inject
|
||||
public static void canvasHeightChanged(int idx)
|
||||
{
|
||||
client.getCallbacks().post(new CanvasSizeChanged());
|
||||
client.getCallbacks().post(CanvasSizeChanged.INSTANCE);
|
||||
}
|
||||
|
||||
@Inject
|
||||
@@ -1272,7 +1272,7 @@ public abstract class RSClientMixin implements RSClient
|
||||
@Inject
|
||||
public static void onUsernameChanged(int idx)
|
||||
{
|
||||
client.getCallbacks().post(new UsernameChanged());
|
||||
client.getCallbacks().post(UsernameChanged.INSTANCE);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -1304,7 +1304,6 @@ public abstract class RSClientMixin implements RSClient
|
||||
final MenuOpened event = new MenuOpened();
|
||||
event.setMenuEntries(getMenuEntries());
|
||||
callbacks.post(event);
|
||||
client.setMenuEntries(event.getMenuEntries());
|
||||
}
|
||||
|
||||
@Inject
|
||||
@@ -1515,7 +1514,7 @@ public abstract class RSClientMixin implements RSClient
|
||||
@FieldHook("cycleCntr")
|
||||
public static void onCycleCntrChanged(int idx)
|
||||
{
|
||||
client.getCallbacks().post(new ClientTick());
|
||||
client.getCallbacks().post(ClientTick.INSTANCE);
|
||||
}
|
||||
|
||||
@Copy("shouldLeftClickOpenMenu")
|
||||
|
||||
@@ -496,7 +496,7 @@ public abstract class RSWidgetMixin implements RSWidget
|
||||
|
||||
client.getLogger().trace("Posting widget position changed");
|
||||
|
||||
WidgetPositioned widgetPositioned = new WidgetPositioned();
|
||||
WidgetPositioned widgetPositioned = WidgetPositioned.INSTANCE;
|
||||
client.getCallbacks().postDeferred(widgetPositioned);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user