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

Move addChatMessage to mixins

Browse Source 
Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
This commit is contained in:
Tomas Slusny
2018-06-22 11:03:25 +02:00
committed by Adam
parent 4d6386d846
commit 517c4c4796
2 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -38,7 +38,6 @@ import java.awt.event.MouseEvent;
import java.awt.event.MouseWheelEvent; import java.awt.event.MouseWheelEvent;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
import java.awt.image.VolatileImage; import java.awt.image.VolatileImage;
import net.runelite.api.ChatMessageType;
import net.runelite.api.Client; import net.runelite.api.Client;
import net.runelite.api.GraphicsObject; import net.runelite.api.GraphicsObject;
import net.runelite.api.MainBufferProvider; import net.runelite.api.MainBufferProvider;
@@ -47,7 +46,6 @@ import net.runelite.api.Region;
import net.runelite.api.RenderOverview; import net.runelite.api.RenderOverview;
import net.runelite.api.TextureProvider; import net.runelite.api.TextureProvider;
import net.runelite.api.WorldMapManager; import net.runelite.api.WorldMapManager;
import net.runelite.api.events.ChatMessage;
import net.runelite.api.events.GameTick; import net.runelite.api.events.GameTick;
import net.runelite.api.events.GraphicsObjectCreated; import net.runelite.api.events.GraphicsObjectCreated;
import net.runelite.api.events.MenuOptionClicked; import net.runelite.api.events.MenuOptionClicked;
@@ -368,19 +366,6 @@ public class Hooks
return menuOptionClicked.isConsumed(); return menuOptionClicked.isConsumed();
} }
public static void addChatMessage(int type, String name, String message, String sender)
{
if (log.isDebugEnabled())
{
log.debug("Chat message type {}: {}", ChatMessageType.of(type), message);
}
ChatMessageType chatMessageType = ChatMessageType.of(type);
ChatMessage chatMessage = new ChatMessage(chatMessageType, name, message, sender);
eventBus.post(chatMessage);
}
public static void updateNpcs() public static void updateNpcs()
{ {
// The NPC update event seem to run every server tick, // The NPC update event seem to run every server tick,

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

@@ -64,6 +64,7 @@ import net.runelite.api.WorldType;
import net.runelite.api.coords.LocalPoint; import net.runelite.api.coords.LocalPoint;
import net.runelite.api.coords.WorldPoint; import net.runelite.api.coords.WorldPoint;
import net.runelite.api.events.BoostedLevelChanged; import net.runelite.api.events.BoostedLevelChanged;
import net.runelite.api.events.ChatMessage;
import net.runelite.api.events.ClanChanged; import net.runelite.api.events.ClanChanged;
import net.runelite.api.events.DraggingWidgetChanged; import net.runelite.api.events.DraggingWidgetChanged;
import net.runelite.api.events.ExperienceChanged; import net.runelite.api.events.ExperienceChanged;
@@ -92,6 +93,7 @@ import net.runelite.api.widgets.WidgetInfo;
import net.runelite.client.callback.Hooks; import net.runelite.client.callback.Hooks;
import static net.runelite.client.callback.Hooks.deferredEventBus; import static net.runelite.client.callback.Hooks.deferredEventBus;
import static net.runelite.client.callback.Hooks.eventBus; import static net.runelite.client.callback.Hooks.eventBus;
import static net.runelite.client.callback.Hooks.log;
import net.runelite.rs.api.RSClanMemberManager; import net.runelite.rs.api.RSClanMemberManager;
import net.runelite.rs.api.RSClient; import net.runelite.rs.api.RSClient;
import net.runelite.rs.api.RSDeque; import net.runelite.rs.api.RSDeque;
@@ -1034,4 +1036,18 @@ public abstract class RSClientMixin implements RSClient
{ {
Hooks.updateNpcs(); Hooks.updateNpcs();
} }
@Inject
@MethodHook("addChatMessage")
public static void onAddChatMessage(int type, String name, String message, String sender)
{
if (log.isDebugEnabled())
{
log.debug("Chat message type {}: {}", ChatMessageType.of(type), message);
}
final ChatMessageType chatMessageType = ChatMessageType.of(type);
final ChatMessage chatMessage = new ChatMessage(chatMessageType, name, message, sender);
eventBus.post(chatMessage);
}
} }