From d84caf7db2b98444de3171f7efc064a2c0ed534d Mon Sep 17 00:00:00 2001 From: leejt Date: Mon, 13 Jan 2020 17:02:11 -0800 Subject: [PATCH] Update WorldMapDefinition attributes Changed the WorldMapType field names from fieldxxx to values that represent what they actually mean (mostly x, y, z coordinates) --- .../cache/definitions/WorldMapDefinition.java | 6 +- .../cache/definitions/WorldMapType0.java | 20 ++--- .../cache/definitions/WorldMapType1.java | 20 ++--- .../cache/definitions/WorldMapType2.java | 12 +-- .../cache/definitions/WorldMapType3.java | 28 +++--- .../definitions/loaders/WorldMapLoader.java | 88 +++++++++---------- 6 files changed, 87 insertions(+), 87 deletions(-) diff --git a/cache/src/main/java/net/runelite/cache/definitions/WorldMapDefinition.java b/cache/src/main/java/net/runelite/cache/definitions/WorldMapDefinition.java index a8333263e5..30c61f73b4 100644 --- a/cache/src/main/java/net/runelite/cache/definitions/WorldMapDefinition.java +++ b/cache/src/main/java/net/runelite/cache/definitions/WorldMapDefinition.java @@ -33,13 +33,13 @@ public class WorldMapDefinition { public String name; public int field450; - public int field451; + public int defaultZoom; public int fileId; public int field453; public int field454; public int field456; - public boolean field457; - public List field458; + public boolean isSurface; + public List regionList; public String safeName; public Position position; public int field463; diff --git a/cache/src/main/java/net/runelite/cache/definitions/WorldMapType0.java b/cache/src/main/java/net/runelite/cache/definitions/WorldMapType0.java index 1294d0eb4d..cecc41f524 100644 --- a/cache/src/main/java/net/runelite/cache/definitions/WorldMapType0.java +++ b/cache/src/main/java/net/runelite/cache/definitions/WorldMapType0.java @@ -29,14 +29,14 @@ import lombok.Data; @Data public class WorldMapType0 implements WorldMapTypeBase { - public int field600; - public int field601; - public int field602; - public int field603; - public int field604; - public int field605; - public int field606; - public int field607; - public int field608; - public int field609; + public int chunk_xHigh; + public int xLow; + public int chunk_xLow; + public int yLow; + public int xHigh; + public int numberOfPlanes; + public int plane; + public int chunk_yLow; + public int yHigh; + public int chunk_yHigh; } diff --git a/cache/src/main/java/net/runelite/cache/definitions/WorldMapType1.java b/cache/src/main/java/net/runelite/cache/definitions/WorldMapType1.java index 15a4f3e28d..4d4cd50d21 100644 --- a/cache/src/main/java/net/runelite/cache/definitions/WorldMapType1.java +++ b/cache/src/main/java/net/runelite/cache/definitions/WorldMapType1.java @@ -29,14 +29,14 @@ import lombok.Data; @Data public class WorldMapType1 implements WorldMapTypeBase { - public int field424; - public int field425; - public int field426; - public int field427; - public int field428; - public int field429; - public int field431; - public int field433; - public int field434; - public int field435; + public int numberOfPlanes; + public int xLowerLeft; + public int yLowerLeft; + public int xLowerRight; + public int yLowerRight; + public int xUpperLeft; + public int yUpperLeft; + public int xUpperRight; + public int plane; + public int yUpperRight; } diff --git a/cache/src/main/java/net/runelite/cache/definitions/WorldMapType2.java b/cache/src/main/java/net/runelite/cache/definitions/WorldMapType2.java index 7b5326814d..3670f99dd0 100644 --- a/cache/src/main/java/net/runelite/cache/definitions/WorldMapType2.java +++ b/cache/src/main/java/net/runelite/cache/definitions/WorldMapType2.java @@ -29,10 +29,10 @@ import lombok.Data; @Data public class WorldMapType2 implements WorldMapTypeBase { - public int field510; - public int field511; - public int field512; - public int field514; - public int field515; - public int field519; + public int xLow; + public int numberOfPlanes; + public int yLow; + public int xHigh; + public int yHigh; + public int plane; } diff --git a/cache/src/main/java/net/runelite/cache/definitions/WorldMapType3.java b/cache/src/main/java/net/runelite/cache/definitions/WorldMapType3.java index 433c8a17fa..10d55418e0 100644 --- a/cache/src/main/java/net/runelite/cache/definitions/WorldMapType3.java +++ b/cache/src/main/java/net/runelite/cache/definitions/WorldMapType3.java @@ -29,18 +29,18 @@ import lombok.Data; @Data public class WorldMapType3 implements WorldMapTypeBase { - public int field376; - public int field377; - public int field378; - public int field379; - public int field380; - public int field381; - public int field382; - public int field383; - public int field384; - public int field385; - public int field386; - public int field387; - public int field388; - public int field389; + public int chunk_oldXHigh; + public int numberOfPlanes; + public int oldX; + public int chunk_oldYHigh; + public int newX; + public int newY; + public int chunk_oldXLow; + public int oldY; + public int chunk_newYLow; + public int chunk_oldYLow; + public int chunk_newXLow; + public int oldPlane; + public int chunk_newXHigh; + public int chunk_newYHigh; } diff --git a/cache/src/main/java/net/runelite/cache/definitions/loaders/WorldMapLoader.java b/cache/src/main/java/net/runelite/cache/definitions/loaders/WorldMapLoader.java index 15ec975d6d..55bc6af71e 100644 --- a/cache/src/main/java/net/runelite/cache/definitions/loaders/WorldMapLoader.java +++ b/cache/src/main/java/net/runelite/cache/definitions/loaders/WorldMapLoader.java @@ -60,14 +60,14 @@ public class WorldMapLoader def.field450 = in.readInt(); in.readUnsignedByte(); - def.field457 = in.readUnsignedByte() == 1; - def.field451 = in.readUnsignedByte(); + def.isSurface = in.readUnsignedByte() == 1; + def.defaultZoom = in.readUnsignedByte(); int var3 = in.readUnsignedByte(); - def.field458 = new LinkedList(); + def.regionList = new LinkedList(); for (int var4 = 0; var4 < var3; ++var4) { - def.field458.add(this.loadType(in)); + def.regionList.add(this.loadType(in)); } return def; @@ -109,16 +109,16 @@ public class WorldMapLoader { WorldMapType0 wm = new WorldMapType0(); - wm.field606 = in.readUnsignedByte(); - wm.field605 = in.readUnsignedByte(); - wm.field601 = in.readUnsignedShort(); - wm.field602 = in.readUnsignedByte(); - wm.field603 = in.readUnsignedShort(); - wm.field607 = in.readUnsignedByte(); - wm.field604 = in.readUnsignedShort(); - wm.field600 = in.readUnsignedByte(); - wm.field608 = in.readUnsignedShort(); - wm.field609 = in.readUnsignedByte(); + wm.plane = in.readUnsignedByte(); + wm.numberOfPlanes = in.readUnsignedByte(); + wm.xLow = in.readUnsignedShort(); + wm.chunk_xLow = in.readUnsignedByte(); + wm.yLow = in.readUnsignedShort(); + wm.chunk_yLow = in.readUnsignedByte(); + wm.xHigh = in.readUnsignedShort(); + wm.chunk_xHigh = in.readUnsignedByte(); + wm.yHigh = in.readUnsignedShort(); + wm.chunk_yHigh = in.readUnsignedByte(); return wm; } @@ -127,16 +127,16 @@ public class WorldMapLoader { WorldMapType1 wm = new WorldMapType1(); - wm.field434 = in.readUnsignedByte(); - wm.field424 = in.readUnsignedByte(); - wm.field425 = in.readUnsignedShort(); - wm.field426 = in.readUnsignedShort(); - wm.field427 = in.readUnsignedShort(); - wm.field431 = in.readUnsignedShort(); - wm.field429 = in.readUnsignedShort(); - wm.field428 = in.readUnsignedShort(); - wm.field433 = in.readUnsignedShort(); - wm.field435 = in.readUnsignedShort(); + wm.plane = in.readUnsignedByte(); + wm.numberOfPlanes = in.readUnsignedByte(); + wm.xLowerLeft = in.readUnsignedShort(); + wm.yLowerLeft = in.readUnsignedShort(); + wm.xLowerRight = in.readUnsignedShort(); + wm.yUpperLeft = in.readUnsignedShort(); + wm.xUpperLeft = in.readUnsignedShort(); + wm.yLowerRight = in.readUnsignedShort(); + wm.xUpperRight = in.readUnsignedShort(); + wm.yUpperRight = in.readUnsignedShort(); return wm; } @@ -145,12 +145,12 @@ public class WorldMapLoader { WorldMapType2 wm = new WorldMapType2(); - wm.field519 = in.readUnsignedByte(); - wm.field511 = in.readUnsignedByte(); - wm.field510 = in.readUnsignedShort(); - wm.field512 = in.readUnsignedShort(); - wm.field514 = in.readUnsignedShort(); - wm.field515 = in.readUnsignedShort(); + wm.plane = in.readUnsignedByte(); + wm.numberOfPlanes = in.readUnsignedByte(); + wm.xLow = in.readUnsignedShort(); + wm.yLow = in.readUnsignedShort(); + wm.xHigh = in.readUnsignedShort(); + wm.yHigh = in.readUnsignedShort(); return wm; } @@ -159,20 +159,20 @@ public class WorldMapLoader { WorldMapType3 wm = new WorldMapType3(); - wm.field387 = in.readUnsignedByte(); - wm.field377 = in.readUnsignedByte(); - wm.field378 = in.readUnsignedShort(); - wm.field382 = in.readUnsignedByte(); - wm.field376 = in.readUnsignedByte(); - wm.field383 = in.readUnsignedShort(); - wm.field385 = in.readUnsignedByte(); - wm.field379 = in.readUnsignedByte(); - wm.field380 = in.readUnsignedShort(); - wm.field386 = in.readUnsignedByte(); - wm.field388 = in.readUnsignedByte(); - wm.field381 = in.readUnsignedShort(); - wm.field384 = in.readUnsignedByte(); - wm.field389 = in.readUnsignedByte(); + wm.oldPlane = in.readUnsignedByte(); + wm.numberOfPlanes = in.readUnsignedByte(); + wm.oldX = in.readUnsignedShort(); + wm.chunk_oldXLow = in.readUnsignedByte(); + wm.chunk_oldXHigh = in.readUnsignedByte(); + wm.oldY = in.readUnsignedShort(); + wm.chunk_oldYLow = in.readUnsignedByte(); + wm.chunk_oldYHigh = in.readUnsignedByte(); + wm.newX = in.readUnsignedShort(); + wm.chunk_newXLow = in.readUnsignedByte(); + wm.chunk_newXHigh = in.readUnsignedByte(); + wm.newY = in.readUnsignedShort(); + wm.chunk_newYLow = in.readUnsignedByte(); + wm.chunk_newYHigh = in.readUnsignedByte(); return wm; }