From c2d1ebf566152b0b9f2afbc9024b7748da547849 Mon Sep 17 00:00:00 2001 From: Kevims Date: Sun, 14 Mar 2021 16:56:53 +0100 Subject: [PATCH] Update entity data ids (#1801) * Fix entity data ids by removing unused data values * Adding entity data with correct ids --- src/main/java/cn/nukkit/entity/Entity.java | 116 ++++++++++----------- 1 file changed, 58 insertions(+), 58 deletions(-) diff --git a/src/main/java/cn/nukkit/entity/Entity.java b/src/main/java/cn/nukkit/entity/Entity.java index a4c1a7d371b..2b4d3ee56cf 100644 --- a/src/main/java/cn/nukkit/entity/Entity.java +++ b/src/main/java/cn/nukkit/entity/Entity.java @@ -118,67 +118,67 @@ public abstract class Entity extends Location implements Metadatable { 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_RIDER_ROTATION_OFFSET = 60; - 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 = 63; //int - public static final int DATA_SHULKER_ATTACH_FACE = 64; //byte - public static final int DATA_SHULKER_ATTACHED = 65; //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_AREA_EFFECT_CLOUD_RADIUS = 61; //float + public static final int DATA_AREA_EFFECT_CLOUD_WAITING = 62; //int + public static final int DATA_AREA_EFFECT_CLOUD_PARTICLE_ID = 63; //int + public static final int DATA_SHULKER_PEEK_ID = 64; //int + public static final int DATA_SHULKER_ATTACH_FACE = 65; //byte + public static final int DATA_SHULKER_ATTACHED = 66; //short + public static final int DATA_SHULKER_ATTACH_POS = 67; //block coords + public static final int DATA_TRADING_PLAYER_EID = 68; //long + public static final int DATA_TRADING_CAREER = 69; + public static final int DATA_HAS_COMMAND_BLOCK = 70; + public static final int DATA_COMMAND_BLOCK_COMMAND = 71; //string + public static final int DATA_COMMAND_BLOCK_LAST_OUTPUT = 72; //string + public static final int DATA_COMMAND_BLOCK_TRACK_OUTPUT = 73; //byte + public static final int DATA_CONTROLLING_RIDER_SEAT_NUMBER = 74; //byte + public static final int DATA_STRENGTH = 75; //int + public static final int DATA_MAX_STRENGTH = 76; //int + public static final int DATA_SPELL_CASTING_COLOR = 77; //int + public static final int DATA_LIMITED_LIFE = 78; + public static final int DATA_ARMOR_STAND_POSE_INDEX = 79; // int + public static final int DATA_ENDER_CRYSTAL_TIME_OFFSET = 80; // int public static final int DATA_ALWAYS_SHOW_NAMETAG = 81; // byte - public static final int DATA_COLOR_2 = 81; // byte - public static final int DATA_NAME_AUTHOR = 82; + public static final int DATA_COLOR_2 = 82; // byte + public static final int DATA_NAME_AUTHOR = 83; public static final int DATA_SCORE_TAG = 84; // 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_INTERVAL_RANGE = 108; - public static final int DATA_AMBIENT_SOUND_EVENT_NAME = 109; - public static final int DATA_FALL_DAMAGE_MULTIPLIER = 110; - public static final int DATA_NAME_RAW_TEXT = 111; - public static final int DATA_CAN_RIDE_TARGET = 112; - public static final int DATA_LOW_TIER_CURED_DISCOUNT = 113; - public static final int DATA_HIGH_TIER_CURED_DISCOUNT = 114; - public static final int DATA_NEARBY_CURED_DISCOUNT = 115; - public static final int DATA_NEARBY_CURED_DISCOUNT_TIMESTAMP = 116; - public static final int DATA_HITBOX = 117; - public static final int DATA_IS_BUOYANT = 118; - public static final int DATA_BUOYANCY_DATA = 119; + public static final int DATA_BALLOON_ATTACHED_ENTITY = 85; // long + public static final int DATA_PUFFERFISH_SIZE = 86; + public static final int DATA_BUBBLE_TIME = 87; + public static final int DATA_AGENT = 88; + public static final int DATA_SITTING_AMOUNT = 89; + public static final int DATA_SITTING_AMOUNT_PREVIOUS = 90; + public static final int DATA_EATING_COUNTER = 91; + public static final int DATA_FLAGS_EXTENDED = 92; + public static final int DATA_LAYING_AMOUNT = 93; + public static final int DATA_LAYING_AMOUNT_PREVIOUS = 94; + public static final int DATA_DURATION = 95; + public static final int DATA_SPAWN_TIME = 96; + public static final int DATA_CHANGE_RATE = 97; + public static final int DATA_CHANGE_ON_PICKUP = 98; + public static final int DATA_PICKUP_COUNT = 99; + public static final int DATA_INTERACT_TEXT = 100; + public static final int DATA_TRADE_TIER = 101; + public static final int DATA_MAX_TRADE_TIER = 102; + public static final int DATA_TRADE_EXPERIENCE = 103; + public static final int DATA_SKIN_ID = 104; // int ??? + public static final int DATA_SPAWNING_FRAMES = 105; + public static final int DATA_COMMAND_BLOCK_TICK_DELAY = 106; + public static final int DATA_COMMAND_BLOCK_EXECUTE_ON_FIRST_TICK = 107; + public static final int DATA_AMBIENT_SOUND_INTERVAL = 108; + public static final int DATA_AMBIENT_SOUND_INTERVAL_RANGE = 109; + public static final int DATA_AMBIENT_SOUND_EVENT_NAME = 110; + public static final int DATA_FALL_DAMAGE_MULTIPLIER = 111; + public static final int DATA_NAME_RAW_TEXT = 112; + public static final int DATA_CAN_RIDE_TARGET = 113; + public static final int DATA_LOW_TIER_CURED_DISCOUNT = 114; + public static final int DATA_HIGH_TIER_CURED_DISCOUNT = 115; + public static final int DATA_NEARBY_CURED_DISCOUNT = 116; + public static final int DATA_NEARBY_CURED_DISCOUNT_TIMESTAMP = 117; + public static final int DATA_HITBOX = 118; + public static final int DATA_IS_BUOYANT = 119; public static final int DATA_FREEZING_EFFECT_STRENGTH = 120; + public static final int DATA_BUOYANCY_DATA = 121; public static final int DATA_GOAT_HORN_COUNT = 122; // Flags