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

Merge remote-tracking branch 'runelite/master'

Browse Source
This commit is contained in:
Owain van Brakel
2022-03-09 01:47:04 +01:00
parent bb07875400 f2b43743c3
commit 5ab766c256
23 changed files with 485 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cache/src/main/java/net/runelite/cache/definitions/TextureDefinition.java vendored
View File

@@ -38,8 +38,8 @@ public class TextureDefinition
public int[] field1780;
public int[] field1781;
public int[] field1786;
public int field1782;
public int field1783;
public int animationSpeed;
public int animationDirection;
public transient int[] pixels;

8
cache/src/main/java/net/runelite/cache/definitions/loaders/TextureLoader.java vendored
View File

@@ -26,13 +26,9 @@ package net.runelite.cache.definitions.loaders;
import net.runelite.cache.definitions.TextureDefinition;
import net.runelite.cache.io.InputStream;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class TextureLoader
{
private static final Logger logger = LoggerFactory.getLogger(TextureLoader.class);
public TextureDefinition load(int id, byte[] b)
{
TextureDefinition def = new TextureDefinition();
@@ -77,8 +73,8 @@ public class TextureLoader
def.field1786[var3] = is.readInt();
}
def.field1783 = is.readUnsignedByte();
def.field1782 = is.readUnsignedByte();
def.animationDirection = is.readUnsignedByte();
def.animationSpeed = is.readUnsignedByte();
return def;
}

4
cache/src/main/java/net/runelite/cache/script/assembler/ScriptWriter.java vendored
View File

@@ -25,7 +25,7 @@
package net.runelite.cache.script.assembler;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
@@ -267,7 +267,7 @@ public class ScriptWriter extends rs2asmBaseListener
continue;
}
Map<Integer, Integer> map = maps[index++] = new HashMap<>();
Map<Integer, Integer> map = maps[index++] = new LinkedHashMap<>();
for (LookupCase scase : lswitch.getCases())
{