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

openrune: just about finish rework, gets to login

Browse Source
This commit is contained in:
therealunull
2020-12-13 15:12:37 -05:00
parent 11a239e94e
commit b54ff7f7db
693 changed files with 11362 additions and 3943 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
runelite-mixins/src/main/java/net/runelite/mixins/EntityHiderMixin.java
View File

@@ -190,7 +190,7 @@ public abstract class EntityHiderMixin implements RSScene
if (hidePets)
{
if (npc.getDefinition().isFollower())
if (npc.getComposition().isFollower())
{
return false;
}

2
runelite-mixins/src/main/java/net/runelite/mixins/LoginScreenMixin.java
View File

@@ -96,7 +96,7 @@ public abstract class LoginScreenMixin implements RSClient
if (loginscreen != null && loginscreen.getWidth() > 383)
{
client.setRightTitleSprite(client.createSprite(new int[]{loginscreen.getPixels()[383]}, 1, 1));
client.setRightTitleSprite(client.createSpritePixels(new int[]{loginscreen.getPixels()[383]}, 1, 1));
}
}
}

20
runelite-mixins/src/main/java/net/runelite/mixins/MenuMixin.java
View File

@@ -184,12 +184,12 @@ public abstract class MenuMixin implements RSClient
public void setLeftClickMenuEntry(final MenuEntry entry)
{
final int i = getMenuOptionCount() - 1;
getMenuOptions()[i] = entry.getOption();
getMenuTargets()[i] = entry.getTarget();
getMenuIdentifiers()[i] = entry.getIdentifier();
getMenuOptions()[i] = entry.getMenuOption();
getMenuTargets()[i] = entry.getMenuTarget();
getMenuIdentifiers()[i] = entry.getType();
getMenuOpcodes()[i] = entry.getOpcode();
getMenuArguments1()[i] = entry.getParam0();
getMenuArguments2()[i] = entry.getParam1();
getMenuArguments1()[i] = entry.getActionParam0();
getMenuArguments2()[i] = entry.getWidgetId();
getMenuForceLeftClick()[i] = entry.isForceLeftClick();
}
@@ -199,7 +199,7 @@ public abstract class MenuMixin implements RSClient
{
if (tempMenuAction != null)
{
client.getCallbacks().post(WidgetPressed.class, WidgetPressed.INSTANCE);
client.getCallbacks().post(WidgetPressed.INSTANCE);
}
}
@@ -212,10 +212,10 @@ public abstract class MenuMixin implements RSClient
return;
}
tempMenuAction.setOption(entry.getOption());
tempMenuAction.setOption(entry.getMenuOption());
tempMenuAction.setOpcode(entry.getOpcode());
tempMenuAction.setIdentifier(entry.getIdentifier());
tempMenuAction.setParam0(entry.getParam0());
tempMenuAction.setParam1(entry.getParam1());
tempMenuAction.setIdentifier(entry.getType());
tempMenuAction.setParam0(entry.getActionParam0());
tempMenuAction.setParam1(entry.getWidgetId());
}
}

2
runelite-mixins/src/main/java/net/runelite/mixins/MinimapMixin.java
View File

@@ -38,7 +38,7 @@ public abstract class MinimapMixin implements RSClient
@Override
public RSSpritePixels drawInstanceMap(int z)
{
RSSpritePixels ourSprite = createSprite(new int[512 * 512], 512, 512);
RSSpritePixels ourSprite = createSpritePixels(new int[512 * 512], 512, 512);
RSSpritePixels theirSprite = getMinimapSprite();
RSScene scene = getScene();

14
runelite-mixins/src/main/java/net/runelite/mixins/RSActorMixin.java
View File

@@ -190,7 +190,7 @@ public abstract class RSActorMixin implements RSActor
{
AnimationChanged animationChange = new AnimationChanged();
animationChange.setActor(this);
client.getCallbacks().post(AnimationChanged.class, animationChange);
client.getCallbacks().post(animationChange);
}
@FieldHook("spotAnimation")
@@ -199,7 +199,7 @@ public abstract class RSActorMixin implements RSActor
{
SpotAnimationChanged spotAnimationChanged = new SpotAnimationChanged();
spotAnimationChanged.setActor(this);
client.getCallbacks().post(SpotAnimationChanged.class, spotAnimationChanged);
client.getCallbacks().post(spotAnimationChanged);
}
@FieldHook("targetIndex")
@@ -207,7 +207,7 @@ public abstract class RSActorMixin implements RSActor
public void interactingChanged(int idx)
{
InteractingChanged interactingChanged = new InteractingChanged(this, getInteracting());
client.getCallbacks().post(InteractingChanged.class, interactingChanged);
client.getCallbacks().post(interactingChanged);
}
@FieldHook("overheadText")
@@ -218,7 +218,7 @@ public abstract class RSActorMixin implements RSActor
if (overheadText != null)
{
OverheadTextChanged overheadTextChanged = new OverheadTextChanged(this, overheadText);
client.getCallbacks().post(OverheadTextChanged.class, overheadTextChanged);
client.getCallbacks().post(overheadTextChanged);
}
}
@@ -229,7 +229,7 @@ public abstract class RSActorMixin implements RSActor
int size = 1;
if (this instanceof NPC)
{
NPCComposition composition = ((NPC)this).getDefinition();
NPCComposition composition = ((NPC)this).getComposition();
if (composition != null && composition.getConfigs() != null)
{
composition = composition.transform();
@@ -264,7 +264,7 @@ public abstract class RSActorMixin implements RSActor
if (healthRatio == 0)
{
final ActorDeath event = new ActorDeath(this);
client.getCallbacks().post(ActorDeath.class, event);
client.getCallbacks().post(event);
this.setDead(true);
}
@@ -290,6 +290,6 @@ public abstract class RSActorMixin implements RSActor
final HitsplatApplied event = new HitsplatApplied();
event.setActor(this);
event.setHitsplat(hitsplat);
client.getCallbacks().post(HitsplatApplied.class, event);
client.getCallbacks().post(event);
}
}

