diff --git a/mappings/net/minecraft/client/player/EntityPlayerClient.mapping b/mappings/net/minecraft/client/player/EntityPlayerClient.mapping
index ddd8974130..c629b70341 100644
--- a/mappings/net/minecraft/client/player/EntityPlayerClient.mapping
+++ b/mappings/net/minecraft/client/player/EntityPlayerClient.mapping
@@ -1,5 +1,5 @@
 CLASS none/boh net/minecraft/client/player/EntityPlayerClient
-	FIELD bY statManager Lnone/nz;
+	FIELD bY stats Lnone/nz;
 	FIELD bZ clientPermissionLevel I
 	FIELD d networkHandler Lnone/bmf;
 	FIELD f game Lnone/bdr;
@@ -7,9 +7,9 @@ CLASS none/boh net/minecraft/client/player/EntityPlayerClient
 		ARG 0 game
 		ARG 1 world
 		ARG 2 networkHandler
-		ARG 3 statManager
+		ARG 3 stats
 	METHOD A closeGui ()V
-	METHOD E getStatManager ()Lnone/nz;
+	METHOD E getStats ()Lnone/nz;
 	METHOD G getClientPermissionLevel ()I
 	METHOD a hasPermission (ILjava/lang/String;)Z
 		ARG 0 permissionLevel
@@ -32,7 +32,7 @@ CLASS none/boh net/minecraft/client/player/EntityPlayerClient
 		ARG 2 pitch
 	METHOD a incrementStat (Lnone/nu;I)V
 		ARG 0 stat
-		ARG 1 points
+		ARG 1 amount
 	METHOD a openInventory (Lnone/qv;)V
 		ARG 0 inv
 	METHOD a swingHand (Lnone/rb;)V
diff --git a/mappings/net/minecraft/entity/player/EntityPlayer.mapping b/mappings/net/minecraft/entity/player/EntityPlayer.mapping
index 5dafd7801b..b30eb2691d 100644
--- a/mappings/net/minecraft/entity/player/EntityPlayer.mapping
+++ b/mappings/net/minecraft/entity/player/EntityPlayer.mapping
@@ -84,9 +84,13 @@ CLASS none/aam net/minecraft/entity/player/EntityPlayer
 		ARG 0 sound
 		ARG 1 volume
 		ARG 2 pitch
+	METHOD a hasAchievementUnlocked (Lnone/no;)Z
+		ARG 0 achievement
+	METHOD a resetStat (Lnone/nu;)V
+		ARG 0 stat
 	METHOD a incrementStat (Lnone/nu;I)V
 		ARG 0 stat
-		ARG 1 points
+		ARG 1 amount
 	METHOD a openInventory (Lnone/qv;)V
 		ARG 0 inv
 	METHOD a openContainer (Lnone/rc;)V
diff --git a/mappings/net/minecraft/entity/player/EntityPlayerServer.mapping b/mappings/net/minecraft/entity/player/EntityPlayerServer.mapping
index 53447c65dd..a525edd062 100644
--- a/mappings/net/minecraft/entity/player/EntityPlayerServer.mapping
+++ b/mappings/net/minecraft/entity/player/EntityPlayerServer.mapping
@@ -3,7 +3,7 @@ CLASS none/lw net/minecraft/entity/player/EntityPlayerServer
 	FIELD b server Lnet/minecraft/server/MinecraftServer;
 	FIELD bS LOGGER Lorg/apache/logging/log4j/Logger;
 	FIELD bT language Ljava/lang/String;
-	FIELD bV statManager Lnone/nt;
+	FIELD bV stats Lnone/nt;
 	FIELD bW lastScoreHealth F
 	FIELD bX lastScoreFood I
 	FIELD bY lastScoreBreath I
@@ -65,9 +65,13 @@ CLASS none/lw net/minecraft/entity/player/EntityPlayerServer
 		ARG 0 message
 	METHOD a setClientSettings (Lnone/iq;)V
 		ARG 0 clientSettings
+	METHOD a hasAchievementUnlocked (Lnone/no;)Z
+		ARG 0 achievement
+	METHOD a resetStat (Lnone/nu;)V
+		ARG 0 stat
 	METHOD a incrementStat (Lnone/nu;I)V
 		ARG 0 stat
-		ARG 1 points
+		ARG 1 amount
 	METHOD a openInventory (Lnone/qv;)V
 		ARG 0 inv
 	METHOD a swingHand (Lnone/rb;)V
diff --git a/mappings/net/minecraft/stat/StatManager.mapping b/mappings/net/minecraft/stat/StatManager.mapping
index 9e34bb6d1b..3762d958aa 100644
--- a/mappings/net/minecraft/stat/StatManager.mapping
+++ b/mappings/net/minecraft/stat/StatManager.mapping
@@ -1,17 +1,17 @@
 CLASS none/nz net/minecraft/stat/StatManager
 	FIELD a stats Ljava/util/Map;
-	METHOD a updateStatState (Lnone/aam;Lnone/nu;I)V
+	METHOD a set (Lnone/aam;Lnone/nu;I)V
 		ARG 0 player
 		ARG 1 stat
-		ARG 2 state
+		ARG 2 value
 	METHOD a isAchievementUnlocked (Lnone/no;)Z
 		ARG 0 achievement
-	METHOD a getValue (Lnone/nu;)I
+	METHOD a get (Lnone/nu;)I
 		ARG 0 stat
 	METHOD a setExtraData (Lnone/nu;Lnone/nx;)Lnone/nx;
 		ARG 0 stat
 		ARG 1 value
-	METHOD b increaseState (Lnone/aam;Lnone/nu;I)V
+	METHOD b increase (Lnone/aam;Lnone/nu;I)V
 		ARG 0 player
 		ARG 1 stat
 		ARG 2 amount
diff --git a/mappings/net/minecraft/stat/StatManagerServer.mapping b/mappings/net/minecraft/stat/StatManagerServer.mapping
index 967375b946..771717b06a 100644
--- a/mappings/net/minecraft/stat/StatManagerServer.mapping
+++ b/mappings/net/minecraft/stat/StatManagerServer.mapping
@@ -2,15 +2,26 @@ CLASS none/nt net/minecraft/stat/StatManagerServer
 	FIELD b LOGGER Lorg/apache/logging/log4j/Logger;
 	FIELD c server Lnet/minecraft/server/MinecraftServer;
 	FIELD d statFile Ljava/io/File;
+	FIELD e dirtyStats Ljava/util/Set;
+	FIELD f lastUpdatedTime I
+	FIELD g dirtyAchievement Z
 	METHOD <init> (Lnet/minecraft/server/MinecraftServer;Ljava/io/File;)V
 		ARG 0 server
 		ARG 1 statFile
 	METHOD a load ()V
 	METHOD a deserialize (Ljava/lang/String;)Ljava/util/Map;
-	METHOD a updateStatState (Lnone/aam;Lnone/nu;I)V
+		ARG 0 json
+	METHOD a serialize (Ljava/util/Map;)Ljava/lang/String;
+		ARG 0 stats
+	METHOD a set (Lnone/aam;Lnone/nu;I)V
 		ARG 0 player
 		ARG 1 stat
-		ARG 2 state
+		ARG 2 value
+	METHOD a sendChangedStats (Lnone/lw;)V
+		ARG 0 player
 	METHOD b save ()V
 	METHOD b sendStatPacket (Lnone/lw;)V
 		ARG 0 player
+	METHOD c getAndClearDirtyStats ()Ljava/util/Set;
+	METHOD d markAllDirty ()V
+	METHOD e hasNewAchievement ()Z