Yandrik/Gamelib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

feat: implemented NPC serialization properly

Browse Source
This commit is contained in:
Yannik Bretschneider
2021-06-01 14:04:50 +02:00
parent fe7687bc21
commit 4802b0113d
3 changed files with 30 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/uulm/teamname/marvelous/gamelibrary/json/ingame/serialize/EntitySerializer.java
View File

@ -43,8 +43,9 @@ public class EntitySerializer extends StdSerializer<Entity> {
private void serializeNPC(NPC value, JsonGenerator gen, SerializerProvider provider)
throws IOException {
gen.writeNumberField("ID", value.id.id);
// gen.writeNumberField("MP",value.MP); // TODO: Doesn't exist yet?
// gen.writeArray(value.); // TODO: Put values here
gen.writeNumberField("MP", value.mp.getValue());
gen.writeFieldName("stones");
gen.writeArray(inventoryToIntArray(value.inventory), 0, value.inventory.getSize());
}
private void serializeCharacter(Character value, JsonGenerator gen, SerializerProvider provider)
@ -57,10 +58,7 @@ public class EntitySerializer extends StdSerializer<Entity> {
gen.writeFieldName("stones");
gen.writeArray(
Arrays.stream(value.inventory.getStonesAsArray())
.mapToInt(StoneType::getID)
.sorted()
.toArray(),
inventoryToIntArray(value.inventory),
0, value.inventory.getSize());
}
@ -74,4 +72,12 @@ public class EntitySerializer extends StdSerializer<Entity> {
throws IOException {
gen.writeNumberField("ID", value.id.id);
}
/** Returns an int[] with the sorted integer representations of the stones in the given Inventory */
private int[] inventoryToIntArray(Inventory inventory) {
return Arrays.stream(inventory.getStonesAsArray())
.mapToInt(StoneType::getID)
.sorted()
.toArray();
}
}