4
runelite-mixins/src/main/java/net/runelite/mixins/RSClanChatMixin.java
View File

@@ -28,7 +28,7 @@ public abstract class RSClanChatMixin implements RSClanChat
}
FriendsChatMemberJoined event = new FriendsChatMemberJoined(member);
client.getCallbacks().postDeferred(FriendsChatMemberJoined.class, event);
client.getCallbacks().postDeferred(event);
}
@Inject
@@ -42,6 +42,6 @@ public abstract class RSClanChatMixin implements RSClanChat
}
FriendsChatMemberLeft event = new FriendsChatMemberLeft(member);
client.getCallbacks().postDeferred(FriendsChatMemberLeft.class, event);
client.getCallbacks().postDeferred(event);
}
}

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

@@ -750,12 +750,12 @@ public abstract class RSClientMixin implements RSClient
for (int i = 0; i < count; ++i)
{
MenuEntry entry = entries[i] = new MenuEntry();
entry.setOption(menuOptions[i]);
entry.setTarget(menuTargets[i]);
entry.setIdentifier(menuIdentifiers[i]);
entry.setMenuOption(menuOptions[i]);
entry.setMenuTarget(menuTargets[i]);
entry.setType(menuIdentifiers[i]);
entry.setOpcode(menuTypes[i]);
entry.setParam0(params0[i]);
entry.setParam1(params1[i]);
entry.setActionParam0(params0[i]);
entry.setWidgetId(params1[i]);
entry.setForceLeftClick(leftClick[i]);
}
return entries;
@@ -781,12 +781,12 @@ public abstract class RSClientMixin implements RSClient
continue;
}
menuOptions[count] = entry.getOption();
menuTargets[count] = entry.getTarget();
menuIdentifiers[count] = entry.getIdentifier();
menuOptions[count] = entry.getMenuOption();
menuTargets[count] = entry.getMenuTarget();
menuIdentifiers[count] = entry.getType();
menuTypes[count] = entry.getOpcode();
params0[count] = entry.getParam0();
params1[count] = entry.getParam1();
params0[count] = entry.getActionParam0();
params1[count] = entry.getWidgetId();
leftClick[count] = entry.isForceLeftClick();
++count;
}
@@ -824,16 +824,16 @@ public abstract class RSClientMixin implements RSClient
forceLeftClick[oldCount]
);
client.getCallbacks().post(MenuEntryAdded.class, event);
client.getCallbacks().post(event);
if (event.isModified() && client.getMenuOptionCount() == newCount)
{
options[oldCount] = event.getOption();
targets[oldCount] = event.getTarget();
identifiers[oldCount] = event.getIdentifier();
options[oldCount] = event.getMenuOption();
targets[oldCount] = event.getMenuTarget();
identifiers[oldCount] = event.getType();
opcodes[oldCount] = event.getOpcode();
arguments1[oldCount] = event.getParam0();
arguments2[oldCount] = event.getParam1();
arguments1[oldCount] = event.getActionParam0();
arguments2[oldCount] = event.getWidgetId();
forceLeftClick[oldCount] = event.isForceLeftClick();
}
}
@@ -942,7 +942,7 @@ public abstract class RSClientMixin implements RSClient
{
DraggingWidgetChanged draggingWidgetChanged = new DraggingWidgetChanged();
draggingWidgetChanged.setDraggingWidget(client.isDraggingWidget());
client.getCallbacks().post(DraggingWidgetChanged.class, draggingWidgetChanged);
client.getCallbacks().post(draggingWidgetChanged);
}
@Inject
@@ -984,7 +984,7 @@ public abstract class RSClientMixin implements RSClient
{
WidgetLoaded event = new WidgetLoaded();
event.setGroupId(groupId);
client.getCallbacks().post(WidgetLoaded.class, event);
client.getCallbacks().post(event);
}
}
@@ -1026,7 +1026,7 @@ public abstract class RSClientMixin implements RSClient
client.getRealSkillLevel(updatedSkill),
client.getBoostedSkillLevel(updatedSkill)
);
client.getCallbacks().post(StatChanged.class, statChanged);
client.getCallbacks().post(statChanged);
}
}
@@ -1050,7 +1050,7 @@ public abstract class RSClientMixin implements RSClient
client.getRealSkillLevels()[skillIdx],
client.getBoostedSkillLevels()[skillIdx]
);
client.getCallbacks().post(StatChanged.class, statChanged);
client.getCallbacks().post(statChanged);
}
}
@@ -1069,7 +1069,7 @@ public abstract class RSClientMixin implements RSClient
PlayerMenuOptionsChanged optionsChanged = new PlayerMenuOptionsChanged();
optionsChanged.setIndex(idx);
client.getCallbacks().post(PlayerMenuOptionsChanged.class, optionsChanged);
client.getCallbacks().post(optionsChanged);
}
@FieldHook("gameState")
@@ -1079,7 +1079,7 @@ public abstract class RSClientMixin implements RSClient
GameStateChanged gameStateChange = new GameStateChanged();
GameState gameState = client.getGameState();
gameStateChange.setGameState(gameState);
client.getCallbacks().post(GameStateChanged.class, gameStateChange);
client.getCallbacks().post(gameStateChange);
if (gameState == GameState.LOGGED_IN)
{
int plane = client.getPlane();
@@ -1104,7 +1104,7 @@ public abstract class RSClientMixin implements RSClient
item.setX(x);
item.setY(y);
ItemSpawned event = new ItemSpawned(tile, item);
client.getCallbacks().post(ItemSpawned.class, event);
client.getCallbacks().post(event);
}
}
}
@@ -1128,7 +1128,7 @@ public abstract class RSClientMixin implements RSClient
{
npc.setIndex(idx);
client.getCallbacks().postDeferred(NpcSpawned.class, new NpcSpawned(npc));
client.getCallbacks().postDeferred(new NpcSpawned(npc));
}
}
@@ -1148,11 +1148,11 @@ public abstract class RSClientMixin implements RSClient
if (oldPlayer != null)
{
client.getCallbacks().post(PlayerDespawned.class, new PlayerDespawned(oldPlayer));
client.getCallbacks().post(new PlayerDespawned(oldPlayer));
}
if (player != null)
{
client.getCallbacks().postDeferred(PlayerSpawned.class, new PlayerSpawned(player));
client.getCallbacks().postDeferred(new PlayerSpawned(player));
}
}
@@ -1161,7 +1161,7 @@ public abstract class RSClientMixin implements RSClient
public static void copy$findItemDefinitions(String var0, boolean var1)
{
GrandExchangeSearched event = new GrandExchangeSearched();
client.getCallbacks().post(GrandExchangeSearched.class, event);
client.getCallbacks().post(event);
if (!event.isConsumed())
{
copy$findItemDefinitions(var0, var1);
@@ -1187,7 +1187,7 @@ public abstract class RSClientMixin implements RSClient
GrandExchangeOfferChanged offerChangedEvent = new GrandExchangeOfferChanged();
offerChangedEvent.setOffer(internalOffer);
offerChangedEvent.setSlot(idx);
client.getCallbacks().post(GrandExchangeOfferChanged.class, offerChangedEvent);
client.getCallbacks().post(offerChangedEvent);
}
@FieldHook("Varps_main")
@@ -1196,7 +1196,7 @@ public abstract class RSClientMixin implements RSClient
{
VarbitChanged varbitChanged = new VarbitChanged();
varbitChanged.setIndex(idx);
client.getCallbacks().post(VarbitChanged.class, varbitChanged);
client.getCallbacks().post(varbitChanged);
}
@FieldHook("isResizable")
@@ -1210,7 +1210,7 @@ public abstract class RSClientMixin implements RSClient
{
ResizeableChanged resizeableChanged = new ResizeableChanged();
resizeableChanged.setResized(isResized);
client.getCallbacks().post(ResizeableChanged.class, resizeableChanged);
client.getCallbacks().post(resizeableChanged);
oldIsResized = isResized;
}
@@ -1220,21 +1220,21 @@ public abstract class RSClientMixin implements RSClient
@Inject
public static void clanMemberManagerChanged(int idx)
{
client.getCallbacks().post(FriendsChatChanged.class, new FriendsChatChanged(client.getFriendsChatManager() != null));
client.getCallbacks().post(new FriendsChatChanged(client.getFriendsChatManager() != null));
}
@FieldHook("canvasWidth")
@Inject
public static void canvasWidthChanged(int idx)
{
client.getCallbacks().post(CanvasSizeChanged.class, CanvasSizeChanged.INSTANCE);
client.getCallbacks().post(CanvasSizeChanged.INSTANCE);
}
@FieldHook("canvasHeight")
@Inject
public static void canvasHeightChanged(int idx)
{
client.getCallbacks().post(CanvasSizeChanged.class, CanvasSizeChanged.INSTANCE);
client.getCallbacks().post(CanvasSizeChanged.INSTANCE);
}
@FieldHook("hintArrowPlayerIndex")
@@ -1414,7 +1414,7 @@ public abstract class RSClientMixin implements RSClient
client.getMouseCurrentButton()
);
client.getCallbacks().post(MenuOptionClicked.class, menuOptionClicked);
client.getCallbacks().post(menuOptionClicked);
if (menuOptionClicked.isConsumed())
{
@@ -1425,14 +1425,14 @@ public abstract class RSClientMixin implements RSClient
{
client.getLogger().info(
"|MenuAction|: MenuOption={} MenuTarget={} Id={} Opcode={} Param0={} Param1={} CanvasX={} CanvasY={} Authentic={}",
menuOptionClicked.getOption(), menuOptionClicked.getTarget(), menuOptionClicked.getIdentifier(),
menuOptionClicked.getOpcode(), menuOptionClicked.getParam0(), menuOptionClicked.getParam1(),
menuOptionClicked.getMenuOption(), menuOptionClicked.getMenuTarget(), menuOptionClicked.getType(),
menuOptionClicked.getOpcode(), menuOptionClicked.getActionParam0(), menuOptionClicked.getWidgetId(),
canvasX, canvasY, authentic
);
}
copy$menuAction(menuOptionClicked.getParam0(), menuOptionClicked.getParam1(), menuOptionClicked.getOpcode(),
menuOptionClicked.getIdentifier(), menuOptionClicked.getOption(), menuOptionClicked.getTarget(), canvasX, canvasY);
copy$menuAction(menuOptionClicked.getActionParam0(), menuOptionClicked.getWidgetId(), menuOptionClicked.getOpcode(),
menuOptionClicked.getType(), menuOptionClicked.getMenuOption(), menuOptionClicked.getMenuTarget(), canvasX, canvasY);
}
@Override
@@ -1448,7 +1448,7 @@ public abstract class RSClientMixin implements RSClient
@Inject
public static void onUsernameChanged(int idx)
{
client.getCallbacks().post(UsernameChanged.class, UsernameChanged.INSTANCE);
client.getCallbacks().post(UsernameChanged.INSTANCE);
}
@Override
@@ -1479,7 +1479,7 @@ public abstract class RSClientMixin implements RSClient
{
final MenuOpened event = new MenuOpened();
event.setMenuEntries(getMenuEntries());
callbacks.post(MenuOpened.class, event);
callbacks.post(event);
if (event.isModified())
{
@@ -1511,7 +1511,7 @@ public abstract class RSClientMixin implements RSClient
final ChatMessageType chatMessageType = ChatMessageType.of(type);
final ChatMessage chatMessage = new ChatMessage(messageNode, chatMessageType, name, message, sender, messageNode.getTimestamp());
client.getCallbacks().post(ChatMessage.class, chatMessage);
client.getCallbacks().post(chatMessage);
}
@Inject
@@ -1653,7 +1653,7 @@ public abstract class RSClientMixin implements RSClient
byte[] pixelArray = spritePixelsArray[i];
int[] pixels = new int[width * height];
RSSpritePixels spritePixels = createSprite(pixels, width, height);
RSSpritePixels spritePixels = createSpritePixels(pixels, width, height);
spritePixels.setMaxHeight(maxHeight);
spritePixels.setMaxWidth(maxWidth);
spritePixels.setOffsetX(offsetX[i]);
@@ -1695,7 +1695,7 @@ public abstract class RSClientMixin implements RSClient
@FieldHook("cycleCntr")
public static void onCycleCntrChanged(int idx)
{
client.getCallbacks().post(ClientTick.class, ClientTick.INSTANCE);
client.getCallbacks().post(ClientTick.INSTANCE);
}
@Copy("shouldLeftClickOpenMenu")
@@ -1709,7 +1709,7 @@ public abstract class RSClientMixin implements RSClient
}
MenuShouldLeftClick menuShouldLeftClick = new MenuShouldLeftClick();
client.getCallbacks().post(MenuShouldLeftClick.class, menuShouldLeftClick);
client.getCallbacks().post(menuShouldLeftClick);
if (menuShouldLeftClick.isForceRightClick())
{
@@ -1732,7 +1732,7 @@ public abstract class RSClientMixin implements RSClient
{
Menu menu = Menu.MENU;
menu.reset();
getCallbacks().post(Menu.class, menu);
getCallbacks().post(menu);
if (menu.shouldRun())
{
copy$menu();
@@ -1767,7 +1767,7 @@ public abstract class RSClientMixin implements RSClient
@Inject
static boolean shouldHideAttackOptionFor(RSPlayer p)
{
if (client.isSpellSelected())
if (client.getSpellSelected())
{
return ((hideFriendCastOptions && p.isFriended()) || (hideClanmateCastOptions && p.isFriendsChatMember()))
&& !unhiddenCasts.contains(client.getSelectedSpellName().replaceAll("<[^>]*>", "").toLowerCase());
@@ -1826,7 +1826,7 @@ public abstract class RSClientMixin implements RSClient
if (type == 3 || type == 4 || type == 10)
{
VolumeChanged volumeChanged = new VolumeChanged(type == 3 ? VolumeChanged.Type.MUSIC : type == 4 ? VolumeChanged.Type.EFFECTS : VolumeChanged.Type.AREA);
client.getCallbacks().post(VolumeChanged.class, volumeChanged);
client.getCallbacks().post(volumeChanged);
}
}
@@ -1925,10 +1925,10 @@ public abstract class RSClientMixin implements RSClient
@Inject
@Override
public ObjectDefinition getObjectDefinition(int objectId)
public ObjectDefinition getObjectComposition(int objectId)
{
assert this.isClientThread() : "getObjectDefinition must be called on client thread";
return getRSObjectDefinition(objectId);
return getRSObjectComposition(objectId);
}
@Inject
@@ -1945,7 +1945,7 @@ public abstract class RSClientMixin implements RSClient
public NPCComposition getNpcDefinition(int id)
{
assert this.isClientThread() : "getNpcDefinition must be called on client thread";
return getRSNpcDefinition(id);
return getRSNpcComposition(id);
}
// this exists because the original got inlined

2
runelite-mixins/src/main/java/net/runelite/mixins/RSDynamicObjectMixin.java
View File

@@ -90,7 +90,7 @@ public abstract class RSDynamicObjectMixin implements RSDynamicObject
DynamicObjectAnimationChanged dynamicObjectAnimationChanged = new DynamicObjectAnimationChanged();
dynamicObjectAnimationChanged.setObject(id);
dynamicObjectAnimationChanged.setAnimation(animationID);
client.getCallbacks().post(DynamicObjectAnimationChanged.class, dynamicObjectAnimationChanged);
client.getCallbacks().post(dynamicObjectAnimationChanged);
}
}

4
runelite-mixins/src/main/java/net/runelite/mixins/RSFriendSystemMixin.java
View File

@@ -20,7 +20,7 @@ public abstract class RSFriendSystemMixin implements RSFriendSystem
public void rl$removeFriend(String friendName)
{
FriendRemoved friendRemoved = new FriendRemoved(friendName);
client.getCallbacks().post(FriendRemoved.class, friendRemoved);
client.getCallbacks().post(friendRemoved);
}
@MethodHook("addFriend")
@@ -28,6 +28,6 @@ public abstract class RSFriendSystemMixin implements RSFriendSystem
public void rl$addFriend(String friendName)
{
FriendAdded friendAdded = new FriendAdded(friendName);
client.getCallbacks().post(FriendAdded.class, friendAdded);
client.getCallbacks().post(friendAdded);
}
}

2
runelite-mixins/src/main/java/net/runelite/mixins/RSGameShellMixin.java
View File

@@ -73,7 +73,7 @@ public abstract class RSGameShellMixin implements RSGameShell
{
final FocusChanged focusChanged = new FocusChanged();
focusChanged.setFocused(true);
client.getCallbacks().post(FocusChanged.class, focusChanged);
client.getCallbacks().post(focusChanged);
}
@Inject

2
runelite-mixins/src/main/java/net/runelite/mixins/RSGraphicsObjectMixin.java
View File

@@ -18,7 +18,7 @@ public abstract class RSGraphicsObjectMixin implements RSGraphicsObject
RSGraphicsObjectMixin()
{
final GraphicsObjectCreated event = new GraphicsObjectCreated(this);
client.getCallbacks().post(GraphicsObjectCreated.class, event);
client.getCallbacks().post(event);
}
@Override

2
runelite-mixins/src/main/java/net/runelite/mixins/RSHealthBarDefinitionMixin.java
View File

@@ -21,6 +21,6 @@ public abstract class RSHealthBarDefinitionMixin implements RSHealthBarDefinitio
{
PostHealthBar postHealthBar = new PostHealthBar();
postHealthBar.setHealthBar(this);
client.getCallbacks().post(PostHealthBar.class, postHealthBar);
client.getCallbacks().post(postHealthBar);
}
}

