project: upstream merge

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

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

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

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