From 44ce5feef6975a20559234b892500a9d838759cc Mon Sep 17 00:00:00 2001
From: mcmonkey4eva <agoodwin@freneticllc.com>
Date: Sat, 10 Jun 2017 21:39:22 -0700
Subject: [PATCH] Something is being dumb, - 7.0.0 start of update

---
 pom.xml                                       |  2 +-
 .../utilities/flags/FlagHelper.java           | 41 ++++++++++++++++++-
 .../utilities/flags/FlagMap.java              |  2 +-
 3 files changed, 42 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1a9d66e..eef3fc3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,7 +33,7 @@
         <dependency>
             <groupId>org.spongepowered</groupId>
             <artifactId>spongeapi</artifactId>
-			<version>6.0.0-SNAPSHOT</version>
+			<version>7.0.0-SNAPSHOT</version>
             <type>jar</type>
             <scope>provided</scope>
         </dependency>
diff --git a/src/main/java/com/denizenscript/denizen2sponge/utilities/flags/FlagHelper.java b/src/main/java/com/denizenscript/denizen2sponge/utilities/flags/FlagHelper.java
index 7e537a4..b63cc11 100644
--- a/src/main/java/com/denizenscript/denizen2sponge/utilities/flags/FlagHelper.java
+++ b/src/main/java/com/denizenscript/denizen2sponge/utilities/flags/FlagHelper.java
@@ -1 +1,40 @@
-package com.denizenscript.denizen2sponge.utilities.flags;

import com.google.common.reflect.TypeToken;
import org.spongepowered.api.Sponge;
import org.spongepowered.api.data.DataQuery;
import org.spongepowered.api.data.key.Key;
import org.spongepowered.api.data.key.KeyFactory;
import org.spongepowered.api.data.value.mutable.Value;

public class FlagHelper {

    public static final TypeToken<FlagMap> FLAGMAP_TOKEN = new TypeToken<FlagMap>() {
    };

    public static final TypeToken<Value<FlagMap>> FLAGMAP_VALUE_TOKEN = new TypeToken<Value<FlagMap>>() {
    };

    public static Key<Value<FlagMap>> FLAGMAP = KeyFactory.makeSingleKey(
            FLAGMAP_TOKEN,
            FLAGMAP_VALUE_TOKEN,
            DataQuery.of("denizen:flagmap"),
            "denizen:flagmap",
            "denizen:flagmap"
    );

    public static FlagMapDataBuilder FMDB;

    public static void register() {
        FMDB = new FlagMapDataBuilder(FlagMapData.class, 1);
        Sponge.getDataManager().register(FlagMapDataImpl.class, ImmFlagMapDataImpl.class, FMDB);
    }
}
\ No newline at end of file
+package com.denizenscript.denizen2sponge.utilities.flags;
+
+import com.denizenscript.denizen2sponge.Denizen2Sponge;
+import com.google.common.reflect.TypeToken;
+import org.spongepowered.api.Sponge;
+import org.spongepowered.api.data.DataQuery;
+import org.spongepowered.api.data.DataRegistration;
+import org.spongepowered.api.data.key.Key;
+import org.spongepowered.api.data.key.KeyFactory;
+import org.spongepowered.api.data.value.mutable.Value;
+
+public class FlagHelper {
+
+    public static final TypeToken<FlagMap> FLAGMAP_TOKEN = new TypeToken<FlagMap>() {
+    };
+
+    public static final TypeToken<Value<FlagMap>> FLAGMAP_VALUE_TOKEN = new TypeToken<Value<FlagMap>>() {
+    };
+
+    public static Key<Value<FlagMap>> FLAGMAP = KeyFactory.makeSingleKey(
+            FLAGMAP_TOKEN,
+            FLAGMAP_VALUE_TOKEN,
+            DataQuery.of("flagmap"),
+            "denizen2sponge:flagmap",
+            "DenizenFlagMap"
+    );
+
+    public static FlagMapDataBuilder FMDB;
+
+    public static void register() {
+        FMDB = new FlagMapDataBuilder(FlagMapData.class, 1);
+        DataRegistration.<FlagMapData, ImmutableFlagMapData>builder()
+                .dataClass(FlagMapData.class)
+                .immutableClass(ImmutableFlagMapData.class)
+                .builder(FMDB)
+                .manipulatorId("flagmap")
+                .dataName("flagmap")
+                .buildAndRegister(Denizen2Sponge.plugin);
+    }
+}
diff --git a/src/main/java/com/denizenscript/denizen2sponge/utilities/flags/FlagMap.java b/src/main/java/com/denizenscript/denizen2sponge/utilities/flags/FlagMap.java
index e951fe5..d0d9ad3 100644
--- a/src/main/java/com/denizenscript/denizen2sponge/utilities/flags/FlagMap.java
+++ b/src/main/java/com/denizenscript/denizen2sponge/utilities/flags/FlagMap.java
@@ -20,7 +20,7 @@ public int getContentVersion() {
 
     @Override
     public DataContainer toContainer() {
-        MemoryDataContainer mdc = new MemoryDataContainer();
+        DataContainer mdc = DataContainer.createNew();
         mdc.set(FLAG, flags.savable());
         return mdc;
     }