2
runelite-mixins/src/main/java/net/runelite/mixins/RSItemCompositionMixin.java
View File

@@ -71,7 +71,7 @@ public abstract class RSItemCompositionMixin implements RSItemComposition
{
final PostItemComposition event = new PostItemComposition();
event.setItemComposition(this);
client.getCallbacks().post(PostItemComposition.class, event);
client.getCallbacks().post(event);
}
@Copy("getModel")

4
runelite-mixins/src/main/java/net/runelite/mixins/RSItemContainerMixin.java
View File

@@ -138,13 +138,13 @@ public abstract class RSItemContainerMixin implements RSItemContainer
if (changedContainer != null)
{
ItemContainerChanged event = new ItemContainerChanged(containerId, changedContainer);
client.getCallbacks().postDeferred(ItemContainerChanged.class, event);
client.getCallbacks().postDeferred(event);
}
if (changedContainerInvOther != null)
{
ItemContainerChanged event = new ItemContainerChanged(containerId | 0x8000, changedContainerInvOther);
client.getCallbacks().postDeferred(ItemContainerChanged.class, event);
client.getCallbacks().postDeferred(event);
}
}
}

2
runelite-mixins/src/main/java/net/runelite/mixins/RSKeyHandlerMixin.java
View File

@@ -60,6 +60,6 @@ public abstract class RSKeyHandlerMixin implements RSKeyHandler
{
final FocusChanged focusChanged = new FocusChanged();
focusChanged.setFocused(false);
client.getCallbacks().post(FocusChanged.class, focusChanged);
client.getCallbacks().post(focusChanged);
}
}

