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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.idea/vcs.xml
View File

@ -2,6 +2,6 @@
<project version="4"> <project version="4">
<component name="VcsDirectoryMappings"> <component name="VcsDirectoryMappings">
<mapping directory="" vcs="Git" /> <mapping directory="" vcs="Git" />
<mapping directory="$PROJECT_DIR$/Gamelib" vcs="Git" /> <mapping directory="$PROJECT_DIR$" vcs="Git" />
</component> </component>
</project> </project>

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) private void serializeNPC(NPC value, JsonGenerator gen, SerializerProvider provider)
throws IOException { throws IOException {
gen.writeNumberField("ID", value.id.id); gen.writeNumberField("ID", value.id.id);
// gen.writeNumberField("MP",value.MP); // TODO: Doesn't exist yet? gen.writeNumberField("MP", value.mp.getValue());
// gen.writeArray(value.); // TODO: Put values here gen.writeFieldName("stones");
gen.writeArray(inventoryToIntArray(value.inventory), 0, value.inventory.getSize());
} }
private void serializeCharacter(Character value, JsonGenerator gen, SerializerProvider provider) private void serializeCharacter(Character value, JsonGenerator gen, SerializerProvider provider)
@ -57,10 +58,7 @@ public class EntitySerializer extends StdSerializer<Entity> {
gen.writeFieldName("stones"); gen.writeFieldName("stones");
gen.writeArray( gen.writeArray(
Arrays.stream(value.inventory.getStonesAsArray()) inventoryToIntArray(value.inventory),
.mapToInt(StoneType::getID)
.sorted()
.toArray(),
0, value.inventory.getSize()); 0, value.inventory.getSize());
} }
@ -74,4 +72,12 @@ public class EntitySerializer extends StdSerializer<Entity> {
throws IOException { throws IOException {
gen.writeNumberField("ID", value.id.id); 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();
}
} }

21
src/test/java/uulm/teamname/marvelous/gamelibrary/json/ingame/serialize/EntitySerializerTest.java
View File

@ -12,12 +12,13 @@ import uulm.teamname.marvelous.gamelibrary.json.ingame.deserialize.EntityDeseria
import static org.mockito.Mockito.*; import static org.mockito.Mockito.*;
import static org.junit.jupiter.api.Assertions.*; import static org.junit.jupiter.api.Assertions.*;
import static org.assertj.core.api.Assertions.*;
class EntitySerializerTest { class EntitySerializerTest {
@Test @Test
void notATestJustSomethingToRun() throws JsonProcessingException { void serializeCharacter() throws JsonProcessingException {
var mapper = new ObjectMapper(); var mapper = new ObjectMapper();
var chara = new Character( var chara = new Character(
@ -35,9 +36,21 @@ class EntitySerializerTest {
chara.inventory.addStone(StoneType.SpaceStone); chara.inventory.addStone(StoneType.SpaceStone);
chara.inventory.addStone(StoneType.MindStone); chara.inventory.addStone(StoneType.MindStone);
var result = mapper.writeValueAsString(chara); var jsonRepresentingCharacter = """
{
"entityType":"Character",
"name":"CoolHeroThing",
"PID":1,
"ID":1,
"HP":200,
"MP":300,
"AP":8,
"stones":[1,2,5],
"position":[12,24]
}""".replace("\n", "");
System.out.println(result); assertThat(mapper.writeValueAsString(chara))
.isEqualTo(jsonRepresentingCharacter);
} }
} }