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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Visne
2019-07-07 23:50:39 +02:00
parent f5a56e0b17 30f0516b24
commit c291c0b6d2
308 changed files with 15461 additions and 14578 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
runescape-api/src/main/java/net/runelite/rs/api/RSAbstractIndexCache.java → runescape-api/src/main/java/net/runelite/rs/api/RSAbstractArchive.java
View File

@@ -3,8 +3,8 @@ package net.runelite.rs.api;
import net.runelite.api.IndexDataBase;
import net.runelite.mapping.Import;
public interface RSAbstractIndexCache extends IndexDataBase
public interface RSAbstractArchive extends IndexDataBase
{
@Import("takeRecord")
@Import("takeFile")
byte[] getConfigData(int archiveId, int fileId);
}

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

@@ -100,7 +100,7 @@ public interface RSActor extends RSEntity, Actor
// Idle animation
@Import("idleSequence")
@Import("readySequence")
@Override
void setIdlePoseAnimation(int animation);

2
runescape-api/src/main/java/net/runelite/rs/api/RSIndexCache.java → runescape-api/src/main/java/net/runelite/rs/api/RSArchive.java
View File

@@ -2,7 +2,7 @@ package net.runelite.rs.api;
import net.runelite.mapping.Import;
public interface RSIndexCache extends RSAbstractIndexCache
public interface RSArchive extends RSAbstractArchive
{
@Import("index")
int getIndex();

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

@@ -5,7 +5,7 @@ import net.runelite.mapping.Import;
public interface RSBuddy extends ChatPlayer, RSUser
{
@Import("world0")
@Import("getWorld")
@Override
int getWorld();

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

@@ -84,7 +84,7 @@ public interface RSClient extends RSGameShell, Client
@Override
int getFPS();
@Import("minimapOrientation")
@Import("camAngleY")
@Override
int getMapAngle();
@@ -187,7 +187,7 @@ public interface RSClient extends RSGameShell, Client
@Override
void setDraggedOnWidget(Widget widget);
@Import("widgets")
@Import("interfaceComponents")
RSWidget[][] getWidgets();
/**
@@ -390,8 +390,7 @@ public interface RSClient extends RSGameShell, Client
RSSprite createItemSprite(int itemId, int quantity, int thickness, int borderColor, int stackable, boolean noted);
@Import("menuAction")
@Override
void invokeMenuAction(int n2, int n3, int n4, int n5, String string, String string2, int n6, int n7);
void sendMenuAction(int n2, int n3, int n4, int n5, String string, String string2, int n6, int n7);
@Import("decodeSprite")
void decodeSprite(byte[] data);
@@ -441,19 +440,19 @@ public interface RSClient extends RSGameShell, Client
@Import("indexedSpritePalette")
void setIndexedSpritePalette(int[] indexedSpritePalette);
@Import("indexCache8")
@Import("archive8")
@Override
RSAbstractIndexCache getIndexSprites();
RSAbstractArchive getIndexSprites();
@Import("indexCache12")
@Import("archive12")
@Override
RSAbstractIndexCache getIndexScripts();
RSAbstractArchive getIndexScripts();
@Import("widgetClickMasks")
@Override
RSNodeHashTable getWidgetFlags();
@Import("widgetGroupParents")
@Import("interfaceParents")
@Override
RSNodeHashTable getComponentTable();
@@ -514,7 +513,7 @@ public interface RSClient extends RSGameShell, Client
* Get the widget top group. widgets[topGroup] contains widgets with
* parentId -1, which are the widget roots.
*/
@Import("rootWidgetGroup")
@Import("rootInterface")
int getWidgetRoot();
@Import("WorldMapElement_cached")
@@ -662,10 +661,10 @@ public interface RSClient extends RSGameShell, Client
*
* (1) JAU - Jagex Angle Unit; 1/1024 of a revolution
*/
@Import("cameraPitchTarget")
@Import("camAngleX")
int getCameraPitchTarget();
@Import("cameraPitchTarget")
@Import("camAngleX")
void setCameraPitchTarget(int pitch);
@Import("Scene_cameraPitchSine")
@@ -1015,7 +1014,7 @@ public interface RSClient extends RSGameShell, Client
boolean isSpellSelected();
@Import("readSoundEffect")
RSSoundEffect getTrack(RSAbstractIndexCache indexData, int id, int var0);
RSSoundEffect getTrack(RSAbstractArchive indexData, int id, int var0);
@Import("createRawPcmStream")
RSRawPcmStream createRawPcmStream(RSRawSound audioNode, int var0, int volume);
@@ -1023,8 +1022,8 @@ public interface RSClient extends RSGameShell, Client
@Import("pcmStreamMixer")
RSPcmStreamMixer getSoundEffectAudioQueue();
@Import("indexCache4")
RSAbstractIndexCache getIndexCache4();
@Import("archive4")
RSAbstractArchive getIndexCache4();
@Import("decimator")
RSDecimator getSoundEffectResampler();

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

@@ -40,7 +40,7 @@ public interface RSEntity extends RSNode, Renderable
@Override
RSModel getModel();
@Import("renderDraw")
@Import("draw")
@Override
void draw(int orientation, int pitchSin, int pitchCos, int yawSin, int yawCos, int x, int y, int z, long hash);
}

4
runescape-api/src/main/java/net/runelite/rs/api/RSEnumDefinition.java
View File

@@ -13,13 +13,13 @@ public interface RSEnumDefinition extends EnumDefinition, RSDualNode
@Override
int[] getIntVals();
@Import("stringVals")
@Import("strVals")
@Override
String[] getStringVals();
@Import("defaultInt")
int getDefaultInt();
@Import("defaultString")
@Import("defaultStr")
String getDefaultString();
}