2
runelite-mixins/src/main/java/net/runelite/mixins/RSNPCCompositionMixin.java
View File

@@ -45,6 +45,6 @@ public abstract class RSNPCCompositionMixin implements RSNPCComposition
NpcActionChanged npcActionChanged = new NpcActionChanged();
npcActionChanged.setNpcComposition(this);
npcActionChanged.setIdx(idx);
client.getCallbacks().post(NpcActionChanged.class, npcActionChanged);
client.getCallbacks().post(npcActionChanged);
}
}

14
runelite-mixins/src/main/java/net/runelite/mixins/RSNPCMixin.java
View File

@@ -55,7 +55,7 @@ public abstract class RSNPCMixin implements RSNPC
@Override
public int getId()
{
RSNPCComposition composition = getDefinition();
RSNPCComposition composition = getComposition();
if (composition != null && composition.getConfigs() != null)
{
composition = composition.transform();
@@ -67,7 +67,7 @@ public abstract class RSNPCMixin implements RSNPC
@Override
public String getName()
{
RSNPCComposition composition = getDefinition();
RSNPCComposition composition = getComposition();
if (composition != null && composition.getConfigs() != null)
{
composition = composition.transform();
@@ -79,7 +79,7 @@ public abstract class RSNPCMixin implements RSNPC
@Override
public int getCombatLevel()
{
RSNPCComposition composition = getDefinition();
RSNPCComposition composition = getComposition();
if (composition != null && composition.getConfigs() != null)
{
composition = composition.transform();
@@ -107,11 +107,11 @@ public abstract class RSNPCMixin implements RSNPC
{
if (composition == null)
{
client.getCallbacks().post(NpcDespawned.class, new NpcDespawned(this));
client.getCallbacks().post(new NpcDespawned(this));
}
else if (this.getId() != -1)
{
client.getCallbacks().post(NpcChanged.class, new NpcChanged(this));
client.getCallbacks().post(new NpcChanged(this));
}
}
@@ -150,7 +150,7 @@ public abstract class RSNPCMixin implements RSNPC
@Override
public NPCComposition getTransformedDefinition()
{
RSNPCComposition composition = getDefinition();
RSNPCComposition composition = getComposition();
if (composition != null && composition.getConfigs() != null)
{
composition = composition.transform();
@@ -168,7 +168,7 @@ public abstract class RSNPCMixin implements RSNPC
return null;
}
int size = getDefinition().getSize();
int size = getComposition().getSize();
LocalPoint tileHeightPoint = new LocalPoint(
size * Perspective.LOCAL_HALF_TILE_SIZE - Perspective.LOCAL_HALF_TILE_SIZE + getX(),
size * Perspective.LOCAL_HALF_TILE_SIZE - Perspective.LOCAL_HALF_TILE_SIZE + getY());

6
runelite-mixins/src/main/java/net/runelite/mixins/RSPlayerMixin.java
View File

@@ -106,7 +106,7 @@ public abstract class RSPlayerMixin implements RSPlayer
final HeadIcon headIcon = getHeadIcon(getRsOverheadIcon());
if (getRsOverheadIcon() != oldHeadIcon)
{
client.getCallbacks().post(OverheadPrayerChanged.class,
client.getCallbacks().post(
new OverheadPrayerChanged(this, getHeadIcon(oldHeadIcon), headIcon));
}
}
@@ -127,7 +127,7 @@ public abstract class RSPlayerMixin implements RSPlayer
final SkullIcon skullIcon = skullFromInt(getRsSkullIcon());
if (getRsSkullIcon() != oldSkullIcon)
{
client.getCallbacks().post(PlayerSkullChanged.class,
client.getCallbacks().post(
new PlayerSkullChanged(this, skullFromInt(getRsSkullIcon()), skullIcon));
}
oldSkullIcon = getRsSkullIcon();
@@ -299,7 +299,7 @@ public abstract class RSPlayerMixin implements RSPlayer
if (client.isComparingAppearance() && getPlayerAppearance().getHash() != appearanceHash)
{
client.getCallbacks().post(PlayerChanged.class, new PlayerChanged(this));
client.getCallbacks().post(new PlayerChanged(this));
}
}
}

4
runelite-mixins/src/main/java/net/runelite/mixins/RSProjectileMixin.java
View File

@@ -48,7 +48,7 @@ public abstract class RSProjectileMixin implements RSProjectile
{
final ProjectileSpawned projectileSpawned = new ProjectileSpawned();
projectileSpawned.setProjectile(this);
client.getCallbacks().post(ProjectileSpawned.class, projectileSpawned);
client.getCallbacks().post(projectileSpawned);
}
@Inject
@@ -109,6 +109,6 @@ public abstract class RSProjectileMixin implements RSProjectile
projectileMoved.setProjectile(this);
projectileMoved.setPosition(position);
projectileMoved.setZ(targetZ);
client.getCallbacks().post(ProjectileMoved.class, projectileMoved);
client.getCallbacks().post(projectileMoved);
}
}

2
runelite-mixins/src/main/java/net/runelite/mixins/RSTileItemMixin.java
View File

@@ -66,7 +66,7 @@ public abstract class RSTileItemMixin implements RSTileItem
client.getLogger().debug("Item quantity changed: {} ({} -> {})", getId(), getQuantity(), quantity);
ItemQuantityChanged itemQuantityChanged = new ItemQuantityChanged(this, getTile(), getQuantity(), quantity);
client.getCallbacks().post(ItemQuantityChanged.class, itemQuantityChanged);
client.getCallbacks().post(itemQuantityChanged);
}
}

38
runelite-mixins/src/main/java/net/runelite/mixins/RSTileMixin.java
View File

@@ -270,14 +270,14 @@ public abstract class RSTileMixin implements RSTile
WallObjectDespawned wallObjectDespawned = new WallObjectDespawned();
wallObjectDespawned.setTile(this);
wallObjectDespawned.setWallObject(previous);
client.getCallbacks().post(WallObjectDespawned.class, wallObjectDespawned);
client.getCallbacks().post(wallObjectDespawned);
}
else if (current != null && previous == null)
{
WallObjectSpawned wallObjectSpawned = new WallObjectSpawned();
wallObjectSpawned.setTile(this);
wallObjectSpawned.setWallObject(current);
client.getCallbacks().post(WallObjectSpawned.class, wallObjectSpawned);
client.getCallbacks().post(wallObjectSpawned);
}
else if (current != null)
{
@@ -285,7 +285,7 @@ public abstract class RSTileMixin implements RSTile
wallObjectChanged.setTile(this);
wallObjectChanged.setPrevious(previous);
wallObjectChanged.setWallObject(current);
client.getCallbacks().post(WallObjectChanged.class, wallObjectChanged);
client.getCallbacks().post(wallObjectChanged);
}
}
@@ -303,14 +303,14 @@ public abstract class RSTileMixin implements RSTile
DecorativeObjectDespawned decorativeObjectDespawned = new DecorativeObjectDespawned();
decorativeObjectDespawned.setTile(this);
decorativeObjectDespawned.setDecorativeObject(previous);
client.getCallbacks().post(DecorativeObjectDespawned.class, decorativeObjectDespawned);
client.getCallbacks().post(decorativeObjectDespawned);
}
else if (current != null && previous == null)
{
DecorativeObjectSpawned decorativeObjectSpawned = new DecorativeObjectSpawned();
decorativeObjectSpawned.setTile(this);
decorativeObjectSpawned.setDecorativeObject(current);
client.getCallbacks().post(DecorativeObjectSpawned.class, decorativeObjectSpawned);
client.getCallbacks().post(decorativeObjectSpawned);
}
else if (current != null)
{
@@ -318,7 +318,7 @@ public abstract class RSTileMixin implements RSTile
decorativeObjectChanged.setTile(this);
decorativeObjectChanged.setPrevious(previous);
decorativeObjectChanged.setDecorativeObject(current);
client.getCallbacks().post(DecorativeObjectChanged.class, decorativeObjectChanged);
client.getCallbacks().post(decorativeObjectChanged);
}
}
@@ -336,14 +336,14 @@ public abstract class RSTileMixin implements RSTile
GroundObjectDespawned groundObjectDespawned = new GroundObjectDespawned();
groundObjectDespawned.setTile(this);
groundObjectDespawned.setGroundObject(previous);
client.getCallbacks().post(GroundObjectDespawned.class, groundObjectDespawned);
client.getCallbacks().post(groundObjectDespawned);
}
else if (current != null && previous == null)
{
GroundObjectSpawned groundObjectSpawned = new GroundObjectSpawned();
groundObjectSpawned.setTile(this);
groundObjectSpawned.setGroundObject(current);
client.getCallbacks().post(GroundObjectSpawned.class, groundObjectSpawned);
client.getCallbacks().post(groundObjectSpawned);
}
else if (current != null)
{
@@ -351,7 +351,7 @@ public abstract class RSTileMixin implements RSTile
groundObjectChanged.setTile(this);
groundObjectChanged.setPrevious(previous);
groundObjectChanged.setGroundObject(current);
client.getCallbacks().post(GroundObjectChanged.class, groundObjectChanged);
client.getCallbacks().post(groundObjectChanged);
}
}
@@ -426,7 +426,7 @@ public abstract class RSTileMixin implements RSTile
GameObjectDespawned gameObjectDespawned = new GameObjectDespawned();
gameObjectDespawned.setTile(this);
gameObjectDespawned.setGameObject(previous);
client.getCallbacks().post(GameObjectDespawned.class, gameObjectDespawned);
client.getCallbacks().post(gameObjectDespawned);
}
else if (previous == null)
{
@@ -437,8 +437,10 @@ public abstract class RSTileMixin implements RSTile
logger.trace("Game object spawn: {}", current.getId());
GameObjectSpawned gameObjectSpawned = new GameObjectSpawned(this, current);
client.getCallbacks().post(GameObjectSpawned.class, gameObjectSpawned);
GameObjectSpawned gameObjectSpawned = new GameObjectSpawned();
gameObjectSpawned.setTile(this);
gameObjectSpawned.setGameObject(current);
client.getCallbacks().post(gameObjectSpawned);
}
else
{
@@ -453,7 +455,7 @@ public abstract class RSTileMixin implements RSTile
gameObjectsChanged.setTile(this);
gameObjectsChanged.setPrevious(previous);
gameObjectsChanged.setGameObject(current);
client.getCallbacks().post(GameObjectChanged.class, gameObjectsChanged);
client.getCallbacks().post(gameObjectsChanged);
}
}
@@ -486,7 +488,7 @@ public abstract class RSTileMixin implements RSTile
{
RSTileItem item = (RSTileItem) cur;
ItemDespawned itemDespawned = new ItemDespawned(this, item);
client.getCallbacks().post(ItemDespawned.class, itemDespawned);
client.getCallbacks().post(itemDespawned);
}
}
lastGroundItems[z][x][y] = newQueue;
@@ -504,7 +506,7 @@ public abstract class RSTileMixin implements RSTile
if (lastUnlink != null)
{
ItemDespawned itemDespawned = new ItemDespawned(this, lastUnlink);
client.getCallbacks().post(ItemDespawned.class, itemDespawned);
client.getCallbacks().post(itemDespawned);
}
return;
}
@@ -514,7 +516,7 @@ public abstract class RSTileMixin implements RSTile
if (lastUnlink != null)
{
ItemDespawned itemDespawned = new ItemDespawned(this, lastUnlink);
client.getCallbacks().post(ItemDespawned.class, itemDespawned);
client.getCallbacks().post(itemDespawned);
}
return;
}
@@ -547,7 +549,7 @@ public abstract class RSTileMixin implements RSTile
if (lastUnlink != null && lastUnlink != next && lastUnlink != previous)
{
ItemDespawned itemDespawned = new ItemDespawned(this, lastUnlink);
client.getCallbacks().post(ItemDespawned.class, itemDespawned);
client.getCallbacks().post(itemDespawned);
}
if (current != null)
@@ -555,7 +557,7 @@ public abstract class RSTileMixin implements RSTile
current.setX(x);
current.setY(y);
ItemSpawned event = new ItemSpawned(this, current);
client.getCallbacks().post(ItemSpawned.class, event);
client.getCallbacks().post(event);
}
}
}

