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

project: upstream merge

Browse Source
This commit is contained in:
zjustin
2022-03-20 16:51:25 +11:00
parent 57a73b0611
commit 11714f1eec
12 changed files with 24 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
buildSrc/src/main/kotlin/Dependencies.kt
View File

@@ -25,9 +25,9 @@
object ProjectVersions { object ProjectVersions {
const val launcherVersion = "2.2.0" const val launcherVersion = "2.2.0"
const val rlVersion = "1.8.13.1" const val rlVersion = "1.8.14"
const val openosrsVersion = "4.20.4" const val openosrsVersion = "4.20.5"
const val rsversion = 203 const val rsversion = 203
const val cacheversion = 165 const val cacheversion = 165

4
runelite-mixins/src/main/java/net/runelite/mixins/RSBoundaryObjectMixin.java
View File

@@ -78,8 +78,8 @@ public abstract class RSBoundaryObjectMixin implements RSBoundaryObject
@Override @Override
public Shape getClickbox() public Shape getClickbox()
{ {
Shape clickboxA = Perspective.getClickbox(client, getModelA(), 0, getLocalLocation()); Shape clickboxA = Perspective.getClickbox(client, getModelA(), 0, getX(), getY(), getZ());
Shape clickboxB = Perspective.getClickbox(client, getModelB(), 0, getLocalLocation()); Shape clickboxB = Perspective.getClickbox(client, getModelB(), 0, getX(), getY(), getZ());
if (clickboxA == null && clickboxB == null) if (clickboxA == null && clickboxB == null)
{ {

2
runelite-mixins/src/main/java/net/runelite/mixins/RSFloorDecorationMixin.java
View File

@@ -77,6 +77,6 @@ public abstract class RSFloorDecorationMixin implements RSFloorDecoration
@Override @Override
public Shape getClickbox() public Shape getClickbox()
{ {
return Perspective.getClickbox(client, getModel(), 0, getLocalLocation()); return Perspective.getClickbox(client, getModel(), 0, getX(), getY(), getZ());
} }
} }

2
runelite-mixins/src/main/java/net/runelite/mixins/RSGameObjectMixin.java
View File

@@ -97,7 +97,7 @@ public abstract class RSGameObjectMixin implements RSGameObject
@Override @Override
public Shape getClickbox() public Shape getClickbox()
{ {
return Perspective.getClickbox(client, getModel(), getModelOrientation(), getLocalLocation()); return Perspective.getClickbox(client, getModel(), getModelOrientation(), getX(), getY(), getZ());
} }
@Inject @Inject

7
runelite-mixins/src/main/java/net/runelite/mixins/RSWallDecorationMixin.java
View File

@@ -86,11 +86,8 @@ public abstract class RSWallDecorationMixin implements RSWallDecoration
@Override @Override
public Shape getClickbox() public Shape getClickbox()
{ {
LocalPoint lp = getLocalLocation(); Shape clickboxA = Perspective.getClickbox(client, getModel1(), 0, getX() + getXOffset(), getY() + getYOffset(), getZ());
Shape clickboxB = Perspective.getClickbox(client, getModel2(), 0, getX(), getY(), getZ());
Shape clickboxA = Perspective.getClickbox(client, getModel1(), 0,
new LocalPoint(lp.getX() + getXOffset(), lp.getY() + getYOffset()));
Shape clickboxB = Perspective.getClickbox(client, getModel2(), 0, lp);
if (clickboxA == null && clickboxB == null) if (clickboxA == null && clickboxB == null)
{ {

2
runelite-mixins/src/main/java/net/runelite/mixins/RuneLiteObjectMixin.java
View File

@@ -51,7 +51,7 @@ public abstract class RuneLiteObjectMixin implements RSRuneLiteObject
setX(localPoint.getX()); setX(localPoint.getX());
setY(localPoint.getY()); setY(localPoint.getY());
setLevel(plane); setLevel(plane);
setHeight(Perspective.getTileHeight(client, localPoint, plane)); setZ(Perspective.getTileHeight(client, localPoint, plane));
} }
@Inject @Inject

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

@@ -28,8 +28,8 @@ public interface RSGameObject extends GameObject
@Override @Override
int getY(); int getY();
@Import("height") @Import("z")
int getHeight(); int getZ();
@Import("orientation") @Import("orientation")
int getModelOrientation(); int getModelOrientation();

9
runescape-api/src/main/java/net/runelite/rs/api/RSGraphicsObject.java
View File

@@ -26,9 +26,8 @@ public interface RSGraphicsObject extends GraphicsObject, RSRenderable
@Override @Override
int getLevel(); int getLevel();
@Import("height") @Import("z")
@Override int getZ();
int getHeight();
@Import("isFinished") @Import("isFinished")
@Override @Override
@@ -58,8 +57,8 @@ public interface RSGraphicsObject extends GraphicsObject, RSRenderable
@Import("y") @Import("y")
void setY(int y); void setY(int y);
@Import("height") @Import("z")
void setHeight(int height); void setZ(int height);
@Import("sequenceDefinition") @Import("sequenceDefinition")
RSSequenceDefinition getSequenceDefinition(); RSSequenceDefinition getSequenceDefinition();

2
runescape-client/src/main/java/ClientPacket.java
View File

@@ -755,7 +755,7 @@ public class ClientPacket implements class253 {
if (var0.isFinished) { if (var0.isFinished) {
var0.remove(); // L: 4711 var0.remove(); // L: 4711
} else { } else {
Decimator.scene.drawEntity(var0.plane, var0.x, var0.y, var0.height, 60, var0, 0, -1L, false); // L: 4712 Decimator.scene.drawEntity(var0.plane, var0.x, var0.y, var0.z, 60, var0, 0, -1L, false); // L: 4712
} }
} }
} else { } else {

4
runescape-client/src/main/java/GameObject.java
View File

@@ -22,8 +22,8 @@ public final class GameObject {
@ObfuscatedGetter( @ObfuscatedGetter(
intValue = 746777845 intValue = 746777845
) )
@Export("height") @Export("z")
int height; int z;
@ObfuscatedName("s") @ObfuscatedName("s")
@ObfuscatedGetter( @ObfuscatedGetter(
intValue = 1435489625 intValue = 1435489625

6
runescape-client/src/main/java/GraphicsObject.java
View File

@@ -41,8 +41,8 @@ public class GraphicsObject extends Renderable {
@ObfuscatedGetter( @ObfuscatedGetter(
intValue = 1971033417 intValue = 1971033417
) )
@Export("height") @Export("z")
int height; int z;
@ObfuscatedName("i") @ObfuscatedName("i")
@ObfuscatedSignature( @ObfuscatedSignature(
descriptor = "Lgm;" descriptor = "Lgm;"
@@ -73,7 +73,7 @@ public class GraphicsObject extends Renderable {
this.plane = var2; // L: 22 this.plane = var2; // L: 22
this.x = var3; this.x = var3;
this.y = var4; this.y = var4;
this.height = var5; this.z = var5;
this.cycleStart = var7 + var6; this.cycleStart = var7 + var6;
int var8 = Widget.SpotAnimationDefinition_get(this.id).sequence; // L: 27 int var8 = Widget.SpotAnimationDefinition_get(this.id).sequence; // L: 27
if (var8 != -1) { if (var8 != -1) {

6
runescape-client/src/main/java/Scene.java
View File

@@ -559,7 +559,7 @@ public class Scene {
var21.plane = var1; // L: 307 var21.plane = var1; // L: 307
var21.centerX = var6; // L: 308 var21.centerX = var6; // L: 308
var21.centerY = var7; // L: 309 var21.centerY = var7; // L: 309
var21.height = var8; // L: 310 var21.z = var8; // L: 310
var21.renderable = var9; // L: 311 var21.renderable = var9; // L: 311
var21.orientation = var10; // L: 312 var21.orientation = var10; // L: 312
var21.startX = var2; // L: 313 var21.startX = var2; // L: 313
@@ -1370,7 +1370,7 @@ public class Scene {
for (var11 = 0; var11 < var9.gameObjectsCount; ++var11) { // L: 931 for (var11 = 0; var11 < var9.gameObjectsCount; ++var11) { // L: 931
var12 = var9.gameObjects[var11]; // L: 932 var12 = var9.gameObjects[var11]; // L: 932
if (var12 != null) { // L: 933 if (var12 != null) { // L: 933
var12.renderable.draw(var12.orientation, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var12.centerX - Scene_cameraX, var12.height - Scene_cameraY, var12.centerY - Scene_cameraZ, var12.tag); var12.renderable.draw(var12.orientation, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var12.centerX - Scene_cameraX, var12.z - Scene_cameraY, var12.centerY - Scene_cameraZ, var12.tag);
} }
} }
} }
@@ -1638,7 +1638,7 @@ public class Scene {
GameObject var33 = gameObjects[var25]; // L: 1113 GameObject var33 = gameObjects[var25]; // L: 1113
var33.lastDrawn = Scene_drawnCount; // L: 1114 var33.lastDrawn = Scene_drawnCount; // L: 1114
if (!this.method3947(var7, var33.startX, var33.endX, var33.startY, var33.endY, var33.renderable.height)) { // L: 1115 if (!this.method3947(var7, var33.startX, var33.endX, var33.startY, var33.endY, var33.renderable.height)) { // L: 1115
var33.renderable.draw(var33.orientation, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var33.centerX - Scene_cameraX, var33.height - Scene_cameraY, var33.centerY - Scene_cameraZ, var33.tag); // L: 1116 var33.renderable.draw(var33.orientation, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var33.centerX - Scene_cameraX, var33.z - Scene_cameraY, var33.centerY - Scene_cameraZ, var33.tag); // L: 1116
} }
for (var14 = var33.startX; var14 <= var33.endX; ++var14) { // L: 1118 for (var14 = var33.startX; var14 <= var33.endX; ++var14) { // L: 1118