project: Merge upstream (#2281)

project: Merge upstream

buildSrc/src/main/kotlin/Dependencies.kt

@@ -25,9 +25,9 @@
 
 object ProjectVersions {
     const val launcherVersion = "2.0.4"
-    const val rlVersion = "1.6.3-SNAPSHOT"
+    const val rlVersion = "1.6.4"
 
-    const val openosrsVersion = "2.1.22-SNAPSHOT"
+    const val openosrsVersion = "2.1.23"
 
     const val rsversion = 187
     const val cacheversion = 165

cache/src/main/java/net/runelite/cache/ConfigType.java

@@ -43,6 +43,7 @@ public enum ConfigType
 	VARCLIENT(19),
 	VARCLIENTSTRING(15),
 	VARPLAYER(16),
+	HITSPLAT(32),
 	STRUCT(34),
 	AREA(35);
 

cache/src/main/java/net/runelite/cache/definitions/HitSplatDefinition.java

@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2020, Hexagon <[email protected]>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, this
+ *    list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package net.runelite.cache.definitions;
+
+import lombok.Data;
+
+@Data
+public class HitSplatDefinition
+{
+	private String stringFormat = "";
+	private int varbitID = -1;
+	private int leftSprite = -1;
+	private int leftSprite2 = -1;
+	private int rightSpriteId = -1;
+	private int fontType = -1;
+	private int backgroundSprite = -1;
+	private int varpID = -1;
+	private int useDamage = -1;
+	private int textColor = 0xFFFFFF;
+	private int displayCycles = 70;
+	private int[] multihitsplats;
+	private int scrollToOffsetX = 0;
+	private int fadeStartCycle = -1;
+	private int scrollToOffsetY = 0;
+	private int textOffsetY = 0;
+}

cache/src/main/java/net/runelite/cache/definitions/InterfaceDefinition.java

@@ -46,42 +46,42 @@ public class InterfaceDefinition
 	public int scrollWidth;
 	public int scrollHeight;
 	public boolean noClickThrough;
-	public int spriteId;
+	public int spriteId = -1;
 	public int textureId;
 	public boolean spriteTiling;
 	public int opacity;
 	public int borderType;
 	public int shadowColor;
 	public boolean flippedVertically;
 	public boolean flippedHorizontally;
-	public int modelType;
-	public int modelId;
+	public int modelType = 1;
+	public int modelId = -1;
 	public int offsetX2d;
 	public int offsetY2d;
 	public int rotationX;
 	public int rotationY;
 	public int rotationZ;
-	public int modelZoom;
-	public int animation;
+	public int modelZoom = 100;
+	public int animation = -1;
 	public boolean orthogonal;
 	public int modelHeightOverride;
-	public int fontId;
-	public String text;
+	public int fontId = -1;
+	public String text = "";
 	public int lineHeight;
 	public int xTextAlignment;
 	public int yTextAlignment;
 	public boolean textShadowed;
 	public int textColor;
 	public boolean filled;
-	public int lineWidth;
+	public int lineWidth = 1;
 	public boolean lineDirection;
 	public int clickMask;
-	public String name;
+	public String name = "";
 	public String[] actions;
 	public int dragDeadZone;
 	public int dragDeadTime;
 	public boolean dragRenderBehavior;
-	public String targetVerb;
+	public String targetVerb = "";
 	public Object[] onLoadListener;
 	public Object[] onMouseOverListener;
 	public Object[] onMouseLeaveListener;
@@ -119,13 +119,13 @@ public class InterfaceDefinition
 	public int[] yOffsets;
 	public int[] sprites;
 	public String[] configActions;
-	public String alternateText;
+	public String alternateText = "";
 	public int alternateTextColor;
 	public int hoveredTextColor;
 	public int alternateHoveredTextColor;
-	public int alternateSpriteId;
-	public int alternateModelId;
-	public int alternateAnimation;
-	public String spellName;
-	public String tooltip;
+	public int alternateSpriteId = -1;
+	public int alternateModelId = -1;
+	public int alternateAnimation = -1;
+	public String spellName = "";
+	public String tooltip = "Ok";
 }

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;

cache/src/main/java/net/runelite/cache/definitions/WorldMapType0.java

@@ -29,14 +29,14 @@
 @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;
 }