2
runelite-mixins/src/main/java/net/runelite/mixins/RSUserMixin.java
View File

@@ -34,6 +34,6 @@ public abstract class RSUserMixin implements RSUser
@Inject
public void onPrevNameChanged(int idx)
{
client.getCallbacks().post(NameableNameChanged.class, new NameableNameChanged(this));
client.getCallbacks().post(new NameableNameChanged(this));
}
}

4
runelite-mixins/src/main/java/net/runelite/mixins/RSVarcsMixin.java
View File

@@ -19,13 +19,13 @@ public abstract class RSVarcsMixin implements RSVarcs
@Inject
public void onVarCIntChanged(int id, int value)
{
client.getCallbacks().post(VarClientIntChanged.class, new VarClientIntChanged(id));
client.getCallbacks().post(new VarClientIntChanged(id));
}
@MethodHook(value = "setString", end = true)
@Inject
public void onVarCStrChanged(int id, String value)
{
client.getCallbacks().post(VarClientStrChanged.class, new VarClientStrChanged(id));
client.getCallbacks().post(new VarClientStrChanged(id));
}
}

4
runelite-mixins/src/main/java/net/runelite/mixins/RSWidgetMixin.java
View File

@@ -419,7 +419,7 @@ public abstract class RSWidgetMixin implements RSWidget
event.setWidget(this);
event.setHidden(hidden);
client.getCallbacks().post(WidgetHiddenChanged.class, event);
client.getCallbacks().post(event);
RSWidget[] children = getChildren();
@@ -504,7 +504,7 @@ public abstract class RSWidgetMixin implements RSWidget
client.getLogger().trace("Posting widget position changed");
WidgetPositioned widgetPositioned = WidgetPositioned.INSTANCE;
client.getCallbacks().postDeferred(WidgetPositioned.class, widgetPositioned);
client.getCallbacks().postDeferred(widgetPositioned);
}
@Inject

