From 4deec93ca3333461eb6b4827016ee675859e8db8 Mon Sep 17 00:00:00 2001 From: Adam Date: Sat, 12 Mar 2016 13:04:22 -0500 Subject: [PATCH] Add @Imports, by hand, untested --- src/main/java/net/runelite/rs/api/Actor.java | 12 ++++ src/main/java/net/runelite/rs/api/Buffer.java | 4 ++ .../net/runelite/rs/api/CacheableNode.java | 4 ++ .../java/net/runelite/rs/api/ClassInfo.java | 4 ++ src/main/java/net/runelite/rs/api/Client.java | 59 +++++++++++++++++-- .../net/runelite/rs/api/CollisionData.java | 3 + src/main/java/net/runelite/rs/api/Deque.java | 4 ++ .../java/net/runelite/rs/api/FileOnDisk.java | 4 ++ src/main/java/net/runelite/rs/api/Friend.java | 5 ++ .../java/net/runelite/rs/api/GameObject.java | 14 +++++ src/main/java/net/runelite/rs/api/Ignore.java | 4 ++ src/main/java/net/runelite/rs/api/Item.java | 4 ++ .../net/runelite/rs/api/ItemComposition.java | 4 ++ .../java/net/runelite/rs/api/ItemLayer.java | 10 ++++ src/main/java/net/runelite/rs/api/NPC.java | 3 + .../net/runelite/rs/api/NPCComposition.java | 10 ++++ src/main/java/net/runelite/rs/api/Node.java | 5 ++ .../runelite/rs/api/ObjectComposition.java | 4 ++ src/main/java/net/runelite/rs/api/Player.java | 8 +++ .../runelite/rs/api/PlayerComposition.java | 4 ++ .../java/net/runelite/rs/api/Projectile.java | 8 +++ src/main/java/net/runelite/rs/api/Region.java | 4 ++ .../java/net/runelite/rs/api/Renderable.java | 3 + .../java/net/runelite/rs/api/Sequence.java | 7 +++ src/main/java/net/runelite/rs/api/Tile.java | 7 +++ src/main/java/net/runelite/rs/api/Widget.java | 36 +++++++++++ .../java/net/runelite/rs/api/WidgetNode.java | 3 + src/main/java/net/runelite/rs/api/World.java | 9 +++ .../java/net/runelite/rs/api/XClanMember.java | 5 ++ .../runelite/rs/api/XGrandExchangeOffer.java | 8 +++ .../java/net/runelite/rs/api/XHashTable.java | 2 +- .../net/runelite/rs/api/XItemContainer.java | 4 ++ 32 files changed, 260 insertions(+), 5 deletions(-) diff --git a/src/main/java/net/runelite/rs/api/Actor.java b/src/main/java/net/runelite/rs/api/Actor.java index deaf88cfe8..bf1ab3fb7a 100644 --- a/src/main/java/net/runelite/rs/api/Actor.java +++ b/src/main/java/net/runelite/rs/api/Actor.java @@ -1,24 +1,36 @@ package net.runelite.rs.api; +import net.runelite.mapping.Import; + public interface Actor extends Renderable { + @Import("interacting") int getInteracting(); + @Import("interactingObjects") int getInteractingObjects(); + @Import("inSequence") boolean inSequence(); + @Import("overhead") String getOverhead(); + @Import("loopCycle") int getLoopCycle(); + @Import("health") int getHealth(); + @Import("maxHealth") int getMaxHealth(); + @Import("x") int getX(); + @Import("y") int getY(); + @Import("animation") int getAnimation(); } diff --git a/src/main/java/net/runelite/rs/api/Buffer.java b/src/main/java/net/runelite/rs/api/Buffer.java index 4a4f8ccdb3..8842d7c263 100644 --- a/src/main/java/net/runelite/rs/api/Buffer.java +++ b/src/main/java/net/runelite/rs/api/Buffer.java @@ -1,8 +1,12 @@ package net.runelite.rs.api; +import net.runelite.mapping.Import; + public interface Buffer { + @Import("payload") byte[] getPayload(); + @Import("offset") int getOffset(); } diff --git a/src/main/java/net/runelite/rs/api/CacheableNode.java b/src/main/java/net/runelite/rs/api/CacheableNode.java index 3227d5bfa6..48f34ff7e6 100644 --- a/src/main/java/net/runelite/rs/api/CacheableNode.java +++ b/src/main/java/net/runelite/rs/api/CacheableNode.java @@ -1,8 +1,12 @@ package net.runelite.rs.api; +import net.runelite.mapping.Import; + public interface CacheableNode { + @Import("next") CacheableNode getNext(); + @Import("previous") CacheableNode getPrevious(); } diff --git a/src/main/java/net/runelite/rs/api/ClassInfo.java b/src/main/java/net/runelite/rs/api/ClassInfo.java index 6a099c0796..6b84280607 100644 --- a/src/main/java/net/runelite/rs/api/ClassInfo.java +++ b/src/main/java/net/runelite/rs/api/ClassInfo.java @@ -2,12 +2,16 @@ package net.runelite.rs.api; import java.lang.reflect.Field; import java.lang.reflect.Method; +import net.runelite.mapping.Import; public interface ClassInfo { + @Import("methods") Method getMethods(); + @Import("fields") Field getFields(); + @Import("args") byte[][][] getArgs(); } diff --git a/src/main/java/net/runelite/rs/api/Client.java b/src/main/java/net/runelite/rs/api/Client.java index bffcfa496f..35da9b753c 100644 --- a/src/main/java/net/runelite/rs/api/Client.java +++ b/src/main/java/net/runelite/rs/api/Client.java @@ -1,110 +1,161 @@ package net.runelite.rs.api; +import net.runelite.mapping.Import; + public interface Client extends GameEngine { + @Import("cameraX") int getCameraX(); + @Import("cameraY") int getCameraY(); + @Import("cameraZ") int getCameraZ(); + @Import("plane") int getPlane(); + @Import("cameraPitch") int getCameraPitch(); + @Import("cameraYaw") int getCameraYaw(); + @Import("world") int getWorld(); + @Import("FPS") int getFPS(); + @Import("mapScale") int getMapScale(); + @Import("mapAngle") int getMapAngle(); + @Import("tileHeights") int[][][] getTileHeights(); + @Import("tileSettings") byte[][][] getTileSettings(); + @Import("settings") int[] getSettings(); + @Import("widgetSettings") int[] getWidgetSettings(); + @Import("energy") int getEnergy(); + @Import("weight") int getWeight(); + @Import("baseX") int getBaseX(); + @Import("baseY") int getBaseY(); + @Import("boostedSkillLevels") int[] getBoostedSkillLevels(); + @Import("realSkillLevels") int[] getRealSkillLevels(); + @Import("skillExperience") int[] getSkillExperiences(); + @Import("gameState") int getGameState(); + @Import("widgets") Widget[][] getWidgets(); + @Import("region") Region getRegion(); + @Import("localPlayer") Player getLocalPlayer(); + @Import("cachedNPCs") NPC[] getCachedNPCs(); + @Import("collionMaps") CollisionData[] getCollisionMaps(); + @Import("cachedPlayers") Player[] getCachedPlayers(); + @Import("groundItemDeque") Deque[][][] getGroundItemDeque(); + @Import("username") String getUsername(); + @Import("menuACtions") String[] getMenuActions(); + @Import("menuOptions") String[] getMenuOptions(); + @Import("friends") Friend[] getFriends(); + @Import("ignores") Ignore[] getIgnores(); + @Import("worldList") World[] getWorldList(); + @Import("rootInterface") int getRootInterface(); - void setUsername(String var1); + //void setUsername(String var1); - void sendGameMessage(int var1, String var2, String var3, int var4); + //void sendGameMessage(int var1, String var2, String var3, int var4); - void hopToWorld(String var1, int var2, int var3); + //void hopToWorld(String var1, int var2, int var3); + @Import("objectDefinition") ObjectComposition getObjectDefinition(int var1); - void setScale(int var1); + //void setScale(int var1); + @Import("scale") int getScale(); + @Import("camera2") int getCamera2(); + @Import("camera3") int getCamera3(); + @Import("validInterfaces") boolean[] getValidInterfaces(); + @Import("resized") boolean isResized(); + @Import("widgetPositionX") int[] getWidgetPositionsX(); + @Import("widgetPositionY") int[] getWidgetPositionsY(); + @Import("itemContainers") XHashTable getItemContainers(); + @Import("componentTable") XHashTable getComponentTable(); + @Import("grandExchangeOffers") XGrandExchangeOffer[] getGrandExchangeOffers(); + @Import("activeInterface") Widget getActiveInterface(); + @Import("clanMembers") XClanMember[] getClanMembers(); } diff --git a/src/main/java/net/runelite/rs/api/CollisionData.java b/src/main/java/net/runelite/rs/api/CollisionData.java index 3ca65e6889..2e62d8f4aa 100644 --- a/src/main/java/net/runelite/rs/api/CollisionData.java +++ b/src/main/java/net/runelite/rs/api/CollisionData.java @@ -1,6 +1,9 @@ package net.runelite.rs.api; +import net.runelite.mapping.Import; + public interface CollisionData { + @Import("flags") int[][] getFlags(); } diff --git a/src/main/java/net/runelite/rs/api/Deque.java b/src/main/java/net/runelite/rs/api/Deque.java index 7635fbc6b2..6c07d20623 100644 --- a/src/main/java/net/runelite/rs/api/Deque.java +++ b/src/main/java/net/runelite/rs/api/Deque.java @@ -1,8 +1,12 @@ package net.runelite.rs.api; +import net.runelite.mapping.Import; + public interface Deque { + @Import("current") Node getCurrent(); + @Import("head") Node getHead(); } diff --git a/src/main/java/net/runelite/rs/api/FileOnDisk.java b/src/main/java/net/runelite/rs/api/FileOnDisk.java index 65a16cf66f..488d9edcaa 100644 --- a/src/main/java/net/runelite/rs/api/FileOnDisk.java +++ b/src/main/java/net/runelite/rs/api/FileOnDisk.java @@ -1,12 +1,16 @@ package net.runelite.rs.api; import java.io.RandomAccessFile; +import net.runelite.mapping.Import; public interface FileOnDisk { + @Import("file") RandomAccessFile getFile(); + @Import("position") long getPosition(); + @Import("length") long getLength(); } diff --git a/src/main/java/net/runelite/rs/api/Friend.java b/src/main/java/net/runelite/rs/api/Friend.java index e317642fb4..5013803421 100644 --- a/src/main/java/net/runelite/rs/api/Friend.java +++ b/src/main/java/net/runelite/rs/api/Friend.java @@ -1,10 +1,15 @@ package net.runelite.rs.api; +import net.runelite.mapping.Import; + public interface Friend { + @Import("name") String getName(); + @Import("previousName") String getPreviousName(); + @Import("world") int getWorld(); } diff --git a/src/main/java/net/runelite/rs/api/GameObject.java b/src/main/java/net/runelite/rs/api/GameObject.java index 77a6c67165..c93c8cf5fe 100644 --- a/src/main/java/net/runelite/rs/api/GameObject.java +++ b/src/main/java/net/runelite/rs/api/GameObject.java @@ -1,28 +1,42 @@ package net.runelite.rs.api; +import net.runelite.mapping.Import; + public interface GameObject { + @Import("renderable") Renderable getRenderable(); + @Import("plane") int getPlane(); + @Import("relativeX") int getRelativeX(); + @Import("relativeY") int getRelativeY(); + @Import("offsetX") int getOffsetX(); + @Import("offsetY") int getOffsetY(); + @Import("x") int getX(); + @Import("y") int getY(); + @Import("height") int getHeight(); + @Import("orientation") int getOrientation(); + @Import("hash") int getHash(); + @Import("flags") int getFlags(); } diff --git a/src/main/java/net/runelite/rs/api/Ignore.java b/src/main/java/net/runelite/rs/api/Ignore.java index 0a5cf2ffc5..23355186c8 100644 --- a/src/main/java/net/runelite/rs/api/Ignore.java +++ b/src/main/java/net/runelite/rs/api/Ignore.java @@ -1,8 +1,12 @@ package net.runelite.rs.api; +import net.runelite.mapping.Import; + public interface Ignore { + @Import("name") String getName(); + @Import("prevousName") String getPreviousName(); } diff --git a/src/main/java/net/runelite/rs/api/Item.java b/src/main/java/net/runelite/rs/api/Item.java index 25aa6967c3..2d34e6b43e 100644 --- a/src/main/java/net/runelite/rs/api/Item.java +++ b/src/main/java/net/runelite/rs/api/Item.java @@ -1,8 +1,12 @@ package net.runelite.rs.api; +import net.runelite.mapping.Import; + public interface Item extends Renderable { + @Import("id") int getId(); + @Import("quantity") int getQuantity(); } diff --git a/src/main/java/net/runelite/rs/api/ItemComposition.java b/src/main/java/net/runelite/rs/api/ItemComposition.java index b99af40d85..72ce4dedfc 100644 --- a/src/main/java/net/runelite/rs/api/ItemComposition.java +++ b/src/main/java/net/runelite/rs/api/ItemComposition.java @@ -1,8 +1,12 @@ package net.runelite.rs.api; +import net.runelite.mapping.Import; + public interface ItemComposition { + @Import("name") String getName(); + @Import("isMembers") boolean isMembers(); } diff --git a/src/main/java/net/runelite/rs/api/ItemLayer.java b/src/main/java/net/runelite/rs/api/ItemLayer.java index 7bcf478f10..01ebe8497c 100644 --- a/src/main/java/net/runelite/rs/api/ItemLayer.java +++ b/src/main/java/net/runelite/rs/api/ItemLayer.java @@ -1,20 +1,30 @@ package net.runelite.rs.api; +import net.runelite.mapping.Import; + public interface ItemLayer { + @Import("x") int getX(); + @Import("y") int getY(); + @Import("hash") int getHash(); + @Import("flags") int getFlags(); + @Import("height") int getHeight(); + @Import("bottom") Renderable getBottom(); + @Import("middle") Renderable getMiddle(); + @Import("top") Renderable getTop(); } diff --git a/src/main/java/net/runelite/rs/api/NPC.java b/src/main/java/net/runelite/rs/api/NPC.java index 0ebad34f9f..08911d222d 100644 --- a/src/main/java/net/runelite/rs/api/NPC.java +++ b/src/main/java/net/runelite/rs/api/NPC.java @@ -1,6 +1,9 @@ package net.runelite.rs.api; +import net.runelite.mapping.Import; + public interface NPC extends Actor { + @Import("composition") NPCComposition getComposition(); } diff --git a/src/main/java/net/runelite/rs/api/NPCComposition.java b/src/main/java/net/runelite/rs/api/NPCComposition.java index 58b6fc9ee1..415e1310d3 100644 --- a/src/main/java/net/runelite/rs/api/NPCComposition.java +++ b/src/main/java/net/runelite/rs/api/NPCComposition.java @@ -1,20 +1,30 @@ package net.runelite.rs.api; +import net.runelite.mapping.Import; + public interface NPCComposition { + @Import("name") String getName(); + @Import("models") int[] getModels(); + @Import("actions") String[] getActions(); + @Import("clickable") boolean isClickable(); + @Import("isMinimapVisible") boolean isMinimapVisable(); + @Import("isVisible") boolean isVisable(); + @Import("id") int getId(); + @Import("combatLevel") int getCombatLevel(); } diff --git a/src/main/java/net/runelite/rs/api/Node.java b/src/main/java/net/runelite/rs/api/Node.java index 4574a66951..06700412e3 100644 --- a/src/main/java/net/runelite/rs/api/Node.java +++ b/src/main/java/net/runelite/rs/api/Node.java @@ -1,10 +1,15 @@ package net.runelite.rs.api; +import net.runelite.mapping.Import; + public interface Node { + @Import("next") Node getNext(); + @Import("hash") long getHash(); + @Import("previous") Node getPrevious(); } diff --git a/src/main/java/net/runelite/rs/api/ObjectComposition.java b/src/main/java/net/runelite/rs/api/ObjectComposition.java index e287a13bc0..f767115688 100644 --- a/src/main/java/net/runelite/rs/api/ObjectComposition.java +++ b/src/main/java/net/runelite/rs/api/ObjectComposition.java @@ -1,8 +1,12 @@ package net.runelite.rs.api; +import net.runelite.mapping.Import; + public interface ObjectComposition { + @Import("name") String getName(); + @Import("actions") String[] getActions(); } diff --git a/src/main/java/net/runelite/rs/api/Player.java b/src/main/java/net/runelite/rs/api/Player.java index 50c105d78c..9d43f6d920 100644 --- a/src/main/java/net/runelite/rs/api/Player.java +++ b/src/main/java/net/runelite/rs/api/Player.java @@ -1,16 +1,24 @@ package net.runelite.rs.api; +import net.runelite.mapping.Import; + public interface Player extends Actor { + @Import("composition") PlayerComposition getComposition(); + @Import("name") String getName(); + @Import("model") Model getModel(); + @Import("combatLevel") int getCombatLevel(); + @Import("totalLevel") int getTotalLevel(); + @Import("team") int getTeam(); } diff --git a/src/main/java/net/runelite/rs/api/PlayerComposition.java b/src/main/java/net/runelite/rs/api/PlayerComposition.java index 059b5f6483..66de626945 100644 --- a/src/main/java/net/runelite/rs/api/PlayerComposition.java +++ b/src/main/java/net/runelite/rs/api/PlayerComposition.java @@ -1,8 +1,12 @@ package net.runelite.rs.api; +import net.runelite.mapping.Import; + public interface PlayerComposition { + @Import("isFemale") boolean isFemale(); + @Import("equipment") int[] getEquipment(); } diff --git a/src/main/java/net/runelite/rs/api/Projectile.java b/src/main/java/net/runelite/rs/api/Projectile.java index 2eb55d3a78..0a3cc0d44c 100644 --- a/src/main/java/net/runelite/rs/api/Projectile.java +++ b/src/main/java/net/runelite/rs/api/Projectile.java @@ -1,16 +1,24 @@ package net.runelite.rs.api; +import net.runelite.mapping.Import; + public interface Projectile { + @Import("isMoving") boolean isMoving(); + @Import("animationSequence") Sequence getAnimationSequence(); + @Import("velocityY") double getVelocityY(); + @Import("velocityX") double getVelocityX(); + @Import("velocityZ") double getVelocityZ(); + @Import("scalar") double getScalar(); } diff --git a/src/main/java/net/runelite/rs/api/Region.java b/src/main/java/net/runelite/rs/api/Region.java index 1b8fdcdda9..225e915eeb 100644 --- a/src/main/java/net/runelite/rs/api/Region.java +++ b/src/main/java/net/runelite/rs/api/Region.java @@ -1,8 +1,12 @@ package net.runelite.rs.api; +import net.runelite.mapping.Import; + public interface Region { + @Import("objects") GameObject[] getObjects(); + @Import("tiles") Tile[][][] getTiles(); } diff --git a/src/main/java/net/runelite/rs/api/Renderable.java b/src/main/java/net/runelite/rs/api/Renderable.java index cf32f1d6d0..87bebbeb76 100644 --- a/src/main/java/net/runelite/rs/api/Renderable.java +++ b/src/main/java/net/runelite/rs/api/Renderable.java @@ -1,6 +1,9 @@ package net.runelite.rs.api; +import net.runelite.mapping.Import; + public interface Renderable extends Node { + @Import("modelHeight") int getModelHeight(); } diff --git a/src/main/java/net/runelite/rs/api/Sequence.java b/src/main/java/net/runelite/rs/api/Sequence.java index e30c3be65d..e6682fe751 100644 --- a/src/main/java/net/runelite/rs/api/Sequence.java +++ b/src/main/java/net/runelite/rs/api/Sequence.java @@ -1,14 +1,21 @@ package net.runelite.rs.api; +import net.runelite.mapping.Import; + public interface Sequence { + @Import("stretches") boolean getStretches(); + @Import("maxLoops") int getMaxLoops(); + @Import("precedenceAnimating") int getPrecedenceAnimating(); + @Import("replyMode") int getReplyMode(); + @Import("interleaveLeave") int[] getInterleaveLeave(); } diff --git a/src/main/java/net/runelite/rs/api/Tile.java b/src/main/java/net/runelite/rs/api/Tile.java index 4b1d564f5a..ca1afb6466 100644 --- a/src/main/java/net/runelite/rs/api/Tile.java +++ b/src/main/java/net/runelite/rs/api/Tile.java @@ -1,14 +1,21 @@ package net.runelite.rs.api; +import net.runelite.mapping.Import; + public interface Tile { + @Import("objects") GameObject[] getObjects(); + @Import("itemLayer") ItemLayer getItemLayer(); + @Import("x") int getX(); + @Import("y") int getY(); + @Import("plane") int getPlane(); } diff --git a/src/main/java/net/runelite/rs/api/Widget.java b/src/main/java/net/runelite/rs/api/Widget.java index 326b98687a..2360807dda 100644 --- a/src/main/java/net/runelite/rs/api/Widget.java +++ b/src/main/java/net/runelite/rs/api/Widget.java @@ -1,72 +1,108 @@ package net.runelite.rs.api; +import net.runelite.mapping.Import; + public interface Widget { + @Import("parent") Widget getParent(); + @Import("dynamicValues") int[][] getDynamicValues(); + @Import("children") Widget[] getChildren(); + @Import("id") int getId(); + @Import("parentId") int getParentId(); + @Import("boundsIndex") int getBoundsIndex(); + @Import("modelId") int getModelId(); + @Import("itemIds") int[] getItemIds(); + @Import("itemQuantities") int[] getItemQuantities(); + @Import("modelType") int getModelType(); + @Import("actions") String[] getActions(); + @Import("text") String getText(); + @Import("name") String getName(); + @Import("textColor") int getTextColor(); + @Import("opacity") int getOpacity(); + @Import("relativeX") int getRelativeX(); + @Import("relativeY") int getRelativeY(); + @Import("width") int getWidth(); + @Import("heigth") int getHeight(); + @Import("isHidden") boolean isHidden(); + @Import("index") int getIndex(); + @Import("rotationX") int getRotationX(); + @Import("rotationY") int getRotationY(); + @Import("rotationZ") int getRotationZ(); + @Import("contentType") int getContentType(); + @Import("type") int getType(); + @Import("scrollX") int getScrollX(); + @Import("scrollY") int getScrollY(); + @Import("textureId") int getTextureId(); + @Import("borderThickness") int getBorderThickness(); + @Import("itemId") int getItemId(); + @Import("itemQuantity") int getItemQuantity(); + @Import("x") int getX(); + @Import("y") int getY(); } diff --git a/src/main/java/net/runelite/rs/api/WidgetNode.java b/src/main/java/net/runelite/rs/api/WidgetNode.java index 0cc9ea4790..fd3b945bf6 100644 --- a/src/main/java/net/runelite/rs/api/WidgetNode.java +++ b/src/main/java/net/runelite/rs/api/WidgetNode.java @@ -1,6 +1,9 @@ package net.runelite.rs.api; +import net.runelite.mapping.Import; + public interface WidgetNode { + @Import("id") int getId(); } diff --git a/src/main/java/net/runelite/rs/api/World.java b/src/main/java/net/runelite/rs/api/World.java index 8948df4d44..202caf1846 100644 --- a/src/main/java/net/runelite/rs/api/World.java +++ b/src/main/java/net/runelite/rs/api/World.java @@ -1,18 +1,27 @@ package net.runelite.rs.api; +import net.runelite.mapping.Import; + public interface World { + @Import("mask") int getMask(); + @Import("playerCount") int getPlayerCount(); + @Import("location") int getLocation(); + @Import("index") int getIndex(); + @Import("id") int getId(); + @Import("activity") String getActivity(); + @Import("address") String getAddress(); } diff --git a/src/main/java/net/runelite/rs/api/XClanMember.java b/src/main/java/net/runelite/rs/api/XClanMember.java index 370c729d98..246aca8116 100644 --- a/src/main/java/net/runelite/rs/api/XClanMember.java +++ b/src/main/java/net/runelite/rs/api/XClanMember.java @@ -1,10 +1,15 @@ package net.runelite.rs.api; +import net.runelite.mapping.Import; + public interface XClanMember { + @Import("name") String getName(); + @Import("world") int getWorld(); + @Import("rank") byte getRank(); } diff --git a/src/main/java/net/runelite/rs/api/XGrandExchangeOffer.java b/src/main/java/net/runelite/rs/api/XGrandExchangeOffer.java index c67a7dc582..7115542fa2 100644 --- a/src/main/java/net/runelite/rs/api/XGrandExchangeOffer.java +++ b/src/main/java/net/runelite/rs/api/XGrandExchangeOffer.java @@ -1,16 +1,24 @@ package net.runelite.rs.api; +import net.runelite.mapping.Import; + public interface XGrandExchangeOffer { + @Import("quantitySold") int getQuantitySold(); + @Import("itemId") int getItemId(); + @Import("totalQuantity") int getTotalQuantity(); + @Import("price") int getPrice(); + @Import("spent") int getSpent(); + @Import("progress") byte getProgress(); } diff --git a/src/main/java/net/runelite/rs/api/XHashTable.java b/src/main/java/net/runelite/rs/api/XHashTable.java index 97fe636784..5f3c4c6814 100644 --- a/src/main/java/net/runelite/rs/api/XHashTable.java +++ b/src/main/java/net/runelite/rs/api/XHashTable.java @@ -2,5 +2,5 @@ package net.runelite.rs.api; public interface XHashTable { - Node get(long var1); + //Node get(long var1); } diff --git a/src/main/java/net/runelite/rs/api/XItemContainer.java b/src/main/java/net/runelite/rs/api/XItemContainer.java index d5b46b8d2b..f2a01a99ef 100644 --- a/src/main/java/net/runelite/rs/api/XItemContainer.java +++ b/src/main/java/net/runelite/rs/api/XItemContainer.java @@ -1,8 +1,12 @@ package net.runelite.rs.api; +import net.runelite.mapping.Import; + public interface XItemContainer extends Node { + @Import("itemIds") int[] getItemIds(); + @Import("stackSizes") int[] getStackSizes(); }