- * 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 HOLDER 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 api;
-
-import java.awt.Dimension;
-
-/**
- * A utility class containing constant values.
- */
-public class Constants
-{
- /**
- * The original width of the game when running in fixed mode.
- */
- public static final int GAME_FIXED_WIDTH = 765;
-
- /**
- * The original height of the game when running in fixed mode.
- */
- public static final int GAME_FIXED_HEIGHT = 503;
-
- /**
- * Dimension representation of the width and height of the game in fixed mode.
- */
- public static final Dimension GAME_FIXED_SIZE = new Dimension(GAME_FIXED_WIDTH, GAME_FIXED_HEIGHT);
-
- /**
- * The aspect ratio of the game when running in fixed mode.
- */
- public static final double GAME_FIXED_ASPECT_RATIO = (double) GAME_FIXED_WIDTH / (double) GAME_FIXED_HEIGHT;
-
- /**
- * The default camera zoom value.
- */
- public static final int CLIENT_DEFAULT_ZOOM = 512;
-
- /**
- * The width and length of a chunk (8x8 tiles).
- */
- public static final int CHUNK_SIZE = 8;
-
- /**
- * The width and length of a map region (64x64 tiles).
- */
- public static final int REGION_SIZE = 64;
-
- /**
- * The width and length of the scene (13 chunks x 8 tiles).
- */
- public static final int SCENE_SIZE = 104;
-
- /**
- * The max allowed plane by the game.
- *
- * This value is exclusive. The plane is set by 2 bits which restricts
- * the plane value to 0-3.
- */
- public static final int MAX_Z = 4;
-
- public static final int TILE_FLAG_BRIDGE = 2;
-
- /**
- * The number of milliseconds in a client tick.
- *
- * This is the length of a single frame when the client is running at
- * the maximum framerate of 50 fps.
- */
- public static final int CLIENT_TICK_LENGTH = 20;
-
- /**
- * The number of milliseconds in a server game tick.
- *
- * This is the length of a single game cycle under ideal conditions.
- * All game-play actions operate within multiples of this duration.
- */
- public static final int GAME_TICK_LENGTH = 600;
-
- /**
- * Used when getting High Alchemy value - multiplied by general store price.
- */
- public static final float HIGH_ALCHEMY_CONSTANT = 0.6f;
-}
diff --git a/api/src/main/java/api/GrandExchangeOffer.java b/api/src/main/java/api/GrandExchangeOffer.java
deleted file mode 100644
index c0a41dd515..0000000000
--- a/api/src/main/java/api/GrandExchangeOffer.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package api;
-
-/**
- * Represents an offer in a grand exchange slot.
- */
-public interface GrandExchangeOffer
-{
- /**
- * Gets the quantity of bought or sold items.
- *
- * @return the quantity bought or sold
- */
- int getQuantitySold();
-
- /**
- * Gets the ID of the item being bought or sold.
- *
- * @return item ID
- * @see ItemID
- */
- int getItemId();
-
- /**
- * Gets the total quantity being bought or sold.
- *
- * @return the total quantity
- */
- int getTotalQuantity();
-
- /**
- * Gets the offer or sell price per item.
- *
- * @return the offer price
- */
- int getPrice();
-
- /**
- * Gets the total amount of money spent so far.
- *
- * @return the amount spent
- */
- int getSpent();
-
- /**
- * Gets the current state of the offer.
- *
- * @return the offers state
- */
- GrandExchangeOfferState getState();
-}
diff --git a/api/src/main/java/api/GrandExchangeOfferState.java b/api/src/main/java/api/GrandExchangeOfferState.java
deleted file mode 100644
index 6d374dd7e6..0000000000
--- a/api/src/main/java/api/GrandExchangeOfferState.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package api;
-
-/**
- * Describes the state of a Grand Exchange offer.
- */
-public enum GrandExchangeOfferState
-{
- /**
- * An empty slot.
- */
- EMPTY,
- /**
- * A cancelled buy offer.
- */
- CANCELLED_BUY,
- /**
- * A cancelled sell offer.
- */
- CANCELLED_SELL,
- /**
- * A buy offer that is currently in progress.
- */
- BUYING,
- /**
- * A buy offer that has completed.
- */
- BOUGHT,
- /**
- * A sell offer that is currently in progress.
- */
- SELLING,
- /**
- * A sell offer that has completed.
- */
- SOLD;
-}
diff --git a/api/src/main/java/api/HashTable.java b/api/src/main/java/api/HashTable.java
deleted file mode 100644
index fe2dd3f1a6..0000000000
--- a/api/src/main/java/api/HashTable.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package api;
-
-import java.util.Collection;
-
-/**
- * A data structure that uses a hash function to compute an index into an
- * array of buckets from which node objects can be quickly obtained.
- */
-public interface HashTable
-{
- /**
- * Gets a node by its hash value.
- *
- * @param value the node value
- * @return the associated node
- */
- T get(long value);
-
- /**
- * Gets a collection of all nodes stored in this table.
- *
- * @return the nodes stored
- */
- Collection getNodes();
-}
diff --git a/api/src/main/java/api/IndexDataBase.java b/api/src/main/java/api/IndexDataBase.java
deleted file mode 100644
index 731eeffed7..0000000000
--- a/api/src/main/java/api/IndexDataBase.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package api;
-
-/**
- * Represents an index in the cache
- */
-public interface IndexDataBase
-{
- /**
- * Returns true if any cache overlay in this index is outdated due to hash mismatch
- */
- boolean isOverlayOutdated();
-}
diff --git a/api/src/main/java/api/NPCDefinition.java b/api/src/main/java/api/NPCDefinition.java
deleted file mode 100644
index 15d0b19ca2..0000000000
--- a/api/src/main/java/api/NPCDefinition.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package api;
-
-public interface NPCDefinition
-{
- /**
- * Gets the name of the NPC.
- *
- * @return the name
- */
- String getName();
-
- /**
- * Gets the model IDs that compose this NPC.
- *
- * @return the NPCs model IDs
- */
- int[] getModels();
-
- /**
- * Gets an array of possible right-click menu actions that can be
- * performed on the NPC.
- *
- * @return the menu actions
- */
- String[] getActions();
-
- /**
- * Gets whether the NPC can be clicked.
- *
- * @return true if the NPC can be clicked, false otherwise
- */
- boolean isClickable();
-
- /**
- * Gets whether the NPC is visible on the mini-map.
- *
- * @return the mini-map visible state
- */
- boolean isMinimapVisible();
-
- /**
- * Gets whether the NPC is visible.
- *
- * @return the visible state
- */
- boolean isVisible();
-
- /**
- * Gets the ID of the NPC.
- *
- * @return the ID of the NPC
- * @see NpcID
- */
- int getId();
-
- /**
- * Gets the combat level of the NPC.
- *
- * @return the combat level, -1 if none
- */
- int getCombatLevel();
-
- /**
- * Gets the configuration data for the NPC.
- *
- * @return the configuration data
- */
- int[] getConfigs();
-
- /**
- * Transforms this NPC into a new state, which may have a different ID.
- *
- * @return the transformed composition
- */
- NPCDefinition transform();
-
- /**
- * Gets the size of the NPC.
- *
- * @return the NPCs size
- */
- int getSize();
-
- /**
- * Gets the displayed overhead icon of the NPC.
- *
- * @return the overhead icon
- */
- HeadIcon getOverheadIcon();
-}
diff --git a/api/src/main/java/api/Skill.java b/api/src/main/java/api/Skill.java
deleted file mode 100644
index 484a0b2994..0000000000
--- a/api/src/main/java/api/Skill.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package api;
-
-/**
- * An enumeration of skills that a player can level.
- */
-public enum Skill
-{
- ATTACK("Attack"),
- DEFENCE("Defence"),
- STRENGTH("Strength"),
- HITPOINTS("Hitpoints"),
- RANGED("Ranged"),
- PRAYER("Prayer"),
- MAGIC("Magic"),
- COOKING("Cooking"),
- WOODCUTTING("Woodcutting"),
- FLETCHING("Fletching"),
- FISHING("Fishing"),
- FIREMAKING("Firemaking"),
- CRAFTING("Crafting"),
- SMITHING("Smithing"),
- MINING("Mining"),
- HERBLORE("Herblore"),
- AGILITY("Agility"),
- THIEVING("Thieving"),
- SLAYER("Slayer"),
- FARMING("Farming"),
- RUNECRAFT("Runecraft"),
- HUNTER("Hunter"),
- CONSTRUCTION("Construction"),
- /**
- * The level of all skills added together.
- */
- OVERALL("Overall");
-
- private final String name;
-
- Skill(String name)
- {
- this.name = name;
- }
-
- /**
- * Gets the name of the skill.
- *
- * @return the skill name
- */
- public String getName()
- {
- return name;
- }
-}
diff --git a/api/src/main/java/api/WidgetNode.java b/api/src/main/java/api/WidgetNode.java
deleted file mode 100644
index 03ab3885a4..0000000000
--- a/api/src/main/java/api/WidgetNode.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package api;
-
-/**
- * Represents a widget as an iterable node.
- */
-public interface WidgetNode extends Node
-{
- /**
- * The ID of the widget.
- *
- * @return the ID of the widget
- * @see api.widgets.Widget
- */
- int getId();
-}
diff --git a/api/src/main/java/api/events/AnimationChanged.java b/api/src/main/java/api/events/AnimationChanged.java
deleted file mode 100644
index ccfed921fe..0000000000
--- a/api/src/main/java/api/events/AnimationChanged.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package api.events;
-
-import api.Actor;
-import lombok.Data;
-
-/**
- * An event where the {@link Actor} has changed animations.
- *
- * In order to get the new animation ID, use {@link Actor#getAnimation()}.
- *
- * Examples of when this event may trigger include:
- *
- * - A player starts or stops gathering a resource (ie. woodcut, fishing)
- * - A player starts or stops dancing
- *
- *
- * @see api.AnimationID
- */
-@Data
-public class AnimationChanged
-{
- /**
- * The actor that has entered a new animation.
- */
- private Actor actor;
-}
diff --git a/api/src/main/java/api/events/InteractingChanged.java b/api/src/main/java/api/events/InteractingChanged.java
deleted file mode 100644
index 3b2855e591..0000000000
--- a/api/src/main/java/api/events/InteractingChanged.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package api.events;
-
-import api.Actor;
-import lombok.Value;
-
-/**
- * An event called when the actor an actor is interacting with changes
- */
-@Value
-public class InteractingChanged
-{
- private final Actor source;
-
- /**
- * Target actor, may be null
- */
- private final Actor target;
-}
diff --git a/api/src/main/java/api/events/OverheadTextChanged.java b/api/src/main/java/api/events/OverheadTextChanged.java
deleted file mode 100644
index 298ba82aee..0000000000
--- a/api/src/main/java/api/events/OverheadTextChanged.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package api.events;
-
-import api.Actor;
-import lombok.Value;
-
-@Value
-public class OverheadTextChanged
-{
- private final Actor actor;
-
- private final String overheadText;
-}
\ No newline at end of file
diff --git a/api/src/main/java/api/events/SpotAnimationChanged.java b/api/src/main/java/api/events/SpotAnimationChanged.java
deleted file mode 100644
index 938ebc761b..0000000000
--- a/api/src/main/java/api/events/SpotAnimationChanged.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package api.events;
-
-import api.Actor;
-import lombok.Data;
-
-/**
- * An event where the graphic of an {@link Actor} has changed.
- *
- * The graphic the player has changed to can be obtained using
- * {@link Actor#getSpotAnimation()}.
- *
- * Examples of when this event may trigger include:
- *
- * - Casting a magic spell
- * - Using a fairy ring
- * - Breaking a teleport tab
- *
- *
- * @see api.GraphicID
- */
-@Data
-public class SpotAnimationChanged
-{
- /**
- * The actor that has had their graphic changed.
- */
- private Actor actor;
-}
\ No newline at end of file
diff --git a/api/src/main/java/api/vars/AccountType.java b/api/src/main/java/api/vars/AccountType.java
deleted file mode 100644
index 6e8c2de5b6..0000000000
--- a/api/src/main/java/api/vars/AccountType.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package api.vars;
-
-/**
- * An enumeration of possible account types.
- */
-public enum AccountType
-{
- /**
- * Normal account type.
- */
- NORMAL,
- /**
- * Ironman account type.
- */
- IRONMAN,
- /**
- * Ultimate ironman account type.
- */
- ULTIMATE_IRONMAN,
- /**
- * Hardcore ironman account type.
- */
- HARDCORE_IRONMAN;
-
- /**
- * Checks whether this type is an ironman.
- *
- * @return {@code true} if the type is any of the ironman types.
- */
- public boolean isIronman()
- {
- return this.ordinal() >= IRONMAN.ordinal() && this.ordinal() <= HARDCORE_IRONMAN.ordinal();
- }
-
-}
\ No newline at end of file
diff --git a/api/src/main/java/mapping/ObfuscatedSignature.java b/api/src/main/java/mapping/ObfuscatedSignature.java
deleted file mode 100644
index 1c0bf31b35..0000000000
--- a/api/src/main/java/mapping/ObfuscatedSignature.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 2016-2017, Adam
- * 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.mapping;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-@Retention(RetentionPolicy.RUNTIME)
-@Target(
- {
- ElementType.METHOD, ElementType.CONSTRUCTOR, ElementType.FIELD
- })
-public @interface ObfuscatedSignature
-{
- String signature();
-
- String garbageValue() default ""; // valid garbage value for last parameter. can't be an Object because Java.
-}
diff --git a/api/src/main/java/rs/api/RSAbstractFont.java b/api/src/main/java/rs/api/RSAbstractFont.java
deleted file mode 100644
index 337dbdc604..0000000000
--- a/api/src/main/java/rs/api/RSAbstractFont.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package rs.api;
-
-import api.FontTypeFace;
-import net.runelite.mapping.Import;
-
-public interface RSAbstractFont extends FontTypeFace
-{
- @Import("stringWidth")
- @Override
- int getTextWidth(String text);
-
- @Import("ascent")
- @Override
- int getBaseline();
-
- @Import("draw")
- void drawTextLeftAligned(String text, int x, int y, int fontColor, int shadowColor);
-}
diff --git a/api/src/main/java/rs/api/RSAbstractIndexCache.java b/api/src/main/java/rs/api/RSAbstractIndexCache.java
deleted file mode 100644
index 793c87f69e..0000000000
--- a/api/src/main/java/rs/api/RSAbstractIndexCache.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package rs.api;
-
-import api.IndexDataBase;
-import net.runelite.mapping.Import;
-
-public interface RSAbstractIndexCache extends IndexDataBase
-{
- @Import("takeRecord")
- byte[] getConfigData(int archiveId, int fileId);
-}
diff --git a/api/src/main/java/rs/api/RSBoundaryObject.java b/api/src/main/java/rs/api/RSBoundaryObject.java
deleted file mode 100644
index fd93d3183c..0000000000
--- a/api/src/main/java/rs/api/RSBoundaryObject.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package rs.api;
-
-import api.WallObject;
-import net.runelite.mapping.Import;
-
-public interface RSBoundaryObject extends WallObject
-{
- @Import("tag")
- @Override
- long getHash();
-
- @Import("x")
- @Override
- int getX();
-
- @Import("y")
- @Override
- int getY();
-
- @Import("orientationA")
- @Override
- int getOrientationA();
-
- @Import("orientationB")
- @Override
- int getOrientationB();
-
- @Import("entity1")
- @Override
- RSEntity getRenderable1();
-
- @Import("entity2")
- @Override
- RSEntity getRenderable2();
-
- @Import("flags")
- @Override
- int getConfig();
-
- void setPlane(int plane);
-}
diff --git a/api/src/main/java/rs/api/RSBuddy.java b/api/src/main/java/rs/api/RSBuddy.java
deleted file mode 100644
index 45cb0b3b0f..0000000000
--- a/api/src/main/java/rs/api/RSBuddy.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package rs.api;
-
-import api.ChatPlayer;
-import net.runelite.mapping.Import;
-
-public interface RSBuddy extends ChatPlayer, RSUser
-{
- @Import("world")
- @Override
- int getWorld();
-
- @Import("rank")
- int getRSRank();
-}
diff --git a/api/src/main/java/rs/api/RSBuffer.java b/api/src/main/java/rs/api/RSBuffer.java
deleted file mode 100644
index 365272e06d..0000000000
--- a/api/src/main/java/rs/api/RSBuffer.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package rs.api;
-
-import net.runelite.mapping.Import;
-
-public interface RSBuffer extends RSNode
-{
- @Import("array")
- byte[] getPayload();
-
- @Import("index")
- int getOffset();
-}
\ No newline at end of file
diff --git a/api/src/main/java/rs/api/RSCanvas.java b/api/src/main/java/rs/api/RSCanvas.java
deleted file mode 100644
index 28d37bc0b4..0000000000
--- a/api/src/main/java/rs/api/RSCanvas.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package rs.api;
-
-public interface RSCanvas
-{
-}
diff --git a/api/src/main/java/rs/api/RSChatChannel.java b/api/src/main/java/rs/api/RSChatChannel.java
deleted file mode 100644
index 91bc1a9fbe..0000000000
--- a/api/src/main/java/rs/api/RSChatChannel.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package rs.api;
-
-import api.ChatLineBuffer;
-import net.runelite.mapping.Import;
-
-public interface RSChatChannel extends ChatLineBuffer
-{
- @Import("messages")
- @Override
- RSMessage[] getLines();
-
- @Import("count")
- @Override
- int getLength();
-
- @Import("count")
- void setLength(int length);
-}
diff --git a/api/src/main/java/rs/api/RSClanChat.java b/api/src/main/java/rs/api/RSClanChat.java
deleted file mode 100644
index dab7c5f895..0000000000
--- a/api/src/main/java/rs/api/RSClanChat.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package rs.api;
-
-import net.runelite.mapping.Import;
-
-public interface RSClanChat extends RSUserList
-{
- @Import("owner")
- String getClanOwner();
-
- @Import("name")
- String getClanChatName();
-}
diff --git a/api/src/main/java/rs/api/RSClanMate.java b/api/src/main/java/rs/api/RSClanMate.java
deleted file mode 100644
index 362d7a8904..0000000000
--- a/api/src/main/java/rs/api/RSClanMate.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package rs.api;
-
-import api.ClanMember;
-
-public interface RSClanMate extends RSBuddy, ClanMember
-{
-}
diff --git a/api/src/main/java/rs/api/RSClientPreferences.java b/api/src/main/java/rs/api/RSClientPreferences.java
deleted file mode 100644
index 5faf552236..0000000000
--- a/api/src/main/java/rs/api/RSClientPreferences.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package rs.api;
-
-import api.Preferences;
-import net.runelite.mapping.Import;
-
-public interface RSClientPreferences extends Preferences
-{
- @Import("rememberedUsername")
- @Override
- String getRememberedUsername();
-
- @Import("rememberedUsername")
- @Override
- void setRememberedUsername(String username);
-}
diff --git a/api/src/main/java/rs/api/RSCollisionMap.java b/api/src/main/java/rs/api/RSCollisionMap.java
deleted file mode 100644
index c5202c120d..0000000000
--- a/api/src/main/java/rs/api/RSCollisionMap.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package rs.api;
-
-import api.CollisionData;
-import net.runelite.mapping.Import;
-
-public interface RSCollisionMap extends CollisionData
-{
- @Import("flags")
- int[][] getFlags();
-}
diff --git a/api/src/main/java/rs/api/RSDynamicObject.java b/api/src/main/java/rs/api/RSDynamicObject.java
deleted file mode 100644
index ee582d4c45..0000000000
--- a/api/src/main/java/rs/api/RSDynamicObject.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package rs.api;
-
-import api.Renderable;
-import net.runelite.mapping.Import;
-
-public interface RSDynamicObject extends RSEntity, Renderable
-{
- @Import("id")
- int getId();
-
- @Import("frame")
- int getAnimFrame();
-
- @Import("frame")
- void setAnimFrame(int frame);
-
- @Import("cycleStart")
- int getAnimCycleCount();
-}
diff --git a/api/src/main/java/rs/api/RSEnumDefinition.java b/api/src/main/java/rs/api/RSEnumDefinition.java
deleted file mode 100644
index 22c0ebe3c6..0000000000
--- a/api/src/main/java/rs/api/RSEnumDefinition.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package rs.api;
-
-import api.EnumDefinition;
-import net.runelite.mapping.Import;
-
-public interface RSEnumDefinition extends EnumDefinition, RSDualNode
-{
- @Import("keys")
- @Override
- int[] getKeys();
-
- @Import("intVals")
- @Override
- int[] getIntVals();
-
- @Import("stringVals")
- @Override
- String[] getStringVals();
-
- @Import("defaultInt")
- int getDefaultInt();
-
- @Import("defaultString")
- String getDefaultString();
-}
diff --git a/api/src/main/java/rs/api/RSEvictingDualNodeHashTable.java b/api/src/main/java/rs/api/RSEvictingDualNodeHashTable.java
deleted file mode 100644
index b9a1563305..0000000000
--- a/api/src/main/java/rs/api/RSEvictingDualNodeHashTable.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package rs.api;
-
-import api.NodeCache;
-import net.runelite.mapping.Import;
-
-public interface RSEvictingDualNodeHashTable extends NodeCache
-{
- @Import("get")
- RSDualNode get(long id);
-
- @Import("clear")
- @Override
- void reset();
-
- @Import("capacity")
- @Override
- void setCapacity(int capacity);
-
- @Import("remainingCapacity")
- @Override
- void setRemainingCapacity(int remainingCapacity);
-}
diff --git a/api/src/main/java/rs/api/RSFileOnDisk.java b/api/src/main/java/rs/api/RSFileOnDisk.java
deleted file mode 100644
index 315064b4f7..0000000000
--- a/api/src/main/java/rs/api/RSFileOnDisk.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package rs.api;
-
-import java.io.RandomAccessFile;
-import net.runelite.mapping.Import;
-
-public interface RSFileOnDisk
-{
- @Import("file")
- RandomAccessFile getFile();
-
- @Import("index")
- long getPosition();
-
- @Import("capacity")
- long getLength();
-}
diff --git a/api/src/main/java/rs/api/RSFloorDecoration.java b/api/src/main/java/rs/api/RSFloorDecoration.java
deleted file mode 100644
index 0c8c5b65ac..0000000000
--- a/api/src/main/java/rs/api/RSFloorDecoration.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package rs.api;
-
-import api.GroundObject;
-import net.runelite.mapping.Import;
-
-public interface RSFloorDecoration extends GroundObject
-{
- @Import("tag")
- @Override
- long getHash();
-
- @Import("x")
- int getX();
-
- @Import("y")
- int getY();
-
- @Import("entity")
- @Override
- RSEntity getRenderable();
-
- void setPlane(int plane);
-}
diff --git a/api/src/main/java/rs/api/RSFont.java b/api/src/main/java/rs/api/RSFont.java
deleted file mode 100644
index 7b12a9d543..0000000000
--- a/api/src/main/java/rs/api/RSFont.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package rs.api;
-
-public interface RSFont extends RSAbstractFont
-{
-}
diff --git a/api/src/main/java/rs/api/RSFriend.java b/api/src/main/java/rs/api/RSFriend.java
deleted file mode 100644
index 4c5b799d9a..0000000000
--- a/api/src/main/java/rs/api/RSFriend.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package rs.api;
-
-import api.Friend;
-
-public interface RSFriend extends Friend, RSBuddy
-{
-}
diff --git a/api/src/main/java/rs/api/RSFriendSystem.java b/api/src/main/java/rs/api/RSFriendSystem.java
deleted file mode 100644
index 1d01b23183..0000000000
--- a/api/src/main/java/rs/api/RSFriendSystem.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package rs.api;
-
-import api.FriendManager;
-import net.runelite.mapping.Import;
-
-public interface RSFriendSystem extends FriendManager
-{
- @Import("friendsList")
- RSFriendsList getFriendContainer();
-
- @Import("ignoreList")
- RSIgnoreList getIgnoreContainer();
-
- @Import("isFriended")
- boolean isFriended(RSUsername var1, boolean var2);
-}
diff --git a/api/src/main/java/rs/api/RSFriendsList.java b/api/src/main/java/rs/api/RSFriendsList.java
deleted file mode 100644
index ef36674350..0000000000
--- a/api/src/main/java/rs/api/RSFriendsList.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package rs.api;
-
-public interface RSFriendsList extends RSUserList
-{
-}
diff --git a/api/src/main/java/rs/api/RSGameObject.java b/api/src/main/java/rs/api/RSGameObject.java
deleted file mode 100644
index e649b310dc..0000000000
--- a/api/src/main/java/rs/api/RSGameObject.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package rs.api;
-
-import api.GameObject;
-import net.runelite.mapping.Import;
-
-public interface RSGameObject extends GameObject
-{
- @Import("entity")
- RSEntity getRenderable();
-
- @Import("plane")
- int getPlane();
-
- @Import("startX")
- int getRelativeX();
-
- @Import("startY")
- int getRelativeY();
-
- @Import("endX")
- int getOffsetX();
-
- @Import("endY")
- int getOffsetY();
-
- @Import("centerX")
- @Override
- int getX();
-
- @Import("centerY")
- @Override
- int getY();
-
- @Import("height")
- int getHeight();
-
- @Import("orientation")
- int getRsOrientation();
-
- @Import("tag")
- @Override
- long getHash();
-
- @Import("flags")
- int getFlags();
-}
diff --git a/api/src/main/java/rs/api/RSGrandExchangeOffer.java b/api/src/main/java/rs/api/RSGrandExchangeOffer.java
deleted file mode 100644
index 9bffb96730..0000000000
--- a/api/src/main/java/rs/api/RSGrandExchangeOffer.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package rs.api;
-
-import api.GrandExchangeOffer;
-import net.runelite.mapping.Import;
-
-public interface RSGrandExchangeOffer extends GrandExchangeOffer
-{
- @Import("currentQuantity")
- @Override
- int getQuantitySold();
-
- @Import("id")
- @Override
- int getItemId();
-
- @Import("totalQuantity")
- @Override
- int getTotalQuantity();
-
- @Import("unitPrice")
- @Override
- int getPrice();
-
- @Import("currentPrice")
- @Override
- int getSpent();
-
- @Import("state")
- byte getRSState();
-}
diff --git a/api/src/main/java/rs/api/RSGraphicsObject.java b/api/src/main/java/rs/api/RSGraphicsObject.java
deleted file mode 100644
index 2471d7de4d..0000000000
--- a/api/src/main/java/rs/api/RSGraphicsObject.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package rs.api;
-
-import api.GraphicsObject;
-import net.runelite.mapping.Import;
-
-public interface RSGraphicsObject extends GraphicsObject, RSEntity
-{
- @Import("id")
- @Override
- int getId();
-
- @Import("x")
- int getX();
-
- @Import("y")
- int getY();
-
- @Import("cycleStart")
- @Override
- int getStartCycle();
-
- @Import("plane")
- @Override
- int getLevel();
-
- @Import("height")
- @Override
- int getHeight();
-}
diff --git a/api/src/main/java/rs/api/RSGroundItem.java b/api/src/main/java/rs/api/RSGroundItem.java
deleted file mode 100644
index f23800fe84..0000000000
--- a/api/src/main/java/rs/api/RSGroundItem.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package rs.api;
-
-import api.Item;
-import api.Tile;
-import net.runelite.mapping.Import;
-
-public interface RSGroundItem extends RSEntity, Item
-{
- @Import("id")
- @Override
- int getId();
-
- @Import("id")
- void setId(int id);
-
- @Import("quantity")
- @Override
- int getQuantity();
-
- @Import("quantity")
- void setQuantity(int quantity);
-
- int getX();
-
- void setX(int x);
-
- int getY();
-
- void setY(int y);
-
- /**
- * Get the tile this item is on
- * @return
- */
- Tile getTile();
-}
diff --git a/api/src/main/java/rs/api/RSGroundItemPile.java b/api/src/main/java/rs/api/RSGroundItemPile.java
deleted file mode 100644
index 3fc5742d90..0000000000
--- a/api/src/main/java/rs/api/RSGroundItemPile.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package rs.api;
-
-import api.ItemLayer;
-import net.runelite.mapping.Import;
-
-public interface RSGroundItemPile extends ItemLayer
-{
- @Import("x")
- int getX();
-
- @Import("y")
- int getY();
-
- @Import("tag")
- @Override
- long getHash();
-
- @Import("height")
- int getHeight();
-
- @Import("third")
- @Override
- RSEntity getBottom();
-
- @Import("second")
- @Override
- RSEntity getMiddle();
-
- @Import("first")
- @Override
- RSEntity getTop();
-
- void setPlane(int plane);
-}
diff --git a/api/src/main/java/rs/api/RSHealthBar.java b/api/src/main/java/rs/api/RSHealthBar.java
deleted file mode 100644
index 13b8871a47..0000000000
--- a/api/src/main/java/rs/api/RSHealthBar.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package rs.api;
-
-import net.runelite.mapping.Import;
-
-public interface RSHealthBar extends RSNode
-{
- @Import("updates")
- RSIterableNodeDeque getUpdates(); // "combatinfolist" but only thing it has is getNode so this works
-
- @Import("definition")
- RSHealthBarDefinition getDefinition();
-}
diff --git a/api/src/main/java/rs/api/RSHealthBarDefinition.java b/api/src/main/java/rs/api/RSHealthBarDefinition.java
deleted file mode 100644
index d688530a85..0000000000
--- a/api/src/main/java/rs/api/RSHealthBarDefinition.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package rs.api;
-
-import api.HealthBar;
-import net.runelite.mapping.Import;
-
-public interface RSHealthBarDefinition extends RSDualNode, HealthBar
-{
- @Import("width")
- int getHealthScale();
-
- @Import("getSprite1")
- RSSprite getHealthBarFrontSprite();
-
- @Import("getSprite2")
- RSSprite getHealthBarBackSprite();
-
- @Import("widthPadding")
- @Override
- void setPadding(int padding);
-}
diff --git a/api/src/main/java/rs/api/RSHealthBarUpdate.java b/api/src/main/java/rs/api/RSHealthBarUpdate.java
deleted file mode 100644
index 9b2f9ee5d4..0000000000
--- a/api/src/main/java/rs/api/RSHealthBarUpdate.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package rs.api;
-
-import net.runelite.mapping.Import;
-
-public interface RSHealthBarUpdate
-{
- @Import("health")
- int getHealthRatio();
-
- @Import("health2") // not sure about that one but it isn't used and I am sure about the other one
- int getHealth();
-}
diff --git a/api/src/main/java/rs/api/RSIgnoreList.java b/api/src/main/java/rs/api/RSIgnoreList.java
deleted file mode 100644
index aa53114779..0000000000
--- a/api/src/main/java/rs/api/RSIgnoreList.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package rs.api;
-
-public interface RSIgnoreList extends RSUserList
-{
-}
diff --git a/api/src/main/java/rs/api/RSIgnored.java b/api/src/main/java/rs/api/RSIgnored.java
deleted file mode 100644
index 1e17d128d1..0000000000
--- a/api/src/main/java/rs/api/RSIgnored.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package rs.api;
-
-import api.Ignore;
-
-public interface RSIgnored extends Ignore, RSUser
-{
-}
diff --git a/api/src/main/java/rs/api/RSIndexCache.java b/api/src/main/java/rs/api/RSIndexCache.java
deleted file mode 100644
index 18be69a891..0000000000
--- a/api/src/main/java/rs/api/RSIndexCache.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package rs.api;
-
-import net.runelite.mapping.Import;
-
-public interface RSIndexCache extends RSAbstractIndexCache
-{
- @Import("index")
- int getIndex();
-}
diff --git a/api/src/main/java/rs/api/RSIndexedSprite.java b/api/src/main/java/rs/api/RSIndexedSprite.java
deleted file mode 100644
index 4af8e04a37..0000000000
--- a/api/src/main/java/rs/api/RSIndexedSprite.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package rs.api;
-
-import api.IndexedSprite;
-import net.runelite.mapping.Import;
-
-public interface RSIndexedSprite extends IndexedSprite
-{
- @Import("pixels")
- @Override
- byte[] getPixels();
-
- @Import("pixels")
- @Override
- void setPixels(byte[] pixels);
-
- @Import("palette")
- @Override
- int[] getPalette();
-
- @Import("palette")
- @Override
- void setPalette(int[] palette);
-
- @Import("width")
- @Override
- int getOriginalWidth();
-
- @Import("width")
- @Override
- void setOriginalWidth(int originalWidth);
-
- @Import("height")
- @Override
- int getOriginalHeight();
-
- @Import("height")
- @Override
- void setOriginalHeight(int originalHeight);
-
- @Import("subHeight")
- @Override
- int getHeight();
-
- @Import("subHeight")
- @Override
- void setHeight(int height);
-
- @Import("xOffset")
- @Override
- int getOffsetX();
-
- @Import("xOffset")
- @Override
- void setOffsetX(int offsetX);
-
- @Import("yOffset")
- @Override
- int getOffsetY();
-
- @Import("yOffset")
- @Override
- void setOffsetY(int offsetY);
-
- @Import("subWidth")
- @Override
- int getWidth();
-
- @Import("subWidth")
- @Override
- void setWidth(int width);
-}
diff --git a/api/src/main/java/rs/api/RSIntegerNode.java b/api/src/main/java/rs/api/RSIntegerNode.java
deleted file mode 100644
index 3d2d2f819f..0000000000
--- a/api/src/main/java/rs/api/RSIntegerNode.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package rs.api;
-
-import api.IntegerNode;
-import net.runelite.mapping.Import;
-
-public interface RSIntegerNode extends RSNode, IntegerNode
-{
- @Import("integer")
- @Override
- int getValue();
-
- @Import("integer")
- @Override
- void setValue(int value);
-}
\ No newline at end of file
diff --git a/api/src/main/java/rs/api/RSItemContainer.java b/api/src/main/java/rs/api/RSItemContainer.java
deleted file mode 100644
index 964bd545fc..0000000000
--- a/api/src/main/java/rs/api/RSItemContainer.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package rs.api;
-
-import api.ItemContainer;
-import net.runelite.mapping.Import;
-
-public interface RSItemContainer extends RSNode, ItemContainer
-{
- @Import("ids")
- int[] getItemIds();
-
- @Import("quantities")
- int[] getStackSizes();
-}
diff --git a/api/src/main/java/rs/api/RSItemDefinition.java b/api/src/main/java/rs/api/RSItemDefinition.java
deleted file mode 100644
index 2c624b3dc7..0000000000
--- a/api/src/main/java/rs/api/RSItemDefinition.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package rs.api;
-
-import api.ItemDefinition;
-import net.runelite.mapping.Import;
-
-public interface RSItemDefinition extends ItemDefinition
-{
- @Import("name")
- @Override
- String getName();
-
- @Import("id")
- @Override
- int getId();
-
- @Import("noteTemplate")
- @Override
- int getNote();
-
- @Import("notedId")
- @Override
- int getLinkedNoteId();
-
- @Import("placeholder")
- @Override
- int getPlaceholderId();
-
- @Import("placeholderTemplate")
- @Override
- int getPlaceholderTemplateId();
-
- @Import("price")
- @Override
- int getPrice();
-
- @Import("isMembersOnly")
- @Override
- boolean isMembers();
-
- @Import("isTradable")
- @Override
- boolean isTradeable();
-
- /**
- * You probably want {@link #isStackable}
- *
- * This is the {@code int} that client code uses internally to represent this true/false value. It appears to only ever be set to 1 or 0
- * @return 0 when this type of item isn't stackable, 1 otherwise
- */
- @Import("isStackable")
- int getIsStackable();
-
- @Import("maleModel")
- int getMaleModel();
-
- @Import("inventoryActions")
- @Override
- String[] getInventoryActions();
-
- @Import("getShiftClickIndex")
- @Override
- int getShiftClickActionIndex();
-}
diff --git a/api/src/main/java/rs/api/RSIterableNodeDeque.java b/api/src/main/java/rs/api/RSIterableNodeDeque.java
deleted file mode 100644
index 17ba1b7a32..0000000000
--- a/api/src/main/java/rs/api/RSIterableNodeDeque.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package rs.api;
-
-import net.runelite.mapping.Import;
-
-public interface RSIterableNodeDeque
-{
- @Import("current")
- RSNode getCurrent();
-}
diff --git a/api/src/main/java/rs/api/RSIterableNodeHashTable.java b/api/src/main/java/rs/api/RSIterableNodeHashTable.java
deleted file mode 100644
index ed732da8d9..0000000000
--- a/api/src/main/java/rs/api/RSIterableNodeHashTable.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package rs.api;
-
-import api.IterableHashTable;
-import net.runelite.mapping.Import;
-
-public interface RSIterableNodeHashTable extends IterableHashTable
-{
- @Import("get")
- @Override
- RSNode get(long hash);
-}
diff --git a/api/src/main/java/rs/api/RSKeyHandler.java b/api/src/main/java/rs/api/RSKeyHandler.java
deleted file mode 100644
index 886b285419..0000000000
--- a/api/src/main/java/rs/api/RSKeyHandler.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package rs.api;
-
-import api.KeyFocusListener;
-import java.awt.event.FocusListener;
-import java.awt.event.KeyListener;
-
-public interface RSKeyHandler extends KeyListener, FocusListener, KeyFocusListener
-{
-}
diff --git a/api/src/main/java/rs/api/RSLoginType.java b/api/src/main/java/rs/api/RSLoginType.java
deleted file mode 100644
index ffb1c207eb..0000000000
--- a/api/src/main/java/rs/api/RSLoginType.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package rs.api;
-
-public interface RSLoginType
-{
-}
diff --git a/api/src/main/java/rs/api/RSMessage.java b/api/src/main/java/rs/api/RSMessage.java
deleted file mode 100644
index 7c7b90a6db..0000000000
--- a/api/src/main/java/rs/api/RSMessage.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package rs.api;
-
-import api.MessageNode;
-import net.runelite.mapping.Import;
-
-public interface RSMessage extends MessageNode
-{
- @Import("count")
- @Override
- int getId();
-
- @Import("type")
- int getRSType();
-
- @Import("prefix")
- @Override
- String getName();
-
- @Import("prefix")
- @Override
- void setName(String name);
-
- @Import("sender")
- @Override
- String getSender();
-
- @Import("sender")
- @Override
- void setSender(String sender);
-
- @Import("text")
- @Override
- String getValue();
-
- @Import("text")
- @Override
- void setValue(String value);
-}
diff --git a/api/src/main/java/rs/api/RSModelData.java b/api/src/main/java/rs/api/RSModelData.java
deleted file mode 100644
index 7dc6c4798f..0000000000
--- a/api/src/main/java/rs/api/RSModelData.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package rs.api;
-
-import net.runelite.mapping.Import;
-
-public interface RSModelData extends RSEntity
-{
- @Import("faceCount")
- int getTriangleFaceCount();
-
- @Import("indices1")
- int[] getTrianglePointsX();
-
- @Import("indices2")
- int[] getTrianglePointsY();
-
- @Import("indices3")
- int[] getTrianglePointsZ();
-
- @Import("verticesX")
- int[] getVertexX();
-
- @Import("verticesY")
- int[] getVertexY();
-
- @Import("verticesZ")
- int[] getVertexZ();
-
- @Import("texTriangleX")
- short[] getTexTriangleX();
-
- @Import("texTriangleY")
- short[] getTexTriangleY();
-
- @Import("texTriangleZ")
- short[] getTexTriangleZ();
-
- @Import("faceTextures")
- short[] getFaceTextures();
-
- @Import("textureCoords")
- byte[] getTextureCoords();
-
- @Import("textureRenderTypes")
- byte[] getTextureRenderTypes();
-}
diff --git a/api/src/main/java/rs/api/RSMouseHandler.java b/api/src/main/java/rs/api/RSMouseHandler.java
deleted file mode 100644
index 853716f7db..0000000000
--- a/api/src/main/java/rs/api/RSMouseHandler.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package rs.api;
-
-import java.awt.event.FocusListener;
-import java.awt.event.MouseListener;
-import java.awt.event.MouseMotionListener;
-
-public interface RSMouseHandler extends MouseListener, MouseMotionListener, FocusListener
-{
-}
diff --git a/api/src/main/java/rs/api/RSMouseRecorder.java b/api/src/main/java/rs/api/RSMouseRecorder.java
deleted file mode 100644
index 9427606814..0000000000
--- a/api/src/main/java/rs/api/RSMouseRecorder.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package rs.api;
-
-import api.MouseRecorder;
-import net.runelite.mapping.Import;
-
-public interface RSMouseRecorder extends MouseRecorder
-{
- @Import("xs")
- int[] getXs();
-
- @Import("ys")
- int[] getYs();
-
- @Import("millis")
- long[] getMillis();
-
- @Import("index")
- int getIndex();
-}
diff --git a/api/src/main/java/rs/api/RSMouseWheelHandler.java b/api/src/main/java/rs/api/RSMouseWheelHandler.java
deleted file mode 100644
index 4d49700d5d..0000000000
--- a/api/src/main/java/rs/api/RSMouseWheelHandler.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package rs.api;
-
-import java.awt.event.MouseWheelListener;
-
-public interface RSMouseWheelHandler extends MouseWheelListener
-{
-}
diff --git a/api/src/main/java/rs/api/RSNPC.java b/api/src/main/java/rs/api/RSNPC.java
deleted file mode 100644
index b32f8e4c74..0000000000
--- a/api/src/main/java/rs/api/RSNPC.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package rs.api;
-
-import api.NPC;
-import net.runelite.mapping.Import;
-
-public interface RSNPC extends RSActor, NPC
-{
- @Import("definition")
- @Override
- RSNPCDefinition getDefinition();
-
- @Override
- int getIndex();
-
- void setIndex(int id);
-
- void setDead(boolean dead);
-}
diff --git a/api/src/main/java/rs/api/RSNPCDefinition.java b/api/src/main/java/rs/api/RSNPCDefinition.java
deleted file mode 100644
index c34073e54d..0000000000
--- a/api/src/main/java/rs/api/RSNPCDefinition.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package rs.api;
-
-import api.NPCDefinition;
-import net.runelite.mapping.Import;
-
-public interface RSNPCDefinition extends NPCDefinition
-{
- @Import("name")
- @Override
- String getName();
-
- @Import("archives")
- @Override
- int[] getModels();
-
- @Import("actions")
- @Override
- String[] getActions();
-
- @Import("isClickable")
- @Override
- boolean isClickable();
-
- @Import("drawMapDot")
- @Override
- boolean isMinimapVisible();
-
- @Import("isVisible")
- @Override
- boolean isVisible();
-
- @Import("id")
- @Override
- int getId();
-
- @Import("combatLevel")
- @Override
- int getCombatLevel();
-
- @Import("transforms")
- @Override
- int[] getConfigs();
-
- @Import("transform")
- @Override
- RSNPCDefinition transform();
-
- @Import("size")
- @Override
- int getSize();
-
- @Import("headIconPrayer")
- int getRsOverheadIcon();
-}
diff --git a/api/src/main/java/rs/api/RSNodeDeque.java b/api/src/main/java/rs/api/RSNodeDeque.java
deleted file mode 100644
index 1d19ecab80..0000000000
--- a/api/src/main/java/rs/api/RSNodeDeque.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package rs.api;
-
-import net.runelite.mapping.Import;
-
-public interface RSNodeDeque
-{
- @Import("current")
- RSNode getCurrent();
-
- @Import("sentinel")
- RSNode getHead();
-}
diff --git a/api/src/main/java/rs/api/RSNodeHashTable.java b/api/src/main/java/rs/api/RSNodeHashTable.java
deleted file mode 100644
index fc18df3b3b..0000000000
--- a/api/src/main/java/rs/api/RSNodeHashTable.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package rs.api;
-
-import api.HashTable;
-import net.runelite.mapping.Import;
-
-public interface RSNodeHashTable extends HashTable
-{
- @Import("get")
- @Override
- RSNode get(long value);
-
- @Import("size")
- int getSize();
-
- @Import("buckets")
- RSNode[] getBuckets();
-}
diff --git a/api/src/main/java/rs/api/RSObjectDefinition.java b/api/src/main/java/rs/api/RSObjectDefinition.java
deleted file mode 100644
index feeb0922ae..0000000000
--- a/api/src/main/java/rs/api/RSObjectDefinition.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package rs.api;
-
-import api.ObjectDefinition;
-import net.runelite.mapping.Import;
-
-public interface RSObjectDefinition extends ObjectDefinition
-{
- @Import("id")
- @Override
- int getId();
-
- @Import("name")
- @Override
- String getName();
-
- @Import("actions")
- @Override
- String[] getActions();
-
- @Import("mapSceneId")
- @Override
- int getMapSceneId();
-
- @Import("mapIconId")
- @Override
- int getMapIconId();
-
- @Import("transforms")
- @Override
- int[] getImpostorIds();
-
- @Import("transform")
- @Override
- RSObjectDefinition getImpostor();
-}
diff --git a/api/src/main/java/rs/api/RSPacketBuffer.java b/api/src/main/java/rs/api/RSPacketBuffer.java
deleted file mode 100644
index f9dbfac32e..0000000000
--- a/api/src/main/java/rs/api/RSPacketBuffer.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package rs.api;
-
-import api.PacketBuffer;
-
-public interface RSPacketBuffer extends PacketBuffer
-{
-}
diff --git a/api/src/main/java/rs/api/RSPlayerAppearance.java b/api/src/main/java/rs/api/RSPlayerAppearance.java
deleted file mode 100644
index b1bf272845..0000000000
--- a/api/src/main/java/rs/api/RSPlayerAppearance.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package rs.api;
-
-import api.PlayerAppearance;
-import net.runelite.mapping.Import;
-
-public interface RSPlayerAppearance extends PlayerAppearance
-{
- @Import("isFemale")
- boolean isFemale();
-
- @Import("bodyColors")
- int[] getBodyPartColours();
-
- @Import("equipment")
- @Override
- int[] getEquipmentIds();
-
- @Import("npcTransformId")
- @Override
- void setTransformedNpcId(int id);
-
- @Import("setHash")
- @Override
- void setHash();
-}
diff --git a/api/src/main/java/rs/api/RSReflectionCheck.java b/api/src/main/java/rs/api/RSReflectionCheck.java
deleted file mode 100644
index 5de9c99b1e..0000000000
--- a/api/src/main/java/rs/api/RSReflectionCheck.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package rs.api;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import net.runelite.mapping.Import;
-
-public interface RSReflectionCheck
-{
- @Import("methods")
- Method[] getMethods();
-
- @Import("fields")
- Field[] getFields();
-
- @Import("arguments")
- byte[][][] getArgs();
-}
diff --git a/api/src/main/java/rs/api/RSRunException.java b/api/src/main/java/rs/api/RSRunException.java
deleted file mode 100644
index acdd484585..0000000000
--- a/api/src/main/java/rs/api/RSRunException.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package rs.api;
-
-import net.runelite.mapping.Import;
-
-public interface RSRunException
-{
- @Import("throwable")
- Throwable getParent();
-}
diff --git a/api/src/main/java/rs/api/RSScene.java b/api/src/main/java/rs/api/RSScene.java
deleted file mode 100644
index 9df00300fc..0000000000
--- a/api/src/main/java/rs/api/RSScene.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package rs.api;
-
-import api.Scene;
-import api.Tile;
-import net.runelite.mapping.Import;
-
-public interface RSScene extends Scene
-{
- //@Import("Scene_gameObjects") --- unused and causing trouble
- //RSGameObject[] getObjects();
-
- @Import("tiles")
- @Override
- RSTile[][][] getTiles();
-
- @Import("drawTile")
- void draw(Tile tile, boolean var2);
-
- @Import("tileHeights")
- int[][][] getTileHeights();
-
- @Import("drawTileMinimap")
- void drawTile(int[] pixels, int pixelOffset, int width, int z, int x, int y);
-
- @Import("occlude")
- void updateOccluders();
-
- @Import("xSize")
- int getMaxX();
-
- @Import("planes")
- int getMaxY();
-
- @Import("ySize")
- int getMaxZ();
-
- @Import("Scene_minPlane")
- int getMinLevel();
-}
diff --git a/api/src/main/java/rs/api/RSScript.java b/api/src/main/java/rs/api/RSScript.java
deleted file mode 100644
index eb76b24058..0000000000
--- a/api/src/main/java/rs/api/RSScript.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package rs.api;
-
-import api.Script;
-import net.runelite.mapping.Import;
-
-public interface RSScript extends Script, RSDualNode
-{
- @Import("intOperands")
- @Override
- int[] getIntOperands();
-
- @Import("opcodes")
- @Override
- int[] getInstructions();
-}
diff --git a/api/src/main/java/rs/api/RSScriptEvent.java b/api/src/main/java/rs/api/RSScriptEvent.java
deleted file mode 100644
index 885879cd1d..0000000000
--- a/api/src/main/java/rs/api/RSScriptEvent.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package rs.api;
-
-import api.ScriptEvent;
-import api.widgets.Widget;
-import net.runelite.mapping.Import;
-
-public interface RSScriptEvent extends ScriptEvent
-{
- @Import("args0")
- Object[] getArguments();
-
- @Import("args0")
- void setArguments(Object[] args);
-
- @Import("widget")
- Widget getSource();
-
- @Import("opIndex")
- int getOp();
-
- @Import("targetName")
- String getOpbase();
-}
diff --git a/api/src/main/java/rs/api/RSSequenceDefinition.java b/api/src/main/java/rs/api/RSSequenceDefinition.java
deleted file mode 100644
index 591e535a01..0000000000
--- a/api/src/main/java/rs/api/RSSequenceDefinition.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package rs.api;
-
-import net.runelite.mapping.Import;
-
-public interface RSSequenceDefinition
-{
-// @Import("stretches")
-// boolean getStretches();
-//
-// @Import("maxLoops")
-// int getMaxLoops();
-//
-// @Import("precedenceAnimating") --- All unused
-// int getPrecedenceAnimating();
-//
-// @Import("replyMode")
-// int getReplyMode();
-//
-// @Import("interleaveLeave")
-// int[] getInterleaveLeave();
-
- @Import("frameIds")
- int[] getFrameIDs();
-
- @Import("frameLengths")
- int[] getFrameLenths();
-}
diff --git a/api/src/main/java/rs/api/RSSoundEffect.java b/api/src/main/java/rs/api/RSSoundEffect.java
deleted file mode 100644
index 7c7fd22ffe..0000000000
--- a/api/src/main/java/rs/api/RSSoundEffect.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package rs.api;
-
-public interface RSSoundEffect
-{
-}
diff --git a/api/src/main/java/rs/api/RSSprite.java b/api/src/main/java/rs/api/RSSprite.java
deleted file mode 100644
index 98425e05b2..0000000000
--- a/api/src/main/java/rs/api/RSSprite.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package rs.api;
-
-import api.Sprite;
-import net.runelite.mapping.Import;
-
-public interface RSSprite extends Sprite
-{
- @Import("drawAt")
- @Override
- void drawAt(int x, int y);
-
- @Import("subHeight")
- @Override
- int getHeight();
-
- @Import("subWidth")
- @Override
- int getWidth();
-
- @Import("pixels")
- @Override
- int[] getPixels();
-
- @Import("setRaster")
- void setRaster();
-
- @Import("width")
- void setMaxWidth(int maxWidth);
-
- @Import("height")
- void setMaxHeight(int maxHeight);
-
- @Import("xOffset")
- void setOffsetX(int offsetX);
-
- @Import("yOffset")
- void setOffsetY(int offsetY);
-}
diff --git a/api/src/main/java/rs/api/RSTexture.java b/api/src/main/java/rs/api/RSTexture.java
deleted file mode 100644
index aa525f793c..0000000000
--- a/api/src/main/java/rs/api/RSTexture.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package rs.api;
-
-import api.Texture;
-import net.runelite.mapping.Import;
-
-public interface RSTexture extends Texture, RSNode
-{
- @Import("pixels")
- @Override
- int[] getPixels();
-
- @Import("animationDirection")
- @Override
- int getAnimationDirection();
-
- @Import("animationSpeed")
- @Override
- int getAnimationSpeed();
-
- @Import("isLoaded")
- @Override
- boolean isLoaded();
-}
diff --git a/api/src/main/java/rs/api/RSTextureProvider.java b/api/src/main/java/rs/api/RSTextureProvider.java
deleted file mode 100644
index 30306c1a4f..0000000000
--- a/api/src/main/java/rs/api/RSTextureProvider.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package rs.api;
-
-import api.TextureProvider;
-import net.runelite.mapping.Import;
-
-public interface RSTextureProvider extends TextureProvider
-{
- @Import("brightness0")
- @Override
- double getBrightness();
-
- @Import("setBrightness")
- @Override
- void setBrightness(double brightness);
-
- @Import("capacity")
- void setMaxSize(int maxSize);
-
- @Import("remaining")
- void setSize(int size);
-
- @Import("textures")
- @Override
- RSTexture[] getTextures();
-
- @Import("load")
- @Override
- int[] load(int textureId);
-}
diff --git a/api/src/main/java/rs/api/RSTile.java b/api/src/main/java/rs/api/RSTile.java
deleted file mode 100644
index eb0ff71378..0000000000
--- a/api/src/main/java/rs/api/RSTile.java
+++ /dev/null
@@ -1,84 +0,0 @@
-package rs.api;
-
-import api.DecorativeObject;
-import api.GameObject;
-import api.GroundObject;
-import api.ItemLayer;
-import api.SceneTileModel;
-import api.SceneTilePaint;
-import api.Tile;
-import api.WallObject;
-import net.runelite.mapping.Import;
-
-public interface RSTile extends Tile
-{
- @Import("gameObjects")
- @Override
- GameObject[] getGameObjects();
-
- @Import("groundItemPile")
- @Override
- ItemLayer getItemLayer();
-
- @Import("wallDecoration")
- @Override
- DecorativeObject getDecorativeObject();
-
- @Import("floorDecoration")
- @Override
- GroundObject getGroundObject();
-
- @Import("boundaryObject")
- @Override
- WallObject getWallObject();
-
- @Import("paint")
- @Override
- SceneTilePaint getSceneTilePaint();
-
- @Import("model")
- @Override
- SceneTileModel getSceneTileModel();
-
- @Import("x")
- int getX();
-
- @Import("y")
- int getY();
-
- @Import("plane")
- @Override
- int getPlane();
-
- @Import("originalPlane")
- @Override
- int getRenderLevel();
-
- @Import("minPlane")
- int getPhysicalLevel();
-
- //@Import("flags")
- //int getFlags(); ---- unused, think it's gameobjectedgemask
-
- @Import("linkedBelowTile")
- @Override
- RSTile getBridge();
-
- @Import("drawPrimary")
- boolean isDraw();
-
- @Import("drawPrimary")
- void setDraw(boolean draw);
-
- @Import("drawSecondary")
- boolean isVisible();
-
- @Import("drawSecondary")
- void setVisible(boolean visible);
-
- @Import("drawGameObjects")
- void setDrawEntities(boolean drawEntities);
-
- @Import("drawGameObjectEdges")
- void setWallCullDirection(int wallCullDirection);
-}
diff --git a/api/src/main/java/rs/api/RSTileModel.java b/api/src/main/java/rs/api/RSTileModel.java
deleted file mode 100644
index 1863e8b61f..0000000000
--- a/api/src/main/java/rs/api/RSTileModel.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package rs.api;
-
-import api.SceneTileModel;
-import net.runelite.mapping.Import;
-
-public interface RSTileModel extends SceneTileModel
-{
- @Import("underlayRgb")
- @Override
- int getModelUnderlay();
-
- @Import("overlayRgb")
- @Override
- int getModelOverlay();
-
- @Import("shape")
- @Override
- int getShape();
-
- @Import("rotation")
- @Override
- int getRotation();
-
- @Import("faceX")
- @Override
- int[] getFaceX();
-
- @Import("faceY")
- @Override
- int[] getFaceY();
-
- @Import("faceZ")
- @Override
- int[] getFaceZ();
-
- @Import("vertexX")
- @Override
- int[] getVertexX();
-
- @Import("vertexY")
- @Override
- int[] getVertexY();
-
- @Import("vertexZ")
- @Override
- int[] getVertexZ();
-
- @Import("triangleColorA")
- @Override
- int[] getTriangleColorA();
-
- @Import("triangleColorB")
- @Override
- int[] getTriangleColorB();
-
- @Import("triangleColorC")
- @Override
- int[] getTriangleColorC();
-
- @Import("triangleTextureId")
- @Override
- int[] getTriangleTextureId();
-}
diff --git a/api/src/main/java/rs/api/RSTilePaint.java b/api/src/main/java/rs/api/RSTilePaint.java
deleted file mode 100644
index 9e1d4355e6..0000000000
--- a/api/src/main/java/rs/api/RSTilePaint.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package rs.api;
-
-import api.SceneTilePaint;
-import net.runelite.mapping.Import;
-
-public interface RSTilePaint extends SceneTilePaint
-{
- @Import("rgb")
- @Override
- int getRBG();
-
- @Import("swColor")
- @Override
- int getSwColor();
-
- @Import("seColor")
- @Override
- int getSeColor();
-
- @Import("nwColor")
- @Override
- int getNwColor();
-
- @Import("neColor")
- @Override
- int getNeColor();
-
- @Import("texture")
- @Override
- int getTexture();
-}
diff --git a/api/src/main/java/rs/api/RSUser.java b/api/src/main/java/rs/api/RSUser.java
deleted file mode 100644
index 9a57f8f3f6..0000000000
--- a/api/src/main/java/rs/api/RSUser.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package rs.api;
-
-import api.Nameable;
-import net.runelite.mapping.Import;
-
-public interface RSUser extends Nameable, Comparable
-{
- @Import("username")
- RSUsername getRsName();
-
- @Import("previousUsername")
- RSUsername getRsPrevName();
-}
diff --git a/api/src/main/java/rs/api/RSUserList.java b/api/src/main/java/rs/api/RSUserList.java
deleted file mode 100644
index 4542b5ef30..0000000000
--- a/api/src/main/java/rs/api/RSUserList.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package rs.api;
-
-import net.runelite.mapping.Import;
-
-public interface RSUserList
-{
- @Import("size0")
- int getCount();
-
- @Import("array")
- T[] getNameables();
-
- @Import("contains")
- boolean isMember(RSUsername var1);
-
- @Import("getByUsername")
- T findByName(RSUsername name);
-
- /**
- * Method called by the container when an element is added
- * @param name
- * @param prevName
- */
- void rl$add(RSUsername name, RSUsername prevName);
-
- /**
- * Method called by the container when an element is removed
- * @param nameable
- */
- void rl$remove(RSUser nameable);
-}
diff --git a/api/src/main/java/rs/api/RSVarbitDefinition.java b/api/src/main/java/rs/api/RSVarbitDefinition.java
deleted file mode 100644
index d3328a7d38..0000000000
--- a/api/src/main/java/rs/api/RSVarbitDefinition.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package rs.api;
-
-import net.runelite.mapping.Import;
-
-public interface RSVarbitDefinition extends RSDualNode
-{
- @Import("varp")
- int getIndex();
-
- @Import("lowBit")
- int getLeastSignificantBit();
-
- @Import("highBit")
- int getMostSignificantBit();
-}
diff --git a/api/src/main/java/rs/api/RSVarcs.java b/api/src/main/java/rs/api/RSVarcs.java
deleted file mode 100644
index 93f0ad15b1..0000000000
--- a/api/src/main/java/rs/api/RSVarcs.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package rs.api;
-
-import java.util.Map;
-import net.runelite.mapping.Import;
-
-public interface RSVarcs
-{
- @Import("map")
- Map getVarcMap();
-}
diff --git a/api/src/main/java/rs/api/RSWallDecoration.java b/api/src/main/java/rs/api/RSWallDecoration.java
deleted file mode 100644
index f671202a9d..0000000000
--- a/api/src/main/java/rs/api/RSWallDecoration.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package rs.api;
-
-import api.DecorativeObject;
-import net.runelite.mapping.Import;
-
-public interface RSWallDecoration extends DecorativeObject
-{
- @Import("tag")
- @Override
- long getHash();
-
- @Import("x")
- int getX();
-
- @Import("y")
- int getY();
-
- @Import("xOffset")
- int getXOffset();
-
- @Import("yOffset")
- int getYOffset();
-
- @Import("orientation")
- int getOrientation();
-
- @Import("entity1")
- @Override
- RSEntity getRenderable();
-
- @Import("entity2")
- @Override
- RSEntity getRenderable2();
-
- void setPlane(int plane);
-}
diff --git a/api/src/main/java/rs/api/RSWidgetGroupParent.java b/api/src/main/java/rs/api/RSWidgetGroupParent.java
deleted file mode 100644
index b3e1f9c4be..0000000000
--- a/api/src/main/java/rs/api/RSWidgetGroupParent.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package rs.api;
-
-import api.WidgetNode;
-import net.runelite.mapping.Import;
-
-public interface RSWidgetGroupParent extends RSNode, WidgetNode
-{
- @Import("group")
- @Override
- int getId();
-}
diff --git a/api/src/main/java/rs/api/RSWorld.java b/api/src/main/java/rs/api/RSWorld.java
deleted file mode 100644
index d176873c8f..0000000000
--- a/api/src/main/java/rs/api/RSWorld.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package rs.api;
-
-import api.World;
-import net.runelite.mapping.Import;
-
-public interface RSWorld extends World
-{
- @Import("properties")
- int getMask();
-
- @Import("properties")
- void setMask(int mask);
-
- @Import("population")
- @Override
- int getPlayerCount();
-
- @Import("population")
- @Override
- void setPlayerCount(int playerCount);
-
- @Import("location")
- @Override
- int getLocation();
-
- @Import("location")
- @Override
- void setLocation(int location);
-
- @Import("index")
- @Override
- int getIndex();
-
- @Import("index")
- @Override
- void setIndex(int index);
-
- @Import("id")
- @Override
- int getId();
-
- @Import("id")
- @Override
- void setId(int id);
-
- @Import("activity")
- @Override
- String getActivity();
-
- @Import("activity")
- @Override
- void setActivity(String activity);
-
- @Import("host")
- @Override
- String getAddress();
-
- @Import("host")
- @Override
- void setAddress(String address);
-}
diff --git a/api/src/main/java/rs/api/RSWorldMap.java b/api/src/main/java/rs/api/RSWorldMap.java
deleted file mode 100644
index fe74a34d86..0000000000
--- a/api/src/main/java/rs/api/RSWorldMap.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package rs.api;
-
-import api.RenderOverview;
-import api.WorldMapData;
-import net.runelite.mapping.Import;
-
-public interface RSWorldMap extends RenderOverview
-{
- @Import("worldMapX")
- int getWorldMapX();
-
- @Import("worldMapY")
- int getWorldMapY();
-
- @Import("zoomTarget")
- float getWorldMapZoom();
-
- @Import("worldMapTargetX")
- int getWorldMapTargetX();
-
- @Import("worldMapTargetY")
- int getWorldMapTargetY();
-
- //@Import("worldMapDisplayWidth")
- //int getWorldMapDisplayWidth();
-//Both unused
- //@Import("worldMapDisplayHeight")
- //int getWorldMapDisplayHeight();
-
- //@Import("worldMapDisplayX")
- //int getWorldMapDisplayX();
-
- //@Import("worldMapDisplayY")
- //int getWorldMapDisplayY();
-
- @Import("setWorldMapPosition")
- void setWorldMapPosition(int worldMapX, int worldMapY, boolean changedSurface);
-
- @Import("setWorldMapPositionTarget")
- void setWorldMapPositionTarget(int worldPointX, int worldPointY);
-
- @Import("worldMapManager")
- @Override
- RSWorldMapManager getWorldMapManager();
-
- @Import("initializeWorldMap")
- @Override
- void initializeWorldMap(WorldMapData var1);
-
- @Import("mainMapArea")
- @Override
- RSWorldMapArea getWorldMapData();
-}
diff --git a/api/src/main/java/rs/api/RSWorldMapArea.java b/api/src/main/java/rs/api/RSWorldMapArea.java
deleted file mode 100644
index 6035b64b51..0000000000
--- a/api/src/main/java/rs/api/RSWorldMapArea.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package rs.api;
-
-import api.WorldMapData;
-import net.runelite.mapping.Import;
-
-public interface RSWorldMapArea extends WorldMapData
-{
- @Import("containsPosition")
- boolean surfaceContainsPosition(int x, int y);
-}
diff --git a/api/src/main/java/rs/api/RSWorldMapElement.java b/api/src/main/java/rs/api/RSWorldMapElement.java
deleted file mode 100644
index 6957121a56..0000000000
--- a/api/src/main/java/rs/api/RSWorldMapElement.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package rs.api;
-
-import api.MapElementConfig;
-import net.runelite.mapping.Import;
-
-public interface RSWorldMapElement extends RSDualNode, MapElementConfig
-{
- @Import("getSprite")
- @Override
- RSSprite getMapIcon(boolean var1);
-}
diff --git a/api/src/main/java/rs/api/RSWorldMapManager.java b/api/src/main/java/rs/api/RSWorldMapManager.java
deleted file mode 100644
index 1c1a74fa55..0000000000
--- a/api/src/main/java/rs/api/RSWorldMapManager.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package rs.api;
-
-import api.WorldMapManager;
-import net.runelite.mapping.Import;
-
-public interface RSWorldMapManager extends WorldMapManager
-{
- @Import("isLoaded0")
- @Override
- boolean isLoaded();
-
- @Import("surfaceOffsetX")
- int getSurfaceOffsetX();
-
- @Import("surfaceOffsetY")
- int getSurfaceOffsetY();
-
- @Import("getPixelsPerTile")
- float getPixelsPerTile(int graphicsDiff, int worldDiff);
-}
diff --git a/injected-client/pom.xml b/cache-client/pom.xml
similarity index 57%
rename from injected-client/pom.xml
rename to cache-client/pom.xml
index 98f48b022e..ebe28ee8c8 100644
--- a/injected-client/pom.xml
+++ b/cache-client/pom.xml
@@ -27,62 +27,40 @@
4.0.0
- com.runeswag
- runeswag-parent
- 1.0-SNAPSHOT
+ net.runelite
+ runelite-parent
+ 1.5.27-SNAPSHOT
- injected-client
- Injected Client
+ cache-client
+ Cache Client
net.runelite
- client
- 1.5.26-SNAPSHOT
- true
+ cache
+ ${project.version}
- com.runeswag
- api
- 1.0-SNAPSHOT
- false
+ net.runelite
+ protocol
+ ${project.version}
+
+
+
+ junit
+ junit
- net.runelite.rs
- vanilla
- 180
- true
+ org.slf4j
+ slf4j-simple
+
+
+ net.runelite
+ cache
+ ${project.version}
+ test-jar
+ test
-
-
-
-
- net.runelite.rs
- injector-plugin
- 1.5.26-SNAPSHOT
-
-
-
- runelite-injector
-
-
-
-
-
- org.apache.maven.plugins
- maven-dependency-plugin
- 2.3
-
-
- generate-sources
-
- properties
-
-
-
-
-
-
diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/Exceptions.java b/cache-client/src/main/java/net/runelite/cache/client/ArchiveResponseHandler.java
similarity index 68%
rename from deobfuscator/src/main/java/net/runelite/asm/attributes/Exceptions.java
rename to cache-client/src/main/java/net/runelite/cache/client/ArchiveResponseHandler.java
index 0b12c513fd..f6bffbeba1 100644
--- a/deobfuscator/src/main/java/net/runelite/asm/attributes/Exceptions.java
+++ b/cache-client/src/main/java/net/runelite/cache/client/ArchiveResponseHandler.java
@@ -22,38 +22,27 @@
* (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.client;
-package net.runelite.asm.attributes;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.SimpleChannelInboundHandler;
+import net.runelite.protocol.api.update.ArchiveResponsePacket;
-import java.util.ArrayList;
-import java.util.List;
-import net.runelite.asm.ClassFile;
-import net.runelite.asm.pool.Class;
-
-public class Exceptions
+public class ArchiveResponseHandler extends SimpleChannelInboundHandler
{
- private final List classes = new ArrayList<>();
+ private final CacheClient client;
- public void addException(Class cl)
+ public ArchiveResponseHandler(CacheClient client)
{
- classes.add(cl);
+ this.client = client;
}
- public List getExceptions()
+ @Override
+ protected void channelRead0(ChannelHandlerContext ctx, ArchiveResponsePacket archiveResponse) throws Exception
{
- return classes;
- }
-
- public void renameClass(ClassFile cf, String name)
- {
- for (Class c : new ArrayList<>(classes))
- {
- if (c.getName().equals(cf.getName()))
- {
- int idx = classes.indexOf(c);
- classes.remove(idx);
- classes.add(idx, new Class(name));
- }
- }
+ client.onFileFinish(archiveResponse.getIndex(),
+ archiveResponse.getArchive(),
+ archiveResponse.getData());
}
+
}
diff --git a/cache-client/src/main/java/net/runelite/cache/client/CacheClient.java b/cache-client/src/main/java/net/runelite/cache/client/CacheClient.java
new file mode 100644
index 0000000000..273da5d5fa
--- /dev/null
+++ b/cache-client/src/main/java/net/runelite/cache/client/CacheClient.java
@@ -0,0 +1,459 @@
+/*
+ * Copyright (c) 2016-2017, Adam
+ * 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.client;
+
+import com.google.common.base.Stopwatch;
+import io.netty.bootstrap.Bootstrap;
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelInitializer;
+import io.netty.channel.ChannelOption;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.EventLoopGroup;
+import io.netty.channel.nio.NioEventLoopGroup;
+import io.netty.channel.socket.SocketChannel;
+import io.netty.channel.socket.nio.NioSocketChannel;
+import java.io.IOException;
+import java.util.ArrayDeque;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Queue;
+import java.util.concurrent.CompletableFuture;
+import net.runelite.cache.fs.Archive;
+import net.runelite.cache.fs.Index;
+import net.runelite.cache.fs.Storage;
+import net.runelite.cache.fs.Store;
+import net.runelite.cache.index.ArchiveData;
+import net.runelite.cache.index.IndexData;
+import net.runelite.protocol.update.decoders.HandshakeResponseDecoder;
+import net.runelite.protocol.update.encoders.ArchiveRequestEncoder;
+import net.runelite.protocol.update.encoders.EncryptionEncoder;
+import net.runelite.protocol.api.update.ArchiveRequestPacket;
+import net.runelite.protocol.api.login.HandshakeResponseType;
+import net.runelite.cache.util.Crc32;
+import net.runelite.protocol.api.handshake.UpdateHandshakePacket;
+import net.runelite.protocol.handshake.UpdateHandshakeEncoder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class CacheClient implements AutoCloseable
+{
+ private static final Logger logger = LoggerFactory.getLogger(CacheClient.class);
+
+ private static final String HOST = "oldschool1.runescape.com";
+ private static final int PORT = 43594;
+
+ private static final int MAX_REQUESTS = 19; // too many and the server closes the conncetion
+
+ private final Store store; // store cache will be written to
+ private final String host;
+ private final int clientRevision;
+ private DownloadWatcher watcher;
+
+ private ClientState state;
+
+ private final EventLoopGroup group = new NioEventLoopGroup(1);
+ private Channel channel;
+
+ private CompletableFuture handshakeFuture;
+ private final Queue requests = new ArrayDeque<>();
+
+ public CacheClient(Store store, int clientRevision)
+ {
+ this(store, HOST, clientRevision);
+ }
+
+ public CacheClient(Store store, String host, int clientRevision)
+ {
+ this.store = store;
+ this.host = host;
+ this.clientRevision = clientRevision;
+ }
+
+ public CacheClient(Store store, int clientRevision, DownloadWatcher watcher)
+ {
+ this(store, clientRevision);
+ this.watcher = watcher;
+ }
+
+ public void connect()
+ {
+ Bootstrap b = new Bootstrap();
+ b.group(group)
+ .channel(NioSocketChannel.class)
+ .option(ChannelOption.TCP_NODELAY, true)
+ .handler(new ChannelInitializer()
+ {
+ @Override
+ public void initChannel(SocketChannel ch) throws Exception
+ {
+ ChannelPipeline p = ch.pipeline();
+
+ //p.addFirst(new HttpProxyHandler(new InetSocketAddress("runelite.net", 3128)));
+ p.addLast("decoder", new HandshakeResponseDecoder());
+
+ p.addLast(
+ new CacheClientHandler(),
+ new HandshakeResponseHandler(CacheClient.this),
+ new ArchiveResponseHandler(CacheClient.this)
+ );
+
+ p.addLast(
+ new UpdateHandshakeEncoder(),
+ new EncryptionEncoder(),
+ new ArchiveRequestEncoder()
+ );
+ }
+ });
+
+ // Start the client.
+ ChannelFuture f = b.connect(host, PORT).syncUninterruptibly();
+ channel = f.channel();
+ }
+
+ public CompletableFuture handshake()
+ {
+ UpdateHandshakePacket handshakePacket = new UpdateHandshakePacket();
+ handshakePacket.setRevision(getClientRevision());
+
+ state = ClientState.HANDSHAKING;
+
+ assert handshakeFuture == null;
+ handshakeFuture = new CompletableFuture<>();
+
+ channel.writeAndFlush(handshakePacket);
+
+ logger.info("Sent handshake with revision {}", handshakePacket.getRevision());
+
+ return handshakeFuture;
+ }
+
+ @Override
+ public void close()
+ {
+ channel.close().syncUninterruptibly();
+ group.shutdownGracefully();
+ }
+
+ public int getClientRevision()
+ {
+ return clientRevision;
+ }
+
+ public ClientState getState()
+ {
+ return state;
+ }
+
+ void setState(ClientState state)
+ {
+ this.state = state;
+ }
+
+ CompletableFuture getHandshakeFuture()
+ {
+ return handshakeFuture;
+ }
+
+ public List requestIndexes() throws IOException
+ {
+ logger.info("Requesting indexes");
+
+ FileResult result = requestFile(255, 255, true).join();
+ result.decompress(null);
+
+ ByteBuf buffer = Unpooled.wrappedBuffer(result.getContents());
+ int indexCount = result.getContents().length / 8;
+ List indexInfo = new ArrayList<>();
+
+ for (int i = 0; i < indexCount; ++i)
+ {
+ int crc = buffer.readInt();
+ int revision = buffer.readInt();
+ indexInfo.add(new IndexInfo(i, crc, revision));
+ }
+
+ return indexInfo;
+ }
+
+ public void download() throws IOException
+ {
+ Stopwatch stopwatch = Stopwatch.createStarted();
+
+ List indexes = requestIndexes();
+ for (IndexInfo indexInfo : indexes)
+ {
+ int i = indexInfo.getId();
+ int crc = indexInfo.getCrc();
+ int revision = indexInfo.getRevision();
+
+ Index index = store.findIndex(i);
+
+ if (index == null)
+ {
+ logger.info("Index {} does not exist, creating", i);
+ }
+ else if (index.getRevision() != revision)
+ {
+ if (revision < index.getRevision())
+ {
+ logger.warn("Index {} revision is going BACKWARDS! (our revision {}, their revision {})", index.getId(), index.getRevision(), revision);
+ }
+ else
+ {
+ logger.info("Index {} has the wrong revision (our revision {}, their revision {})", index.getId(), index.getRevision(), revision);
+ }
+ }
+ else if (index.getCrc() != crc)
+ {
+ logger.warn("Index {} CRC has changed! (our crc {}, their crc {})",
+ index.getCrc(), index.getCrc(), crc);
+ }
+ else
+ {
+ // despite the index being up to date, not everything
+ // can be downloaded, eg. for tracks.
+ logger.info("Index {} is up to date", index.getId());
+ }
+
+ logger.info("Downloading index {}", i);
+
+ FileResult indexFileResult = requestFile(255, i, true).join();
+ indexFileResult.decompress(null);
+
+ logger.info("Downloaded index {}", i);
+
+ if (indexFileResult.getCrc() != crc)
+ {
+ logger.warn("Corrupted download for index {}", i);
+ continue;
+ }
+
+ IndexData indexData = new IndexData();
+ indexData.load(indexFileResult.getContents());
+
+ if (index == null)
+ {
+ index = store.addIndex(i);
+ }
+
+ // update index settings
+ index.setProtocol(indexData.getProtocol());
+ index.setNamed(indexData.isNamed());
+ index.setCrc(crc);
+ index.setRevision(revision);
+
+ logger.info("Index {} has {} archives", i, indexData.getArchives().length);
+
+ for (ArchiveData ad : indexData.getArchives())
+ {
+ Archive existing = index.getArchive(ad.getId());
+
+ if (existing != null && existing.getRevision() == ad.getRevision()
+ && existing.getCrc() == ad.getCrc()
+ && existing.getNameHash() == ad.getNameHash())
+ {
+ logger.debug("Archive {}/{} in index {} is up to date",
+ ad.getId(), indexData.getArchives().length, index.getId());
+ continue;
+ }
+
+ if (existing == null)
+ {
+ logger.info("Archive {}/{} in index {} is out of date, downloading",
+ ad.getId(), indexData.getArchives().length, index.getId());
+ }
+ else if (ad.getRevision() < existing.getRevision())
+ {
+ logger.warn("Archive {}/{} in index {} revision is going BACKWARDS! (our revision {}, their revision {})",
+ ad.getId(), indexData.getArchives().length, index.getId(),
+ existing.getRevision(), ad.getRevision());
+ }
+ else
+ {
+ logger.info("Archive {}/{} in index {} is out of date, downloading. " +
+ "revision: ours: {} theirs: {}, crc: ours: {} theirs {}, name: ours {} theirs {}",
+ ad.getId(), indexData.getArchives().length, index.getId(),
+ existing.getRevision(), ad.getRevision(),
+ existing.getCrc(), ad.getCrc(),
+ existing.getNameHash(), ad.getNameHash());
+ }
+
+ final Archive archive = existing == null
+ ? index.addArchive(ad.getId())
+ : existing;
+
+ archive.setRevision(ad.getRevision());
+ archive.setCrc(ad.getCrc());
+ archive.setNameHash(ad.getNameHash());
+
+ // Add files
+ archive.setFileData(ad.getFiles());
+
+ CompletableFuture future = requestFile(index.getId(), ad.getId(), false);
+ future.handle((fr, ex) ->
+ {
+ byte[] data = fr.getCompressedData();
+
+ Crc32 crc32 = new Crc32();
+ crc32.update(data, 0, data.length);
+ int hash = crc32.getHash();
+
+ if (hash != archive.getCrc())
+ {
+ logger.warn("crc mismatch on downloaded archive {}/{}: {} != {}",
+ archive.getIndex().getId(), archive.getArchiveId(),
+ hash, archive.getCrc());
+ throw new RuntimeException("crc mismatch");
+ }
+
+ if (watcher != null)
+ {
+ watcher.downloadComplete(archive, data);
+ }
+ else
+ {
+ try
+ {
+ Storage storage = store.getStorage();
+ storage.saveArchive(archive, data);
+ }
+ catch (IOException ex1)
+ {
+ logger.warn("unable to save archive data", ex1);
+ }
+ }
+ return null;
+ });
+ }
+ }
+
+ // flush any pending requests
+ channel.flush();
+
+ while (!requests.isEmpty())
+ {
+ // wait for pending requests
+ synchronized (this)
+ {
+ try
+ {
+ wait();
+ }
+ catch (InterruptedException ex)
+ {
+ logger.warn(null, ex);
+ }
+ }
+ }
+
+ stopwatch.stop();
+ logger.info("Download completed in {}", stopwatch);
+ }
+
+ private synchronized CompletableFuture requestFile(int index, int fileId, boolean flush)
+ {
+ if (state != ClientState.CONNECTED)
+ {
+ throw new IllegalStateException("Can't request files until connected!");
+ }
+
+ if (!flush)
+ {
+ while (requests.size() >= MAX_REQUESTS)
+ {
+ channel.flush();
+
+ try
+ {
+ wait();
+ }
+ catch (InterruptedException ex)
+ {
+ logger.warn("interrupted while waiting for requests", ex);
+ }
+ }
+ }
+
+ ArchiveRequestPacket archiveRequest = new ArchiveRequestPacket();
+ archiveRequest.setPriority(false);
+ archiveRequest.setIndex(index);
+ archiveRequest.setArchive(fileId);
+
+ CompletableFuture future = new CompletableFuture<>();
+ PendingFileRequest pf = new PendingFileRequest(index,
+ fileId, future);
+
+ logger.trace("Sending request for {}/{}", index, fileId);
+
+ requests.add(pf);
+
+ if (!flush)
+ {
+ channel.write(archiveRequest);
+ }
+ else
+ {
+ channel.writeAndFlush(archiveRequest);
+ }
+
+ return future;
+ }
+
+ private PendingFileRequest findRequest(int index, int file)
+ {
+ for (PendingFileRequest pr : requests)
+ {
+ if (pr.getIndex() == index && pr.getArchive() == file)
+ {
+ return pr;
+ }
+ }
+ return null;
+ }
+
+ protected synchronized void onFileFinish(int index, int file, byte[] compressedData)
+ {
+ PendingFileRequest pr = findRequest(index, file);
+
+ if (pr == null)
+ {
+ logger.warn("File download {}/{} with no pending request", index, file);
+ return;
+ }
+
+ requests.remove(pr);
+
+ notify();
+
+ FileResult result = new FileResult(index, file, compressedData);
+
+ logger.debug("File download finished for index {} file {}, length {}", index, file, compressedData.length);
+
+ pr.getFuture().complete(result);
+ }
+}
diff --git a/cache-client/src/main/java/net/runelite/cache/client/CacheClientHandler.java b/cache-client/src/main/java/net/runelite/cache/client/CacheClientHandler.java
new file mode 100644
index 0000000000..9afe8f976b
--- /dev/null
+++ b/cache-client/src/main/java/net/runelite/cache/client/CacheClientHandler.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2016-2017, Adam
+ * 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.client;
+
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelInboundHandlerAdapter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class CacheClientHandler extends ChannelInboundHandlerAdapter
+{
+ private static final Logger logger = LoggerFactory.getLogger(CacheClientHandler.class);
+
+ @Override
+ public void channelInactive(ChannelHandlerContext ctx) throws Exception
+ {
+ logger.warn("Channel has gone inactive");
+ }
+
+ @Override
+ public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause)
+ {
+ // Close the connection when an exception is raised.
+ logger.warn(null, cause);
+ ctx.close();
+ }
+}
diff --git a/deobfuscator/src/main/java/net/runelite/asm/execution/FrameVisitor.java b/cache-client/src/main/java/net/runelite/cache/client/ClientState.java
similarity index 93%
rename from deobfuscator/src/main/java/net/runelite/asm/execution/FrameVisitor.java
rename to cache-client/src/main/java/net/runelite/cache/client/ClientState.java
index e5d59cfba1..5c859aa61c 100644
--- a/deobfuscator/src/main/java/net/runelite/asm/execution/FrameVisitor.java
+++ b/cache-client/src/main/java/net/runelite/cache/client/ClientState.java
@@ -22,10 +22,10 @@
* (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.client;
-package net.runelite.asm.execution;
-
-public interface FrameVisitor
+public enum ClientState
{
- void visit(Frame f);
+ HANDSHAKING,
+ CONNECTED
}
diff --git a/cache-client/src/main/java/net/runelite/cache/client/DownloadWatcher.java b/cache-client/src/main/java/net/runelite/cache/client/DownloadWatcher.java
new file mode 100644
index 0000000000..3924c74541
--- /dev/null
+++ b/cache-client/src/main/java/net/runelite/cache/client/DownloadWatcher.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2016-2017, Adam
+ * 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.client;
+
+import net.runelite.cache.fs.Archive;
+
+@FunctionalInterface
+public interface DownloadWatcher
+{
+ void downloadComplete(Archive archive, byte[] data);
+}
diff --git a/deobfuscator/src/main/java/net/runelite/asm/attributes/annotation/Annotation.java b/cache-client/src/main/java/net/runelite/cache/client/FileResult.java
similarity index 57%
rename from deobfuscator/src/main/java/net/runelite/asm/attributes/annotation/Annotation.java
rename to cache-client/src/main/java/net/runelite/cache/client/FileResult.java
index 7c727eb788..2c5046af62 100644
--- a/deobfuscator/src/main/java/net/runelite/asm/attributes/annotation/Annotation.java
+++ b/cache-client/src/main/java/net/runelite/cache/client/FileResult.java
@@ -22,61 +22,71 @@
* (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.client;
-package net.runelite.asm.attributes.annotation;
+import java.io.IOException;
+import net.runelite.cache.fs.Container;
-import java.util.ArrayList;
-import java.util.List;
-
-import net.runelite.asm.Type;
-import net.runelite.asm.attributes.Annotations;
-import org.objectweb.asm.AnnotationVisitor;
-
-public class Annotation
+public class FileResult
{
- private final Annotations annotations;
- private Type type;
- private final List elements = new ArrayList<>();
+ private final int index;
+ private final int fileId;
+ private final byte[] compressedData;
- public Annotation(Annotations annotations)
+ private byte[] contents;
+ private int revision;
+ private int crc;
+ private int compression; // compression method used by archive data
+
+ public FileResult(int index, int fileId, byte[] compressedData)
{
- this.annotations = annotations;
+ this.index = index;
+ this.fileId = fileId;
+ this.compressedData = compressedData;
}
- public Annotations getAnnotations()
+ public int getIndex()
{
- return annotations;
+ return index;
}
- public void setType(Type type)
+ public int getFileId()
{
- this.type = type;
+ return fileId;
}
- public Type getType()
+ public byte[] getCompressedData()
{
- return type;
+ return compressedData;
}
- public List getElements()
+ public void decompress(int[] keys) throws IOException
{
- return elements;
+ Container res = Container.decompress(compressedData, keys);
+
+ contents = res.data;
+ revision = res.revision;
+ crc = res.crc;
+ compression = res.compression;
}
-
- public Element getElement()
+
+ public byte[] getContents()
{
- return elements.get(0);
+ return contents;
}
-
- public void addElement(Element element)
+
+ public int getRevision()
{
- elements.add(element);
+ return revision;
}
-
- public void accept(AnnotationVisitor visitor)
+
+ public int getCrc()
{
- for (Element element : elements)
- visitor.visit(element.getName(), element.getValue());
- visitor.visitEnd();
+ return crc;
+ }
+
+ public int getCompression()
+ {
+ return compression;
}
}
diff --git a/cache-client/src/main/java/net/runelite/cache/client/HandshakeResponseHandler.java b/cache-client/src/main/java/net/runelite/cache/client/HandshakeResponseHandler.java
new file mode 100644
index 0000000000..bcbb01bafb
--- /dev/null
+++ b/cache-client/src/main/java/net/runelite/cache/client/HandshakeResponseHandler.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 2016-2017, Adam
+ * 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.client;
+
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.SimpleChannelInboundHandler;
+import java.util.concurrent.CompletableFuture;
+import net.runelite.protocol.update.decoders.ArchiveResponseDecoder;
+import net.runelite.protocol.api.update.EncryptionPacket;
+import net.runelite.protocol.api.handshake.HandshakeResponsePacket;
+import net.runelite.protocol.api.login.HandshakeResponseType;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class HandshakeResponseHandler extends SimpleChannelInboundHandler
+{
+ private static final Logger logger = LoggerFactory.getLogger(HandshakeResponseHandler.class);
+
+ private final CacheClient client;
+
+ public HandshakeResponseHandler(CacheClient client)
+ {
+ this.client = client;
+ }
+
+ @Override
+ protected void channelRead0(ChannelHandlerContext ctx, HandshakeResponsePacket handshakeResponse) throws Exception
+ {
+ Channel channel = ctx.channel();
+ ChannelPipeline p = ctx.pipeline();
+ CompletableFuture handshakeFuture = client.getHandshakeFuture();
+
+ assert handshakeFuture != null;
+
+ if (handshakeResponse.getResponse() != HandshakeResponseType.RESPONSE_OK)
+ {
+ logger.warn("Non-ok response from server {}", handshakeResponse.getResponse());
+ handshakeFuture.complete(handshakeResponse.getResponse());
+ ctx.close();
+ return;
+ }
+
+ // Send encryption packet
+ EncryptionPacket encryptionPacket = new EncryptionPacket();
+ encryptionPacket.setKey((byte) 0);
+ channel.writeAndFlush(encryptionPacket);
+
+ client.setState(ClientState.CONNECTED);
+
+ logger.info("Client is now connected!");
+
+ p.replace("decoder", "decoder", new ArchiveResponseDecoder());
+
+ handshakeFuture.complete(handshakeResponse.getResponse());
+ }
+
+}
diff --git a/deobfuscator/src/main/java/net/runelite/asm/pool/Method.java b/cache-client/src/main/java/net/runelite/cache/client/IndexInfo.java
similarity index 68%
rename from deobfuscator/src/main/java/net/runelite/asm/pool/Method.java
rename to cache-client/src/main/java/net/runelite/cache/client/IndexInfo.java
index 510868d191..b6f088e84b 100644
--- a/deobfuscator/src/main/java/net/runelite/asm/pool/Method.java
+++ b/cache-client/src/main/java/net/runelite/cache/client/IndexInfo.java
@@ -22,37 +22,34 @@
* (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.asm.pool;
+package net.runelite.cache.client;
-import java.util.Objects;
-import net.runelite.asm.signature.Signature;
-
-public class Method
+public class IndexInfo
{
- private final Class clazz;
- private final String name;
- private final Signature type;
+ private final int id;
+ private final int crc;
+ private final int revision;
- public Method(Class clazz, String name, Signature type)
+ public IndexInfo(int id, int crc, int revision)
{
- this.clazz = clazz;
- this.name = name;
- this.type = type;
+ this.id = id;
+ this.crc = crc;
+ this.revision = revision;
}
@Override
public String toString()
{
- return clazz + "." + name + type;
+ return "IndexInfo{" + "id=" + id + ", crc=" + crc + ", revision=" + revision + '}';
}
@Override
public int hashCode()
{
- int hash = 7;
- hash = 59 * hash + Objects.hashCode(this.clazz);
- hash = 59 * hash + Objects.hashCode(this.name);
- hash = 59 * hash + Objects.hashCode(this.type);
+ int hash = 5;
+ hash = 71 * hash + this.id;
+ hash = 71 * hash + this.crc;
+ hash = 71 * hash + this.revision;
return hash;
}
@@ -71,34 +68,34 @@ public class Method
{
return false;
}
- final Method other = (Method) obj;
- if (!Objects.equals(this.name, other.name))
+ final IndexInfo other = (IndexInfo) obj;
+ if (this.id != other.id)
{
return false;
}
- if (!Objects.equals(this.clazz, other.clazz))
+ if (this.crc != other.crc)
{
return false;
}
- if (!Objects.equals(this.type, other.type))
+ if (this.revision != other.revision)
{
return false;
}
return true;
}
- public Class getClazz()
+ public int getId()
{
- return clazz;
+ return id;
}
- public String getName()
+ public int getCrc()
{
- return name;
+ return crc;
}
- public Signature getType()
+ public int getRevision()
{
- return type;
+ return revision;
}
}
diff --git a/deobfuscator/src/main/java/net/runelite/deob/clientver/VersionMethodVisitor.java b/cache-client/src/main/java/net/runelite/cache/client/PendingFileRequest.java
similarity index 72%
rename from deobfuscator/src/main/java/net/runelite/deob/clientver/VersionMethodVisitor.java
rename to cache-client/src/main/java/net/runelite/cache/client/PendingFileRequest.java
index a8f5c4dec6..d07dc4f606 100644
--- a/deobfuscator/src/main/java/net/runelite/deob/clientver/VersionMethodVisitor.java
+++ b/cache-client/src/main/java/net/runelite/cache/client/PendingFileRequest.java
@@ -22,39 +22,35 @@
* (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.client;
-package net.runelite.deob.clientver;
+import java.util.concurrent.CompletableFuture;
-import org.objectweb.asm.MethodVisitor;
-import org.objectweb.asm.Opcodes;
-
-public class VersionMethodVisitor extends MethodVisitor
+public class PendingFileRequest
{
- private int state = 0;
- private int version = -1;
+ private final int index;
+ private final int archive;
+ private final CompletableFuture future;
- VersionMethodVisitor()
+ public PendingFileRequest(int index, int archive, CompletableFuture future)
{
- super(Opcodes.ASM5);
+ this.index = index;
+ this.archive = archive;
+ this.future = future;
}
- @Override
- public void visitIntInsn(int opcode, int operand)
+ public int getIndex()
{
- if (state == 2)
- {
- version = operand;
- ++state;
- }
-
- if (operand == 765 || operand == 503)
- {
- ++state;
- }
+ return index;
}
- public int getVersion()
+ public int getArchive()
{
- return version;
+ return archive;
+ }
+
+ public CompletableFuture getFuture()
+ {
+ return future;
}
}
diff --git a/cache-client/src/test/java/net/runelite/cache/client/CacheClientTest.java b/cache-client/src/test/java/net/runelite/cache/client/CacheClientTest.java
new file mode 100644
index 0000000000..f5ba5d6824
--- /dev/null
+++ b/cache-client/src/test/java/net/runelite/cache/client/CacheClientTest.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 2016-2017, Adam
+ * 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.client;
+
+import java.io.File;
+import java.util.concurrent.CompletableFuture;
+import net.runelite.cache.CacheProperties;
+import net.runelite.cache.fs.Store;
+import net.runelite.protocol.api.login.HandshakeResponseType;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.slf4j.impl.SimpleLogger;
+
+public class CacheClientTest
+{
+ private static final Logger logger = LoggerFactory.getLogger(CacheClientTest.class);
+
+ @Before
+ public void before()
+ {
+ System.setProperty(SimpleLogger.DEFAULT_LOG_LEVEL_KEY, "TRACE");
+ }
+
+ @Test
+ @Ignore
+ public void test() throws Exception
+ {
+ try (Store store = new Store(new File("D:\\rs\\07\\temp\\cache")))
+ {
+ store.load();
+
+ CacheClient c = new CacheClient(store, CacheProperties.getRsVersion());
+ c.connect();
+ CompletableFuture handshake = c.handshake();
+
+ HandshakeResponseType result = handshake.get();
+ logger.info("Handshake result: {}", result);
+
+ Assert.assertEquals(HandshakeResponseType.RESPONSE_OK, result);
+
+ c.download();
+
+ c.close();
+
+ store.save();
+ }
+ }
+}
diff --git a/cache-updater/pom.xml b/cache-updater/pom.xml
new file mode 100644
index 0000000000..eec033bd29
--- /dev/null
+++ b/cache-updater/pom.xml
@@ -0,0 +1,104 @@
+
+
+
+ 4.0.0
+
+ net.runelite
+ runelite-parent
+ 1.5.27-SNAPSHOT
+
+
+ Cache Updater
+ cache-updater
+
+
+ 1.5.6.RELEASE
+ 5.1.45
+
+
+
+
+ org.springframework.boot
+ spring-boot-starter
+ ${spring.boot.version}
+
+
+ org.springframework.boot
+ spring-boot-starter-jdbc
+ ${spring.boot.version}
+
+
+ org.springframework.boot
+ spring-boot-devtools
+ ${spring.boot.version}
+ true
+
+
+ mysql
+ mysql-connector-java
+ ${mysql.connector.version}
+
+
+ net.runelite
+ cache-client
+ ${project.version}
+
+
+ org.sql2o
+ sql2o
+
+
+ io.minio
+ minio
+
+
+ org.projectlombok
+ lombok
+ provided
+
+
+
+
+
+
+ org.springframework.boot
+ spring-boot-maven-plugin
+ ${spring.boot.version}
+
+
+
+ repackage
+
+
+ spring-boot
+ net.runelite.cache.updater.CacheUpdater
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/cache-updater/schema.sql b/cache-updater/schema.sql
new file mode 100644
index 0000000000..a4e063e1a6
--- /dev/null
+++ b/cache-updater/schema.sql
@@ -0,0 +1,118 @@
+-- MySQL dump 10.16 Distrib 10.2.9-MariaDB, for Linux (x86_64)
+--
+-- Host: localhost Database: cache
+-- ------------------------------------------------------
+-- Server version 10.2.9-MariaDB
+
+/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
+/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
+/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
+/*!40101 SET NAMES utf8 */;
+/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
+/*!40103 SET TIME_ZONE='+00:00' */;
+/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
+/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
+/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
+/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
+
+--
+-- Table structure for table `archive`
+--
+
+DROP TABLE IF EXISTS `archive`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `archive` (
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `archiveId` int(11) NOT NULL,
+ `nameHash` int(11) NOT NULL,
+ `crc` int(11) NOT NULL,
+ `revision` int(11) NOT NULL,
+ `hash` binary(32) NOT NULL,
+ PRIMARY KEY (`id`),
+ KEY `archive_revision` (`archiveId`,`revision`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `cache`
+--
+
+DROP TABLE IF EXISTS `cache`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `cache` (
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `revision` int(11) NOT NULL,
+ `date` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `revision_date` (`revision`,`date`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `file`
+--
+
+DROP TABLE IF EXISTS `file`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `file` (
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `archive` int(11) NOT NULL,
+ `fileId` int(11) NOT NULL,
+ `nameHash` int(11) NOT NULL,
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `archive_file` (`archive`,`fileId`),
+ CONSTRAINT `file_ibfk_1` FOREIGN KEY (`archive`) REFERENCES `archive` (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `index`
+--
+
+DROP TABLE IF EXISTS `index`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `index` (
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `cache` int(11) NOT NULL,
+ `indexId` int(11) NOT NULL,
+ `crc` int(11) NOT NULL,
+ `revision` int(11) NOT NULL,
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `indexId` (`cache`,`indexId`,`revision`,`crc`) USING BTREE,
+ CONSTRAINT `index_ibfk_1` FOREIGN KEY (`cache`) REFERENCES `cache` (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `index_archive`
+--
+
+DROP TABLE IF EXISTS `index_archive`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `index_archive` (
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `index` int(11) NOT NULL,
+ `archive` int(11) NOT NULL,
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `idx_index_archive` (`index`,`archive`) USING BTREE,
+ KEY `archive` (`archive`) USING BTREE,
+ CONSTRAINT `index_archive_ibfk_1` FOREIGN KEY (`index`) REFERENCES `index` (`id`),
+ CONSTRAINT `index_archive_ibfk_2` FOREIGN KEY (`archive`) REFERENCES `archive` (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
+
+/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
+/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
+/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
+/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
+/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
+/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
+/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
+
+-- Dump completed on 2018-02-02 21:55:48
diff --git a/cache-updater/src/main/java/net/runelite/cache/updater/CacheConfiguration.java b/cache-updater/src/main/java/net/runelite/cache/updater/CacheConfiguration.java
new file mode 100644
index 0000000000..229ea1d268
--- /dev/null
+++ b/cache-updater/src/main/java/net/runelite/cache/updater/CacheConfiguration.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) 2018, Adam
+ * 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.updater;
+
+import io.minio.MinioClient;
+import io.minio.errors.InvalidEndpointException;
+import io.minio.errors.InvalidPortException;
+import java.time.Instant;
+import java.util.HashMap;
+import java.util.Map;
+import javax.sql.DataSource;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceBuilder;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.sql2o.Sql2o;
+import org.sql2o.converters.Converter;
+import org.sql2o.quirks.NoQuirks;
+
+@Configuration
+public class CacheConfiguration
+{
+ @Value("${minio.endpoint}")
+ private String minioUrl;
+
+ @Value("${minio.accesskey}")
+ private String minioAccessKey;
+
+ @Value("${minio.secretkey}")
+ private String minioSecretKey;
+
+ @Bean
+ @ConfigurationProperties(prefix = "datasource.runelite-cache")
+ public DataSource dataSource()
+ {
+ return DataSourceBuilder.create().build();
+ }
+
+ @Bean
+ @Qualifier("Runelite Cache SQL2O")
+ public Sql2o sql2o(DataSource dataSource)
+ {
+ Map converters = new HashMap<>();
+ converters.put(Instant.class, new InstantConverter());
+ return new Sql2o(dataSource, new NoQuirks(converters));
+ }
+
+ @Bean
+ public MinioClient minioClient() throws InvalidEndpointException, InvalidPortException
+ {
+ return new MinioClient(minioUrl, minioAccessKey, minioSecretKey);
+ }
+}
diff --git a/cache-updater/src/main/java/net/runelite/cache/updater/CacheDAO.java b/cache-updater/src/main/java/net/runelite/cache/updater/CacheDAO.java
new file mode 100644
index 0000000000..2834e5bb1e
--- /dev/null
+++ b/cache-updater/src/main/java/net/runelite/cache/updater/CacheDAO.java
@@ -0,0 +1,177 @@
+/*
+ * Copyright (c) 2017, Adam
+ * 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.updater;
+
+import java.time.Instant;
+import java.util.List;
+import net.runelite.cache.updater.beans.ArchiveEntry;
+import net.runelite.cache.updater.beans.CacheEntry;
+import net.runelite.cache.updater.beans.IndexEntry;
+import org.sql2o.Connection;
+import org.sql2o.Query;
+import org.sql2o.ResultSetIterable;
+
+class CacheDAO
+{
+ // cache prepared statements for high volume queries
+ private Query associateArchive;
+ private Query findArchive, insertArchive;
+ private Query associateFile;
+
+ public CacheEntry findMostRecent(Connection con)
+ {
+ return con.createQuery("select id, revision, date from cache order by revision desc, date desc limit 1")
+ .executeAndFetchFirst(CacheEntry.class);
+ }
+
+ public List findIndexesForCache(Connection con, CacheEntry cache)
+ {
+ return con.createQuery("select id, indexId, crc, revision from `index` where cache = :cache")
+ .addParameter("cache", cache.getId())
+ .executeAndFetch(IndexEntry.class);
+ }
+
+ public ResultSetIterable findArchivesForIndex(Connection con, IndexEntry indexEntry)
+ {
+ return con.createQuery("select archive.id, archive.archiveId, archive.nameHash,"
+ + " archive.crc, archive.revision, archive.hash from index_archive "
+ + "join archive on index_archive.archive = archive.id "
+ + "where index_archive.index = :id")
+ .addParameter("id", indexEntry.getId())
+ .executeAndFetchLazy(ArchiveEntry.class);
+ }
+
+ public CacheEntry createCache(Connection con, int revision, Instant date)
+ {
+ int cacheId = con.createQuery("insert into cache (revision, date) values (:revision, :date)")
+ .addParameter("revision", revision)
+ .addParameter("date", date)
+ .executeUpdate()
+ .getKey(int.class);
+
+ CacheEntry entry = new CacheEntry();
+ entry.setId(cacheId);
+ entry.setRevision(revision);
+ entry.setDate(date);
+ return entry;
+ }
+
+ public IndexEntry createIndex(Connection con, CacheEntry cache, int indexId, int crc, int revision)
+ {
+ int id = con.createQuery("insert into `index` (cache, indexId, crc, revision) values (:cache, :indexId, :crc, :revision)")
+ .addParameter("cache", cache.getId())
+ .addParameter("indexId", indexId)
+ .addParameter("crc", crc)
+ .addParameter("revision", revision)
+ .executeUpdate()
+ .getKey(int.class);
+
+ IndexEntry entry = new IndexEntry();
+ entry.setId(id);
+ entry.setIndexId(indexId);
+ entry.setCrc(crc);
+ entry.setRevision(revision);
+ return entry;
+ }
+
+ public void associateArchiveToIndex(Connection con, ArchiveEntry archive, IndexEntry index)
+ {
+ if (associateArchive == null)
+ {
+ associateArchive = con.createQuery("insert into index_archive (`index`, archive) values (:index, :archive)");
+ }
+ associateArchive
+ .addParameter("index", index.getId())
+ .addParameter("archive", archive.getId())
+ .executeUpdate();
+ }
+
+ public ArchiveEntry findArchive(Connection con, IndexEntry index,
+ int archiveId, int nameHash, int crc, int revision)
+ {
+ if (findArchive == null)
+ {
+ findArchive = con.createQuery("select distinct archive.id, archive.archiveId, archive.nameHash,"
+ + " archive.crc, archive.revision, archive.hash from archive "
+ + " join index_archive on index_archive.archive = archive.id"
+ + " join `index` on index.id = index_archive.index"
+ + " where archive.archiveId = :archiveId"
+ + " and archive.nameHash = :nameHash"
+ + " and archive.crc = :crc"
+ + " and archive.revision = :revision"
+ + " and index.indexId = :indexId");
+ }
+
+ ArchiveEntry entry = findArchive
+ .addParameter("archiveId", archiveId)
+ .addParameter("nameHash", nameHash)
+ .addParameter("crc", crc)
+ .addParameter("revision", revision)
+ .addParameter("indexId", index.getIndexId())
+ .executeAndFetchFirst(ArchiveEntry.class);
+ return entry;
+ }
+
+ public ArchiveEntry createArchive(Connection con, IndexEntry index,
+ int archiveId, int nameHash, int crc, int revision, byte[] hash)
+ {
+ if (insertArchive == null)
+ {
+ insertArchive = con.createQuery("insert into archive (archiveId, nameHash, crc, revision, hash) values "
+ + "(:archiveId, :nameHash, :crc, :revision, :hash)");
+ }
+
+ int id = insertArchive
+ .addParameter("archiveId", archiveId)
+ .addParameter("nameHash", nameHash)
+ .addParameter("crc", crc)
+ .addParameter("revision", revision)
+ .addParameter("hash", hash)
+ .executeUpdate()
+ .getKey(int.class);
+
+ ArchiveEntry entry = new ArchiveEntry();
+ entry.setId(id);
+ entry.setArchiveId(archiveId);
+ entry.setNameHash(nameHash);
+ entry.setCrc(crc);
+ entry.setRevision(revision);
+ entry.setHash(hash);
+ return entry;
+ }
+
+ public void associateFileToArchive(Connection con, ArchiveEntry archive, int fileId, int nameHash)
+ {
+ if (associateFile == null)
+ {
+ associateFile = con.createQuery("insert into file (archive, fileId, nameHash) values (:archive, :fileId, :nameHash)");
+ }
+ associateFile
+ .addParameter("archive", archive.getId())
+ .addParameter("fileId", fileId)
+ .addParameter("nameHash", nameHash)
+ .executeUpdate();
+ }
+}
diff --git a/cache-updater/src/main/java/net/runelite/cache/updater/CacheStorage.java b/cache-updater/src/main/java/net/runelite/cache/updater/CacheStorage.java
new file mode 100644
index 0000000000..cac605da09
--- /dev/null
+++ b/cache-updater/src/main/java/net/runelite/cache/updater/CacheStorage.java
@@ -0,0 +1,144 @@
+/*
+ * Copyright (c) 2017, Adam
+ * 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.updater;
+
+import java.io.IOException;
+import java.util.List;
+import net.runelite.cache.fs.Archive;
+import net.runelite.cache.fs.Index;
+import net.runelite.cache.fs.Storage;
+import net.runelite.cache.fs.Store;
+import net.runelite.cache.index.FileData;
+import net.runelite.cache.updater.beans.ArchiveEntry;
+import net.runelite.cache.updater.beans.CacheEntry;
+import net.runelite.cache.updater.beans.IndexEntry;
+import org.sql2o.Connection;
+import org.sql2o.ResultSetIterable;
+
+public class CacheStorage implements Storage
+{
+ private CacheEntry cacheEntry;
+ private final CacheDAO cacheDao;
+ private final Connection con;
+
+ public CacheStorage(CacheEntry cacheEntry, CacheDAO cacheDao, Connection con)
+ {
+ this.cacheEntry = cacheEntry;
+ this.cacheDao = cacheDao;
+ this.con = con;
+ }
+
+ public CacheEntry getCacheEntry()
+ {
+ return cacheEntry;
+ }
+
+ public void setCacheEntry(CacheEntry cacheEntry)
+ {
+ this.cacheEntry = cacheEntry;
+ }
+
+ @Override
+ public void init(Store store) throws IOException
+ {
+ }
+
+ @Override
+ public void close() throws IOException
+ {
+ }
+
+ @Override
+ public void load(Store store) throws IOException
+ {
+ List indexes = cacheDao.findIndexesForCache(con, cacheEntry);
+ for (IndexEntry indexEntry : indexes)
+ {
+ Index index = store.addIndex(indexEntry.getIndexId());
+ index.setCrc(indexEntry.getCrc());
+ index.setRevision(indexEntry.getRevision());
+
+ try (ResultSetIterable archives = cacheDao.findArchivesForIndex(con, indexEntry))
+ {
+ for (ArchiveEntry archiveEntry : archives)
+ {
+ if (index.getArchive(archiveEntry.getArchiveId()) != null)
+ {
+ throw new IOException("Duplicate archive " + archiveEntry + " on " + indexEntry);
+ }
+
+ Archive archive = index.addArchive(archiveEntry.getArchiveId());
+ archive.setNameHash(archiveEntry.getNameHash());
+ archive.setCrc(archiveEntry.getCrc());
+ archive.setRevision(archiveEntry.getRevision());
+ archive.setHash(archiveEntry.getHash());
+
+ // File data is not necessary for cache updating
+ }
+ }
+ }
+ }
+
+ @Override
+ public void save(Store store) throws IOException
+ {
+ for (Index index : store.getIndexes())
+ {
+ IndexEntry entry = cacheDao.createIndex(con, cacheEntry, index.getId(), index.getCrc(), index.getRevision());
+
+ for (Archive archive : index.getArchives())
+ {
+ ArchiveEntry archiveEntry = cacheDao.findArchive(con, entry, archive.getArchiveId(),
+ archive.getNameHash(), archive.getCrc(), archive.getRevision());
+ if (archiveEntry == null)
+ {
+ byte[] hash = archive.getHash();
+ archiveEntry = cacheDao.createArchive(con, entry, archive.getArchiveId(),
+ archive.getNameHash(), archive.getCrc(), archive.getRevision(), hash);
+
+ for (FileData file : archive.getFileData())
+ {
+ cacheDao.associateFileToArchive(con, archiveEntry, file.getId(), file.getNameHash());
+ }
+ }
+
+ cacheDao.associateArchiveToIndex(con, archiveEntry, entry);
+ }
+ }
+ }
+
+ @Override
+ public byte[] loadArchive(Archive archive) throws IOException
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public void saveArchive(Archive archive, byte[] data) throws IOException
+ {
+ throw new UnsupportedOperationException();
+ }
+
+}
diff --git a/cache-updater/src/main/java/net/runelite/cache/updater/CacheUpdater.java b/cache-updater/src/main/java/net/runelite/cache/updater/CacheUpdater.java
new file mode 100644
index 0000000000..1a8f81c5ec
--- /dev/null
+++ b/cache-updater/src/main/java/net/runelite/cache/updater/CacheUpdater.java
@@ -0,0 +1,173 @@
+/*
+ * Copyright (c) 2017, Adam
+ * 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.updater;
+
+import io.minio.MinioClient;
+import io.minio.errors.InvalidEndpointException;
+import io.minio.errors.InvalidPortException;
+import java.io.IOException;
+import java.time.Instant;
+import java.util.List;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+import net.runelite.cache.client.CacheClient;
+import net.runelite.cache.client.IndexInfo;
+import net.runelite.cache.fs.Archive;
+import net.runelite.cache.fs.Store;
+import net.runelite.cache.updater.beans.CacheEntry;
+import net.runelite.cache.updater.beans.IndexEntry;
+import net.runelite.http.api.RuneLiteAPI;
+import net.runelite.protocol.api.login.HandshakeResponseType;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.sql2o.Connection;
+import org.sql2o.Sql2o;
+
+@SpringBootApplication
+public class CacheUpdater implements CommandLineRunner
+{
+ private static final Logger logger = LoggerFactory.getLogger(CacheUpdater.class);
+
+ private final Sql2o sql2o;
+ private final MinioClient minioClient;
+
+ @Value("${minio.bucket}")
+ private String minioBucket;
+
+ @Autowired
+ public CacheUpdater(
+ @Qualifier("Runelite Cache SQL2O") Sql2o sql2o,
+ MinioClient minioClient
+ )
+ {
+ this.sql2o = sql2o;
+ this.minioClient = minioClient;
+ }
+
+ public void update() throws IOException, InvalidEndpointException, InvalidPortException, InterruptedException
+ {
+ int rsVersion = RuneLiteAPI.getRsVersion();
+
+ try (Connection con = sql2o.beginTransaction())
+ {
+ CacheDAO cacheDao = new CacheDAO();
+ CacheEntry cache = cacheDao.findMostRecent(con);
+ boolean created = false;
+ if (cache == null)
+ {
+ created = true;
+ cache = cacheDao.createCache(con, rsVersion, Instant.now());
+ }
+
+ CacheStorage storage = new CacheStorage(cache, cacheDao, con);
+ Store store = new Store(storage);
+ store.load();
+
+ ExecutorService executor = Executors.newSingleThreadExecutor();
+
+ CacheClient client = new CacheClient(store, rsVersion,
+ (Archive archive, byte[] data) -> executor.submit(new CacheUploader(minioClient, minioBucket, archive, data)));
+
+ client.connect();
+ HandshakeResponseType result = client.handshake().join();
+
+ if (result != HandshakeResponseType.RESPONSE_OK)
+ {
+ logger.warn("Out of date!");
+ return;
+ }
+
+ List indexes = client.requestIndexes();
+ List entries = cacheDao.findIndexesForCache(con, cache);
+
+ if (!checkOutOfDate(indexes, entries))
+ {
+ logger.info("All up to date.");
+ return;
+ }
+
+ client.download();
+
+ CacheEntry newCache = created ? cache : cacheDao.createCache(con, rsVersion, Instant.now());
+
+ storage.setCacheEntry(newCache);
+ store.save();
+
+ // ensure objects are added to the store before they become
+ // visible in the database
+ executor.shutdown();
+ while (!executor.awaitTermination(1, TimeUnit.SECONDS))
+ {
+ logger.debug("Waiting for termination of executor...");
+ }
+
+ // commit database
+ con.commit();
+ }
+ }
+
+ private boolean checkOutOfDate(List indexes, List dbIndexes)
+ {
+ if (indexes.size() != dbIndexes.size())
+ {
+ return true;
+ }
+
+ for (int i = 0; i < indexes.size(); ++i)
+ {
+ IndexInfo ii = indexes.get(i);
+ IndexEntry ie = dbIndexes.get(i);
+
+ if (ii.getId() != ie.getIndexId()
+ || ii.getRevision() != ie.getRevision()
+ || ii.getCrc() != ie.getCrc())
+ {
+ return true;
+ }
+ }
+
+ return false;
+ }
+
+ @Override
+ public void run(String... args) throws Exception
+ {
+ update();
+ }
+
+ public static void main(String[] args)
+ {
+ SpringApplication.run(CacheUpdater.class, args).close();
+ System.exit(0);
+ }
+
+}
diff --git a/cache-updater/src/main/java/net/runelite/cache/updater/CacheUploader.java b/cache-updater/src/main/java/net/runelite/cache/updater/CacheUploader.java
new file mode 100644
index 0000000000..ed685a9034
--- /dev/null
+++ b/cache-updater/src/main/java/net/runelite/cache/updater/CacheUploader.java
@@ -0,0 +1,96 @@
+/*
+ * Copyright (c) 2017, Adam
+ * 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.updater;
+
+import com.google.common.hash.Hashing;
+import com.google.common.io.BaseEncoding;
+import io.minio.MinioClient;
+import io.minio.errors.ErrorResponseException;
+import io.minio.errors.InsufficientDataException;
+import io.minio.errors.InternalException;
+import io.minio.errors.InvalidArgumentException;
+import io.minio.errors.InvalidBucketNameException;
+import io.minio.errors.NoResponseException;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.security.InvalidKeyException;
+import java.security.NoSuchAlgorithmException;
+import net.runelite.cache.fs.Archive;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.xmlpull.v1.XmlPullParserException;
+
+public class CacheUploader implements Runnable
+{
+ private static final Logger logger = LoggerFactory.getLogger(CacheUploader.class);
+
+ private final MinioClient minioClient;
+ private final String minioBucket;
+ private final Archive archive;
+ private final byte[] data;
+
+ public CacheUploader(MinioClient minioClient, String minioBucket, Archive archive, byte[] data)
+ {
+ this.minioClient = minioClient;
+ this.minioBucket = minioBucket;
+ this.archive = archive;
+ this.data = data;
+ }
+
+ @Override
+ public void run()
+ {
+ byte[] hash = Hashing.sha256().hashBytes(data).asBytes();
+ String hashStr = BaseEncoding.base16().encode(hash);
+
+ archive.setHash(hash);
+
+ String path = new StringBuilder()
+ .append(hashStr, 0, 2)
+ .append('/')
+ .append(hashStr.substring(2))
+ .toString();
+
+ try
+ {
+ try (InputStream in = minioClient.getObject(minioBucket, path))
+ {
+ return; // already exists
+ }
+ catch (ErrorResponseException ex)
+ {
+ // doesn't exist
+ }
+
+ minioClient.putObject(minioBucket, path, new ByteArrayInputStream(data), data.length, "binary/octet-stream");
+ }
+ catch (ErrorResponseException | InsufficientDataException | InternalException | InvalidArgumentException | InvalidBucketNameException | NoResponseException | IOException | InvalidKeyException | NoSuchAlgorithmException | XmlPullParserException ex)
+ {
+ logger.warn("unable to upload data to store", ex);
+ }
+ }
+
+}
diff --git a/api/src/main/java/rs/api/RSProjectile.java b/cache-updater/src/main/java/net/runelite/cache/updater/InstantConverter.java
similarity index 55%
rename from api/src/main/java/rs/api/RSProjectile.java
rename to cache-updater/src/main/java/net/runelite/cache/updater/InstantConverter.java
index e2c8b16a53..953fe9bd3a 100644
--- a/api/src/main/java/rs/api/RSProjectile.java
+++ b/cache-updater/src/main/java/net/runelite/cache/updater/InstantConverter.java
@@ -1,7 +1,5 @@
/*
- * BSD 2-Clause License
- *
- * Copyright (c) 2019, ThatGamerBlue
+ * Copyright (c) 2017, Adam
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -25,82 +23,26 @@
* 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.updater;
-package rs.api;
+import java.sql.Timestamp;
+import java.time.Instant;
+import org.sql2o.converters.Converter;
+import org.sql2o.converters.ConverterException;
-import api.Projectile;
-import net.runelite.mapping.Import;
-
-public interface RSProjectile extends RSEntity, Projectile
+public class InstantConverter implements Converter
{
- @Import("id")
@Override
- int getId();
+ public Instant convert(Object val) throws ConverterException
+ {
+ Timestamp ts = (Timestamp) val;
+ return ts.toInstant();
+ }
- @Import("targetIndex")
- int getRsInteracting();
-
- @Import("sourceZ")
@Override
- int getHeight();
+ public Object toDatabaseParam(Instant val)
+ {
+ return Timestamp.from(val);
+ }
- @Import("endHeight")
- @Override
- int getEndHeight();
-
- @Import("sourceX")
- @Override
- int getX1();
-
- @Import("sourceY")
- @Override
- int getY1();
-
- @Import("plane")
- @Override
- int getFloor();
-
- @Import("cycleStart")
- @Override
- int getStartMovementCycle();
-
- @Import("cycleEnd")
- @Override
- int getEndCycle();
-
- @Import("slope")
- @Override
- int getSlope();
-
- @Import("startHeight")
- @Override
- int getStartHeight();
-
- @Import("x")
- @Override
- double getX();
-
- @Import("y")
- @Override
- double getY();
-
- @Import("z")
- @Override
- double getZ();
-
- @Import("speed")
- @Override
- double getScalar();
-
- @Import("speedX")
- @Override
- double getVelocityX();
-
- @Import("speedY")
- @Override
- double getVelocityY();
-
- @Import("speedZ")
- @Override
- double getVelocityZ();
}
diff --git a/cache-updater/src/main/java/net/runelite/cache/updater/beans/ArchiveEntry.java b/cache-updater/src/main/java/net/runelite/cache/updater/beans/ArchiveEntry.java
new file mode 100644
index 0000000000..9bacab75b8
--- /dev/null
+++ b/cache-updater/src/main/java/net/runelite/cache/updater/beans/ArchiveEntry.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2017, Adam
+ * 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.updater.beans;
+
+import lombok.Data;
+
+@Data
+public class ArchiveEntry
+{
+ private int id;
+ private int archiveId;
+ private int nameHash;
+ private int crc;
+ private int revision;
+ private byte[] hash;
+}
diff --git a/cache-updater/src/main/java/net/runelite/cache/updater/beans/CacheEntry.java b/cache-updater/src/main/java/net/runelite/cache/updater/beans/CacheEntry.java
new file mode 100644
index 0000000000..c9081cd883
--- /dev/null
+++ b/cache-updater/src/main/java/net/runelite/cache/updater/beans/CacheEntry.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2017, Adam
+ * 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.updater.beans;
+
+import java.time.Instant;
+import lombok.Data;
+
+@Data
+public class CacheEntry
+{
+ private int id;
+ private int revision;
+ private Instant date;
+}
diff --git a/cache-updater/src/main/java/net/runelite/cache/updater/beans/FileEntry.java b/cache-updater/src/main/java/net/runelite/cache/updater/beans/FileEntry.java
new file mode 100644
index 0000000000..bb43c2a189
--- /dev/null
+++ b/cache-updater/src/main/java/net/runelite/cache/updater/beans/FileEntry.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2017, Adam
+ * 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.updater.beans;
+
+import lombok.Data;
+
+@Data
+public class FileEntry
+{
+ private int id;
+ private int archiveId;
+ private int fileId;
+ private int nameHash;
+}
diff --git a/cache-updater/src/main/java/net/runelite/cache/updater/beans/IndexEntry.java b/cache-updater/src/main/java/net/runelite/cache/updater/beans/IndexEntry.java
new file mode 100644
index 0000000000..a5a0748f18
--- /dev/null
+++ b/cache-updater/src/main/java/net/runelite/cache/updater/beans/IndexEntry.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2017, Adam
+ * 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.updater.beans;
+
+import lombok.Data;
+
+@Data
+public class IndexEntry
+{
+ private int id;
+ private int indexId;
+ private int crc;
+ private int revision;
+}
diff --git a/cache-updater/src/main/resources/application.yaml b/cache-updater/src/main/resources/application.yaml
new file mode 100644
index 0000000000..df290d680f
--- /dev/null
+++ b/cache-updater/src/main/resources/application.yaml
@@ -0,0 +1,16 @@
+---
+# Database
+datasource:
+ runelite-cache:
+ driverClassName: com.mysql.jdbc.Driver
+ type: com.mysql.jdbc.jdbc2.optional.MysqlDataSource
+ url: jdbc:mysql://localhost/runelite-cache
+ username: runelite
+ password: runelite
+
+# Minio client storage for cache
+minio:
+ endpoint: http://localhost:9000
+ accesskey: AM54M27O4WZK65N6F8IP
+ secretkey: /PZCxzmsJzwCHYlogcymuprniGCaaLUOET2n6yMP
+ bucket: runelite
diff --git a/cache/pom.xml b/cache/pom.xml
new file mode 100644
index 0000000000..6fd5d36c0f
--- /dev/null
+++ b/cache/pom.xml
@@ -0,0 +1,168 @@
+
+
+
+ 4.0.0
+
+
+ net.runelite
+ runelite-parent
+ 1.5.27-SNAPSHOT
+
+
+ cache
+ Cache
+
+
+ 1.3.1
+ 1.10
+ 4.6
+
+ 165
+
+
+
+
+ net.runelite
+ http-api
+ ${project.version}
+
+
+
+ com.google.guava
+ guava
+
+
+ org.slf4j
+ slf4j-api
+
+
+ org.apache.commons
+ commons-compress
+ ${commons.compress.version}
+
+
+ com.google.code.gson
+ gson
+
+
+ io.netty
+ netty-buffer
+
+
+ org.antlr
+ antlr4-runtime
+ ${antlr4.version}
+
+
+ commons-cli
+ commons-cli
+ ${commons.cli.version}
+
+
+ org.projectlombok
+ lombok
+ provided
+
+
+
+ junit
+ junit
+
+
+ org.slf4j
+ slf4j-simple
+
+
+ net.runelite.rs
+ cache
+ ${cache.version}
+ test
+
+
+
+
+
+
+ src/test/resources
+ true
+
+
+
+
+ org.apache.maven.plugins
+ maven-surefire-plugin
+
+ true
+ -Xmx2048m
+
+ ${cache.tmpdir}
+
+
+
+
+ maven-assembly-plugin
+
+
+ jar-with-dependencies
+
+
+
+
+ make-assembly
+ package
+
+ single
+
+
+
+
+
+ org.antlr
+ antlr4-maven-plugin
+ ${antlr4.version}
+
+
+ process-resources
+
+ antlr4
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-jar-plugin
+
+
+
+ test-jar
+
+
+
+
+
+
+
diff --git a/cache/src/main/antlr4/net/runelite/cache/script/assembler/rs2asm.g4 b/cache/src/main/antlr4/net/runelite/cache/script/assembler/rs2asm.g4
new file mode 100644
index 0000000000..f8b33e8676
--- /dev/null
+++ b/cache/src/main/antlr4/net/runelite/cache/script/assembler/rs2asm.g4
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2017, Adam
+ * 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.
+ */
+grammar rs2asm;
+
+prog: NEWLINE* (header NEWLINE+)* (line NEWLINE+)+ ;
+
+header: id | int_stack_count | string_stack_count | int_var_count | string_var_count ;
+
+id: '.id ' id_value ;
+int_stack_count: '.int_stack_count ' int_stack_value ;
+string_stack_count: '.string_stack_count ' string_stack_value ;
+int_var_count: '.int_var_count ' int_var_value ;
+string_var_count: '.string_var_count ' string_var_value ;
+
+id_value: INT ;
+int_stack_value: INT ;
+string_stack_value: INT ;
+int_var_value: INT ;
+string_var_value: INT ;
+
+line: instruction | label | switch_lookup ;
+instruction: instruction_name instruction_operand ;
+label: IDENTIFIER ':' ;
+
+instruction_name: name_string | name_opcode ;
+name_string: IDENTIFIER ;
+name_opcode: INT ;
+
+instruction_operand: operand_int | operand_qstring | operand_label | ;
+operand_int: INT ;
+operand_qstring: QSTRING ;
+operand_label: IDENTIFIER ;
+
+switch_lookup: switch_key ':' switch_value ;
+switch_key: INT ;
+switch_value: IDENTIFIER ;
+
+NEWLINE: ( '\r' | '\n' )+ ;
+INT: '-'? [0-9]+ ;
+QSTRING: '"' (~('"' | '\\' | '\r' | '\n') | '\\' ('"' | '\\'))* '"' ;
+IDENTIFIER: [a-zA-Z0-9_]+ ;
+COMMENT: ';' ~( '\r' | '\n' )* -> channel(HIDDEN) ;
+
+WS: (' ' | '\t')+ -> channel(HIDDEN) ;
\ No newline at end of file
diff --git a/cache/src/main/java/net/runelite/cache/AreaManager.java b/cache/src/main/java/net/runelite/cache/AreaManager.java
new file mode 100644
index 0000000000..96967b84b6
--- /dev/null
+++ b/cache/src/main/java/net/runelite/cache/AreaManager.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) 2017, Adam
+ * 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;
+
+import java.io.IOException;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import net.runelite.cache.definitions.AreaDefinition;
+import net.runelite.cache.definitions.loaders.AreaLoader;
+import net.runelite.cache.fs.Archive;
+import net.runelite.cache.fs.ArchiveFiles;
+import net.runelite.cache.fs.FSFile;
+import net.runelite.cache.fs.Index;
+import net.runelite.cache.fs.Storage;
+import net.runelite.cache.fs.Store;
+
+public class AreaManager
+{
+ private final Store store;
+ private final Map areas = new HashMap<>();
+
+ public AreaManager(Store store)
+ {
+ this.store = store;
+ }
+
+ public void load() throws IOException
+ {
+ Storage storage = store.getStorage();
+ Index index = store.getIndex(IndexType.CONFIGS);
+ Archive archive = index.getArchive(ConfigType.AREA.getId());
+
+ byte[] archiveData = storage.loadArchive(archive);
+ ArchiveFiles files = archive.getFiles(archiveData);
+
+ for (FSFile file : files.getFiles())
+ {
+ AreaLoader loader = new AreaLoader();
+ AreaDefinition area = loader.load(file.getContents(), file.getFileId());
+ areas.put(area.id, area);
+ }
+ }
+
+ public Collection getAreas()
+ {
+ return Collections.unmodifiableCollection(areas.values());
+ }
+
+ public AreaDefinition getArea(int areaId)
+ {
+ return areas.get(areaId);
+ }
+}
diff --git a/cache/src/main/java/net/runelite/cache/Cache.java b/cache/src/main/java/net/runelite/cache/Cache.java
new file mode 100644
index 0000000000..0f2c2d36b1
--- /dev/null
+++ b/cache/src/main/java/net/runelite/cache/Cache.java
@@ -0,0 +1,161 @@
+/*
+ * Copyright (c) 2017, Adam
+ * 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;
+
+import java.io.File;
+import java.io.IOException;
+import net.runelite.cache.fs.Store;
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.CommandLineParser;
+import org.apache.commons.cli.DefaultParser;
+import org.apache.commons.cli.Options;
+import org.apache.commons.cli.ParseException;
+
+public class Cache
+{
+ public static void main(String[] args) throws IOException
+ {
+ Options options = new Options();
+
+ options.addOption("c", "cache", true, "cache base");
+
+ options.addOption(null, "items", true, "directory to dump items to");
+ options.addOption(null, "npcs", true, "directory to dump npcs to");
+ options.addOption(null, "objects", true, "directory to dump objects to");
+ options.addOption(null, "sprites", true, "directory to dump sprites to");
+
+ CommandLineParser parser = new DefaultParser();
+ CommandLine cmd;
+ try
+ {
+ cmd = parser.parse(options, args);
+ }
+ catch (ParseException ex)
+ {
+ System.err.println("Error parsing command line options: " + ex.getMessage());
+ System.exit(-1);
+ return;
+ }
+
+ String cache = cmd.getOptionValue("cache");
+
+ Store store = loadStore(cache);
+
+ if (cmd.hasOption("items"))
+ {
+ String itemdir = cmd.getOptionValue("items");
+
+ if (itemdir == null)
+ {
+ System.err.println("Item directory must be specified");
+ return;
+ }
+
+ System.out.println("Dumping items to " + itemdir);
+ dumpItems(store, new File(itemdir));
+ }
+ else if (cmd.hasOption("npcs"))
+ {
+ String npcdir = cmd.getOptionValue("npcs");
+
+ if (npcdir == null)
+ {
+ System.err.println("NPC directory must be specified");
+ return;
+ }
+
+ System.out.println("Dumping npcs to " + npcdir);
+ dumpNpcs(store, new File(npcdir));
+ }
+ else if (cmd.hasOption("objects"))
+ {
+ String objectdir = cmd.getOptionValue("objects");
+
+ if (objectdir == null)
+ {
+ System.err.println("Object directory must be specified");
+ return;
+ }
+
+ System.out.println("Dumping objects to " + objectdir);
+ dumpObjects(store, new File(objectdir));
+ }
+ else if (cmd.hasOption("sprites"))
+ {
+ String spritedir = cmd.getOptionValue("sprites");
+
+ if (spritedir == null)
+ {
+ System.err.println("Sprite directory must be specified");
+ return;
+ }
+
+ System.out.println("Dumping sprites to " + spritedir);
+ dumpSprites(store, new File(spritedir));
+ }
+ else
+ {
+ System.err.println("Nothing to do");
+ }
+ }
+
+ private static Store loadStore(String cache) throws IOException
+ {
+ Store store = new Store(new File(cache));
+ store.load();
+ return store;
+ }
+
+ private static void dumpItems(Store store, File itemdir) throws IOException
+ {
+ ItemManager dumper = new ItemManager(store);
+ dumper.load();
+ dumper.export(itemdir);
+ dumper.java(itemdir);
+ }
+
+ private static void dumpNpcs(Store store, File npcdir) throws IOException
+ {
+ NpcManager dumper = new NpcManager(store);
+ dumper.load();
+ dumper.dump(npcdir);
+ dumper.java(npcdir);
+ }
+
+ private static void dumpObjects(Store store, File objectdir) throws IOException
+ {
+ ObjectManager dumper = new ObjectManager(store);
+ dumper.load();
+ dumper.dump(objectdir);
+ dumper.java(objectdir);
+ }
+
+ private static void dumpSprites(Store store, File spritedir) throws IOException
+ {
+ SpriteManager dumper = new SpriteManager(store);
+ dumper.load();
+ dumper.export(spritedir);
+ }
+}
diff --git a/cache/src/main/java/net/runelite/cache/ConfigType.java b/cache/src/main/java/net/runelite/cache/ConfigType.java
new file mode 100644
index 0000000000..48d8e229c0
--- /dev/null
+++ b/cache/src/main/java/net/runelite/cache/ConfigType.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2016-2017, Adam
+ * 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;
+
+public enum ConfigType
+{
+ // types from https://github.com/im-frizzy/OpenRS/blob/master/source/net/openrs/cache/type/ConfigArchive.java
+ UNDERLAY(1),
+ IDENTKIT(3),
+ OVERLAY(4),
+ INV(5),
+ OBJECT(6),
+ ENUM(8),
+ NPC(9),
+ ITEM(10),
+ SEQUENCE(12),
+ SPOTANIM(13),
+ VARBIT(14),
+ VARCLIENT(19),
+ VARCLIENTSTRING(15),
+ VARPLAYER(16),
+ STRUCT(34),
+ AREA(35);
+
+ private final int id;
+
+ ConfigType(int id)
+ {
+ this.id = id;
+ }
+
+ public int getId()
+ {
+ return id;
+ }
+}
diff --git a/cache/src/main/java/net/runelite/cache/HeightMapDumper.java b/cache/src/main/java/net/runelite/cache/HeightMapDumper.java
new file mode 100644
index 0000000000..5db30815ff
--- /dev/null
+++ b/cache/src/main/java/net/runelite/cache/HeightMapDumper.java
@@ -0,0 +1,149 @@
+/*
+ * Copyright (c) 2016-2017, Adam
+ * 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;
+
+import java.awt.Color;
+import java.awt.image.BufferedImage;
+import java.io.IOException;
+import net.runelite.cache.fs.Store;
+import net.runelite.cache.region.Region;
+import net.runelite.cache.region.RegionLoader;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class HeightMapDumper
+{
+ private static final Logger logger = LoggerFactory.getLogger(HeightMapDumper.class);
+
+ private static final int MAP_SCALE = 1;
+ private static final float MAX_HEIGHT = 2048f;
+
+ private final Store store;
+ private RegionLoader regionLoader;
+
+ public HeightMapDumper(Store store)
+ {
+ this.store = store;
+ }
+
+ public void load() throws IOException
+ {
+ regionLoader = new RegionLoader(store);
+ regionLoader.loadRegions();
+ regionLoader.calculateBounds();
+ }
+
+ public BufferedImage drawHeightMap(int z)
+ {
+ int minX = regionLoader.getLowestX().getBaseX();
+ int minY = regionLoader.getLowestY().getBaseY();
+
+ int maxX = regionLoader.getHighestX().getBaseX() + Region.X;
+ int maxY = regionLoader.getHighestY().getBaseY() + Region.Y;
+
+ int dimX = maxX - minX;
+ int dimY = maxY - minY;
+
+ dimX *= MAP_SCALE;
+ dimY *= MAP_SCALE;
+
+ logger.info("Map image dimensions: {}px x {}px, {}px per map square ({} MB)", dimX, dimY, MAP_SCALE, (dimX * dimY / 1024 / 1024));
+
+ BufferedImage image = new BufferedImage(dimX, dimY, BufferedImage.TYPE_INT_RGB);
+ draw(image, z);
+ return image;
+ }
+
+ private void draw(BufferedImage image, int z)
+ {
+ int max = Integer.MIN_VALUE;
+ int min = Integer.MAX_VALUE;
+
+ for (Region region : regionLoader.getRegions())
+ {
+ int baseX = region.getBaseX();
+ int baseY = region.getBaseY();
+
+ // to pixel X
+ int drawBaseX = baseX - regionLoader.getLowestX().getBaseX();
+
+ // to pixel Y. top most y is 0, but the top most
+ // region has the greatest y, so invert
+ int drawBaseY = regionLoader.getHighestY().getBaseY() - baseY;
+
+ for (int x = 0; x < Region.X; ++x)
+ {
+ int drawX = drawBaseX + x;
+
+ for (int y = 0; y < Region.Y; ++y)
+ {
+ int drawY = drawBaseY + (Region.Y - 1 - y);
+
+ int height = region.getTileHeight(z, x, y);
+ if (height > max)
+ {
+ max = height;
+ }
+ if (height < min)
+ {
+ min = height;
+ }
+
+ int rgb = toColor(height);
+
+ drawMapSquare(image, drawX, drawY, rgb);
+ }
+ }
+ }
+ System.out.println("max " + max);
+ System.out.println("min " + min);
+ }
+
+ private int toColor(int height)
+ {
+ // height seems to be between -2040 and 0, inclusive
+ height = -height;
+ // Convert to between 0 and 1
+ float color = (float) height / MAX_HEIGHT;
+
+ assert color >= 0.0f && color <= 1.0f;
+
+ return new Color(color, color, color).getRGB();
+ }
+
+ private void drawMapSquare(BufferedImage image, int x, int y, int rgb)
+ {
+ x *= MAP_SCALE;
+ y *= MAP_SCALE;
+
+ for (int i = 0; i < MAP_SCALE; ++i)
+ {
+ for (int j = 0; j < MAP_SCALE; ++j)
+ {
+ image.setRGB(x + i, y + j, rgb);
+ }
+ }
+ }
+}
diff --git a/api/src/main/java/mapping/ObfuscatedName.java b/cache/src/main/java/net/runelite/cache/IndexType.java
similarity index 78%
rename from api/src/main/java/mapping/ObfuscatedName.java
rename to cache/src/main/java/net/runelite/cache/IndexType.java
index 10ccf9ecd4..813594bac5 100644
--- a/api/src/main/java/mapping/ObfuscatedName.java
+++ b/cache/src/main/java/net/runelite/cache/IndexType.java
@@ -22,19 +22,38 @@
* (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.mapping;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
+package net.runelite.cache;
-@Retention(RetentionPolicy.RUNTIME)
-@Target(
- {
- ElementType.FIELD, ElementType.METHOD, ElementType.TYPE
- })
-public @interface ObfuscatedName
+public enum IndexType
{
- String value();
-}
+ FRAMES(0),
+ FRAMEMAPS(1),
+ CONFIGS(2),
+ INTERFACES(3),
+ SOUNDEFFECTS(4),
+ MAPS(5),
+ TRACK1(6),
+ MODELS(7),
+ SPRITES(8),
+ TEXTURES(9),
+ BINARY(10),
+ TRACK2(11),
+ CLIENTSCRIPT(12),
+ FONTS(13),
+ VORBIS(14),
+ INSTRUMENTS(15),
+ WORLDMAP(16);
+
+ private int id;
+
+ IndexType(int id)
+ {
+ this.id = id;
+ }
+
+ public int getNumber()
+ {
+ return id;
+ }
+}
\ No newline at end of file
diff --git a/cache/src/main/java/net/runelite/cache/InterfaceManager.java b/cache/src/main/java/net/runelite/cache/InterfaceManager.java
new file mode 100644
index 0000000000..ccfcfedd3b
--- /dev/null
+++ b/cache/src/main/java/net/runelite/cache/InterfaceManager.java
@@ -0,0 +1,176 @@
+/*
+ * Copyright (c) 2017, Adam
+ * 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;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.PrintWriter;
+import net.runelite.cache.definitions.InterfaceDefinition;
+import net.runelite.cache.definitions.exporters.InterfaceExporter;
+import net.runelite.cache.definitions.loaders.InterfaceLoader;
+import net.runelite.cache.fs.Archive;
+import net.runelite.cache.fs.ArchiveFiles;
+import net.runelite.cache.fs.FSFile;
+import net.runelite.cache.fs.Index;
+import net.runelite.cache.fs.Storage;
+import net.runelite.cache.fs.Store;
+import net.runelite.cache.util.Namer;
+
+public class InterfaceManager
+{
+ private final Store store;
+ private InterfaceDefinition[][] interfaces;
+ private final Namer namer = new Namer();
+
+ public InterfaceManager(Store store)
+ {
+ this.store = store;
+ }
+
+ public void load() throws IOException
+ {
+ InterfaceLoader loader = new InterfaceLoader();
+
+ Storage storage = store.getStorage();
+ Index index = store.getIndex(IndexType.INTERFACES);
+
+ int max = index.getArchives().stream().mapToInt(a -> a.getArchiveId()).max().getAsInt();
+ interfaces = new InterfaceDefinition[max + 1][];
+
+ for (Archive archive : index.getArchives())
+ {
+ int archiveId = archive.getArchiveId();
+ byte[] archiveData = storage.loadArchive(archive);
+ ArchiveFiles files = archive.getFiles(archiveData);
+
+ InterfaceDefinition[] ifaces = interfaces[archiveId];
+ if (ifaces == null)
+ {
+ ifaces = interfaces[archiveId] = new InterfaceDefinition[archive.getFileData().length];
+ }
+
+ for (FSFile file : files.getFiles())
+ {
+ int fileId = file.getFileId();
+
+ int widgetId = (archiveId << 16) + fileId;
+
+ InterfaceDefinition iface = loader.load(widgetId, file.getContents());
+ ifaces[fileId] = iface;
+ }
+ }
+ }
+
+ public int getNumInterfaceGroups()
+ {
+ return interfaces.length;
+ }
+
+ public int getNumChildren(int groupId)
+ {
+ return interfaces[groupId].length;
+ }
+
+ public InterfaceDefinition[] getIntefaceGroup(int groupId)
+ {
+ return interfaces[groupId];
+ }
+
+ public InterfaceDefinition getInterface(int groupId, int childId)
+ {
+ return interfaces[groupId][childId];
+ }
+
+ public InterfaceDefinition[][] getInterfaces()
+ {
+ return interfaces;
+ }
+
+ public void export(File out) throws IOException
+ {
+ out.mkdirs();
+
+ for (InterfaceDefinition[] defs : interfaces)
+ {
+ if (defs == null)
+ {
+ continue;
+ }
+
+ for (InterfaceDefinition def : defs)
+ {
+ if (def == null)
+ {
+ continue;
+ }
+
+ InterfaceExporter exporter = new InterfaceExporter(def);
+
+ File folder = new File(out, "" + (def.id >>> 16));
+ folder.mkdirs();
+
+ File targ = new File(folder, (def.id & 0xffff) + ".json");
+ exporter.exportTo(targ);
+ }
+ }
+ }
+
+ public void java(File java) throws IOException
+ {
+ System.setProperty("line.separator", "\n");
+ java.mkdirs();
+ File targ = new File(java, "InterfaceID.java");
+ try (PrintWriter fw = new PrintWriter(targ))
+ {
+ fw.println("/* This file is automatically generated. Do not edit. */");
+ fw.println("package net.runelite.api;");
+ fw.println("");
+ fw.println("public final class InterfaceID {");
+ for (InterfaceDefinition[] defs : interfaces)
+ {
+ if (defs == null)
+ {
+ continue;
+ }
+ for (InterfaceDefinition def : defs)
+ {
+ if (def == null || def.name == null || def.name.equalsIgnoreCase("NULL"))
+ {
+ continue;
+ }
+
+ String name = namer.name(def.name, def.id);
+ if (name == null)
+ {
+ continue;
+ }
+
+ fw.println(" public static final int " + name + " = " + def.id + ";");
+ }
+ }
+ fw.println("}");
+ }
+ }
+}
diff --git a/deobfuscator/src/main/java/net/runelite/asm/ClassGroup.java b/cache/src/main/java/net/runelite/cache/InventoryManager.java
similarity index 52%
rename from deobfuscator/src/main/java/net/runelite/asm/ClassGroup.java
rename to cache/src/main/java/net/runelite/cache/InventoryManager.java
index 2c6ba531a5..772d48b1a9 100644
--- a/deobfuscator/src/main/java/net/runelite/asm/ClassGroup.java
+++ b/cache/src/main/java/net/runelite/cache/InventoryManager.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016-2017, Adam
+ * Copyright (c) 2017, Adam
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -22,89 +22,63 @@
* (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.asm;
+package net.runelite.cache;
+import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
-import net.runelite.asm.attributes.Code;
+import net.runelite.cache.definitions.InventoryDefinition;
+import net.runelite.cache.definitions.loaders.InventoryLoader;
+import net.runelite.cache.fs.Archive;
+import net.runelite.cache.fs.ArchiveFiles;
+import net.runelite.cache.fs.FSFile;
+import net.runelite.cache.fs.Index;
+import net.runelite.cache.fs.Storage;
+import net.runelite.cache.fs.Store;
-public class ClassGroup
+public class InventoryManager
{
- private final List classes = new ArrayList<>(); // to keep order
- private final Map classMap = new HashMap<>();
+ private final Store store;
+ private final List inventories = new ArrayList<>();
- public void addClass(ClassFile cf)
+ public InventoryManager(Store store)
{
- assert cf.getGroup() == this || cf.getGroup() == null;
- cf.setGroup(this);
-
- classes.add(cf);
- classMap.put(cf.getName(), cf);
+ this.store = store;
}
- public void removeClass(ClassFile cf)
+ public void load() throws IOException
{
- classes.remove(cf);
- classMap.remove(cf.getName());
- }
+ InventoryLoader loader = new InventoryLoader();
- public void renameClass(ClassFile cf, String newName)
- {
- assert classes.contains(cf);
- assert classMap.get(cf.getName()) == cf;
+ Storage storage = store.getStorage();
+ Index index = store.getIndex(IndexType.CONFIGS);
+ Archive archive = index.getArchive(ConfigType.INV.getId());
- classMap.remove(cf.getName());
- cf.setName(newName);
- classMap.put(cf.getName(), cf);
- }
+ byte[] archiveData = storage.loadArchive(archive);
+ ArchiveFiles files = archive.getFiles(archiveData);
- public List getClasses()
- {
- return Collections.unmodifiableList(classes);
- }
-
- public ClassFile findClass(String name)
- {
- return classMap.get(name);
- }
-
- public void initialize()
- {
- buildClassGraph();
- lookup();
- }
-
- public void buildClassGraph()
- {
- for (ClassFile c : classes)
+ for (FSFile file : files.getFiles())
{
- c.clearClassGraph();
- }
-
- for (ClassFile c : classes)
- {
- c.buildClassGraph();
+ InventoryDefinition inv = loader.load(file.getFileId(), file.getContents());
+ inventories.add(inv);
}
}
- public void lookup()
+ public List getInventories()
{
- for (ClassFile cf : this.getClasses())
+ return Collections.unmodifiableList(inventories);
+ }
+
+ public InventoryDefinition findInventory(int id)
+ {
+ for (InventoryDefinition def : inventories)
{
- for (Method m : cf.getMethods())
+ if (def.id == id)
{
- Code code = m.getCode();
-
- if (code == null)
- {
- continue;
- }
-
- code.getInstructions().lookup();
+ return def;
}
}
+ return null;
}
}
diff --git a/cache/src/main/java/net/runelite/cache/ItemManager.java b/cache/src/main/java/net/runelite/cache/ItemManager.java
new file mode 100644
index 0000000000..b3449a51a4
--- /dev/null
+++ b/cache/src/main/java/net/runelite/cache/ItemManager.java
@@ -0,0 +1,123 @@
+/*
+ * Copyright (c) 2016-2017, Adam
+ * 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;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import net.runelite.cache.definitions.ItemDefinition;
+import net.runelite.cache.definitions.exporters.ItemExporter;
+import net.runelite.cache.definitions.loaders.ItemLoader;
+import net.runelite.cache.definitions.providers.ItemProvider;
+import net.runelite.cache.fs.Archive;
+import net.runelite.cache.fs.ArchiveFiles;
+import net.runelite.cache.fs.FSFile;
+import net.runelite.cache.fs.Index;
+import net.runelite.cache.fs.Storage;
+import net.runelite.cache.fs.Store;
+import net.runelite.cache.util.IDClass;
+
+public class ItemManager implements ItemProvider
+{
+ private final Store store;
+ private final Map items = new HashMap<>();
+
+ public ItemManager(Store store)
+ {
+ this.store = store;
+ }
+
+ public void load() throws IOException
+ {
+ ItemLoader loader = new ItemLoader();
+
+ Storage storage = store.getStorage();
+ Index index = store.getIndex(IndexType.CONFIGS);
+ Archive archive = index.getArchive(ConfigType.ITEM.getId());
+
+ byte[] archiveData = storage.loadArchive(archive);
+ ArchiveFiles files = archive.getFiles(archiveData);
+
+ for (FSFile f : files.getFiles())
+ {
+ ItemDefinition def = loader.load(f.getFileId(), f.getContents());
+ items.put(f.getFileId(), def);
+ }
+ }
+
+ public Collection getItems()
+ {
+ return Collections.unmodifiableCollection(items.values());
+ }
+
+ public ItemDefinition getItem(int itemId)
+ {
+ return items.get(itemId);
+ }
+
+ public void export(File out) throws IOException
+ {
+ out.mkdirs();
+
+ for (ItemDefinition def : items.values())
+ {
+ ItemExporter exporter = new ItemExporter(def);
+
+ File targ = new File(out, def.id + ".json");
+ exporter.exportTo(targ);
+ }
+ }
+
+ public void java(File java) throws IOException
+ {
+ java.mkdirs();
+ try (IDClass ids = IDClass.create(java, "ItemID"))
+ {
+ try (IDClass nulls = IDClass.create(java, "NullItemID"))
+ {
+ for (ItemDefinition def : items.values())
+ {
+ if (def.name.equalsIgnoreCase("NULL"))
+ {
+ nulls.add(def.name, def.id);
+ }
+ else
+ {
+ ids.add(def.name, def.id);
+ }
+ }
+ }
+ }
+ }
+
+ @Override
+ public ItemDefinition provide(int itemId)
+ {
+ return getItem(itemId);
+ }
+}
diff --git a/cache/src/main/java/net/runelite/cache/MapImageDumper.java b/cache/src/main/java/net/runelite/cache/MapImageDumper.java
new file mode 100644
index 0000000000..5235d97fb6
--- /dev/null
+++ b/cache/src/main/java/net/runelite/cache/MapImageDumper.java
@@ -0,0 +1,987 @@
+/*
+ * Copyright (c) 2016-2017, Adam
+ * 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;
+
+import java.awt.Color;
+import java.awt.Graphics2D;
+import java.awt.Image;
+import java.awt.image.BufferedImage;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+import lombok.Getter;
+import lombok.Setter;
+import net.runelite.cache.definitions.AreaDefinition;
+import net.runelite.cache.definitions.ObjectDefinition;
+import net.runelite.cache.definitions.OverlayDefinition;
+import net.runelite.cache.definitions.SpriteDefinition;
+import net.runelite.cache.definitions.UnderlayDefinition;
+import net.runelite.cache.definitions.loaders.OverlayLoader;
+import net.runelite.cache.definitions.loaders.SpriteLoader;
+import net.runelite.cache.definitions.loaders.UnderlayLoader;
+import net.runelite.cache.fs.Archive;
+import net.runelite.cache.fs.ArchiveFiles;
+import net.runelite.cache.fs.FSFile;
+import net.runelite.cache.fs.Index;
+import net.runelite.cache.fs.Storage;
+import net.runelite.cache.fs.Store;
+import net.runelite.cache.item.ColorPalette;
+import net.runelite.cache.item.RSTextureProvider;
+import net.runelite.cache.region.Location;
+import net.runelite.cache.region.Region;
+import net.runelite.cache.region.RegionLoader;
+import net.runelite.cache.util.Djb2;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class MapImageDumper
+{
+ private static final Logger logger = LoggerFactory.getLogger(MapImageDumper.class);
+
+ private static final int MAP_SCALE = 4; // this squared is the number of pixels per map square
+ private static final int MAPICON_MAX_WIDTH = 5; // scale minimap icons down to this size so they fit..
+ private static final int MAPICON_MAX_HEIGHT = 6;
+ private static final int BLEND = 5; // number of surrounding tiles for ground blending
+
+ private static int[] colorPalette = new ColorPalette(0.9d, 0, 512).getColorPalette();
+
+ private static int[][] TILE_SHAPE_2D = new int[][]{{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}, {1, 0, 0, 0, 1, 1, 0, 0, 1, 1, 1, 0, 1, 1, 1, 1}, {1, 1, 0, 0, 1, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0}, {0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 1}, {0, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}, {1, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1}, {1, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0}, {0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0}, {1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 0, 0, 1, 1}, {1, 1, 1, 1, 1, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0}, {0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1}, {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 1, 1, 1}};
+ private static int[][] TILE_ROTATION_2D = new int[][]{{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15}, {12, 8, 4, 0, 13, 9, 5, 1, 14, 10, 6, 2, 15, 11, 7, 3}, {15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0}, {3, 7, 11, 15, 2, 6, 10, 14, 1, 5, 9, 13, 0, 4, 8, 12}};
+
+ private final int wallColor = (238 + (int) (Math.random() * 20.0D) - 10 << 16) + (238 + (int) (Math.random() * 20.0D) - 10 << 8) + (238 + (int) (Math.random() * 20.0D) - 10);
+ private final int doorColor = 238 + (int) (Math.random() * 20.0D) - 10 << 16;
+
+ private final Store store;
+
+ private final Map underlays = new HashMap<>();
+ private final Map overlays = new HashMap<>();
+ private final Map scaledMapIcons = new HashMap<>();
+
+ private RegionLoader regionLoader;
+ private final AreaManager areas;
+ private final SpriteManager sprites;
+ private RSTextureProvider rsTextureProvider;
+ private final ObjectManager objectManager;
+
+ @Getter
+ @Setter
+ private boolean labelRegions;
+
+ @Getter
+ @Setter
+ private boolean outlineRegions;
+
+ public MapImageDumper(Store store)
+ {
+ this.store = store;
+ this.areas = new AreaManager(store);
+ this.sprites = new SpriteManager(store);
+ objectManager = new ObjectManager(store);
+ }
+
+ public void load() throws IOException
+ {
+ loadUnderlays(store);
+ loadOverlays(store);
+ objectManager.load();
+
+ TextureManager textureManager = new TextureManager(store);
+ textureManager.load();
+ rsTextureProvider = new RSTextureProvider(textureManager, sprites);
+
+ loadRegions(store);
+ areas.load();
+ sprites.load();
+ loadSprites();
+ }
+
+ public BufferedImage drawMap(int z)
+ {
+ int minX = regionLoader.getLowestX().getBaseX();
+ int minY = regionLoader.getLowestY().getBaseY();
+
+ int maxX = regionLoader.getHighestX().getBaseX() + Region.X;
+ int maxY = regionLoader.getHighestY().getBaseY() + Region.Y;
+
+ int dimX = maxX - minX;
+ int dimY = maxY - minY;
+
+ int pixelsX = dimX * MAP_SCALE;
+ int pixelsY = dimY * MAP_SCALE;
+
+ logger.info("Map image dimensions: {}px x {}px, {}px per map square ({} MB). Max memory: {}mb", pixelsX, pixelsY,
+ MAP_SCALE, (pixelsX * pixelsY * 3 / 1024 / 1024),
+ Runtime.getRuntime().maxMemory() / 1024L / 1024L);
+
+ BufferedImage image = new BufferedImage(pixelsX, pixelsY, BufferedImage.TYPE_INT_RGB);
+
+ drawMap(image, z);
+ drawObjects(image, z);
+ drawMapIcons(image, z);
+
+ return image;
+ }
+
+ public BufferedImage drawRegion(Region region, int z)
+ {
+ int pixelsX = Region.X * MAP_SCALE;
+ int pixelsY = Region.Y * MAP_SCALE;
+
+ BufferedImage image = new BufferedImage(pixelsX, pixelsY, BufferedImage.TYPE_INT_RGB);
+
+ drawMap(image, 0, 0, z, region);
+ drawObjects(image, 0, 0, region, z);
+ drawMapIcons(image, 0, 0, region, z);
+
+ return image;
+ }
+
+ private void drawMap(BufferedImage image, int drawBaseX, int drawBaseY, int z, Region region)
+ {
+ int[][] map = new int[Region.X * MAP_SCALE][Region.Y * MAP_SCALE];
+ drawMap(map, region, z);
+
+ int[][] above = null;
+ if (z < 3)
+ {
+ above = new int[Region.X * MAP_SCALE][Region.Y * MAP_SCALE];
+ drawMap(above, region, z + 1);
+ }
+
+ for (int x = 0; x < Region.X; ++x)
+ {
+ for (int y = 0; y < Region.Y; ++y)
+ {
+ boolean isBridge = (region.getTileSetting(1, x, Region.Y - y - 1) & 2) != 0;
+
+ int tileSetting = region.getTileSetting(z, x, Region.Y - y - 1);
+ if (!isBridge && ((tileSetting & 24) == 0))
+ {
+ drawTile(image, map, drawBaseX, drawBaseY, x, y);
+ }
+
+ if (z < 3 && isBridge) // client also has a check for &8 != 0 here
+ {
+ drawTile(image, above, drawBaseX, drawBaseY, x, y);
+ }
+ }
+ }
+ }
+
+ private void drawMap(BufferedImage image, int z)
+ {
+ for (Region region : regionLoader.getRegions())
+ {
+ int baseX = region.getBaseX();
+ int baseY = region.getBaseY();
+
+ // to pixel X
+ int drawBaseX = baseX - regionLoader.getLowestX().getBaseX();
+
+ // to pixel Y. top most y is 0, but the top most
+ // region has the greatest y, so invert
+ int drawBaseY = regionLoader.getHighestY().getBaseY() - baseY;
+
+ drawMap(image, drawBaseX, drawBaseY, z, region);
+ }
+ }
+
+ private void drawTile(BufferedImage to, int[][] pixels, int drawBaseX, int drawBaseY, int x, int y)
+ {
+ for (int i = 0; i < MAP_SCALE; ++i)
+ {
+ for (int j = 0; j < MAP_SCALE; ++j)
+ {
+ to.setRGB(drawBaseX * MAP_SCALE + x * MAP_SCALE + i,
+ drawBaseY * MAP_SCALE + y * MAP_SCALE + j,
+ pixels[x * MAP_SCALE + i][y * MAP_SCALE + j]);
+ }
+ }
+ }
+
+ private void drawMap(int[][] pixels, Region region, int z)
+ {
+ int baseX = region.getBaseX();
+ int baseY = region.getBaseY();
+
+ int len = Region.X + BLEND * 2;
+ int[] hues = new int[len];
+ int[] sats = new int[len];
+ int[] light = new int[len];
+ int[] mul = new int[len];
+ int[] num = new int[len];
+
+ boolean hasLeftRegion = regionLoader.findRegionForWorldCoordinates(baseX - 1, baseY) != null;
+ boolean hasRightRegion = regionLoader.findRegionForWorldCoordinates(baseX + Region.X, baseY) != null;
+ boolean hasUpRegion = regionLoader.findRegionForWorldCoordinates(baseX, baseY + Region.Y) != null;
+ boolean hasDownRegion = regionLoader.findRegionForWorldCoordinates(baseX, baseY - 1) != null;
+
+ for (int xi = (hasLeftRegion ? -BLEND * 2 : -BLEND); xi < Region.X + (hasRightRegion ? BLEND * 2 : BLEND); ++xi)
+ {
+ for (int yi = (hasDownRegion ? -BLEND : 0); yi < Region.Y + (hasUpRegion ? BLEND : 0); ++yi)
+ {
+ int xr = xi + BLEND;
+ if (xr >= (hasLeftRegion ? -BLEND : 0) && xr < Region.X + (hasRightRegion ? BLEND : 0))
+ {
+ Region r = regionLoader.findRegionForWorldCoordinates(baseX + xr, baseY + yi);
+ if (r != null)
+ {
+ int underlayId = r.getUnderlayId(z, convert(xr), convert(yi));
+ if (underlayId > 0)
+ {
+ UnderlayDefinition underlay = findUnderlay(underlayId - 1);
+ hues[yi + BLEND] += underlay.getHue();
+ sats[yi + BLEND] += underlay.getSaturation();
+ light[yi + BLEND] += underlay.getLightness();
+ mul[yi + BLEND] += underlay.getHueMultiplier();
+ num[yi + BLEND]++;
+ }
+ }
+ }
+
+ int xl = xi - BLEND;
+ if (xl >= (hasLeftRegion ? -BLEND : 0) && xl < Region.X + (hasRightRegion ? BLEND : 0))
+ {
+ Region r = regionLoader.findRegionForWorldCoordinates(baseX + xl, baseY + yi);
+ if (r != null)
+ {
+ int underlayId = r.getUnderlayId(z, convert(xl), convert(yi));
+ if (underlayId > 0)
+ {
+ UnderlayDefinition underlay = findUnderlay(underlayId - 1);
+ hues[yi + BLEND] -= underlay.getHue();
+ sats[yi + BLEND] -= underlay.getSaturation();
+ light[yi + BLEND] -= underlay.getLightness();
+ mul[yi + BLEND] -= underlay.getHueMultiplier();
+ num[yi + BLEND]--;
+ }
+ }
+ }
+ }
+
+ if (xi >= 0 && xi < Region.X)
+ {
+ int runningHues = 0;
+ int runningSat = 0;
+ int runningLight = 0;
+ int runningMultiplier = 0;
+ int runningNumber = 0;
+
+ for (int yi = (hasDownRegion ? -BLEND * 2 : -BLEND); yi < Region.Y + (hasUpRegion ? BLEND * 2 : BLEND); ++yi)
+ {
+ int yu = yi + BLEND;
+ if (yu >= (hasDownRegion ? -BLEND : 0) && yu < Region.Y + (hasUpRegion ? BLEND : 0))
+ {
+ runningHues += hues[yu + BLEND];
+ runningSat += sats[yu + BLEND];
+ runningLight += light[yu + BLEND];
+ runningMultiplier += mul[yu + BLEND];
+ runningNumber += num[yu + BLEND];
+ }
+
+ int yd = yi - BLEND;
+ if (yd >= (hasDownRegion ? -BLEND : 0) && yd < Region.Y + (hasUpRegion ? BLEND : 0))
+ {
+ runningHues -= hues[yd + BLEND];
+ runningSat -= sats[yd + BLEND];
+ runningLight -= light[yd + BLEND];
+ runningMultiplier -= mul[yd + BLEND];
+ runningNumber -= num[yd + BLEND];
+ }
+
+ if (yi >= 0 && yi < Region.Y)
+ {
+ Region r = regionLoader.findRegionForWorldCoordinates(baseX + xi, baseY + yi);
+ if (r != null)
+ {
+ int underlayId = r.getUnderlayId(z, convert(xi), convert(yi));
+ int overlayId = r.getOverlayId(z, convert(xi), convert(yi));
+
+ if (underlayId > 0 || overlayId > 0)
+ {
+ int underlayHsl = -1;
+ if (underlayId > 0)
+ {
+ int avgHue = runningHues * 256 / runningMultiplier;
+ int avgSat = runningSat / runningNumber;
+ int avgLight = runningLight / runningNumber;
+ // randomness is added to avgHue here
+
+ if (avgLight < 0)
+ {
+ avgLight = 0;
+ }
+ else if (avgLight > 255)
+ {
+ avgLight = 255;
+ }
+
+ underlayHsl = packHsl(avgHue, avgSat, avgLight);
+ }
+
+ int underlayRgb = 0;
+ if (underlayHsl != -1)
+ {
+ int var0 = method1792(underlayHsl, 96);
+ underlayRgb = colorPalette[var0];
+ }
+
+ int shape, rotation;
+ Integer overlayRgb = null;
+ if (overlayId == 0)
+ {
+ shape = rotation = 0;
+ }
+ else
+ {
+ shape = r.getOverlayPath(z, convert(xi), convert(yi)) + 1;
+ rotation = r.getOverlayRotation(z, convert(xi), convert(yi));
+
+ OverlayDefinition overlayDefinition = findOverlay(overlayId - 1);
+ int overlayTexture = overlayDefinition.getTexture();
+ int rgb;
+
+ if (overlayTexture >= 0)
+ {
+ rgb = rsTextureProvider.getAverageTextureRGB(overlayTexture);
+ }
+ else if (overlayDefinition.getRgbColor() == 0xFF_00FF)
+ {
+ rgb = -2;
+ }
+ else
+ {
+ // randomness added here
+ int overlayHsl = packHsl(overlayDefinition.getHue(), overlayDefinition.getSaturation(), overlayDefinition.getLightness());
+ rgb = overlayHsl;
+ }
+
+ overlayRgb = 0;
+ if (rgb != -2)
+ {
+ int var0 = adjustHSLListness0(rgb, 96);
+ overlayRgb = colorPalette[var0];
+ }
+
+ if (overlayDefinition.getSecondaryRgbColor() != -1)
+ {
+ int hue = overlayDefinition.getOtherHue();
+ int sat = overlayDefinition.getOtherSaturation();
+ int olight = overlayDefinition.getOtherLightness();
+ rgb = packHsl(hue, sat, olight);
+ int var0 = adjustHSLListness0(rgb, 96);
+ overlayRgb = colorPalette[var0];
+ }
+ }
+
+ if (shape == 0)
+ {
+ int drawX = xi;
+ int drawY = Region.Y - 1 - yi;
+ if (underlayRgb != 0)
+ {
+ drawMapSquare(pixels, drawX, drawY, underlayRgb);
+ }
+ }
+ else if (shape == 1)
+ {
+ int drawX = xi;
+ int drawY = Region.Y - 1 - yi;
+ drawMapSquare(pixels, drawX, drawY, overlayRgb);
+ }
+ else
+ {
+ int drawX = xi * MAP_SCALE;
+ int drawY = (Region.Y - 1 - yi) * MAP_SCALE;
+ int[] tileShapes = TILE_SHAPE_2D[shape];
+ int[] tileRotations = TILE_ROTATION_2D[rotation];
+ if (underlayRgb != 0)
+ {
+ int rotIdx = 0;
+ for (int i = 0; i < Region.Z; ++i)
+ {
+ int p1 = tileShapes[tileRotations[rotIdx++]] == 0 ? underlayRgb : overlayRgb;
+ int p2 = tileShapes[tileRotations[rotIdx++]] == 0 ? underlayRgb : overlayRgb;
+ int p3 = tileShapes[tileRotations[rotIdx++]] == 0 ? underlayRgb : overlayRgb;
+ int p4 = tileShapes[tileRotations[rotIdx++]] == 0 ? underlayRgb : overlayRgb;
+ pixels[drawX + 0][drawY + i] = p1;
+ pixels[drawX + 1][drawY + i] = p2;
+ pixels[drawX + 2][drawY + i] = p3;
+ pixels[drawX + 3][drawY + i] = p4;
+ }
+ }
+ else
+ {
+ int rotIdx = 0;
+ for (int i = 0; i < Region.Z; ++i)
+ {
+ int p1 = tileShapes[tileRotations[rotIdx++]];
+ int p2 = tileShapes[tileRotations[rotIdx++]];
+ int p3 = tileShapes[tileRotations[rotIdx++]];
+ int p4 = tileShapes[tileRotations[rotIdx++]];
+
+ if (p1 != 0)
+ {
+ pixels[drawX + 0][drawY + i] = overlayRgb;
+ }
+
+ if (p2 != 0)
+ {
+ pixels[drawX + 1][drawY + i] = overlayRgb;
+ }
+
+ if (p3 != 0)
+ {
+ pixels[drawX + 2][drawY + i] = overlayRgb;
+ }
+
+ if (p4 != 0)
+ {
+ pixels[drawX + 3][drawY + i] = overlayRgb;
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+
+ private static int convert(int d)
+ {
+ if (d >= 0)
+ {
+ return d % 64;
+ }
+ else
+ {
+ return 64 - -(d % 64) - 1;
+ }
+ }
+
+ private void drawObjects(BufferedImage image, int drawBaseX, int drawBaseY, Region region, int z)
+ {
+ Graphics2D graphics = image.createGraphics();
+
+ for (Location location : region.getLocations())
+ {
+
+ int rotation = location.getOrientation();
+ int type = location.getType();
+
+ int localX = location.getPosition().getX() - region.getBaseX();
+ int localY = location.getPosition().getY() - region.getBaseY();
+
+ boolean isBridge = (region.getTileSetting(1, localX, localY) & 2) != 0;
+
+ if (location.getPosition().getZ() == z + 1)
+ {
+ if (!isBridge)
+ {
+ continue;
+ }
+ }
+ else if (location.getPosition().getZ() == z)
+ {
+ if (isBridge)
+ {
+ continue;
+ }
+
+ if ((region.getTileSetting(z, localX, localY) & 24) != 0)
+ {
+ continue;
+ }
+ }
+ else
+ {
+ continue;
+ }
+
+ ObjectDefinition object = findObject(location.getId());
+
+ int drawX = (drawBaseX + localX) * MAP_SCALE;
+ int drawY = (drawBaseY + (Region.Y - 1 - localY)) * MAP_SCALE;
+
+ if (type >= 0 && type <= 3)
+ {
+ // this is a wall
+ int hash = (localY << 7) + localX + (location.getId() << 14) + 0x4000_0000;
+ if (object.getAnInt2088() == 0)
+ {
+ hash -= Integer.MIN_VALUE;
+ }
+
+ int rgb = wallColor;
+ if (hash > 0)
+ {
+ rgb = doorColor;
+ }
+
+ if (object.getMapSceneID() != -1)
+ {
+ Image spriteImage = scaledMapIcons.get(object.getMapSceneID());
+ graphics.drawImage(spriteImage, drawX * MAP_SCALE, drawY * MAP_SCALE, null);
+ }
+ else
+ {
+ if (type == 0 || type == 2)
+ {
+ if (rotation == 0)
+ {
+ image.setRGB(drawX + 0, drawY + 0, rgb);
+ image.setRGB(drawX + 0, drawY + 1, rgb);
+ image.setRGB(drawX + 0, drawY + 2, rgb);
+ image.setRGB(drawX + 0, drawY + 3, rgb);
+ }
+ else if (rotation == 1)
+ {
+ image.setRGB(drawX + 0, drawY + 0, rgb);
+ image.setRGB(drawX + 1, drawY + 0, rgb);
+ image.setRGB(drawX + 2, drawY + 0, rgb);
+ image.setRGB(drawX + 3, drawY + 0, rgb);
+ }
+ else if (rotation == 2)
+ {
+ image.setRGB(drawX + 3, drawY + 0, rgb);
+ image.setRGB(drawX + 3, drawY + 1, rgb);
+ image.setRGB(drawX + 3, drawY + 2, rgb);
+ image.setRGB(drawX + 3, drawY + 3, rgb);
+ }
+ else if (rotation == 3)
+ {
+ image.setRGB(drawX + 0, drawY + 3, rgb);
+ image.setRGB(drawX + 1, drawY + 3, rgb);
+ image.setRGB(drawX + 2, drawY + 3, rgb);
+ image.setRGB(drawX + 3, drawY + 3, rgb);
+ }
+ }
+
+ if (type == 3)
+ {
+ if (rotation == 0)
+ {
+ image.setRGB(drawX + 0, drawY + 0, rgb);
+ }
+ else if (rotation == 1)
+ {
+ image.setRGB(drawX + 3, drawY + 0, rgb);
+ }
+ else if (rotation == 2)
+ {
+ image.setRGB(drawX + 3, drawY + 3, rgb);
+ }
+ else if (rotation == 3)
+ {
+ image.setRGB(drawX + 0, drawY + 3, rgb);
+ }
+ }
+
+ if (type == 2)
+ {
+ if (rotation == 3)
+ {
+ image.setRGB(drawX + 0, drawY + 0, rgb);
+ image.setRGB(drawX + 0, drawY + 1, rgb);
+ image.setRGB(drawX + 0, drawY + 2, rgb);
+ image.setRGB(drawX + 0, drawY + 3, rgb);
+ }
+ else if (rotation == 0)
+ {
+ image.setRGB(drawX + 0, drawY + 0, rgb);
+ image.setRGB(drawX + 1, drawY + 0, rgb);
+ image.setRGB(drawX + 2, drawY + 0, rgb);
+ image.setRGB(drawX + 3, drawY + 0, rgb);
+ }
+ else if (rotation == 1)
+ {
+ image.setRGB(drawX + 3, drawY + 0, rgb);
+ image.setRGB(drawX + 3, drawY + 1, rgb);
+ image.setRGB(drawX + 3, drawY + 2, rgb);
+ image.setRGB(drawX + 3, drawY + 3, rgb);
+ }
+ else if (rotation == 2)
+ {
+ image.setRGB(drawX + 0, drawY + 3, rgb);
+ image.setRGB(drawX + 1, drawY + 3, rgb);
+ image.setRGB(drawX + 2, drawY + 3, rgb);
+ image.setRGB(drawX + 3, drawY + 3, rgb);
+ }
+ }
+ }
+ }
+ else if (type == 9)
+ {
+ if (object.getMapSceneID() != -1)
+ {
+ Image spriteImage = scaledMapIcons.get(object.getMapSceneID());
+ graphics.drawImage(spriteImage, drawX, drawY, null);
+ continue;
+ }
+
+ int hash = (localY << 7) + localX + (location.getId() << 14) + 0x4000_0000;
+ if (object.getAnInt2088() == 0)
+ {
+ hash -= Integer.MIN_VALUE;
+ }
+
+ if ((hash >> 29 & 3) != 2)
+ {
+ continue;
+ }
+
+ int rgb = 0xEE_EEEE;
+ if (hash > 0)
+ {
+ rgb = 0xEE_0000;
+ }
+
+ if (rotation != 0 && rotation != 2)
+ {
+ image.setRGB(drawX + 0, drawY + 0, rgb);
+ image.setRGB(drawX + 1, drawY + 1, rgb);
+ image.setRGB(drawX + 2, drawY + 2, rgb);
+ image.setRGB(drawX + 3, drawY + 3, rgb);
+ }
+ else
+ {
+ image.setRGB(drawX + 0, drawY + 3, rgb);
+ image.setRGB(drawX + 1, drawY + 2, rgb);
+ image.setRGB(drawX + 2, drawY + 1, rgb);
+ image.setRGB(drawX + 3, drawY + 0, rgb);
+ }
+ }
+ else if (type == 22 || (type >= 9 && type <= 11))
+ {
+ // ground object
+ if (object.getMapSceneID() != -1)
+ {
+ Image spriteImage = scaledMapIcons.get(object.getMapSceneID());
+ graphics.drawImage(spriteImage, drawX, drawY, null);
+ }
+ }
+ }
+
+ graphics.dispose();
+ }
+
+ private void drawObjects(BufferedImage image, int z)
+ {
+ for (Region region : regionLoader.getRegions())
+ {
+ int baseX = region.getBaseX();
+ int baseY = region.getBaseY();
+
+ // to pixel X
+ int drawBaseX = baseX - regionLoader.getLowestX().getBaseX();
+
+ // to pixel Y. top most y is 0, but the top most
+ // region has the greatest y, so invert
+ int drawBaseY = regionLoader.getHighestY().getBaseY() - baseY;
+
+ drawObjects(image, drawBaseX, drawBaseY, region, z);
+ }
+ }
+
+ private void drawMapIcons(BufferedImage image, int drawBaseX, int drawBaseY, Region region, int z)
+ {
+ int baseX = region.getBaseX();
+ int baseY = region.getBaseY();
+
+ Graphics2D graphics = image.createGraphics();
+
+ drawMapIcons(graphics, region, z, drawBaseX, drawBaseY);
+
+ if (labelRegions)
+ {
+ graphics.setColor(Color.WHITE);
+ String str = baseX + "," + baseY + " (" + region.getRegionX() + "," + region.getRegionY() + ")";
+ graphics.drawString(str, drawBaseX * MAP_SCALE, drawBaseY * MAP_SCALE + graphics.getFontMetrics().getHeight());
+ }
+
+ if (outlineRegions)
+ {
+ graphics.setColor(Color.WHITE);
+ graphics.drawRect(drawBaseX * MAP_SCALE, drawBaseY * MAP_SCALE, Region.X * MAP_SCALE, Region.Y * MAP_SCALE);
+ }
+
+ graphics.dispose();
+ }
+
+ private void drawMapIcons(BufferedImage image, int z)
+ {
+ // map icons
+ for (Region region : regionLoader.getRegions())
+ {
+ int baseX = region.getBaseX();
+ int baseY = region.getBaseY();
+
+ // to pixel X
+ int drawBaseX = baseX - regionLoader.getLowestX().getBaseX();
+
+ // to pixel Y. top most y is 0, but the top most
+ // region has the greatest y, so invert
+ int drawBaseY = regionLoader.getHighestY().getBaseY() - baseY;
+
+ drawMapIcons(image, drawBaseX, drawBaseY, region, z);
+ }
+ }
+
+ private ObjectDefinition findObject(int id)
+ {
+ return objectManager.getObject(id);
+ }
+
+ private int packHsl(int var0, int var1, int var2)
+ {
+ if (var2 > 179)
+ {
+ var1 /= 2;
+ }
+
+ if (var2 > 192)
+ {
+ var1 /= 2;
+ }
+
+ if (var2 > 217)
+ {
+ var1 /= 2;
+ }
+
+ if (var2 > 243)
+ {
+ var1 /= 2;
+ }
+
+ int var3 = (var1 / 32 << 7) + (var0 / 4 << 10) + var2 / 2;
+ return var3;
+ }
+
+ static int method1792(int var0, int var1)
+ {
+ if (var0 == -1)
+ {
+ return 12345678;
+ }
+ else
+ {
+ var1 = (var0 & 127) * var1 / 128;
+ if (var1 < 2)
+ {
+ var1 = 2;
+ }
+ else if (var1 > 126)
+ {
+ var1 = 126;
+ }
+
+ return (var0 & 65408) + var1;
+ }
+ }
+
+ static final int adjustHSLListness0(int var0, int var1)
+ {
+ if (var0 == -2)
+ {
+ return 12345678;
+ }
+ else if (var0 == -1)
+ {
+ if (var1 < 2)
+ {
+ var1 = 2;
+ }
+ else if (var1 > 126)
+ {
+ var1 = 126;
+ }
+
+ return var1;
+ }
+ else
+ {
+ var1 = (var0 & 127) * var1 / 128;
+ if (var1 < 2)
+ {
+ var1 = 2;
+ }
+ else if (var1 > 126)
+ {
+ var1 = 126;
+ }
+
+ return (var0 & 65408) + var1;
+ }
+ }
+
+ private void drawMapSquare(int[][] pixels, int x, int y, int rgb)
+ {
+ x *= MAP_SCALE;
+ y *= MAP_SCALE;
+
+ for (int i = 0; i < MAP_SCALE; ++i)
+ {
+ for (int j = 0; j < MAP_SCALE; ++j)
+ {
+ pixels[x + i][y + j] = rgb;
+ }
+ }
+ }
+
+ private void drawMapIcons(Graphics2D graphics, Region region, int z, int drawBaseX, int drawBaseY)
+ {
+ for (Location location : region.getLocations())
+ {
+ int localZ = location.getPosition().getZ();
+ if (z != 0 && localZ != z)
+ {
+ // draw all icons on z=0
+ continue;
+ }
+
+ ObjectDefinition od = findObject(location.getId());
+
+ assert od != null;
+
+ int localX = location.getPosition().getX() - region.getBaseX();
+ int localY = location.getPosition().getY() - region.getBaseY();
+
+ int drawX = drawBaseX + localX;
+ int drawY = drawBaseY + (Region.Y - 1 - localY);
+
+ if (od.getMapAreaId() != -1)
+ {
+ AreaDefinition area = areas.getArea(od.getMapAreaId());
+ assert area != null;
+
+ int spriteId = area.spriteId;
+
+ SpriteDefinition sprite = sprites.findSprite(spriteId, 0);
+ assert sprite != null;
+
+ BufferedImage iconImage = sprites.getSpriteImage(sprite);
+ graphics.drawImage(iconImage, drawX * MAP_SCALE, drawY * MAP_SCALE, null);
+ }
+ }
+ }
+
+ private void loadRegions(Store store) throws IOException
+ {
+ regionLoader = new RegionLoader(store);
+ regionLoader.loadRegions();
+ regionLoader.calculateBounds();
+
+ logger.info("North most region: {}", regionLoader.getLowestY().getBaseY());
+ logger.info("South most region: {}", regionLoader.getHighestY().getBaseY());
+ logger.info("West most region: {}", regionLoader.getLowestX().getBaseX());
+ logger.info("East most region: {}", regionLoader.getHighestX().getBaseX());
+ }
+
+ private void loadUnderlays(Store store) throws IOException
+ {
+ Storage storage = store.getStorage();
+ Index index = store.getIndex(IndexType.CONFIGS);
+ Archive archive = index.getArchive(ConfigType.UNDERLAY.getId());
+
+ byte[] archiveData = storage.loadArchive(archive);
+ ArchiveFiles files = archive.getFiles(archiveData);
+
+ for (FSFile file : files.getFiles())
+ {
+ UnderlayLoader loader = new UnderlayLoader();
+ UnderlayDefinition underlay = loader.load(file.getFileId(), file.getContents());
+
+ underlays.put(underlay.getId(), underlay);
+ }
+ }
+
+ private UnderlayDefinition findUnderlay(int id)
+ {
+ return underlays.get(id);
+ }
+
+ private void loadOverlays(Store store) throws IOException
+ {
+ Storage storage = store.getStorage();
+ Index index = store.getIndex(IndexType.CONFIGS);
+ Archive archive = index.getArchive(ConfigType.OVERLAY.getId());
+
+ byte[] archiveData = storage.loadArchive(archive);
+ ArchiveFiles files = archive.getFiles(archiveData);
+
+ for (FSFile file : files.getFiles())
+ {
+ OverlayLoader loader = new OverlayLoader();
+ OverlayDefinition overlay = loader.load(file.getFileId(), file.getContents());
+
+ overlays.put(overlay.getId(), overlay);
+ }
+ }
+
+ private OverlayDefinition findOverlay(int id)
+ {
+ return overlays.get(id);
+ }
+
+ private void loadSprites() throws IOException
+ {
+ Storage storage = store.getStorage();
+ Index index = store.getIndex(IndexType.SPRITES);
+ final int mapsceneHash = Djb2.hash("mapscene");
+
+ for (Archive a : index.getArchives())
+ {
+ byte[] contents = a.decompress(storage.loadArchive(a));
+
+ SpriteLoader loader = new SpriteLoader();
+ SpriteDefinition[] sprites = loader.load(a.getArchiveId(), contents);
+
+ for (SpriteDefinition sprite : sprites)
+ {
+ if (sprite.getHeight() <= 0 || sprite.getWidth() <= 0)
+ {
+ continue;
+ }
+
+ if (a.getNameHash() == mapsceneHash)
+ {
+ BufferedImage spriteImage = new BufferedImage(sprite.getWidth(), sprite.getHeight(), BufferedImage.TYPE_INT_ARGB);
+ spriteImage.setRGB(0, 0, sprite.getWidth(), sprite.getHeight(), sprite.getPixels(), 0, sprite.getWidth());
+
+ // scale image down so it fits
+ Image scaledImage = spriteImage.getScaledInstance(MAPICON_MAX_WIDTH, MAPICON_MAX_HEIGHT, 0);
+
+ assert scaledMapIcons.containsKey(sprite.getFrame()) == false;
+ scaledMapIcons.put(sprite.getFrame(), scaledImage);
+ }
+ }
+ }
+ }
+
+}
diff --git a/cache/src/main/java/net/runelite/cache/NpcManager.java b/cache/src/main/java/net/runelite/cache/NpcManager.java
new file mode 100644
index 0000000000..3124eb455f
--- /dev/null
+++ b/cache/src/main/java/net/runelite/cache/NpcManager.java
@@ -0,0 +1,111 @@
+/*
+ * Copyright (c) 2016-2017, Adam
+ * 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;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import net.runelite.cache.definitions.NpcDefinition;
+import net.runelite.cache.definitions.exporters.NpcExporter;
+import net.runelite.cache.definitions.loaders.NpcLoader;
+import net.runelite.cache.fs.Archive;
+import net.runelite.cache.fs.ArchiveFiles;
+import net.runelite.cache.fs.FSFile;
+import net.runelite.cache.fs.Index;
+import net.runelite.cache.fs.Storage;
+import net.runelite.cache.fs.Store;
+import net.runelite.cache.util.IDClass;
+
+public class NpcManager
+{
+ private final Store store;
+ private final Map npcs = new HashMap<>();
+
+ public NpcManager(Store store)
+ {
+ this.store = store;
+ }
+
+ public void load() throws IOException
+ {
+ NpcLoader loader = new NpcLoader();
+
+ Storage storage = store.getStorage();
+ Index index = store.getIndex(IndexType.CONFIGS);
+ Archive archive = index.getArchive(ConfigType.NPC.getId());
+
+ byte[] archiveData = storage.loadArchive(archive);
+ ArchiveFiles files = archive.getFiles(archiveData);
+
+ for (FSFile f : files.getFiles())
+ {
+ NpcDefinition npc = loader.load(f.getFileId(), f.getContents());
+ npcs.put(f.getFileId(), npc);
+ }
+ }
+
+ public Collection getNpcs()
+ {
+ return Collections.unmodifiableCollection(npcs.values());
+ }
+
+ public NpcDefinition get(int npcId)
+ {
+ return npcs.get(npcId);
+ }
+
+ public void dump(File out) throws IOException
+ {
+ out.mkdirs();
+
+ for (NpcDefinition def : npcs.values())
+ {
+ NpcExporter exporter = new NpcExporter(def);
+
+ File targ = new File(out, def.id + ".json");
+ exporter.exportTo(targ);
+ }
+ }
+
+ public void java(File java) throws IOException
+ {
+ java.mkdirs();
+ try (IDClass ids = IDClass.create(java, "NpcID"))
+ {
+ for (NpcDefinition def : npcs.values())
+ {
+ if (def.name.equalsIgnoreCase("NULL"))
+ {
+ continue;
+ }
+
+ ids.add(def.name, def.id);
+ }
+ }
+ }
+}
diff --git a/cache/src/main/java/net/runelite/cache/ObjectManager.java b/cache/src/main/java/net/runelite/cache/ObjectManager.java
new file mode 100644
index 0000000000..cb1372ed65
--- /dev/null
+++ b/cache/src/main/java/net/runelite/cache/ObjectManager.java
@@ -0,0 +1,116 @@
+/*
+ * Copyright (c) 2016-2017, Adam
+ * 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;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import net.runelite.cache.definitions.ObjectDefinition;
+import net.runelite.cache.definitions.exporters.ObjectExporter;
+import net.runelite.cache.definitions.loaders.ObjectLoader;
+import net.runelite.cache.fs.Archive;
+import net.runelite.cache.fs.ArchiveFiles;
+import net.runelite.cache.fs.FSFile;
+import net.runelite.cache.fs.Index;
+import net.runelite.cache.fs.Storage;
+import net.runelite.cache.fs.Store;
+import net.runelite.cache.util.IDClass;
+
+public class ObjectManager
+{
+ private final Store store;
+ private final Map objects = new HashMap<>();
+
+ public ObjectManager(Store store)
+ {
+ this.store = store;
+ }
+
+ public void load() throws IOException
+ {
+ ObjectLoader loader = new ObjectLoader();
+
+ Storage storage = store.getStorage();
+ Index index = store.getIndex(IndexType.CONFIGS);
+ Archive archive = index.getArchive(ConfigType.OBJECT.getId());
+
+ byte[] archiveData = storage.loadArchive(archive);
+ ArchiveFiles files = archive.getFiles(archiveData);
+
+ for (FSFile f : files.getFiles())
+ {
+ ObjectDefinition def = loader.load(f.getFileId(), f.getContents());
+ objects.put(f.getFileId(), def);
+ }
+ }
+
+ public Collection getObjects()
+ {
+ return Collections.unmodifiableCollection(objects.values());
+ }
+
+ public ObjectDefinition getObject(int id)
+ {
+ return objects.get(id);
+ }
+
+ public void dump(File out) throws IOException
+ {
+ out.mkdirs();
+
+ for (ObjectDefinition def : objects.values())
+ {
+ ObjectExporter exporter = new ObjectExporter(def);
+
+ File targ = new File(out, def.getId() + ".json");
+ exporter.exportTo(targ);
+ }
+ }
+
+ public void java(File java) throws IOException
+ {
+ java.mkdirs();
+ try (IDClass ids = IDClass.create(java, "ObjectID"))
+ {
+ try (IDClass nulls = IDClass.create(java, "NullObjectID"))
+ {
+ for (ObjectDefinition def : objects.values())
+ {
+ if ("null".equals(def.getName()))
+ {
+ nulls.add(def.getName(), def.getId());
+ }
+ else
+ {
+ ids.add(def.getName(), def.getId());
+ }
+ }
+ }
+ }
+ }
+}
diff --git a/cache/src/main/java/net/runelite/cache/OverlayManager.java b/cache/src/main/java/net/runelite/cache/OverlayManager.java
new file mode 100644
index 0000000000..6940227c0f
--- /dev/null
+++ b/cache/src/main/java/net/runelite/cache/OverlayManager.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright (c) 2018, Adam
+ * 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;
+
+import java.io.IOException;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import net.runelite.cache.definitions.OverlayDefinition;
+import net.runelite.cache.definitions.loaders.OverlayLoader;
+import net.runelite.cache.definitions.providers.OverlayProvider;
+import net.runelite.cache.fs.Archive;
+import net.runelite.cache.fs.ArchiveFiles;
+import net.runelite.cache.fs.FSFile;
+import net.runelite.cache.fs.Index;
+import net.runelite.cache.fs.Storage;
+import net.runelite.cache.fs.Store;
+
+public class OverlayManager implements OverlayProvider
+{
+ private final Store store;
+ private final Map overlays = new HashMap<>();
+
+ public OverlayManager(Store store)
+ {
+ this.store = store;
+ }
+
+ public void load() throws IOException
+ {
+ Storage storage = store.getStorage();
+ Index index = store.getIndex(IndexType.CONFIGS);
+ Archive archive = index.getArchive(ConfigType.OVERLAY.getId());
+
+ byte[] archiveData = storage.loadArchive(archive);
+ ArchiveFiles files = archive.getFiles(archiveData);
+
+ for (FSFile file : files.getFiles())
+ {
+ OverlayLoader loader = new OverlayLoader();
+ OverlayDefinition overlay = loader.load(file.getFileId(), file.getContents());
+
+ overlays.put(overlay.getId(), overlay);
+ }
+ }
+
+ public Collection getOverlays()
+ {
+ return Collections.unmodifiableCollection(overlays.values());
+ }
+
+ @Override
+ public OverlayDefinition provide(int overlayId)
+ {
+ return overlays.get(overlayId);
+ }
+}
diff --git a/cache/src/main/java/net/runelite/cache/SpriteManager.java b/cache/src/main/java/net/runelite/cache/SpriteManager.java
new file mode 100644
index 0000000000..a18dd4f6ba
--- /dev/null
+++ b/cache/src/main/java/net/runelite/cache/SpriteManager.java
@@ -0,0 +1,118 @@
+/*
+ * Copyright (c) 2016-2017, Adam
+ * 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;
+
+import com.google.common.collect.LinkedListMultimap;
+import com.google.common.collect.Multimap;
+import java.awt.image.BufferedImage;
+import java.io.File;
+import java.io.IOException;
+import java.util.Collection;
+import java.util.Collections;
+import net.runelite.cache.definitions.SpriteDefinition;
+import net.runelite.cache.definitions.exporters.SpriteExporter;
+import net.runelite.cache.definitions.loaders.SpriteLoader;
+import net.runelite.cache.definitions.providers.SpriteProvider;
+import net.runelite.cache.fs.Archive;
+import net.runelite.cache.fs.Index;
+import net.runelite.cache.fs.Storage;
+import net.runelite.cache.fs.Store;
+
+public class SpriteManager implements SpriteProvider
+{
+ private final Store store;
+ private final Multimap sprites = LinkedListMultimap.create();
+
+ public SpriteManager(Store store)
+ {
+ this.store = store;
+ }
+
+ public void load() throws IOException
+ {
+ Storage storage = store.getStorage();
+ Index index = store.getIndex(IndexType.SPRITES);
+
+ for (Archive a : index.getArchives())
+ {
+ byte[] contents = a.decompress(storage.loadArchive(a));
+
+ SpriteLoader loader = new SpriteLoader();
+ SpriteDefinition[] defs = loader.load(a.getArchiveId(), contents);
+
+ for (SpriteDefinition sprite : defs)
+ {
+ sprites.put(sprite.getId(), sprite);
+ }
+ }
+ }
+
+ public Collection getSprites()
+ {
+ return Collections.unmodifiableCollection(sprites.values());
+ }
+
+ public SpriteDefinition findSprite(int spriteId, int frameId)
+ {
+ for (SpriteDefinition sprite : sprites.get(spriteId))
+ {
+ if (sprite.getFrame() == frameId)
+ {
+ return sprite;
+ }
+ }
+ return null;
+ }
+
+ public BufferedImage getSpriteImage(SpriteDefinition sprite)
+ {
+ BufferedImage image = new BufferedImage(sprite.getWidth(), sprite.getHeight(), BufferedImage.TYPE_INT_ARGB);
+ image.setRGB(0, 0, sprite.getWidth(), sprite.getHeight(), sprite.getPixels(), 0, sprite.getWidth());
+ return image;
+ }
+
+ public void export(File outDir) throws IOException
+ {
+ for (SpriteDefinition sprite : sprites.values())
+ {
+ // I don't know why this happens
+ if (sprite.getHeight() <= 0 || sprite.getWidth() <= 0)
+ {
+ continue;
+ }
+
+ SpriteExporter exporter = new SpriteExporter(sprite);
+ File png = new File(outDir, sprite.getId() + "-" + sprite.getFrame() + ".png");
+
+ exporter.exportTo(png);
+ }
+ }
+
+ @Override
+ public SpriteDefinition provide(int spriteId, int frameId)
+ {
+ return findSprite(spriteId, frameId);
+ }
+}
diff --git a/cache/src/main/java/net/runelite/cache/StructManager.java b/cache/src/main/java/net/runelite/cache/StructManager.java
new file mode 100644
index 0000000000..bd816a4abb
--- /dev/null
+++ b/cache/src/main/java/net/runelite/cache/StructManager.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright (c) 2018, Joshua Filby
+ * 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;
+
+import java.io.IOException;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import net.runelite.cache.definitions.StructDefinition;
+import net.runelite.cache.definitions.loaders.StructLoader;
+import net.runelite.cache.definitions.providers.StructProvider;
+import net.runelite.cache.fs.Archive;
+import net.runelite.cache.fs.ArchiveFiles;
+import net.runelite.cache.fs.FSFile;
+import net.runelite.cache.fs.Index;
+import net.runelite.cache.fs.Storage;
+import net.runelite.cache.fs.Store;
+
+public class StructManager implements StructProvider
+{
+ private final Store store;
+ private final Map structs = new HashMap<>();
+
+ public StructManager(Store store)
+ {
+ this.store = store;
+ }
+
+ public void load() throws IOException
+ {
+ StructLoader loader = new StructLoader();
+
+ Storage storage = store.getStorage();
+ Index index = store.getIndex(IndexType.CONFIGS);
+ Archive archive = index.getArchive(ConfigType.STRUCT.getId());
+
+ byte[] archiveData = storage.loadArchive(archive);
+ ArchiveFiles files = archive.getFiles(archiveData);
+
+ for (FSFile f : files.getFiles())
+ {
+ StructDefinition def = loader.load(f.getFileId(), f.getContents());
+ structs.put(f.getFileId(), def);
+ }
+ }
+
+ public Map getStructs()
+ {
+ return Collections.unmodifiableMap(structs);
+ }
+
+ public StructDefinition getStruct(int structId)
+ {
+ return structs.get(structId);
+ }
+
+ @Override
+ public StructDefinition provide(int structId)
+ {
+ return getStruct(structId);
+ }
+}
diff --git a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/exprargorder/Expression.java b/cache/src/main/java/net/runelite/cache/TextureManager.java
similarity index 50%
rename from deobfuscator/src/main/java/net/runelite/deob/deobfuscators/exprargorder/Expression.java
rename to cache/src/main/java/net/runelite/cache/TextureManager.java
index 8ba1dd8c71..9eeb3504f2 100644
--- a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/exprargorder/Expression.java
+++ b/cache/src/main/java/net/runelite/cache/TextureManager.java
@@ -22,79 +22,69 @@
* (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.deob.deobfuscators.exprargorder;
+package net.runelite.cache;
+import java.io.IOException;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.List;
-import net.runelite.asm.attributes.code.InstructionType;
-import net.runelite.asm.execution.InstructionContext;
-import net.runelite.asm.execution.MethodContext;
+import net.runelite.cache.definitions.TextureDefinition;
+import net.runelite.cache.definitions.loaders.TextureLoader;
+import net.runelite.cache.definitions.providers.TextureProvider;
+import net.runelite.cache.fs.Archive;
+import net.runelite.cache.fs.ArchiveFiles;
+import net.runelite.cache.fs.FSFile;
+import net.runelite.cache.fs.Index;
+import net.runelite.cache.fs.Storage;
+import net.runelite.cache.fs.Store;
-public class Expression
+public class TextureManager implements TextureProvider
{
- private final InstructionContext head;
- private final List exprs = new ArrayList<>();
- private final List comExprs = new ArrayList<>();
+ private final Store store;
+ private final List textures = new ArrayList<>();
- public List sortedExprs;
- private int exprHash;
-
- public Expression(InstructionContext head)
+ public TextureManager(Store store)
{
- this.head = head;
+ this.store = store;
}
- public InstructionType getType()
+ public void load() throws IOException
{
- return head.getInstruction().getType();
- }
+ Storage storage = store.getStorage();
+ Index index = store.getIndex(IndexType.TEXTURES);
+ Archive archive = index.getArchive(0);
- public InstructionContext getHead()
- {
- return head;
- }
+ byte[] archiveData = storage.loadArchive(archive);
+ ArchiveFiles files = archive.getFiles(archiveData);
- public void addExpr(Expression expr)
- {
- exprs.add(expr);
- }
+ TextureLoader loader = new TextureLoader();
- public List getExprs()
- {
- return Collections.unmodifiableList(exprs);
- }
-
- public void addComExpr(Expression expr)
- {
- comExprs.add(expr);
- }
-
- public List getComExprs()
- {
- return Collections.unmodifiableList(comExprs);
- }
-
- public void sort(MethodContext ctx)
- {
- for (Expression e : comExprs)
+ for (FSFile file : files.getFiles())
{
- e.sort(ctx);
- }
- for (Expression e : exprs)
- {
- e.sort(ctx);
+ TextureDefinition texture = loader.load(file.getFileId(), file.getContents());
+ textures.add(texture);
}
+ }
- sortedExprs = new ArrayList<>(comExprs);
- Collections.sort(sortedExprs, (e1, e2) -> ExprArgOrder.compare(ctx.getMethod(), getType(), e1, e2));
- Collections.reverse(sortedExprs);
+ public List getTextures()
+ {
+ return textures;
+ }
- int hash = 0;
- for (Expression e : sortedExprs)
+ public TextureDefinition findTexture(int id)
+ {
+ for (TextureDefinition td : textures)
{
- hash ^= e.exprHash;
+ if (td.getId() == id)
+ {
+ return td;
+ }
}
- exprHash = hash;
+ return null;
+ }
+
+ @Override
+ public TextureDefinition[] provide()
+ {
+ return textures.toArray(new TextureDefinition[textures.size()]);
}
}
diff --git a/cache/src/main/java/net/runelite/cache/UnderlayManager.java b/cache/src/main/java/net/runelite/cache/UnderlayManager.java
new file mode 100644
index 0000000000..3bba2230a4
--- /dev/null
+++ b/cache/src/main/java/net/runelite/cache/UnderlayManager.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright (c) 2018, Adam
+ * 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;
+
+import java.io.IOException;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import net.runelite.cache.definitions.UnderlayDefinition;
+import net.runelite.cache.definitions.loaders.UnderlayLoader;
+import net.runelite.cache.definitions.providers.UnderlayProvider;
+import net.runelite.cache.fs.Archive;
+import net.runelite.cache.fs.ArchiveFiles;
+import net.runelite.cache.fs.FSFile;
+import net.runelite.cache.fs.Index;
+import net.runelite.cache.fs.Storage;
+import net.runelite.cache.fs.Store;
+
+public class UnderlayManager implements UnderlayProvider
+{
+ private final Store store;
+ private final Map underlays = new HashMap<>();
+
+ public UnderlayManager(Store store)
+ {
+ this.store = store;
+ }
+
+ public void load() throws IOException
+ {
+ Storage storage = store.getStorage();
+ Index index = store.getIndex(IndexType.CONFIGS);
+ Archive archive = index.getArchive(ConfigType.UNDERLAY.getId());
+
+ byte[] archiveData = storage.loadArchive(archive);
+ ArchiveFiles files = archive.getFiles(archiveData);
+
+ for (FSFile file : files.getFiles())
+ {
+ UnderlayLoader loader = new UnderlayLoader();
+ UnderlayDefinition underlay = loader.load(file.getFileId(), file.getContents());
+
+ underlays.put(underlay.getId(), underlay);
+ }
+ }
+
+ public Collection getUnderlays()
+ {
+ return Collections.unmodifiableCollection(underlays.values());
+ }
+
+ @Override
+ public UnderlayDefinition provide(int underlayId)
+ {
+ return underlays.get(underlayId);
+ }
+}
diff --git a/cache/src/main/java/net/runelite/cache/definitions/AreaDefinition.java b/cache/src/main/java/net/runelite/cache/definitions/AreaDefinition.java
new file mode 100644
index 0000000000..7abdbdfddd
--- /dev/null
+++ b/cache/src/main/java/net/runelite/cache/definitions/AreaDefinition.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2017, Adam
+ * 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 AreaDefinition
+{
+ public int id;
+ public int[] field3292;
+ public int spriteId = -1;
+ public int field3294 = -1;
+ public String name;
+ public int field3296;
+ public int field3297 = -1;
+ public String[] field3298 = new String[5];
+ public int[] field3300;
+ public String field3308;
+ public byte[] field3309;
+ public int field3310;
+
+}
diff --git a/cache/src/main/java/net/runelite/cache/definitions/ClientScript1Instruction.java b/cache/src/main/java/net/runelite/cache/definitions/ClientScript1Instruction.java
new file mode 100644
index 0000000000..b56c0a42d1
--- /dev/null
+++ b/cache/src/main/java/net/runelite/cache/definitions/ClientScript1Instruction.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2018 Abex
+ * 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;
+import lombok.RequiredArgsConstructor;
+
+@Data
+public class ClientScript1Instruction
+{
+ @RequiredArgsConstructor
+ public enum Opcode
+ {
+ RETURN(0),
+ BOOSTED_SKILL_LEVELS(1),
+ REAL_SKILL_LEVELS(1),
+ SKILL_EXPERIENCE(1),
+ WIDGET_CONTAINS_ITEM_GET_QUANTITY(3),
+ VARP(1),
+ EXPERIENCE_AT_LEVEL_FOR_SKILL(1),
+ VARP_TIMES_469(1),
+ COMBAT_LEVEL(1),
+ TOTAL_LEVEL(0),
+ WIDGET_CONTAINS_ITEM_STAR(3),
+ RUN_ENERGY(0),
+ WEIGHT(0),
+ VARP_TESTBIT(2),
+ VARBIT(1),
+ MINUS(0),
+ DIV(0),
+ MUL(0),
+ WORLD_X(0),
+ WORLD_Y(1),
+ CONSTANT(1);
+
+ public final int argumentCount;
+ }
+
+ public Opcode opcode;
+ public int[] operands;
+}
diff --git a/api/src/main/java/mapping/ObfuscatedGetter.java b/cache/src/main/java/net/runelite/cache/definitions/EnumDefinition.java
similarity index 78%
rename from api/src/main/java/mapping/ObfuscatedGetter.java
rename to cache/src/main/java/net/runelite/cache/definitions/EnumDefinition.java
index b8e2873006..e9f1c11b02 100644
--- a/api/src/main/java/mapping/ObfuscatedGetter.java
+++ b/cache/src/main/java/net/runelite/cache/definitions/EnumDefinition.java
@@ -22,18 +22,22 @@
* (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.mapping;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
+package net.runelite.cache.definitions;
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.FIELD)
-public @interface ObfuscatedGetter
+import lombok.Data;
+import net.runelite.cache.util.ScriptVarType;
+
+@Data
+public class EnumDefinition
{
- int intValue() default 0;
-
- long longValue() default 0L;
+ private int id;
+ private int[] intVals;
+ private ScriptVarType keyType;
+ private ScriptVarType valType;
+ private String defaultString = "null";
+ private int defaultInt;
+ private int size;
+ private int[] keys;
+ private String[] stringVals;
}
diff --git a/cache/src/main/java/net/runelite/cache/definitions/FrameDefinition.java b/cache/src/main/java/net/runelite/cache/definitions/FrameDefinition.java
new file mode 100644
index 0000000000..c31f0330ac
--- /dev/null
+++ b/cache/src/main/java/net/runelite/cache/definitions/FrameDefinition.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2017, Adam
+ * 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 FrameDefinition
+{
+ public int id; // file id
+ public FramemapDefinition framemap;
+ public int[] translator_x;
+ public int[] translator_y;
+ public int[] translator_z;
+ public int translatorCount = -1;
+ public int[] indexFrameIds;
+ public boolean showing;
+}
diff --git a/cache/src/main/java/net/runelite/cache/definitions/FramemapDefinition.java b/cache/src/main/java/net/runelite/cache/definitions/FramemapDefinition.java
new file mode 100644
index 0000000000..00669d6690
--- /dev/null
+++ b/cache/src/main/java/net/runelite/cache/definitions/FramemapDefinition.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2017, Adam
+ * 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 FramemapDefinition
+{
+ public int id;
+ public int[] types;
+ public int[][] frameMaps;
+ public int length;
+}
diff --git a/cache/src/main/java/net/runelite/cache/definitions/InterfaceDefinition.java b/cache/src/main/java/net/runelite/cache/definitions/InterfaceDefinition.java
new file mode 100644
index 0000000000..aede6d6d7b
--- /dev/null
+++ b/cache/src/main/java/net/runelite/cache/definitions/InterfaceDefinition.java
@@ -0,0 +1,131 @@
+/*
+ * Copyright (c) 2017, Adam
+ * 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 InterfaceDefinition
+{
+ public int id = -1;
+ public boolean isIf3 = false;
+ public int type;
+ public int contentType;
+ public int originalX;
+ public int originalY;
+ public int originalWidth;
+ public int originalHeight;
+ public int widthMode;
+ public int heightMode;
+ public int xPositionMode;
+ public int yPositionMode;
+ public int parentId = -1;
+ public boolean isHidden;
+ public int scrollWidth;
+ public int scrollHeight;
+ public boolean noClickThrough;
+ public int spriteId;
+ 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 offsetX2d;
+ public int offsetY2d;
+ public int rotationX;
+ public int rotationY;
+ public int rotationZ;
+ public int modelZoom;
+ public int animation;
+ public boolean orthogonal;
+ public int modelHeightOverride;
+ public int fontId;
+ 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 boolean lineDirection;
+ public int clickMask;
+ public String name;
+ public String[] actions;
+ public int dragDeadZone;
+ public int dragDeadTime;
+ public boolean dragRenderBehavior;
+ public String targetVerb;
+ public Object[] onLoadListener;
+ public Object[] onMouseOverListener;
+ public Object[] onMouseLeaveListener;
+ public Object[] onTargetLeaveListener;
+ public Object[] onTargetEnterListener;
+ public Object[] onVarTransmitListener;
+ public Object[] onInvTransmitListener;
+ public Object[] onStatTransmitListener;
+ public Object[] onTimerListener;
+ public Object[] onOpListener;
+ public Object[] onMouseRepeatListener;
+ public Object[] onClickListener;
+ public Object[] onClickRepeatListener;
+ public Object[] onReleaseListener;
+ public Object[] onHoldListener;
+ public Object[] onDragListener;
+ public Object[] onDragCompleteListener;
+ public Object[] onScrollWheelListener;
+ public int[] varTransmitTriggers;
+ public int[] invTransmitTriggers;
+ public int[] statTransmitTriggers;
+ public boolean hasListener;
+
+ public int menuType;
+ // This is set to a siblings' child id when that widget should get a hover effect when this one is hovered
+ public int hoveredSiblingId;
+ public int[] alternateOperators;
+ public int[] alternateRhs;
+ public ClientScript1Instruction[][] clientScripts;
+ public int[] itemIds;
+ public int[] itemQuantities;
+ public int xPitch;
+ public int yPitch;
+ public int[] xOffsets;
+ public int[] yOffsets;
+ public int[] sprites;
+ public String[] configActions;
+ 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;
+}
diff --git a/cache/src/main/java/net/runelite/cache/definitions/InventoryDefinition.java b/cache/src/main/java/net/runelite/cache/definitions/InventoryDefinition.java
new file mode 100644
index 0000000000..5239f5c093
--- /dev/null
+++ b/cache/src/main/java/net/runelite/cache/definitions/InventoryDefinition.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2017, Adam
+ * 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 InventoryDefinition
+{
+ public int id;
+ public int size;
+}
diff --git a/cache/src/main/java/net/runelite/cache/definitions/ItemDefinition.java b/cache/src/main/java/net/runelite/cache/definitions/ItemDefinition.java
new file mode 100644
index 0000000000..8f67622b24
--- /dev/null
+++ b/cache/src/main/java/net/runelite/cache/definitions/ItemDefinition.java
@@ -0,0 +1,123 @@
+/*
+ * Copyright (c) 2016-2017, Adam
+ * 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 java.util.Map;
+import lombok.Data;
+
+@Data
+public class ItemDefinition
+{
+ public final int id;
+
+ public String name = "null";
+
+ public int resizeX = 128;
+ public int resizeY = 128;
+ public int resizeZ = 128;
+
+ public int xan2d = 0;
+ public int yan2d = 0;
+ public int zan2d = 0;
+
+ public int cost = 1;
+ public boolean isTradeable;
+ public int stackable = 0;
+ public int inventoryModel;
+ public boolean members = false;
+
+ public short[] colorFind;
+ public short[] colorReplace;
+ public short[] textureFind;
+ public short[] textureReplace;
+
+ public int zoom2d = 2000;
+ public int xOffset2d = 0;
+ public int yOffset2d = 0;
+
+ public int ambient;
+ public int contrast;
+
+ public int[] countCo;
+ public int[] countObj;
+
+ public String[] options = new String[]
+ {
+ null, null, "Take", null, null
+ };
+
+ public String[] interfaceOptions = new String[]
+ {
+ null, null, null, null, "Drop"
+ };
+
+ public int maleModel0 = -1;
+ public int maleModel1 = -1;
+ public int maleModel2 = -1;
+ public int maleOffset;
+ public int maleHeadModel = -1;
+ public int maleHeadModel2 = -1;
+
+ public int femaleModel0 = -1;
+ public int femaleModel1 = -1;
+ public int femaleModel2 = -1;
+ public int femaleOffset;
+ public int femaleHeadModel = -1;
+ public int femaleHeadModel2 = -1;
+
+ public int notedID = -1;
+ public int notedTemplate = -1;
+
+ public int team;
+
+ public int shiftClickDropIndex = -2;
+
+ public int boughtId = -1;
+ public int boughtTemplateId = -1;
+
+ public int placeholderId = -1;
+ public int placeholderTemplateId = -1;
+
+ public Map params = null;
+
+ public void updateNote(ItemDefinition notedItem, ItemDefinition unnotedItem)
+ {
+ this.inventoryModel = notedItem.inventoryModel;
+ this.zoom2d = notedItem.zoom2d;
+ this.xan2d = notedItem.xan2d;
+ this.yan2d = notedItem.yan2d;
+ this.zan2d = notedItem.zan2d;
+ this.xOffset2d = notedItem.xOffset2d;
+ this.yOffset2d = notedItem.yOffset2d;
+ this.colorFind = notedItem.colorFind;
+ this.colorReplace = notedItem.colorReplace;
+ this.textureFind = notedItem.textureFind;
+ this.textureReplace = notedItem.textureReplace;
+ this.name = unnotedItem.name;
+ this.members = unnotedItem.members;
+ this.cost = unnotedItem.cost;
+ this.stackable = 1;
+ }
+}
diff --git a/cache/src/main/java/net/runelite/cache/definitions/KitDefinition.java b/cache/src/main/java/net/runelite/cache/definitions/KitDefinition.java
new file mode 100644
index 0000000000..bd2ee535f5
--- /dev/null
+++ b/cache/src/main/java/net/runelite/cache/definitions/KitDefinition.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2017, Adam
+ * 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 KitDefinition
+{
+ private final int id;
+ public short[] recolorToReplace;
+ public short[] recolorToFind;
+ public short[] retextureToFind;
+ public short[] retextureToReplace;
+ public int bodyPartId = -1;
+ public int[] modelIds;
+ public int[] models = new int[]
+ {
+ -1, -1, -1, -1, -1
+ };
+ public boolean nonSelectable = false;
+}
diff --git a/cache/src/main/java/net/runelite/cache/definitions/LocationsDefinition.java b/cache/src/main/java/net/runelite/cache/definitions/LocationsDefinition.java
new file mode 100644
index 0000000000..435cdd4746
--- /dev/null
+++ b/cache/src/main/java/net/runelite/cache/definitions/LocationsDefinition.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2017, Adam
+ * 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 java.util.ArrayList;
+import java.util.List;
+import lombok.Data;
+import net.runelite.cache.region.Location;
+
+@Data
+public class LocationsDefinition
+{
+ private int regionX;
+ private int regionY;
+ private List locations = new ArrayList<>();
+}
diff --git a/cache/src/main/java/net/runelite/cache/definitions/MapDefinition.java b/cache/src/main/java/net/runelite/cache/definitions/MapDefinition.java
new file mode 100644
index 0000000000..b695b24cbe
--- /dev/null
+++ b/cache/src/main/java/net/runelite/cache/definitions/MapDefinition.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2017, Adam
+ * 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 MapDefinition
+{
+ public static final int X = 64;
+ public static final int Y = 64;
+ public static final int Z = 4;
+
+ @Data
+ public static class Tile
+ {
+ public Integer height;
+ public int attrOpcode;
+ public byte settings;
+ public byte overlayId;
+ public byte overlayPath;
+ public byte overlayRotation;
+ public byte underlayId;
+ }
+
+ private int regionX;
+ private int regionY;
+ private Tile[][][] tiles = new Tile[Z][X][Y];
+}
diff --git a/cache/src/main/java/net/runelite/cache/definitions/ModelDefinition.java b/cache/src/main/java/net/runelite/cache/definitions/ModelDefinition.java
new file mode 100644
index 0000000000..2259026a4d
--- /dev/null
+++ b/cache/src/main/java/net/runelite/cache/definitions/ModelDefinition.java
@@ -0,0 +1,635 @@
+package net.runelite.cache.definitions;
+
+import java.util.Arrays;
+import lombok.Data;
+import net.runelite.cache.models.CircularAngle;
+import net.runelite.cache.models.FaceNormal;
+import net.runelite.cache.models.VertexNormal;
+
+@Data
+public class ModelDefinition
+{
+ public int id;
+
+ public int vertexCount = 0;
+ public int[] vertexPositionsX;
+ public int[] vertexPositionsY;
+ public int[] vertexPositionsZ;
+ public transient VertexNormal[] vertexNormals;
+
+ public int faceCount;
+ public int[] faceVertexIndices1;
+ public int[] faceVertexIndices2;
+ public int[] faceVertexIndices3;
+ public byte[] faceAlphas;
+ public short[] faceColors;
+ public byte[] faceRenderPriorities;
+ public byte[] faceRenderTypes;
+ public transient FaceNormal[] faceNormals;
+
+ public int textureTriangleCount;
+ public short[] textureTriangleVertexIndices1;
+ public short[] textureTriangleVertexIndices2;
+ public short[] textureTriangleVertexIndices3;
+ public transient float[][] faceTextureUCoordinates;
+ public transient float[][] faceTextureVCoordinates;
+ public short[] texturePrimaryColors;
+ public short[] faceTextures;
+ public byte[] textureCoordinates;
+ public byte[] textureRenderTypes;
+
+ public int[] vertexSkins;
+ public int[] faceSkins;
+
+ public byte priority;
+
+ public short[] aShortArray2574;
+ public short[] aShortArray2575;
+ public short[] aShortArray2577;
+ public short[] aShortArray2578;
+ public byte[] aByteArray2580;
+ public short[] aShortArray2586;
+
+ private transient int[][] vertexGroups;
+
+ private transient int[] origVX;
+ private transient int[] origVY;
+ private transient int[] origVZ;
+
+ public transient int maxPriority;
+
+ public static transient int animOffsetX, animOffsetY, animOffsetZ;
+
+ public void computeNormals()
+ {
+ if (this.vertexNormals != null)
+ {
+ return;
+ }
+
+ this.vertexNormals = new VertexNormal[this.vertexCount];
+
+ int var1;
+ for (var1 = 0; var1 < this.vertexCount; ++var1)
+ {
+ this.vertexNormals[var1] = new VertexNormal();
+ }
+
+ for (var1 = 0; var1 < this.faceCount; ++var1)
+ {
+ int vertexA = this.faceVertexIndices1[var1];
+ int vertexB = this.faceVertexIndices2[var1];
+ int vertexC = this.faceVertexIndices3[var1];
+
+ int xA = this.vertexPositionsX[vertexB] - this.vertexPositionsX[vertexA];
+ int yA = this.vertexPositionsY[vertexB] - this.vertexPositionsY[vertexA];
+ int zA = this.vertexPositionsZ[vertexB] - this.vertexPositionsZ[vertexA];
+
+ int xB = this.vertexPositionsX[vertexC] - this.vertexPositionsX[vertexA];
+ int yB = this.vertexPositionsY[vertexC] - this.vertexPositionsY[vertexA];
+ int zB = this.vertexPositionsZ[vertexC] - this.vertexPositionsZ[vertexA];
+
+ // Compute cross product
+ int var11 = yA * zB - yB * zA;
+ int var12 = zA * xB - zB * xA;
+ int var13 = xA * yB - xB * yA;
+
+ while (var11 > 8192 || var12 > 8192 || var13 > 8192 || var11 < -8192 || var12 < -8192 || var13 < -8192)
+ {
+ var11 >>= 1;
+ var12 >>= 1;
+ var13 >>= 1;
+ }
+
+ int length = (int) Math.sqrt((double) (var11 * var11 + var12 * var12 + var13 * var13));
+ if (length <= 0)
+ {
+ length = 1;
+ }
+
+ var11 = var11 * 256 / length;
+ var12 = var12 * 256 / length;
+ var13 = var13 * 256 / length;
+
+ byte var15;
+ if (this.faceRenderTypes == null)
+ {
+ var15 = 0;
+ }
+ else
+ {
+ var15 = this.faceRenderTypes[var1];
+ }
+
+ if (var15 == 0)
+ {
+ VertexNormal var16 = this.vertexNormals[vertexA];
+ var16.x += var11;
+ var16.y += var12;
+ var16.z += var13;
+ ++var16.magnitude;
+
+ var16 = this.vertexNormals[vertexB];
+ var16.x += var11;
+ var16.y += var12;
+ var16.z += var13;
+ ++var16.magnitude;
+
+ var16 = this.vertexNormals[vertexC];
+ var16.x += var11;
+ var16.y += var12;
+ var16.z += var13;
+ ++var16.magnitude;
+ }
+ else if (var15 == 1)
+ {
+ if (this.faceNormals == null)
+ {
+ this.faceNormals = new FaceNormal[this.faceCount];
+ }
+
+ FaceNormal var17 = this.faceNormals[var1] = new FaceNormal();
+ var17.x = var11;
+ var17.y = var12;
+ var17.z = var13;
+ }
+ }
+ }
+
+ /**
+ * Computes the UV coordinates for every three-vertex face that has a
+ * texture.
+ */
+ public void computeTextureUVCoordinates()
+ {
+ this.faceTextureUCoordinates = new float[faceCount][];
+ this.faceTextureVCoordinates = new float[faceCount][];
+
+ for (int i = 0; i < faceCount; i++)
+ {
+ int textureCoordinate;
+ if (textureCoordinates == null)
+ {
+ textureCoordinate = -1;
+ }
+ else
+ {
+ textureCoordinate = textureCoordinates[i];
+ }
+
+ int textureIdx;
+ if (faceTextures == null)
+ {
+ textureIdx = -1;
+ }
+ else
+ {
+ textureIdx = faceTextures[i] & 0xFFFF;
+ }
+
+ if (textureIdx != -1)
+ {
+ float[] u = new float[3];
+ float[] v = new float[3];
+
+ if (textureCoordinate == -1)
+ {
+ u[0] = 0.0F;
+ v[0] = 1.0F;
+
+ u[1] = 1.0F;
+ v[1] = 1.0F;
+
+ u[2] = 0.0F;
+ v[2] = 0.0F;
+ }
+ else
+ {
+ textureCoordinate &= 0xFF;
+
+ byte textureRenderType = 0;
+ if (textureRenderTypes != null)
+ {
+ textureRenderType = textureRenderTypes[textureCoordinate];
+ }
+
+ if (textureRenderType == 0)
+ {
+ int faceVertexIdx1 = faceVertexIndices1[i];
+ int faceVertexIdx2 = faceVertexIndices2[i];
+ int faceVertexIdx3 = faceVertexIndices3[i];
+
+ short triangleVertexIdx1 = textureTriangleVertexIndices1[textureCoordinate];
+ short triangleVertexIdx2 = textureTriangleVertexIndices2[textureCoordinate];
+ short triangleVertexIdx3 = textureTriangleVertexIndices3[textureCoordinate];
+
+ float triangleX = (float) vertexPositionsX[triangleVertexIdx1];
+ float triangleY = (float) vertexPositionsY[triangleVertexIdx1];
+ float triangleZ = (float) vertexPositionsZ[triangleVertexIdx1];
+
+ float f_882_ = (float) vertexPositionsX[triangleVertexIdx2] - triangleX;
+ float f_883_ = (float) vertexPositionsY[triangleVertexIdx2] - triangleY;
+ float f_884_ = (float) vertexPositionsZ[triangleVertexIdx2] - triangleZ;
+ float f_885_ = (float) vertexPositionsX[triangleVertexIdx3] - triangleX;
+ float f_886_ = (float) vertexPositionsY[triangleVertexIdx3] - triangleY;
+ float f_887_ = (float) vertexPositionsZ[triangleVertexIdx3] - triangleZ;
+ float f_888_ = (float) vertexPositionsX[faceVertexIdx1] - triangleX;
+ float f_889_ = (float) vertexPositionsY[faceVertexIdx1] - triangleY;
+ float f_890_ = (float) vertexPositionsZ[faceVertexIdx1] - triangleZ;
+ float f_891_ = (float) vertexPositionsX[faceVertexIdx2] - triangleX;
+ float f_892_ = (float) vertexPositionsY[faceVertexIdx2] - triangleY;
+ float f_893_ = (float) vertexPositionsZ[faceVertexIdx2] - triangleZ;
+ float f_894_ = (float) vertexPositionsX[faceVertexIdx3] - triangleX;
+ float f_895_ = (float) vertexPositionsY[faceVertexIdx3] - triangleY;
+ float f_896_ = (float) vertexPositionsZ[faceVertexIdx3] - triangleZ;
+
+ float f_897_ = f_883_ * f_887_ - f_884_ * f_886_;
+ float f_898_ = f_884_ * f_885_ - f_882_ * f_887_;
+ float f_899_ = f_882_ * f_886_ - f_883_ * f_885_;
+ float f_900_ = f_886_ * f_899_ - f_887_ * f_898_;
+ float f_901_ = f_887_ * f_897_ - f_885_ * f_899_;
+ float f_902_ = f_885_ * f_898_ - f_886_ * f_897_;
+ float f_903_ = 1.0F / (f_900_ * f_882_ + f_901_ * f_883_ + f_902_ * f_884_);
+
+ u[0] = (f_900_ * f_888_ + f_901_ * f_889_ + f_902_ * f_890_) * f_903_;
+ u[1] = (f_900_ * f_891_ + f_901_ * f_892_ + f_902_ * f_893_) * f_903_;
+ u[2] = (f_900_ * f_894_ + f_901_ * f_895_ + f_902_ * f_896_) * f_903_;
+
+ f_900_ = f_883_ * f_899_ - f_884_ * f_898_;
+ f_901_ = f_884_ * f_897_ - f_882_ * f_899_;
+ f_902_ = f_882_ * f_898_ - f_883_ * f_897_;
+ f_903_ = 1.0F / (f_900_ * f_885_ + f_901_ * f_886_ + f_902_ * f_887_);
+
+ v[0] = (f_900_ * f_888_ + f_901_ * f_889_ + f_902_ * f_890_) * f_903_;
+ v[1] = (f_900_ * f_891_ + f_901_ * f_892_ + f_902_ * f_893_) * f_903_;
+ v[2] = (f_900_ * f_894_ + f_901_ * f_895_ + f_902_ * f_896_) * f_903_;
+ }
+ }
+
+ this.faceTextureUCoordinates[i] = u;
+ this.faceTextureVCoordinates[i] = v;
+ }
+ }
+ }
+
+ public void computeAnimationTables()
+ {
+ if (this.vertexSkins != null)
+ {
+ int[] groupCounts = new int[256];
+ int numGroups = 0;
+ int var3, var4;
+
+ for (var3 = 0; var3 < this.vertexCount; ++var3)
+ {
+ var4 = this.vertexSkins[var3];
+ ++groupCounts[var4];
+ if (var4 > numGroups)
+ {
+ numGroups = var4;
+ }
+ }
+
+ this.vertexGroups = new int[numGroups + 1][];
+
+ for (var3 = 0; var3 <= numGroups; ++var3)
+ {
+ this.vertexGroups[var3] = new int[groupCounts[var3]];
+ groupCounts[var3] = 0;
+ }
+
+ for (var3 = 0; var3 < this.vertexCount; this.vertexGroups[var4][groupCounts[var4]++] = var3++)
+ {
+ var4 = this.vertexSkins[var3];
+ }
+
+ this.vertexSkins = null;
+ }
+
+ // triangleSkinValues is here
+ }
+
+ public void rotate(int orientation)
+ {
+ int sin = CircularAngle.SINE[orientation];
+ int cos = CircularAngle.COSINE[orientation];
+
+ assert vertexPositionsX.length == vertexPositionsY.length;
+ assert vertexPositionsY.length == vertexPositionsZ.length;
+
+ for (int i = 0; i < vertexPositionsX.length; ++i)
+ {
+ vertexPositionsX[i] = vertexPositionsX[i] * cos + vertexPositionsZ[i] * sin >> 16;
+ vertexPositionsZ[i] = vertexPositionsZ[i] * cos - vertexPositionsX[i] * sin >> 16;
+ }
+
+ reset();
+ }
+
+ public void resetAnim()
+ {
+ if (origVX == null)
+ {
+ return;
+ }
+
+ System.arraycopy(origVX, 0, vertexPositionsX, 0, origVX.length);
+ System.arraycopy(origVY, 0, vertexPositionsY, 0, origVY.length);
+ System.arraycopy(origVZ, 0, vertexPositionsZ, 0, origVZ.length);
+ }
+
+ public void animate(int type, int[] frameMap, int dx, int dy, int dz)
+ {
+ if (origVX == null)
+ {
+ origVX = Arrays.copyOf(vertexPositionsX, vertexPositionsX.length);
+ origVY = Arrays.copyOf(vertexPositionsY, vertexPositionsY.length);
+ origVZ = Arrays.copyOf(vertexPositionsZ, vertexPositionsZ.length);
+ }
+
+ final int[] verticesX = vertexPositionsX;
+ final int[] verticesY = vertexPositionsY;
+ final int[] verticesZ = vertexPositionsZ;
+ int var6 = frameMap.length;
+ int var7;
+ int var8;
+ int var11;
+ int var12;
+ if (type == 0)
+ {
+ var7 = 0;
+ animOffsetX = 0;
+ animOffsetY = 0;
+ animOffsetZ = 0;
+
+ for (var8 = 0; var8 < var6; ++var8)
+ {
+ int var9 = frameMap[var8];
+ if (var9 < this.vertexGroups.length)
+ {
+ int[] var10 = this.vertexGroups[var9];
+
+ for (var11 = 0; var11 < var10.length; ++var11)
+ {
+ var12 = var10[var11];
+ animOffsetX += verticesX[var12];
+ animOffsetY += verticesY[var12];
+ animOffsetZ += verticesZ[var12];
+ ++var7;
+ }
+ }
+ }
+
+ if (var7 > 0)
+ {
+ animOffsetX = dx + animOffsetX / var7;
+ animOffsetY = dy + animOffsetY / var7;
+ animOffsetZ = dz + animOffsetZ / var7;
+ }
+ else
+ {
+ animOffsetX = dx;
+ animOffsetY = dy;
+ animOffsetZ = dz;
+ }
+
+ }
+ else
+ {
+ int[] var18;
+ int var19;
+ if (type == 1)
+ {
+ for (var7 = 0; var7 < var6; ++var7)
+ {
+ var8 = frameMap[var7];
+ if (var8 < this.vertexGroups.length)
+ {
+ var18 = this.vertexGroups[var8];
+
+ for (var19 = 0; var19 < var18.length; ++var19)
+ {
+ var11 = var18[var19];
+ verticesX[var11] += dx;
+ verticesY[var11] += dy;
+ verticesZ[var11] += dz;
+ }
+ }
+ }
+
+ }
+ else if (type == 2)
+ {
+ for (var7 = 0; var7 < var6; ++var7)
+ {
+ var8 = frameMap[var7];
+ if (var8 < this.vertexGroups.length)
+ {
+ var18 = this.vertexGroups[var8];
+
+ for (var19 = 0; var19 < var18.length; ++var19)
+ {
+ var11 = var18[var19];
+ verticesX[var11] -= animOffsetX;
+ verticesY[var11] -= animOffsetY;
+ verticesZ[var11] -= animOffsetZ;
+ var12 = (dx & 255) * 8;
+ int var13 = (dy & 255) * 8;
+ int var14 = (dz & 255) * 8;
+ int var15;
+ int var16;
+ int var17;
+ if (var14 != 0)
+ {
+ var15 = CircularAngle.SINE[var14];
+ var16 = CircularAngle.COSINE[var14];
+ var17 = var15 * verticesY[var11] + var16 * verticesX[var11] >> 16;
+ verticesY[var11] = var16 * verticesY[var11] - var15 * verticesX[var11] >> 16;
+ verticesX[var11] = var17;
+ }
+
+ if (var12 != 0)
+ {
+ var15 = CircularAngle.SINE[var12];
+ var16 = CircularAngle.COSINE[var12];
+ var17 = var16 * verticesY[var11] - var15 * verticesZ[var11] >> 16;
+ verticesZ[var11] = var15 * verticesY[var11] + var16 * verticesZ[var11] >> 16;
+ verticesY[var11] = var17;
+ }
+
+ if (var13 != 0)
+ {
+ var15 = CircularAngle.SINE[var13];
+ var16 = CircularAngle.COSINE[var13];
+ var17 = var15 * verticesZ[var11] + var16 * verticesX[var11] >> 16;
+ verticesZ[var11] = var16 * verticesZ[var11] - var15 * verticesX[var11] >> 16;
+ verticesX[var11] = var17;
+ }
+
+ verticesX[var11] += animOffsetX;
+ verticesY[var11] += animOffsetY;
+ verticesZ[var11] += animOffsetZ;
+ }
+ }
+ }
+
+ }
+ else if (type == 3)
+ {
+ for (var7 = 0; var7 < var6; ++var7)
+ {
+ var8 = frameMap[var7];
+ if (var8 < this.vertexGroups.length)
+ {
+ var18 = this.vertexGroups[var8];
+
+ for (var19 = 0; var19 < var18.length; ++var19)
+ {
+ var11 = var18[var19];
+ verticesX[var11] -= animOffsetX;
+ verticesY[var11] -= animOffsetY;
+ verticesZ[var11] -= animOffsetZ;
+ verticesX[var11] = dx * verticesX[var11] / 128;
+ verticesY[var11] = dy * verticesY[var11] / 128;
+ verticesZ[var11] = dz * verticesZ[var11] / 128;
+ verticesX[var11] += animOffsetX;
+ verticesY[var11] += animOffsetY;
+ verticesZ[var11] += animOffsetZ;
+ }
+ }
+ }
+
+ }
+ else if (type == 5)
+ {
+ // alpha animation
+ }
+ }
+ }
+
+ public void method1493()
+ {
+ int var1;
+ for (var1 = 0; var1 < this.vertexCount; ++var1)
+ {
+ this.vertexPositionsZ[var1] = -this.vertexPositionsZ[var1];
+ }
+
+ for (var1 = 0; var1 < this.faceCount; ++var1)
+ {
+ int var2 = this.faceVertexIndices1[var1];
+ this.faceVertexIndices1[var1] = this.faceVertexIndices3[var1];
+ this.faceVertexIndices3[var1] = var2;
+ }
+
+ reset();
+ }
+
+ public void rotate1()
+ {
+ for (int var1 = 0; var1 < this.vertexCount; ++var1)
+ {
+ int var2 = this.vertexPositionsX[var1];
+ this.vertexPositionsX[var1] = this.vertexPositionsZ[var1];
+ this.vertexPositionsZ[var1] = -var2;
+ }
+
+ reset();
+ }
+
+ public void rotate2()
+ {
+ for (int var1 = 0; var1 < this.vertexCount; ++var1)
+ {
+ this.vertexPositionsX[var1] = -this.vertexPositionsX[var1];
+ this.vertexPositionsZ[var1] = -this.vertexPositionsZ[var1];
+ }
+
+ reset();
+ }
+
+ public void rotate3()
+ {
+ for (int var1 = 0; var1 < this.vertexCount; ++var1)
+ {
+ int var2 = this.vertexPositionsZ[var1];
+ this.vertexPositionsZ[var1] = this.vertexPositionsX[var1];
+ this.vertexPositionsX[var1] = -var2;
+ }
+
+ reset();
+ }
+
+ private void reset()
+ {
+ vertexNormals = null;
+ faceNormals = null;
+ faceTextureUCoordinates = faceTextureVCoordinates = null;
+ }
+
+ public void resize(int var1, int var2, int var3)
+ {
+ for (int var4 = 0; var4 < this.vertexCount; ++var4)
+ {
+ this.vertexPositionsX[var4] = this.vertexPositionsX[var4] * var1 / 128;
+ this.vertexPositionsY[var4] = var2 * this.vertexPositionsY[var4] / 128;
+ this.vertexPositionsZ[var4] = var3 * this.vertexPositionsZ[var4] / 128;
+ }
+
+ reset();
+ }
+
+ public void recolor(short var1, short var2)
+ {
+ for (int var3 = 0; var3 < this.faceCount; ++var3)
+ {
+ if (this.faceColors[var3] == var1)
+ {
+ this.faceColors[var3] = var2;
+ }
+ }
+
+ }
+
+ public void retexture(short var1, short var2)
+ {
+ if (this.faceTextures != null)
+ {
+ for (int var3 = 0; var3 < this.faceCount; ++var3)
+ {
+ if (this.faceTextures[var3] == var1)
+ {
+ this.faceTextures[var3] = var2;
+ }
+ }
+
+ }
+ }
+
+ public void move(int xOffset, int yOffset, int zOffset)
+ {
+ for (int i = 0; i < this.vertexCount; i++)
+ {
+ this.vertexPositionsX[i] += xOffset;
+ this.vertexPositionsY[i] += yOffset;
+ this.vertexPositionsZ[i] += zOffset;
+ }
+ this.reset();
+ }
+
+ public void computeMaxPriority()
+ {
+ if (faceRenderPriorities == null)
+ {
+ return;
+ }
+
+ for (int i = 0; i < faceCount; ++i)
+ {
+ if (faceRenderPriorities[i] > maxPriority)
+ {
+ maxPriority = faceRenderPriorities[i];
+ }
+ }
+ }
+}
diff --git a/deobfuscator/src/main/java/net/runelite/deob/util/NameMappings.java b/cache/src/main/java/net/runelite/cache/definitions/NpcDefinition.java
similarity index 55%
rename from deobfuscator/src/main/java/net/runelite/deob/util/NameMappings.java
rename to cache/src/main/java/net/runelite/cache/definitions/NpcDefinition.java
index 36c1b52c92..8ba160c97a 100644
--- a/deobfuscator/src/main/java/net/runelite/deob/util/NameMappings.java
+++ b/cache/src/main/java/net/runelite/cache/definitions/NpcDefinition.java
@@ -23,52 +23,46 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-package net.runelite.deob.util;
+package net.runelite.cache.definitions;
-import java.util.HashMap;
import java.util.Map;
-import net.runelite.asm.pool.Class;
-import net.runelite.asm.pool.Field;
-import net.runelite.asm.pool.Method;
+import lombok.Data;
-public class NameMappings
+@Data
+public class NpcDefinition
{
- private final Map map = new HashMap<>();
- private final Map paramMap = new HashMap<>();
-
- public void map(Class cf, String name)
- {
- map.put(cf, name);
- }
-
- public void map(Field field, String name)
- {
- map.put(field, name);
- }
-
- public void map(Method method, String name)
- {
- map.put(method, name);
- }
-
- public void map(Method method, String[] params)
- {
- paramMap.put(method, params);
- }
-
- public String get(Object object)
- {
- return map.get(object);
- }
-
- public String[] getP(Method method)
- {
- return paramMap.get(method);
- }
-
- public Map getMap()
- {
- return map;
- }
+ public final int id;
+ public short[] recolorToFind;
+ public int rotation = 32;
+ public String name = "null";
+ public short[] recolorToReplace;
+ public int[] models;
+ public int[] models_2;
+ public int stanceAnimation = -1;
+ public int anInt2165 = -1;
+ public int tileSpacesOccupied = 1;
+ public int walkAnimation = -1;
+ public short[] retextureToReplace;
+ public int rotate90RightAnimation = -1;
+ public boolean aBool2170 = true;
+ public int resizeX = 128;
+ public int contrast = 0;
+ public int rotate180Animation = -1;
+ public int varbitIndex = -1;
+ public String[] options = new String[5];
+ public boolean renderOnMinimap = true;
+ public int combatLevel = -1;
+ public int rotate90LeftAnimation = -1;
+ public int resizeY = 128;
+ public boolean hasRenderPriority = false;
+ public int ambient = 0;
+ public int headIcon = -1;
+ public int[] configs;
+ public short[] retextureToFind;
+ public int varpIndex = -1;
+ public boolean isClickable = true;
+ public int anInt2189 = -1;
+ public boolean aBool2190 = false;
+ public Map params = null;
}
diff --git a/cache/src/main/java/net/runelite/cache/definitions/ObjectDefinition.java b/cache/src/main/java/net/runelite/cache/definitions/ObjectDefinition.java
new file mode 100644
index 0000000000..007c9e2ebf
--- /dev/null
+++ b/cache/src/main/java/net/runelite/cache/definitions/ObjectDefinition.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 2016-2017, Adam
+ * 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 java.util.Map;
+import lombok.Data;
+
+@Data
+public class ObjectDefinition
+{
+ private int id;
+ private short[] retextureToFind;
+ private int anInt2069 = 16;
+ private boolean isSolid = false;
+ private String name = "null";
+ private int[] objectModels;
+ private int[] objectTypes;
+ private short[] recolorToFind;
+ private int mapAreaId = -1;
+ private short[] textureToReplace;
+ private int sizeX = 1;
+ private int sizeY = 1;
+ private int anInt2083 = 0;
+ private int[] anIntArray2084;
+ private int offsetX = 0;
+ private boolean nonFlatShading = false;
+ private int anInt2088 = -1;
+ private int animationID = -1;
+ private int varbitID = -1;
+ private int ambient = 0;
+ private int contrast = 0;
+ private String[] actions = new String[5];
+ private int interactType = 2;
+ private int mapSceneID = -1;
+ private short[] recolorToReplace;
+ private boolean aBool2097 = true;
+ private int modelSizeX = 128;
+ private int modelSizeHeight = 128;
+ private int modelSizeY = 128;
+ private int objectID;
+ private int offsetHeight = 0;
+ private int offsetY = 0;
+ private boolean aBool2104 = false;
+ private int anInt2105 = -1;
+ private int anInt2106 = -1;
+ private int[] configChangeDest;
+ private boolean isRotated = false;
+ private int varpID = -1;
+ private int anInt2110 = -1;
+ private boolean aBool2111 = false;
+ private int anInt2112 = 0;
+ private int anInt2113 = 0;
+ private boolean blocksProjectile = true;
+ private Map params = null;
+}
diff --git a/cache/src/main/java/net/runelite/cache/definitions/OverlayDefinition.java b/cache/src/main/java/net/runelite/cache/definitions/OverlayDefinition.java
new file mode 100644
index 0000000000..3846e99364
--- /dev/null
+++ b/cache/src/main/java/net/runelite/cache/definitions/OverlayDefinition.java
@@ -0,0 +1,139 @@
+/*
+ * Copyright (c) 2016-2017, Adam
+ * 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 OverlayDefinition
+{
+ private int id;
+ private int rgbColor = 0;
+ private int texture = -1;
+ private int secondaryRgbColor = -1;
+ private boolean hideUnderlay = true;
+
+ private transient int hue;
+ private transient int saturation;
+ private transient int lightness;
+
+ private transient int otherHue;
+ private transient int otherSaturation;
+ private transient int otherLightness;
+
+ public void calculateHsl()
+ {
+ if (secondaryRgbColor != -1)
+ {
+ calculateHsl(secondaryRgbColor);
+ otherHue = hue;
+ otherSaturation = saturation;
+ otherLightness = lightness;
+ }
+
+ calculateHsl(rgbColor);
+ }
+
+ private void calculateHsl(int var1)
+ {
+ double var2 = (double) (var1 >> 16 & 255) / 256.0D;
+ double var4 = (double) (var1 >> 8 & 255) / 256.0D;
+ double var6 = (double) (var1 & 255) / 256.0D;
+ double var8 = var2;
+ if (var4 < var2)
+ {
+ var8 = var4;
+ }
+
+ if (var6 < var8)
+ {
+ var8 = var6;
+ }
+
+ double var10 = var2;
+ if (var4 > var2)
+ {
+ var10 = var4;
+ }
+
+ if (var6 > var10)
+ {
+ var10 = var6;
+ }
+
+ double var12 = 0.0D;
+ double var14 = 0.0D;
+ double var16 = (var8 + var10) / 2.0D;
+ if (var10 != var8)
+ {
+ if (var16 < 0.5D)
+ {
+ var14 = (var10 - var8) / (var10 + var8);
+ }
+
+ if (var16 >= 0.5D)
+ {
+ var14 = (var10 - var8) / (2.0D - var10 - var8);
+ }
+
+ if (var2 == var10)
+ {
+ var12 = (var4 - var6) / (var10 - var8);
+ }
+ else if (var4 == var10)
+ {
+ var12 = 2.0D + (var6 - var2) / (var10 - var8);
+ }
+ else if (var10 == var6)
+ {
+ var12 = 4.0D + (var2 - var4) / (var10 - var8);
+ }
+ }
+
+ var12 /= 6.0D;
+ this.hue = (int) (256.0D * var12);
+ this.saturation = (int) (var14 * 256.0D);
+ this.lightness = (int) (var16 * 256.0D);
+ if (this.saturation < 0)
+ {
+ this.saturation = 0;
+ }
+ else if (this.saturation > 255)
+ {
+ this.saturation = 255;
+ }
+
+ if (this.lightness < 0)
+ {
+ this.lightness = 0;
+ }
+ else if (this.lightness > 255)
+ {
+ this.lightness = 255;
+ }
+
+ }
+}
diff --git a/api/src/main/java/mapping/Implements.java b/cache/src/main/java/net/runelite/cache/definitions/ScriptDefinition.java
similarity index 78%
rename from api/src/main/java/mapping/Implements.java
rename to cache/src/main/java/net/runelite/cache/definitions/ScriptDefinition.java
index 4c19074e10..cb57851b8c 100644
--- a/api/src/main/java/mapping/Implements.java
+++ b/cache/src/main/java/net/runelite/cache/definitions/ScriptDefinition.java
@@ -22,16 +22,21 @@
* (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.mapping;
+package net.runelite.cache.definitions;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
+import java.util.Map;
+import lombok.Data;
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.TYPE)
-public @interface Implements
+@Data
+public class ScriptDefinition
{
- String value();
+ private int id;
+ private int[] instructions;
+ private int[] intOperands;
+ private String[] stringOperands;
+ private int intStackCount;
+ private int stringStackCount;
+ private int localIntCount;
+ private int localStringCount;
+ private Map[] switches;
}
diff --git a/api/src/main/java/mapping/Export.java b/cache/src/main/java/net/runelite/cache/definitions/SequenceDefinition.java
similarity index 70%
rename from api/src/main/java/mapping/Export.java
rename to cache/src/main/java/net/runelite/cache/definitions/SequenceDefinition.java
index cd789618cd..3f280f31c2 100644
--- a/api/src/main/java/mapping/Export.java
+++ b/cache/src/main/java/net/runelite/cache/definitions/SequenceDefinition.java
@@ -22,19 +22,26 @@
* (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.mapping;
+package net.runelite.cache.definitions;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
+import lombok.Data;
-@Retention(RetentionPolicy.RUNTIME)
-@Target(
+@Data
+public class SequenceDefinition
{
- ElementType.FIELD, ElementType.METHOD
-})
-public @interface Export
-{
- String value();
+ private final int id;
+ public int[] frameIDs; // top 16 bits are FrameDefinition ids
+ public int[] field3048;
+ public int[] frameLenghts;
+ public int rightHandItem = -1;
+ public int[] interleaveLeave;
+ public boolean stretches = false;
+ public int forcedPriority = 5;
+ public int maxLoops = 99;
+ public int[] field3056;
+ public int precedenceAnimating = -1;
+ public int leftHandItem = -1;
+ public int replyMode = 2;
+ public int frameStep = -1;
+ public int priority = -1;
}
diff --git a/api/src/main/java/mapping/Hook.java b/cache/src/main/java/net/runelite/cache/definitions/SpotAnimDefinition.java
similarity index 76%
rename from api/src/main/java/mapping/Hook.java
rename to cache/src/main/java/net/runelite/cache/definitions/SpotAnimDefinition.java
index 6fa13fb8d5..e85b3918e2 100644
--- a/api/src/main/java/mapping/Hook.java
+++ b/cache/src/main/java/net/runelite/cache/definitions/SpotAnimDefinition.java
@@ -22,23 +22,23 @@
* (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.mapping;
+package net.runelite.cache.definitions;
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
+import lombok.Data;
-@Retention(RetentionPolicy.RUNTIME)
-@Target(
- {
- ElementType.METHOD, ElementType.CONSTRUCTOR
- })
-@Documented
-public @interface Hook
+@Data
+public class SpotAnimDefinition
{
- String value();
-
- boolean end() default false;
+ public int rotaton = 0;
+ public short[] textureToReplace;
+ public int id;
+ public short[] textureToFind;
+ public int resizeY = 128;
+ public int animationId = -1;
+ public short[] recolorToFind;
+ public short[] recolorToReplace;
+ public int resizeX = 128;
+ public int modelId;
+ public int ambient = 0;
+ public int contrast = 0;
}
diff --git a/cache/src/main/java/net/runelite/cache/definitions/SpriteDefinition.java b/cache/src/main/java/net/runelite/cache/definitions/SpriteDefinition.java
new file mode 100644
index 0000000000..632ea1e4e3
--- /dev/null
+++ b/cache/src/main/java/net/runelite/cache/definitions/SpriteDefinition.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2016-2017, Adam
+ * 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 SpriteDefinition
+{
+ private int id;
+ private int frame;
+ private int offsetX;
+ private int offsetY;
+ private int width;
+ private int height;
+ private int[] pixels;
+ private int maxWidth;
+ private int maxHeight;
+
+ public transient byte[] pixelIdx;
+ public transient int[] palette;
+
+ public void normalize()
+ {
+ if (this.width != this.maxWidth || this.height != this.maxHeight)
+ {
+ byte[] var1 = new byte[this.maxWidth * this.maxHeight];
+ int var2 = 0;
+
+ for (int var3 = 0; var3 < this.height; ++var3)
+ {
+ for (int var4 = 0; var4 < this.width; ++var4)
+ {
+ var1[var4 + (var3 + this.offsetY) * this.maxWidth + this.offsetX] = this.pixelIdx[var2++];
+ }
+ }
+
+ this.pixelIdx = var1;
+ this.width = this.maxWidth;
+ this.height = this.maxHeight;
+ this.offsetX = 0;
+ this.offsetY = 0;
+ }
+ }
+}
diff --git a/cache/src/main/java/net/runelite/cache/definitions/StructDefinition.java b/cache/src/main/java/net/runelite/cache/definitions/StructDefinition.java
new file mode 100644
index 0000000000..455ce9ea5e
--- /dev/null
+++ b/cache/src/main/java/net/runelite/cache/definitions/StructDefinition.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2018, Joshua Filby
+ * 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 java.util.Map;
+import lombok.Data;
+
+@Data
+public class StructDefinition
+{
+ public final int id;
+ public Map params = null;
+}
diff --git a/cache/src/main/java/net/runelite/cache/definitions/TextureDefinition.java b/cache/src/main/java/net/runelite/cache/definitions/TextureDefinition.java
new file mode 100644
index 0000000000..d34bc5678a
--- /dev/null
+++ b/cache/src/main/java/net/runelite/cache/definitions/TextureDefinition.java
@@ -0,0 +1,150 @@
+/*
+ * Copyright (c) 2016-2017, Adam
+ * 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;
+import net.runelite.cache.definitions.providers.SpriteProvider;
+
+@Data
+public class TextureDefinition
+{
+ public int field1777;
+ public boolean field1778;
+ private int id;
+ private int[] fileIds;
+ public int[] field1780;
+ public int[] field1781;
+ public int[] field1786;
+ public int field1782;
+ public int field1783;
+
+ public transient int[] pixels;
+
+ public boolean method2680(double var1, int var3, SpriteProvider spriteProvider)
+ {
+ int var5 = var3 * var3;
+ this.pixels = new int[var5];
+
+ for (int var6 = 0; var6 < this.fileIds.length; ++var6)
+ {
+ SpriteDefinition var7 = spriteProvider.provide(fileIds[var6], 0);
+ var7.normalize();
+ byte[] var8 = var7.pixelIdx;
+ int[] var9 = var7.palette;
+ int var10 = this.field1786[var6];
+
+ int var11;
+ int var12;
+ int var13;
+ int var14;
+ if ((var10 & -16777216) == 50331648)
+ {
+ var11 = var10 & 16711935;
+ var12 = var10 >> 8 & 255;
+
+ for (var13 = 0; var13 < var9.length; ++var13)
+ {
+ var14 = var9[var13];
+ if (var14 >> 8 == (var14 & 65535))
+ {
+ var14 &= 255;
+ var9[var13] = var11 * var14 >> 8 & 16711935 | var12 * var14 & 65280;
+ }
+ }
+ }
+
+ for (var11 = 0; var11 < var9.length; ++var11)
+ {
+ var9[var11] = adjustRGB(var9[var11], var1);
+ }
+
+ if (var6 == 0)
+ {
+ var11 = 0;
+ }
+ else
+ {
+ var11 = this.field1780[var6 - 1];
+ }
+
+ if (var11 == 0)
+ {
+ if (var3 == var7.getMaxWidth())
+ {
+ for (var12 = 0; var12 < var5; ++var12)
+ {
+ this.pixels[var12] = var9[var8[var12] & 255];
+ }
+ }
+ else if (var7.getMaxWidth() == 64 && var3 == 128)
+ {
+ var12 = 0;
+
+ for (var13 = 0; var13 < var3; ++var13)
+ {
+ for (var14 = 0; var14 < var3; ++var14)
+ {
+ this.pixels[var12++] = var9[var8[(var13 >> 1 << 6) + (var14 >> 1)] & 255];
+ }
+ }
+ }
+ else
+ {
+ if (var7.getMaxWidth() != 128 || var3 != 64)
+ {
+ throw new RuntimeException();
+ }
+
+ var12 = 0;
+
+ for (var13 = 0; var13 < var3; ++var13)
+ {
+ for (var14 = 0; var14 < var3; ++var14)
+ {
+ this.pixels[var12++] = var9[var8[(var14 << 1) + (var13 << 1 << 7)] & 255];
+ }
+ }
+ }
+ }
+ }
+
+ return true;
+ }
+
+ static int adjustRGB(int var0, double var1)
+ {
+ double var3 = (double) (var0 >> 16) / 256.0D;
+ double var5 = (double) (var0 >> 8 & 255) / 256.0D;
+ double var7 = (double) (var0 & 255) / 256.0D;
+ var3 = Math.pow(var3, var1);
+ var5 = Math.pow(var5, var1);
+ var7 = Math.pow(var7, var1);
+ int var9 = (int) (var3 * 256.0D);
+ int var10 = (int) (var5 * 256.0D);
+ int var11 = (int) (var7 * 256.0D);
+ return var11 + (var10 << 8) + (var9 << 16);
+ }
+}
diff --git a/cache/src/main/java/net/runelite/cache/definitions/TrackDefinition.java b/cache/src/main/java/net/runelite/cache/definitions/TrackDefinition.java
new file mode 100644
index 0000000000..136070e8f9
--- /dev/null
+++ b/cache/src/main/java/net/runelite/cache/definitions/TrackDefinition.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2017, Adam
+ * 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 TrackDefinition
+{
+ public byte[] midi; // midi file contents
+}
diff --git a/cache/src/main/java/net/runelite/cache/definitions/UnderlayDefinition.java b/cache/src/main/java/net/runelite/cache/definitions/UnderlayDefinition.java
new file mode 100644
index 0000000000..7d3d8c2a47
--- /dev/null
+++ b/cache/src/main/java/net/runelite/cache/definitions/UnderlayDefinition.java
@@ -0,0 +1,134 @@
+/*
+ * Copyright (c) 2016-2017, Adam
+ * 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 UnderlayDefinition
+{
+ private int id;
+ private int color;
+
+ private transient int hue;
+ private transient int saturation;
+ private transient int lightness;
+ private transient int hueMultiplier;
+
+ public void calculateHsl()
+ {
+ int var1 = color;
+ double var2 = (double) (var1 >> 16 & 255) / 256.0D;
+ double var4 = (double) (var1 >> 8 & 255) / 256.0D;
+ double var6 = (double) (var1 & 255) / 256.0D;
+ double var8 = var2;
+ if (var4 < var2)
+ {
+ var8 = var4;
+ }
+
+ if (var6 < var8)
+ {
+ var8 = var6;
+ }
+
+ double var10 = var2;
+ if (var4 > var2)
+ {
+ var10 = var4;
+ }
+
+ if (var6 > var10)
+ {
+ var10 = var6;
+ }
+
+ double var12 = 0.0D;
+ double var14 = 0.0D;
+ double var16 = (var10 + var8) / 2.0D;
+ if (var8 != var10)
+ {
+ if (var16 < 0.5D)
+ {
+ var14 = (var10 - var8) / (var8 + var10);
+ }
+
+ if (var16 >= 0.5D)
+ {
+ var14 = (var10 - var8) / (2.0D - var10 - var8);
+ }
+
+ if (var2 == var10)
+ {
+ var12 = (var4 - var6) / (var10 - var8);
+ }
+ else if (var10 == var4)
+ {
+ var12 = 2.0D + (var6 - var2) / (var10 - var8);
+ }
+ else if (var10 == var6)
+ {
+ var12 = 4.0D + (var2 - var4) / (var10 - var8);
+ }
+ }
+
+ var12 /= 6.0D;
+ this.saturation = (int) (var14 * 256.0D);
+ this.lightness = (int) (var16 * 256.0D);
+ if (this.saturation < 0)
+ {
+ this.saturation = 0;
+ }
+ else if (this.saturation > 255)
+ {
+ this.saturation = 255;
+ }
+
+ if (this.lightness < 0)
+ {
+ this.lightness = 0;
+ }
+ else if (this.lightness > 255)
+ {
+ this.lightness = 255;
+ }
+
+ if (var16 > 0.5D)
+ {
+ this.hueMultiplier = (int) (var14 * (1.0D - var16) * 512.0D);
+ }
+ else
+ {
+ this.hueMultiplier = (int) (var14 * var16 * 512.0D);
+ }
+
+ if (this.hueMultiplier < 1)
+ {
+ this.hueMultiplier = 1;
+ }
+
+ this.hue = (int) ((double) this.hueMultiplier * var12);
+ }
+}
diff --git a/cache/src/main/java/net/runelite/cache/definitions/VarbitDefinition.java b/cache/src/main/java/net/runelite/cache/definitions/VarbitDefinition.java
new file mode 100644
index 0000000000..f50ae2ddf1
--- /dev/null
+++ b/cache/src/main/java/net/runelite/cache/definitions/VarbitDefinition.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2017, Adam
+ * 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 VarbitDefinition
+{
+ private int id;
+ private int index;
+ private int leastSignificantBit;
+ private int mostSignificantBit;
+}
diff --git a/cache/src/main/java/net/runelite/cache/definitions/WorldMapDefinition.java b/cache/src/main/java/net/runelite/cache/definitions/WorldMapDefinition.java
new file mode 100644
index 0000000000..a8333263e5
--- /dev/null
+++ b/cache/src/main/java/net/runelite/cache/definitions/WorldMapDefinition.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2017, Adam
+ * 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 java.util.List;
+import lombok.Data;
+import net.runelite.cache.region.Position;
+
+@Data
+public class WorldMapDefinition
+{
+ public String name;
+ public int field450;
+ public int field451;
+ public int fileId;
+ public int field453;
+ public int field454;
+ public int field456;
+ public boolean field457;
+ public List field458;
+ 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
new file mode 100644
index 0000000000..1294d0eb4d
--- /dev/null
+++ b/cache/src/main/java/net/runelite/cache/definitions/WorldMapType0.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2017, Adam
+ * 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 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;
+}
diff --git a/cache/src/main/java/net/runelite/cache/definitions/WorldMapType1.java b/cache/src/main/java/net/runelite/cache/definitions/WorldMapType1.java
new file mode 100644
index 0000000000..15a4f3e28d
--- /dev/null
+++ b/cache/src/main/java/net/runelite/cache/definitions/WorldMapType1.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2017, Adam
+ * 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 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;
+}
diff --git a/cache/src/main/java/net/runelite/cache/definitions/WorldMapType2.java b/cache/src/main/java/net/runelite/cache/definitions/WorldMapType2.java
new file mode 100644
index 0000000000..7b5326814d
--- /dev/null
+++ b/cache/src/main/java/net/runelite/cache/definitions/WorldMapType2.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2017, Adam
+ * 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 WorldMapType2 implements WorldMapTypeBase
+{
+ public int field510;
+ public int field511;
+ public int field512;
+ public int field514;
+ public int field515;
+ public int field519;
+}
diff --git a/cache/src/main/java/net/runelite/cache/definitions/WorldMapType3.java b/cache/src/main/java/net/runelite/cache/definitions/WorldMapType3.java
new file mode 100644
index 0000000000..433c8a17fa
--- /dev/null
+++ b/cache/src/main/java/net/runelite/cache/definitions/WorldMapType3.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2017, Adam
+ * 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 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;
+}
diff --git a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/lvt/LVTType.java b/cache/src/main/java/net/runelite/cache/definitions/WorldMapTypeBase.java
similarity index 94%
rename from deobfuscator/src/main/java/net/runelite/deob/deobfuscators/lvt/LVTType.java
rename to cache/src/main/java/net/runelite/cache/definitions/WorldMapTypeBase.java
index 573aad34d9..d24d6d63f3 100644
--- a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/lvt/LVTType.java
+++ b/cache/src/main/java/net/runelite/cache/definitions/WorldMapTypeBase.java
@@ -22,11 +22,9 @@
* (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.deob.deobfuscators.lvt;
+package net.runelite.cache.definitions;
-public enum LVTType
+public interface WorldMapTypeBase
{
- INT,
- LONG,
- OBJECT
+
}
diff --git a/cache/src/main/java/net/runelite/cache/definitions/exporters/InterfaceExporter.java b/cache/src/main/java/net/runelite/cache/definitions/exporters/InterfaceExporter.java
new file mode 100644
index 0000000000..b1020b9a59
--- /dev/null
+++ b/cache/src/main/java/net/runelite/cache/definitions/exporters/InterfaceExporter.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 2017, Adam
+ * 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.exporters;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import net.runelite.cache.definitions.InterfaceDefinition;
+
+public class InterfaceExporter
+{
+ private final InterfaceDefinition item;
+ private final Gson gson;
+
+ public InterfaceExporter(InterfaceDefinition item)
+ {
+ this.item = item;
+
+ GsonBuilder builder = new GsonBuilder()
+ .setPrettyPrinting();
+ gson = builder.create();
+ }
+
+ public String export()
+ {
+ return gson.toJson(item);
+ }
+
+ public void exportTo(File file) throws IOException
+ {
+ try (FileWriter fw = new FileWriter(file))
+ {
+ fw.write(export());
+ }
+ }
+}
diff --git a/cache/src/main/java/net/runelite/cache/definitions/exporters/ItemExporter.java b/cache/src/main/java/net/runelite/cache/definitions/exporters/ItemExporter.java
new file mode 100644
index 0000000000..5dddff97ee
--- /dev/null
+++ b/cache/src/main/java/net/runelite/cache/definitions/exporters/ItemExporter.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 2016-2017, Adam
+ * 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.exporters;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import net.runelite.cache.definitions.ItemDefinition;
+
+public class ItemExporter
+{
+ private final ItemDefinition item;
+ private final Gson gson;
+
+ public ItemExporter(ItemDefinition item)
+ {
+ this.item = item;
+
+ GsonBuilder builder = new GsonBuilder()
+ .setPrettyPrinting();
+ gson = builder.create();
+ }
+
+ public String export()
+ {
+ return gson.toJson(item);
+ }
+
+ public void exportTo(File file) throws IOException
+ {
+ try (FileWriter fw = new FileWriter(file))
+ {
+ fw.write(export());
+ }
+ }
+}
diff --git a/cache/src/main/java/net/runelite/cache/definitions/exporters/NpcExporter.java b/cache/src/main/java/net/runelite/cache/definitions/exporters/NpcExporter.java
new file mode 100644
index 0000000000..eec1be340b
--- /dev/null
+++ b/cache/src/main/java/net/runelite/cache/definitions/exporters/NpcExporter.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 2016-2017, Adam
+ * 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.exporters;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import net.runelite.cache.definitions.NpcDefinition;
+
+public class NpcExporter
+{
+ private final NpcDefinition npc;
+ private final Gson gson;
+
+ public NpcExporter(NpcDefinition npc)
+ {
+ this.npc = npc;
+
+ GsonBuilder builder = new GsonBuilder()
+ .setPrettyPrinting();
+ gson = builder.create();
+ }
+
+ public String export()
+ {
+ return gson.toJson(npc);
+ }
+
+ public void exportTo(File file) throws IOException
+ {
+ try (FileWriter fw = new FileWriter(file))
+ {
+ fw.write(export());
+ }
+ }
+}
diff --git a/cache/src/main/java/net/runelite/cache/definitions/exporters/ObjectExporter.java b/cache/src/main/java/net/runelite/cache/definitions/exporters/ObjectExporter.java
new file mode 100644
index 0000000000..994bff625f
--- /dev/null
+++ b/cache/src/main/java/net/runelite/cache/definitions/exporters/ObjectExporter.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 2016-2017, Adam
+ * 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.exporters;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import net.runelite.cache.definitions.ObjectDefinition;
+
+public class ObjectExporter
+{
+ private final ObjectDefinition object;
+ private final Gson gson;
+
+ public ObjectExporter(ObjectDefinition object)
+ {
+ this.object = object;
+
+ GsonBuilder builder = new GsonBuilder()
+ .setPrettyPrinting();
+ gson = builder.create();
+ }
+
+ public String export()
+ {
+ return gson.toJson(object);
+ }
+
+ public void exportTo(File file) throws IOException
+ {
+ try (FileWriter fw = new FileWriter(file))
+ {
+ fw.write(export());
+ }
+ }
+}
diff --git a/cache/src/main/java/net/runelite/cache/definitions/exporters/SpriteExporter.java b/cache/src/main/java/net/runelite/cache/definitions/exporters/SpriteExporter.java
new file mode 100644
index 0000000000..9c073d5e3a
--- /dev/null
+++ b/cache/src/main/java/net/runelite/cache/definitions/exporters/SpriteExporter.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2016-2017, Adam
+ * 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.exporters;
+
+import java.awt.image.BufferedImage;
+import java.io.File;
+import java.io.IOException;
+import javax.imageio.ImageIO;
+import net.runelite.cache.definitions.SpriteDefinition;
+
+public class SpriteExporter
+{
+ private final SpriteDefinition sprite;
+
+ public SpriteExporter(SpriteDefinition sprite)
+ {
+ this.sprite = sprite;
+ }
+
+ public BufferedImage export()
+ {
+ BufferedImage bi = new BufferedImage(sprite.getWidth(), sprite.getHeight(), BufferedImage.TYPE_INT_ARGB);
+ bi.setRGB(0, 0, sprite.getWidth(), sprite.getHeight(), sprite.getPixels(), 0, sprite.getWidth());
+ return bi;
+ }
+
+ public void exportTo(File file) throws IOException
+ {
+ BufferedImage image = export();
+ ImageIO.write(image, "png", file);
+ }
+}
diff --git a/cache/src/main/java/net/runelite/cache/definitions/loaders/AreaLoader.java b/cache/src/main/java/net/runelite/cache/definitions/loaders/AreaLoader.java
new file mode 100644
index 0000000000..7b47358678
--- /dev/null
+++ b/cache/src/main/java/net/runelite/cache/definitions/loaders/AreaLoader.java
@@ -0,0 +1,190 @@
+/*
+ * Copyright (c) 2017, Adam
+ * 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.AreaDefinition;
+import net.runelite.cache.io.InputStream;
+
+public class AreaLoader
+{
+ public AreaDefinition load(byte[] b, int id)
+ {
+ InputStream in = new InputStream(b);
+ AreaDefinition def = new AreaDefinition();
+ def.id = id;
+
+ for (;;)
+ {
+ int opcode = in.readUnsignedByte();
+ if (opcode == 0)
+ {
+ break;
+ }
+
+ processOpcode(def, in, opcode);
+ }
+
+ return def;
+ }
+
+ private void processOpcode(AreaDefinition def, InputStream in, int opcode)
+ {
+ if (opcode == 1)
+ {
+ def.spriteId = in.readBigSmart2();
+ }
+ else if (opcode == 2)
+ {
+ def.field3294 = in.readBigSmart2();
+ }
+ else if (opcode == 3)
+ {
+ def.name = in.readString();
+ }
+ else if (opcode == 4)
+ {
+ def.field3296 = in.read24BitInt();
+ }
+ else if (opcode == 5)
+ {
+ in.read24BitInt();
+ }
+ else if (opcode == 6)
+ {
+ def.field3310 = in.readUnsignedByte();
+ }
+ else if (opcode == 7)
+ {
+ int var3 = in.readUnsignedByte();
+ if ((var3 & 1) == 0)
+ {
+ ;
+ }
+
+ if ((var3 & 2) == 2)
+ {
+ ;
+ }
+ }
+ else if (opcode == 8)
+ {
+ in.readUnsignedByte();
+ }
+ else if (opcode >= 10 && opcode <= 14)
+ {
+ def.field3298[opcode - 10] = in.readString();
+ }
+ else if (opcode == 15)
+ {
+ int var3 = in.readUnsignedByte();
+ def.field3300 = new int[var3 * 2];
+
+ int var4;
+ for (var4 = 0; var4 < var3 * 2; ++var4)
+ {
+ def.field3300[var4] = in.readShort();
+ }
+
+ in.readInt();
+ var4 = in.readUnsignedByte();
+ def.field3292 = new int[var4];
+
+ int var5;
+ for (var5 = 0; var5 < def.field3292.length; ++var5)
+ {
+ def.field3292[var5] = in.readInt();
+ }
+
+ def.field3309 = new byte[var3];
+
+ for (var5 = 0; var5 < var3; ++var5)
+ {
+ def.field3309[var5] = in.readByte();
+ }
+ }
+ else if (opcode == 16)
+ {
+
+ }
+ else if (opcode == 17)
+ {
+ def.field3308 = in.readString();
+ }
+ else if (opcode == 18)
+ {
+ in.readBigSmart2();
+ }
+ else if (opcode == 19)
+ {
+ def.field3297 = in.readUnsignedShort();
+ }
+ else if (opcode == 21)
+ {
+ in.readInt();
+ }
+ else if (opcode == 22)
+ {
+ in.readInt();
+ }
+ else if (opcode == 23)
+ {
+ in.readUnsignedByte();
+ in.readUnsignedByte();
+ in.readUnsignedByte();
+ }
+ else if (opcode == 24)
+ {
+ in.readShort();
+ in.readShort();
+ }
+ else if (opcode == 25)
+ {
+ in.readBigSmart2();
+ }
+ else if (opcode == 28)
+ {
+ in.readUnsignedByte();
+ }
+ else if (opcode == 29)
+ {
+ in.skip(1);
+// class257[] var6 = new class257[]
+// {
+// class257.field3538, class257.field3539, class257.field3540
+// };
+// this.field3299 = (class257) Item.method1751(var6, var1.readUnsignedByte());
+ }
+ else if (opcode == 30)
+ {
+ in.skip(1);
+// class239[] var7 = new class239[]
+// {
+// class239.field3273, class239.field3275, class239.field3271
+// };
+// this.field3306 = (class239) Item.method1751(var7, var1.readUnsignedByte());
+ }
+
+ }
+}
diff --git a/cache/src/main/java/net/runelite/cache/definitions/loaders/EnumLoader.java b/cache/src/main/java/net/runelite/cache/definitions/loaders/EnumLoader.java
new file mode 100644
index 0000000000..83542c4fed
--- /dev/null
+++ b/cache/src/main/java/net/runelite/cache/definitions/loaders/EnumLoader.java
@@ -0,0 +1,114 @@
+/*
+ * Copyright (c) 2016-2017, Adam
+ * 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.EnumDefinition;
+import net.runelite.cache.io.InputStream;
+import net.runelite.cache.util.ScriptVarType;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class EnumLoader
+{
+ private static final Logger logger = LoggerFactory.getLogger(EnumLoader.class);
+
+ public EnumDefinition load(int id, byte[] b)
+ {
+ if (b.length == 1 && b[0] == 0)
+ {
+ return null;
+ }
+
+ EnumDefinition def = new EnumDefinition();
+ InputStream is = new InputStream(b);
+
+ def.setId(id);
+
+ for (;;)
+ {
+ int opcode = is.readUnsignedByte();
+ if (opcode == 0)
+ {
+ break;
+ }
+
+ processOp(opcode, def, is);
+ }
+
+ return def;
+ }
+
+ private void processOp(int opcode, EnumDefinition def, InputStream is)
+ {
+ switch (opcode)
+ {
+ case 1:
+ def.setKeyType(ScriptVarType.forCharKey((char) is.readUnsignedByte()));
+ break;
+ case 2:
+ def.setValType(ScriptVarType.forCharKey((char) is.readUnsignedByte()));
+ break;
+ case 3:
+ def.setDefaultString(is.readString());
+ break;
+ case 4:
+ def.setDefaultInt(is.readInt());
+ break;
+ case 5:
+ {
+ int size = is.readUnsignedShort();
+ int[] keys = new int[size];
+ String[] stringVals = new String[size];
+ for (int index = 0; index < size; ++index)
+ {
+ keys[index] = is.readInt();
+ stringVals[index] = is.readString();
+ }
+ def.setSize(size);
+ def.setKeys(keys);
+ def.setStringVals(stringVals);
+ break;
+ }
+ case 6:
+ {
+ int size = is.readUnsignedShort();
+ int[] keys = new int[size];
+ int[] intVals = new int[size];
+ for (int index = 0; index < size; ++index)
+ {
+ keys[index] = is.readInt();
+ intVals[index] = is.readInt();
+ }
+ def.setSize(size);
+ def.setKeys(keys);
+ def.setIntVals(intVals);
+ break;
+ }
+ default:
+ logger.warn("Unrecognized opcode {}", opcode);
+ break;
+ }
+ }
+}
diff --git a/cache/src/main/java/net/runelite/cache/definitions/loaders/FrameLoader.java b/cache/src/main/java/net/runelite/cache/definitions/loaders/FrameLoader.java
new file mode 100644
index 0000000000..5ec512d62f
--- /dev/null
+++ b/cache/src/main/java/net/runelite/cache/definitions/loaders/FrameLoader.java
@@ -0,0 +1,142 @@
+/*
+ * Copyright (c) 2017, Adam
+ * 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.FrameDefinition;
+import net.runelite.cache.definitions.FramemapDefinition;
+import net.runelite.cache.io.InputStream;
+
+public class FrameLoader
+{
+ public FrameDefinition load(FramemapDefinition framemap, int id, byte[] b)
+ {
+ FrameDefinition def = new FrameDefinition();
+ InputStream in = new InputStream(b);
+ InputStream data = new InputStream(b);
+
+ def.id = id;
+ def.framemap = framemap;
+
+ int framemapArchiveIndex = in.readUnsignedShort();
+ int length = in.readUnsignedByte();
+
+ data.skip(3 + length); // framemapArchiveIndex + length + data
+
+ int[] indexFrameIds = new int[500];
+ int[] scratchTranslatorX = new int[500];
+ int[] scratchTranslatorY = new int[500];
+ int[] scratchTranslatorZ = new int[500];
+
+ int lastI = -1;
+ int index = 0;
+ for (int i = 0; i < length; ++i)
+ {
+ int var9 = in.readUnsignedByte();
+
+ if (var9 <= 0)
+ {
+ continue;
+ }
+
+ if (def.framemap.types[i] != 0)
+ {
+ for (int var10 = i - 1; var10 > lastI; --var10)
+ {
+ if (def.framemap.types[var10] == 0)
+ {
+ indexFrameIds[index] = var10;
+ scratchTranslatorX[index] = 0;
+ scratchTranslatorY[index] = 0;
+ scratchTranslatorZ[index] = 0;
+ ++index;
+ break;
+ }
+ }
+ }
+
+ indexFrameIds[index] = i;
+ short var11 = 0;
+ if (def.framemap.types[i] == 3)
+ {
+ var11 = 128;
+ }
+
+ if ((var9 & 1) != 0)
+ {
+ scratchTranslatorX[index] = data.readShortSmart();
+ }
+ else
+ {
+ scratchTranslatorX[index] = var11;
+ }
+
+ if ((var9 & 2) != 0)
+ {
+ scratchTranslatorY[index] = data.readShortSmart();
+ }
+ else
+ {
+ scratchTranslatorY[index] = var11;
+ }
+
+ if ((var9 & 4) != 0)
+ {
+ scratchTranslatorZ[index] = data.readShortSmart();
+ }
+ else
+ {
+ scratchTranslatorZ[index] = var11;
+ }
+
+ lastI = i;
+ ++index;
+ if (def.framemap.types[i] == 5)
+ {
+ def.showing = true;
+ }
+ }
+
+ if (data.getOffset() != b.length)
+ {
+ throw new RuntimeException();
+ }
+
+ def.translatorCount = index;
+ def.indexFrameIds = new int[index];
+ def.translator_x = new int[index];
+ def.translator_y = new int[index];
+ def.translator_z = new int[index];
+
+ for (int i = 0; i < index; ++i)
+ {
+ def.indexFrameIds[i] = indexFrameIds[i];
+ def.translator_x[i] = scratchTranslatorX[i];
+ def.translator_y[i] = scratchTranslatorY[i];
+ def.translator_z[i] = scratchTranslatorZ[i];
+ }
+
+ return def;
+ }
+}
diff --git a/cache/src/main/java/net/runelite/cache/definitions/loaders/FramemapLoader.java b/cache/src/main/java/net/runelite/cache/definitions/loaders/FramemapLoader.java
new file mode 100644
index 0000000000..b649af8e47
--- /dev/null
+++ b/cache/src/main/java/net/runelite/cache/definitions/loaders/FramemapLoader.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2017, Adam
+ * 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.FramemapDefinition;
+import net.runelite.cache.io.InputStream;
+
+public class FramemapLoader
+{
+ public FramemapDefinition load(int id, byte[] b)
+ {
+ FramemapDefinition def = new FramemapDefinition();
+ InputStream in = new InputStream(b);
+
+ def.id = id;
+
+ def.length = in.readUnsignedByte();
+ def.types = new int[def.length];
+ def.frameMaps = new int[def.length][];
+
+ for (int i = 0; i < def.length; ++i)
+ {
+ def.types[i] = in.readUnsignedByte();
+ }
+
+ for (int i = 0; i < def.length; ++i)
+ {
+ def.frameMaps[i] = new int[in.readUnsignedByte()];
+ }
+
+ for (int i = 0; i < def.length; ++i)
+ {
+ for (int j = 0; j < def.frameMaps[i].length; ++j)
+ {
+ def.frameMaps[i][j] = in.readUnsignedByte();
+ }
+ }
+
+ return def;
+ }
+}
diff --git a/cache/src/main/java/net/runelite/cache/definitions/loaders/InterfaceLoader.java b/cache/src/main/java/net/runelite/cache/definitions/loaders/InterfaceLoader.java
new file mode 100644
index 0000000000..69db420f9f
--- /dev/null
+++ b/cache/src/main/java/net/runelite/cache/definitions/loaders/InterfaceLoader.java
@@ -0,0 +1,572 @@
+/*
+ * Copyright (c) 2017, Adam
+ * 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 java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import net.runelite.cache.definitions.ClientScript1Instruction;
+import net.runelite.cache.definitions.InterfaceDefinition;
+import net.runelite.cache.io.InputStream;
+
+public class InterfaceLoader
+{
+ public InterfaceDefinition load(int id, byte[] b)
+ {
+ InterfaceDefinition iface = new InterfaceDefinition();
+ iface.id = id;
+ if (b[0] == -1)
+ {
+ decodeIf3(iface, new InputStream(b));
+ }
+ else
+ {
+ decodeIf1(iface, new InputStream(b));
+ }
+
+ return iface;
+ }
+
+ private void decodeIf1(InterfaceDefinition iface, InputStream var1)
+ {
+ iface.isIf3 = false;
+ iface.type = var1.readUnsignedByte();
+ iface.menuType = var1.readUnsignedByte();
+ iface.contentType = var1.readUnsignedShort();
+ iface.originalX = var1.readShort();
+ iface.originalY = var1.readShort();
+ iface.originalWidth = var1.readUnsignedShort();
+ iface.originalHeight = var1.readUnsignedShort();
+ iface.opacity = var1.readUnsignedByte();
+ iface.parentId = var1.readUnsignedShort();
+ if (iface.parentId == 0xFFFF)
+ {
+ iface.parentId = -1;
+ }
+ else
+ {
+ iface.parentId += iface.id & ~0xFFFF;
+ }
+
+ iface.hoveredSiblingId = var1.readUnsignedShort();
+ if (iface.hoveredSiblingId == 0xFFFF)
+ {
+ iface.hoveredSiblingId = -1;
+ }
+
+ int var2 = var1.readUnsignedByte();
+ int var3;
+ if (var2 > 0)
+ {
+ iface.alternateOperators = new int[var2];
+ iface.alternateRhs = new int[var2];
+
+ for (var3 = 0; var3 < var2; ++var3)
+ {
+ iface.alternateOperators[var3] = var1.readUnsignedByte();
+ iface.alternateRhs[var3] = var1.readUnsignedShort();
+ }
+ }
+
+ var3 = var1.readUnsignedByte();
+ int var4;
+ int var5;
+ int var6;
+ if (var3 > 0)
+ {
+ iface.clientScripts = new ClientScript1Instruction[var3][];
+
+ for (var4 = 0; var4 < var3; ++var4)
+ {
+ var5 = var1.readUnsignedShort();
+ int[] bytecode = new int[var5];
+
+ for (var6 = 0; var6 < var5; ++var6)
+ {
+ bytecode[var6] = var1.readUnsignedShort();
+ if (bytecode[var6] == 0xFFFF)
+ {
+ bytecode[var6] = -1;
+ }
+
+ List instructions = new ArrayList<>();
+ for (int i = 0; i < bytecode.length;)
+ {
+ ClientScript1Instruction ins = new ClientScript1Instruction();
+
+ ins.opcode = ClientScript1Instruction.Opcode.values()[bytecode[i++]];
+
+ int ac = ins.opcode.argumentCount;
+ ins.operands = Arrays.copyOfRange(bytecode, i, i + ac);
+
+ instructions.add(ins);
+ i += ac;
+ }
+ iface.clientScripts[var4] = instructions.toArray(new ClientScript1Instruction[0]);
+ }
+ }
+ }
+
+ if (iface.type == 0)
+ {
+ iface.scrollHeight = var1.readUnsignedShort();
+ iface.isHidden = var1.readUnsignedByte() == 1;
+ }
+
+ if (iface.type == 1)
+ {
+ var1.readUnsignedShort();
+ var1.readUnsignedByte();
+ }
+
+ if (iface.type == 2)
+ {
+ iface.itemIds = new int[iface.originalWidth * iface.originalHeight];
+ iface.itemQuantities = new int[iface.originalHeight * iface.originalWidth];
+ var4 = var1.readUnsignedByte();
+ if (var4 == 1)
+ {
+ iface.clickMask |= 268435456;
+ }
+
+ var5 = var1.readUnsignedByte();
+ if (var5 == 1)
+ {
+ iface.clickMask |= 1073741824;
+ }
+
+ var6 = var1.readUnsignedByte();
+ if (var6 == 1)
+ {
+ iface.clickMask |= Integer.MIN_VALUE;
+ }
+
+ int var7 = var1.readUnsignedByte();
+ if (var7 == 1)
+ {
+ iface.clickMask |= 536870912;
+ }
+
+ iface.xPitch = var1.readUnsignedByte();
+ iface.yPitch = var1.readUnsignedByte();
+ iface.xOffsets = new int[20];
+ iface.yOffsets = new int[20];
+ iface.sprites = new int[20];
+
+ int var8;
+ for (var8 = 0; var8 < 20; ++var8)
+ {
+ int var9 = var1.readUnsignedByte();
+ if (var9 == 1)
+ {
+ iface.xOffsets[var8] = var1.readShort();
+ iface.yOffsets[var8] = var1.readShort();
+ iface.sprites[var8] = var1.readInt();
+ }
+ else
+ {
+ iface.sprites[var8] = -1;
+ }
+ }
+
+ iface.configActions = new String[5];
+
+ for (var8 = 0; var8 < 5; ++var8)
+ {
+ String var11 = var1.readString();
+ if (var11.length() > 0)
+ {
+ iface.configActions[var8] = var11;
+ iface.clickMask |= 1 << var8 + 23;
+ }
+ }
+ }
+
+ if (iface.type == 3)
+ {
+ iface.filled = var1.readUnsignedByte() == 1;
+ }
+
+ if (iface.type == 4 || iface.type == 1)
+ {
+ iface.xTextAlignment = var1.readUnsignedByte();
+ iface.yTextAlignment = var1.readUnsignedByte();
+ iface.lineHeight = var1.readUnsignedByte();
+ iface.fontId = var1.readUnsignedShort();
+ if (iface.fontId == 0xFFFF)
+ {
+ iface.fontId = -1;
+ }
+
+ iface.textShadowed = var1.readUnsignedByte() == 1;
+ }
+
+ if (iface.type == 4)
+ {
+ iface.text = var1.readString();
+ iface.alternateText = var1.readString();
+ }
+
+ if (iface.type == 1 || iface.type == 3 || iface.type == 4)
+ {
+ iface.textColor = var1.readInt();
+ }
+
+ if (iface.type == 3 || iface.type == 4)
+ {
+ iface.alternateTextColor = var1.readInt();
+ iface.hoveredTextColor = var1.readInt();
+ iface.alternateHoveredTextColor = var1.readInt();
+ }
+
+ if (iface.type == 5)
+ {
+ iface.spriteId = var1.readInt();
+ iface.alternateSpriteId = var1.readInt();
+ }
+
+ if (iface.type == 6)
+ {
+ iface.modelType = 1;
+ iface.modelId = var1.readUnsignedShort();
+ if (iface.modelId == 0xFFFF)
+ {
+ iface.modelId = -1;
+ }
+
+ iface.alternateModelId = var1.readUnsignedShort();
+ if (iface.alternateModelId == 0xFFFF)
+ {
+ iface.alternateModelId = -1;
+ }
+
+ iface.animation = var1.readUnsignedShort();
+ if (iface.animation == 0xFFFF)
+ {
+ iface.animation = -1;
+ }
+
+ iface.alternateAnimation = var1.readUnsignedShort();
+ if (iface.alternateAnimation == 0xFFFF)
+ {
+ iface.alternateAnimation = -1;
+ }
+
+ iface.modelZoom = var1.readUnsignedShort();
+ iface.rotationX = var1.readUnsignedShort();
+ iface.rotationZ = var1.readUnsignedShort();
+ }
+
+ if (iface.type == 7)
+ {
+ iface.itemIds = new int[iface.originalWidth * iface.originalHeight];
+ iface.itemQuantities = new int[iface.originalWidth * iface.originalHeight];
+ iface.xTextAlignment = var1.readUnsignedByte();
+ iface.fontId = var1.readUnsignedShort();
+ if (iface.fontId == 0xFFFF)
+ {
+ iface.fontId = -1;
+ }
+
+ iface.textShadowed = var1.readUnsignedByte() == 1;
+ iface.textColor = var1.readInt();
+ iface.xPitch = var1.readShort();
+ iface.yPitch = var1.readShort();
+ var4 = var1.readUnsignedByte();
+ if (var4 == 1)
+ {
+ iface.clickMask |= 1073741824;
+ }
+
+ iface.configActions = new String[5];
+
+ for (var5 = 0; var5 < 5; ++var5)
+ {
+ String var10 = var1.readString();
+ if (var10.length() > 0)
+ {
+ iface.configActions[var5] = var10;
+ iface.clickMask |= 1 << var5 + 23;
+ }
+ }
+ }
+
+ if (iface.type == 8)
+ {
+ iface.text = var1.readString();
+ }
+
+ if (iface.menuType == 2 || iface.type == 2)
+ {
+ iface.targetVerb = var1.readString();
+ iface.spellName = var1.readString();
+ var4 = var1.readUnsignedShort() & 63;
+ iface.clickMask |= var4 << 11;
+ }
+
+ if (iface.menuType == 1 || iface.menuType == 4 || iface.menuType == 5 || iface.menuType == 6)
+ {
+ iface.tooltip = var1.readString();
+ if (iface.tooltip.length() == 0)
+ {
+ if (iface.menuType == 1)
+ {
+ iface.tooltip = "Ok";
+ }
+
+ if (iface.menuType == 4)
+ {
+ iface.tooltip = "Select";
+ }
+
+ if (iface.menuType == 5)
+ {
+ iface.tooltip = "Select";
+ }
+
+ if (iface.menuType == 6)
+ {
+ iface.tooltip = "Continue";
+ }
+ }
+ }
+
+ if (iface.menuType == 1 || iface.menuType == 4 || iface.menuType == 5)
+ {
+ iface.clickMask |= 4194304;
+ }
+
+ if (iface.menuType == 6)
+ {
+ iface.clickMask |= 1;
+ }
+
+ }
+
+ private void decodeIf3(InterfaceDefinition iface, InputStream var1)
+ {
+ var1.readUnsignedByte();
+ iface.isIf3 = true;
+ iface.type = var1.readUnsignedByte();
+ iface.contentType = var1.readUnsignedShort();
+ iface.originalX = var1.readShort();
+ iface.originalY = var1.readShort();
+ iface.originalWidth = var1.readUnsignedShort();
+ if (iface.type == 9)
+ {
+ iface.originalHeight = var1.readShort();
+ }
+ else
+ {
+ iface.originalHeight = var1.readUnsignedShort();
+ }
+
+ iface.widthMode = var1.readByte();
+ iface.heightMode = var1.readByte();
+ iface.xPositionMode = var1.readByte();
+ iface.yPositionMode = var1.readByte();
+ iface.parentId = var1.readUnsignedShort();
+ if (iface.parentId == 0xFFFF)
+ {
+ iface.parentId = -1;
+ }
+ else
+ {
+ iface.parentId += iface.id & ~0xFFFF;
+ }
+
+ iface.isHidden = var1.readUnsignedByte() == 1;
+ if (iface.type == 0)
+ {
+ iface.scrollWidth = var1.readUnsignedShort();
+ iface.scrollHeight = var1.readUnsignedShort();
+ iface.noClickThrough = var1.readUnsignedByte() == 1;
+ }
+
+ if (iface.type == 5)
+ {
+ iface.spriteId = var1.readInt();
+ iface.textureId = var1.readUnsignedShort();
+ iface.spriteTiling = var1.readUnsignedByte() == 1;
+ iface.opacity = var1.readUnsignedByte();
+ iface.borderType = var1.readUnsignedByte();
+ iface.shadowColor = var1.readInt();
+ iface.flippedVertically = var1.readUnsignedByte() == 1;
+ iface.flippedHorizontally = var1.readUnsignedByte() == 1;
+ }
+
+ if (iface.type == 6)
+ {
+ iface.modelType = 1;
+ iface.modelId = var1.readUnsignedShort();
+ if (iface.modelId == 0xFFFF)
+ {
+ iface.modelId = -1;
+ }
+
+ iface.offsetX2d = var1.readShort();
+ iface.offsetY2d = var1.readShort();
+ iface.rotationX = var1.readUnsignedShort();
+ iface.rotationZ = var1.readUnsignedShort();
+ iface.rotationY = var1.readUnsignedShort();
+ iface.modelZoom = var1.readUnsignedShort();
+ iface.animation = var1.readUnsignedShort();
+ if (iface.animation == 0xFFFF)
+ {
+ iface.animation = -1;
+ }
+
+ iface.orthogonal = var1.readUnsignedByte() == 1;
+ var1.readUnsignedShort();
+ if (iface.widthMode != 0)
+ {
+ iface.modelHeightOverride = var1.readUnsignedShort();
+ }
+
+ if (iface.heightMode != 0)
+ {
+ var1.readUnsignedShort();
+ }
+ }
+
+ if (iface.type == 4)
+ {
+ iface.fontId = var1.readUnsignedShort();
+ if (iface.fontId == 0xFFFF)
+ {
+ iface.fontId = -1;
+ }
+
+ iface.text = var1.readString();
+ iface.lineHeight = var1.readUnsignedByte();
+ iface.xTextAlignment = var1.readUnsignedByte();
+ iface.yTextAlignment = var1.readUnsignedByte();
+ iface.textShadowed = var1.readUnsignedByte() == 1;
+ iface.textColor = var1.readInt();
+ }
+
+ if (iface.type == 3)
+ {
+ iface.textColor = var1.readInt();
+ iface.filled = var1.readUnsignedByte() == 1;
+ iface.opacity = var1.readUnsignedByte();
+ }
+
+ if (iface.type == 9)
+ {
+ iface.lineWidth = var1.readUnsignedByte();
+ iface.textColor = var1.readInt();
+ iface.lineDirection = var1.readUnsignedByte() == 1;
+ }
+
+ iface.clickMask = var1.read24BitInt();
+ iface.name = var1.readString();
+ int var2 = var1.readUnsignedByte();
+ if (var2 > 0)
+ {
+ iface.actions = new String[var2];
+
+ for (int var3 = 0; var3 < var2; ++var3)
+ {
+ iface.actions[var3] = var1.readString();
+ }
+ }
+
+ iface.dragDeadZone = var1.readUnsignedByte();
+ iface.dragDeadTime = var1.readUnsignedByte();
+ iface.dragRenderBehavior = var1.readUnsignedByte() == 1;
+ iface.targetVerb = var1.readString();
+ iface.onLoadListener = this.decodeListener(iface, var1);
+ iface.onMouseOverListener = this.decodeListener(iface, var1);
+ iface.onMouseLeaveListener = this.decodeListener(iface, var1);
+ iface.onTargetLeaveListener = this.decodeListener(iface, var1);
+ iface.onTargetEnterListener = this.decodeListener(iface, var1);
+ iface.onVarTransmitListener = this.decodeListener(iface, var1);
+ iface.onInvTransmitListener = this.decodeListener(iface, var1);
+ iface.onStatTransmitListener = this.decodeListener(iface, var1);
+ iface.onTimerListener = this.decodeListener(iface, var1);
+ iface.onOpListener = this.decodeListener(iface, var1);
+ iface.onMouseRepeatListener = this.decodeListener(iface, var1);
+ iface.onClickListener = this.decodeListener(iface, var1);
+ iface.onClickRepeatListener = this.decodeListener(iface, var1);
+ iface.onReleaseListener = this.decodeListener(iface, var1);
+ iface.onHoldListener = this.decodeListener(iface, var1);
+ iface.onDragListener = this.decodeListener(iface, var1);
+ iface.onDragCompleteListener = this.decodeListener(iface, var1);
+ iface.onScrollWheelListener = this.decodeListener(iface, var1);
+ iface.varTransmitTriggers = this.decodeTriggers(var1);
+ iface.invTransmitTriggers = this.decodeTriggers(var1);
+ iface.statTransmitTriggers = this.decodeTriggers(var1);
+ }
+
+ private Object[] decodeListener(InterfaceDefinition iface, InputStream var1)
+ {
+ int var2 = var1.readUnsignedByte();
+ if (var2 == 0)
+ {
+ return null;
+ }
+ else
+ {
+ Object[] var3 = new Object[var2];
+
+ for (int var4 = 0; var4 < var2; ++var4)
+ {
+ int var5 = var1.readUnsignedByte();
+ if (var5 == 0)
+ {
+ var3[var4] = new Integer(var1.readInt());
+ }
+ else if (var5 == 1)
+ {
+ var3[var4] = var1.readString();
+ }
+ }
+
+ iface.hasListener = true;
+ return var3;
+ }
+ }
+
+ private int[] decodeTriggers(InputStream var1)
+ {
+ int var2 = var1.readUnsignedByte();
+ if (var2 == 0)
+ {
+ return null;
+ }
+ else
+ {
+ int[] var3 = new int[var2];
+
+ for (int var4 = 0; var4 < var2; ++var4)
+ {
+ var3[var4] = var1.readInt();
+ }
+
+ return var3;
+ }
+ }
+}
diff --git a/cache/src/main/java/net/runelite/cache/definitions/loaders/InventoryLoader.java b/cache/src/main/java/net/runelite/cache/definitions/loaders/InventoryLoader.java
new file mode 100644
index 0000000000..b93cac48c0
--- /dev/null
+++ b/cache/src/main/java/net/runelite/cache/definitions/loaders/InventoryLoader.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2017, Adam
+ * 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.InventoryDefinition;
+import net.runelite.cache.io.InputStream;
+
+public class InventoryLoader
+{
+ public InventoryDefinition load(int id, byte[] b)
+ {
+ InventoryDefinition def = new InventoryDefinition();
+ def.id = id;
+ InputStream is = new InputStream(b);
+
+ while (true)
+ {
+ int opcode = is.readUnsignedByte();
+ if (opcode == 0)
+ {
+ break;
+ }
+
+ if (opcode == 2)
+ {
+ def.size = is.readUnsignedShort();
+ }
+ }
+
+ return def;
+ }
+}
diff --git a/cache/src/main/java/net/runelite/cache/definitions/loaders/ItemLoader.java b/cache/src/main/java/net/runelite/cache/definitions/loaders/ItemLoader.java
new file mode 100644
index 0000000000..6cb6c9bd41
--- /dev/null
+++ b/cache/src/main/java/net/runelite/cache/definitions/loaders/ItemLoader.java
@@ -0,0 +1,289 @@
+/*
+ * Copyright (c) 2016-2017, Adam
+ * 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.ItemDefinition;
+import net.runelite.cache.io.InputStream;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.HashMap;
+
+public class ItemLoader
+{
+ private static final Logger logger = LoggerFactory.getLogger(ItemLoader.class);
+
+ public ItemDefinition load(int id, byte[] b)
+ {
+ ItemDefinition def = new ItemDefinition(id);
+ InputStream is = new InputStream(b);
+
+ while (true)
+ {
+ int opcode = is.readUnsignedByte();
+ if (opcode == 0)
+ {
+ break;
+ }
+
+ this.decodeValues(opcode, def, is);
+ }
+
+ return def;
+ }
+
+ private void decodeValues(int opcode, ItemDefinition def, InputStream stream)
+ {
+ if (opcode == 1)
+ {
+ def.inventoryModel = stream.readUnsignedShort();
+ }
+ else if (opcode == 2)
+ {
+ def.name = stream.readString();
+ }
+ else if (opcode == 4)
+ {
+ def.zoom2d = stream.readUnsignedShort();
+ }
+ else if (opcode == 5)
+ {
+ def.xan2d = stream.readUnsignedShort();
+ }
+ else if (opcode == 6)
+ {
+ def.yan2d = stream.readUnsignedShort();
+ }
+ else if (opcode == 7)
+ {
+ def.xOffset2d = stream.readUnsignedShort();
+ if (def.xOffset2d > 32767)
+ {
+ def.xOffset2d -= 65536;
+ }
+ }
+ else if (opcode == 8)
+ {
+ def.yOffset2d = stream.readUnsignedShort();
+ if (def.yOffset2d > 32767)
+ {
+ def.yOffset2d -= 65536;
+ }
+ }
+ else if (opcode == 11)
+ {
+ def.stackable = 1;
+ }
+ else if (opcode == 12)
+ {
+ def.cost = stream.readInt();
+ }
+ else if (opcode == 16)
+ {
+ def.members = true;
+ }
+ else if (opcode == 23)
+ {
+ def.maleModel0 = stream.readUnsignedShort();
+ def.maleOffset = stream.readUnsignedByte();
+ }
+ else if (opcode == 24)
+ {
+ def.maleModel1 = stream.readUnsignedShort();
+ }
+ else if (opcode == 25)
+ {
+ def.femaleModel0 = stream.readUnsignedShort();
+ def.femaleOffset = stream.readUnsignedByte();
+ }
+ else if (opcode == 26)
+ {
+ def.femaleModel1 = stream.readUnsignedShort();
+ }
+ else if (opcode >= 30 && opcode < 35)
+ {
+ def.options[opcode - 30] = stream.readString();
+ if (def.options[opcode - 30].equalsIgnoreCase("Hidden"))
+ {
+ def.options[opcode - 30] = null;
+ }
+ }
+ else if (opcode >= 35 && opcode < 40)
+ {
+ def.interfaceOptions[opcode - 35] = stream.readString();
+ }
+ else if (opcode == 40)
+ {
+ int var5 = stream.readUnsignedByte();
+ def.colorFind = new short[var5];
+ def.colorReplace = new short[var5];
+
+ for (int var4 = 0; var4 < var5; ++var4)
+ {
+ def.colorFind[var4] = (short) stream.readUnsignedShort();
+ def.colorReplace[var4] = (short) stream.readUnsignedShort();
+ }
+
+ }
+ else if (opcode == 41)
+ {
+ int var5 = stream.readUnsignedByte();
+ def.textureFind = new short[var5];
+ def.textureReplace = new short[var5];
+
+ for (int var4 = 0; var4 < var5; ++var4)
+ {
+ def.textureFind[var4] = (short) stream.readUnsignedShort();
+ def.textureReplace[var4] = (short) stream.readUnsignedShort();
+ }
+
+ }
+ else if (opcode == 42)
+ {
+ def.shiftClickDropIndex = stream.readByte();
+ }
+ else if (opcode == 65)
+ {
+ def.isTradeable = true;
+ }
+ else if (opcode == 78)
+ {
+ def.maleModel2 = stream.readUnsignedShort();
+ }
+ else if (opcode == 79)
+ {
+ def.femaleModel2 = stream.readUnsignedShort();
+ }
+ else if (opcode == 90)
+ {
+ def.maleHeadModel = stream.readUnsignedShort();
+ }
+ else if (opcode == 91)
+ {
+ def.femaleHeadModel = stream.readUnsignedShort();
+ }
+ else if (opcode == 92)
+ {
+ def.maleHeadModel2 = stream.readUnsignedShort();
+ }
+ else if (opcode == 93)
+ {
+ def.femaleHeadModel2 = stream.readUnsignedShort();
+ }
+ else if (opcode == 95)
+ {
+ def.zan2d = stream.readUnsignedShort();
+ }
+ else if (opcode == 97)
+ {
+ def.notedID = stream.readUnsignedShort();
+ }
+ else if (opcode == 98)
+ {
+ def.notedTemplate = stream.readUnsignedShort();
+ }
+ else if (opcode >= 100 && opcode < 110)
+ {
+ if (def.countObj == null)
+ {
+ def.countObj = new int[10];
+ def.countCo = new int[10];
+ }
+
+ def.countObj[opcode - 100] = stream.readUnsignedShort();
+ def.countCo[opcode - 100] = stream.readUnsignedShort();
+ }
+ else if (opcode == 110)
+ {
+ def.resizeX = stream.readUnsignedShort();
+ }
+ else if (opcode == 111)
+ {
+ def.resizeY = stream.readUnsignedShort();
+ }
+ else if (opcode == 112)
+ {
+ def.resizeZ = stream.readUnsignedShort();
+ }
+ else if (opcode == 113)
+ {
+ def.ambient = stream.readByte();
+ }
+ else if (opcode == 114)
+ {
+ def.contrast = stream.readByte();
+ }
+ else if (opcode == 115)
+ {
+ def.team = stream.readUnsignedByte();
+ }
+ else if (opcode == 139)
+ {
+ def.boughtId = stream.readUnsignedShort();
+ }
+ else if (opcode == 140)
+ {
+ def.boughtTemplateId = stream.readUnsignedShort();
+ }
+ else if (opcode == 148)
+ {
+ def.placeholderId = stream.readUnsignedShort();
+ }
+ else if (opcode == 149)
+ {
+ def.placeholderTemplateId = stream.readUnsignedShort();
+ }
+ else if (opcode == 249)
+ {
+ int length = stream.readUnsignedByte();
+
+ def.params = new HashMap<>(length);
+
+ for (int i = 0; i < length; i++)
+ {
+ boolean isString = stream.readUnsignedByte() == 1;
+ int key = stream.read24BitInt();
+ Object value;
+
+ if (isString)
+ {
+ value = stream.readString();
+ }
+
+ else
+ {
+ value = stream.readInt();
+ }
+
+ def.params.put(key, value);
+ }
+ }
+ else
+ {
+ logger.warn("Unrecognized opcode {}", opcode);
+ }
+ }
+}
diff --git a/cache/src/main/java/net/runelite/cache/definitions/loaders/KitLoader.java b/cache/src/main/java/net/runelite/cache/definitions/loaders/KitLoader.java
new file mode 100644
index 0000000000..9bd3f89a2f
--- /dev/null
+++ b/cache/src/main/java/net/runelite/cache/definitions/loaders/KitLoader.java
@@ -0,0 +1,99 @@
+/*
+ * Copyright (c) 2017, Adam
+ * 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.KitDefinition;
+import net.runelite.cache.io.InputStream;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class KitLoader
+{
+ private static final Logger logger = LoggerFactory.getLogger(KitLoader.class);
+
+ public KitDefinition load(int id, byte[] b)
+ {
+ KitDefinition def = new KitDefinition(id);
+ InputStream is = new InputStream(b);
+
+ for (;;)
+ {
+ int opcode = is.readUnsignedByte();
+ if (opcode == 0)
+ {
+ break;
+ }
+
+ if (opcode == 1)
+ {
+ def.bodyPartId = is.readUnsignedByte();
+ }
+ else if (opcode == 2)
+ {
+ int length = is.readUnsignedByte();
+ def.modelIds = new int[length];
+
+ for (int index = 0; index < length; ++index)
+ {
+ def.modelIds[index] = is.readUnsignedShort();
+ }
+ }
+ else if (opcode == 3)
+ {
+ def.nonSelectable = true;
+ }
+ else if (opcode == 40)
+ {
+ int length = is.readUnsignedByte();
+ def.recolorToFind = new short[length];
+ def.recolorToReplace = new short[length];
+
+ for (int index = 0; index < length; ++index)
+ {
+ def.recolorToFind[index] = is.readShort();
+ def.recolorToReplace[index] = is.readShort();
+ }
+ }
+ else if (opcode == 41)
+ {
+ int length = is.readUnsignedByte();
+ def.retextureToFind = new short[length];
+ def.retextureToReplace = new short[length];
+
+ for (int index = 0; index < length; ++index)
+ {
+ def.retextureToFind[index] = is.readShort();
+ def.retextureToReplace[index] = is.readShort();
+ }
+ }
+ else if (opcode >= 60 && opcode < 70)
+ {
+ def.models[opcode - 60] = is.readShort();
+ }
+ }
+
+ return def;
+ }
+}
diff --git a/cache/src/main/java/net/runelite/cache/definitions/loaders/LocationsLoader.java b/cache/src/main/java/net/runelite/cache/definitions/loaders/LocationsLoader.java
new file mode 100644
index 0000000000..4dab72cf77
--- /dev/null
+++ b/cache/src/main/java/net/runelite/cache/definitions/loaders/LocationsLoader.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright (c) 2017, Adam
+ * 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.LocationsDefinition;
+import net.runelite.cache.io.InputStream;
+import net.runelite.cache.region.Location;
+import net.runelite.cache.region.Position;
+
+public class LocationsLoader
+{
+ public LocationsDefinition load(int regionX, int regionY, byte[] b)
+ {
+ LocationsDefinition loc = new LocationsDefinition();
+ loc.setRegionX(regionX);
+ loc.setRegionY(regionY);
+ loadLocations(loc, b);
+ return loc;
+ }
+
+ private void loadLocations(LocationsDefinition loc, byte[] b)
+ {
+ InputStream buf = new InputStream(b);
+
+ int id = -1;
+ int idOffset;
+
+ while ((idOffset = buf.readUnsignedIntSmartShortCompat()) != 0)
+ {
+ id += idOffset;
+
+ int position = 0;
+ int positionOffset;
+
+ while ((positionOffset = buf.readUnsignedShortSmart()) != 0)
+ {
+ position += positionOffset - 1;
+
+ int localY = position & 0x3F;
+ int localX = position >> 6 & 0x3F;
+ int height = position >> 12 & 0x3;
+
+ int attributes = buf.readUnsignedByte();
+ int type = attributes >> 2;
+ int orientation = attributes & 0x3;
+
+ loc.getLocations().add(new Location(id, type, orientation, new Position(localX, localY, height)));
+ }
+ }
+ }
+}
diff --git a/cache/src/main/java/net/runelite/cache/definitions/loaders/MapLoader.java b/cache/src/main/java/net/runelite/cache/definitions/loaders/MapLoader.java
new file mode 100644
index 0000000000..3224536388
--- /dev/null
+++ b/cache/src/main/java/net/runelite/cache/definitions/loaders/MapLoader.java
@@ -0,0 +1,91 @@
+/*
+ * Copyright (c) 2017, Adam
+ * 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.MapDefinition;
+import net.runelite.cache.definitions.MapDefinition.Tile;
+import net.runelite.cache.io.InputStream;
+import static net.runelite.cache.region.Region.X;
+import static net.runelite.cache.region.Region.Y;
+import static net.runelite.cache.region.Region.Z;
+
+public class MapLoader
+{
+ public MapDefinition load(int regionX, int regionY, byte[] b)
+ {
+ MapDefinition map = new MapDefinition();
+ map.setRegionX(regionX);
+ map.setRegionY(regionY);
+ loadTerrain(map, b);
+ return map;
+ }
+
+ private void loadTerrain(MapDefinition map, byte[] buf)
+ {
+ Tile[][][] tiles = map.getTiles();
+
+ InputStream in = new InputStream(buf);
+
+ for (int z = 0; z < Z; z++)
+ {
+ for (int x = 0; x < X; x++)
+ {
+ for (int y = 0; y < Y; y++)
+ {
+ Tile tile = tiles[z][x][y] = new Tile();
+ while (true)
+ {
+ int attribute = in.readUnsignedByte();
+ if (attribute == 0)
+ {
+ break;
+ }
+ else if (attribute == 1)
+ {
+ int height = in.readUnsignedByte();
+ tile.height = height;
+ break;
+ }
+ else if (attribute <= 49)
+ {
+ tile.attrOpcode = attribute;
+ tile.overlayId = in.readByte();
+ tile.overlayPath = (byte) ((attribute - 2) / 4);
+ tile.overlayRotation = (byte) (attribute - 2 & 3);
+ }
+ else if (attribute <= 81)
+ {
+ tile.settings = (byte) (attribute - 49);
+ }
+ else
+ {
+ tile.underlayId = (byte) (attribute - 81);
+ }
+ }
+ }
+ }
+ }
+ }
+}
diff --git a/cache/src/main/java/net/runelite/cache/definitions/loaders/ModelLoader.java b/cache/src/main/java/net/runelite/cache/definitions/loaders/ModelLoader.java
new file mode 100644
index 0000000000..4529f8a069
--- /dev/null
+++ b/cache/src/main/java/net/runelite/cache/definitions/loaders/ModelLoader.java
@@ -0,0 +1,750 @@
+package net.runelite.cache.definitions.loaders;
+
+import net.runelite.cache.definitions.ModelDefinition;
+import net.runelite.cache.io.InputStream;
+
+public class ModelLoader
+{
+ public ModelDefinition load(int modelId, byte[] b)
+ {
+ ModelDefinition def = new ModelDefinition();
+ def.id = modelId;
+
+ if (b[b.length - 1] == -1 && b[b.length - 2] == -1)
+ {
+ this.load1(def, b);
+ }
+ else
+ {
+ this.load2(def, b);
+ }
+
+ def.computeNormals();
+ def.computeTextureUVCoordinates();
+ def.computeAnimationTables();
+
+ return def;
+ }
+
+ private void load1(ModelDefinition model, byte[] var1)
+ {
+ InputStream var2 = new InputStream(var1);
+ InputStream var24 = new InputStream(var1);
+ InputStream var3 = new InputStream(var1);
+ InputStream var28 = new InputStream(var1);
+ InputStream var6 = new InputStream(var1);
+ InputStream var55 = new InputStream(var1);
+ InputStream var51 = new InputStream(var1);
+ var2.setOffset(var1.length - 23);
+ int verticeCount = var2.readUnsignedShort();
+ int triangleCount = var2.readUnsignedShort();
+ int textureTriangleCount = var2.readUnsignedByte();
+ int var13 = var2.readUnsignedByte();
+ int modelPriority = var2.readUnsignedByte();
+ int var50 = var2.readUnsignedByte();
+ int var17 = var2.readUnsignedByte();
+ int modelTexture = var2.readUnsignedByte();
+ int modelVertexSkins = var2.readUnsignedByte();
+ int var20 = var2.readUnsignedShort();
+ int var21 = var2.readUnsignedShort();
+ int var42 = var2.readUnsignedShort();
+ int var22 = var2.readUnsignedShort();
+ int var38 = var2.readUnsignedShort();
+ int textureAmount = 0;
+ int var7 = 0;
+ int var29 = 0;
+ int position;
+ if (textureTriangleCount > 0)
+ {
+ model.textureRenderTypes = new byte[textureTriangleCount];
+ var2.setOffset(0);
+
+ for (position = 0; position < textureTriangleCount; ++position)
+ {
+ byte renderType = model.textureRenderTypes[position] = var2.readByte();
+ if (renderType == 0)
+ {
+ ++textureAmount;
+ }
+
+ if (renderType >= 1 && renderType <= 3)
+ {
+ ++var7;
+ }
+
+ if (renderType == 2)
+ {
+ ++var29;
+ }
+ }
+ }
+
+ position = textureTriangleCount + verticeCount;
+ int renderTypePos = position;
+ if (var13 == 1)
+ {
+ position += triangleCount;
+ }
+
+ int var49 = position;
+ position += triangleCount;
+ int priorityPos = position;
+ if (modelPriority == 255)
+ {
+ position += triangleCount;
+ }
+
+ int triangleSkinPos = position;
+ if (var17 == 1)
+ {
+ position += triangleCount;
+ }
+
+ int var35 = position;
+ if (modelVertexSkins == 1)
+ {
+ position += verticeCount;
+ }
+
+ int alphaPos = position;
+ if (var50 == 1)
+ {
+ position += triangleCount;
+ }
+
+ int var11 = position;
+ position += var22;
+ int texturePos = position;
+ if (modelTexture == 1)
+ {
+ position += triangleCount * 2;
+ }
+
+ int textureCoordPos = position;
+ position += var38;
+ int colorPos = position;
+ position += triangleCount * 2;
+ int var40 = position;
+ position += var20;
+ int var41 = position;
+ position += var21;
+ int var8 = position;
+ position += var42;
+ int var43 = position;
+ position += textureAmount * 6;
+ int var37 = position;
+ position += var7 * 6;
+ int var48 = position;
+ position += var7 * 6;
+ int var56 = position;
+ position += var7 * 2;
+ int var45 = position;
+ position += var7;
+ int var46 = position;
+ position += var7 * 2 + var29 * 2;
+ model.vertexCount = verticeCount;
+ model.faceCount = triangleCount;
+ model.textureTriangleCount = textureTriangleCount;
+ model.vertexPositionsX = new int[verticeCount];
+ model.vertexPositionsY = new int[verticeCount];
+ model.vertexPositionsZ = new int[verticeCount];
+ model.faceVertexIndices1 = new int[triangleCount];
+ model.faceVertexIndices2 = new int[triangleCount];
+ model.faceVertexIndices3 = new int[triangleCount];
+ if (modelVertexSkins == 1)
+ {
+ model.vertexSkins = new int[verticeCount];
+ }
+
+ if (var13 == 1)
+ {
+ model.faceRenderTypes = new byte[triangleCount];
+ }
+
+ if (modelPriority == 255)
+ {
+ model.faceRenderPriorities = new byte[triangleCount];
+ }
+ else
+ {
+ model.priority = (byte) modelPriority;
+ }
+
+ if (var50 == 1)
+ {
+ model.faceAlphas = new byte[triangleCount];
+ }
+
+ if (var17 == 1)
+ {
+ model.faceSkins = new int[triangleCount];
+ }
+
+ if (modelTexture == 1)
+ {
+ model.faceTextures = new short[triangleCount];
+ }
+
+ if (modelTexture == 1 && textureTriangleCount > 0)
+ {
+ model.textureCoordinates = new byte[triangleCount];
+ }
+
+ model.faceColors = new short[triangleCount];
+ if (textureTriangleCount > 0)
+ {
+ model.textureTriangleVertexIndices1 = new short[textureTriangleCount];
+ model.textureTriangleVertexIndices2 = new short[textureTriangleCount];
+ model.textureTriangleVertexIndices3 = new short[textureTriangleCount];
+ if (var7 > 0)
+ {
+ model.aShortArray2574 = new short[var7];
+ model.aShortArray2575 = new short[var7];
+ model.aShortArray2586 = new short[var7];
+ model.aShortArray2577 = new short[var7];
+ model.aByteArray2580 = new byte[var7];
+ model.aShortArray2578 = new short[var7];
+ }
+
+ if (var29 > 0)
+ {
+ model.texturePrimaryColors = new short[var29];
+ }
+ }
+
+ var2.setOffset(textureTriangleCount);
+ var24.setOffset(var40);
+ var3.setOffset(var41);
+ var28.setOffset(var8);
+ var6.setOffset(var35);
+ int vX = 0;
+ int vY = 0;
+ int vZ = 0;
+
+ int vertexZOffset;
+ int var10;
+ int vertexYOffset;
+ int var15;
+ int point;
+ for (point = 0; point < verticeCount; ++point)
+ {
+ int vertexFlags = var2.readUnsignedByte();
+ int vertexXOffset = 0;
+ if ((vertexFlags & 1) != 0)
+ {
+ vertexXOffset = var24.readShortSmart();
+ }
+
+ vertexYOffset = 0;
+ if ((vertexFlags & 2) != 0)
+ {
+ vertexYOffset = var3.readShortSmart();
+ }
+
+ vertexZOffset = 0;
+ if ((vertexFlags & 4) != 0)
+ {
+ vertexZOffset = var28.readShortSmart();
+ }
+
+ model.vertexPositionsX[point] = vX + vertexXOffset;
+ model.vertexPositionsY[point] = vY + vertexYOffset;
+ model.vertexPositionsZ[point] = vZ + vertexZOffset;
+ vX = model.vertexPositionsX[point];
+ vY = model.vertexPositionsY[point];
+ vZ = model.vertexPositionsZ[point];
+ if (modelVertexSkins == 1)
+ {
+ model.vertexSkins[point] = var6.readUnsignedByte();
+ }
+ }
+
+ var2.setOffset(colorPos);
+ var24.setOffset(renderTypePos);
+ var3.setOffset(priorityPos);
+ var28.setOffset(alphaPos);
+ var6.setOffset(triangleSkinPos);
+ var55.setOffset(texturePos);
+ var51.setOffset(textureCoordPos);
+
+ for (point = 0; point < triangleCount; ++point)
+ {
+ model.faceColors[point] = (short) var2.readUnsignedShort();
+ if (var13 == 1)
+ {
+ model.faceRenderTypes[point] = var24.readByte();
+ }
+
+ if (modelPriority == 255)
+ {
+ model.faceRenderPriorities[point] = var3.readByte();
+ }
+
+ if (var50 == 1)
+ {
+ model.faceAlphas[point] = var28.readByte();
+ }
+
+ if (var17 == 1)
+ {
+ model.faceSkins[point] = var6.readUnsignedByte();
+ }
+
+ if (modelTexture == 1)
+ {
+ model.faceTextures[point] = (short) (var55.readUnsignedShort() - 1);
+ }
+
+ if (model.textureCoordinates != null && model.faceTextures[point] != -1)
+ {
+ model.textureCoordinates[point] = (byte) (var51.readUnsignedByte() - 1);
+ }
+ }
+
+ var2.setOffset(var11);
+ var24.setOffset(var49);
+ int trianglePointX = 0;
+ int trianglePointY = 0;
+ int trianglePointZ = 0;
+ vertexYOffset = 0;
+
+ int var16;
+ for (vertexZOffset = 0; vertexZOffset < triangleCount; ++vertexZOffset)
+ {
+ int numFaces = var24.readUnsignedByte();
+ if (numFaces == 1)
+ {
+ trianglePointX = var2.readShortSmart() + vertexYOffset;
+ trianglePointY = var2.readShortSmart() + trianglePointX;
+ trianglePointZ = var2.readShortSmart() + trianglePointY;
+ vertexYOffset = trianglePointZ;
+ model.faceVertexIndices1[vertexZOffset] = trianglePointX;
+ model.faceVertexIndices2[vertexZOffset] = trianglePointY;
+ model.faceVertexIndices3[vertexZOffset] = trianglePointZ;
+ }
+
+ if (numFaces == 2)
+ {
+ trianglePointY = trianglePointZ;
+ trianglePointZ = var2.readShortSmart() + vertexYOffset;
+ vertexYOffset = trianglePointZ;
+ model.faceVertexIndices1[vertexZOffset] = trianglePointX;
+ model.faceVertexIndices2[vertexZOffset] = trianglePointY;
+ model.faceVertexIndices3[vertexZOffset] = trianglePointZ;
+ }
+
+ if (numFaces == 3)
+ {
+ trianglePointX = trianglePointZ;
+ trianglePointZ = var2.readShortSmart() + vertexYOffset;
+ vertexYOffset = trianglePointZ;
+ model.faceVertexIndices1[vertexZOffset] = trianglePointX;
+ model.faceVertexIndices2[vertexZOffset] = trianglePointY;
+ model.faceVertexIndices3[vertexZOffset] = trianglePointZ;
+ }
+
+ if (numFaces == 4)
+ {
+ int var57 = trianglePointX;
+ trianglePointX = trianglePointY;
+ trianglePointY = var57;
+ trianglePointZ = var2.readShortSmart() + vertexYOffset;
+ vertexYOffset = trianglePointZ;
+ model.faceVertexIndices1[vertexZOffset] = trianglePointX;
+ model.faceVertexIndices2[vertexZOffset] = var57;
+ model.faceVertexIndices3[vertexZOffset] = trianglePointZ;
+ }
+ }
+
+ var2.setOffset(var43);
+ var24.setOffset(var37);
+ var3.setOffset(var48);
+ var28.setOffset(var56);
+ var6.setOffset(var45);
+ var55.setOffset(var46);
+
+ for (int texIndex = 0; texIndex < textureTriangleCount; ++texIndex)
+ {
+ int type = model.textureRenderTypes[texIndex] & 255;
+ if (type == 0)
+ {
+ model.textureTriangleVertexIndices1[texIndex] = (short) var2.readUnsignedShort();
+ model.textureTriangleVertexIndices2[texIndex] = (short) var2.readUnsignedShort();
+ model.textureTriangleVertexIndices3[texIndex] = (short) var2.readUnsignedShort();
+ }
+
+ if (type == 1)
+ {
+ model.textureTriangleVertexIndices1[texIndex] = (short) var24.readUnsignedShort();
+ model.textureTriangleVertexIndices2[texIndex] = (short) var24.readUnsignedShort();
+ model.textureTriangleVertexIndices3[texIndex] = (short) var24.readUnsignedShort();
+ model.aShortArray2574[texIndex] = (short) var3.readUnsignedShort();
+ model.aShortArray2575[texIndex] = (short) var3.readUnsignedShort();
+ model.aShortArray2586[texIndex] = (short) var3.readUnsignedShort();
+ model.aShortArray2577[texIndex] = (short) var28.readUnsignedShort();
+ model.aByteArray2580[texIndex] = var6.readByte();
+ model.aShortArray2578[texIndex] = (short) var55.readUnsignedShort();
+ }
+
+ if (type == 2)
+ {
+ model.textureTriangleVertexIndices1[texIndex] = (short) var24.readUnsignedShort();
+ model.textureTriangleVertexIndices2[texIndex] = (short) var24.readUnsignedShort();
+ model.textureTriangleVertexIndices3[texIndex] = (short) var24.readUnsignedShort();
+ model.aShortArray2574[texIndex] = (short) var3.readUnsignedShort();
+ model.aShortArray2575[texIndex] = (short) var3.readUnsignedShort();
+ model.aShortArray2586[texIndex] = (short) var3.readUnsignedShort();
+ model.aShortArray2577[texIndex] = (short) var28.readUnsignedShort();
+ model.aByteArray2580[texIndex] = var6.readByte();
+ model.aShortArray2578[texIndex] = (short) var55.readUnsignedShort();
+ model.texturePrimaryColors[texIndex] = (short) var55.readUnsignedShort();
+ }
+
+ if (type == 3)
+ {
+ model.textureTriangleVertexIndices1[texIndex] = (short) var24.readUnsignedShort();
+ model.textureTriangleVertexIndices2[texIndex] = (short) var24.readUnsignedShort();
+ model.textureTriangleVertexIndices3[texIndex] = (short) var24.readUnsignedShort();
+ model.aShortArray2574[texIndex] = (short) var3.readUnsignedShort();
+ model.aShortArray2575[texIndex] = (short) var3.readUnsignedShort();
+ model.aShortArray2586[texIndex] = (short) var3.readUnsignedShort();
+ model.aShortArray2577[texIndex] = (short) var28.readUnsignedShort();
+ model.aByteArray2580[texIndex] = var6.readByte();
+ model.aShortArray2578[texIndex] = (short) var55.readUnsignedShort();
+ }
+ }
+
+ var2.setOffset(position);
+ vertexZOffset = var2.readUnsignedByte();
+ if (vertexZOffset != 0)
+ {
+ //new Class41();
+ var2.readUnsignedShort();
+ var2.readUnsignedShort();
+ var2.readUnsignedShort();
+ var2.readInt();
+ }
+ }
+
+ private void load2(ModelDefinition model, byte[] var1)
+ {
+ boolean var2 = false;
+ boolean var43 = false;
+ InputStream var5 = new InputStream(var1);
+ InputStream var39 = new InputStream(var1);
+ InputStream var26 = new InputStream(var1);
+ InputStream var9 = new InputStream(var1);
+ InputStream var3 = new InputStream(var1);
+ var5.setOffset(var1.length - 18);
+ int var10 = var5.readUnsignedShort();
+ int var11 = var5.readUnsignedShort();
+ int var12 = var5.readUnsignedByte();
+ int var13 = var5.readUnsignedByte();
+ int var14 = var5.readUnsignedByte();
+ int var30 = var5.readUnsignedByte();
+ int var15 = var5.readUnsignedByte();
+ int var28 = var5.readUnsignedByte();
+ int var27 = var5.readUnsignedShort();
+ int var20 = var5.readUnsignedShort();
+ int var36 = var5.readUnsignedShort();
+ int var23 = var5.readUnsignedShort();
+ byte var16 = 0;
+ int var46 = var16 + var10;
+ int var24 = var46;
+ var46 += var11;
+ int var25 = var46;
+ if (var14 == 255)
+ {
+ var46 += var11;
+ }
+
+ int var4 = var46;
+ if (var15 == 1)
+ {
+ var46 += var11;
+ }
+
+ int var42 = var46;
+ if (var13 == 1)
+ {
+ var46 += var11;
+ }
+
+ int var37 = var46;
+ if (var28 == 1)
+ {
+ var46 += var10;
+ }
+
+ int var29 = var46;
+ if (var30 == 1)
+ {
+ var46 += var11;
+ }
+
+ int var44 = var46;
+ var46 += var23;
+ int var17 = var46;
+ var46 += var11 * 2;
+ int var32 = var46;
+ var46 += var12 * 6;
+ int var34 = var46;
+ var46 += var27;
+ int var35 = var46;
+ var46 += var20;
+ int var10000 = var46 + var36;
+ model.vertexCount = var10;
+ model.faceCount = var11;
+ model.textureTriangleCount = var12;
+ model.vertexPositionsX = new int[var10];
+ model.vertexPositionsY = new int[var10];
+ model.vertexPositionsZ = new int[var10];
+ model.faceVertexIndices1 = new int[var11];
+ model.faceVertexIndices2 = new int[var11];
+ model.faceVertexIndices3 = new int[var11];
+ if (var12 > 0)
+ {
+ model.textureRenderTypes = new byte[var12];
+ model.textureTriangleVertexIndices1 = new short[var12];
+ model.textureTriangleVertexIndices2 = new short[var12];
+ model.textureTriangleVertexIndices3 = new short[var12];
+ }
+
+ if (var28 == 1)
+ {
+ model.vertexSkins = new int[var10];
+ }
+
+ if (var13 == 1)
+ {
+ model.faceRenderTypes = new byte[var11];
+ model.textureCoordinates = new byte[var11];
+ model.faceTextures = new short[var11];
+ }
+
+ if (var14 == 255)
+ {
+ model.faceRenderPriorities = new byte[var11];
+ }
+ else
+ {
+ model.priority = (byte) var14;
+ }
+
+ if (var30 == 1)
+ {
+ model.faceAlphas = new byte[var11];
+ }
+
+ if (var15 == 1)
+ {
+ model.faceSkins = new int[var11];
+ }
+
+ model.faceColors = new short[var11];
+ var5.setOffset(var16);
+ var39.setOffset(var34);
+ var26.setOffset(var35);
+ var9.setOffset(var46);
+ var3.setOffset(var37);
+ int var41 = 0;
+ int var33 = 0;
+ int var19 = 0;
+
+ int var6;
+ int var7;
+ int var8;
+ int var18;
+ int var31;
+ for (var18 = 0; var18 < var10; ++var18)
+ {
+ var8 = var5.readUnsignedByte();
+ var31 = 0;
+ if ((var8 & 1) != 0)
+ {
+ var31 = var39.readShortSmart();
+ }
+
+ var6 = 0;
+ if ((var8 & 2) != 0)
+ {
+ var6 = var26.readShortSmart();
+ }
+
+ var7 = 0;
+ if ((var8 & 4) != 0)
+ {
+ var7 = var9.readShortSmart();
+ }
+
+ model.vertexPositionsX[var18] = var41 + var31;
+ model.vertexPositionsY[var18] = var33 + var6;
+ model.vertexPositionsZ[var18] = var19 + var7;
+ var41 = model.vertexPositionsX[var18];
+ var33 = model.vertexPositionsY[var18];
+ var19 = model.vertexPositionsZ[var18];
+ if (var28 == 1)
+ {
+ model.vertexSkins[var18] = var3.readUnsignedByte();
+ }
+ }
+
+ var5.setOffset(var17);
+ var39.setOffset(var42);
+ var26.setOffset(var25);
+ var9.setOffset(var29);
+ var3.setOffset(var4);
+
+ for (var18 = 0; var18 < var11; ++var18)
+ {
+ model.faceColors[var18] = (short) var5.readUnsignedShort();
+ if (var13 == 1)
+ {
+ var8 = var39.readUnsignedByte();
+ if ((var8 & 1) == 1)
+ {
+ model.faceRenderTypes[var18] = 1;
+ var2 = true;
+ }
+ else
+ {
+ model.faceRenderTypes[var18] = 0;
+ }
+
+ if ((var8 & 2) == 2)
+ {
+ model.textureCoordinates[var18] = (byte) (var8 >> 2);
+ model.faceTextures[var18] = model.faceColors[var18];
+ model.faceColors[var18] = 127;
+ if (model.faceTextures[var18] != -1)
+ {
+ var43 = true;
+ }
+ }
+ else
+ {
+ model.textureCoordinates[var18] = -1;
+ model.faceTextures[var18] = -1;
+ }
+ }
+
+ if (var14 == 255)
+ {
+ model.faceRenderPriorities[var18] = var26.readByte();
+ }
+
+ if (var30 == 1)
+ {
+ model.faceAlphas[var18] = var9.readByte();
+ }
+
+ if (var15 == 1)
+ {
+ model.faceSkins[var18] = var3.readUnsignedByte();
+ }
+ }
+
+ var5.setOffset(var44);
+ var39.setOffset(var24);
+ var18 = 0;
+ var8 = 0;
+ var31 = 0;
+ var6 = 0;
+
+ int var21;
+ int var22;
+ for (var7 = 0; var7 < var11; ++var7)
+ {
+ var22 = var39.readUnsignedByte();
+ if (var22 == 1)
+ {
+ var18 = var5.readShortSmart() + var6;
+ var8 = var5.readShortSmart() + var18;
+ var31 = var5.readShortSmart() + var8;
+ var6 = var31;
+ model.faceVertexIndices1[var7] = var18;
+ model.faceVertexIndices2[var7] = var8;
+ model.faceVertexIndices3[var7] = var31;
+ }
+
+ if (var22 == 2)
+ {
+ var8 = var31;
+ var31 = var5.readShortSmart() + var6;
+ var6 = var31;
+ model.faceVertexIndices1[var7] = var18;
+ model.faceVertexIndices2[var7] = var8;
+ model.faceVertexIndices3[var7] = var31;
+ }
+
+ if (var22 == 3)
+ {
+ var18 = var31;
+ var31 = var5.readShortSmart() + var6;
+ var6 = var31;
+ model.faceVertexIndices1[var7] = var18;
+ model.faceVertexIndices2[var7] = var8;
+ model.faceVertexIndices3[var7] = var31;
+ }
+
+ if (var22 == 4)
+ {
+ var21 = var18;
+ var18 = var8;
+ var8 = var21;
+ var31 = var5.readShortSmart() + var6;
+ var6 = var31;
+ model.faceVertexIndices1[var7] = var18;
+ model.faceVertexIndices2[var7] = var21;
+ model.faceVertexIndices3[var7] = var31;
+ }
+ }
+
+ var5.setOffset(var32);
+
+ for (var7 = 0; var7 < var12; ++var7)
+ {
+ model.textureRenderTypes[var7] = 0;
+ model.textureTriangleVertexIndices1[var7] = (short) var5.readUnsignedShort();
+ model.textureTriangleVertexIndices2[var7] = (short) var5.readUnsignedShort();
+ model.textureTriangleVertexIndices3[var7] = (short) var5.readUnsignedShort();
+ }
+
+ if (model.textureCoordinates != null)
+ {
+ boolean var45 = false;
+
+ for (var22 = 0; var22 < var11; ++var22)
+ {
+ var21 = model.textureCoordinates[var22] & 255;
+ if (var21 != 255)
+ {
+ if ((model.textureTriangleVertexIndices1[var21] & '\uffff') == model.faceVertexIndices1[var22] && (model.textureTriangleVertexIndices2[var21] & '\uffff') == model.faceVertexIndices2[var22] && (model.textureTriangleVertexIndices3[var21] & '\uffff') == model.faceVertexIndices3[var22])
+ {
+ model.textureCoordinates[var22] = -1;
+ }
+ else
+ {
+ var45 = true;
+ }
+ }
+ }
+
+ if (!var45)
+ {
+ model.textureCoordinates = null;
+ }
+ }
+
+ if (!var43)
+ {
+ model.faceTextures = null;
+ }
+
+ if (!var2)
+ {
+ model.faceRenderTypes = null;
+ }
+ }
+
+}
diff --git a/cache/src/main/java/net/runelite/cache/definitions/loaders/NpcLoader.java b/cache/src/main/java/net/runelite/cache/definitions/loaders/NpcLoader.java
new file mode 100644
index 0000000000..478ef2660a
--- /dev/null
+++ b/cache/src/main/java/net/runelite/cache/definitions/loaders/NpcLoader.java
@@ -0,0 +1,289 @@
+/*
+ * Copyright (c) 2016-2017, Adam
+ * 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.NpcDefinition;
+import net.runelite.cache.io.InputStream;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.HashMap;
+
+public class NpcLoader
+{
+ private static final Logger logger = LoggerFactory.getLogger(NpcLoader.class);
+
+ public NpcDefinition load(int id, byte[] b)
+ {
+ NpcDefinition def = new NpcDefinition(id);
+ InputStream is = new InputStream(b);
+
+ while (true)
+ {
+ int opcode = is.readUnsignedByte();
+ if (opcode == 0)
+ {
+ break;
+ }
+
+ this.decodeValues(opcode, def, is);
+ }
+
+ return def;
+ }
+
+ private void decodeValues(int opcode, NpcDefinition def, InputStream stream)
+ {
+ int length;
+ int index;
+ if (opcode == 1)
+ {
+ length = stream.readUnsignedByte();
+ def.models = new int[length];
+
+ for (index = 0; index < length; ++index)
+ {
+ def.models[index] = stream.readUnsignedShort();
+ }
+
+ }
+ else if (opcode == 2)
+ {
+ def.name = stream.readString();
+ }
+ else if (opcode == 12)
+ {
+ def.tileSpacesOccupied = stream.readUnsignedByte();
+ }
+ else if (opcode == 13)
+ {
+ def.stanceAnimation = stream.readUnsignedShort();
+ }
+ else if (opcode == 14)
+ {
+ def.walkAnimation = stream.readUnsignedShort();
+ }
+ else if (opcode == 15)
+ {
+ def.anInt2165 = stream.readUnsignedShort();
+ }
+ else if (opcode == 16)
+ {
+ def.anInt2189 = stream.readUnsignedShort();
+ }
+ else if (opcode == 17)
+ {
+ def.walkAnimation = stream.readUnsignedShort();
+ def.rotate180Animation = stream.readUnsignedShort();
+ def.rotate90RightAnimation = stream.readUnsignedShort();
+ def.rotate90LeftAnimation = stream.readUnsignedShort();
+ }
+ else if (opcode >= 30 && opcode < 35)
+ {
+ def.options[opcode - 30] = stream.readString();
+ if (def.options[opcode - 30].equalsIgnoreCase("Hidden"))
+ {
+ def.options[opcode - 30] = null;
+ }
+ }
+ else if (opcode == 40)
+ {
+ length = stream.readUnsignedByte();
+ def.recolorToFind = new short[length];
+ def.recolorToReplace = new short[length];
+
+ for (index = 0; index < length; ++index)
+ {
+ def.recolorToFind[index] = (short) stream.readUnsignedShort();
+ def.recolorToReplace[index] = (short) stream.readUnsignedShort();
+ }
+
+ }
+ else if (opcode == 41)
+ {
+ length = stream.readUnsignedByte();
+ def.retextureToFind = new short[length];
+ def.retextureToReplace = new short[length];
+
+ for (index = 0; index < length; ++index)
+ {
+ def.retextureToFind[index] = (short) stream.readUnsignedShort();
+ def.retextureToReplace[index] = (short) stream.readUnsignedShort();
+ }
+
+ }
+ else if (opcode == 60)
+ {
+ length = stream.readUnsignedByte();
+ def.models_2 = new int[length];
+
+ for (index = 0; index < length; ++index)
+ {
+ def.models_2[index] = stream.readUnsignedShort();
+ }
+
+ }
+ else if (opcode == 93)
+ {
+ def.renderOnMinimap = false;
+ }
+ else if (opcode == 95)
+ {
+ def.combatLevel = stream.readUnsignedShort();
+ }
+ else if (opcode == 97)
+ {
+ def.resizeX = stream.readUnsignedShort();
+ }
+ else if (opcode == 98)
+ {
+ def.resizeY = stream.readUnsignedShort();
+ }
+ else if (opcode == 99)
+ {
+ def.hasRenderPriority = true;
+ }
+ else if (opcode == 100)
+ {
+ def.ambient = stream.readByte();
+ }
+ else if (opcode == 101)
+ {
+ def.contrast = stream.readByte();
+ }
+ else if (opcode == 102)
+ {
+ def.headIcon = stream.readUnsignedShort();
+ }
+ else if (opcode == 103)
+ {
+ def.rotation = stream.readUnsignedShort();
+ }
+ else if (opcode == 106)
+ {
+ def.varbitIndex = stream.readUnsignedShort();
+ if ('\uffff' == def.varbitIndex)
+ {
+ def.varbitIndex = -1;
+ }
+
+ def.varpIndex = stream.readUnsignedShort();
+ if ('\uffff' == def.varpIndex)
+ {
+ def.varpIndex = -1;
+ }
+
+ length = stream.readUnsignedByte();
+ def.configs = new int[length + 2];
+
+ for (index = 0; index <= length; ++index)
+ {
+ def.configs[index] = stream.readUnsignedShort();
+ if (def.configs[index] == '\uffff')
+ {
+ def.configs[index] = -1;
+ }
+ }
+
+ def.configs[length + 1] = -1;
+
+ }
+ else if (opcode == 107)
+ {
+ def.isClickable = false;
+ }
+ else if (opcode == 109)
+ {
+ def.aBool2170 = false;
+ }
+ else if (opcode == 111)
+ {
+ def.aBool2190 = true;
+ }
+ else if (opcode == 118)
+ {
+ def.varbitIndex = stream.readUnsignedShort();
+ if ('\uffff' == def.varbitIndex)
+ {
+ def.varbitIndex = -1;
+ }
+
+ def.varpIndex = stream.readUnsignedShort();
+ if ('\uffff' == def.varpIndex)
+ {
+ def.varpIndex = -1;
+ }
+
+ int var = stream.readUnsignedShort();
+ if (var == 0xFFFF)
+ {
+ var = -1;
+ }
+
+ length = stream.readUnsignedByte();
+ def.configs = new int[length + 2];
+
+ for (index = 0; index <= length; ++index)
+ {
+ def.configs[index] = stream.readUnsignedShort();
+ if (def.configs[index] == '\uffff')
+ {
+ def.configs[index] = -1;
+ }
+ }
+
+ def.configs[length + 1] = var;
+ }
+ else if (opcode == 249)
+ {
+ length = stream.readUnsignedByte();
+
+ def.params = new HashMap<>(length);
+
+ for (int i = 0; i < length; i++)
+ {
+ boolean isString = stream.readUnsignedByte() == 1;
+ int key = stream.read24BitInt();
+ Object value;
+
+ if (isString)
+ {
+ value = stream.readString();
+ }
+
+ else
+ {
+ value = stream.readInt();
+ }
+
+ def.params.put(key, value);
+ }
+ }
+ else
+ {
+ logger.warn("Unrecognized opcode {}", opcode);
+ }
+ }
+}
diff --git a/cache/src/main/java/net/runelite/cache/definitions/loaders/ObjectLoader.java b/cache/src/main/java/net/runelite/cache/definitions/loaders/ObjectLoader.java
new file mode 100644
index 0000000000..13a3eab754
--- /dev/null
+++ b/cache/src/main/java/net/runelite/cache/definitions/loaders/ObjectLoader.java
@@ -0,0 +1,405 @@
+/*
+ * Copyright (c) 2016-2017, Adam
+ * 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 java.util.HashMap;
+import java.util.Map;
+import net.runelite.cache.definitions.ObjectDefinition;
+import net.runelite.cache.io.InputStream;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class ObjectLoader
+{
+ private static final Logger logger = LoggerFactory.getLogger(ObjectLoader.class);
+
+ public ObjectDefinition load(int id, byte[] b)
+ {
+ ObjectDefinition def = new ObjectDefinition();
+ InputStream is = new InputStream(b);
+
+ def.setId(id);
+
+ for (;;)
+ {
+ int opcode = is.readUnsignedByte();
+ if (opcode == 0)
+ {
+ break;
+ }
+
+ processOp(opcode, def, is);
+ }
+
+ post(def);
+
+ return def;
+ }
+
+ private void processOp(int opcode, ObjectDefinition def, InputStream is)
+ {
+ if (opcode == 1)
+ {
+ int length = is.readUnsignedByte();
+ if (length > 0)
+ {
+ int[] objectTypes = new int[length];
+ int[] objectModels = new int[length];
+
+ for (int index = 0; index < length; ++index)
+ {
+ objectModels[index] = is.readUnsignedShort();
+ objectTypes[index] = is.readUnsignedByte();
+ }
+
+ def.setObjectTypes(objectTypes);
+ def.setObjectModels(objectModels);
+ }
+ }
+ else if (opcode == 2)
+ {
+ def.setName(is.readString());
+ }
+ else if (opcode == 5)
+ {
+ int length = is.readUnsignedByte();
+ if (length > 0)
+ {
+ def.setObjectTypes(null);
+ int[] objectModels = new int[length];
+
+ for (int index = 0; index < length; ++index)
+ {
+ objectModels[index] = is.readUnsignedShort();
+ }
+
+ def.setObjectModels(objectModels);
+ }
+ }
+ else if (opcode == 14)
+ {
+ def.setSizeX(is.readUnsignedByte());
+ }
+ else if (opcode == 15)
+ {
+ def.setSizeY(is.readUnsignedByte());
+ }
+ else if (opcode == 17)
+ {
+ def.setInteractType(0);
+ def.setBlocksProjectile(false);
+ }
+ else if (opcode == 18)
+ {
+ def.setBlocksProjectile(false);
+ }
+ else if (opcode == 19)
+ {
+ def.setAnInt2088(is.readUnsignedByte());
+ }
+ else if (opcode == 21)
+ {
+ def.setAnInt2105(0);
+ }
+ else if (opcode == 22)
+ {
+ def.setNonFlatShading(false);
+ }
+ else if (opcode == 23)
+ {
+ def.setABool2111(true);
+ }
+ else if (opcode == 24)
+ {
+ def.setAnimationID(is.readUnsignedShort());
+ if (def.getAnimationID() == 0xFFFF)
+ {
+ def.setAnimationID(-1);
+ }
+ }
+ else if (opcode == 27)
+ {
+ def.setInteractType(1);
+ }
+ else if (opcode == 28)
+ {
+ def.setAnInt2069(is.readUnsignedByte());
+ }
+ else if (opcode == 29)
+ {
+ def.setAmbient(is.readByte());
+ }
+ else if (opcode == 39)
+ {
+ def.setContrast(is.readByte());
+ }
+ else if (opcode >= 30 && opcode < 35)
+ {
+ String[] actions = def.getActions();
+ actions[opcode - 30] = is.readString();
+ if (actions[opcode - 30].equalsIgnoreCase("Hidden"))
+ {
+ actions[opcode - 30] = null;
+ }
+ }
+ else if (opcode == 40)
+ {
+ int length = is.readUnsignedByte();
+ short[] recolorToFind = new short[length];
+ short[] recolorToReplace = new short[length];
+
+ for (int index = 0; index < length; ++index)
+ {
+ recolorToFind[index] = is.readShort();
+ recolorToReplace[index] = is.readShort();
+ }
+
+ def.setRecolorToFind(recolorToFind);
+ def.setRecolorToReplace(recolorToReplace);
+ }
+ else if (opcode == 41)
+ {
+ int length = is.readUnsignedByte();
+ short[] retextureToFind = new short[length];
+ short[] textureToReplace = new short[length];
+
+ for (int index = 0; index < length; ++index)
+ {
+ retextureToFind[index] = is.readShort();
+ textureToReplace[index] = is.readShort();
+ }
+
+ def.setRetextureToFind(retextureToFind);
+ def.setTextureToReplace(textureToReplace);
+ }
+ else if (opcode == 62)
+ {
+ def.setRotated(true);
+ }
+ else if (opcode == 64)
+ {
+ def.setABool2097(false);
+ }
+ else if (opcode == 65)
+ {
+ def.setModelSizeX(is.readUnsignedShort());
+ }
+ else if (opcode == 66)
+ {
+ def.setModelSizeHeight(is.readUnsignedShort());
+ }
+ else if (opcode == 67)
+ {
+ def.setModelSizeY(is.readUnsignedShort());
+ }
+ else if (opcode == 68)
+ {
+ def.setMapSceneID(is.readUnsignedShort());
+ }
+ else if (opcode == 69)
+ {
+ is.readByte();
+ }
+ else if (opcode == 70)
+ {
+ def.setOffsetX(is.readUnsignedShort());
+ }
+ else if (opcode == 71)
+ {
+ def.setOffsetHeight(is.readUnsignedShort());
+ }
+ else if (opcode == 72)
+ {
+ def.setOffsetY(is.readUnsignedShort());
+ }
+ else if (opcode == 73)
+ {
+ def.setABool2104(true);
+ }
+ else if (opcode == 74)
+ {
+ def.setSolid(true);
+ }
+ else if (opcode == 75)
+ {
+ def.setAnInt2106(is.readUnsignedByte());
+ }
+ else if (opcode == 77)
+ {
+ int varpID = is.readUnsignedShort();
+ if (varpID == 0xFFFF)
+ {
+ varpID = -1;
+ }
+ def.setVarbitID(varpID);
+
+ int configId = is.readUnsignedShort();
+ if (configId == 0xFFFF)
+ {
+ configId = -1;
+ }
+ def.setVarpID(configId);
+
+ int length = is.readUnsignedByte();
+ int[] configChangeDest = new int[length + 2];
+
+ for (int index = 0; index <= length; ++index)
+ {
+ configChangeDest[index] = is.readUnsignedShort();
+ if (0xFFFF == configChangeDest[index])
+ {
+ configChangeDest[index] = -1;
+ }
+ }
+
+ configChangeDest[length + 1] = -1;
+
+ def.setConfigChangeDest(configChangeDest);
+ }
+ else if (opcode == 78)
+ {
+ def.setAnInt2110(is.readUnsignedShort());
+ def.setAnInt2083(is.readUnsignedByte());
+ }
+ else if (opcode == 79)
+ {
+ def.setAnInt2112(is.readUnsignedShort());
+ def.setAnInt2113(is.readUnsignedShort());
+ def.setAnInt2083(is.readUnsignedByte());
+ int length = is.readUnsignedByte();
+ int[] anIntArray2084 = new int[length];
+
+ for (int index = 0; index < length; ++index)
+ {
+ anIntArray2084[index] = is.readUnsignedShort();
+ }
+
+ def.setAnIntArray2084(anIntArray2084);
+ }
+ else if (opcode == 81)
+ {
+ def.setAnInt2105(is.readUnsignedByte() * 256);
+ }
+ else if (opcode == 82)
+ {
+ def.setMapAreaId(is.readUnsignedShort());
+ }
+ else if (opcode == 92)
+ {
+ int varpID = is.readUnsignedShort();
+ if (varpID == 0xFFFF)
+ {
+ varpID = -1;
+ }
+ def.setVarbitID(varpID);
+
+ int configId = is.readUnsignedShort();
+ if (configId == 0xFFFF)
+ {
+ configId = -1;
+ }
+ def.setVarpID(configId);
+
+
+ int var = is.readUnsignedShort();
+ if (var == 0xFFFF)
+ {
+ var = -1;
+ }
+
+ int length = is.readUnsignedByte();
+ int[] configChangeDest = new int[length + 2];
+
+ for (int index = 0; index <= length; ++index)
+ {
+ configChangeDest[index] = is.readUnsignedShort();
+ if (0xFFFF == configChangeDest[index])
+ {
+ configChangeDest[index] = -1;
+ }
+ }
+
+ configChangeDest[length + 1] = var;
+
+ def.setConfigChangeDest(configChangeDest);
+ }
+ else if (opcode == 249)
+ {
+ int length = is.readUnsignedByte();
+
+ Map params = new HashMap<>(length);
+ for (int i = 0; i < length; i++)
+ {
+ boolean isString = is.readUnsignedByte() == 1;
+ int key = is.read24BitInt();
+ Object value;
+
+ if (isString)
+ {
+ value = is.readString();
+ }
+
+ else
+ {
+ value = is.readInt();
+ }
+
+ params.put(key, value);
+ }
+
+ def.setParams(params);
+ }
+ else
+ {
+ logger.warn("Unrecognized opcode {}", opcode);
+ }
+ }
+
+
+ private void post(ObjectDefinition def)
+ {
+ if (def.getAnInt2088() == -1)
+ {
+ def.setAnInt2088(0);
+ if (def.getObjectModels() != null && (def.getObjectTypes() == null || def.getObjectTypes()[0] == 10))
+ {
+ def.setAnInt2088(1);
+ }
+
+ for (int var1 = 0; var1 < 5; ++var1)
+ {
+ if (def.getActions()[var1] != null)
+ {
+ def.setAnInt2088(1);
+ }
+ }
+ }
+
+ if (def.getAnInt2106() == -1)
+ {
+ def.setAnInt2106(def.getInteractType() != 0 ? 1 : 0);
+ }
+ }
+}
diff --git a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/UnusedClass.java b/cache/src/main/java/net/runelite/cache/definitions/loaders/OverlayLoader.java
similarity index 62%
rename from deobfuscator/src/main/java/net/runelite/deob/deobfuscators/UnusedClass.java
rename to cache/src/main/java/net/runelite/cache/definitions/loaders/OverlayLoader.java
index 647dcaf4f4..1b01c07c87 100644
--- a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/UnusedClass.java
+++ b/cache/src/main/java/net/runelite/cache/definitions/loaders/OverlayLoader.java
@@ -22,56 +22,55 @@
* (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.deob.deobfuscators;
+package net.runelite.cache.definitions.loaders;
-import java.util.ArrayList;
-import net.runelite.asm.ClassFile;
-import net.runelite.asm.ClassGroup;
-import net.runelite.deob.Deobfuscator;
+import net.runelite.cache.definitions.OverlayDefinition;
+import net.runelite.cache.io.InputStream;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class UnusedClass implements Deobfuscator
+public class OverlayLoader
{
- private static final Logger logger = LoggerFactory.getLogger(UnusedClass.class);
+ private static final Logger logger = LoggerFactory.getLogger(OverlayLoader.class);
- @Override
- public void run(ClassGroup group)
+ public OverlayDefinition load(int id, byte[] b)
{
- int count = 0;
- for (ClassFile cf : new ArrayList<>(group.getClasses()))
+ OverlayDefinition def = new OverlayDefinition();
+ InputStream is = new InputStream(b);
+
+ def.setId(id);
+
+ for (;;)
{
- if (!cf.getFields().isEmpty())
+ int opcode = is.readUnsignedByte();
+ if (opcode == 0)
{
- continue;
+ break;
}
- if (!cf.getMethods().isEmpty())
+ if (opcode == 1)
{
- continue;
+ int color = is.read24BitInt();
+ def.setRgbColor(color);
}
-
- if (isImplemented(group, cf))
+ else if (opcode == 2)
{
- continue;
+ int texture = is.readUnsignedByte();
+ def.setTexture(texture);
}
-
- group.removeClass(cf);
- ++count;
- }
-
- logger.info("Removed {} classes", count);
- }
-
- private boolean isImplemented(ClassGroup group, ClassFile iface)
- {
- for (ClassFile cf : group.getClasses())
- {
- if (cf.getInterfaces().getMyInterfaces().contains(iface))
+ else if (opcode == 5)
{
- return true;
+ def.setHideUnderlay(false);
+ }
+ else if (opcode == 7)
+ {
+ int secondaryColor = is.read24BitInt();
+ def.setSecondaryRgbColor(secondaryColor);
}
}
- return false;
+
+ def.calculateHsl();
+
+ return def;
}
}
diff --git a/cache/src/main/java/net/runelite/cache/definitions/loaders/ScriptLoader.java b/cache/src/main/java/net/runelite/cache/definitions/loaders/ScriptLoader.java
new file mode 100644
index 0000000000..e77964a5ca
--- /dev/null
+++ b/cache/src/main/java/net/runelite/cache/definitions/loaders/ScriptLoader.java
@@ -0,0 +1,113 @@
+/*
+ * Copyright (c) 2016-2017, Adam
+ * 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 java.util.HashMap;
+import java.util.Map;
+import net.runelite.cache.definitions.ScriptDefinition;
+import net.runelite.cache.io.InputStream;
+import static net.runelite.cache.script.Opcodes.SCONST;
+import static net.runelite.cache.script.Opcodes.POP_INT;
+import static net.runelite.cache.script.Opcodes.POP_STRING;
+import static net.runelite.cache.script.Opcodes.RETURN;
+
+public class ScriptLoader
+{
+ public ScriptDefinition load(int id, byte[] b)
+ {
+ ScriptDefinition def = new ScriptDefinition();
+ def.setId(id);
+ InputStream in = new InputStream(b);
+
+ in.setOffset(in.getLength() - 2);
+ int switchLength = in.readUnsignedShort();
+
+ // 2 for switchLength + the switch data + 12 for the param/vars/stack data
+ int endIdx = in.getLength() - 2 - switchLength - 12;
+ in.setOffset(endIdx);
+ int numOpcodes = in.readInt();
+ int localIntCount = in.readUnsignedShort();
+ int localStringCount = in.readUnsignedShort();
+ int intStackCount = in.readUnsignedShort();
+ int stringStackCount = in.readUnsignedShort();
+
+ int numSwitches = in.readUnsignedByte();
+ if (numSwitches > 0)
+ {
+ Map[] switches = new Map[numSwitches];
+ def.setSwitches(switches);
+
+ for (int i = 0; i < numSwitches; ++i)
+ {
+ switches[i] = new HashMap<>();
+
+ int count = in.readUnsignedShort();
+ while (count-- > 0)
+ {
+ int key = in.readInt(); // int from stack is compared to this
+ int pcOffset = in.readInt(); // pc jumps by this
+
+ switches[i].put(key, pcOffset);
+ }
+ }
+ }
+
+ def.setLocalIntCount(localIntCount);
+ def.setLocalStringCount(localStringCount);
+ def.setIntStackCount(intStackCount);
+ def.setStringStackCount(stringStackCount);
+
+ in.setOffset(0);
+ in.readStringOrNull();
+
+ int[] instructions = new int[numOpcodes];
+ int[] intOperands = new int[numOpcodes];
+ String[] stringOperands = new String[numOpcodes];
+
+ def.setInstructions(instructions);
+ def.setIntOperands(intOperands);
+ def.setStringOperands(stringOperands);
+
+ int opcode;
+ for (int i = 0; in.getOffset() < endIdx; instructions[i++] = opcode)
+ {
+ opcode = in.readUnsignedShort();
+ if (opcode == SCONST)
+ {
+ stringOperands[i] = in.readString();
+ }
+ else if (opcode < 100 && opcode != RETURN && opcode != POP_INT && opcode != POP_STRING)
+ {
+ intOperands[i] = in.readInt();
+ }
+ else
+ {
+ intOperands[i] = in.readUnsignedByte();
+ }
+ }
+
+ return def;
+ }
+}
diff --git a/cache/src/main/java/net/runelite/cache/definitions/loaders/SequenceLoader.java b/cache/src/main/java/net/runelite/cache/definitions/loaders/SequenceLoader.java
new file mode 100644
index 0000000000..987cbd4204
--- /dev/null
+++ b/cache/src/main/java/net/runelite/cache/definitions/loaders/SequenceLoader.java
@@ -0,0 +1,156 @@
+/*
+ * Copyright (c) 2016-2017, Adam
+ * 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.SequenceDefinition;
+import net.runelite.cache.io.InputStream;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class SequenceLoader
+{
+ private static final Logger logger = LoggerFactory.getLogger(SequenceLoader.class);
+
+ public SequenceDefinition load(int id, byte[] b)
+ {
+ SequenceDefinition def = new SequenceDefinition(id);
+ InputStream is = new InputStream(b);
+
+ while (true)
+ {
+ int opcode = is.readUnsignedByte();
+ if (opcode == 0)
+ {
+ break;
+ }
+
+ this.decodeValues(opcode, def, is);
+ }
+
+ return def;
+ }
+
+ private void decodeValues(int opcode, SequenceDefinition def, InputStream stream)
+ {
+ int var3;
+ int var4;
+ if (opcode == 1)
+ {
+ var3 = stream.readUnsignedShort();
+ def.frameLenghts = new int[var3];
+
+ for (var4 = 0; var4 < var3; ++var4)
+ {
+ def.frameLenghts[var4] = stream.readUnsignedShort();
+ }
+
+ def.frameIDs = new int[var3];
+
+ for (var4 = 0; var4 < var3; ++var4)
+ {
+ def.frameIDs[var4] = stream.readUnsignedShort();
+ }
+
+ for (var4 = 0; var4 < var3; ++var4)
+ {
+ def.frameIDs[var4] += stream.readUnsignedShort() << 16;
+ }
+ }
+ else if (opcode == 2)
+ {
+ def.frameStep = stream.readUnsignedShort();
+ }
+ else if (opcode == 3)
+ {
+ var3 = stream.readUnsignedByte();
+ def.interleaveLeave = new int[1 + var3];
+
+ for (var4 = 0; var4 < var3; ++var4)
+ {
+ def.interleaveLeave[var4] = stream.readUnsignedByte();
+ }
+
+ def.interleaveLeave[var3] = 9999999;
+ }
+ else if (opcode == 4)
+ {
+ def.stretches = true;
+ }
+ else if (opcode == 5)
+ {
+ def.forcedPriority = stream.readUnsignedByte();
+ }
+ else if (opcode == 6)
+ {
+ def.leftHandItem = stream.readUnsignedShort();
+ }
+ else if (opcode == 7)
+ {
+ def.rightHandItem = stream.readUnsignedShort();
+ }
+ else if (opcode == 8)
+ {
+ def.maxLoops = stream.readUnsignedByte();
+ }
+ else if (opcode == 9)
+ {
+ def.precedenceAnimating = stream.readUnsignedByte();
+ }
+ else if (opcode == 10)
+ {
+ def.priority = stream.readUnsignedByte();
+ }
+ else if (opcode == 11)
+ {
+ def.replyMode = stream.readUnsignedByte();
+ }
+ else if (opcode == 12)
+ {
+ var3 = stream.readUnsignedByte();
+ def.field3048 = new int[var3];
+
+ for (var4 = 0; var4 < var3; ++var4)
+ {
+ def.field3048[var4] = stream.readUnsignedShort();
+ }
+
+ for (var4 = 0; var4 < var3; ++var4)
+ {
+ def.field3048[var4] += stream.readUnsignedShort() << 16;
+ }
+ }
+ else if (opcode == 13)
+ {
+ var3 = stream.readUnsignedByte();
+ def.field3056 = new int[var3];
+
+ for (var4 = 0; var4 < var3; ++var4)
+ {
+ def.field3056[var4] = stream.read24BitInt();
+ }
+ }
+
+ }
+}
diff --git a/cache/src/main/java/net/runelite/cache/definitions/loaders/SpotAnimLoader.java b/cache/src/main/java/net/runelite/cache/definitions/loaders/SpotAnimLoader.java
new file mode 100644
index 0000000000..20f2be2d24
--- /dev/null
+++ b/cache/src/main/java/net/runelite/cache/definitions/loaders/SpotAnimLoader.java
@@ -0,0 +1,111 @@
+/*
+ * Copyright (c) 2017, Adam
+ * 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.SpotAnimDefinition;
+import net.runelite.cache.io.InputStream;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class SpotAnimLoader
+{
+ private static final Logger logger = LoggerFactory.getLogger(SpotAnimLoader.class);
+
+ public SpotAnimDefinition load(int id, byte[] b)
+ {
+ SpotAnimDefinition def = new SpotAnimDefinition();
+ InputStream is = new InputStream(b);
+ def.id = id;
+
+ while (true)
+ {
+ int opcode = is.readUnsignedByte();
+ if (opcode == 0)
+ {
+ break;
+ }
+
+ this.decodeValues(opcode, def, is);
+ }
+
+ return def;
+ }
+
+ private void decodeValues(int opcode, SpotAnimDefinition def, InputStream stream)
+ {
+ if (opcode == 1)
+ {
+ def.modelId = stream.readUnsignedShort();
+ }
+ else if (opcode == 2)
+ {
+ def.animationId = stream.readUnsignedShort();
+ }
+ else if (opcode == 4)
+ {
+ def.resizeX = stream.readUnsignedShort();
+ }
+ else if (opcode == 5)
+ {
+ def.resizeY = stream.readUnsignedShort();
+ }
+ else if (opcode == 6)
+ {
+ def.rotaton = stream.readUnsignedShort();
+ }
+ else if (opcode == 7)
+ {
+ def.ambient = stream.readUnsignedByte();
+ }
+ else if (opcode == 8)
+ {
+ def.contrast = stream.readUnsignedByte();
+ }
+ else if (opcode == 40)
+ {
+ int var3 = stream.readUnsignedByte();
+ def.recolorToFind = new short[var3];
+ def.recolorToReplace = new short[var3];
+
+ for (int var4 = 0; var4 < var3; ++var4)
+ {
+ def.recolorToFind[var4] = (short) stream.readUnsignedShort();
+ def.recolorToReplace[var4] = (short) stream.readUnsignedShort();
+ }
+ }
+ else if (opcode == 41)
+ {
+ int var3 = stream.readUnsignedByte();
+ def.textureToFind = new short[var3];
+ def.textureToReplace = new short[var3];
+
+ for (int var4 = 0; var4 < var3; ++var4)
+ {
+ def.textureToFind[var4] = (short) stream.readUnsignedShort();
+ def.textureToReplace[var4] = (short) stream.readUnsignedShort();
+ }
+ }
+ }
+}
diff --git a/cache/src/main/java/net/runelite/cache/definitions/loaders/SpriteLoader.java b/cache/src/main/java/net/runelite/cache/definitions/loaders/SpriteLoader.java
new file mode 100644
index 0000000000..9dc6e43e0f
--- /dev/null
+++ b/cache/src/main/java/net/runelite/cache/definitions/loaders/SpriteLoader.java
@@ -0,0 +1,183 @@
+/*
+ * Copyright (c) 2016-2017, Adam
+ * 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.SpriteDefinition;
+import net.runelite.cache.io.InputStream;
+
+public class SpriteLoader
+{
+ public static final int FLAG_VERTICAL = 0b01;
+ public static final int FLAG_ALPHA = 0b10;
+
+ public SpriteDefinition[] load(int id, byte[] b)
+ {
+ InputStream is = new InputStream(b);
+
+ is.setOffset(is.getLength() - 2);
+ int spriteCount = is.readUnsignedShort();
+
+ SpriteDefinition[] sprites = new SpriteDefinition[spriteCount];
+
+ // 2 for size
+ // 5 for width, height, palette length
+ // + 8 bytes per sprite for offset x/y, width, and height
+ is.setOffset(is.getLength() - 7 - spriteCount * 8);
+
+ // max width and height
+ int width = is.readUnsignedShort();
+ int height = is.readUnsignedShort();
+ int paletteLength = is.readUnsignedByte() + 1;
+
+ for (int i = 0; i < spriteCount; ++i)
+ {
+ sprites[i] = new SpriteDefinition();
+ sprites[i].setId(id);
+ sprites[i].setFrame(i);
+ sprites[i].setMaxWidth(width);
+ sprites[i].setMaxHeight(height);
+ }
+
+ for (int i = 0; i < spriteCount; ++i)
+ {
+ sprites[i].setOffsetX(is.readUnsignedShort());
+ }
+
+ for (int i = 0; i < spriteCount; ++i)
+ {
+ sprites[i].setOffsetY(is.readUnsignedShort());
+ }
+
+ for (int i = 0; i < spriteCount; ++i)
+ {
+ sprites[i].setWidth(is.readUnsignedShort());
+ }
+
+ for (int i = 0; i < spriteCount; ++i)
+ {
+ sprites[i].setHeight(is.readUnsignedShort());
+ }
+
+ // same as above + 3 bytes for each palette entry, except for the first one (which is transparent)
+ is.setOffset(is.getLength() - 7 - spriteCount * 8 - (paletteLength - 1) * 3);
+ int[] palette = new int[paletteLength];
+
+ for (int i = 1; i < paletteLength; ++i)
+ {
+ palette[i] = is.read24BitInt();
+
+ if (palette[i] == 0)
+ {
+ palette[i] = 1;
+ }
+ }
+
+ is.setOffset(0);
+
+ for (int i = 0; i < spriteCount; ++i)
+ {
+ SpriteDefinition def = sprites[i];
+ int spriteWidth = def.getWidth();
+ int spriteHeight = def.getHeight();
+ int dimension = spriteWidth * spriteHeight;
+ byte[] pixelPaletteIndicies = new byte[dimension];
+ byte[] pixelAlphas = new byte[dimension];
+ def.pixelIdx = pixelPaletteIndicies;
+ def.palette = palette;
+
+ int flags = is.readUnsignedByte();
+
+ if ((flags & FLAG_VERTICAL) == 0)
+ {
+ // read horizontally
+ for (int j = 0; j < dimension; ++j)
+ {
+ pixelPaletteIndicies[j] = is.readByte();
+ }
+ }
+ else
+ {
+ // read vertically
+ for (int j = 0; j < spriteWidth; ++j)
+ {
+ for (int k = 0; k < spriteHeight; ++k)
+ {
+ pixelPaletteIndicies[spriteWidth * k + j] = is.readByte();
+ }
+ }
+ }
+
+ // read alphas
+ if ((flags & FLAG_ALPHA) != 0)
+ {
+ if ((flags & FLAG_VERTICAL) == 0)
+ {
+ // read horizontally
+ for (int j = 0; j < dimension; ++j)
+ {
+ pixelAlphas[j] = is.readByte();
+ }
+ }
+ else
+ {
+ // read vertically
+ for (int j = 0; j < spriteWidth; ++j)
+ {
+ for (int k = 0; k < spriteHeight; ++k)
+ {
+ pixelAlphas[spriteWidth * k + j] = is.readByte();
+ }
+ }
+ }
+ }
+ else
+ {
+ // everything non-zero is opaque
+ for (int j = 0; j < dimension; ++j)
+ {
+ int index = pixelPaletteIndicies[j];
+
+ if (index != 0)
+ pixelAlphas[j] = (byte) 0xFF;
+ }
+ }
+
+ int[] pixels = new int[dimension];
+
+ // build argb pixels from palette/alphas
+ for (int j = 0; j < dimension; ++j)
+ {
+ int index = pixelPaletteIndicies[j] & 0xFF;
+
+ pixels[j] = palette[index] | (pixelAlphas[j] << 24);
+ }
+
+ def.setPixels(pixels);
+ }
+
+ return sprites;
+ }
+}
diff --git a/cache/src/main/java/net/runelite/cache/definitions/loaders/StructLoader.java b/cache/src/main/java/net/runelite/cache/definitions/loaders/StructLoader.java
new file mode 100644
index 0000000000..4137da8f37
--- /dev/null
+++ b/cache/src/main/java/net/runelite/cache/definitions/loaders/StructLoader.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright (c) 2018, Joshua Filby
+ * 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 java.util.HashMap;
+import net.runelite.cache.definitions.StructDefinition;
+import net.runelite.cache.io.InputStream;
+
+public class StructLoader
+{
+ public StructDefinition load(int id, byte[] b)
+ {
+ StructDefinition def = new StructDefinition(id);
+ InputStream is = new InputStream(b);
+
+ while (true)
+ {
+ int opcode = is.readUnsignedByte();
+ if (opcode == 0)
+ {
+ break;
+ }
+
+ this.decodeValues(opcode, def, is);
+ }
+
+ return def;
+ }
+
+ private void decodeValues(int opcode, StructDefinition def, InputStream stream)
+ {
+ if (opcode == 249)
+ {
+ int length = stream.readUnsignedByte();
+
+ def.params = new HashMap<>(length);
+
+ for (int i = 0; i < length; i++)
+ {
+ boolean isString = stream.readUnsignedByte() == 1;
+ int key = stream.read24BitInt();
+ Object value;
+
+ if (isString)
+ {
+ value = stream.readString();
+ }
+ else
+ {
+ value = stream.readInt();
+ }
+
+ def.params.put(key, value);
+ }
+ }
+ }
+
+}
diff --git a/deobfuscator/src/main/java/net/runelite/asm/Interfaces.java b/cache/src/main/java/net/runelite/cache/definitions/loaders/TextureLoader.java
similarity index 53%
rename from deobfuscator/src/main/java/net/runelite/asm/Interfaces.java
rename to cache/src/main/java/net/runelite/cache/definitions/loaders/TextureLoader.java
index a372f9d68c..3e9ff09e89 100644
--- a/deobfuscator/src/main/java/net/runelite/asm/Interfaces.java
+++ b/cache/src/main/java/net/runelite/cache/definitions/loaders/TextureLoader.java
@@ -22,71 +22,64 @@
* (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.asm;
+package net.runelite.cache.definitions.loaders;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
-import net.runelite.asm.pool.Class;
+import net.runelite.cache.definitions.TextureDefinition;
+import net.runelite.cache.io.InputStream;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
-public class Interfaces
+public class TextureLoader
{
- private final ClassFile classFile;
+ private static final Logger logger = LoggerFactory.getLogger(TextureLoader.class);
- private final List interfaces = new ArrayList<>();
-
- Interfaces(ClassFile c)
+ public TextureDefinition load(int id, byte[] b)
{
- classFile = c;
- }
+ TextureDefinition def = new TextureDefinition();
+ InputStream is = new InputStream(b);
- public void addInterface(Class clazz)
- {
- if (!interfaces.contains(clazz))
+ def.field1777 = is.readUnsignedShort();
+ def.field1778 = is.readByte() != 0;
+ def.setId(id);
+
+ int count = is.readUnsignedByte();
+ int[] files = new int[count];
+
+ for (int i = 0; i < count; ++i)
+ files[i] = is.readUnsignedShort();
+
+ def.setFileIds(files);
+
+ if (count > 1)
{
- interfaces.add(clazz);
- }
- }
+ def.field1780 = new int[count - 1];
- public List getInterfaces()
- {
- return interfaces;
- }
-
- public void clear()
- {
- interfaces.clear();
- }
-
- public List getMyInterfaces()
- {
- List l = new ArrayList<>();
- for (Class clazz : interfaces)
- {
- ClassFile iface = classFile.getGroup().findClass(clazz.getName());
- if (iface != null)
+ for (int var3 = 0; var3 < count - 1; ++var3)
{
- l.add(iface);
+ def.field1780[var3] = is.readUnsignedByte();
}
}
- return l;
- }
- public List getNonMyInterfaces()
- {
- return interfaces.stream().filter(clazz -> classFile.getGroup().findClass(clazz.getName()) == null).collect(Collectors.toList());
- }
-
- public boolean instanceOf(ClassFile cf)
- {
- for (Class clazz : interfaces)
+ if (count > 1)
{
- ClassFile iface = classFile.getGroup().findClass(clazz.getName());
- if (iface.instanceOf(cf))
+ def.field1781 = new int[count - 1];
+
+ for (int var3 = 0; var3 < count - 1; ++var3)
{
- return true;
+ def.field1781[var3] = is.readUnsignedByte();
}
}
- return false;
+
+ def.field1786 = new int[count];
+
+ for (int var3 = 0; var3 < count; ++var3)
+ {
+ def.field1786[var3] = is.readInt();
+ }
+
+ def.field1783 = is.readUnsignedByte();
+ def.field1782 = is.readUnsignedByte();
+
+ return def;
}
}
diff --git a/cache/src/main/java/net/runelite/cache/definitions/loaders/TrackLoader.java b/cache/src/main/java/net/runelite/cache/definitions/loaders/TrackLoader.java
new file mode 100644
index 0000000000..6911b9de27
--- /dev/null
+++ b/cache/src/main/java/net/runelite/cache/definitions/loaders/TrackLoader.java
@@ -0,0 +1,506 @@
+/*
+ * Copyright (c) 2017, Adam
+ * 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.TrackDefinition;
+import net.runelite.cache.io.InputStream;
+import net.runelite.cache.io.OutputStream;
+
+public class TrackLoader
+{
+ // Headers
+ private static final int MTHD_MAGIC = 1297377380;
+ private static final int MTRK_MAGIC = 1297379947;
+
+ // Major MIDI Messages. Bottom 4 bits are the channel.
+ private static final int NOTE_ON = 0b1001_0000;
+ private static final int NOTE_OFF = 0b1000_0000;
+ private static final int CONTROL_CHANGE = 0b1011_0000;
+ private static final int PITCH_WHEEL_CHANGE = 0b1110_0000;
+ private static final int CHANNEL_PRESSURE = 0b1101_0000;
+ private static final int POLYPHONIC_KEY_PRESSURE = 0b1010_0000;
+ private static final int PROGRAM_CHANGE = 0b1100_0000;
+
+ // Meta Events
+ private static final int META = 255;
+ private static final int END_OF_TRACK = 47;
+ private static final int TEMPO = 81;
+
+ // Controller messages
+ private static final int CONTROLLER_BANK_SELECT = 0;
+ private static final int CONTROLLER_MODULATION_WHEEL = 1;
+ private static final int CONTROLLER_CHANNEL_VOLUME = 7;
+ private static final int CONTROLLER_PAN = 10;
+ private static final int CONTROLLER_BANK_SELECT_2 = 32;
+ private static final int CONTROLLER_MODULATION_WHEEL2 = 33;
+ private static final int CONTROLLER_CHANNEL_VOLUME_2 = 39;
+ private static final int CONTROLLER_PAN_2 = 42;
+ private static final int CONTROLLER_DAMPER_PEDAL = 64;
+ private static final int CONTROLLER_PORTAMENTO = 65;
+ private static final int CONTROLLER_NON_REGISTERED_PARAMETER_NUMBER_LSB = 98;
+ private static final int CONTROLLER_NON_REGISTERED_PARAMETER_NUMBER_MSB = 99;
+ private static final int CONTROLLER_REGISTERED_PARAMETER_NUMBER_LSB = 100;
+ private static final int CONTROLLER_REGISTERED_PARAMETER_NUMBER_MSB = 101;
+ private static final int CONTROLLER_ALL_SOUND_OFF = 120;
+ private static final int CONTROLLER_RESET_ALL_CONTROLLERS = 121;
+ private static final int CONTROLLER_ALL_NOTES_OFF = 123;
+
+ private static final int JAG_NOTE_ON = 0;
+ private static final int JAG_NOTE_OFF = 1;
+ private static final int JAG_CONTROL_CHANGE = 2;
+ private static final int JAG_PITCH_BEND = 3;
+ private static final int JAG_CHANNEL_PRESSURE = 4;
+ private static final int JAG_POLY_PRESSURE = 5;
+ private static final int JAG_PROGRAM_CHANGE = 6;
+ private static final int JAG_END_OF_TRACK = 7;
+ private static final int JAG_TEMPO = 23;
+
+ public TrackDefinition load(byte[] b)
+ {
+ TrackDefinition def = new TrackDefinition();
+ load(def, new InputStream(b));
+ return def;
+ }
+
+ private void load(TrackDefinition def, InputStream var1)
+ {
+ // Some of the names are from https://www.rune-server.ee/runescape-development/rs-503-client-server/snippets/311669-rs-music-file-structure-conversion.html
+ var1.setOffset(var1.getLength() - 3);
+ int tracks = var1.readUnsignedByte();
+ int division = var1.readUnsignedShort();
+ int offset = 14 + tracks * 10;
+ var1.setOffset(0);
+ int tempoOpcodes = 0;
+ int ctrlChangeOpcodes = 0;
+ int noteOnOpcodes = 0;
+ int noteOffOpcodes = 0;
+ int wheelChangeOpcodes = 0;
+ int chnnlAfterTchOpcodes = 0;
+ int keyAfterTchOpcodes = 0;
+ int progmChangeOpcodes = 0;
+
+ int var13;
+ int opcode;
+ int controlChangeIndex;
+ for (var13 = 0; var13 < tracks; ++var13)
+ {
+ opcode = -1;
+
+ while (true)
+ {
+ controlChangeIndex = var1.readUnsignedByte();
+ if (controlChangeIndex != opcode)
+ {
+ ++offset;
+ }
+
+ opcode = controlChangeIndex & 15;
+ if (controlChangeIndex == JAG_END_OF_TRACK)
+ {
+ break;
+ }
+
+ if (controlChangeIndex == JAG_TEMPO)
+ {
+ ++tempoOpcodes;
+ }
+ else if (opcode == JAG_NOTE_ON)
+ {
+ ++noteOnOpcodes;
+ }
+ else if (opcode == JAG_NOTE_OFF)
+ {
+ ++noteOffOpcodes;
+ }
+ else if (opcode == JAG_CONTROL_CHANGE)
+ {
+ ++ctrlChangeOpcodes;
+ }
+ else if (opcode == JAG_PITCH_BEND)
+ {
+ ++wheelChangeOpcodes;
+ }
+ else if (opcode == JAG_CHANNEL_PRESSURE)
+ {
+ ++chnnlAfterTchOpcodes;
+ }
+ else if (opcode == JAG_POLY_PRESSURE)
+ {
+ ++keyAfterTchOpcodes;
+ }
+ else if (opcode == JAG_PROGRAM_CHANGE)
+ {
+ ++progmChangeOpcodes;
+ }
+ else
+ {
+ throw new RuntimeException();
+ }
+ }
+ }
+
+ offset += 5 * tempoOpcodes;
+ offset += 2 * (noteOnOpcodes + noteOffOpcodes + ctrlChangeOpcodes + wheelChangeOpcodes + keyAfterTchOpcodes);
+ offset += chnnlAfterTchOpcodes + progmChangeOpcodes;
+ var13 = var1.getOffset();
+ opcode = tracks + tempoOpcodes + ctrlChangeOpcodes + noteOnOpcodes + noteOffOpcodes + wheelChangeOpcodes + chnnlAfterTchOpcodes + keyAfterTchOpcodes + progmChangeOpcodes;
+
+ for (controlChangeIndex = 0; controlChangeIndex < opcode; ++controlChangeIndex)
+ {
+ var1.readVarInt();
+ }
+
+ offset += var1.getOffset() - var13;
+ controlChangeIndex = var1.getOffset();
+ int modulationWheelSize = 0;
+ int modulationWheel2Size = 0;
+ int channelVolumeSize = 0;
+ int channelVolume2Size = 0;
+ int panSize = 0;
+ int pan2Size = 0;
+ int nonRegisteredMsbSize = 0;
+ int nonRegisteredLsbSize = 0;
+ int registeredNumberMsb = 0;
+ int registeredLsbSize = 0;
+ int commandsSize = 0;
+ int otherSize = 0;
+ int controllerNumber = 0;
+
+ int var29;
+ for (var29 = 0; var29 < ctrlChangeOpcodes; ++var29)
+ {
+ controllerNumber = controllerNumber + var1.readUnsignedByte() & 127;
+ if (controllerNumber == CONTROLLER_BANK_SELECT || controllerNumber == CONTROLLER_BANK_SELECT_2)
+ {
+ ++progmChangeOpcodes;
+ }
+ else if (controllerNumber == CONTROLLER_MODULATION_WHEEL)
+ {
+ ++modulationWheelSize;
+ }
+ else if (controllerNumber == CONTROLLER_MODULATION_WHEEL2)
+ {
+ ++modulationWheel2Size;
+ }
+ else if (controllerNumber == CONTROLLER_CHANNEL_VOLUME)
+ {
+ ++channelVolumeSize;
+ }
+ else if (controllerNumber == CONTROLLER_CHANNEL_VOLUME_2)
+ {
+ ++channelVolume2Size;
+ }
+ else if (controllerNumber == CONTROLLER_PAN)
+ {
+ ++panSize;
+ }
+ else if (controllerNumber == CONTROLLER_PAN_2)
+ {
+ ++pan2Size;
+ }
+ else if (controllerNumber == CONTROLLER_NON_REGISTERED_PARAMETER_NUMBER_MSB)
+ {
+ ++nonRegisteredMsbSize;
+ }
+ else if (controllerNumber == CONTROLLER_NON_REGISTERED_PARAMETER_NUMBER_LSB)
+ {
+ ++nonRegisteredLsbSize;
+ }
+ else if (controllerNumber == CONTROLLER_REGISTERED_PARAMETER_NUMBER_MSB)
+ {
+ ++registeredNumberMsb;
+ }
+ else if (controllerNumber == CONTROLLER_REGISTERED_PARAMETER_NUMBER_LSB)
+ {
+ ++registeredLsbSize;
+ }
+ else if (controllerNumber != CONTROLLER_DAMPER_PEDAL
+ && controllerNumber != CONTROLLER_PORTAMENTO
+ && controllerNumber != CONTROLLER_ALL_SOUND_OFF
+ && controllerNumber != CONTROLLER_RESET_ALL_CONTROLLERS
+ && controllerNumber != CONTROLLER_ALL_NOTES_OFF)
+ {
+ ++otherSize;
+ }
+ else
+ {
+ ++commandsSize;
+ }
+ }
+
+ var29 = 0;
+ int commandsIndex = var1.getOffset();
+ var1.skip(commandsSize);
+ int polyPressureIndex = var1.getOffset();
+ var1.skip(keyAfterTchOpcodes);
+ int channelPressureIndex = var1.getOffset();
+ var1.skip(chnnlAfterTchOpcodes);
+ int pitchWheelHighIndex = var1.getOffset();
+ var1.skip(wheelChangeOpcodes);
+ int modulationWheelOffset = var1.getOffset();
+ var1.skip(modulationWheelSize);
+ int channelVolumeOffset = var1.getOffset();
+ var1.skip(channelVolumeSize);
+ int panOffset = var1.getOffset();
+ var1.skip(panSize);
+ int notesIndex = var1.getOffset();
+ var1.skip(noteOnOpcodes + noteOffOpcodes + keyAfterTchOpcodes);
+ int notesOnIndex = var1.getOffset();
+ var1.skip(noteOnOpcodes);
+ int otherIndex = var1.getOffset();
+ var1.skip(otherSize);
+ int notesOffIndex = var1.getOffset();
+ var1.skip(noteOffOpcodes);
+ int modulationWheel2Offset = var1.getOffset();
+ var1.skip(modulationWheel2Size);
+ int channelVolume2Offset = var1.getOffset();
+ var1.skip(channelVolume2Size);
+ int pan2Offset = var1.getOffset();
+ var1.skip(pan2Size);
+ int programChangeIndex = var1.getOffset();
+ var1.skip(progmChangeOpcodes);
+ int pitchWheelLowIndex = var1.getOffset();
+ var1.skip(wheelChangeOpcodes);
+ int nonRegisteredMsbIndex = var1.getOffset();
+ var1.skip(nonRegisteredMsbSize);
+ int nonRegisteredLsbIndex = var1.getOffset();
+ var1.skip(nonRegisteredLsbSize);
+ int registeredMsbIndex = var1.getOffset();
+ var1.skip(registeredNumberMsb);
+ int registeredLsbIndex = var1.getOffset();
+ var1.skip(registeredLsbSize);
+ int tempoOffset = var1.getOffset();
+ var1.skip(tempoOpcodes * 3);
+ OutputStream var51 = new OutputStream(offset);
+ var51.writeInt(MTHD_MAGIC); // MThd header
+ var51.writeInt(6); // length of header
+ var51.writeShort(tracks > 1 ? 1 : 0); // format
+ var51.writeShort(tracks); // tracks
+ var51.writeShort(division); // division
+ var1.setOffset(var13);
+ int channel = 0;
+ int var53 = 0;
+ int var54 = 0;
+ int var55 = 0;
+ int var56 = 0;
+ int var57 = 0;
+ int var58 = 0;
+ int[] var59 = new int[128];
+ controllerNumber = 0;
+
+ label361:
+ for (int var60 = 0; var60 < tracks; ++var60)
+ {
+ var51.writeInt(MTRK_MAGIC); // MTrk
+ var51.skip(4); // length gets written here later
+ int var61 = var51.getOffset();
+ int var62 = -1;
+
+ while (true)
+ {
+ int deltaTick = var1.readVarInt();
+ var51.writeVarInt(deltaTick); // delta time
+ int status = var1.getArray()[var29++] & 255;
+ boolean var65 = status != var62;
+ var62 = status & 15;
+ if (status == JAG_END_OF_TRACK)
+ {
+ //if (var65) -- client has this if, but it causes broken midi to be produced
+ {
+ var51.writeByte(META);
+ }
+
+ var51.writeByte(END_OF_TRACK); // type - end of track
+ var51.writeByte(0); // length
+ var51.writeLengthFromMark(var51.getOffset() - var61);
+ continue label361;
+ }
+
+ if (status == JAG_TEMPO)
+ {
+ //if (var65) -- client has this if, but it causes broken midi to be produced
+ {
+ var51.writeByte(META); // meta event FF
+ }
+
+ var51.writeByte(TEMPO); // type - set tempo
+ var51.writeByte(3); // length
+ var51.writeByte(var1.getArray()[tempoOffset++]);
+ var51.writeByte(var1.getArray()[tempoOffset++]);
+ var51.writeByte(var1.getArray()[tempoOffset++]);
+ }
+ else
+ {
+ channel ^= status >> 4;
+ if (var62 == JAG_NOTE_ON)
+ {
+ if (var65)
+ {
+ var51.writeByte(NOTE_ON + channel);
+ }
+
+ var53 += var1.getArray()[notesIndex++];
+ var54 += var1.getArray()[notesOnIndex++];
+ var51.writeByte(var53 & 127);
+ var51.writeByte(var54 & 127);
+ }
+ else if (var62 == JAG_NOTE_OFF)
+ {
+ if (var65)
+ {
+ var51.writeByte(NOTE_OFF + channel);
+ }
+
+ var53 += var1.getArray()[notesIndex++];
+ var55 += var1.getArray()[notesOffIndex++];
+ var51.writeByte(var53 & 127);
+ var51.writeByte(var55 & 127);
+ }
+ else if (var62 == JAG_CONTROL_CHANGE)
+ {
+ if (var65)
+ {
+ var51.writeByte(CONTROL_CHANGE + channel);
+ }
+
+ controllerNumber = controllerNumber + var1.getArray()[controlChangeIndex++] & 127;
+ var51.writeByte(controllerNumber);
+ byte var66;
+ if (controllerNumber == CONTROLLER_BANK_SELECT || controllerNumber == CONTROLLER_BANK_SELECT_2)
+ {
+ var66 = var1.getArray()[programChangeIndex++];
+ }
+ else if (controllerNumber == CONTROLLER_MODULATION_WHEEL)
+ {
+ var66 = var1.getArray()[modulationWheelOffset++];
+ }
+ else if (controllerNumber == CONTROLLER_MODULATION_WHEEL2)
+ {
+ var66 = var1.getArray()[modulationWheel2Offset++];
+ }
+ else if (controllerNumber == CONTROLLER_CHANNEL_VOLUME)
+ {
+ var66 = var1.getArray()[channelVolumeOffset++];
+ }
+ else if (controllerNumber == CONTROLLER_CHANNEL_VOLUME_2)
+ {
+ var66 = var1.getArray()[channelVolume2Offset++];
+ }
+ else if (controllerNumber == CONTROLLER_PAN)
+ {
+ var66 = var1.getArray()[panOffset++];
+ }
+ else if (controllerNumber == CONTROLLER_PAN_2)
+ {
+ var66 = var1.getArray()[pan2Offset++];
+ }
+ else if (controllerNumber == CONTROLLER_NON_REGISTERED_PARAMETER_NUMBER_MSB)
+ {
+ var66 = var1.getArray()[nonRegisteredMsbIndex++];
+ }
+ else if (controllerNumber == CONTROLLER_NON_REGISTERED_PARAMETER_NUMBER_LSB)
+ {
+ var66 = var1.getArray()[nonRegisteredLsbIndex++];
+ }
+ else if (controllerNumber == CONTROLLER_REGISTERED_PARAMETER_NUMBER_MSB)
+ {
+ var66 = var1.getArray()[registeredMsbIndex++];
+ }
+ else if (controllerNumber == CONTROLLER_REGISTERED_PARAMETER_NUMBER_LSB)
+ {
+ var66 = var1.getArray()[registeredLsbIndex++];
+ }
+ else if (controllerNumber != CONTROLLER_DAMPER_PEDAL
+ && controllerNumber != CONTROLLER_PORTAMENTO
+ && controllerNumber != CONTROLLER_ALL_SOUND_OFF
+ && controllerNumber != CONTROLLER_RESET_ALL_CONTROLLERS
+ && controllerNumber != CONTROLLER_ALL_NOTES_OFF)
+ {
+ var66 = var1.getArray()[otherIndex++];
+ }
+ else
+ {
+ var66 = var1.getArray()[commandsIndex++];
+ }
+
+ int var67 = var66 + var59[controllerNumber];
+ var59[controllerNumber] = var67;
+ var51.writeByte(var67 & 127);
+ }
+ else if (var62 == JAG_PITCH_BEND)
+ {
+ if (var65)
+ {
+ var51.writeByte(PITCH_WHEEL_CHANGE + channel);
+ }
+
+ var56 += var1.getArray()[pitchWheelLowIndex++];
+ var56 += var1.getArray()[pitchWheelHighIndex++] << 7;
+ var51.writeByte(var56 & 127);
+ var51.writeByte(var56 >> 7 & 127);
+ }
+ else if (var62 == JAG_CHANNEL_PRESSURE)
+ {
+ if (var65)
+ {
+ var51.writeByte(CHANNEL_PRESSURE + channel);
+ }
+
+ var57 += var1.getArray()[channelPressureIndex++];
+ var51.writeByte(var57 & 127);
+ }
+ else if (var62 == JAG_POLY_PRESSURE)
+ {
+ if (var65)
+ {
+ var51.writeByte(POLYPHONIC_KEY_PRESSURE + channel);
+ }
+
+ var53 += var1.getArray()[notesIndex++];
+ var58 += var1.getArray()[polyPressureIndex++];
+ var51.writeByte(var53 & 127);
+ var51.writeByte(var58 & 127);
+ }
+ else if (var62 == JAG_PROGRAM_CHANGE)
+ {
+
+ if (var65)
+ {
+ var51.writeByte(PROGRAM_CHANGE + channel);
+ }
+
+ var51.writeByte(var1.getArray()[programChangeIndex++]);
+ }
+ else
+ {
+ throw new RuntimeException();
+ }
+ }
+ }
+ }
+
+ def.midi = var51.flip();
+ }
+}
diff --git a/cache/src/main/java/net/runelite/cache/definitions/loaders/UnderlayLoader.java b/cache/src/main/java/net/runelite/cache/definitions/loaders/UnderlayLoader.java
new file mode 100644
index 0000000000..5c4c10f09d
--- /dev/null
+++ b/cache/src/main/java/net/runelite/cache/definitions/loaders/UnderlayLoader.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2016-2017, Adam
+ * 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.UnderlayDefinition;
+import net.runelite.cache.io.InputStream;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class UnderlayLoader
+{
+ private static final Logger logger = LoggerFactory.getLogger(UnderlayLoader.class);
+
+ public UnderlayDefinition load(int id, byte[] b)
+ {
+ UnderlayDefinition def = new UnderlayDefinition();
+ InputStream is = new InputStream(b);
+
+ def.setId(id);
+
+ for (;;)
+ {
+ int opcode = is.readUnsignedByte();
+ if (opcode == 0)
+ {
+ break;
+ }
+
+ if (opcode == 1)
+ {
+ int color = is.read24BitInt();
+ def.setColor(color);
+ }
+ }
+
+ def.calculateHsl();
+
+ return def;
+ }
+}
diff --git a/cache/src/main/java/net/runelite/cache/definitions/loaders/VarbitLoader.java b/cache/src/main/java/net/runelite/cache/definitions/loaders/VarbitLoader.java
new file mode 100644
index 0000000000..05d91afa90
--- /dev/null
+++ b/cache/src/main/java/net/runelite/cache/definitions/loaders/VarbitLoader.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2017, Adam
+ * 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.VarbitDefinition;
+import net.runelite.cache.io.InputStream;
+
+public class VarbitLoader
+{
+ public VarbitDefinition load(int id, byte[] b)
+ {
+ VarbitDefinition def = new VarbitDefinition();
+ InputStream is = new InputStream(b);
+
+ def.setId(id);
+
+ for (;;)
+ {
+ int opcode = is.readUnsignedByte();
+ if (opcode == 0)
+ {
+ break;
+ }
+
+ if (opcode == 1)
+ {
+ def.setIndex(is.readUnsignedShort());
+ def.setLeastSignificantBit(is.readUnsignedByte());
+ def.setMostSignificantBit(is.readUnsignedByte());
+ }
+ }
+
+ return def;
+ }
+}
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
new file mode 100644
index 0000000000..15ec975d6d
--- /dev/null
+++ b/cache/src/main/java/net/runelite/cache/definitions/loaders/WorldMapLoader.java
@@ -0,0 +1,179 @@
+/*
+ * Copyright (c) 2017, Adam
+ * 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 java.util.LinkedList;
+import net.runelite.cache.definitions.WorldMapDefinition;
+import net.runelite.cache.definitions.WorldMapType0;
+import net.runelite.cache.definitions.WorldMapType1;
+import net.runelite.cache.definitions.WorldMapType2;
+import net.runelite.cache.definitions.WorldMapType3;
+import net.runelite.cache.definitions.WorldMapTypeBase;
+import net.runelite.cache.io.InputStream;
+import net.runelite.cache.region.Position;
+
+public class WorldMapLoader
+{
+ public WorldMapDefinition load(byte[] b, int fileId)
+ {
+ WorldMapDefinition def = new WorldMapDefinition();
+ InputStream in = new InputStream(b);
+
+ def.fileId = fileId;
+ def.safeName = in.readString();
+ def.name = in.readString();
+
+ int packedPos = in.readInt();
+ if (packedPos == -1)
+ {
+ def.position = new Position(-1, -1, -1);
+ }
+ else
+ {
+ int y = packedPos >> 28 & 3;
+ int x = packedPos >> 14 & 16383;
+ int z = packedPos & 16383;
+ def.position = new Position(x, y, z);
+ }
+
+ def.field450 = in.readInt();
+ in.readUnsignedByte();
+ def.field457 = in.readUnsignedByte() == 1;
+ def.field451 = in.readUnsignedByte();
+ int var3 = in.readUnsignedByte();
+ def.field458 = new LinkedList();
+
+ for (int var4 = 0; var4 < var3; ++var4)
+ {
+ def.field458.add(this.loadType(in));
+ }
+
+ return def;
+ }
+
+ private WorldMapTypeBase loadType(InputStream var1)
+ {
+ int var2 = var1.readUnsignedByte();
+ // field397 = new class27(1, (byte)0);
+ // field390 = new class27(2, (byte)1);
+ // field399 = new class27(3, (byte)2);
+ // field393 = new class27(0, (byte)3);
+ WorldMapTypeBase base;
+ switch (var2)
+ {
+ case 0:
+ // type 1
+ base = load1(var1);
+ break;
+ case 1:
+ // type 2
+ base = load2(var1);
+ break;
+ case 2:
+ // type 3
+ base = load3(var1);
+ break;
+ case 3:
+ // type 0
+ base = load0(var1);
+ break;
+ default:
+ throw new IllegalStateException();
+ }
+ return base;
+ }
+
+ private WorldMapTypeBase load0(InputStream in)
+ {
+ 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();
+
+ return wm;
+ }
+
+ private WorldMapTypeBase load1(InputStream in)
+ {
+ 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();
+
+ return wm;
+ }
+
+ private WorldMapTypeBase load2(InputStream in)
+ {
+ 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();
+
+ return wm;
+ }
+
+ private WorldMapTypeBase load3(InputStream in)
+ {
+ 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();
+
+ return wm;
+ }
+}
diff --git a/cache/src/main/java/net/runelite/cache/definitions/loaders/sound/SoundEffect1Loader.java b/cache/src/main/java/net/runelite/cache/definitions/loaders/sound/SoundEffect1Loader.java
new file mode 100644
index 0000000000..a5c8f16f78
--- /dev/null
+++ b/cache/src/main/java/net/runelite/cache/definitions/loaders/sound/SoundEffect1Loader.java
@@ -0,0 +1,93 @@
+/*
+ * Copyright (c) 2017, Adam
+ * 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.sound;
+
+import net.runelite.cache.definitions.sound.SoundEffect1Definition;
+import net.runelite.cache.definitions.sound.SoundEffect2Definition;
+import net.runelite.cache.io.InputStream;
+
+public class SoundEffect1Loader
+{
+ private final SoundEffect2Loader se2Loader = new SoundEffect2Loader();
+ private final SoundEffect3Loader se3Loader = new SoundEffect3Loader();
+
+ public SoundEffect1Definition load(InputStream in)
+ {
+ SoundEffect1Definition se = new SoundEffect1Definition();
+
+ load(se, in);
+
+ return se;
+ }
+
+ private void load(SoundEffect1Definition se, InputStream var1)
+ {
+ se.field1181 = se2Loader.load(var1);
+ se.field1173 = se2Loader.load(var1);
+ int var2 = var1.readUnsignedByte();
+ if (var2 != 0)
+ {
+ var1.setOffset(var1.getOffset() - 1);
+ se.field1174 = se2Loader.load(var1);
+ se.field1193 = se2Loader.load(var1);
+ }
+
+ var2 = var1.readUnsignedByte();
+ if (var2 != 0)
+ {
+ var1.setOffset(var1.getOffset() - 1);
+ se.field1183 = se2Loader.load(var1);
+ se.field1192 = se2Loader.load(var1);
+ }
+
+ var2 = var1.readUnsignedByte();
+ if (var2 != 0)
+ {
+ var1.setOffset(var1.getOffset() - 1);
+ se.field1178 = se2Loader.load(var1);
+ se.field1175 = se2Loader.load(var1);
+ }
+
+ for (int var3 = 0; var3 < 10; ++var3)
+ {
+ int var4 = var1.readUnsignedShortSmart();
+ if (var4 == 0)
+ {
+ break;
+ }
+
+ se.field1180[var3] = var4;
+ se.field1179[var3] = var1.readShortSmart();
+ se.field1177[var3] = var1.readUnsignedShortSmart();
+ }
+
+ se.field1187 = var1.readUnsignedShortSmart();
+ se.field1184 = var1.readUnsignedShortSmart();
+ se.field1176 = var1.readUnsignedShort();
+ se.field1188 = var1.readUnsignedShort();
+ se.field1186 = new SoundEffect2Definition();
+ se.field1182 = se3Loader.load(var1, se.field1186);
+ }
+}
diff --git a/cache/src/main/java/net/runelite/cache/definitions/loaders/sound/SoundEffect2Loader.java b/cache/src/main/java/net/runelite/cache/definitions/loaders/sound/SoundEffect2Loader.java
new file mode 100644
index 0000000000..d9ae3d3abb
--- /dev/null
+++ b/cache/src/main/java/net/runelite/cache/definitions/loaders/sound/SoundEffect2Loader.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2017, Adam
+ * 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.sound;
+
+import net.runelite.cache.definitions.sound.SoundEffect2Definition;
+import net.runelite.cache.io.InputStream;
+
+public class SoundEffect2Loader
+{
+ public SoundEffect2Definition load(InputStream in)
+ {
+ SoundEffect2Definition se = new SoundEffect2Definition();
+
+ load(se, in);
+
+ return se;
+ }
+
+ private void load(SoundEffect2Definition se, InputStream var1)
+ {
+ se.field1087 = var1.readUnsignedByte();
+ se.field1088 = var1.readInt();
+ se.field1089 = var1.readInt();
+ this.method1144(se, var1);
+ }
+
+ final void method1144(SoundEffect2Definition se, InputStream var1)
+ {
+ se.field1092 = var1.readUnsignedByte();
+ se.field1086 = new int[se.field1092];
+ se.field1090 = new int[se.field1092];
+
+ for (int var2 = 0; var2 < se.field1092; ++var2)
+ {
+ se.field1086[var2] = var1.readUnsignedShort();
+ se.field1090[var2] = var1.readUnsignedShort();
+ }
+
+ }
+}
diff --git a/cache/src/main/java/net/runelite/cache/definitions/loaders/sound/SoundEffect3Loader.java b/cache/src/main/java/net/runelite/cache/definitions/loaders/sound/SoundEffect3Loader.java
new file mode 100644
index 0000000000..ad7f733efb
--- /dev/null
+++ b/cache/src/main/java/net/runelite/cache/definitions/loaders/sound/SoundEffect3Loader.java
@@ -0,0 +1,95 @@
+/*
+ * Copyright (c) 2017, Adam
+ * 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.sound;
+
+import net.runelite.cache.definitions.sound.SoundEffect2Definition;
+import net.runelite.cache.definitions.sound.SoundEffect3Definition;
+import net.runelite.cache.io.InputStream;
+
+public class SoundEffect3Loader
+{
+ private final SoundEffect2Loader se2Loader = new SoundEffect2Loader();
+
+ public SoundEffect3Definition load(InputStream in, SoundEffect2Definition var2)
+ {
+ SoundEffect3Definition se = new SoundEffect3Definition();
+
+ load(se, in, var2);
+
+ return se;
+ }
+
+ private void load(SoundEffect3Definition se, InputStream var1, SoundEffect2Definition var2)
+ {
+ int var3 = var1.readUnsignedByte();
+ se.field1155[0] = var3 >> 4;
+ se.field1155[1] = var3 & 15;
+ if (var3 != 0)
+ {
+ se.field1156[0] = var1.readUnsignedShort();
+ se.field1156[1] = var1.readUnsignedShort();
+ int var4 = var1.readUnsignedByte();
+
+ int var5;
+ int var6;
+ for (var5 = 0; var5 < 2; ++var5)
+ {
+ for (var6 = 0; var6 < se.field1155[var5]; ++var6)
+ {
+ se.field1154[var5][0][var6] = var1.readUnsignedShort();
+ se.field1159[var5][0][var6] = var1.readUnsignedShort();
+ }
+ }
+
+ for (var5 = 0; var5 < 2; ++var5)
+ {
+ for (var6 = 0; var6 < se.field1155[var5]; ++var6)
+ {
+ if ((var4 & 1 << var5 * 4 << var6) != 0)
+ {
+ se.field1154[var5][1][var6] = var1.readUnsignedShort();
+ se.field1159[var5][1][var6] = var1.readUnsignedShort();
+ }
+ else
+ {
+ se.field1154[var5][1][var6] = se.field1154[var5][0][var6];
+ se.field1159[var5][1][var6] = se.field1159[var5][0][var6];
+ }
+ }
+ }
+
+ if (var4 != 0 || se.field1156[1] != se.field1156[0])
+ {
+ se2Loader.method1144(var2, var1);
+ }
+ }
+ else
+ {
+ int[] var7 = se.field1156;
+ se.field1156[1] = 0;
+ var7[0] = 0;
+ }
+ }
+}
diff --git a/cache/src/main/java/net/runelite/cache/definitions/loaders/sound/SoundEffectLoader.java b/cache/src/main/java/net/runelite/cache/definitions/loaders/sound/SoundEffectLoader.java
new file mode 100644
index 0000000000..ddb6a4d9fc
--- /dev/null
+++ b/cache/src/main/java/net/runelite/cache/definitions/loaders/sound/SoundEffectLoader.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2017, Adam
+ * 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.sound;
+
+import net.runelite.cache.definitions.sound.SoundEffectDefinition;
+import net.runelite.cache.definitions.sound.SoundEffect1Definition;
+import net.runelite.cache.io.InputStream;
+
+public class SoundEffectLoader
+{
+ public SoundEffectDefinition load(byte[] b)
+ {
+ SoundEffectDefinition se = new SoundEffectDefinition();
+ InputStream in = new InputStream(b);
+
+ load(se, in);
+
+ return se;
+ }
+
+ private void load(SoundEffectDefinition se, InputStream var1)
+ {
+ for (int var2 = 0; var2 < 10; ++var2)
+ {
+ int var3 = var1.readUnsignedByte();
+ if (var3 != 0)
+ {
+ var1.setOffset(var1.getOffset() - 1);
+
+ SoundEffect1Loader se1Loader = new SoundEffect1Loader();
+ SoundEffect1Definition se1 = se1Loader.load(var1);
+
+ se.field1008[var2] = se1;
+ }
+ }
+
+ se.field1006 = var1.readUnsignedShort();
+ se.field1009 = var1.readUnsignedShort();
+ }
+}
diff --git a/cache/src/main/java/net/runelite/cache/definitions/providers/ItemProvider.java b/cache/src/main/java/net/runelite/cache/definitions/providers/ItemProvider.java
new file mode 100644
index 0000000000..7d58c98104
--- /dev/null
+++ b/cache/src/main/java/net/runelite/cache/definitions/providers/ItemProvider.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2018, Adam
+ * 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.providers;
+
+import net.runelite.cache.definitions.ItemDefinition;
+
+public interface ItemProvider
+{
+ ItemDefinition provide(int itemId);
+}
diff --git a/cache/src/main/java/net/runelite/cache/definitions/providers/ModelProvider.java b/cache/src/main/java/net/runelite/cache/definitions/providers/ModelProvider.java
new file mode 100644
index 0000000000..36a8412b81
--- /dev/null
+++ b/cache/src/main/java/net/runelite/cache/definitions/providers/ModelProvider.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2018, Adam
+ * 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.providers;
+
+import java.io.IOException;
+import net.runelite.cache.definitions.ModelDefinition;
+
+public interface ModelProvider
+{
+ ModelDefinition provide(int modelId) throws IOException;
+}
diff --git a/cache/src/main/java/net/runelite/cache/definitions/providers/OverlayProvider.java b/cache/src/main/java/net/runelite/cache/definitions/providers/OverlayProvider.java
new file mode 100644
index 0000000000..a793b39962
--- /dev/null
+++ b/cache/src/main/java/net/runelite/cache/definitions/providers/OverlayProvider.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2018, Adam
+ * 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.providers;
+
+import net.runelite.cache.definitions.OverlayDefinition;
+
+public interface OverlayProvider
+{
+ OverlayDefinition provide(int overlayId);
+}
diff --git a/cache/src/main/java/net/runelite/cache/definitions/providers/SpriteProvider.java b/cache/src/main/java/net/runelite/cache/definitions/providers/SpriteProvider.java
new file mode 100644
index 0000000000..f7177bd378
--- /dev/null
+++ b/cache/src/main/java/net/runelite/cache/definitions/providers/SpriteProvider.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2018, Adam
+ * 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.providers;
+
+import net.runelite.cache.definitions.SpriteDefinition;
+
+public interface SpriteProvider
+{
+ SpriteDefinition provide(int spriteId, int frameId);
+}
diff --git a/cache/src/main/java/net/runelite/cache/definitions/providers/StructProvider.java b/cache/src/main/java/net/runelite/cache/definitions/providers/StructProvider.java
new file mode 100644
index 0000000000..54d03060c1
--- /dev/null
+++ b/cache/src/main/java/net/runelite/cache/definitions/providers/StructProvider.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2018, Joshua Filby
+ * 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.providers;
+
+import net.runelite.cache.definitions.StructDefinition;
+
+public interface StructProvider
+{
+ StructDefinition provide(int structId);
+}
diff --git a/cache/src/main/java/net/runelite/cache/definitions/providers/TextureProvider.java b/cache/src/main/java/net/runelite/cache/definitions/providers/TextureProvider.java
new file mode 100644
index 0000000000..f85fec54d3
--- /dev/null
+++ b/cache/src/main/java/net/runelite/cache/definitions/providers/TextureProvider.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2018, Adam
+ * 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.providers;
+
+import net.runelite.cache.definitions.TextureDefinition;
+
+public interface TextureProvider
+{
+ TextureDefinition[] provide();
+}
diff --git a/cache/src/main/java/net/runelite/cache/definitions/providers/UnderlayProvider.java b/cache/src/main/java/net/runelite/cache/definitions/providers/UnderlayProvider.java
new file mode 100644
index 0000000000..3b0381c7a3
--- /dev/null
+++ b/cache/src/main/java/net/runelite/cache/definitions/providers/UnderlayProvider.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2018, Adam
+ * 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.providers;
+
+import net.runelite.cache.definitions.UnderlayDefinition;
+
+public interface UnderlayProvider
+{
+ UnderlayDefinition provide(int underlayId);
+}
diff --git a/cache/src/main/java/net/runelite/cache/definitions/savers/InterfaceSaver.java b/cache/src/main/java/net/runelite/cache/definitions/savers/InterfaceSaver.java
new file mode 100644
index 0000000000..61151a4158
--- /dev/null
+++ b/cache/src/main/java/net/runelite/cache/definitions/savers/InterfaceSaver.java
@@ -0,0 +1,226 @@
+/*
+ * Copyright (c) 2017, Adam
+ * 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.savers;
+
+import net.runelite.cache.definitions.ClientScript1Instruction;
+import net.runelite.cache.definitions.InterfaceDefinition;
+import net.runelite.cache.io.OutputStream;
+
+public class InterfaceSaver
+{
+ public byte[] save(InterfaceDefinition def)
+ {
+ if (def.isIf3)
+ {
+ return saveIf3(def);
+ }
+ else
+ {
+ return saveIf1(def);
+ }
+ }
+
+ private byte[] saveIf3(InterfaceDefinition def)
+ {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
+
+ private byte[] saveIf1(InterfaceDefinition def)
+ {
+ OutputStream out = new OutputStream();
+ out.writeByte(def.type);
+ out.writeByte(def.menuType);
+ out.writeShort(def.contentType);
+ out.writeShort(def.originalX);
+ out.writeShort(def.originalY);
+ out.writeShort(def.originalWidth);
+ out.writeShort(def.originalHeight);
+ out.writeByte(def.opacity);
+ out.writeShort(def.parentId);
+ out.writeShort(def.hoveredSiblingId);
+ if (def.alternateOperators != null)
+ {
+ out.writeByte(def.alternateOperators.length);
+ for (int i = 0; i < def.alternateOperators.length; ++i)
+ {
+ out.writeByte(def.alternateOperators[i]);
+ out.writeShort(def.alternateRhs[i]);
+ }
+ }
+ else
+ {
+ out.writeByte(0);
+ }
+ if (def.clientScripts != null)
+ {
+ out.writeByte(def.clientScripts.length);
+ for (int i = 0; i < def.clientScripts.length; ++i)
+ {
+ int len = 0;
+ for (int j = 0; j < def.clientScripts[i].length; ++j)
+ {
+ ClientScript1Instruction ins = def.clientScripts[i][j];
+ len++;
+ if (ins.operands != null)
+ {
+ len += ins.operands.length;
+ }
+ }
+ out.writeShort(len);
+ for (int j = 0; j < def.clientScripts[i].length; ++j)
+ {
+ ClientScript1Instruction ins = def.clientScripts[i][j];
+ out.writeShort(ins.opcode.ordinal());
+ if (ins.operands != null)
+ {
+ for (int op : ins.operands)
+ {
+ out.writeShort(op);
+ }
+ }
+ }
+ }
+ }
+ else
+ {
+ out.writeByte(0);
+ }
+ if (def.type == 0)
+ {
+ out.writeShort(def.scrollHeight);
+ out.writeByte(def.isHidden ? 1 : 0);
+ }
+ if (def.type == 1)
+ {
+ out.writeShort(0);
+ out.writeByte(0);
+ }
+ if (def.type == 2)
+ {
+ out.writeByte((def.clickMask & 268435456) != 0 ? 1 : 0);
+ out.writeByte((def.clickMask & 1073741824) != 0 ? 1 : 0);
+ out.writeByte((def.clickMask & Integer.MIN_VALUE) != 0 ? 1 : 0);
+ out.writeByte((def.clickMask & 536870912) != 0 ? 1 : 0);
+ out.writeByte(def.xPitch);
+ out.writeByte(def.yPitch);
+ for (int i = 0; i < 20; ++i)
+ {
+ if (def.sprites[i] != -1)
+ {
+ out.writeByte(1);
+ out.writeShort(def.xOffsets[i]);
+ out.writeShort(def.yOffsets[i]);
+ out.writeShort(def.sprites[i]);
+ }
+ else
+ {
+ out.writeByte(0);
+ }
+ }
+ for (int i = 0; i < 5; ++i)
+ {
+ if (def.configActions[i] != null)
+ {
+ out.writeString(def.configActions[i]);
+ }
+ else
+ {
+ out.writeString("");
+ }
+ }
+ }
+ if (def.type == 3)
+ {
+ out.writeByte(def.filled ? 1 : 0);
+ }
+ if (def.type == 4 || def.type == 1)
+ {
+ out.writeByte(def.xTextAlignment);
+ out.writeByte(def.yTextAlignment);
+ out.writeByte(def.lineHeight);
+ out.writeShort(def.fontId);
+ out.writeByte(def.textShadowed ? 1 : 0);
+ }
+ if (def.type == 4)
+ {
+ out.writeString(def.text);
+ out.writeString(def.alternateText);
+ }
+ if (def.type == 1 || def.type == 3 || def.type == 4)
+ {
+ out.writeInt(def.textColor);
+ }
+ if (def.type == 3 || def.type == 4)
+ {
+ out.writeInt(def.alternateTextColor);
+ out.writeInt(def.hoveredTextColor);
+ out.writeInt(def.alternateHoveredTextColor);
+ }
+ if (def.type == 5)
+ {
+ out.writeInt(def.spriteId);
+ out.writeInt(def.alternateSpriteId);
+ }
+ if (def.type == 6)
+ {
+ out.writeShort(def.modelId);
+ out.writeShort(def.alternateModelId);
+ out.writeShort(def.animation);
+ out.writeShort(def.alternateAnimation);
+ out.writeShort(def.modelZoom);
+ out.writeShort(def.rotationX);
+ out.writeShort(def.rotationZ);
+ }
+ if (def.type == 7)
+ {
+ out.writeByte(def.xTextAlignment);
+ out.writeShort(def.fontId);
+ out.writeByte(def.textShadowed ? 1 : 0);
+ out.writeInt(def.textColor);
+ out.writeShort(def.xPitch);
+ out.writeShort(def.yPitch);
+ out.writeByte((def.clickMask & 1073741824) != 0 ? 1 : 0);
+ for (int i = 0; i < 5; ++i)
+ {
+ out.writeString(def.configActions[i]);
+ }
+ }
+ if (def.type == 8)
+ {
+ out.writeString(def.text);
+ }
+ if (def.menuType == 2 || def.type == 2)
+ {
+ out.writeString(def.targetVerb);
+ out.writeString(def.spellName);
+ out.writeShort((def.clickMask >>> 11) & 63);
+ }
+ if (def.menuType == 1 || def.menuType == 4 || def.menuType == 5 || def.menuType == 6)
+ {
+ out.writeString(def.tooltip);
+ }
+ return out.flip();
+ }
+}
diff --git a/cache/src/main/java/net/runelite/cache/definitions/savers/ItemSaver.java b/cache/src/main/java/net/runelite/cache/definitions/savers/ItemSaver.java
new file mode 100644
index 0000000000..baa9af3bea
--- /dev/null
+++ b/cache/src/main/java/net/runelite/cache/definitions/savers/ItemSaver.java
@@ -0,0 +1,235 @@
+/*
+ * Copyright (c) 2017, Adam
+ * 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.savers;
+
+import java.util.Map.Entry;
+import net.runelite.cache.definitions.ItemDefinition;
+import net.runelite.cache.io.OutputStream;
+
+public class ItemSaver
+{
+ public byte[] save(ItemDefinition item)
+ {
+ OutputStream out = new OutputStream();
+ if (item.inventoryModel != 0)
+ {
+ out.writeByte(1);
+ out.writeShort(item.inventoryModel);
+ }
+ if (item.name != null)
+ {
+ out.writeByte(2);
+ out.writeString(item.name);
+ }
+ out.writeByte(4);
+ out.writeShort(item.zoom2d);
+ out.writeByte(5);
+ out.writeShort(item.xan2d);
+ out.writeByte(6);
+ out.writeShort(item.yan2d);
+ out.writeByte(7);
+ out.writeShort(item.xOffset2d);
+ out.writeByte(8);
+ out.writeShort(item.yOffset2d);
+ if (item.stackable != 0)
+ {
+ out.writeByte(11);
+ }
+ out.writeByte(12);
+ out.writeInt(item.cost);
+ if (item.members)
+ {
+ out.writeByte(16);
+ }
+ if (item.maleModel0 != -1 || item.maleOffset != 0)
+ {
+ out.writeByte(23);
+ out.writeShort(item.maleModel0);
+ out.writeByte(item.maleOffset);
+ }
+ if (item.maleModel1 != -1)
+ {
+ out.writeByte(24);
+ out.writeShort(item.maleModel1);
+ }
+ if (item.femaleModel0 != -1 || item.femaleOffset != 0)
+ {
+ out.writeByte(25);
+ out.writeShort(item.femaleModel0);
+ out.writeByte(item.femaleOffset);
+ }
+ if (item.femaleModel1 != -1)
+ {
+ out.writeByte(26);
+ out.writeShort(item.femaleModel1);
+ }
+ for (int i = 0; i < 5; ++i)
+ {
+ if (item.options[i] != null)
+ {
+ out.writeByte(30 + i);
+ out.writeString(item.options[i]);
+ }
+ }
+ for (int i = 0; i < 5; ++i)
+ {
+ if (item.interfaceOptions[i] != null)
+ {
+ out.writeByte(35 + i);
+ out.writeString(item.interfaceOptions[i]);
+ }
+ }
+ if (item.colorFind != null && item.colorReplace != null)
+ {
+ out.writeByte(40);
+ out.writeByte(item.colorFind.length);
+ for (int i = 0; i < item.colorFind.length; ++i)
+ {
+ out.writeShort(item.colorFind[i]);
+ out.writeShort(item.colorReplace[i]);
+ }
+ }
+ if (item.textureFind != null && item.textureReplace != null)
+ {
+ out.writeByte(41);
+ out.writeByte(item.textureFind.length);
+ for (int i = 0; i < item.textureFind.length; ++i)
+ {
+ out.writeShort(item.textureFind[i]);
+ out.writeShort(item.textureReplace[i]);
+ }
+ }
+ out.writeByte(42);
+ out.writeByte(item.shiftClickDropIndex);
+ if (item.isTradeable)
+ {
+ out.writeByte(65);
+ }
+ if (item.maleModel2 != -1)
+ {
+ out.writeByte(78);
+ out.writeShort(item.maleModel2);
+ }
+ if (item.femaleModel2 != -1)
+ {
+ out.writeByte(79);
+ out.writeShort(item.femaleModel2);
+ }
+ if (item.maleHeadModel != -1)
+ {
+ out.writeByte(90);
+ out.writeShort(item.maleHeadModel);
+ }
+ if (item.femaleHeadModel != -1)
+ {
+ out.writeByte(91);
+ out.writeShort(item.femaleHeadModel);
+ }
+ if (item.maleHeadModel2 != -1)
+ {
+ out.writeByte(92);
+ out.writeShort(item.maleHeadModel2);
+ }
+ if (item.femaleHeadModel2 != -1)
+ {
+ out.writeByte(93);
+ out.writeShort(item.femaleHeadModel2);
+ }
+ out.writeByte(95);
+ out.writeShort(item.zan2d);
+ if (item.notedID != -1)
+ {
+ out.writeByte(97);
+ out.writeShort(item.notedID);
+ }
+ if (item.notedTemplate != -1)
+ {
+ out.writeByte(98);
+ out.writeShort(item.notedTemplate);
+ }
+ if (item.countObj != null)
+ {
+ for (int i = 0; i < 10; ++i)
+ {
+ out.writeByte(100 + i);
+ out.writeShort(item.countObj[i]);
+ out.writeShort(item.countCo[i]);
+ }
+ }
+ out.writeByte(110);
+ out.writeShort(item.resizeX);
+ out.writeByte(111);
+ out.writeShort(item.resizeY);
+ out.writeByte(112);
+ out.writeShort(item.resizeZ);
+ out.writeByte(113);
+ out.writeByte(item.ambient);
+ out.writeByte(114);
+ out.writeByte(item.contrast);
+ out.writeByte(115);
+ out.writeByte(item.team);
+ if (item.boughtId != -1)
+ {
+ out.writeByte(139);
+ out.writeShort(item.boughtId);
+ }
+ if (item.boughtTemplateId != -1)
+ {
+ out.writeByte(140);
+ out.writeShort(item.boughtTemplateId);
+ }
+ if (item.placeholderId != -1)
+ {
+ out.writeByte(148);
+ out.writeShort(item.placeholderId);
+ }
+ if (item.placeholderTemplateId != -1)
+ {
+ out.writeByte(149);
+ out.writeShort(item.placeholderTemplateId);
+ }
+ if (item.params != null)
+ {
+ out.writeByte(249);
+ out.writeByte(item.params.size());
+ for (Entry entry : item.params.entrySet())
+ {
+ out.writeByte(entry.getValue() instanceof String ? 1 : 0);
+ out.write24BitInt(entry.getKey());
+ if (entry.getValue() instanceof String)
+ {
+ out.writeString((String) entry.getValue());
+ }
+ else
+ {
+ out.writeInt((Integer) entry.getValue());
+ }
+ }
+ }
+ out.writeByte(0);
+
+ return out.flip();
+ }
+}
diff --git a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/mapping/MethodSignatureMapper.java b/cache/src/main/java/net/runelite/cache/definitions/savers/LocationSaver.java
similarity index 51%
rename from deobfuscator/src/main/java/net/runelite/deob/deobfuscators/mapping/MethodSignatureMapper.java
rename to cache/src/main/java/net/runelite/cache/definitions/savers/LocationSaver.java
index a5128f00c9..2086bd7e78 100644
--- a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/mapping/MethodSignatureMapper.java
+++ b/cache/src/main/java/net/runelite/cache/definitions/savers/LocationSaver.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016-2017, Adam
+ * Copyright (c) 2017, Adam
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -22,51 +22,57 @@
* (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.savers;
-package net.runelite.deob.deobfuscators.mapping;
-
-import com.google.common.collect.LinkedHashMultimap;
+import com.google.common.collect.LinkedListMultimap;
import com.google.common.collect.Multimap;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.List;
-import java.util.stream.Collectors;
-import net.runelite.asm.ClassFile;
-import net.runelite.asm.ClassGroup;
-import net.runelite.asm.Method;
-import net.runelite.asm.signature.Signature;
+import net.runelite.cache.definitions.LocationsDefinition;
+import net.runelite.cache.io.OutputStream;
+import net.runelite.cache.region.Location;
-public class MethodSignatureMapper
+public class LocationSaver
{
- private Multimap map = LinkedHashMultimap.create();
-
- private List getMethods(ClassGroup group)
+ public byte[] save(LocationsDefinition locs)
{
- List methods = new ArrayList<>();
- for (ClassFile cf : group.getClasses())
- for (Method m : cf.getMethods())
- if (!m.isStatic() && !m.getName().equals("") && m.getCode() != null)
- methods.add(m);
- return methods;
- }
-
- private List getMethodsOfSignature(ClassGroup group, ClassFile cf, Signature sig)
- {
- return getMethods(group).stream()
- .filter(m -> MappingExecutorUtil.isMaybeEqual(cf, m.getClassFile()))
- .filter(m -> MappingExecutorUtil.isMaybeEqual(m.getDescriptor(), sig))
- .collect(Collectors.toList());
- }
-
- public void map(ClassGroup group1, ClassGroup group2)
- {
- for (Method m : getMethods(group1))
+ Multimap locById = LinkedListMultimap.create();
+ List sortedLocs = new ArrayList<>(locs.getLocations());
+ sortedLocs.sort((l1, l2) -> Integer.compare(l1.getId(), l2.getId()));
+ for (Location loc : sortedLocs)
{
- map.putAll(m, getMethodsOfSignature(group2, m.getClassFile(), m.getDescriptor()));
+ locById.put(loc.getId(), loc);
}
- }
+ OutputStream out = new OutputStream();
+ int prevId = -1;
+ for (Integer id : locById.keySet())
+ {
+ int diffId = id - prevId;
+ prevId = id;
- public Multimap getMap()
- {
- return map;
+ out.writeShortSmart(diffId);
+
+ Collection locations = locById.get(id);
+ int position = 0;
+ for (Location loc : locations)
+ {
+ int packedPosition = (loc.getPosition().getZ() << 12)
+ | (loc.getPosition().getX() << 6)
+ | (loc.getPosition().getY());
+
+ int diffPos = packedPosition - position;
+ position = packedPosition;
+
+ out.writeShortSmart(diffPos + 1);
+
+ int packedAttributes = (loc.getType() << 2) | loc.getOrientation();
+ out.writeByte(packedAttributes);
+ }
+
+ out.writeShortSmart(0);
+ }
+ out.writeShortSmart(0);
+ return out.flip();
}
}
diff --git a/cache/src/main/java/net/runelite/cache/definitions/savers/MapSaver.java b/cache/src/main/java/net/runelite/cache/definitions/savers/MapSaver.java
new file mode 100644
index 0000000000..855ccd413c
--- /dev/null
+++ b/cache/src/main/java/net/runelite/cache/definitions/savers/MapSaver.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 2017, Adam
+ * 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.savers;
+
+import net.runelite.cache.definitions.MapDefinition;
+import net.runelite.cache.definitions.MapDefinition.Tile;
+import net.runelite.cache.io.OutputStream;
+import static net.runelite.cache.region.Region.X;
+import static net.runelite.cache.region.Region.Y;
+import static net.runelite.cache.region.Region.Z;
+
+public class MapSaver
+{
+ public byte[] save(MapDefinition map)
+ {
+ Tile[][][] tiles = map.getTiles();
+ OutputStream out = new OutputStream();
+ for (int z = 0; z < Z; z++)
+ {
+ for (int x = 0; x < X; x++)
+ {
+ for (int y = 0; y < Y; y++)
+ {
+ Tile tile = tiles[z][x][y];
+ if (tile.attrOpcode != 0)
+ {
+ out.writeByte(tile.attrOpcode);
+ out.writeByte(tile.overlayId);
+ }
+ if (tile.settings != 0)
+ {
+ out.writeByte(tile.settings + 49);
+ }
+ if (tile.underlayId != 0)
+ {
+ out.writeByte(tile.underlayId + 81);
+ }
+ if (tile.height == null)
+ {
+ out.writeByte(0);
+ }
+ else
+ {
+ out.writeByte(1);
+ out.writeByte(tile.height);
+ }
+ }
+ }
+ }
+ return out.flip();
+ }
+}
diff --git a/cache/src/main/java/net/runelite/cache/definitions/savers/NpcSaver.java b/cache/src/main/java/net/runelite/cache/definitions/savers/NpcSaver.java
new file mode 100644
index 0000000000..55d4b966e9
--- /dev/null
+++ b/cache/src/main/java/net/runelite/cache/definitions/savers/NpcSaver.java
@@ -0,0 +1,195 @@
+/*
+ * Copyright (c) 2017, Adam
+ * 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.savers;
+
+import java.util.Map;
+import net.runelite.cache.definitions.NpcDefinition;
+import net.runelite.cache.io.OutputStream;
+
+public class NpcSaver
+{
+ public byte[] save(NpcDefinition npc)
+ {
+ OutputStream out = new OutputStream();
+ if (npc.models != null)
+ {
+ out.writeByte(1);
+ out.writeByte(npc.models.length);
+ for (int modelId : npc.models)
+ {
+ out.writeShort(modelId);
+ }
+ }
+ if (npc.name != null)
+ {
+ out.writeByte(2);
+ out.writeString(npc.name);
+ }
+ if (npc.tileSpacesOccupied != 1)
+ {
+ out.writeByte(12);
+ out.writeByte(npc.tileSpacesOccupied);
+ }
+ if (npc.stanceAnimation != -1)
+ {
+ out.writeByte(13);
+ out.writeShort(npc.stanceAnimation);
+ }
+ if (npc.walkAnimation != -1)
+ {
+ out.writeByte(14);
+ out.writeShort(npc.walkAnimation);
+ }
+ if (npc.anInt2165 != -1)
+ {
+ out.writeByte(15);
+ out.writeShort(npc.anInt2165);
+ }
+ if (npc.anInt2189 != -1)
+ {
+ out.writeByte(16);
+ out.writeShort(npc.anInt2189);
+ }
+ if (npc.rotate180Animation != -1 || npc.rotate90LeftAnimation != -1 || npc.rotate90RightAnimation != -1)
+ {
+ out.writeByte(17);
+ out.writeShort(npc.walkAnimation);
+ out.writeShort(npc.rotate180Animation);
+ out.writeShort(npc.rotate90RightAnimation);
+ out.writeShort(npc.rotate90LeftAnimation);
+ }
+ for (int i = 0; i < 5; ++i)
+ {
+ if (npc.options[i] != null)
+ {
+ out.writeByte(30 + i);
+ out.writeString(npc.options[i]);
+ }
+ }
+ if (npc.recolorToFind != null && npc.recolorToReplace != null)
+ {
+ out.writeByte(40);
+ out.writeByte(npc.recolorToFind.length);
+ for (int i = 0; i < npc.recolorToFind.length; ++i)
+ {
+ out.writeShort(npc.recolorToFind[i]);
+ out.writeShort(npc.recolorToReplace[i]);
+ }
+ }
+ if (npc.retextureToFind != null && npc.retextureToReplace != null)
+ {
+ out.writeByte(41);
+ out.writeByte(npc.retextureToFind.length);
+ for (int i = 0; i < npc.retextureToFind.length; ++i)
+ {
+ out.writeShort(npc.retextureToFind[i]);
+ out.writeShort(npc.retextureToReplace[i]);
+ }
+ }
+ if (npc.models_2 != null)
+ {
+ out.writeByte(60);
+ out.writeByte(npc.models_2.length);
+ for (int modelId : npc.models_2)
+ {
+ out.writeShort(modelId);
+ }
+ }
+ if (!npc.renderOnMinimap)
+ {
+ out.writeByte(93);
+ }
+ if (npc.combatLevel != -1)
+ {
+ out.writeByte(95);
+ out.writeShort(npc.combatLevel);
+ }
+ out.writeByte(97);
+ out.writeShort(npc.resizeX);
+ out.writeByte(98);
+ out.writeShort(npc.resizeY);
+ if (npc.hasRenderPriority)
+ {
+ out.writeByte(99);
+ }
+ out.writeByte(100);
+ out.writeByte(npc.ambient);
+ out.writeByte(101);
+ out.writeByte(npc.contrast);
+ if (npc.headIcon != -1)
+ {
+ out.writeByte(102);
+ out.writeShort(npc.headIcon);
+ }
+ out.writeByte(103);
+ out.writeShort(npc.rotation);
+ if (!npc.isClickable)
+ {
+ out.writeByte(107);
+ }
+ if (!npc.aBool2170)
+ {
+ out.writeByte(109);
+ }
+ if (npc.aBool2190)
+ {
+ out.writeByte(111);
+ }
+ if (npc.configs != null)
+ {
+ out.writeByte(118);
+ out.writeShort(npc.varbitIndex);
+ out.writeShort(npc.varpIndex);
+
+ int[] c = npc.configs;
+ out.writeShort(c[c.length - 1]);
+ out.writeByte(c.length - 2);
+ for (int i = 0; i <= c.length - 2; ++i)
+ {
+ out.writeShort(c[i]);
+ }
+ }
+ if (npc.params != null)
+ {
+ out.writeByte(249);
+ out.writeByte(npc.params.size());
+ for (Map.Entry entry : npc.params.entrySet())
+ {
+ out.writeByte(entry.getValue() instanceof String ? 1 : 0);
+ out.write24BitInt(entry.getKey());
+ if (entry.getValue() instanceof String)
+ {
+ out.writeString((String) entry.getValue());
+ }
+ else
+ {
+ out.writeInt((Integer) entry.getValue());
+ }
+ }
+ }
+ out.writeByte(0);
+ return out.flip();
+ }
+}
diff --git a/cache/src/main/java/net/runelite/cache/definitions/savers/ObjectSaver.java b/cache/src/main/java/net/runelite/cache/definitions/savers/ObjectSaver.java
new file mode 100644
index 0000000000..e1bb77896d
--- /dev/null
+++ b/cache/src/main/java/net/runelite/cache/definitions/savers/ObjectSaver.java
@@ -0,0 +1,231 @@
+/*
+ * Copyright (c) 2017, Adam
+ * 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.savers;
+
+import java.util.Map;
+import net.runelite.cache.definitions.ObjectDefinition;
+import net.runelite.cache.io.OutputStream;
+
+public class ObjectSaver
+{
+ public byte[] save(ObjectDefinition obj)
+ {
+ OutputStream out = new OutputStream();
+ if (obj.getObjectTypes() != null && obj.getObjectModels() != null)
+ {
+ out.writeByte(1);
+ out.writeByte(obj.getObjectTypes().length);
+ for (int i = 0; i < obj.getObjectTypes().length; ++i)
+ {
+ out.writeShort(obj.getObjectModels()[i]);
+ out.writeByte(obj.getObjectTypes()[i]);
+ }
+ }
+ if (obj.getName() != null)
+ {
+ out.writeByte(2);
+ out.writeString(obj.getName());
+ }
+ if (obj.getObjectTypes() == null && obj.getObjectModels() != null)
+ {
+ out.writeByte(5);
+ out.writeByte(obj.getObjectModels().length);
+ for (int i = 0; i < obj.getObjectModels().length; ++i)
+ {
+ out.writeShort(obj.getObjectModels()[i]);
+ }
+ }
+ out.writeByte(14);
+ out.writeByte(obj.getSizeX());
+ out.writeByte(15);
+ out.writeByte(obj.getSizeY());
+ if (obj.getInteractType() == 0 && !obj.isBlocksProjectile())
+ {
+ out.writeByte(17);
+ }
+ else if (!obj.isBlocksProjectile())
+ {
+ out.writeByte(18);
+ }
+ if (obj.getAnInt2088() != -1)
+ {
+ out.writeByte(19);
+ out.writeByte(obj.getAnInt2088());
+ }
+ if (obj.getAnInt2105() == 0)
+ {
+ out.writeByte(21);
+ }
+ if (!obj.isNonFlatShading())
+ {
+ out.writeByte(22);
+ }
+ if (obj.isABool2111())
+ {
+ out.writeByte(23);
+ }
+ if (obj.getAnimationID() != -1)
+ {
+ out.writeByte(24);
+ out.writeShort(obj.getAnimationID());
+ }
+ if (obj.getInteractType() == 1)
+ {
+ out.writeByte(27);
+ }
+ out.writeByte(28);
+ out.writeByte(obj.getAnInt2069());
+ out.writeByte(29);
+ out.writeByte(obj.getAmbient());
+ out.writeByte(39);
+ out.writeByte(obj.getContrast());
+ for (int i = 0; i < 5; ++i)
+ {
+ out.writeByte(30 + i);
+ String action = obj.getActions()[i];
+ out.writeString(action != null ? action : "Hidden");
+ }
+ if (obj.getRecolorToFind() != null && obj.getRecolorToReplace() != null)
+ {
+ out.writeByte(40);
+ out.writeByte(obj.getRecolorToFind().length);
+ for (int i = 0; i < obj.getRecolorToFind().length; ++i)
+ {
+ out.writeShort(obj.getRecolorToFind()[i]);
+ out.writeShort(obj.getRecolorToReplace()[i]);
+ }
+ }
+ if (obj.getRetextureToFind() != null && obj.getTextureToReplace() != null)
+ {
+ out.writeByte(41);
+ out.writeByte(obj.getRetextureToFind().length);
+ for (int i = 0; i < obj.getRetextureToFind().length; ++i)
+ {
+ out.writeShort(obj.getRetextureToFind()[i]);
+ out.writeShort(obj.getTextureToReplace()[i]);
+ }
+ }
+ if (obj.isRotated())
+ {
+ out.writeByte(62);
+ }
+ if (!obj.isABool2097())
+ {
+ out.writeByte(64);
+ }
+ out.writeByte(65);
+ out.writeShort(obj.getModelSizeX());
+ out.writeByte(66);
+ out.writeShort(obj.getModelSizeHeight());
+ out.writeByte(67);
+ out.writeShort(obj.getModelSizeY());
+ if (obj.getMapSceneID() != -1)
+ {
+ out.writeByte(68);
+ out.writeShort(obj.getMapSceneID());
+ }
+ out.writeByte(70);
+ out.writeShort(obj.getOffsetX());
+ out.writeByte(71);
+ out.writeShort(obj.getOffsetHeight());
+ out.writeByte(72);
+ out.writeShort(obj.getOffsetY());
+ if (obj.isABool2104())
+ {
+ out.writeByte(73);
+ }
+ if (obj.isSolid())
+ {
+ out.writeByte(74);
+ }
+ if (obj.getAnInt2106() != -1)
+ {
+ out.writeByte(75);
+ out.writeByte(obj.getAnInt2106());
+ }
+ if (obj.getAnInt2110() != -1)
+ {
+ out.writeByte(78);
+ out.writeShort(obj.getAnInt2110());
+ out.writeByte(obj.getAnInt2083());
+ }
+ if (obj.getAnIntArray2084() != null)
+ {
+ out.writeByte(79);
+ out.writeShort(obj.getAnInt2112());
+ out.writeShort(obj.getAnInt2113());
+ out.writeByte(obj.getAnInt2083());
+ out.writeByte(obj.getAnIntArray2084().length);
+ for (int i : obj.getAnIntArray2084())
+ {
+ out.writeShort(i);
+ }
+ }
+ if (obj.getAnInt2105() != -1)
+ {
+ out.writeByte(81);
+ out.writeByte(obj.getAnInt2105() / 256);
+ }
+ if (obj.getMapAreaId() != -1)
+ {
+ out.writeByte(82);
+ out.writeShort(obj.getMapAreaId());
+ }
+ if (obj.getConfigChangeDest() != null)
+ {
+ out.writeByte(92);
+ out.writeShort(obj.getVarbitID());
+ out.writeShort(obj.getVarpID());
+
+ int[] c = obj.getConfigChangeDest();
+ out.writeShort(c[c.length - 1]);
+ out.writeByte(c.length - 2);
+ for (int i = 0; i <= c.length - 2; ++i)
+ {
+ out.writeShort(c[i]);
+ }
+ }
+ if (obj.getParams() != null)
+ {
+ out.writeByte(249);
+ out.writeByte(obj.getParams().size());
+ for (Map.Entry entry : obj.getParams().entrySet())
+ {
+ out.writeByte(entry.getValue() instanceof String ? 1 : 0);
+ out.write24BitInt(entry.getKey());
+ if (entry.getValue() instanceof String)
+ {
+ out.writeString((String) entry.getValue());
+ }
+ else
+ {
+ out.writeInt((Integer) entry.getValue());
+ }
+ }
+ }
+ out.writeByte(0);
+ return out.flip();
+ }
+}
diff --git a/cache/src/main/java/net/runelite/cache/definitions/savers/ScriptSaver.java b/cache/src/main/java/net/runelite/cache/definitions/savers/ScriptSaver.java
new file mode 100644
index 0000000000..3b130c4c53
--- /dev/null
+++ b/cache/src/main/java/net/runelite/cache/definitions/savers/ScriptSaver.java
@@ -0,0 +1,91 @@
+/*
+ * Copyright (c) 2017, Adam
+ * 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.savers;
+
+import java.util.Map;
+import java.util.Map.Entry;
+import net.runelite.cache.definitions.ScriptDefinition;
+import net.runelite.cache.io.OutputStream;
+import static net.runelite.cache.script.Opcodes.SCONST;
+import static net.runelite.cache.script.Opcodes.POP_INT;
+import static net.runelite.cache.script.Opcodes.POP_STRING;
+import static net.runelite.cache.script.Opcodes.RETURN;
+
+public class ScriptSaver
+{
+ public byte[] save(ScriptDefinition script)
+ {
+ int[] instructions = script.getInstructions();
+ int[] intOperands = script.getIntOperands();
+ String[] stringOperands = script.getStringOperands();
+ Map[] switches = script.getSwitches();
+
+ OutputStream out = new OutputStream();
+ out.writeByte(0); // null string
+ for (int i = 0; i < instructions.length; ++i)
+ {
+ int opcode = instructions[i];
+ out.writeShort(opcode);
+ if (opcode == SCONST)
+ {
+ out.writeString(stringOperands[i]);
+ }
+ else if (opcode < 100 && opcode != RETURN && opcode != POP_INT && opcode != POP_STRING)
+ {
+ out.writeInt(intOperands[i]);
+ }
+ else
+ {
+ out.writeByte(intOperands[i]);
+ }
+ }
+ out.writeInt(instructions.length);
+ out.writeShort(script.getLocalIntCount());
+ out.writeShort(script.getLocalStringCount());
+ out.writeShort(script.getIntStackCount());
+ out.writeShort(script.getStringStackCount());
+ int switchStart = out.getOffset();
+ if (switches == null)
+ {
+ out.writeByte(0);
+ }
+ else
+ {
+ out.writeByte(switches.length);
+ for (Map s : switches)
+ {
+ out.writeShort(s.size());
+ for (Entry e : s.entrySet())
+ {
+ out.writeInt(e.getKey());
+ out.writeInt(e.getValue());
+ }
+ }
+ }
+ int switchLength = out.getOffset() - switchStart;
+ out.writeShort(switchLength);
+ return out.flip();
+ }
+}
diff --git a/cache/src/main/java/net/runelite/cache/definitions/sound/SoundEffect1Definition.java b/cache/src/main/java/net/runelite/cache/definitions/sound/SoundEffect1Definition.java
new file mode 100644
index 0000000000..ecd9854892
--- /dev/null
+++ b/cache/src/main/java/net/runelite/cache/definitions/sound/SoundEffect1Definition.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2017, Adam
+ * 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.sound;
+
+public class SoundEffect1Definition
+{
+ public SoundEffect2Definition field1173;
+ public SoundEffect2Definition field1174;
+ public SoundEffect2Definition field1175;
+ public int field1176 = 500;
+ public int[] field1177 = new int[]
+ {
+ 0, 0, 0, 0, 0
+ };
+ public SoundEffect2Definition field1178;
+ public int[] field1179 = new int[]
+ {
+ 0, 0, 0, 0, 0
+ };
+ public int[] field1180 = new int[]
+ {
+ 0, 0, 0, 0, 0
+ };
+ public SoundEffect2Definition field1181;
+ public SoundEffect3Definition field1182;
+ public SoundEffect2Definition field1183;
+ public int field1184 = 100;
+ public SoundEffect2Definition field1186;
+ public int field1187 = 0;
+ public int field1188 = 0;
+ public SoundEffect2Definition field1192;
+ public SoundEffect2Definition field1193;
+}
diff --git a/cache/src/main/java/net/runelite/cache/definitions/sound/SoundEffect2Definition.java b/cache/src/main/java/net/runelite/cache/definitions/sound/SoundEffect2Definition.java
new file mode 100644
index 0000000000..358d462f50
--- /dev/null
+++ b/cache/src/main/java/net/runelite/cache/definitions/sound/SoundEffect2Definition.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2017, Adam
+ * 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.sound;
+
+public class SoundEffect2Definition
+{
+ public int field1085;
+ public int[] field1086 = new int[2];
+ public int field1087;
+ public int field1088;
+ public int field1089;
+ public int[] field1090 = new int[2];
+ public int field1091;
+ public int field1092 = 2;
+ public int field1093;
+ public int field1094;
+ public int field1095;
+
+ public SoundEffect2Definition()
+ {
+ this.field1086[0] = 0;
+ this.field1086[1] = '\uffff';
+ this.field1090[0] = 0;
+ this.field1090[1] = '\uffff';
+ }
+}
diff --git a/cache/src/main/java/net/runelite/cache/definitions/sound/SoundEffect3Definition.java b/cache/src/main/java/net/runelite/cache/definitions/sound/SoundEffect3Definition.java
new file mode 100644
index 0000000000..a6580c046f
--- /dev/null
+++ b/cache/src/main/java/net/runelite/cache/definitions/sound/SoundEffect3Definition.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2017, Adam
+ * 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.sound;
+
+public class SoundEffect3Definition
+{
+ public int[][][] field1154 = new int[2][2][4];
+ public int[] field1155 = new int[2];
+ public int[] field1156 = new int[2];
+ public int[][][] field1159 = new int[2][2][4];
+}
diff --git a/cache/src/main/java/net/runelite/cache/definitions/sound/SoundEffectDefinition.java b/cache/src/main/java/net/runelite/cache/definitions/sound/SoundEffectDefinition.java
new file mode 100644
index 0000000000..0eda10254e
--- /dev/null
+++ b/cache/src/main/java/net/runelite/cache/definitions/sound/SoundEffectDefinition.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2017, Adam
+ * 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.sound;
+
+public class SoundEffectDefinition
+{
+ public int field1006;
+ public SoundEffect1Definition[] field1008 = new SoundEffect1Definition[10];
+ public int field1009;
+}
diff --git a/cache/src/main/java/net/runelite/cache/fs/Archive.java b/cache/src/main/java/net/runelite/cache/fs/Archive.java
new file mode 100644
index 0000000000..d7b8435f3c
--- /dev/null
+++ b/cache/src/main/java/net/runelite/cache/fs/Archive.java
@@ -0,0 +1,224 @@
+/*
+ * Copyright (c) 2016-2017, Adam
+ * 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.fs;
+
+import java.io.IOException;
+import net.runelite.cache.index.FileData;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class Archive
+{
+ private static final Logger logger = LoggerFactory.getLogger(Archive.class);
+
+ private final Index index; // member of this index
+
+ private final int archiveId;
+ private int nameHash;
+ private int crc;
+ private int revision;
+ private int compression;
+ private FileData[] fileData;
+ private byte[] hash; // used by webservice, sha256 hash of content
+
+ public Archive(Index index, int id)
+ {
+ this.index = index;
+ this.archiveId = id;
+ }
+
+ @Override
+ public int hashCode()
+ {
+ int hash = 7;
+ hash = 47 * hash + this.archiveId;
+ hash = 47 * hash + this.nameHash;
+ hash = 47 * hash + this.revision;
+ return hash;
+ }
+
+ @Override
+ public boolean equals(Object obj)
+ {
+ if (obj == null)
+ {
+ return false;
+ }
+ if (getClass() != obj.getClass())
+ {
+ return false;
+ }
+ final Archive other = (Archive) obj;
+ if (this.archiveId != other.archiveId)
+ {
+ return false;
+ }
+ if (this.nameHash != other.nameHash)
+ {
+ return false;
+ }
+ if (this.revision != other.revision)
+ {
+ return false;
+ }
+ return true;
+ }
+
+ public Index getIndex()
+ {
+ return index;
+ }
+
+ public byte[] decompress(byte[] data) throws IOException
+ {
+ return decompress(data, null);
+ }
+
+ public byte[] decompress(byte[] data, int[] keys) throws IOException
+ {
+ if (data == null)
+ {
+ return null;
+ }
+
+ byte[] encryptedData = data;
+
+ Container container = Container.decompress(encryptedData, keys);
+ if (container == null)
+ {
+ logger.warn("Unable to decrypt archive {}", this);
+ return null;
+ }
+
+ byte[] decompressedData = container.data;
+
+ if (this.crc != container.crc)
+ {
+ logger.warn("crc mismatch for archive {}/{}", index.getId(), this.getArchiveId());
+ throw new IOException("CRC mismatch for " + index.getId() + "/" + this.getArchiveId());
+ }
+
+ if (container.revision != -1 && this.getRevision() != container.revision)
+ {
+ // compressed data doesn't always include a revision, but check it if it does
+ logger.warn("revision mismatch for archive {}/{}, expected {} was {}",
+ index.getId(), this.getArchiveId(),
+ this.getRevision(), container.revision);
+ // I've seen this happen with vanilla caches where the
+ // revision in the index data differs from the revision
+ // stored for the archive data on disk... I assume this
+ // is more correct
+ this.setRevision(container.revision);
+ }
+
+ setCompression(container.compression);
+ return decompressedData;
+ }
+
+ public ArchiveFiles getFiles(byte[] data) throws IOException
+ {
+ return getFiles(data, null);
+ }
+
+ public ArchiveFiles getFiles(byte[] data, int[] keys) throws IOException
+ {
+ byte[] decompressedData = decompress(data, keys);
+
+ ArchiveFiles files = new ArchiveFiles();
+ for (FileData fileEntry : fileData)
+ {
+ FSFile file = new FSFile(fileEntry.getId());
+ file.setNameHash(fileEntry.getNameHash());
+ files.addFile(file);
+ }
+ files.loadContents(decompressedData);
+ return files;
+ }
+
+ public int getArchiveId()
+ {
+ return archiveId;
+ }
+
+ public int getNameHash()
+ {
+ return nameHash;
+ }
+
+ public void setNameHash(int nameHash)
+ {
+ this.nameHash = nameHash;
+ }
+
+ public int getCrc()
+ {
+ return crc;
+ }
+
+ public void setCrc(int crc)
+ {
+ this.crc = crc;
+ }
+
+ public int getRevision()
+ {
+ return revision;
+ }
+
+ public void setRevision(int revision)
+ {
+ this.revision = revision;
+ }
+
+ public int getCompression()
+ {
+ return compression;
+ }
+
+ public void setCompression(int compression)
+ {
+ this.compression = compression;
+ }
+
+ public FileData[] getFileData()
+ {
+ return fileData;
+ }
+
+ public void setFileData(FileData[] fileData)
+ {
+ this.fileData = fileData;
+ }
+
+ public byte[] getHash()
+ {
+ return hash;
+ }
+
+ public void setHash(byte[] hash)
+ {
+ this.hash = hash;
+ }
+}
diff --git a/cache/src/main/java/net/runelite/cache/fs/ArchiveFiles.java b/cache/src/main/java/net/runelite/cache/fs/ArchiveFiles.java
new file mode 100644
index 0000000000..2642b1fbb4
--- /dev/null
+++ b/cache/src/main/java/net/runelite/cache/fs/ArchiveFiles.java
@@ -0,0 +1,208 @@
+/*
+ * Copyright (c) 2016-2017, Adam
+ * 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.fs;
+
+import com.google.common.base.Preconditions;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import net.runelite.cache.io.InputStream;
+import net.runelite.cache.io.OutputStream;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class ArchiveFiles
+{
+ private static final Logger logger = LoggerFactory.getLogger(ArchiveFiles.class);
+
+ private final List files = new ArrayList<>();
+ private final Map