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

runelite-mixins: fix setting menu preventing menu add event from being fired

Browse Source
This commit is contained in:
Adam
2018-05-11 15:45:53 -04:00
parent deb0bdf4ab
commit 837d373fdd
2 changed files with 29 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
runelite-mixins/src/main/java/net/runelite/mixins/MenuEntryEventMixin.java
View File

@@ -1,68 +0,0 @@
/*
* Copyright (c) 2018, SomeoneWithAnInternetConnection
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice, this
* list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package net.runelite.mixins;
import net.runelite.api.events.MenuEntryAdded;
import net.runelite.api.mixins.FieldHook;
import net.runelite.api.mixins.Inject;
import net.runelite.api.mixins.Mixin;
import net.runelite.api.mixins.Shadow;
import static net.runelite.client.callback.Hooks.eventBus;
import net.runelite.rs.api.RSClient;
@Mixin(RSClient.class)
public abstract class MenuEntryEventMixin implements RSClient
{
@Shadow("clientInstance")
private static RSClient client;
@Inject
private static int oldMenuEntryCount;
@FieldHook("menuOptionCount")
@Inject
public static void onMenuOptionsChanged(int idx)
{
int newCount = client.getMenuOptionCount();
if (newCount == oldMenuEntryCount + 1)
{
MenuEntryAdded event = new MenuEntryAdded(
client.getMenuOptions()[newCount - 1],
client.getMenuTargets()[newCount - 1],
client.getMenuTypes()[newCount - 1],
client.getMenuIdentifiers()[newCount - 1],
client.getMenuActionParams0()[newCount - 1],
client.getMenuActionParams1()[newCount - 1]
);
eventBus.post(event);
}
oldMenuEntryCount = newCount;
}
}

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

@@ -68,6 +68,7 @@ import net.runelite.api.events.ExperienceChanged;
import net.runelite.api.events.GameStateChanged;
import net.runelite.api.events.GrandExchangeOfferChanged;
import net.runelite.api.events.MapRegionChanged;
import net.runelite.api.events.MenuEntryAdded;
import net.runelite.api.events.NpcDespawned;
import net.runelite.api.events.NpcSpawned;
import net.runelite.api.events.PlayerDespawned;
@@ -135,6 +136,9 @@ public abstract class RSClientMixin implements RSClient
@Inject
private static boolean hasVarbitChanged;
@Inject
private static int oldMenuEntryCount;
@Inject
@Override
public boolean isInterpolatePlayerAnimations()
@@ -485,6 +489,31 @@ public abstract class RSClientMixin implements RSClient
}
setMenuOptionCount(count);
oldMenuEntryCount = count;
}
@FieldHook("menuOptionCount")
@Inject
public static void onMenuOptionsChanged(int idx)
{
int oldCount = oldMenuEntryCount;
int newCount = client.getMenuOptionCount();
oldMenuEntryCount = newCount;
if (newCount == oldCount + 1)
{
MenuEntryAdded event = new MenuEntryAdded(
client.getMenuOptions()[newCount - 1],
client.getMenuTargets()[newCount - 1],
client.getMenuTypes()[newCount - 1],
client.getMenuIdentifiers()[newCount - 1],
client.getMenuActionParams0()[newCount - 1],
client.getMenuActionParams1()[newCount - 1]
);
eventBus.post(event);
}
}
@Inject