cache/src/main/java/net/runelite/cache/definitions/WorldMapType1.java

@@ -29,14 +29,14 @@
 @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;
 }

cache/src/main/java/net/runelite/cache/definitions/WorldMapType2.java

@@ -29,10 +29,10 @@
 @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;
 }

cache/src/main/java/net/runelite/cache/definitions/WorldMapType3.java

@@ -29,18 +29,18 @@
 @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;
 }

cache/src/main/java/net/runelite/cache/definitions/loaders/HitSplatLoader.java

@@ -0,0 +1,133 @@
+/*
+ * Copyright (c) 2020, Hexagon <[email protected]>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, this
+ *    list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package net.runelite.cache.definitions.loaders;
+
+import net.runelite.cache.definitions.HitSplatDefinition;
+import net.runelite.cache.io.InputStream;
+
+public class HitSplatLoader
+{
+	public HitSplatDefinition load(byte[] data)
+	{
+		HitSplatDefinition def = new HitSplatDefinition();
+		InputStream stream = new InputStream(data);
+
+		for (; ; )
+		{
+			int opcode = stream.readUnsignedByte();
+
+			switch (opcode)
+			{
+				case 0:
+					return def;
+				case 1:
+					def.setFontType(stream.readBigSmart2());
+					break;
+				case 2:
+					def.setTextColor(stream.read24BitInt());
+					break;
+				case 3:
+					def.setLeftSprite(stream.readBigSmart2());
+					break;
+				case 4:
+					def.setLeftSprite2(stream.readBigSmart2());
+					break;
+				case 5:
+					def.setBackgroundSprite(stream.readBigSmart2());
+					break;
+				case 6:
+					def.setRightSpriteId(stream.readBigSmart2());
+					break;
+				case 7:
+					def.setScrollToOffsetX(stream.readShort());
+					break;
+				case 8:
+					def.setStringFormat(stream.readString2());
+					break;
+				case 9:
+					def.setDisplayCycles(stream.readUnsignedShort());
+					break;
+				case 10:
+					def.setScrollToOffsetY(stream.readShort());
+					break;
+				case 11:
+					def.setFadeStartCycle(0);
+					break;
+				case 12:
+					def.setUseDamage(stream.readUnsignedByte());
+					break;
+				case 13:
+					def.setTextOffsetY(stream.readShort());
+					break;
+				case 14:
+					def.setFadeStartCycle(stream.readUnsignedShort());
+					break;
+				case 17:
+				case 18:
+					int varbitId = stream.readUnsignedShort();
+
+					if (varbitId == 0xFFFF)
+					{
+						varbitId = -1;
+					}
+					def.setVarbitID(varbitId);
+
+					int varp = stream.readUnsignedShort();
+					if (varp == 0xFFFF)
+					{
+						varp = -1;
+					}
+					def.setVarpID(varp);
+
+					int id = -1;
+					if (opcode == 18)
+					{
+						id = stream.readUnsignedShort();
+						if (id == 0xFFFF)
+						{
+							id = -1;
+						}
+					}
+
+					int length = stream.readUnsignedByte();
+					int[] multihitsplats = new int[length + 2];
+
+					for (int i = 0; i <= length; i++)
+					{
+						multihitsplats[i] = stream.readUnsignedShort();
+						if (multihitsplats[i] == 0xFFFF)
+						{
+							multihitsplats[i] = -1;
+						}
+					}
+
+					multihitsplats[length + 1] = id;
+
+					def.setMultihitsplats(multihitsplats);
+					break;
+			}
+		}
+	}
+}