2
runelite-mixins/src/main/java/net/runelite/mixins/RSWorldMixin.java
View File

@@ -63,7 +63,7 @@ public abstract class RSWorldMixin implements RSWorld
{
// this is the last world in the list.
WorldListLoad worldLoad = new WorldListLoad(worlds);
client.getCallbacks().post(WorldListLoad.class, worldLoad);
client.getCallbacks().post(worldLoad);
}
}
}

8
runelite-mixins/src/main/java/net/runelite/mixins/ScriptVMMixin.java
View File

@@ -67,7 +67,7 @@ public abstract class ScriptVMMixin implements RSClient
if (script != null)
{
ScriptPreFired event = new ScriptPreFired((int) script.getHash(), rootScriptEvent);
client.getCallbacks().post(ScriptPreFired.class, event);
client.getCallbacks().post(event);
}
rootScriptEvent = null;
@@ -124,14 +124,14 @@ public abstract class ScriptVMMixin implements RSClient
ScriptCallbackEvent event = new ScriptCallbackEvent();
event.setScript(currentScript);
event.setEventName(stringOp);
client.getCallbacks().post(ScriptCallbackEvent.class, event);
client.getCallbacks().post(event);
return true;
case INVOKE:
int scriptId = currentScript.getIntOperands()[currentScriptPC];
client.getCallbacks().post(ScriptPreFired.class, new ScriptPreFired(scriptId, null));
client.getCallbacks().post(new ScriptPreFired(scriptId, null));
return false;
case RETURN:
client.getCallbacks().post(ScriptPostFired.class, new ScriptPostFired((int) currentScript.getHash()));
client.getCallbacks().post(new ScriptPostFired((int) currentScript.getHash()));
return false;
}
return false;

4
runelite-mixins/src/main/java/net/runelite/mixins/SoundEffectMixin.java
View File

@@ -91,7 +91,7 @@ public abstract class SoundEffectMixin implements RSClient
lastSoundEffectSourceNPCid = -1;
event.setSoundId(client.getQueuedSoundEffectIDs()[soundIndex]);
event.setDelay(client.getQueuedSoundEffectDelays()[soundIndex]);
client.getCallbacks().post(SoundEffectPlayed.class, event);
client.getCallbacks().post(event);
consumed = event.isConsumed();
}
else
@@ -108,7 +108,7 @@ public abstract class SoundEffectMixin implements RSClient
event.setSceneY(y);
event.setRange(range);
event.setDelay(client.getQueuedSoundEffectDelays()[soundIndex]);
client.getCallbacks().post(AreaSoundEffectPlayed.class, event);
client.getCallbacks().post(event);
consumed = event.isConsumed();
}