diff --git a/pom.xml b/pom.xml
index f721293..ac80278 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,7 +36,7 @@
2.0.2
1.15.2-R0.1-SNAPSHOT
- 1.13.1
+ 1.14.0-SNAPSHOT
1.6.0
1.7
diff --git a/src/main/java/world/bentobox/challenges/ChallengesManager.java b/src/main/java/world/bentobox/challenges/ChallengesManager.java
index 522b61c..f522c67 100644
--- a/src/main/java/world/bentobox/challenges/ChallengesManager.java
+++ b/src/main/java/world/bentobox/challenges/ChallengesManager.java
@@ -549,7 +549,7 @@ public class ChallengesManager
{
// Create the player data
ChallengesPlayerData pd = new ChallengesPlayerData(uniqueID);
- this.playersDatabase.saveObject(pd);
+ this.playersDatabase.saveObjectAsync(pd);
// Add to cache
this.playerCacheData.put(uniqueID, pd);
}
@@ -696,7 +696,7 @@ public class ChallengesManager
challengesID.forEach(challenge ->
level.getChallenges().add(addonName + challenge.substring(world.getName().length())));
- this.levelDatabase.saveObject(level);
+ this.levelDatabase.saveObjectAsync(level);
this.levelCacheData.put(level.getUniqueId(), level);
updated = true;
@@ -740,7 +740,7 @@ public class ChallengesManager
updated = true;
- this.challengeDatabase.saveObject(challenge);
+ this.challengeDatabase.saveObjectAsync(challenge);
this.challengeCacheData.put(challenge.getUniqueId(), challenge);
}
@@ -783,7 +783,7 @@ public class ChallengesManager
// This save should not involve any upgrades in other parts.
- this.challengeDatabase.saveObject(challenge);
+ this.challengeDatabase.saveObjectAsync(challenge);
this.challengeCacheData.put(challenge.getUniqueId(), challenge);
}
}
@@ -834,7 +834,7 @@ public class ChallengesManager
}
});
- this.playersDatabase.saveObject(playerData);
+ this.playersDatabase.saveObjectAsync(playerData);
});
}
diff --git a/src/main/java/world/bentobox/challenges/database/object/Challenge.java b/src/main/java/world/bentobox/challenges/database/object/Challenge.java
index cff291f..a8990cc 100644
--- a/src/main/java/world/bentobox/challenges/database/object/Challenge.java
+++ b/src/main/java/world/bentobox/challenges/database/object/Challenge.java
@@ -19,6 +19,8 @@ import com.google.gson.annotations.Expose;
import com.google.gson.annotations.JsonAdapter;
import world.bentobox.bentobox.database.objects.DataObject;
+import world.bentobox.bentobox.database.objects.Table;
+import world.bentobox.challenges.database.object.adapters.EntityCompatibilityAdapter;
import world.bentobox.challenges.database.object.adapters.RequirementsAdapter;
import world.bentobox.challenges.database.object.requirements.Requirements;
@@ -28,6 +30,7 @@ import world.bentobox.challenges.database.object.requirements.Requirements;
* @author tastybento
*
*/
+@Table(name = "Challenge")
public class Challenge implements DataObject
{
/**
@@ -156,6 +159,7 @@ public class Challenge implements DataObject
@Deprecated
@Expose
+ @JsonAdapter(EntityCompatibilityAdapter.class)
private Map requiredEntities = new EnumMap<>(EntityType.class);
@Deprecated
diff --git a/src/main/java/world/bentobox/challenges/database/object/ChallengeLevel.java b/src/main/java/world/bentobox/challenges/database/object/ChallengeLevel.java
index 7fb26bf..63c108d 100644
--- a/src/main/java/world/bentobox/challenges/database/object/ChallengeLevel.java
+++ b/src/main/java/world/bentobox/challenges/database/object/ChallengeLevel.java
@@ -14,6 +14,7 @@ import com.google.gson.annotations.Expose;
import world.bentobox.bentobox.api.configuration.ConfigComment;
import world.bentobox.bentobox.database.objects.DataObject;
+import world.bentobox.bentobox.database.objects.Table;
import world.bentobox.challenges.ChallengesManager;
/**
@@ -21,6 +22,7 @@ import world.bentobox.challenges.ChallengesManager;
* @author tastybento
*
*/
+@Table(name = "ChallengeLevel")
public class ChallengeLevel implements DataObject, Comparable
{
/**
diff --git a/src/main/java/world/bentobox/challenges/database/object/ChallengesPlayerData.java b/src/main/java/world/bentobox/challenges/database/object/ChallengesPlayerData.java
index db306a9..c1de447 100644
--- a/src/main/java/world/bentobox/challenges/database/object/ChallengesPlayerData.java
+++ b/src/main/java/world/bentobox/challenges/database/object/ChallengesPlayerData.java
@@ -14,6 +14,7 @@ import com.google.gson.annotations.Expose;
import world.bentobox.bentobox.api.logs.LogEntry;
import world.bentobox.bentobox.database.objects.DataObject;
+import world.bentobox.bentobox.database.objects.Table;
import world.bentobox.bentobox.database.objects.adapters.Adapter;
import world.bentobox.bentobox.database.objects.adapters.LogEntryListAdapter;
@@ -23,6 +24,7 @@ import world.bentobox.bentobox.database.objects.adapters.LogEntryListAdapter;
* @author tastybento
*
*/
+@Table(name = "ChallengesPlayerData")
public class ChallengesPlayerData implements DataObject
{
/**
diff --git a/src/main/java/world/bentobox/challenges/database/object/adapters/EntityCompatibilityAdapter.java b/src/main/java/world/bentobox/challenges/database/object/adapters/EntityCompatibilityAdapter.java
new file mode 100644
index 0000000..b64a32f
--- /dev/null
+++ b/src/main/java/world/bentobox/challenges/database/object/adapters/EntityCompatibilityAdapter.java
@@ -0,0 +1,92 @@
+//
+// Created by BONNe
+// Copyright - 2020
+//
+
+
+package world.bentobox.challenges.database.object.adapters;
+
+
+import com.google.gson.*;
+import org.bukkit.entity.EntityType;
+import java.lang.reflect.Type;
+import java.util.EnumMap;
+import java.util.Map;
+
+import world.bentobox.bentobox.BentoBox;
+
+
+/**
+ * This is compatibility class for dealing with Mojang renamed entities.
+ * Created for update 1.16.
+ */
+public class EntityCompatibilityAdapter implements
+ JsonSerializer