diff --git a/nms-patches/ItemStack.patch b/nms-patches/ItemStack.patch
index b597e91404..22939304bd 100644
--- a/nms-patches/ItemStack.patch
+++ b/nms-patches/ItemStack.patch
@@ -40,7 +40,7 @@
 +
 +            NBTTagCompound savedStack = new NBTTagCompound();
 +            this.save(savedStack);
-+            savedStack = (NBTTagCompound) MinecraftServer.getServer().dataConverterManager.update(DataConverterTypes.ITEM_STACK, new Dynamic(DynamicOpsNBT.a, savedStack), -1, CraftMagicNumbers.DATA_VERSION).getValue();
++            savedStack = (NBTTagCompound) MinecraftServer.getServer().dataConverterManager.update(DataConverterTypes.ITEM_STACK, new Dynamic(DynamicOpsNBT.a, savedStack), -1, CraftMagicNumbers.INSTANCE.getDataVersion()).getValue();
 +            this.load(savedStack);
 +        }
 +    }
diff --git a/nms-patches/WorldData.patch b/nms-patches/WorldData.patch
index 68d3fb5dc4..2a60109879 100644
--- a/nms-patches/WorldData.patch
+++ b/nms-patches/WorldData.patch
@@ -24,7 +24,7 @@
          nbttagcompound2.setBoolean("Snapshot", false);
          nbttagcompound.set("Version", nbttagcompound2);
          nbttagcompound.setInt("DataVersion", 1631);
-+        if (org.bukkit.craftbukkit.util.CraftMagicNumbers.DATA_VERSION != 1631) throw new AssertionError(); // CraftBukkit - sentinel
++        if (org.bukkit.craftbukkit.util.CraftMagicNumbers.INSTANCE.getDataVersion() != 1631) throw new AssertionError(); // CraftBukkit - sentinel
          nbttagcompound.setLong("RandomSeed", this.e);
          nbttagcompound.setString("generatorName", this.f.b());
          nbttagcompound.setInt("generatorVersion", this.f.getVersion());
diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftLegacy.java b/src/main/java/org/bukkit/craftbukkit/util/CraftLegacy.java
index f7881201ac..c6aae80716 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftLegacy.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftLegacy.java
@@ -400,7 +400,7 @@ public class CraftLegacy {
                 stack.setInt("id", material.getId());
                 stack.setShort("Damage", data);
 
-                Dynamic<NBTBase> converted = DataConverterRegistry.a().update(DataConverterTypes.ITEM_STACK, new Dynamic<NBTBase>(DynamicOpsNBT.a, stack), -1, CraftMagicNumbers.DATA_VERSION);
+                Dynamic<NBTBase> converted = DataConverterRegistry.a().update(DataConverterTypes.ITEM_STACK, new Dynamic<NBTBase>(DynamicOpsNBT.a, stack), -1, CraftMagicNumbers.INSTANCE.getDataVersion());
 
                 String newId = converted.getString("id");
                 // Recover spawn eggs with invalid data
diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
index 9b4cea09f7..4342a9f432 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
@@ -144,7 +144,6 @@ public final class CraftMagicNumbers implements UnsafeValues {
         return CraftBlockData.fromData(getBlock(material, data));
     }
 
-    public static final int DATA_VERSION = 1631;
     /**
      * This string should be changed if the NMS mappings do.
      *
@@ -157,12 +156,16 @@ public final class CraftMagicNumbers implements UnsafeValues {
      * thing as many common NMS usages. If not, you are encouraged to open a
      * feature and/or pull request for consideration, or use a well abstracted
      * third-party API such as ProtocolLib.
+     *
+     * @return string
      */
-    public static final String MAPPINGS_VERSION = "00ed8e5c39debc3ed194ad7c5645cc45";
+    public String getMappingsVersion() {
+        return "00ed8e5c39debc3ed194ad7c5645cc45";
+    }
 
     @Override
     public int getDataVersion() {
-        return DATA_VERSION;
+        return 1631;
     }
 
     @Override