From b805f786a83f9e0e2405482f55b942ac7fdedf2b Mon Sep 17 00:00:00 2001 From: Adam Date: Thu, 10 May 2018 08:28:41 -0400 Subject: [PATCH] Update mixins/api for 170 --- .../java/net/runelite/api/TileObject.java | 2 +- .../net/runelite/mixins/EntityHiderMixin.java | 4 ++-- .../net/runelite/mixins/RSRegionMixin.java | 22 +++++++++---------- .../net/runelite/mixins/TileObjectMixin.java | 4 ++-- .../runelite/rs/api/RSDecorativeObject.java | 2 +- .../net/runelite/rs/api/RSGameObject.java | 2 +- .../net/runelite/rs/api/RSGroundObject.java | 2 +- .../java/net/runelite/rs/api/RSItemLayer.java | 2 +- .../net/runelite/rs/api/RSWallObject.java | 2 +- 9 files changed, 21 insertions(+), 21 deletions(-) diff --git a/runelite-api/src/main/java/net/runelite/api/TileObject.java b/runelite-api/src/main/java/net/runelite/api/TileObject.java index abc580c92e..b51061eff2 100644 --- a/runelite-api/src/main/java/net/runelite/api/TileObject.java +++ b/runelite-api/src/main/java/net/runelite/api/TileObject.java @@ -32,7 +32,7 @@ import net.runelite.api.coords.WorldPoint; public interface TileObject { - int getHash(); + long getHash(); int getX(); diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/EntityHiderMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/EntityHiderMixin.java index 853a2bb210..79f2ec704d 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/EntityHiderMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/EntityHiderMixin.java @@ -77,10 +77,10 @@ public abstract class EntityHiderMixin implements RSRegion private static boolean hideProjectiles; @Copy("addEntityMarker") - abstract boolean addEntityMarker(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, RSRenderable renderable, int var10, boolean var11, int var12, int var13); + abstract boolean addEntityMarker(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, RSRenderable renderable, int var10, boolean var11, long var12, int var13); @Replace("addEntityMarker") - boolean rl$addEntityMarker(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, RSRenderable renderable, int var10, boolean var11, int var12, int var13) + boolean rl$addEntityMarker(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, RSRenderable renderable, int var10, boolean var11, long var12, int var13) { return shouldDraw(renderable, false) && addEntityMarker(var1, var2, var3, var4, var5, var6, var7, var8, renderable, var10, var11, var12, var13); } diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSRegionMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSRegionMixin.java index 20e0ff9514..e29dcb2b36 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSRegionMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSRegionMixin.java @@ -60,12 +60,12 @@ public abstract class RSRegionMixin implements RSRegion } @Copy("addBoundaryDecoration") - abstract public void rs$addBoundaryDecoration(int plane, int x, int y, int hash, Renderable var5, Renderable var6, int var7, int var8, int var9, int var10, int var11, int var12); + abstract public void rs$addBoundaryDecoration(int plane, int x, int y, int floor, Renderable var5, Renderable var6, int var7, int var8, int var9, int var10, long hash, int var12); @Replace("addBoundaryDecoration") - public void rl$addBoundaryDecoration(int plane, int x, int y, int hash, Renderable var5, Renderable var6, int var7, int var8, int var9, int var10, int var11, int var12) + public void rl$addBoundaryDecoration(int plane, int x, int y, int floor, Renderable var5, Renderable var6, int var7, int var8, int var9, int var10, long hash, int var12) { - rs$addBoundaryDecoration(plane, x, y, hash, var5, var6, var7, var8, var9, var10, var11, var12); + rs$addBoundaryDecoration(plane, x, y, floor, var5, var6, var7, var8, var9, var10, hash, var12); Tile tile = getTiles()[plane][x][y]; if (tile != null) { @@ -78,10 +78,10 @@ public abstract class RSRegionMixin implements RSRegion } @Copy("addItemPile") - abstract public void rs$addItemPile(int plane, int x, int y, int hash, Renderable var5, int var6, Renderable var7, Renderable var8); + abstract public void rs$addItemPile(int plane, int x, int y, int hash, Renderable var5, long var6, Renderable var7, Renderable var8); @Replace("addItemPile") - public void rl$addItemPile(int plane, int x, int y, int hash, Renderable var5, int var6, Renderable var7, Renderable var8) + public void rl$addItemPile(int plane, int x, int y, int hash, Renderable var5, long var6, Renderable var7, Renderable var8) { rs$addItemPile(plane, x, y, hash, var5, var6, var7, var8); Tile tile = getTiles()[plane][x][y]; @@ -96,12 +96,12 @@ public abstract class RSRegionMixin implements RSRegion } @Copy("groundObjectSpawned") - abstract public void rs$groundObjectSpawned(int plane, int x, int y, int hash, Renderable var5, int var6, int var7); + abstract public void rs$groundObjectSpawned(int plane, int x, int y, int floor, Renderable var5, long hash, int var7); @Replace("groundObjectSpawned") - public void rl$groundObjectSpawned(int plane, int x, int y, int hash, Renderable var5, int var6, int var7) + public void rl$groundObjectSpawned(int plane, int x, int y, int floor, Renderable var5, long hash, int var7) { - rs$groundObjectSpawned(plane, x, y, hash, var5, var6, var7); + rs$groundObjectSpawned(plane, x, y, floor, var5, hash, var7); Tile tile = getTiles()[plane][x][y]; if (tile != null) { @@ -114,12 +114,12 @@ public abstract class RSRegionMixin implements RSRegion } @Copy("addBoundary") - abstract public void rs$addBoundary(int plane, int x, int y, int hash, Renderable var5, Renderable var6, int var7, int var8, int var9, int var10); + abstract public void rs$addBoundary(int plane, int x, int y, int floor, Renderable var5, Renderable var6, int var7, int var8, long hash, int var10); @Replace("addBoundary") - public void rl$addBoundary(int plane, int x, int y, int hash, Renderable var5, Renderable var6, int var7, int var8, int var9, int var10) + public void rl$addBoundary(int plane, int x, int y, int floor, Renderable var5, Renderable var6, int var7, int var8, long hash, int var10) { - rs$addBoundary(plane, x, y, hash, var5, var6, var7, var8, var9, var10); + rs$addBoundary(plane, x, y, floor, var5, var6, var7, var8, hash, var10); Tile tile = getTiles()[plane][x][y]; if (tile != null) { diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/TileObjectMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/TileObjectMixin.java index 3ee9d46268..4eabe528e2 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/TileObjectMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/TileObjectMixin.java @@ -58,8 +58,8 @@ public abstract class TileObjectMixin implements TileObject @Inject public int getId() { - int hash = getHash(); - return hash >> 14 & 32767; + long hash = getHash(); + return (int) (hash >>> 17 & 4294967295L); } @Override diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSDecorativeObject.java b/runescape-api/src/main/java/net/runelite/rs/api/RSDecorativeObject.java index 8263a676d0..7e4977d26c 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSDecorativeObject.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSDecorativeObject.java @@ -31,7 +31,7 @@ public interface RSDecorativeObject extends DecorativeObject { @Import("hash") @Override - int getHash(); + long getHash(); @Import("x") int getX(); diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSGameObject.java b/runescape-api/src/main/java/net/runelite/rs/api/RSGameObject.java index c0aff49eb6..b77453c325 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSGameObject.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSGameObject.java @@ -63,7 +63,7 @@ public interface RSGameObject extends GameObject @Import("hash") @Override - int getHash(); + long getHash(); @Import("flags") int getFlags(); diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSGroundObject.java b/runescape-api/src/main/java/net/runelite/rs/api/RSGroundObject.java index 80ab8716b5..73b754aa99 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSGroundObject.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSGroundObject.java @@ -32,7 +32,7 @@ public interface RSGroundObject extends GroundObject { @Import("hash") @Override - int getHash(); + long getHash(); @Import("x") int getX(); diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSItemLayer.java b/runescape-api/src/main/java/net/runelite/rs/api/RSItemLayer.java index 3ed4cab8e3..4afd479296 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSItemLayer.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSItemLayer.java @@ -37,7 +37,7 @@ public interface RSItemLayer extends ItemLayer @Import("hash") @Override - int getHash(); + long getHash(); @Import("height") int getHeight(); diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSWallObject.java b/runescape-api/src/main/java/net/runelite/rs/api/RSWallObject.java index a119f0a697..e8765bb645 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSWallObject.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSWallObject.java @@ -32,7 +32,7 @@ public interface RSWallObject extends WallObject { @Import("hash") @Override - int getHash(); + long getHash(); @Import("x") @Override