Further improved the TrappingXPTest

Author: Josh-Larson

src/main/java/com/projectswg/holocore/resources/support/data/collections/SWGMap.java

@@ -1,11 +1,10 @@
 /***********************************************************************************
- * Copyright (c) 2024 /// Project SWG /// www.projectswg.com                       *
+ * Copyright (c) 2025 /// Project SWG /// www.projectswg.com                       *
  *                                                                                 *
- * ProjectSWG is the first NGE emulator for Star Wars Galaxies founded on          *
+ * ProjectSWG is an emulation project for Star Wars Galaxies founded on            *
  * July 7th, 2011 after SOE announced the official shutdown of Star Wars Galaxies. *
- * Our goal is to create an emulator which will provide a server for players to    *
- * continue playing a game similar to the one they used to play. We are basing     *
- * it on the final publish of the game prior to end-game events.                   *
+ * Our goal is to create one or more emulators which will provide servers for      *
+ * players to continue playing a game similar to the one they used to play.        *
  *                                                                                 *
  * This file is part of Holocore.                                                  *
  *                                                                                 *
@@ -182,13 +181,17 @@ public void decode(ByteBuffer data, StringType keyType, Class<V> vType) {
 		NetBuffer buffer = NetBuffer.wrap(data);
 		try {
 			for (int i = 0; i < size; i++) {
-				buffer.getByte();
+				byte updateType = buffer.getByte();
 				String key = buffer.getString(keyType);
 				Object value = buffer.getGeneric(vType);
-				if (value != null && vType.isAssignableFrom(value.getClass()))
-					put((K) key, (V) value);
-				else
-					Log.e("Unable to parse: key=%s  value=%s", key, value);
+				if (updateType == 0 || updateType == 2) {
+					if (value != null && vType.isAssignableFrom(value.getClass()))
+						put((K) key, (V) value);
+					else
+						Log.e("Unable to parse: key=%s  value=%s", key, value);
+				} else if (updateType == 1) {
+					remove(key);
+				}
 			}
 		} catch (ClassCastException e) {
 			Log.e(e);
@@ -204,7 +207,7 @@ public void decode(ByteBuffer data, Class<K> kType, Class<V> vType) {
 
 		NetBuffer buffer = NetBuffer.wrap(data);
 		for (int i = 0; i < size; i++) {
-			buffer.getByte();
+			byte updateType = buffer.getByte();
 			Object key = buffer.getGeneric(kType);
 			if (key == null) {
 				Log.e("Failed to decode: " + kType.getSimpleName());
@@ -215,10 +218,14 @@ public void decode(ByteBuffer data, Class<K> kType, Class<V> vType) {
 				Log.e("Failed to decode: " + vType.getSimpleName());
 				break;
 			}
-			if (kType.isAssignableFrom(key.getClass()) && vType.isAssignableFrom(value.getClass()))
-				put((K) key, (V) value);
-			else
-				Log.e("Failed to insert key=" + key + "  value=" + value);
+			if (updateType == 0 || updateType == 2) {
+				if (kType.isAssignableFrom(key.getClass()) && vType.isAssignableFrom(value.getClass()))
+					put((K) key, (V) value);
+				else
+					Log.e("Failed to insert key=" + key + "  value=" + value);
+			} else if (updateType == 1) {
+				remove(key);
+			}
 		}
 		clearDeltaQueue();
 	}

src/test/java/com/projectswg/holocore/headless/experience.kt

@@ -25,19 +25,21 @@
  ***********************************************************************************/
 package com.projectswg.holocore.headless
 
-import com.projectswg.common.network.NetBuffer
+import com.projectswg.common.encoding.StringType
+import com.projectswg.holocore.resources.support.data.collections.SWGMap
+import java.nio.ByteBuffer
+import java.nio.ByteOrder
 import java.util.concurrent.TimeUnit
 
 fun ZonedInCharacter.waitForExperiencePoints(xpType: String) {
+	@Suppress("PLATFORM_CLASS_MAPPED_TO_KOTLIN") // We want a Java boxed int for now
+	val experienceMap = SWGMap<String, Integer>(8, 0, StringType.ASCII)
 	while (true) { // Quits naturally when the packet timeout is exceeded
 		val experienceDelta = player.waitForNextObjectDelta(player.playerObject.objectId, 8, 0, 50, TimeUnit.MILLISECONDS) ?: throw IllegalStateException("No XP delta received")
-		// TODO: Add a proper parser for SWGMap deltas
-		val deltasData = NetBuffer.wrap(experienceDelta.deltaData)
-		deltasData.seek(9)
-		val deltaXpType = deltasData.ascii
-		if (deltaXpType == xpType)
-			return
+		experienceMap.decode(ByteBuffer.wrap(experienceDelta.deltaData).order(ByteOrder.LITTLE_ENDIAN), StringType.ASCII, Integer::class.java)
+		if (experienceMap.containsKey(xpType))
+			break
 	}
 }
 
-private fun ZonedInCharacter.getXP(xpType: String) = player.playerObject.getExperiencePoints(xpType)
+fun ZonedInCharacter.getXP(xpType: String) = player.playerObject.getExperiencePoints(xpType)

src/test/java/com/projectswg/holocore/services/gameplay/player/experience/TrappingXPTest.kt

@@ -45,7 +45,7 @@ class TrappingXPTest : AcceptanceTest() {
 
 		// There are three types of XP we receive from this kill: combat_meleespecialize_unarmed, trapping, and combat_general
 		character.waitForExperiencePoints("trapping")
-		assertTrue(character.player.playerObject.getExperiencePoints("trapping") > 0)
+		assertTrue(character.getXP("trapping") > 0)
 	}
 
 	@Test
@@ -57,7 +57,7 @@ class TrappingXPTest : AcceptanceTest() {
 
 		killTarget(character, npc)
 
-		assertEquals(0, character.player.playerObject.getExperiencePoints("trapping"))
+		assertEquals(0, character.getXP("trapping"))
 	}
 
 	@Test
@@ -68,7 +68,7 @@ class TrappingXPTest : AcceptanceTest() {
 
 		killTarget(character, npc)
 
-		assertEquals(0, character.player.playerObject.getExperiencePoints("trapping"))
+		assertEquals(0, character.getXP("trapping"))
 	}
 
 	private fun killTarget(character: ZonedInCharacter, target: CreatureObject) {