2
runescape-api/src/main/java/net/runelite/rs/api/RSWidgetGroupParent.java → runescape-api/src/main/java/net/runelite/rs/api/RSInterfaceParent.java
View File

@@ -3,7 +3,7 @@ package net.runelite.rs.api;
import net.runelite.api.WidgetNode;
import net.runelite.mapping.Import;
public interface RSWidgetGroupParent extends RSNode, WidgetNode
public interface RSInterfaceParent extends RSNode, WidgetNode
{
@Import("group")
@Override

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

@@ -9,7 +9,7 @@ public interface RSNPCDefinition extends NPCDefinition
@Override
String getName();
@Import("archives")
@Import("models")
@Override
int[] getModels();

4
runescape-api/src/main/java/net/runelite/rs/api/RSPacketBuffer.java
View File

@@ -1,7 +1,5 @@
package net.runelite.rs.api;
import net.runelite.api.PacketBuffer;
public interface RSPacketBuffer extends PacketBuffer
public interface RSPacketBuffer
{
}

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

@@ -34,6 +34,6 @@ public interface RSScene extends Scene
@Import("ySize")
int getMaxZ();
@Import("Scene_minPlane")
@Import("minPlane")
int getMinLevel();
}

6
runescape-api/src/main/java/net/runelite/rs/api/RSVarbitDefinition.java
View File

@@ -4,12 +4,12 @@ import net.runelite.mapping.Import;
public interface RSVarbitDefinition extends RSDualNode
{
@Import("varp")
@Import("baseVar")
int getIndex();
@Import("lowBit")
@Import("startBit")
int getLeastSignificantBit();
@Import("highBit")
@Import("endBit")
int getMostSignificantBit();
}

6
runescape-api/src/main/java/net/runelite/rs/api/RSWidget.java
View File

@@ -312,7 +312,7 @@ public interface RSWidget extends Widget
@Override
void setHasListener(boolean hasListener);
@Import("onKeyListener")
@Import("onKey")
@Override
Object[] getOnKeyListener();
@@ -320,11 +320,11 @@ public interface RSWidget extends Widget
@Override
Object[] getOnLoadListener();
@Import("onDialogAbortListener")
@Import("onDialogAbort")
@Override
void setOnDialogAbortListener(Object... args);
@Import("onKeyListener")
@Import("onKey")
@Override
void setOnKeyListener(Object... args);

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

@@ -43,7 +43,7 @@ public interface RSWorldMap extends RenderOverview
@Override
RSWorldMapManager getWorldMapManager();
@Import("initializeWorldMap")
@Import("initializeWorldMapManager")
@Override
void initializeWorldMap(WorldMapData var1);