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

Merge branch 'upstream-master' into runelite

Browse Source 
# Conflicts:
#	cache-client/pom.xml
#	cache-updater/pom.xml
#	cache/pom.xml
#	http-api/pom.xml
#	http-service/pom.xml
#	pom.xml
#	runelite-api/pom.xml
#	runelite-api/src/main/java/net/runelite/api/Client.java
#	runelite-api/src/main/java/net/runelite/api/events/MenuEntryAdded.java
#	runelite-api/src/main/java/net/runelite/api/events/NpcActionChanged.java
#	runelite-api/src/main/java/net/runelite/api/events/PlayerMenuOptionClicked.java
#	runelite-client/pom.xml
#	runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldSwitcherPanel.java
#	runelite-client/src/test/java/net/runelite/client/plugins/slayer/SlayerPluginTest.java
#	runelite-script-assembler-plugin/pom.xml
This commit is contained in:
zeruth
2021-01-29 21:19:28 -05:00
parent 48fdf79e65 e3b0755385
commit 7b0678d0a1
55 changed files with 1763 additions and 395 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
runescape-api/src/main/java/net/runelite/rs/api/RSClient.java
View File

@@ -33,7 +33,7 @@ import net.runelite.api.widgets.Widget;
import net.runelite.mapping.Construct;
import net.runelite.mapping.Import;
public interface RSClient extends RSGameShell, Client
public interface RSClient extends RSGameEngine, Client
{
@Import("cameraX")
@Override

4
runescape-api/src/main/java/net/runelite/rs/api/RSGameShell.java → runescape-api/src/main/java/net/runelite/rs/api/RSGameEngine.java
View File

@@ -24,11 +24,11 @@
*/
package net.runelite.rs.api;
import net.runelite.api.GameShell;
import net.runelite.api.GameEngine;
import java.awt.Canvas;
import net.runelite.mapping.Import;
public interface RSGameShell extends GameShell
public interface RSGameEngine extends GameEngine
{
@Import("canvas")
Canvas getCanvas();