diff --git a/src/main/java/cn/nukkit/entity/Entity.java b/src/main/java/cn/nukkit/entity/Entity.java
index 1c5389d2d0e..96af486bbb9 100644
--- a/src/main/java/cn/nukkit/entity/Entity.java
+++ b/src/main/java/cn/nukkit/entity/Entity.java
@@ -54,221 +54,221 @@ public abstract class Entity extends Location implements Metadatable {
 
     public abstract int getNetworkId();
 
-    public static final int DATA_TYPE_BYTE = valueOf(0);
-    public static final int DATA_TYPE_SHORT = valueOf(1);
-    public static final int DATA_TYPE_INT = valueOf(2);
-    public static final int DATA_TYPE_FLOAT = valueOf(3);
-    public static final int DATA_TYPE_STRING = valueOf(4);
-    public static final int DATA_TYPE_NBT = valueOf(5);
-    public static final int DATA_TYPE_POS = valueOf(6);
-    public static final int DATA_TYPE_LONG = valueOf(7);
-    public static final int DATA_TYPE_VECTOR3F = valueOf(8);
-
-    public static final int DATA_FLAGS = valueOf(0);
-    public static final int DATA_HEALTH = valueOf(1); //int (minecart/boat)
-    public static final int DATA_VARIANT = valueOf(2); //int
-    public static final int DATA_COLOR = 3, DATA_COLOUR = valueOf(3); //byte
-    public static final int DATA_NAMETAG = valueOf(4); //string
-    public static final int DATA_OWNER_EID = valueOf(5); //long
-    public static final int DATA_TARGET_EID = valueOf(6); //long
-    public static final int DATA_AIR = valueOf(7); //short
-    public static final int DATA_POTION_COLOR = valueOf(8); //int (ARGB!)
-    public static final int DATA_POTION_AMBIENT = valueOf(9); //byte
-    public static final int DATA_JUMP_DURATION = valueOf(10); //long
-    public static final int DATA_HURT_TIME = valueOf(11); //int (minecart/boat)
-    public static final int DATA_HURT_DIRECTION = valueOf(12); //int (minecart/boat)
-    public static final int DATA_PADDLE_TIME_LEFT = valueOf(13); //float
-    public static final int DATA_PADDLE_TIME_RIGHT = valueOf(14); //float
-    public static final int DATA_EXPERIENCE_VALUE = valueOf(15); //int (xp orb)
-    public static final int DATA_DISPLAY_ITEM = valueOf(16); //int (id | (data << 16))
-    public static final int DATA_DISPLAY_OFFSET = valueOf(17); //int
-    public static final int DATA_HAS_DISPLAY = valueOf(18); //byte (must be 1 for minecart to show block inside)
-    public static final int DATA_SWELL = valueOf(19);
-    public static final int DATA_OLD_SWELL = valueOf(20);
-    public static final int DATA_SWELL_DIR = valueOf(21);
-    public static final int DATA_CHARGE_AMOUNT = valueOf(22);
-    public static final int DATA_ENDERMAN_HELD_RUNTIME_ID = valueOf(23); //short
-    public static final int DATA_ENTITY_AGE = valueOf(24); //short
-    public static final int DATA_PLAYER_FLAGS = valueOf(26); //byte
-    public static final int DATA_PLAYER_INDEX = valueOf(27);
-    public static final int DATA_PLAYER_BED_POSITION = valueOf(28); //block coords
-    public static final int DATA_FIREBALL_POWER_X = valueOf(29); //float
-    public static final int DATA_FIREBALL_POWER_Y = valueOf(30);
-    public static final int DATA_FIREBALL_POWER_Z = valueOf(31);
-    public static final int DATA_AUX_POWER = valueOf(32);
-    public static final int DATA_FISH_X = valueOf(33);
-    public static final int DATA_FISH_Z = valueOf(34);
-    public static final int DATA_FISH_ANGLE = valueOf(35);
-    public static final int DATA_POTION_AUX_VALUE = valueOf(36); //short
-    public static final int DATA_LEAD_HOLDER_EID = valueOf(37); //long
-    public static final int DATA_SCALE = valueOf(38); //float
-    public static final int DATA_INTERACTIVE_TAG = valueOf(39); //string (button text)
-    public static final int DATA_NPC_SKIN_ID = valueOf(40); //string
-    public static final int DATA_URL_TAG = valueOf(41); //string
-    public static final int DATA_MAX_AIR = valueOf(42); //short
-    public static final int DATA_MARK_VARIANT = valueOf(43); //int
-    public static final int DATA_CONTAINER_TYPE = valueOf(44); //byte
-    public static final int DATA_CONTAINER_BASE_SIZE = valueOf(45); //int
-    public static final int DATA_CONTAINER_EXTRA_SLOTS_PER_STRENGTH = valueOf(46); //int
-    public static final int DATA_BLOCK_TARGET = valueOf(47); //block coords (ender crystal)
-    public static final int DATA_WITHER_INVULNERABLE_TICKS = valueOf(48); //int
-    public static final int DATA_WITHER_TARGET_1 = valueOf(49); //long
-    public static final int DATA_WITHER_TARGET_2 = valueOf(50); //long
-    public static final int DATA_WITHER_TARGET_3 = valueOf(51); //long
-    public static final int DATA_AERIAL_ATTACK = valueOf(52);
-    public static final int DATA_BOUNDING_BOX_WIDTH = valueOf(53); //float
-    public static final int DATA_BOUNDING_BOX_HEIGHT = valueOf(54); //float
-    public static final int DATA_FUSE_LENGTH = valueOf(55); //int
-    public static final int DATA_RIDER_SEAT_POSITION = valueOf(56); //vector3f
-    public static final int DATA_RIDER_ROTATION_LOCKED = valueOf(57); //byte
-    public static final int DATA_RIDER_MAX_ROTATION = valueOf(58); //float
-    public static final int DATA_RIDER_MIN_ROTATION = valueOf(59); //float
-    public static final int DATA_AREA_EFFECT_CLOUD_RADIUS = valueOf(60); //float
-    public static final int DATA_AREA_EFFECT_CLOUD_WAITING = valueOf(61); //int
-    public static final int DATA_AREA_EFFECT_CLOUD_PARTICLE_ID = valueOf(62); //int
-    public static final int DATA_SHULKER_PEEK_ID = valueOf(64); //int
-    public static final int DATA_SHULKER_ATTACH_FACE = valueOf(64); //byte
-    public static final int DATA_SHULKER_ATTACHED = valueOf(64); //short
-    public static final int DATA_SHULKER_ATTACH_POS = valueOf(66); //block coords
-    public static final int DATA_TRADING_PLAYER_EID = valueOf(67); //long
-    public static final int DATA_TRADING_CAREER = valueOf(68);
-    public static final int DATA_HAS_COMMAND_BLOCK = valueOf(69);
-    public static final int DATA_COMMAND_BLOCK_COMMAND = valueOf(70); //string
-    public static final int DATA_COMMAND_BLOCK_LAST_OUTPUT = valueOf(71); //string
-    public static final int DATA_COMMAND_BLOCK_TRACK_OUTPUT = valueOf(72); //byte
-    public static final int DATA_CONTROLLING_RIDER_SEAT_NUMBER = valueOf(73); //byte
-    public static final int DATA_STRENGTH = valueOf(74); //int
-    public static final int DATA_MAX_STRENGTH = valueOf(75); //int
-    public static final int DATA_SPELL_CASTING_COLOR = valueOf(76); //int
-    public static final int DATA_LIMITED_LIFE = valueOf(77);
-    public static final int DATA_ARMOR_STAND_POSE_INDEX = valueOf(78); // int
-    public static final int DATA_ENDER_CRYSTAL_TIME_OFFSET = valueOf(79); // int
-    public static final int DATA_ALWAYS_SHOW_NAMETAG = valueOf(80); // byte
-    public static final int DATA_COLOR_2 = valueOf(81); // byte
-    public static final int DATA_NAME_AUTHOR = valueOf(82);
-    public static final int DATA_SCORE_TAG = valueOf(83); //String
-    public static final int DATA_BALLOON_ATTACHED_ENTITY = valueOf(84); // long
-    public static final int DATA_PUFFERFISH_SIZE = valueOf(85);
-    public static final int DATA_BUBBLE_TIME = valueOf(86);
-    public static final int DATA_AGENT = valueOf(87);
-    public static final int DATA_SITTING_AMOUNT = valueOf(88);
-    public static final int DATA_SITTING_AMOUNT_PREVIOUS = valueOf(89);
-    public static final int DATA_EATING_COUNTER = valueOf(90);
-    public static final int DATA_FLAGS_EXTENDED = valueOf(91);
-    public static final int DATA_LAYING_AMOUNT = valueOf(92);
-    public static final int DATA_LAYING_AMOUNT_PREVIOUS = valueOf(93);
-    public static final int DATA_DURATION = valueOf(94);
-    public static final int DATA_SPAWN_TIME = valueOf(95);
-    public static final int DATA_CHANGE_RATE = valueOf(96);
-    public static final int DATA_CHANGE_ON_PICKUP = valueOf(97);
-    public static final int DATA_PICKUP_COUNT = valueOf(98);
-    public static final int DATA_INTERACT_TEXT = valueOf(99);
-    public static final int DATA_TRADE_TIER = valueOf(100);
-    public static final int DATA_MAX_TRADE_TIER = valueOf(101);
-    public static final int DATA_TRADE_EXPERIENCE = valueOf(102);
-    public static final int DATA_SKIN_ID = valueOf(103); // int ???
-    public static final int DATA_SPAWNING_FRAMES = valueOf(104);
-    public static final int DATA_COMMAND_BLOCK_TICK_DELAY = valueOf(105);
-    public static final int DATA_COMMAND_BLOCK_EXECUTE_ON_FIRST_TICK = valueOf(106);
-    public static final int DATA_AMBIENT_SOUND_INTERVAL = valueOf(107);
-    public static final int DATA_AMBIENT_SOUND_EVENT_NAME = valueOf(108);
-    public static final int DATA_FALL_DAMAGE_MULTIPLIER = valueOf(109);
-    public static final int DATA_NAME_RAW_TEXT = valueOf(110);
-    public static final int DATA_CAN_RIDE_TARGET = valueOf(111);
+    public static final int DATA_TYPE_BYTE = 0;
+    public static final int DATA_TYPE_SHORT = 1;
+    public static final int DATA_TYPE_INT = 2;
+    public static final int DATA_TYPE_FLOAT = 3;
+    public static final int DATA_TYPE_STRING = 4;
+    public static final int DATA_TYPE_NBT = 5;
+    public static final int DATA_TYPE_POS = 6;
+    public static final int DATA_TYPE_LONG = 7;
+    public static final int DATA_TYPE_VECTOR3F = 8;
+
+    public static final int DATA_FLAGS = 0;
+    public static final int DATA_HEALTH = 1; //int (minecart/boat)
+    public static final int DATA_VARIANT = 2; //int
+    public static final int DATA_COLOR = 3, DATA_COLOUR = 3; //byte
+    public static final int DATA_NAMETAG = 4; //string
+    public static final int DATA_OWNER_EID = 5; //long
+    public static final int DATA_TARGET_EID = 6; //long
+    public static final int DATA_AIR = 7; //short
+    public static final int DATA_POTION_COLOR = 8; //int (ARGB!)
+    public static final int DATA_POTION_AMBIENT = 9; //byte
+    public static final int DATA_JUMP_DURATION = 10; //long
+    public static final int DATA_HURT_TIME = 11; //int (minecart/boat)
+    public static final int DATA_HURT_DIRECTION = 12; //int (minecart/boat)
+    public static final int DATA_PADDLE_TIME_LEFT = 13; //float
+    public static final int DATA_PADDLE_TIME_RIGHT = 14; //float
+    public static final int DATA_EXPERIENCE_VALUE = 15; //int (xp orb)
+    public static final int DATA_DISPLAY_ITEM = 16; //int (id | (data << 16))
+    public static final int DATA_DISPLAY_OFFSET = 17; //int
+    public static final int DATA_HAS_DISPLAY = 18; //byte (must be 1 for minecart to show block inside)
+    public static final int DATA_SWELL = 19;
+    public static final int DATA_OLD_SWELL = 20;
+    public static final int DATA_SWELL_DIR = 21;
+    public static final int DATA_CHARGE_AMOUNT = 22;
+    public static final int DATA_ENDERMAN_HELD_RUNTIME_ID = 23; //short
+    public static final int DATA_ENTITY_AGE = 24; //short
+    public static final int DATA_PLAYER_FLAGS = 26; //byte
+    public static final int DATA_PLAYER_INDEX = 27;
+    public static final int DATA_PLAYER_BED_POSITION = 28; //block coords
+    public static final int DATA_FIREBALL_POWER_X = 29; //float
+    public static final int DATA_FIREBALL_POWER_Y = 30;
+    public static final int DATA_FIREBALL_POWER_Z = 31;
+    public static final int DATA_AUX_POWER = 32;
+    public static final int DATA_FISH_X = 33;
+    public static final int DATA_FISH_Z = 34;
+    public static final int DATA_FISH_ANGLE = 35;
+    public static final int DATA_POTION_AUX_VALUE = 36; //short
+    public static final int DATA_LEAD_HOLDER_EID = 37; //long
+    public static final int DATA_SCALE = 38; //float
+    public static final int DATA_INTERACTIVE_TAG = 39; //string (button text)
+    public static final int DATA_NPC_SKIN_ID = 40; //string
+    public static final int DATA_URL_TAG = 41; //string
+    public static final int DATA_MAX_AIR = 42; //short
+    public static final int DATA_MARK_VARIANT = 43; //int
+    public static final int DATA_CONTAINER_TYPE = 44; //byte
+    public static final int DATA_CONTAINER_BASE_SIZE = 45; //int
+    public static final int DATA_CONTAINER_EXTRA_SLOTS_PER_STRENGTH = 46; //int
+    public static final int DATA_BLOCK_TARGET = 47; //block coords (ender crystal)
+    public static final int DATA_WITHER_INVULNERABLE_TICKS = 48; //int
+    public static final int DATA_WITHER_TARGET_1 = 49; //long
+    public static final int DATA_WITHER_TARGET_2 = 50; //long
+    public static final int DATA_WITHER_TARGET_3 = 51; //long
+    public static final int DATA_AERIAL_ATTACK = 52;
+    public static final int DATA_BOUNDING_BOX_WIDTH = 53; //float
+    public static final int DATA_BOUNDING_BOX_HEIGHT = 54; //float
+    public static final int DATA_FUSE_LENGTH = 55; //int
+    public static final int DATA_RIDER_SEAT_POSITION = 56; //vector3f
+    public static final int DATA_RIDER_ROTATION_LOCKED = 57; //byte
+    public static final int DATA_RIDER_MAX_ROTATION = 58; //float
+    public static final int DATA_RIDER_MIN_ROTATION = 59; //float
+    public static final int DATA_AREA_EFFECT_CLOUD_RADIUS = 60; //float
+    public static final int DATA_AREA_EFFECT_CLOUD_WAITING = 61; //int
+    public static final int DATA_AREA_EFFECT_CLOUD_PARTICLE_ID = 62; //int
+    public static final int DATA_SHULKER_PEEK_ID = 64; //int
+    public static final int DATA_SHULKER_ATTACH_FACE = 64; //byte
+    public static final int DATA_SHULKER_ATTACHED = 64; //short
+    public static final int DATA_SHULKER_ATTACH_POS = 66; //block coords
+    public static final int DATA_TRADING_PLAYER_EID = 67; //long
+    public static final int DATA_TRADING_CAREER = 68;
+    public static final int DATA_HAS_COMMAND_BLOCK = 69;
+    public static final int DATA_COMMAND_BLOCK_COMMAND = 70; //string
+    public static final int DATA_COMMAND_BLOCK_LAST_OUTPUT = 71; //string
+    public static final int DATA_COMMAND_BLOCK_TRACK_OUTPUT = 72; //byte
+    public static final int DATA_CONTROLLING_RIDER_SEAT_NUMBER = 73; //byte
+    public static final int DATA_STRENGTH = 74; //int
+    public static final int DATA_MAX_STRENGTH = 75; //int
+    public static final int DATA_SPELL_CASTING_COLOR = 76; //int
+    public static final int DATA_LIMITED_LIFE = 77;
+    public static final int DATA_ARMOR_STAND_POSE_INDEX = 78; // int
+    public static final int DATA_ENDER_CRYSTAL_TIME_OFFSET = 79; // int
+    public static final int DATA_ALWAYS_SHOW_NAMETAG = 80; // byte
+    public static final int DATA_COLOR_2 = 81; // byte
+    public static final int DATA_NAME_AUTHOR = 82;
+    public static final int DATA_SCORE_TAG = 83; //String
+    public static final int DATA_BALLOON_ATTACHED_ENTITY = 84; // long
+    public static final int DATA_PUFFERFISH_SIZE = 85;
+    public static final int DATA_BUBBLE_TIME = 86;
+    public static final int DATA_AGENT = 87;
+    public static final int DATA_SITTING_AMOUNT = 88;
+    public static final int DATA_SITTING_AMOUNT_PREVIOUS = 89;
+    public static final int DATA_EATING_COUNTER = 90;
+    public static final int DATA_FLAGS_EXTENDED = 91;
+    public static final int DATA_LAYING_AMOUNT = 92;
+    public static final int DATA_LAYING_AMOUNT_PREVIOUS = 93;
+    public static final int DATA_DURATION = 94;
+    public static final int DATA_SPAWN_TIME = 95;
+    public static final int DATA_CHANGE_RATE = 96;
+    public static final int DATA_CHANGE_ON_PICKUP = 97;
+    public static final int DATA_PICKUP_COUNT = 98;
+    public static final int DATA_INTERACT_TEXT = 99;
+    public static final int DATA_TRADE_TIER = 100;
+    public static final int DATA_MAX_TRADE_TIER = 101;
+    public static final int DATA_TRADE_EXPERIENCE = 102;
+    public static final int DATA_SKIN_ID = 103; // int ???
+    public static final int DATA_SPAWNING_FRAMES = 104;
+    public static final int DATA_COMMAND_BLOCK_TICK_DELAY = 105;
+    public static final int DATA_COMMAND_BLOCK_EXECUTE_ON_FIRST_TICK = 106;
+    public static final int DATA_AMBIENT_SOUND_INTERVAL = 107;
+    public static final int DATA_AMBIENT_SOUND_EVENT_NAME = 108;
+    public static final int DATA_FALL_DAMAGE_MULTIPLIER = 109;
+    public static final int DATA_NAME_RAW_TEXT = 110;
+    public static final int DATA_CAN_RIDE_TARGET = 111;
 
     // Flags
-    public static final int DATA_FLAG_ONFIRE = valueOf(0);
-    public static final int DATA_FLAG_SNEAKING = valueOf(1);
-    public static final int DATA_FLAG_RIDING = valueOf(2);
-    public static final int DATA_FLAG_SPRINTING = valueOf(3);
-    public static final int DATA_FLAG_ACTION = valueOf(4);
-    public static final int DATA_FLAG_INVISIBLE = valueOf(5);
-    public static final int DATA_FLAG_TEMPTED = valueOf(6);
-    public static final int DATA_FLAG_INLOVE = valueOf(7);
-    public static final int DATA_FLAG_SADDLED = valueOf(8);
-    public static final int DATA_FLAG_POWERED = valueOf(9);
-    public static final int DATA_FLAG_IGNITED = valueOf(10);
-    public static final int DATA_FLAG_BABY = valueOf(11); //disable head scaling
-    public static final int DATA_FLAG_CONVERTING = valueOf(12);
-    public static final int DATA_FLAG_CRITICAL = valueOf(13);
-    public static final int DATA_FLAG_CAN_SHOW_NAMETAG = valueOf(14);
-    public static final int DATA_FLAG_ALWAYS_SHOW_NAMETAG = valueOf(15);
-    public static final int DATA_FLAG_IMMOBILE = 16, DATA_FLAG_NO_AI = valueOf(16);
-    public static final int DATA_FLAG_SILENT = valueOf(17);
-    public static final int DATA_FLAG_WALLCLIMBING = valueOf(18);
-    public static final int DATA_FLAG_CAN_CLIMB = valueOf(19);
-    public static final int DATA_FLAG_SWIMMER = valueOf(20);
-    public static final int DATA_FLAG_CAN_FLY = valueOf(21);
-    public static final int DATA_FLAG_WALKER = valueOf(22);
-    public static final int DATA_FLAG_RESTING = valueOf(23);
-    public static final int DATA_FLAG_SITTING = valueOf(24);
-    public static final int DATA_FLAG_ANGRY = valueOf(25);
-    public static final int DATA_FLAG_INTERESTED = valueOf(26);
-    public static final int DATA_FLAG_CHARGED = valueOf(27);
-    public static final int DATA_FLAG_TAMED = valueOf(28);
-    public static final int DATA_FLAG_ORPHANED = valueOf(29);
-    public static final int DATA_FLAG_LEASHED = valueOf(30);
-    public static final int DATA_FLAG_SHEARED = valueOf(31);
-    public static final int DATA_FLAG_GLIDING = valueOf(32);
-    public static final int DATA_FLAG_ELDER = valueOf(33);
-    public static final int DATA_FLAG_MOVING = valueOf(34);
-    public static final int DATA_FLAG_BREATHING = valueOf(35);
-    public static final int DATA_FLAG_CHESTED = valueOf(36);
-    public static final int DATA_FLAG_STACKABLE = valueOf(37);
-    public static final int DATA_FLAG_SHOWBASE = valueOf(38);
-    public static final int DATA_FLAG_REARING = valueOf(39);
-    public static final int DATA_FLAG_VIBRATING = valueOf(40);
-    public static final int DATA_FLAG_IDLING = valueOf(41);
-    public static final int DATA_FLAG_EVOKER_SPELL = valueOf(42);
-    public static final int DATA_FLAG_CHARGE_ATTACK = valueOf(43);
-    public static final int DATA_FLAG_WASD_CONTROLLED = valueOf(44);
-    public static final int DATA_FLAG_CAN_POWER_JUMP = valueOf(45);
-    public static final int DATA_FLAG_LINGER = valueOf(46);
-    public static final int DATA_FLAG_HAS_COLLISION = valueOf(47);
-    public static final int DATA_FLAG_GRAVITY = valueOf(48);
-    public static final int DATA_FLAG_FIRE_IMMUNE = valueOf(49);
-    public static final int DATA_FLAG_DANCING = valueOf(50);
-    public static final int DATA_FLAG_ENCHANTED = valueOf(51);
-    public static final int DATA_FLAG_SHOW_TRIDENT_ROPE = valueOf(52); // tridents show an animated rope when enchanted with loyalty after they are thrown and return to their owner. To be combined with DATA_OWNER_EID
-    public static final int DATA_FLAG_CONTAINER_PRIVATE = valueOf(53); //inventory is private, doesn't drop contents when killed if true
-    public static final int DATA_FLAG_IS_TRANSFORMING = valueOf(54);
-    public static final int DATA_FLAG_SPIN_ATTACK = valueOf(55);
-    public static final int DATA_FLAG_SWIMMING = valueOf(56);
-    public static final int DATA_FLAG_BRIBED = valueOf(57); //dolphins have this set when they go to find treasure for the player
-    public static final int DATA_FLAG_PREGNANT = valueOf(58);
-    public static final int DATA_FLAG_LAYING_EGG = valueOf(59);
-    public static final int DATA_FLAG_RIDER_CAN_PICK = valueOf(60);
-    public static final int DATA_FLAG_TRANSITION_SETTING = valueOf(61);
-    public static final int DATA_FLAG_EATING = valueOf(62);
-    public static final int DATA_FLAG_LAYING_DOWN = valueOf(63);
-    public static final int DATA_FLAG_SNEEZING = valueOf(64);
-    public static final int DATA_FLAG_TRUSTING = valueOf(65);
-    public static final int DATA_FLAG_ROLLING = valueOf(66);
-    public static final int DATA_FLAG_SCARED = valueOf(67);
-    public static final int DATA_FLAG_IN_SCAFFOLDING = valueOf(68);
-    public static final int DATA_FLAG_OVER_SCAFFOLDING = valueOf(69);
-    public static final int DATA_FLAG_FALL_THROUGH_SCAFFOLDING = valueOf(70);
-    public static final int DATA_FLAG_BLOCKING = valueOf(71);
-    public static final int DATA_FLAG_TRANSITION_BLOCKING = valueOf(72);
-    public static final int DATA_FLAG_BLOCKED_USING_SHIELD = valueOf(73);
-    public static final int DATA_FLAG_BLOCKED_USING_DAMAGED_SHIELD = valueOf(74);
-    public static final int DATA_FLAG_SLEEPING = valueOf(75);
-    public static final int DATA_FLAG_WANTS_TO_WAKE = valueOf(76);
-    public static final int DATA_FLAG_TRADE_INTEREST = valueOf(77);
-    public static final int DATA_FLAG_DOOR_BREAKER = valueOf(78);
-    public static final int DATA_FLAG_BREAKING_OBSTRUCTION = valueOf(79);
-    public static final int DATA_FLAG_DOOR_OPENER = valueOf(80);
-    public static final int DATA_FLAG_IS_ILLAGER_CAPTAIN = valueOf(81);
-    public static final int DATA_FLAG_STUNNED = valueOf(82);
-    public static final int DATA_FLAG_ROARING = valueOf(83);
-    public static final int DATA_FLAG_DELAYED_ATTACK = valueOf(84);
-    public static final int DATA_FLAG_IS_AVOIDING_MOBS = valueOf(85);
-    public static final int DATA_FLAG_FACING_TARGET_TO_RANGE_ATTACK = valueOf(86);
-    public static final int DATA_FLAG_HIDDEN_WHEN_INVISIBLE = valueOf(87);
-    public static final int DATA_FLAG_IS_IN_UI = valueOf(88);
-    public static final int DATA_FLAG_STALKING = valueOf(89);
-    public static final int DATA_FLAG_EMOTING = valueOf(90);
-    public static final int DATA_FLAG_CELEBRATING = valueOf(91);
+    public static final int DATA_FLAG_ONFIRE = 0;
+    public static final int DATA_FLAG_SNEAKING = 1;
+    public static final int DATA_FLAG_RIDING = 2;
+    public static final int DATA_FLAG_SPRINTING = 3;
+    public static final int DATA_FLAG_ACTION = 4;
+    public static final int DATA_FLAG_INVISIBLE = 5;
+    public static final int DATA_FLAG_TEMPTED = 6;
+    public static final int DATA_FLAG_INLOVE = 7;
+    public static final int DATA_FLAG_SADDLED = 8;
+    public static final int DATA_FLAG_POWERED = 9;
+    public static final int DATA_FLAG_IGNITED = 10;
+    public static final int DATA_FLAG_BABY = 11; //disable head scaling
+    public static final int DATA_FLAG_CONVERTING = 12;
+    public static final int DATA_FLAG_CRITICAL = 13;
+    public static final int DATA_FLAG_CAN_SHOW_NAMETAG = 14;
+    public static final int DATA_FLAG_ALWAYS_SHOW_NAMETAG = 15;
+    public static final int DATA_FLAG_IMMOBILE = 16, DATA_FLAG_NO_AI = 16;
+    public static final int DATA_FLAG_SILENT = 17;
+    public static final int DATA_FLAG_WALLCLIMBING = 18;
+    public static final int DATA_FLAG_CAN_CLIMB = 19;
+    public static final int DATA_FLAG_SWIMMER = 20;
+    public static final int DATA_FLAG_CAN_FLY = 21;
+    public static final int DATA_FLAG_WALKER = 22;
+    public static final int DATA_FLAG_RESTING = 23;
+    public static final int DATA_FLAG_SITTING = 24;
+    public static final int DATA_FLAG_ANGRY = 25;
+    public static final int DATA_FLAG_INTERESTED = 26;
+    public static final int DATA_FLAG_CHARGED = 27;
+    public static final int DATA_FLAG_TAMED = 28;
+    public static final int DATA_FLAG_ORPHANED = 29;
+    public static final int DATA_FLAG_LEASHED = 30;
+    public static final int DATA_FLAG_SHEARED = 31;
+    public static final int DATA_FLAG_GLIDING = 32;
+    public static final int DATA_FLAG_ELDER = 33;
+    public static final int DATA_FLAG_MOVING = 34;
+    public static final int DATA_FLAG_BREATHING = 35;
+    public static final int DATA_FLAG_CHESTED = 36;
+    public static final int DATA_FLAG_STACKABLE = 37;
+    public static final int DATA_FLAG_SHOWBASE = 38;
+    public static final int DATA_FLAG_REARING = 39;
+    public static final int DATA_FLAG_VIBRATING = 40;
+    public static final int DATA_FLAG_IDLING = 41;
+    public static final int DATA_FLAG_EVOKER_SPELL = 42;
+    public static final int DATA_FLAG_CHARGE_ATTACK = 43;
+    public static final int DATA_FLAG_WASD_CONTROLLED = 44;
+    public static final int DATA_FLAG_CAN_POWER_JUMP = 45;
+    public static final int DATA_FLAG_LINGER = 46;
+    public static final int DATA_FLAG_HAS_COLLISION = 47;
+    public static final int DATA_FLAG_GRAVITY = 48;
+    public static final int DATA_FLAG_FIRE_IMMUNE = 49;
+    public static final int DATA_FLAG_DANCING = 50;
+    public static final int DATA_FLAG_ENCHANTED = 51;
+    public static final int DATA_FLAG_SHOW_TRIDENT_ROPE = 52; // tridents show an animated rope when enchanted with loyalty after they are thrown and return to their owner. To be combined with DATA_OWNER_EID
+    public static final int DATA_FLAG_CONTAINER_PRIVATE = 53; //inventory is private, doesn't drop contents when killed if true
+    public static final int DATA_FLAG_IS_TRANSFORMING = 54;
+    public static final int DATA_FLAG_SPIN_ATTACK = 55;
+    public static final int DATA_FLAG_SWIMMING = 56;
+    public static final int DATA_FLAG_BRIBED = 57; //dolphins have this set when they go to find treasure for the player
+    public static final int DATA_FLAG_PREGNANT = 58;
+    public static final int DATA_FLAG_LAYING_EGG = 59;
+    public static final int DATA_FLAG_RIDER_CAN_PICK = 60;
+    public static final int DATA_FLAG_TRANSITION_SETTING = 61;
+    public static final int DATA_FLAG_EATING = 62;
+    public static final int DATA_FLAG_LAYING_DOWN = 63;
+    public static final int DATA_FLAG_SNEEZING = 64;
+    public static final int DATA_FLAG_TRUSTING = 65;
+    public static final int DATA_FLAG_ROLLING = 66;
+    public static final int DATA_FLAG_SCARED = 67;
+    public static final int DATA_FLAG_IN_SCAFFOLDING = 68;
+    public static final int DATA_FLAG_OVER_SCAFFOLDING = 69;
+    public static final int DATA_FLAG_FALL_THROUGH_SCAFFOLDING = 70;
+    public static final int DATA_FLAG_BLOCKING = 71;
+    public static final int DATA_FLAG_TRANSITION_BLOCKING = 72;
+    public static final int DATA_FLAG_BLOCKED_USING_SHIELD = 73;
+    public static final int DATA_FLAG_BLOCKED_USING_DAMAGED_SHIELD = 74;
+    public static final int DATA_FLAG_SLEEPING = 75;
+    public static final int DATA_FLAG_WANTS_TO_WAKE = 76;
+    public static final int DATA_FLAG_TRADE_INTEREST = 77;
+    public static final int DATA_FLAG_DOOR_BREAKER = 78;
+    public static final int DATA_FLAG_BREAKING_OBSTRUCTION = 79;
+    public static final int DATA_FLAG_DOOR_OPENER = 80;
+    public static final int DATA_FLAG_IS_ILLAGER_CAPTAIN = 81;
+    public static final int DATA_FLAG_STUNNED = 82;
+    public static final int DATA_FLAG_ROARING = 83;
+    public static final int DATA_FLAG_DELAYED_ATTACK = 84;
+    public static final int DATA_FLAG_IS_AVOIDING_MOBS = 85;
+    public static final int DATA_FLAG_FACING_TARGET_TO_RANGE_ATTACK = 86;
+    public static final int DATA_FLAG_HIDDEN_WHEN_INVISIBLE = 87;
+    public static final int DATA_FLAG_IS_IN_UI = 88;
+    public static final int DATA_FLAG_STALKING = 89;
+    public static final int DATA_FLAG_EMOTING = 90;
+    public static final int DATA_FLAG_CELEBRATING = 91;
 
     public static long entityCount = 1;