diff --git a/modules/API/src/main/java/com/comphenix/protocol/PacketType.java b/modules/API/src/main/java/com/comphenix/protocol/PacketType.java
index d6fceaaf..46c6cb67 100644
--- a/modules/API/src/main/java/com/comphenix/protocol/PacketType.java
+++ b/modules/API/src/main/java/com/comphenix/protocol/PacketType.java
@@ -109,85 +109,86 @@ public class PacketType implements Serializable, Cloneable, Comparable<PacketTyp
 		public static class Server extends PacketTypeEnum {
 			private final static Sender SENDER = Sender.SERVER;
 
-			public static final PacketType SPAWN_ENTITY =                 new PacketType(PROTOCOL, SENDER, 0x00, 0x0E, "SpawnEntity");
-			public static final PacketType SPAWN_ENTITY_EXPERIENCE_ORB =  new PacketType(PROTOCOL, SENDER, 0x01, 0x11, "SpawnEntityExperienceOrb");
-			public static final PacketType SPAWN_ENTITY_WEATHER =         new PacketType(PROTOCOL, SENDER, 0x02, 0x2C, "SpawnEntityWeather");
-			public static final PacketType SPAWN_ENTITY_LIVING =          new PacketType(PROTOCOL, SENDER, 0x03, 0x0F, "SpawnEntityLiving");
-			public static final PacketType SPAWN_ENTITY_PAINTING =        new PacketType(PROTOCOL, SENDER, 0x04, 0x10, "SpawnEntityPainting");
-			public static final PacketType NAMED_ENTITY_SPAWN =           new PacketType(PROTOCOL, SENDER, 0x05, 0x0C, "NamedEntitySpawn");
-			public static final PacketType ANIMATION =                    new PacketType(PROTOCOL, SENDER, 0x06, 0x0B, "Animation");
-			public static final PacketType STATISTIC =                    new PacketType(PROTOCOL, SENDER, 0x07, 0x37, "Statistic");
-			public static final PacketType BLOCK_BREAK_ANIMATION =        new PacketType(PROTOCOL, SENDER, 0x08, 0x25, "BlockBreakAnimation");
-			public static final PacketType TILE_ENTITY_DATA =             new PacketType(PROTOCOL, SENDER, 0x09, 0x35, "TileEntityData");
-			public static final PacketType BLOCK_ACTION =                 new PacketType(PROTOCOL, SENDER, 0x0A, 0x24, "BlockAction");
-			public static final PacketType BLOCK_CHANGE =                 new PacketType(PROTOCOL, SENDER, 0x0B, 0x23, "BlockChange");
-			public static final PacketType BOSS =                         new PacketType(PROTOCOL, SENDER, 0x0C, 0xFF, "Boss");
-			public static final PacketType SERVER_DIFFICULTY =            new PacketType(PROTOCOL, SENDER, 0x0D, 0x41, "ServerDifficulty");
-			public static final PacketType TAB_COMPLETE =                 new PacketType(PROTOCOL, SENDER, 0x0E, 0x3A, "TabComplete");
-			public static final PacketType CHAT =                         new PacketType(PROTOCOL, SENDER, 0x0F, 0x02, "Chat");
-			public static final PacketType MULTI_BLOCK_CHANGE =           new PacketType(PROTOCOL, SENDER, 0x10, 0x22, "MultiBlockChange");
-			public static final PacketType TRANSACTION =                  new PacketType(PROTOCOL, SENDER, 0x11, 0x32, "Transaction");
-			public static final PacketType CLOSE_WINDOW =                 new PacketType(PROTOCOL, SENDER, 0x12, 0x2E, "CloseWindow");
-			public static final PacketType OPEN_WINDOW =                  new PacketType(PROTOCOL, SENDER, 0x13, 0x2D, "OpenWindow");
-			public static final PacketType WINDOW_ITEMS =                 new PacketType(PROTOCOL, SENDER, 0x14, 0x30, "WindowItems");
-			public static final PacketType WINDOW_DATA =                  new PacketType(PROTOCOL, SENDER, 0x15, 0x31, "WindowData");
-			public static final PacketType SET_SLOT =                     new PacketType(PROTOCOL, SENDER, 0x16, 0x2F, "SetSlot");
-			public static final PacketType SET_COOLDOWN =                 new PacketType(PROTOCOL, SENDER, 0x17, 0xFC, "SetCooldown");
-			public static final PacketType CUSTOM_PAYLOAD =               new PacketType(PROTOCOL, SENDER, 0x18, 0x3F, "CustomPayload");
-			public static final PacketType CUSTOM_SOUND_EFFECT =          new PacketType(PROTOCOL, SENDER, 0x19, 0xFD, "CustomSoundEffect");
-			public static final PacketType KICK_DISCONNECT =              new PacketType(PROTOCOL, SENDER, 0x1A, 0x40, "KickDisconnect");
-			public static final PacketType ENTITY_STATUS =                new PacketType(PROTOCOL, SENDER, 0x1B, 0x1A, "EntityStatus");
-			public static final PacketType EXPLOSION =                    new PacketType(PROTOCOL, SENDER, 0x1C, 0x27, "Explosion");
-			public static final PacketType UNLOAD_CHUNK =                 new PacketType(PROTOCOL, SENDER, 0x1D, 0xFA, "UnloadChunk");
-			public static final PacketType GAME_STATE_CHANGE =            new PacketType(PROTOCOL, SENDER, 0x1E, 0x2B, "GameStateChange");
-			public static final PacketType KEEP_ALIVE =                   new PacketType(PROTOCOL, SENDER, 0x1F, 0x00, "KeepAlive");
-			public static final PacketType MAP_CHUNK =                    new PacketType(PROTOCOL, SENDER, 0x20, 0x21, "MapChunk");
-			public static final PacketType WORLD_EVENT =                  new PacketType(PROTOCOL, SENDER, 0x21, 0x28, "WorldEvent");
-			public static final PacketType WORLD_PARTICLES =              new PacketType(PROTOCOL, SENDER, 0x22, 0x2A, "WorldParticles");
-			public static final PacketType LOGIN =                        new PacketType(PROTOCOL, SENDER, 0x23, 0x01, "Login");
-			public static final PacketType MAP =                          new PacketType(PROTOCOL, SENDER, 0x24, 0x34, "Map");
-			public static final PacketType ENTITY =                       new PacketType(PROTOCOL, SENDER, 0x25, 0x14, "Entity");
-			public static final PacketType REL_ENTITY_MOVE =              new PacketType(PROTOCOL, SENDER, 0x26, 0x15, "RelEntityMove");
-			public static final PacketType REL_ENTITY_MOVE_LOOK =         new PacketType(PROTOCOL, SENDER, 0x27, 0x17, "RelEntityMoveLook");
-			public static final PacketType ENTITY_LOOK =                  new PacketType(PROTOCOL, SENDER, 0x28, 0x16, "EntityLook");
-			public static final PacketType VEHICLE_MOVE =                 new PacketType(PROTOCOL, SENDER, 0x29, 0xFE, "VehicleMove");
-			public static final PacketType OPEN_SIGN_EDITOR =             new PacketType(PROTOCOL, SENDER, 0x2A, 0x36, "OpenSignEditor");
-			public static final PacketType ABILITIES =                    new PacketType(PROTOCOL, SENDER, 0x2B, 0x39, "Abilities");
-			public static final PacketType COMBAT_EVENT =                 new PacketType(PROTOCOL, SENDER, 0x2C, 0x42, "CombatEvent");
-			public static final PacketType PLAYER_INFO =                  new PacketType(PROTOCOL, SENDER, 0x2D, 0x38, "PlayerInfo");
-			public static final PacketType POSITION =                     new PacketType(PROTOCOL, SENDER, 0x2E, 0x08, "Position");
-			public static final PacketType BED =                          new PacketType(PROTOCOL, SENDER, 0x2F, 0x0A, "Bed");
-			public static final PacketType RECIPES =                      new PacketType(PROTOCOL, SENDER, 0x30, -1,   "Recipes");
-			public static final PacketType ENTITY_DESTROY =               new PacketType(PROTOCOL, SENDER, 0x31, 0x13, "EntityDestroy");
-			public static final PacketType REMOVE_ENTITY_EFFECT =         new PacketType(PROTOCOL, SENDER, 0x32, 0x1E, "RemoveEntityEffect");
-			public static final PacketType RESOURCE_PACK_SEND =           new PacketType(PROTOCOL, SENDER, 0x33, 0x48, "ResourcePackSend");
-			public static final PacketType RESPAWN =                      new PacketType(PROTOCOL, SENDER, 0x34, 0x07, "Respawn");
-			public static final PacketType ENTITY_HEAD_ROTATION =         new PacketType(PROTOCOL, SENDER, 0x35, 0x19, "EntityHeadRotation");
-			public static final PacketType SELECT_ADVANCEMENT_TAB =       new PacketType(PROTOCOL, SENDER, 0x36, -1,   "SelectAdvancementTab");
-			public static final PacketType WORLD_BORDER =                 new PacketType(PROTOCOL, SENDER, 0x37, 0x44, "WorldBorder");
-			public static final PacketType CAMERA =                       new PacketType(PROTOCOL, SENDER, 0x38, 0x43, "Camera");
-			public static final PacketType HELD_ITEM_SLOT =               new PacketType(PROTOCOL, SENDER, 0x39, 0x09, "HeldItemSlot");
-			public static final PacketType SCOREBOARD_DISPLAY_OBJECTIVE = new PacketType(PROTOCOL, SENDER, 0x3A, 0x3D, "ScoreboardDisplayObjective");
-			public static final PacketType ENTITY_METADATA =              new PacketType(PROTOCOL, SENDER, 0x3B, 0x1C, "EntityMetadata");
-			public static final PacketType ATTACH_ENTITY =                new PacketType(PROTOCOL, SENDER, 0x3C, 0x1B, "AttachEntity");
-			public static final PacketType ENTITY_VELOCITY =              new PacketType(PROTOCOL, SENDER, 0x3D, 0x12, "EntityVelocity");
-			public static final PacketType ENTITY_EQUIPMENT =             new PacketType(PROTOCOL, SENDER, 0x3E, 0x04, "EntityEquipment");
-			public static final PacketType EXPERIENCE =                   new PacketType(PROTOCOL, SENDER, 0x3F, 0x1F, "Experience");
-			public static final PacketType UPDATE_HEALTH =                new PacketType(PROTOCOL, SENDER, 0x40, 0x06, "UpdateHealth");
-			public static final PacketType SCOREBOARD_OBJECTIVE =         new PacketType(PROTOCOL, SENDER, 0x41, 0x3B, "ScoreboardObjective");
-			public static final PacketType MOUNT =                        new PacketType(PROTOCOL, SENDER, 0x42, 0xFB, "Mount");
-			public static final PacketType SCOREBOARD_TEAM =              new PacketType(PROTOCOL, SENDER, 0x43, 0x3E, "ScoreboardTeam");
-			public static final PacketType SCOREBOARD_SCORE =             new PacketType(PROTOCOL, SENDER, 0x44, 0x3C, "ScoreboardScore");
-			public static final PacketType SPAWN_POSITION =               new PacketType(PROTOCOL, SENDER, 0x45, 0x05, "SpawnPosition");
-			public static final PacketType UPDATE_TIME =                  new PacketType(PROTOCOL, SENDER, 0x46, 0x03, "UpdateTime");
-			public static final PacketType TITLE =                        new PacketType(PROTOCOL, SENDER, 0x47, 0x45, "Title");
-			public static final PacketType NAMED_SOUND_EFFECT =           new PacketType(PROTOCOL, SENDER, 0x48, 0x29, "NamedSoundEffect");
-			public static final PacketType PLAYER_LIST_HEADER_FOOTER =    new PacketType(PROTOCOL, SENDER, 0x49, 0x47, "PlayerListHeaderFooter");
-			public static final PacketType COLLECT =                      new PacketType(PROTOCOL, SENDER, 0x4A, 0x0D, "Collect");
-			public static final PacketType ENTITY_TELEPORT =              new PacketType(PROTOCOL, SENDER, 0x4B, 0x18, "EntityTeleport");
-			public static final PacketType ADVANCEMENTS =                 new PacketType(PROTOCOL, SENDER, 0x4C, -1,   "Advancements");
-			public static final PacketType UPDATE_ATTRIBUTES =            new PacketType(PROTOCOL, SENDER, 0x4D, 0x20, "UpdateAttributes");
-			public static final PacketType ENTITY_EFFECT =                new PacketType(PROTOCOL, SENDER, 0x4E, 0x1D, "EntityEffect");
+			public static final PacketType SPAWN_ENTITY =                 new PacketType(PROTOCOL, SENDER, 0x00, 0x00, "SpawnEntity");
+			public static final PacketType SPAWN_ENTITY_EXPERIENCE_ORB =  new PacketType(PROTOCOL, SENDER, 0x01, 0x01, "SpawnEntityExperienceOrb");
+			public static final PacketType SPAWN_ENTITY_WEATHER =         new PacketType(PROTOCOL, SENDER, 0x02, 0x02, "SpawnEntityWeather");
+			public static final PacketType SPAWN_ENTITY_LIVING =          new PacketType(PROTOCOL, SENDER, 0x03, 0x03, "SpawnEntityLiving");
+			public static final PacketType SPAWN_ENTITY_PAINTING =        new PacketType(PROTOCOL, SENDER, 0x04, 0x04, "SpawnEntityPainting");
+			public static final PacketType NAMED_ENTITY_SPAWN =           new PacketType(PROTOCOL, SENDER, 0x05, 0x05, "NamedEntitySpawn");
+			public static final PacketType ANIMATION =                    new PacketType(PROTOCOL, SENDER, 0x06, 0x06, "Animation");
+			public static final PacketType STATISTIC =                    new PacketType(PROTOCOL, SENDER, 0x07, 0x07, "Statistic");
+			public static final PacketType BLOCK_BREAK_ANIMATION =        new PacketType(PROTOCOL, SENDER, 0x08, 0x08, "BlockBreakAnimation");
+			public static final PacketType TILE_ENTITY_DATA =             new PacketType(PROTOCOL, SENDER, 0x09, 0x09, "TileEntityData");
+			public static final PacketType BLOCK_ACTION =                 new PacketType(PROTOCOL, SENDER, 0x0A, 0x0A, "BlockAction");
+			public static final PacketType BLOCK_CHANGE =                 new PacketType(PROTOCOL, SENDER, 0x0B, 0x0B, "BlockChange");
+			public static final PacketType BOSS =                         new PacketType(PROTOCOL, SENDER, 0x0C, 0x0C, "Boss");
+			public static final PacketType SERVER_DIFFICULTY =            new PacketType(PROTOCOL, SENDER, 0x0D, 0x0D, "ServerDifficulty");
+			public static final PacketType TAB_COMPLETE =                 new PacketType(PROTOCOL, SENDER, 0x0E, 0x0E, "TabComplete");
+			public static final PacketType CHAT =                         new PacketType(PROTOCOL, SENDER, 0x0F, 0x0F, "Chat");
+			public static final PacketType MULTI_BLOCK_CHANGE =           new PacketType(PROTOCOL, SENDER, 0x10, 0x10, "MultiBlockChange");
+			public static final PacketType TRANSACTION =                  new PacketType(PROTOCOL, SENDER, 0x11, 0x11, "Transaction");
+			public static final PacketType CLOSE_WINDOW =                 new PacketType(PROTOCOL, SENDER, 0x12, 0x12, "CloseWindow");
+			public static final PacketType OPEN_WINDOW =                  new PacketType(PROTOCOL, SENDER, 0x13, 0x13, "OpenWindow");
+			public static final PacketType WINDOW_ITEMS =                 new PacketType(PROTOCOL, SENDER, 0x14, 0x14, "WindowItems");
+			public static final PacketType WINDOW_DATA =                  new PacketType(PROTOCOL, SENDER, 0x15, 0x15, "WindowData");
+			public static final PacketType SET_SLOT =                     new PacketType(PROTOCOL, SENDER, 0x16, 0x16, "SetSlot");
+			public static final PacketType SET_COOLDOWN =                 new PacketType(PROTOCOL, SENDER, 0x17, 0x17, "SetCooldown");
+			public static final PacketType CUSTOM_PAYLOAD =               new PacketType(PROTOCOL, SENDER, 0x18, 0x18, "CustomPayload");
+			public static final PacketType CUSTOM_SOUND_EFFECT =          new PacketType(PROTOCOL, SENDER, 0x19, 0x19, "CustomSoundEffect");
+			public static final PacketType KICK_DISCONNECT =              new PacketType(PROTOCOL, SENDER, 0x1A, 0x1A, "KickDisconnect");
+			public static final PacketType ENTITY_STATUS =                new PacketType(PROTOCOL, SENDER, 0x1B, 0x1B, "EntityStatus");
+			public static final PacketType EXPLOSION =                    new PacketType(PROTOCOL, SENDER, 0x1C, 0x1C, "Explosion");
+			public static final PacketType UNLOAD_CHUNK =                 new PacketType(PROTOCOL, SENDER, 0x1D, 0x1D, "UnloadChunk");
+			public static final PacketType GAME_STATE_CHANGE =            new PacketType(PROTOCOL, SENDER, 0x1E, 0x1E, "GameStateChange");
+			public static final PacketType KEEP_ALIVE =                   new PacketType(PROTOCOL, SENDER, 0x1F, 0x1F, "KeepAlive");
+			public static final PacketType MAP_CHUNK =                    new PacketType(PROTOCOL, SENDER, 0x20, 0x20, "MapChunk");
+			public static final PacketType WORLD_EVENT =                  new PacketType(PROTOCOL, SENDER, 0x21, 0x21, "WorldEvent");
+			public static final PacketType WORLD_PARTICLES =              new PacketType(PROTOCOL, SENDER, 0x22, 0x22, "WorldParticles");
+			public static final PacketType LOGIN =                        new PacketType(PROTOCOL, SENDER, 0x23, 0x23, "Login");
+			public static final PacketType MAP =                          new PacketType(PROTOCOL, SENDER, 0x24, 0x24, "Map");
+			public static final PacketType ENTITY =                       new PacketType(PROTOCOL, SENDER, 0x25, 0x25, "Entity");
+			public static final PacketType REL_ENTITY_MOVE =              new PacketType(PROTOCOL, SENDER, 0x26, 0x26, "RelEntityMove");
+			public static final PacketType REL_ENTITY_MOVE_LOOK =         new PacketType(PROTOCOL, SENDER, 0x27, 0x27, "RelEntityMoveLook");
+			public static final PacketType ENTITY_LOOK =                  new PacketType(PROTOCOL, SENDER, 0x28, 0x28, "EntityLook");
+			public static final PacketType VEHICLE_MOVE =                 new PacketType(PROTOCOL, SENDER, 0x29, 0x29, "VehicleMove");
+			public static final PacketType OPEN_SIGN_EDITOR =             new PacketType(PROTOCOL, SENDER, 0x2A, 0x2A, "OpenSignEditor");
+			public static final PacketType AUTO_RECIPE =                  new PacketType(PROTOCOL, SENDER, 0x2B, -1,   "AutoRecipe");
+			public static final PacketType ABILITIES =                    new PacketType(PROTOCOL, SENDER, 0x2C, 0x2B, "Abilities");
+			public static final PacketType COMBAT_EVENT =                 new PacketType(PROTOCOL, SENDER, 0x2D, 0x2C, "CombatEvent");
+			public static final PacketType PLAYER_INFO =                  new PacketType(PROTOCOL, SENDER, 0x2E, 0x2D, "PlayerInfo");
+			public static final PacketType POSITION =                     new PacketType(PROTOCOL, SENDER, 0x2F, 0x2E, "Position");
+			public static final PacketType BED =                          new PacketType(PROTOCOL, SENDER, 0x30, 0x2F, "Bed");
+			public static final PacketType RECIPES =                      new PacketType(PROTOCOL, SENDER, 0x31, 0x30, "Recipes");
+			public static final PacketType ENTITY_DESTROY =               new PacketType(PROTOCOL, SENDER, 0x32, 0x31, "EntityDestroy");
+			public static final PacketType REMOVE_ENTITY_EFFECT =         new PacketType(PROTOCOL, SENDER, 0x33, 0x32, "RemoveEntityEffect");
+			public static final PacketType RESOURCE_PACK_SEND =           new PacketType(PROTOCOL, SENDER, 0x34, 0x33, "ResourcePackSend");
+			public static final PacketType RESPAWN =                      new PacketType(PROTOCOL, SENDER, 0x35, 0x34, "Respawn");
+			public static final PacketType ENTITY_HEAD_ROTATION =         new PacketType(PROTOCOL, SENDER, 0x36, 0x35, "EntityHeadRotation");
+			public static final PacketType SELECT_ADVANCEMENT_TAB =       new PacketType(PROTOCOL, SENDER, 0x37, 0x36, "SelectAdvancementTab");
+			public static final PacketType WORLD_BORDER =                 new PacketType(PROTOCOL, SENDER, 0x38, 0x37, "WorldBorder");
+			public static final PacketType CAMERA =                       new PacketType(PROTOCOL, SENDER, 0x39, 0x38, "Camera");
+			public static final PacketType HELD_ITEM_SLOT =               new PacketType(PROTOCOL, SENDER, 0x3A, 0x39, "HeldItemSlot");
+			public static final PacketType SCOREBOARD_DISPLAY_OBJECTIVE = new PacketType(PROTOCOL, SENDER, 0x3B, 0x3A, "ScoreboardDisplayObjective");
+			public static final PacketType ENTITY_METADATA =              new PacketType(PROTOCOL, SENDER, 0x3C, 0x3B, "EntityMetadata");
+			public static final PacketType ATTACH_ENTITY =                new PacketType(PROTOCOL, SENDER, 0x3D, 0x3C, "AttachEntity");
+			public static final PacketType ENTITY_VELOCITY =              new PacketType(PROTOCOL, SENDER, 0x3E, 0x3D, "EntityVelocity");
+			public static final PacketType ENTITY_EQUIPMENT =             new PacketType(PROTOCOL, SENDER, 0x3F, 0x3E, "EntityEquipment");
+			public static final PacketType EXPERIENCE =                   new PacketType(PROTOCOL, SENDER, 0x40, 0x3F, "Experience");
+			public static final PacketType UPDATE_HEALTH =                new PacketType(PROTOCOL, SENDER, 0x41, 0x40, "UpdateHealth");
+			public static final PacketType SCOREBOARD_OBJECTIVE =         new PacketType(PROTOCOL, SENDER, 0x42, 0x41, "ScoreboardObjective");
+			public static final PacketType MOUNT =                        new PacketType(PROTOCOL, SENDER, 0x43, 0x42, "Mount");
+			public static final PacketType SCOREBOARD_TEAM =              new PacketType(PROTOCOL, SENDER, 0x44, 0x43, "ScoreboardTeam");
+			public static final PacketType SCOREBOARD_SCORE =             new PacketType(PROTOCOL, SENDER, 0x45, 0x44, "ScoreboardScore");
+			public static final PacketType SPAWN_POSITION =               new PacketType(PROTOCOL, SENDER, 0x46, 0x45, "SpawnPosition");
+			public static final PacketType UPDATE_TIME =                  new PacketType(PROTOCOL, SENDER, 0x47, 0x46, "UpdateTime");
+			public static final PacketType TITLE =                        new PacketType(PROTOCOL, SENDER, 0x48, 0x47, "Title");
+			public static final PacketType NAMED_SOUND_EFFECT =           new PacketType(PROTOCOL, SENDER, 0x49, 0x48, "NamedSoundEffect");
+			public static final PacketType PLAYER_LIST_HEADER_FOOTER =    new PacketType(PROTOCOL, SENDER, 0x4A, 0x49, "PlayerListHeaderFooter");
+			public static final PacketType COLLECT =                      new PacketType(PROTOCOL, SENDER, 0x4B, 0x4A, "Collect");
+			public static final PacketType ENTITY_TELEPORT =              new PacketType(PROTOCOL, SENDER, 0x4C, 0x4B, "EntityTeleport");
+			public static final PacketType ADVANCEMENTS =                 new PacketType(PROTOCOL, SENDER, 0x4D, 0x4C, "Advancements");
+			public static final PacketType UPDATE_ATTRIBUTES =            new PacketType(PROTOCOL, SENDER, 0x4E, 0x4D, "UpdateAttributes");
+			public static final PacketType ENTITY_EFFECT =                new PacketType(PROTOCOL, SENDER, 0x4F, 0x4E, "EntityEffect");
 
 			// ---- Removed in 1.9
 
@@ -264,39 +265,39 @@ public class PacketType implements Serializable, Cloneable, Comparable<PacketTyp
 		public static class Client extends PacketTypeEnum {
 			private final static Sender SENDER = Sender.CLIENT;
 
-			public static final PacketType TELEPORT_ACCEPT =              new PacketType(PROTOCOL, SENDER, 0x00, 0xF9, "TeleportAccept");
-			public static final PacketType AUTO_RECIPE =                  new PacketType(PROTOCOL, SENDER, 0x01, -1,   "AutoRecipe");
-			public static final PacketType TAB_COMPLETE =                 new PacketType(PROTOCOL, SENDER, 0x02, 0x14, "TabComplete");
-			public static final PacketType CHAT =                         new PacketType(PROTOCOL, SENDER, 0x03, 0x01, "Chat");
-			public static final PacketType CLIENT_COMMAND =               new PacketType(PROTOCOL, SENDER, 0x04, 0x16, "ClientCommand");
-			public static final PacketType SETTINGS =                     new PacketType(PROTOCOL, SENDER, 0x05, 0x15, "Settings");
-			public static final PacketType TRANSACTION =                  new PacketType(PROTOCOL, SENDER, 0x06, 0x0F, "Transaction");
-			public static final PacketType ENCHANT_ITEM =                 new PacketType(PROTOCOL, SENDER, 0x07, 0x11, "EnchantItem");
-			public static final PacketType WINDOW_CLICK =                 new PacketType(PROTOCOL, SENDER, 0x08, 0x0E, "WindowClick");
-			public static final PacketType CLOSE_WINDOW =                 new PacketType(PROTOCOL, SENDER, 0x09, 0x0D, "CloseWindow");
-			public static final PacketType CUSTOM_PAYLOAD =               new PacketType(PROTOCOL, SENDER, 0x0A, 0x17, "CustomPayload");
-			public static final PacketType USE_ENTITY =                   new PacketType(PROTOCOL, SENDER, 0x0B, 0x02, "UseEntity");
-			public static final PacketType KEEP_ALIVE =                   new PacketType(PROTOCOL, SENDER, 0x0C, 0x00, "KeepAlive");
-			public static final PacketType FLYING =                       new PacketType(PROTOCOL, SENDER, 0x0D, 0x03, "Flying");
-			public static final PacketType POSITION =                     new PacketType(PROTOCOL, SENDER, 0x0E, 0x04, "Position");
-			public static final PacketType POSITION_LOOK =                new PacketType(PROTOCOL, SENDER, 0x0F, 0x06, "PositionLook");
-			public static final PacketType LOOK =                         new PacketType(PROTOCOL, SENDER, 0x10, 0x05, "Look");
-			public static final PacketType VEHICLE_MOVE =                 new PacketType(PROTOCOL, SENDER, 0x11, 0xF8, "VehicleMove");
-			public static final PacketType BOAT_MOVE =                    new PacketType(PROTOCOL, SENDER, 0x12, 0xF7, "BoatMove");
+			public static final PacketType TELEPORT_ACCEPT =              new PacketType(PROTOCOL, SENDER, 0x00, 0x00, "TeleportAccept");
+			public static final PacketType TAB_COMPLETE =                 new PacketType(PROTOCOL, SENDER, 0x01, 0x02, "TabComplete");
+			public static final PacketType CHAT =                         new PacketType(PROTOCOL, SENDER, 0x02, 0x03, "Chat");
+			public static final PacketType CLIENT_COMMAND =               new PacketType(PROTOCOL, SENDER, 0x03, 0x04, "ClientCommand");
+			public static final PacketType SETTINGS =                     new PacketType(PROTOCOL, SENDER, 0x04, 0x05, "Settings");
+			public static final PacketType TRANSACTION =                  new PacketType(PROTOCOL, SENDER, 0x05, 0x06, "Transaction");
+			public static final PacketType ENCHANT_ITEM =                 new PacketType(PROTOCOL, SENDER, 0x06, 0x07, "EnchantItem");
+			public static final PacketType WINDOW_CLICK =                 new PacketType(PROTOCOL, SENDER, 0x07, 0x08, "WindowClick");
+			public static final PacketType CLOSE_WINDOW =                 new PacketType(PROTOCOL, SENDER, 0x08, 0x09, "CloseWindow");
+			public static final PacketType CUSTOM_PAYLOAD =               new PacketType(PROTOCOL, SENDER, 0x09, 0x0A, "CustomPayload");
+			public static final PacketType USE_ENTITY =                   new PacketType(PROTOCOL, SENDER, 0x0A, 0x0B, "UseEntity");
+			public static final PacketType KEEP_ALIVE =                   new PacketType(PROTOCOL, SENDER, 0x0B, 0x0C, "KeepAlive");
+			public static final PacketType FLYING =                       new PacketType(PROTOCOL, SENDER, 0x0C, 0x0D, "Flying");
+			public static final PacketType POSITION =                     new PacketType(PROTOCOL, SENDER, 0x0D, 0x0E, "Position");
+			public static final PacketType POSITION_LOOK =                new PacketType(PROTOCOL, SENDER, 0x0E, 0x0F, "PositionLook");
+			public static final PacketType LOOK =                         new PacketType(PROTOCOL, SENDER, 0x0F, 0x10, "Look");
+			public static final PacketType VEHICLE_MOVE =                 new PacketType(PROTOCOL, SENDER, 0x10, 0x11, "VehicleMove");
+			public static final PacketType BOAT_MOVE =                    new PacketType(PROTOCOL, SENDER, 0x11, 0x12, "BoatMove");
+			public static final PacketType AUTO_RECIPE =                  new PacketType(PROTOCOL, SENDER, 0x12, 0x01, "AutoRecipe");
 			public static final PacketType ABILITIES =                    new PacketType(PROTOCOL, SENDER, 0x13, 0x13, "Abilities");
-			public static final PacketType BLOCK_DIG =                    new PacketType(PROTOCOL, SENDER, 0x14, 0x07, "BlockDig");
-			public static final PacketType ENTITY_ACTION =                new PacketType(PROTOCOL, SENDER, 0x15, 0x0B, "EntityAction");
-			public static final PacketType STEER_VEHICLE =                new PacketType(PROTOCOL, SENDER, 0x16, 0x0C, "SteerVehicle");
-			public static final PacketType RECIPE_DISPLAYED =             new PacketType(PROTOCOL, SENDER, 0x17, -1,   "RecipeDisplayed");
-			public static final PacketType RESOURCE_PACK_STATUS =         new PacketType(PROTOCOL, SENDER, 0x18, 0x19, "ResourcePackStatus");
-			public static final PacketType ADVANCEMENTS =                 new PacketType(PROTOCOL, SENDER, 0x19, -1,   "Advancements");
-			public static final PacketType HELD_ITEM_SLOT =               new PacketType(PROTOCOL, SENDER, 0x1A, 0x09, "HeldItemSlot");
-			public static final PacketType SET_CREATIVE_SLOT =            new PacketType(PROTOCOL, SENDER, 0x1B, 0x10, "SetCreativeSlot");
-			public static final PacketType UPDATE_SIGN =                  new PacketType(PROTOCOL, SENDER, 0x1C, 0x12, "UpdateSign");
-			public static final PacketType ARM_ANIMATION =                new PacketType(PROTOCOL, SENDER, 0x1D, 0x0A, "ArmAnimation");
-			public static final PacketType SPECTATE =                     new PacketType(PROTOCOL, SENDER, 0x1E, 0x18, "Spectate");
-			public static final PacketType USE_ITEM =                     new PacketType(PROTOCOL, SENDER, 0x1F, 0xF6, "UseItem");
-			public static final PacketType BLOCK_PLACE =                  new PacketType(PROTOCOL, SENDER, 0x20, 0x08, "BlockPlace");
+			public static final PacketType BLOCK_DIG =                    new PacketType(PROTOCOL, SENDER, 0x14, 0x14, "BlockDig");
+			public static final PacketType ENTITY_ACTION =                new PacketType(PROTOCOL, SENDER, 0x15, 0x15, "EntityAction");
+			public static final PacketType STEER_VEHICLE =                new PacketType(PROTOCOL, SENDER, 0x16, 0x16, "SteerVehicle");
+			public static final PacketType RECIPE_DISPLAYED =             new PacketType(PROTOCOL, SENDER, 0x17, 0x17, "RecipeDisplayed");
+			public static final PacketType RESOURCE_PACK_STATUS =         new PacketType(PROTOCOL, SENDER, 0x18, 0x18, "ResourcePackStatus");
+			public static final PacketType ADVANCEMENTS =                 new PacketType(PROTOCOL, SENDER, 0x19, 0x19, "Advancements");
+			public static final PacketType HELD_ITEM_SLOT =               new PacketType(PROTOCOL, SENDER, 0x1A, 0x1A, "HeldItemSlot");
+			public static final PacketType SET_CREATIVE_SLOT =            new PacketType(PROTOCOL, SENDER, 0x1B, 0x1B, "SetCreativeSlot");
+			public static final PacketType UPDATE_SIGN =                  new PacketType(PROTOCOL, SENDER, 0x1C, 0x1C, "UpdateSign");
+			public static final PacketType ARM_ANIMATION =                new PacketType(PROTOCOL, SENDER, 0x1D, 0x1D, "ArmAnimation");
+			public static final PacketType SPECTATE =                     new PacketType(PROTOCOL, SENDER, 0x1E, 0x1E, "Spectate");
+			public static final PacketType USE_ITEM =                     new PacketType(PROTOCOL, SENDER, 0x1F, 0x1F, "UseItem");
+			public static final PacketType BLOCK_PLACE =                  new PacketType(PROTOCOL, SENDER, 0x20, 0x20, "BlockPlace");
 
 			private final static Client INSTANCE = new Client();
 
diff --git a/modules/API/src/main/java/com/comphenix/protocol/events/PacketContainer.java b/modules/API/src/main/java/com/comphenix/protocol/events/PacketContainer.java
index 0073be3e..68c68f51 100644
--- a/modules/API/src/main/java/com/comphenix/protocol/events/PacketContainer.java
+++ b/modules/API/src/main/java/com/comphenix/protocol/events/PacketContainer.java
@@ -995,6 +995,18 @@ public class PacketContainer implements Serializable {
 			    BukkitConverters.getSetConverter(converter));
     }
 
+	/**
+	 * Retrieve a read/write structure for the List class.
+	 * @param converter Converter for elements
+	 * @param <E> Element param
+	 * @return A modifier for List fields
+	 */
+	public <E> StructureModifier<List<E>> getLists(EquivalentConverter<E> converter) {
+		return structureModifier.withType(
+				List.class,
+				BukkitConverters.getListConverter(converter));
+    }
+
     /**
      * Retrieve a read/write structure for an enum. This allows for the use of
      * user-created enums that may not exist in ProtocolLib. The specific (user
diff --git a/modules/API/src/main/java/com/comphenix/protocol/reflect/StructureModifier.java b/modules/API/src/main/java/com/comphenix/protocol/reflect/StructureModifier.java
index bcf9cef8..1d7ef222 100644
--- a/modules/API/src/main/java/com/comphenix/protocol/reflect/StructureModifier.java
+++ b/modules/API/src/main/java/com/comphenix/protocol/reflect/StructureModifier.java
@@ -19,10 +19,7 @@ package com.comphenix.protocol.reflect;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Level;
 
@@ -263,6 +260,24 @@ public class StructureModifier<TField> {
 			return null;
 		}
 	}
+
+	/**
+	 * Reads the value of a field only if it exists. If the field does not exist, an empty {@link Optional} is returned.
+	 * <p>
+	 * This method has the same functionality as {@link #readSafely(int)}, but enforces null checks by way of an Optional.
+	 * It will eventually become the preferred method of reading fields.
+	 *
+	 * @param fieldIndex index of the field
+	 * @return An optional that may contain the value of the field
+	 * @see #readSafely(int)
+	 */
+	public Optional<TField> optionRead(int fieldIndex) {
+		try {
+			return Optional.ofNullable(read(fieldIndex));
+		} catch (FieldAccessException ex) {
+			return Optional.empty();
+		}
+	}
 	
 	/**
 	 * Determine whether or not a field is read-only (final).
diff --git a/modules/API/src/main/java/com/comphenix/protocol/utility/MinecraftProtocolVersion.java b/modules/API/src/main/java/com/comphenix/protocol/utility/MinecraftProtocolVersion.java
index 93f226f3..8c961ea7 100644
--- a/modules/API/src/main/java/com/comphenix/protocol/utility/MinecraftProtocolVersion.java
+++ b/modules/API/src/main/java/com/comphenix/protocol/utility/MinecraftProtocolVersion.java
@@ -45,6 +45,7 @@ public class MinecraftProtocolVersion {
 		map.put(new MinecraftVersion(1, 11, 0), 315);
 		map.put(new MinecraftVersion(1, 11, 1), 316);
 		map.put(new MinecraftVersion(1, 12, 0), 335);
+		map.put(new MinecraftVersion(1, 12, 1), 338);
 		return map;
 	}
 
diff --git a/modules/API/src/main/java/com/comphenix/protocol/wrappers/AutoWrapper.java b/modules/API/src/main/java/com/comphenix/protocol/wrappers/AutoWrapper.java
index c0f67d96..ae847be4 100644
--- a/modules/API/src/main/java/com/comphenix/protocol/wrappers/AutoWrapper.java
+++ b/modules/API/src/main/java/com/comphenix/protocol/wrappers/AutoWrapper.java
@@ -18,11 +18,13 @@ package com.comphenix.protocol.wrappers;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.function.Function;
 
 import com.comphenix.protocol.reflect.EquivalentConverter;
+import com.comphenix.protocol.utility.MinecraftReflection;
 
 /**
  * Automatically wraps an internal NMS class to a non-versioned, deofbuscated class.
@@ -54,6 +56,10 @@ public class AutoWrapper<T> implements EquivalentConverter<T> {
 		return new AutoWrapper<>(wrapperClass, nmsClass);
 	}
 
+	public static <T> AutoWrapper<T> wrap(Class<T> wrapperClass, String nmsClassName) {
+		return wrap(wrapperClass, MinecraftReflection.getMinecraftClass(nmsClassName));
+	}
+
 	public AutoWrapper<T> field(int index, Function<Object, Object> wrapper, Function<Object, Object> unwrapper) {
 		wrappers.put(index, wrapper);
 		unwrappers.put(index, unwrapper);
@@ -74,7 +80,10 @@ public class AutoWrapper<T> implements EquivalentConverter<T> {
 		}
 
 		Field[] wrapperFields = wrapperClass.getDeclaredFields();
-		Field[] nmsFields = nmsClass.getDeclaredFields();
+		Field[] nmsFields = Arrays
+				.stream(nmsClass.getDeclaredFields())
+				.filter(field -> !Modifier.isStatic(field.getModifiers()))
+				.toArray(Field[]::new);
 
 		for (int i = 0; i < wrapperFields.length; i++) {
 			try {
@@ -107,7 +116,10 @@ public class AutoWrapper<T> implements EquivalentConverter<T> {
 		}
 
 		Field[] wrapperFields = wrapperClass.getDeclaredFields();
-		Field[] nmsFields = nmsClass.getDeclaredFields();
+		Field[] nmsFields = Arrays
+				.stream(nmsClass.getDeclaredFields())
+				.filter(field -> !Modifier.isStatic(field.getModifiers()))
+				.toArray(Field[]::new);
 
 		for (int i = 0; i < wrapperFields.length; i++) {
 			try {
diff --git a/pom.xml b/pom.xml
index aff08c10..4377065f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <minorVersion>4.4.0-SNAPSHOT</minorVersion>
-    <spigotVersion>1.12-R0.1-SNAPSHOT</spigotVersion>
+    <spigotVersion>1.12.1-R0.1-SNAPSHOT</spigotVersion>
   </properties>
 
   <modules>