diff --git a/src/main/java/org/spacehq/mc/protocol/data/MagicValues.java b/src/main/java/org/spacehq/mc/protocol/data/MagicValues.java
index 736a0a99..cda1a61a 100644
--- a/src/main/java/org/spacehq/mc/protocol/data/MagicValues.java
+++ b/src/main/java/org/spacehq/mc/protocol/data/MagicValues.java
@@ -517,38 +517,39 @@ public class MagicValues {
         register(EnterCreditsValue.SEEN_BEFORE, 0);
         register(EnterCreditsValue.FIRST_TIME, 1);
 
-        register(Achievement.OPEN_INVENTORY, "achievement.openInventory");
-        register(Achievement.GET_WOOD, "achievement.mineWood");
-        register(Achievement.MAKE_WORKBENCH, "achievement.buildWorkBench");
-        register(Achievement.MAKE_PICKAXE, "achievement.buildPickaxe");
-        register(Achievement.MAKE_FURNACE, "achievement.buildFurnace");
-        register(Achievement.GET_IRON, "achievement.acquireIron");
-        register(Achievement.MAKE_HOE, "achievement.buildHoe");
-        register(Achievement.MAKE_BREAD, "achievement.makeBread");
-        register(Achievement.MAKE_CAKE, "achievement.bakeCake");
-        register(Achievement.MAKE_IRON_PICKAXE, "achievement.buildBetterPickaxe");
-        register(Achievement.COOK_FISH, "achievement.cookFish");
-        register(Achievement.RIDE_MINECART_1000_BLOCKS, "achievement.onARail");
-        register(Achievement.MAKE_SWORD, "achievement.buildSword");
-        register(Achievement.KILL_ENEMY, "achievement.killEnemy");
-        register(Achievement.KILL_COW, "achievement.killCow");
-        register(Achievement.FLY_PIG, "achievement.flyPig");
-        register(Achievement.SNIPE_SKELETON, "achievement.snipeSkeleton");
-        register(Achievement.GET_DIAMONDS, "achievement.diamonds");
-        register(Achievement.GIVE_DIAMONDS, "achievement.diamondsToYou");
-        register(Achievement.ENTER_PORTAL, "achievement.portal");
-        register(Achievement.ATTACKED_BY_GHAST, "achievement.ghast");
-        register(Achievement.GET_BLAZE_ROD, "achievement.blazeRod");
-        register(Achievement.MAKE_POTION, "achievement.potion");
-        register(Achievement.GO_TO_THE_END, "achievement.theEnd");
-        register(Achievement.DEFEAT_ENDER_DRAGON, "achievement.theEnd2");
-        register(Achievement.DEAL_18_OR_MORE_DAMAGE, "achievement.overkill");
-        register(Achievement.MAKE_BOOKCASE, "achievement.bookcase");
-        register(Achievement.BREED_COW, "achievement.breedCow");
-        register(Achievement.SPAWN_WITHER, "achievement.spawnWither");
-        register(Achievement.KILL_WITHER, "achievement.killWither");
-        register(Achievement.MAKE_FULL_BEACON, "achievement.fullBeacon");
-        register(Achievement.EXPLORE_ALL_BIOMES, "achievement.exploreAllBiomes");
+        register(Achievement.TAKING_INVENTORY, "achievement.openInventory");
+        register(Achievement.GETTING_WOOD, "achievement.mineWood");
+        register(Achievement.BENCHMARKING, "achievement.buildWorkBench");
+        register(Achievement.TIME_TO_MINE, "achievement.buildPickaxe");
+        register(Achievement.HOT_TOPIC, "achievement.buildFurnace");
+        register(Achievement.ACQUIRE_HARDWARE, "achievement.acquireIron");
+        register(Achievement.TIME_TO_FARM, "achievement.buildHoe");
+        register(Achievement.BAKE_BREAD, "achievement.makeBread");
+        register(Achievement.THE_LIE, "achievement.bakeCake");
+        register(Achievement.GETTING_AN_UPGRADE, "achievement.buildBetterPickaxe");
+        register(Achievement.DELICIOUS_FISH, "achievement.cookFish");
+        register(Achievement.ON_A_RAIL, "achievement.onARail");
+        register(Achievement.TIME_TO_STRIKE, "achievement.buildSword");
+        register(Achievement.MONSTER_HUNTER, "achievement.killEnemy");
+        register(Achievement.COW_TIPPER, "achievement.killCow");
+        register(Achievement.WHEN_PIGS_FLY, "achievement.flyPig");
+        register(Achievement.SNIPER_DUEL, "achievement.snipeSkeleton");
+        register(Achievement.DIAMONDS, "achievement.diamonds");
+        register(Achievement.WE_NEED_TO_GO_DEEPER, "achievement.portal");
+        register(Achievement.RETURN_TO_SENDER, "achievement.ghast");
+        register(Achievement.INTO_FIRE, "achievement.blazeRod");
+        register(Achievement.LOCAL_BREWERY, "achievement.potion");
+        register(Achievement.THE_END_1, "achievement.theEnd");
+        register(Achievement.THE_END_2, "achievement.theEnd2");
+        register(Achievement.ENCHANTER, "achievement.enchantments");
+        register(Achievement.OVERKILL, "achievement.overkill");
+        register(Achievement.LIBRARIAN, "achievement.bookcase");
+        register(Achievement.ADVENTURING_TIME, "achievement.exploreAllBiomes");
+        register(Achievement.THE_BEGINNING_1, "achievement.spawnWither");
+        register(Achievement.THE_BEGINNING_2, "achievement.killWither");
+        register(Achievement.BEACONATOR, "achievement.fullBeacon");
+        register(Achievement.REPOPULATION, "achievement.breedCow");
+        register(Achievement.DIAMONDS_TO_YOU, "achievement.diamondsToYou");
         register(Achievement.OVERPOWERED, "achievement.overpowered");
 
         register(GenericStatistic.TIMES_LEFT_GAME, "stat.leaveGame");
diff --git a/src/main/java/org/spacehq/mc/protocol/data/game/statistic/Achievement.java b/src/main/java/org/spacehq/mc/protocol/data/game/statistic/Achievement.java
index caa089b9..b183887f 100644
--- a/src/main/java/org/spacehq/mc/protocol/data/game/statistic/Achievement.java
+++ b/src/main/java/org/spacehq/mc/protocol/data/game/statistic/Achievement.java
@@ -1,39 +1,38 @@
 package org.spacehq.mc.protocol.data.game.statistic;
 
 public enum Achievement implements Statistic {
-
-    OPEN_INVENTORY,
-    GET_WOOD,
-    MAKE_WORKBENCH,
-    MAKE_PICKAXE,
-    MAKE_FURNACE,
-    GET_IRON,
-    MAKE_HOE,
-    MAKE_BREAD,
-    MAKE_CAKE,
-    MAKE_IRON_PICKAXE,
-    COOK_FISH,
-    RIDE_MINECART_1000_BLOCKS,
-    MAKE_SWORD,
-    KILL_ENEMY,
-    KILL_COW,
-    FLY_PIG,
-    SNIPE_SKELETON,
-    GET_DIAMONDS,
-    GIVE_DIAMONDS,
-    ENTER_PORTAL,
-    ATTACKED_BY_GHAST,
-    GET_BLAZE_ROD,
-    MAKE_POTION,
-    GO_TO_THE_END,
-    DEFEAT_ENDER_DRAGON,
-    DEAL_18_OR_MORE_DAMAGE,
-    MAKE_BOOKCASE,
-    BREED_COW,
-    SPAWN_WITHER,
-    KILL_WITHER,
-    MAKE_FULL_BEACON,
-    EXPLORE_ALL_BIOMES,
-    OVERPOWERED;
-
+    TAKING_INVENTORY,
+    GETTING_WOOD,
+    BENCHMARKING,
+    TIME_TO_MINE,
+    HOT_TOPIC,
+    ACQUIRE_HARDWARE,
+    TIME_TO_FARM,
+    BAKE_BREAD,
+    THE_LIE,
+    GETTING_AN_UPGRADE,
+    DELICIOUS_FISH,
+    ON_A_RAIL,
+    TIME_TO_STRIKE,
+    MONSTER_HUNTER,
+    COW_TIPPER,
+    WHEN_PIGS_FLY,
+    SNIPER_DUEL,
+    DIAMONDS,
+    WE_NEED_TO_GO_DEEPER,
+    RETURN_TO_SENDER,
+    INTO_FIRE,
+    LOCAL_BREWERY,
+    THE_END_1,
+    THE_END_2,
+    ENCHANTER,
+    OVERKILL,
+    LIBRARIAN,
+    ADVENTURING_TIME,
+    THE_BEGINNING_1,
+    THE_BEGINNING_2,
+    BEACONATOR,
+    REPOPULATION,
+    DIAMONDS_TO_YOU,
+    OVERPOWERED
 }