From 34ed09e7684d694fd003af6db0b9063ac1ddcb43 Mon Sep 17 00:00:00 2001 From: BONNe1704 Date: Thu, 9 May 2019 16:45:53 +0300 Subject: [PATCH] Change json adapter factory to BentoBoxTypeAdapterFactory class. --- .../bentobox/challenges/ChallengesImportManager.java | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/src/main/java/world/bentobox/challenges/ChallengesImportManager.java b/src/main/java/world/bentobox/challenges/ChallengesImportManager.java index dc426f4..2d9c496 100644 --- a/src/main/java/world/bentobox/challenges/ChallengesImportManager.java +++ b/src/main/java/world/bentobox/challenges/ChallengesImportManager.java @@ -8,7 +8,6 @@ import java.nio.file.Files; import java.util.*; import java.util.stream.Collectors; -import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.World; import org.bukkit.configuration.ConfigurationSection; @@ -16,10 +15,8 @@ import org.bukkit.configuration.InvalidConfigurationException; import org.bukkit.configuration.file.YamlConfiguration; import org.bukkit.entity.EntityType; import org.bukkit.inventory.ItemStack; -import org.bukkit.potion.PotionEffectType; -import world.bentobox.bentobox.api.flags.Flag; -import world.bentobox.bentobox.database.json.adapters.*; +import world.bentobox.bentobox.database.json.BentoboxTypeAdapterFactory; import world.bentobox.bentobox.database.objects.DataObject; import world.bentobox.bentobox.util.ItemParser; import world.bentobox.challenges.database.object.ChallengeLevel; @@ -431,11 +428,7 @@ public class ChallengesImportManager { GsonBuilder builder = new GsonBuilder().excludeFieldsWithoutExposeAnnotation().enableComplexMapKeySerialization(); // Register adapters - builder.registerTypeAdapter(Location.class, new LocationAdapter()) ; - builder.registerTypeAdapter(World.class, new WorldAdapter()); - builder.registerTypeAdapter(Flag.class, new FlagAdapter(addon.getPlugin())); - builder.registerTypeAdapter(PotionEffectType.class, new PotionEffectTypeAdapter()); - builder.registerTypeAdapter(ItemStack.class, new ItemStackTypeAdapter()); + builder.registerTypeAdapterFactory(new BentoboxTypeAdapterFactory(addon.getPlugin())); // Keep null in the database builder.serializeNulls(); // Allow characters like < or > without escaping them