Feature: blockdata parsing (#219)

* Add blockdata parsing

* Add license header

* sort imports

* sort registration

Author: rainbowdashlabs

build.gradle.kts

@@ -15,7 +15,7 @@ plugins {
 }
 publishData {
     useEldoNexusRepos(false)
-    publishingVersion = "1.3.0"
+    publishingVersion = "1.4.0"
 }
 version = publishData.getVersion()
 

core/src/main/java/de/eldoria/jacksonbukkit/JacksonBukkitModule.java

@@ -10,10 +10,11 @@
 import com.fasterxml.jackson.databind.module.SimpleDeserializers;
 import com.fasterxml.jackson.databind.module.SimpleSerializers;
 import de.eldoria.jacksonbukkit.deserializer.AttributeModifierDeserializer;
+import de.eldoria.jacksonbukkit.deserializer.BlockDataDeserializer;
 import de.eldoria.jacksonbukkit.deserializer.BlockVectorDeserializer;
 import de.eldoria.jacksonbukkit.deserializer.BoundingBoxDeserializer;
+import de.eldoria.jacksonbukkit.deserializer.EnchantmentDeserializer;
 import de.eldoria.jacksonbukkit.deserializer.ExactChoiceDeserializer;
-import de.eldoria.jacksonbukkit.serializer.EnchantmentSerializer;
 import de.eldoria.jacksonbukkit.deserializer.FireworkEffectDeserializer;
 import de.eldoria.jacksonbukkit.deserializer.LocationDeserializer;
 import de.eldoria.jacksonbukkit.deserializer.MaterialChoiceDeserializer;
@@ -27,10 +28,11 @@
 import de.eldoria.jacksonbukkit.deserializer.ShapelessRecipeDeserializer;
 import de.eldoria.jacksonbukkit.deserializer.VectorDeserializer;
 import de.eldoria.jacksonbukkit.serializer.AttributeModifierSerializer;
+import de.eldoria.jacksonbukkit.serializer.BlockDataSerializer;
 import de.eldoria.jacksonbukkit.serializer.BlockVectorSerializer;
 import de.eldoria.jacksonbukkit.serializer.BoundingBoxSerializer;
+import de.eldoria.jacksonbukkit.serializer.EnchantmentSerializer;
 import de.eldoria.jacksonbukkit.serializer.ExactChoiceSerializer;
-import de.eldoria.jacksonbukkit.deserializer.EnchantmentDeserializer;
 import de.eldoria.jacksonbukkit.serializer.FireworkEffectSerializer;
 import de.eldoria.jacksonbukkit.serializer.LocationSerializer;
 import de.eldoria.jacksonbukkit.serializer.MaterialChoiceSerializer;
@@ -50,11 +52,12 @@
 import org.bukkit.OfflinePlayer;
 import org.bukkit.attribute.AttributeModifier;
 import org.bukkit.block.banner.Pattern;
+import org.bukkit.block.data.BlockData;
+import org.bukkit.enchantments.Enchantment;
 import org.bukkit.inventory.RecipeChoice.ExactChoice;
 import org.bukkit.inventory.RecipeChoice.MaterialChoice;
 import org.bukkit.inventory.ShapedRecipe;
 import org.bukkit.inventory.ShapelessRecipe;
-import org.bukkit.enchantments.Enchantment;
 import org.bukkit.potion.PotionEffect;
 import org.bukkit.potion.PotionEffectType;
 import org.bukkit.util.BlockVector;
@@ -109,23 +112,24 @@ public void setupModule(SetupContext context) {
      * @param serializers serializers
      */
     protected final void addSerializer(SimpleSerializers serializers) {
-        serializers.addSerializer(Vector.class, new VectorSerializer());
+        serializers.addSerializer(AttributeModifier.class, new AttributeModifierSerializer());
+        serializers.addSerializer(BlockData.class, new BlockDataSerializer());
         serializers.addSerializer(BlockVector.class, new BlockVectorSerializer());
-        serializers.addSerializer(NamespacedKey.class, new NamespacedKeySerializer(namespacedKeyFormat));
-        serializers.addSerializer(PotionEffect.class, new PotionEffectSerializer());
-        serializers.addSerializer(PotionEffectType.class, new PotionEffectTypeSerializer());
-        serializers.addSerializer(FireworkEffect.class, new FireworkEffectSerializer());
-        serializers.addSerializer(Pattern.class, new PatternSerializer());
         serializers.addSerializer(BoundingBox.class, new BoundingBoxSerializer());
-        serializers.addSerializer(Enchantment.class, new EnchantmentSerializer());
-        serializers.addSerializer(AttributeModifier.class, new AttributeModifierSerializer());
-        serializers.addSerializer(Location.class, new LocationSerializer());
-        serializers.addSerializer(OfflinePlayer.class, new PlayerSerializer());
         serializers.addSerializer(Color.class, new RGBColorSerializer());
+        serializers.addSerializer(Enchantment.class, new EnchantmentSerializer());
         serializers.addSerializer(ExactChoice.class, new ExactChoiceSerializer());
+        serializers.addSerializer(FireworkEffect.class, new FireworkEffectSerializer());
+        serializers.addSerializer(Location.class, new LocationSerializer());
         serializers.addSerializer(MaterialChoice.class, new MaterialChoiceSerializer());
+        serializers.addSerializer(NamespacedKey.class, new NamespacedKeySerializer(namespacedKeyFormat));
+        serializers.addSerializer(OfflinePlayer.class, new PlayerSerializer());
+        serializers.addSerializer(Pattern.class, new PatternSerializer());
+        serializers.addSerializer(PotionEffect.class, new PotionEffectSerializer());
+        serializers.addSerializer(PotionEffectType.class, new PotionEffectTypeSerializer());
         serializers.addSerializer(ShapedRecipe.class, new ShapedRecipeSerializer());
         serializers.addSerializer(ShapelessRecipe.class, new ShapelessRecipeSerializer());
+        serializers.addSerializer(Vector.class, new VectorSerializer());
         registerSerializer(serializers);
     }
 
@@ -144,23 +148,24 @@ protected final void addSerializer(SimpleSerializers serializers) {
      * @param deserializers deserializers
      */
     protected final void addDeserializer(SimpleDeserializers deserializers) {
-        deserializers.addDeserializer(Vector.class, new VectorDeserializer());
+        deserializers.addDeserializer(AttributeModifier.class, new AttributeModifierDeserializer());
+        deserializers.addDeserializer(BlockData.class, new BlockDataDeserializer());
         deserializers.addDeserializer(BlockVector.class, new BlockVectorDeserializer());
-        deserializers.addDeserializer(NamespacedKey.class, new NamespacedKeyDeserializer());
-        deserializers.addDeserializer(PotionEffect.class, new PotionEffectDeserializer());
-        deserializers.addDeserializer(PotionEffectType.class, new PotionEffectTypeDeserializer());
-        deserializers.addDeserializer(FireworkEffect.class, new FireworkEffectDeserializer());
-        deserializers.addDeserializer(Pattern.class, new PatternDeserializer());
         deserializers.addDeserializer(BoundingBox.class, new BoundingBoxDeserializer());
-        deserializers.addDeserializer(Enchantment.class, new EnchantmentDeserializer());
-        deserializers.addDeserializer(AttributeModifier.class, new AttributeModifierDeserializer());
-        deserializers.addDeserializer(Location.class, new LocationDeserializer());
-        deserializers.addDeserializer(OfflinePlayer.class, new PlayerDeserializer());
         deserializers.addDeserializer(Color.class, new RGBColorDeserializer());
+        deserializers.addDeserializer(Enchantment.class, new EnchantmentDeserializer());
         deserializers.addDeserializer(ExactChoice.class, new ExactChoiceDeserializer());
+        deserializers.addDeserializer(FireworkEffect.class, new FireworkEffectDeserializer());
+        deserializers.addDeserializer(Location.class, new LocationDeserializer());
         deserializers.addDeserializer(MaterialChoice.class, new MaterialChoiceDeserializer());
+        deserializers.addDeserializer(NamespacedKey.class, new NamespacedKeyDeserializer());
+        deserializers.addDeserializer(OfflinePlayer.class, new PlayerDeserializer());
+        deserializers.addDeserializer(Pattern.class, new PatternDeserializer());
+        deserializers.addDeserializer(PotionEffect.class, new PotionEffectDeserializer());
+        deserializers.addDeserializer(PotionEffectType.class, new PotionEffectTypeDeserializer());
         deserializers.addDeserializer(ShapedRecipe.class, new ShapedRecipeDeserializer());
         deserializers.addDeserializer(ShapelessRecipe.class, new ShapelessRecipeDeserializer());
+        deserializers.addDeserializer(Vector.class, new VectorDeserializer());
         registerDeserializer(deserializers);
     }
 

core/src/main/java/de/eldoria/jacksonbukkit/deserializer/BlockDataDeserializer.java

@@ -0,0 +1,25 @@
+/*
+ *     SPDX-License-Identifier: MIT
+ *
+ *     Copyright (C) EldoriaRPG Team and Contributor
+ */
+package de.eldoria.jacksonbukkit.deserializer;
+
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.JsonDeserializer;
+import org.bukkit.Bukkit;
+import org.bukkit.block.data.BlockData;
+import org.bukkit.util.BlockVector;
+
+import java.io.IOException;
+
+/**
+ * Class for deserialization of {@link BlockVector}.
+ */
+public class BlockDataDeserializer extends JsonDeserializer<BlockData> {
+    @Override
+    public BlockData deserialize(JsonParser p, DeserializationContext ctxt) throws IOException {
+        return Bukkit.createBlockData(ctxt.readValue(p, String.class));
+    }
+}

core/src/main/java/de/eldoria/jacksonbukkit/serializer/BlockDataSerializer.java

@@ -0,0 +1,24 @@
+/*
+ *     SPDX-License-Identifier: MIT
+ *
+ *     Copyright (C) EldoriaRPG Team and Contributor
+ */
+package de.eldoria.jacksonbukkit.serializer;
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.JsonSerializer;
+import com.fasterxml.jackson.databind.SerializerProvider;
+import org.bukkit.block.data.BlockData;
+import org.bukkit.util.BlockVector;
+
+import java.io.IOException;
+
+/**
+ * Class for serialization of {@link BlockVector}.
+ */
+public class BlockDataSerializer extends JsonSerializer<BlockData> {
+    @Override
+    public void serialize(BlockData value, JsonGenerator gen, SerializerProvider serializers) throws IOException {
+        gen.writeObject(value.getAsString());
+    }
+}