Better cache parsing, reading more data from cache instead of code/config defined values

Server/src/main/java/core/cache/def/impl/AnimationDefinition.java

@@ -141,7 +141,7 @@ public final class AnimationDefinition {
 										int i_22_ = buffer.get() & 0xFF;
 										if ((i_22_ ^ 0xffffffff) < -1) {
 											handledSounds[i_21_] = new int[i_22_];
-											handledSounds[i_21_][0] = ByteBufferUtils.getTriByte(buffer);
+											handledSounds[i_21_][0] = ByteBufferUtils.getMedium(buffer);
 											for (int i_23_ = 1; ((i_22_ ^ 0xffffffff) < (i_23_ ^ 0xffffffff)); i_23_++) {
 												handledSounds[i_21_][i_23_] = buffer.getShort() & 0xFFFF;
 											}

Server/src/main/java/core/cache/def/impl/DataMap.java

@@ -0,0 +1,117 @@
+package core.cache.def.impl;
+
+import core.cache.Cache;
+import core.cache.CacheFileManager;
+import core.cache.misc.Container;
+import core.cache.misc.buffer.ByteBufferUtils;
+import core.tools.CP1252;
+import rs09.game.system.SystemLogger;
+
+import java.nio.ByteBuffer;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+
+public class DataMap {
+
+    /**
+     * The config definitions mapping.
+     */
+    private static final Map<Integer, core.cache.def.impl.DataMap> definitions = new HashMap<>();
+
+    /**
+     * The enum id.
+     */
+    private final int id;
+
+    public char keyType = '?';
+
+    public char valueType = '?';
+
+    public String defaultString;
+
+    public int defaultInt;
+
+    public HashMap<Integer, Object> dataStore = new HashMap<>();
+
+    public DataMap(int id) {
+        this.id = id;
+    }
+
+    public int getInt(int key){
+        if(!dataStore.containsKey(key)){
+            SystemLogger.logErr("Invalid value passed for key: " + key + " map: " + id);
+            return -1;
+        }
+        return (int) dataStore.get(key);
+    }
+
+    public String getString(int key){
+        return (String) dataStore.get(key);
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder builder = new StringBuilder();
+        return "DataMapDefinition{" +
+                "id=" + id +
+                ", keyType=" + keyType +
+                ", valueType=" + (valueType == 'K' ? "Normal" : valueType == 'J' ? "Struct Pointer" : "Unknown") +
+                ", defaultString='" + defaultString + '\'' +
+                ", defaultInt=" + defaultInt +
+                ", dataStore=" + dataStore +
+                '}' + "\n";
+    }
+
+    public static DataMap get(int id){
+        core.cache.def.impl.DataMap def = definitions.get(id);
+        if (def != null) {
+            return def;
+        }
+        byte[] data = Cache.getIndexes()[17].getFileData(id >>> 8, id & 0xFF);
+        def = parse(id, data);
+        definitions.put(id, def);
+        return def;
+    }
+
+    public static DataMap parse(int id, byte[] data)
+    {
+        DataMap def = new DataMap(id);
+        if (data != null) {
+            ByteBuffer buffer = ByteBuffer.wrap(data);
+            int opcode;
+
+            while ((opcode = buffer.get() & 0xFF) != 0) {
+
+                if (opcode == 1) {
+                    def.keyType = CP1252.getFromByte(buffer.get());
+                } else if (opcode == 2) {
+                    def.valueType = CP1252.getFromByte(buffer.get());
+                } else if (opcode == 3) {
+                    def.defaultString = ByteBufferUtils.getString(buffer);
+                } else if (opcode == 4) {
+                    def.defaultInt = buffer.getInt();
+                } else if (opcode == 5 || opcode == 6) {
+                    int size = buffer.getShort() & 0xFFFF;
+
+                    for (int i = 0; i < size; i++) {
+                        int key = buffer.getInt();
+
+                        Object value;
+                        if (opcode == 5) {
+                            value = ByteBufferUtils.getString(buffer);
+                        } else {
+                            value = buffer.getInt();
+                        }
+                        def.dataStore.put(key, value);
+                    }
+                }
+            }
+        }
+        return def;
+    }
+
+    public int getId() {
+        return id;
+    }
+}

Server/src/main/java/core/cache/def/impl/ItemDefinition.java

@@ -495,7 +495,7 @@ public class ItemDefinition extends Definition<Item> {
 				}
 				for (int index = 0; index < length; index++) {
 					boolean string = (buffer.get() & 0xFF) == 1;
-					int key = ByteBufferUtils.getTriByte(buffer);
+					int key = ByteBufferUtils.getMedium(buffer);
 					Object value = string ? ByteBufferUtils.getString(buffer) : buffer.getInt();
 					def.clientScriptData.put(key, value);
 				}

Server/src/main/java/core/cache/def/impl/NPCDefinition.java

@@ -473,7 +473,7 @@ public final class NPCDefinition extends Definition<NPC> {
 			length = buffer.get() & 0xFF;
 			for (int i = 0; i < length; i++) {
 				boolean string = buffer.get() == 1;
-				ByteBufferUtils.getTriByte(buffer); // script id
+				ByteBufferUtils.getMedium(buffer); // script id
 				if (!string) {
 					buffer.getInt(); // Value
 				} else {

Server/src/main/java/core/cache/def/impl/SceneryDefinition.java

@@ -792,7 +792,7 @@ public class SceneryDefinition extends Definition<Scenery> {
 				int length = buffer.get() & 0xFF;
 				for (int i = 0; i < length; i++) {
 					boolean string = buffer.get() == 1;
-					ByteBufferUtils.getTriByte(buffer); // script id
+					ByteBufferUtils.getMedium(buffer); // script id
 					if (!string) {
 						buffer.getInt(); // Value
 					} else {

Server/src/main/java/core/cache/def/impl/Struct.java

@@ -0,0 +1,99 @@
+package core.cache.def.impl;
+
+import core.cache.Cache;
+import core.cache.CacheFileManager;
+import core.cache.misc.Container;
+import core.cache.misc.buffer.ByteBufferUtils;
+import rs09.game.system.SystemLogger;
+
+import java.nio.ByteBuffer;
+import java.util.HashMap;
+import java.util.Map;
+
+public class Struct {
+
+    /**
+     * The struct definitions mapping.
+     */
+    private static final Map<Integer, Struct> definitions = new HashMap<>();
+
+    /**
+     * The enum id.
+     */
+    private final int id;
+
+    public HashMap<Integer, Object> dataStore = new HashMap<>();
+
+    public Struct(int id) {
+        this.id = id;
+    }
+
+    public int getInt(int key){
+        if(!dataStore.containsKey(key)){
+            SystemLogger.logErr("Invalid value passed for key: " + key + " struct: " + id);
+            return -1;
+        }
+        return (int) dataStore.get(key);
+    }
+
+    public String getString(int key){
+        return (String) dataStore.get(key);
+    }
+
+    @Override
+    public String toString() {
+        return "Struct{" +
+                "id=" + id +
+                ", dataStore=" + dataStore +
+                '}';
+    }
+
+    public static Struct get(int id){
+        Struct def = definitions.get(id);
+        if (def != null) {
+            return def;
+        }
+        byte[] data = Cache.getIndexes()[2].getFileData(26, id);
+        def = parse(id, data);
+
+        definitions.put(id, def);
+        return def;
+    }
+
+    public static Struct parse(int id, byte[] data)
+    {
+        Struct def = new Struct(id);
+        if (data != null) {
+            ByteBuffer buffer = ByteBuffer.wrap(data);
+            int opcode;
+
+            while ((opcode = buffer.get() & 0xFF) != 0) {
+
+                if (opcode == 249) {
+                    int size = buffer.get() & 0xFF;
+
+                    for (int i = 0; size > i; i++) {
+                        boolean bool = (buffer.get() & 0xFF) == 1;
+                        int key = ByteBufferUtils.getMedium(buffer);
+                        Object value;
+                        if (bool) {
+                            value = ByteBufferUtils.getString(buffer);
+                        } else {
+                            value = buffer.getInt();
+                        }
+                        def.dataStore.put(key, value);
+                    }
+                }
+            }
+        }
+        return def;
+    }
+
+    public static int getCount() {
+        return Cache.getIndexes()[2].getFilesSize(26);
+    }
+
+    public int getId() {
+        return id;
+    }
+}

Server/src/main/java/core/cache/misc/buffer/ByteBufferUtils.java

@@ -105,7 +105,7 @@ public final class ByteBufferUtils {
 	 * @param buffer The buffer.
 	 * @return The value.
 	 */
-	public static int getTriByte(ByteBuffer buffer) {
+	public static int getMedium(ByteBuffer buffer) {
 		return ((buffer.get() & 0xFF) << 16) + ((buffer.get() & 0xFF) << 8) + (buffer.get() & 0xFF);
 	}
 

Server/src/main/java/core/game/node/entity/player/link/music/MusicPlayer.java

@@ -168,7 +168,7 @@ public final class MusicPlayer {
 	 */
 	public void play(MusicEntry entry) {
 		PacketRepository.send(MusicPacket.class, new MusicContext(player, entry.getId()));
-		PacketRepository.send(StringPacket.class, new StringContext(player, entry.getName(), 187, 14));
+		PacketRepository.send(StringPacket.class, new StringContext(player, entry.getName() + (player.isDebug() ? (" (" + entry.getId() + ")") : ""), 187, 14));
 		currentMusicId = entry.getId();
 		playing = true;
 	}

Server/src/main/java/core/net/event/JS5ReadEvent.java

@@ -33,7 +33,7 @@ public final class JS5ReadEvent extends IoReadEvent {
 			switch (opcode) {
 			case 0:
 			case 1:
-				int request = ByteBufferUtils.getTriByte(buffer);
+				int request = ByteBufferUtils.getMedium(buffer);
 				//System.out.println("Requested file " + request);
 				int container = request >> 16 & 0xFF;
 				//System.out.println("In container " + container);
@@ -62,7 +62,7 @@ public final class JS5ReadEvent extends IoReadEvent {
 				buffer.getInt();
 				break;
 			case 6:
-				ByteBufferUtils.getTriByte(buffer); // Value should be 3
+				ByteBufferUtils.getMedium(buffer); // Value should be 3
 				// buffer.getShort(); // Value should be 0
 				break;
 			case 7:

Server/src/main/java/core/tools/CP1252.java

@@ -0,0 +1,23 @@
+package core.tools;
+
+public class CP1252 {
+    private static char[] charMap = {'\u20ac', '\0', '\u201a', '\u0192', '\u201e', '\u2026', '\u2020', '\u2021',
+            '\u02c6', '\u2030', '\u0160', '\u2039', '\u0152', '\0', '\u017d', '\0', '\0', '\u2018', '\u2019',
+            '\u201c', '\u201d', '\u2022', '\u2013', '\u2014', '\u02dc', '\u2122', '\u0161', '\u203a', '\u0153',
+            '\0', '\u017e', '\u0178'};
+
+    public static char getFromByte(byte value) {
+        int out = value & 0xff;
+        if (out == 0) {
+            throw new IllegalArgumentException("Non cp1252 character 0x" + Integer.toString(out, 16) + " provided");
+        }
+        if (out >= 128 && out < 160) {
+            int cp1252 = charMap[out - 128];
+            if (cp1252 == 0) {
+                cp1252 = 63;
+            }
+            out = cp1252;
+        }
+        return (char) out;
+    }
+}

Server/src/main/kotlin/rs09/game/interaction/QCRepository.kt

@@ -1,6 +1,7 @@
 package rs09.game.interaction
 
 import core.cache.Cache
+import core.cache.def.impl.DataMap
 import core.cache.def.impl.ItemDefinition
 import core.cache.def.impl.NPCDefinition
 import core.cache.misc.buffer.ByteBufferUtils
@@ -21,37 +22,7 @@ import java.nio.ByteBuffer
  * Handles the sending of quick chat messages and string-replacement for specific messages.
  * @author Ceikry
  */
-//TODO: A lot of the menus defined in the massive arrays at the bottom need to be rearranged because the order they appear in the menu and the order they are actually in is quite different. Start clicking through the "can you cook me..." menu to see what I mean.
-//TODO: I've done the groundwork, Please someone else take up the task of rearranging these menus
 object QCRepository {
-
-    val skillIDs = mapOf(
-            0 to "Agility",
-            1 to "Attack",
-            2 to "Construction",
-            3 to "Cooking",
-            4 to "Crafting",
-            5 to "Defence",
-            6 to "Farming",
-            7 to "Firemaking",
-            8 to "Fishing",
-            9 to "Fletching",
-            10 to "Herblore",
-            11 to "Hitpoints",
-            12 to "Hunter",
-            13 to "Thieving",
-            14 to "Summoning",
-            15 to "Strength",
-            16 to "Smithing",
-            19 to "Slayer",
-            20 to "Runecrafting",
-            21 to "Ranged",
-            22 to "Prayer",
-            23 to "Mining",
-            24 to "Magic",
-            25 to "Woodcutting"
-    )
-
     private val quickChatIndex = Cache.getIndexes()[24]
 
     /**
@@ -62,8 +33,8 @@ object QCRepository {
         val index = getIndex(offset, multiplier)
         player?.setAttribute("qc_offset", offset) //Slapping this in an attribute because it's only useful for one or two messages
         val qcString = when(packetType){
-            QCPacketType.SINGLE -> getSingleQC(player, index, selection_a_index)
-            QCPacketType.DOUBLE -> getDoubleQC(player, index, selection_a_index, selection_b_index)
+            QCPacketType.SINGLE -> getSingleQC(index, selection_a_index)
+            QCPacketType.DOUBLE -> getDoubleQC(index, selection_a_index, selection_b_index)
             QCPacketType.STANDARD -> getStandardQC(player, index)
             else -> ""
         }
@@ -96,9 +67,9 @@ object QCRepository {
         
         //XP to next level
         if (qcString.contains("to get my next")) {
-            val offset = player?.getAttribute("qc_offset", 0) ?: 0
-            val skillName = skillIDs[offset - 103]
-            val skill = Skills.getSkillByName(skillName?.toUpperCase())
+            val split = qcString.split(" ")
+            val skillName = split[split.size - 2]
+            val skill = Skills.getSkillByName(skillName.toUpperCase())
             val playerXP = player?.skills?.getExperience(skill)
             val playerLevel = player?.skills?.getStaticLevel(skill)
             val nextXP = player?.skills?.getExperienceByLevel(playerLevel?.plus(1) ?: 1)
@@ -130,7 +101,7 @@ object QCRepository {
      * For Single-replacement quick chat messages with one replacement selection
      */
     @JvmStatic
-    fun getSingleQC(player: Player?, index: Int, selectionIndex: Int): String{
+    fun getSingleQC(index: Int, selectionIndex: Int): String{
         var qcString = getQCString(index)
 
         //Messages that include items
@@ -141,184 +112,185 @@ object QCRepository {
 
         //Loan duration
         else if (qcString.contains("I'd like the loan duration to be")){
-            qcString = when(selectionIndex){
-                0 -> qcString.replace("<", "just until one of us logs out")
-                else -> qcString.replace("<", "${selectionIndex} hours")
-            }
+            qcString = qcString.replace("<", getFromMap(1642, selectionIndex))
         }
 
         //Go to agility course / Try training your agility at
         else if (qcString.contains("Let's go to Agility course:") || qcString.contains("Try training your Agility at:")){
-            qcString = qcString.replace("<", AGILITY_COURSES[selectionIndex])
+            qcString = qcString.replace("<", getFromMap(1505, selectionIndex))
         }
 
         //Try training on
         else if(qcString.contains("Try training on")){
-            qcString = qcString.replace("<", TRAIN_MELEE_NPCS[selectionIndex])
+            qcString = qcString.replace("<", getFromMap(1524, selectionIndex))
         }
 
         //Try ranging
         else if(qcString.contains("Try ranging")){
-            qcString = qcString.replace("<", TRAIN_RANGE_NPCS[selectionIndex])
+            qcString = qcString.replace("<", getFromMap(1525, selectionIndex))
         }
 
         //flat-pack
         else if(qcString.contains("flat-pack")){
-            qcString = qcString.replace("<", FLATPAKS[selectionIndex])
+            qcString = qcString.replace("<", getFromMap(1490, selectionIndex))
         }
 
         //Cooking
         else if(qcString.contains("I'm cooking") || qcString.contains("Would you please cook me") || qcString.contains("Try cooking")){
-            qcString = qcString.replace("<", COOK_ITEMS[selectionIndex])
+            qcString = qcString.replace("<", getFromMap(1492, selectionIndex))
         }
 
         //Crafting
         else if(qcString.contains("I am crafting") || qcString.contains("Try crafting") || qcString.contains("Would you please craft me")){
-            qcString = qcString.replace("<", CRAFT_ITEMS[selectionIndex])
+            qcString = qcString.replace("<", getFromMap(1493, selectionIndex))
         }
 
         //Farming
         else if(qcString.contains("I'm growing crop") || qcString.contains("Try growing crop")){
-            qcString = qcString.replace("<", FARM_CROPS[selectionIndex])
+            qcString = qcString.replace("<", getFromMap(1494, selectionIndex))
         }
 
         //I'm burning logs...
         else if(qcString.contains("I'm burning logs")){
-            qcString = qcString.replace("<", FM_LOGS[selectionIndex])
+            qcString = qcString.replace("<", getFromMap(1495, selectionIndex))
         }
 
         //Try burning logs at
         else if(qcString.contains("Try burning logs at")){
-            qcString = qcString.replace("<", FM_LOCATIONS[selectionIndex])
+            qcString = qcString.replace("<", getFromMap(1544, selectionIndex))
         }
 
         //Fishing
         else if(qcString.contains("I'm fishing") || qcString.contains("Would you please fish me") || qcString.contains("Try fishing for")){
-            qcString = qcString.replace("<", FISH[selectionIndex])
+            qcString = qcString.replace("<", getFromMap(1491, selectionIndex))
         }
 
         //Fletching
         else if(qcString.contains("I'm fletching") || qcString.contains("Try fletching") || qcString.contains("Would you please fetch me")){
-            qcString = qcString.replace("<", FLETCH_ITEMS[selectionIndex])
+            qcString = qcString.replace("<", getFromMap(1496, selectionIndex))
         }
 
         //Herblore
         else if(qcString.contains("I'm mixing potion") || qcString.contains("Would you please mix me a potion") || qcString.contains("Try mixing potion")){
-            qcString = qcString.replace("<", HERB_POTIONS[selectionIndex])
+            qcString = qcString.replace("<", getFromMap(1526, selectionIndex))
         }
 
         //Herblore secondaries
         else if(qcString.contains("Where can I get the secondary ingredient")){
-            qcString = qcString.replace("<", HERB_SECONDARIES[selectionIndex])
+            qcString = qcString.replace("<", getFromMap(1516, selectionIndex))
         }
 
         //Hunter
         else if(qcString.contains("Would you please hunt me") || qcString.contains("Try hunting")){
-            qcString = qcString.replace("<", HUNTER_ANIMALS[selectionIndex])
+            qcString = qcString.replace("<", getFromMap(1543, selectionIndex))
         }
 
         //Casting spell
         else if(qcString.contains("I'm casting spell") || qcString.contains("Would you please cast")){
-            qcString = qcString.replace("<", MAGIC_SPELLS[selectionIndex])
+            qcString = qcString.replace("<", getFromMap(1527, selectionIndex))
         }
 
         //Spellbook
         else if(qcString.contains("I am on spell book")){
-            qcString = qcString.replace("<", MAGIC_BOOKS[selectionIndex])
+            qcString = qcString.replace("<", getFromMap(1528, selectionIndex))
         }
 
         //Mining ore
         else if(qcString.contains("I'm mining ore")){
-            qcString = qcString.replace("<", ORES[selectionIndex])
+            qcString = qcString.replace("<", getFromMap(1529, selectionIndex))
         }
 
         //Pickaxe using
         else if(qcString.contains("I'm using a pick")){
-            qcString = qcString.replace("<", PICKAXE_TYPES[selectionIndex])
+            qcString = qcString.replace("<", getFromMap(1531, selectionIndex))
         }
 
         //Try mining at
         else if(qcString.contains("Try mining at")){
-            qcString = qcString.replace("<", MINING_LOCATIONS[selectionIndex])
+            qcString = qcString.replace("<", getFromMap(1533, selectionIndex))
         }
 
         //Use your prayer
         else if(qcString.contains("Use your prayer")){
-            qcString = qcString.replace("<", PRAYERS[selectionIndex])
+            qcString = qcString.replace("<", getFromMap(1534, selectionIndex))
         }
 
         //i'm going to craft rune
         else if(qcString.contains("I'm going to craft rune")){
-            qcString = qcString.replace("<", RUNES[selectionIndex])
+            qcString = qcString.replace("<", getFromMap(1535, selectionIndex))
         }
 
         //try crafting runes at
         else if(qcString.contains("Try crafting runes at")){
-            qcString = qcString.replace("<", RC_LOCATIONS[selectionIndex])
+            qcString = qcString.replace("<", getFromMap(1536, selectionIndex))
         }
 
         //Slayer master in
         else if(qcString.contains("You should use the Slayer master in")){
-            qcString = qcString.replace("<", SLAYER_LOCATIONS[selectionIndex])
+            qcString = qcString.replace("<", getFromMap(2139, selectionIndex))
         }
 
         //Spare slayer equipment
         else if(qcString.contains("Do you have spare Slayer equipment")){
-            qcString = qcString.replace("<", SLAYER_EQUIPMENT[selectionIndex])
+            qcString = qcString.replace("<", getFromMap(1538, selectionIndex))
         }
 
         //familiars
         else if(qcString.contains("I like the familiar") || qcString.contains("I can summon up to")){
-            qcString = qcString.replace("<", FAMILIARS[selectionIndex])
+            qcString = qcString.replace("<", getFromMap(1539, selectionIndex))
         }
 
         //charm droppers
         else if(qcString.contains("Good charm droppers are")){
-            qcString = qcString.replace("<", CHARM_DROPPERS[selectionIndex])
+            qcString = qcString.replace("<", getFromMap(1499, selectionIndex))
         }
 
         //Thieving
         else if(qcString.contains("Try thieving from")){
-            qcString = qcString.replace("<", THIEVE_TARGETS[selectionIndex])
+            qcString = qcString.replace("<", getFromMap(1540, selectionIndex))
         }
 
         //Axe made of
         else if(qcString.contains("I'm using a woodcutting axe made")){
-            qcString = qcString.replace("<", AXE_TYPES[selectionIndex])
+            qcString = qcString.replace("<", getFromMap(1532, selectionIndex))
         }
 
         //Try training woodcutting at
         else if(qcString.contains("Try training Woodcutting at")){
-            qcString = qcString.replace("<", WOODCUTTING_LOCATIONS[selectionIndex])
+            qcString = qcString.replace("<", getFromMap(1500, selectionIndex))
         }
 
         //Nice level in
         else if(qcString.contains("Nice level in")){
-            qcString = qcString.replace("<", SKILL_NAMES[selectionIndex])
+            qcString = qcString.replace("<", getFromMap(1517, selectionIndex))
         }
 
 
         return qcString
     }
 
+    fun getFromMap(map: Int, index: Int): String
+    {
+        return DataMap.get(map).getString(index)
+    }
 
     /**
      * For Double-replacement quick chat messages with 2 selection replacements.
      */
     @JvmStatic
-    fun getDoubleQC(player: Player?, index: Int, selection_a_index: Int, selection_b_index: Int): String{
+    fun getDoubleQC(index: Int, selection_a_index: Int, selection_b_index: Int): String{
         var qcString = getQCString(index)
 
         //Giving directions: That is _ of _
         if(qcString.contains("That is < of <")){
-            qcString = qcString.replaceFirst("<", DIRECTIONS[selection_a_index])
-            qcString = qcString.replaceFirst("<", DIR_LOCATIONS[selection_b_index])
+            qcString = qcString.replaceFirst("<", getFromMap(1502, selection_a_index))
+            qcString = qcString.replaceFirst("<", getFromMap(1504, selection_b_index))
         }
 
         //Smithing
         else if(qcString.contains("I am smithing") || qcString.contains("Try smithing") || qcString.contains("Would you please smith me")){
-            qcString = qcString.replaceFirst("<", SMITHING_BARTYPES[selection_a_index])
-            qcString = qcString.replaceFirst("<", SMITHING_PRODUCTS[selection_b_index])
+            qcString = qcString.replaceFirst("<", getFromMap(1530, selection_a_index))
+            qcString = qcString.replaceFirst("<", getFromMap(1498, selection_b_index))
         }
 
         return qcString
@@ -341,41 +313,6 @@ object QCRepository {
     }
 
     private fun getQCString(index: Int): String{
-        return ByteBufferUtils.getString(ByteBuffer.wrap(QCRepository.quickChatIndex.getFileData(1, index)))
+        return ByteBufferUtils.getString(ByteBuffer.wrap(quickChatIndex.getFileData(1, index)))
     }
-}
-
-private val AGILITY_COURSES: Array<String> = arrayOf("Agility Pyramid", "Ape Atoll", "Barbarian Outpost", "Brimhaven Agility Arena", "Dorgesh-Kaan", "Gnome Stronghold Course", "Penguin Course", "Werewolf Agility Course", "Wilderness Course", "Gnome Ball", "Werewolf Skullball")
-private val TRAIN_MELEE_NPCS: Array<String> = arrayOf("black demons", "blue dragons", "chickens", "cows", "cyclopes", "dagannoths", "experiments", "fire giants", "goblins", "guards", "hill giants", "ice giants", "lesser demons", "moss giants", "Slayer creatures")
-private val TRAIN_RANGE_NPCS: Array<String> = arrayOf("barbarians", "black demons", "blue dragons", "chickens", "cows", "dark wizards", "dwarves", "fire giants", "goblins", "guards", "hill giants", "lesser demons", "moss giants", "rats", "zombies")
-private val FLATPAKS: Array<String> = arrayOf("Asgarnian Ale barrel", "beer barrel", "carved oak bench", "carved oak dining table", "carved oak magic wardrobe", "carved teak bench", "carved teak magic wardrobe", "carved teak table", "Chef's Delight barrel", "cider barrel", "crude wooden chair", "Dragon Bitter barrel", "fancy teak dresser", "four-poster bed", "gilded bench", "gilded cape rack", "gilded clock", "gilded dresser", "gilded four-poster bed", "gilded magic wardrobe", "gilded wardrobe", "Greenman's Ale barrel", "large oak bed", "large teak bed", "magical cape rack", "mahogany armchair", "mahogany armour case", "mahogany bench", "mahogany bookcase", "mahogany cape rack", "mahogany costume box", "mahogany dresser", "mahogany magic wardrobe", "mahogany table", "mahogany toy box", "mahogany treasure chest", "mahogany wardrobe", "marble cape rack", "marble magic wardrobe", "oak armchair", "oak armour case", "oak bed", "oak bench", "oak bookcase", "oak cape rack", "oak chair", "oak clock", "oak costume box", "oak dining table", "oak drawers", "oak dresser", "oak kitchen table", "oak magic wardrobe", "oak shaving stand", "oak toy box", "oak treasure chest", "oak wardrobe", "opulent table", "rocking chair", "shaving stand", "shoe box", "teak armchair", "teak armour case", "teak bed", "teak cape rack", "teak clock", "teak costume box", "teak dining bench", "teak drawers", "teak dresser", "teak kitchen table", "teak magic wardrobe", "teak table", "teak toy box", "teak treasure chest", "teak wardrobe", "wooden bed", "wooden bench", "wooden bookcase", "wooden chair", "wooden dining table", "wooden kitchen table")
-private val COOK_ITEMS: Array<String> = arrayOf("admiral pie", "anchovies", "anchovy pizza", "apple pie", "bass", "bear meat", "bread", "bird meat", "cake", "cave eel", "cheese and tomato batta", "chicken", "chilli con carne", "chilli potato", "choc chip crunchies", "chocolate bomb", "chocolate cake", "chompy", "cod", "cooked pawya", "cooked rabbit", "crab meat", "crayfish", "curry", "egg and tomato", "egg and tomato potato", "fat snail", "fish pie", "fishcake", "fried mushrooms", "fried onions", "fruit batta", "garden pie", "herring", "jubbly", "karambwan", "karambwanji", "lava eel", "lean snail", "leaping salmon", "leaping sturgeon", "leaping trout", "lobster", "mackerel", "manta ray", "meat", "meat pie", "meat pizza", "monkfish", "mud pie", "mushroom and onion", "mushroom and onion potato", "oomlie wrap", "pawya", "pike", "pineapple pizza", "pitta bread", "plain pizza", "potato", "rabbit", "rainbow fish", "rat meat", "redberry pie", "roasted beast meat", "roasted rabbit", "baked potato with butter", "salmon", "sardine", "baked potato", "scrambled egg", "sea turtle", "seaweed", "shark", "shrimp", "slimy eel", "spice crunchies", "spicy meat", "spicy sauce", "spider on a stick", "stew", "summer pie", "sweetcorn", "swordfish", "tangled toads' legs", "thin snail", "toad batta", "toad crunchies", "trout", "tuna", "tuna and corn", "tuna and corn potato", "ugthanki kebab", "ugthanki meat", "vegball", "vegetable ball", "vegetable batta", "wild pie", "worm batta", "worm crunchies", "worm hole")
-private val CRAFT_ITEMS: Array<String> = arrayOf("air battlestaves", "balls of wool", "baskets", "beer glasses", "black dragonhide bodies", "black dragonhide chaps", "black dragonhide vambraces", "black spiked vambraces", "blue dragonhide bodies", "blue dragonhide chaps", "blue dragonhide vambraces", "blue spiked vambraces", "bowls", "bowstrings", "bullseye lanterns", "candle lanterns", "cloth", "coifs", "crossbow strings", "diamond amulets", "diamond bracelets", "diamond necklaces", "diamond rings", "diamonds", "Dorgeshuun light orbs", "dragonstone amulets", "dragonstone bracelets", "dragonstone necklaces", "dragonstone rings", "dragonstones", "earth battlestaves", "emerald amulets", "emerald bracelets", "emerald necklaces", "emerald rings", "emeralds", "feather headdresses", "fire battlestaves", "fishbowls", "fremennik round shields", "glass orbs", "gold amulets", "gold bracelets", "gold necklaces", "gold rings", "green dragonhide bodies", "green dragonhide chaps", "green dragonhide vambraces", "green spiked vambraces", "hard leather bodies", "holy symbols", "leather bodies", "leather boots", "leather chaps", "leather cowls", "leather gloves", "leather vambraces", "lightning conductors", "limestone bricks", "magic string", "oil lamps", "oil lanterns", "onyx", "onyx amulets", "onyx bracelets", "onyx necklaces", "onyx rings", "pie dishes", "plant pots", "pot lids", "pots", "red dragonhide bodies", "red dragonhide chaps", "red dragonhide vambraces", "red spiked vambraces", "rope", "rubies", "ruby amulets", "ruby bracelets", "ruby necklaces", "ruby rings", "sacks", "sapphire amulets", "sapphire bracelets", "sapphire necklaces", "sapphire rings", "sapphires", "silver bolts", "silver sickles", "snakeskin bandannas", "snakeskin bodies", "snakeskin boots", "snakeskin chaps", "snakeskin vambraces", "snelms", "spiked vambraces", "studded bodies", "studded leather chaps", "tiaras", "unholy symbols", "unpowered orbs", "vials", "water battlestaves", "yak-hide bodies", "yak-hide legs")
-private val FARM_CROPS: Array<String> = arrayOf("apples", "Asgarnian hops", "avantoe", "bananas", "barley", "bittercap mushrooms", "cabbages", "cacti", "cadantine", "cadavaberries", "calquats", "coconuts", "curry leaves", "deadly nightshade", "dwarf weed", "dwellberries", "evil turnips", "goutweed", "guam", "hammerstone hops", "harralander", "irit", "jade vine", "jangerberries", "jute fiber", "Krandorian hops", "kwuarm", "lantadyme", "limpwurt roots", "magic trees", "maple trees", "marigolds", "marrentill", "nasturtium", "oak trees", "onions", "oranges", "papayas", "pineapples", "poison ivy berries", "potatoes", "ranarr", "redberries", "rosemary", "snapdragon", "spirit trees", "spirit weed", "strawberries", "sweetcorn", "tarromin", "toadflax", "tomatoes", "torstol", "watermelons", "whiteberries", "wildblood hops", "willow trees", "woad leaves", "Yanillian hops", "yew trees")
-private val FM_LOGS: Array<String> = arrayOf("achey", "arctic pine", "eucalyptus", "logs", "magic", "mahogany", "maple", "oak", "teak", "willow", "yew")
-private val FM_LOCATIONS: Array<String> = arrayOf("Draynor Village", "Falador east bank", "Fishing Colony", "Oo'glog", "Port Phasmatys", "Yanille")
-private val FISH: Array<String> = arrayOf("anchovies", "bass", "caskets", "cave eel", "cod", "crayfish", "frog spawn", "herring", "karambwan", "karambwanji", "lava eel", "leaping salmon", "leaping sturgeon", "leaping trout", "lobster", "mackerel", "manta ray", "monkfish", "oysters", "pike", "rainbow fish", "salmon", "sardine", "sea turtle", "seaweed", "shark", "shrimp", "slimy eel", "swordfish", "trout", "tuna")
-private val FLETCH_ITEMS: Array<String> = arrayOf("adamant arrows", "adamant bolts", "adamant brutal arrows", "adamant crossbows", "adamant darts", "arrow shafts", "barbed bolts", "black brutal arrows", "blurite bolts", "blurite crossbows", "bronze arrows", "bronze bolts", "bronze brutal arrows", "bronze crossbows", "bronze darts", "composite ogre bows", "crossbow stocks", "diamond bolts", "dragon arrows", "dragon darts", "dragonstone bolts", "emerald bolts", "flighted ogre arrows", "headless arrows", "iron arrows", "iron bolts", "iron brutal arrows", "iron crossbows", "iron darts", "jade bolts", "longbows", "magic longbows", "magic shortbows", "mahogany crossbow stocks", "maple crossbow stocks", "maple longbows", "maple shortbows", "mithril arrows", "mithril bolts", "mithril brutal arrows", "mithril crossbows", "mithril darts", "mithril grapples", "oak crossbow stocks", "oak longbows", "oak shortbows", "ogre arrow shafts", "ogre arrows", "onyx bolts", "opal bolts", "pearl bolts", "red topaz bolts", "ruby bolts", "rune arrows", "rune bolts", "rune brutal arrows", "rune crossbows", "rune darts", "sapphire bolts", "shortbows", "silver bolts", "steel arrows", "steel bolts", "steel brutal arrows", "steel crossbows", "steel darts", "teak crossbow stocks", "willow crossbow stocks", "willow longbows", "willow shortbows", "yew crossbow stocks", "yew longbows", "yew shortbows")
-private val HERB_POTIONS: Array<String> = arrayOf("Agility potion", "Anti fire-breath potion", "Antipoison", "Attack potion", "Blamish oil", "Combat potion", "Defence potion", "Energy potion", "Fishing potion", "Guthix Balance", "Hunter potion", "Magic essence potion", "Magic potion", "Prayer restore", "Ranging potion", "Relicym's Balm", "Restore potion", "Sanfew Serum", "Saradomin Brew", "Strength potion", "Summoning potion", "Super antipoison", "Super antipoison+", "Super antipoison++", "Super Attack potion", "Super Defence potion", " Super energy potion", "Super fishing explosive", "Super restore potion", "Super Strength potion", "Weapon poison", "Weapon poison+", "Weapon poison++", "Zamorak Brew")
-private val HERB_SECONDARIES: Array<String> = arrayOf("blamish snail slime", "cactus spine", "chocolate dust", "cockatrice egg", "crushed nest", "deadly nightshade", "eye of newt", "garlic", "ground blue dragon scale", "ground goat's horn", "ground gorak claw", "ground unicorn horn", "jangerberries", "kebbit teeth dust", "limpwurt root", "magic tree roots", "Mort Myre fungi", "nail beast nails", "poison ivy berries", "potato cactus", "red spiders' eggs", "rubium", "silver dust", "snake weed", "snape grass", "toad's legs", "white berries", "wine of Zamorak", "yew roots")
-private val HUNTER_ANIMALS: Array<String> = arrayOf("baby impling", "barbtailed kebbit", "black salamander", "black warlock", "cerulean twitch", "chinchompa", "common kebbit", "copper longtail", "crimson swift", "dark kebbit", "dashing kebbit", "desert devil", "dragon impling", "earth impling", "eclectic impling", "essence impling", "Feldip weasel", "ferret", "golden warbler", "gourmet impling", "grenwall", "horned graahk", "imp", "magpie impling", "nature impling", "ninja impling", "orange salamander", "pawya", "polar kebbit", "prickly kebbit", "rabbit", "razorbacked kebbit", "red chinchompa", "red salamander", "ruby harvest", "sabretooth kebbit", "sabretooth kyatt", "sapphire glacialis", "snowy knight", "spined larupia", "spotted kebbit", "swamp lizard", "tropical wagtail", "wild kebbit", "young impling")
-private val MAGIC_SPELLS: Array<String> = arrayOf("Annakarl Teleport", "Ape Atoll Teleport", "Ardougne Teleport", "Bake Pie", "Barbarian Teleport", "Bind", "Blood Barrage", "Blood Blitz", "Blood Burst", "Blood Rush", "Bones to Bananas", "Bones to Peaches", "Boost Potion Share", "Bounty Locate", "Camelot Teleport", "Carrallangar Teleport", "Catherby Teleport", "Charge", "Charge Air Orb", "Charge Earth Orb", "Charge Fire Orb", "Charge Water Orb", "Claws of Guthix", "Confuse", "Crumble Undead", "Cure Group", "Cure Me", "Cure Other", "Cure Plant", "Curse", "Dareeyak Teleport", "Dream", "Earth Blast", "Earth Bolt", "Earth Strike", "Earth Wave", "Enchant 1 - Sapphire", "Enchant 2 - Emerald", "Enchant 3 - Ruby", "Enchant 4 - Diamond", "Enchant 5 - Dragonstone", "Enchant 6 - Onyx", "Enchant Bolt", "Energy Transfer", "Enfeeble", "Entangle", "Falador Teleport", "Fertilise Soil", "Fire Blast", "Fire Bolt", "Fire Strike", "Fire Wave", "Fishing Guild Teleport", "Flames of Zamorak", "Ghorrock Teleport", "Heal Group", "Heal Other", "High Level Alchemy", "Home Teleport", "House Teleport", "Humidify", "Hunter Kit", "Iban Blast", "Ice Barrage", "Ice Blitz", "Ice Burst", "Ice Plateau Teleport", "Ice Rush", "Kharyll Teleport", "Khazard Teleport", "Lassar Teleport", "Low Level Alchemy", "Lumbridge Teleport", "Magic Dart", "Magic Imbue", "Monster Examine", "Moonclan Teleport", "NPC Contact", "Ourania Teleport", "Paddewwa Teleport", "Plank Make", "Saradomin Strike", "Senntisten Teleport", "Shadow Barrage", "Shadow Blitz", "Shadow Burst", "Shadow Rush", "Smoke Barrage", "Smoke Blitz", "Smoke Burst", "Smoke Rush", "Snare", "Spellbook Swap", "Stat Restore Pot Share", "Stat Spy", "String Jewellery", "Stun", "Superglass Make", "Superheat Item", "Tele Group Barbarian", "Tele Group Catherby", "Tele Group Fishing Guild", "Tele Group Ice Plateau", "Tele Group Khazard", "Tele Group Moonclan", "Tele Group Waterbirth", "Telegrab", "Teleother Camelot", "Teleother Falador", "Teleother Lumbridge", "Trollheim Teleport", "Varrock Teleport", "Vengeance", "Vengeance Other", "Vulnerability", "Watchtower Teleport", "Water Blast", "Water Bolt", "Water Strike", "Water Wave", "Waterbirth Teleport", "Weaken", "Wind Blast", "Wind Bolt", "Wind Strike", "Wind Wave")
-private val MAGIC_BOOKS: Array<String> = arrayOf("Standard", "Ancients", "Lunar")
-private val ORES: Array<String> = arrayOf("adamantite", "blurite", "clay", "coal", "copper", "elemental", "gold", "granite", "iron", "limestone", "mithril", "obsidian", "pure essence", "rubium", "rune essence", "runite", "sandstone", "silver", "tin")
-private val MINING_LOCATIONS: Array<String> = arrayOf("Ardougne south", "Barbarian village", "Brimhaven north-west", "Brimhaven south-west", "Brimhaven volcano gold mine", "Coal Trucks", "Crafting Guild", "Crandor Isle", "Dorgeshuun mine", "Dwarven Mine", "East of Ardougne", "Edgeville", "Edgeville dungeon mine", "Elemental Workshop", "Fremennik Isles mine", "Grand Tree", "Haunted Mine", "Heroes' Guild", "Ice Caves", "Keldagrim", "Kharid Scorpion chasm", "Lumbridge Caves", "Lumbridge swamp", "Lunar Isle", "Mining Guild", "North of Yanille", "Piscatoris", "Port Khazard", "Rimmington", "Shilo Village gem mine", "TzHaar City", "Varrock south-east", "Varrock south-west", "Wilderness Hobgoblins' mine", "Wilderness Lava Maze", "Wilderness Pirates' mine", "Wilderness runite mine")
-private val PRAYERS: Array<String> = arrayOf("Burst of Strength", "Chivalry", "Clarity of Thought", "Eagle Eye", "Hawk Eye", "Improved Reflexes", "Incredible Reflexes", "Mystic Lore", "Mystic Might", "Mystic Will", "Piety", "Protect from Magic", "Protect from Melee", "Protect from Missiles", "Protect from Summoning", "Protect Item", "Rapid Heal", "Rapid Restore", "Redemption", "Retribution", "Rock Skin", "Sharp Eye", "Smite", "Steel Skin", "Superhuman Strength", "Thick Skin", "Ultimate Strength")
-private val RUNES: Array<String> = arrayOf("air runes", "astral runes", "blood runes", "body runes", "chaos runes", "cosmic runes", "death runes", "dust runes", "earth runes", "fire runes", "lava runes", "law runes", "mind runes", "mist runes", "mud runes", "nature runes", "smoke runes", "soul runes", "steam runes", "water runes")
-private val RC_LOCATIONS: Array<String> = arrayOf("Air Altar", "Astral Altar", "Blood Altar", "Body Altar", "Chaos Altar", "Cosmic Altar", "Death Altar", "Earth Altar", "Fire Altar", "Law Altar", "Mind Altar", "Nature Altar", "Ourania Altar", "Water Altar")
-private val SLAYER_LOCATIONS: Array<String> = arrayOf("Burthorpe", "Canifis", "Edgeville Dungeon", "Pollnivneach", "Shilo Village", "Zanaris")
-private val FAMILIARS: Array<String> = arrayOf("abyssal lurker", "abyssal parasite", "abyssal titan", "adamant minotaur", "albino rat", "arctic bear", "barker toad", "beaver", "bloated leech", "bronze minotaur", "bull ant", "bunyip", "compost mound", "desert wyrm", "dreadfowl", "evil turnip", "fire titan", "forge regent", "fruit bat", "geyser titan", "giant chinchompa", "giant ent", "granite crab", "granite lobster", "honey badger", "hydra", "ibis", "ice titan", "iron minotaur", "iron titan", "karamthulhu overlord", "lava titan", "macaw", "magpie", "mithril minotaur", "moss titan", "obsidian golem", "pack yak", "phoenix", "praying mantis", "pyrelord", "ravenous locust", "rune minotaur", "smoke devil", "spirit cobra", "spirit cockatrice", "spirit coraxatrice", "spirit dagannoth", "spirit graahk", "spirit guthatrice", "spirit jelly", "spirit kalphite", "spirit kyatt", "spirit larupia", "spirit mosquito", "spirit pengatrice", "spirit saratrice", "spirit scorpion", "spirit spider", "spirit terrorbird", "spirit Tz-Kih", "spirit vulatrice", "spirit wolf", "spirit zamatrice", "steel minotaur", "steel titan", "stranger plant", "swamp titan", "talon beast", "thorny snail", "unicorn stallion", "vampire bat", "void ravager", "void shifter", "void spinner", "void torcher", "war tortoise", "wolpertinger")
-private val CHARM_DROPPERS: Array<String> = arrayOf("basilisks", "bloodvelds", "dust devils", "fire giants", "ice giants", "ice warriors", "jogres", "ogres", "rock crabs", "rock lobsters", "waterfiends", "wolves")
-private val THIEVE_TARGETS: Array<String> = arrayOf("bearded Pollnivnian bandits", "cave goblins", "chests", "desert bandits", "elves", "farmers", "Fremenniks", "gnomes", "guards", "H.A.M. members", "heroes", "knights", "master farmers", "men and women", "Menaphite thugs", "paladins", "Pollnivnian bandits", "rogues", "stalls", "warriors", "watchmen")
-private val PICKAXE_TYPES: Array<String> = arrayOf("adamant", "bronze", "iron", "mithril", "rune", "steel")
-private val AXE_TYPES: Array<String> = arrayOf("adamant", "black", "bronze", "dragon", "iron", "mithril", "rune", "steel")
-private val WOODCUTTING_LOCATIONS: Array<String> = arrayOf("Ape Atoll", "Draynor", "Edgeville", "Gnome Stronghold", "Isafdar", "Kharazi Jungle", "Mage Training Area", "Neitiznot", "Piscatoris", "Seers' Village", "Seers' Village cemetery", "Sinclair Mansion", "Sorcerer's Tower", "South of Castle Wars", "South of Falador", "South of the Lumberyard", "Tai Bwo Bwannai", "Uzer", "Varrock Palace", "West of Barbarian Assault", "West of Catherby", "West of Lumbridge Castle", "West of Oo'glog")
-private val SLAYER_EQUIPMENT: Array<String> = arrayOf("a bug lantern", "a crystal chime", "a face mask", "a mirror shield", "a nosepeg", "a Slayer bell", "a spiny helmet", "a witchwood icon", "an enchanted gem", "bags of salt", "broad arrows", "earmuffs", "Fishing explosives", "fungicide spray", "ice coolers", "insulated boots", "leaf-bladed spear", "rock hammers", "Slayer gloves", "Slayer staff", "super fishing explosive")
-private val DIRECTIONS: Array<String> = arrayOf("north", "south", "east", "west", "north-east", "north-west", "south-east", "south-west")
-private val DIR_LOCATIONS: Array<String> = arrayOf("Al Kharid", "Ape Atoll", "Ardougne (East)", "Ardougne (West)", "Barbarian Village", "Braindeath Island", "Brimhaven", "BUrdh de Rott", "Burthorpe", "Camelot", "Canifis", "Catherby", "Crandor", "Dorgesh-Kaan", "Draynor Manor", "Draynor Village", "Edgeville", "Entrana", "Etceteria", "Falador", "Goblin Village", "God Wars Dungeon", "Grand Exchange", "Gu'Tanoth", "Harmony Island", "Hemenster", "Isafdar", "Jatizso", "Kalphite Lair", "Karamja", "Keldagrim", "Lletya", "Lumbridge", "Lunar Isle", "Meiyerditch", "Miscellania", "Mort'ton", "Mos Le Harmless", "Nardah", "Neitiznot", "Oo'glog", "Paterdomus", "Piscatoris", "Pollnivneach", "Port Khazard", "Port Phasmatys", "Port Sarim", "Rellekka", "Rimmington", "Seers' Village", "Shilo Village", "Sophanem", "Tai Bwo Wannai Village", "Taverley", "Tree Gnome Stronghold", "Tree Gnome Village", "Troll Stronghold", "TzHaar city", "Varrock", "Waterbirth Island", "Witchaven", "Yanille", "Zanaris")
-private val SKILL_NAMES: Array<String> = arrayOf("Agility", "Attack", "Construction", "Cooking", "Crafting", "Defence", "Farming", "Firemaking", "Fishing", "Fletching", "Herblore", "Hitpoints", "Hunter", "Magic", "Mining", "Prayer", "Ranged", "Runecrafting", "Slayer", "Smithing", "Strength", "Summoning", "Thieving", "Woodcutting")
-private val SMITHING_BARTYPES: Array<String> = arrayOf("adamant", "blurite", "bronze", "iron", "item", "mithril", "rune", "steel")
-private val SMITHING_PRODUCTS: Array<String> = arrayOf("arrow tips", "axes", "battleaxes", "bolts", "bullseye lantern frames", "cannonballs", "chainbodies", "claws", "crossbow limbs", "daggers", "dart tips", "full helms", "grapple tips", "hastae", "kite shields", "longswords", "maces", "medium helms", "nails", "oil lantern frames", "pickaxes", "platebodies", "platelegs", "plateskirts", "scimitars", "short swords", "spears", "spits", "square shields", "studs", "throwing knives", "two-handed swords", "warhammers", "wire")
+}

Server/src/main/kotlin/rs09/game/system/command/sets/DevelopmentCommandSet.kt

@@ -2,23 +2,25 @@ package rs09.game.system.command.sets
 
 import api.sendMessage
 import core.cache.Cache
+import core.cache.def.impl.DataMap
 import core.cache.def.impl.NPCDefinition
 import core.cache.def.impl.VarbitDefinition
+import core.cache.def.impl.Struct
 import core.game.node.entity.combat.ImpactHandler.HitsplatType
-import core.game.node.entity.npc.drop.NPCDropTables
 import core.game.node.entity.player.Player
 import core.game.node.entity.player.link.SpellBookManager
 import core.game.node.item.Item
 import core.net.packet.context.PlayerContext
 import core.net.packet.out.ResetInterface
-import core.net.packet.out.Varbit
 import core.plugin.Initializable
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import org.rs09.consts.Items
-import rs09.game.content.global.NPCDropTable
-import rs09.game.system.command.Command
+import rs09.game.system.SystemLogger
 import rs09.game.system.command.Privilege
+import java.io.BufferedWriter
+import java.io.File
+import java.io.FileWriter
 import rs09.net.packet.PacketWriteQueue
 
 @Initializable
@@ -49,6 +51,64 @@ class DevelopmentCommandSet : CommandSet(Privilege.ADMIN) {
             player.impactHandler.manualHit(player, player.skills.lifepoints, HitsplatType.NORMAL)
         }
 
+        define("struct") {player, args ->
+            val mapId = args[1].toIntOrNull() ?: return@define
+
+            val def = Struct.get(mapId)
+            SystemLogger.logInfo(def.toString())
+        }
+
+        define("datamap") {player, args ->
+            val mapId = args[1].toIntOrNull() ?: return@define
+
+            val def = DataMap.get(mapId)
+            SystemLogger.logInfo(def.toString())
+        }
+
+        define("dumpstructs") {player, _ ->
+            val dump = File("structs.txt")
+            val writer = BufferedWriter(FileWriter(dump))
+            val index = Cache.getIndexes()[2]
+            val containers = index.information.containers[26].filesIndexes
+            for(fID in containers)
+            {
+                val file = index.getFileData(26, fID)
+                if(file != null){
+                    val def = Struct.parse(fID, file)
+                    if(def.dataStore.isEmpty()) continue //no data in struct.
+                    writer.write(def.toString())
+                    writer.newLine()
+                }
+            }
+            writer.flush()
+            writer.close()
+        }
+
+        define("dumpdatamaps") {player, _ ->
+            val index = Cache.getIndexes()[17]
+            val containers = index.information.containersIndexes
+
+            val dump = File("datamaps.txt")
+            val writer = BufferedWriter(FileWriter(dump))
+
+            for(cID in containers)
+            {
+                val fileIndexes = index.information.containers[cID].filesIndexes
+                for(fID in fileIndexes)
+                {
+                    val file = index.getFileData(cID, fID)
+                    if(file != null){
+                        val def = DataMap.parse((cID shl 8) or fID, file)
+                        if(def.keyType == '?') continue //Empty definition - only a 0 present in the cachefile data.
+                        writer.write(def.toString())
+                        writer.newLine()
+                    }
+                }
+            }
+            writer.flush()
+            writer.close()
+        }
+
         define("rolldrops") { player: Player, args: Array<String> ->
             if(args.size < 2){
                 reject(player,"Usage: ::rolldrops npcid amount")

Server/src/main/kotlin/rs09/game/system/config/MusicConfigLoader.kt

@@ -1,5 +1,6 @@
 package rs09.game.system.config
 
+import core.cache.def.impl.DataMap
 import rs09.ServerConstants
 import core.game.node.entity.player.link.music.MusicEntry
 import core.game.node.entity.player.link.music.MusicZone
@@ -12,6 +13,10 @@ import org.json.simple.parser.JSONParser
 import java.io.FileReader
 
 class MusicConfigLoader {
+    //1351 -> buttonID:songID
+    //1345 -> buttonID:songName (capitalized)
+    //1347 -> buttonID:songName (lowercase)
+
     val parser = JSONParser()
     var reader: FileReader? = null
     fun load(){
@@ -19,15 +24,18 @@ class MusicConfigLoader {
         reader = FileReader(ServerConstants.CONFIG_PATH + "music_configs.json")
         var configs = parser.parse(reader) as JSONArray
 
+        val songs = DataMap.get(1351)
+        val names = DataMap.get(1345)
+
+        for((index, songId) in songs.dataStore)
+        {
+            val entry = MusicEntry(songId as Int, names.getString(index as Int), index)
+            MusicEntry.getSongs().putIfAbsent(songId, entry)
+        }
+
         for(config in configs){
             val e = config as JSONObject
             val musicId = Integer.parseInt(e["id"].toString())
-            val entry = MusicEntry(
-                    musicId,
-                    e["name"].toString(),
-                    Integer.parseInt(e["indexId"].toString())
-            )
-            MusicEntry.getSongs().putIfAbsent(entry.id,entry)
             val string = e["borders"].toString()
             val borderArray = string.split("-")
             var tokens: Array<String>? = null