From 970cb76c9cd49018c417cf39278f33fd8e3fee18 Mon Sep 17 00:00:00 2001 From: YanisBft Date: Sun, 18 Apr 2021 15:02:39 +0200 Subject: [PATCH] Entity flags and other constant fields (#2331) * Entity flags and other constant fields * updated unpick --- .../entity/mob/PiglinBruteEntity.mapping | 3 +++ .../minecraft/entity/mob/VexEntity.mapping | 1 + .../entity/passive/BatEntity.mapping | 1 + .../entity/passive/BeeEntity.mapping | 5 ++++- .../entity/passive/CatEntity.mapping | 11 ++++++++++ .../entity/passive/FoxEntity.mapping | 7 ++++++ .../entity/passive/HorseBaseEntity.mapping | 6 +++++ .../entity/passive/PandaEntity.mapping | 4 ++++ .../entity/passive/RabbitEntity.mapping | 8 +++++++ .../entity/passive/SnowGolemEntity.mapping | 1 + .../entity/passive/StriderEntity.mapping | 3 +++ .../passive/TameableShoulderEntity.mapping | 1 + .../PersistentProjectileEntity.mapping | 3 +++ .../vehicle/HopperMinecartEntity.mapping | 1 + .../entity/vehicle/TntMinecartEntity.mapping | 1 + .../net/fabricmc/yarn/constants/CatTypes.java | 22 ------------------- .../fabricmc/yarn/constants/RabbitTypes.java | 18 --------------- unpick-definitions/cat_types.unpick | 22 +++++++++---------- unpick-definitions/rabbit_types.unpick | 14 ++++++------ 19 files changed, 73 insertions(+), 59 deletions(-) delete mode 100644 src/constants/java/net/fabricmc/yarn/constants/CatTypes.java delete mode 100644 src/constants/java/net/fabricmc/yarn/constants/RabbitTypes.java diff --git a/mappings/net/minecraft/entity/mob/PiglinBruteEntity.mapping b/mappings/net/minecraft/entity/mob/PiglinBruteEntity.mapping index 23afc7bcfe..ae0a2d1f3e 100644 --- a/mappings/net/minecraft/entity/mob/PiglinBruteEntity.mapping +++ b/mappings/net/minecraft/entity/mob/PiglinBruteEntity.mapping @@ -1,5 +1,8 @@ CLASS net/minecraft/class_5419 net/minecraft/entity/mob/PiglinBruteEntity FIELD field_25760 MEMORY_MODULE_TYPES Lcom/google/common/collect/ImmutableList; FIELD field_25761 SENSOR_TYPES Lcom/google/common/collect/ImmutableList; + FIELD field_30586 MAX_HEALTH I + FIELD field_30587 MOVEMENT_SPEED F + FIELD field_30588 ATTACK_DAMAGE I METHOD method_30242 createPiglinBruteAttributes ()Lnet/minecraft/class_5132$class_5133; METHOD method_30243 playAngrySound ()V diff --git a/mappings/net/minecraft/entity/mob/VexEntity.mapping b/mappings/net/minecraft/entity/mob/VexEntity.mapping index 19059d8dc0..29184f3c1f 100644 --- a/mappings/net/minecraft/entity/mob/VexEntity.mapping +++ b/mappings/net/minecraft/entity/mob/VexEntity.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_1634 net/minecraft/entity/mob/VexEntity + FIELD field_30503 CHARGING_FLAG I FIELD field_7407 bounds Lnet/minecraft/class_2338; FIELD field_7408 lifeTicks I FIELD field_7409 alive Z diff --git a/mappings/net/minecraft/entity/passive/BatEntity.mapping b/mappings/net/minecraft/entity/passive/BatEntity.mapping index d15d03b01a..22d8b7d807 100644 --- a/mappings/net/minecraft/entity/passive/BatEntity.mapping +++ b/mappings/net/minecraft/entity/passive/BatEntity.mapping @@ -1,5 +1,6 @@ CLASS net/minecraft/class_1420 net/minecraft/entity/passive/BatEntity FIELD field_18100 CLOSE_PLAYER_PREDICATE Lnet/minecraft/class_4051; + FIELD field_30269 ROOSTING_FLAG I FIELD field_6728 BAT_FLAGS Lnet/minecraft/class_2940; COMMENT Equals 0 when the bat is flying, and 1 when it's roosting. FIELD field_6729 hangingPosition Lnet/minecraft/class_2338; diff --git a/mappings/net/minecraft/entity/passive/BeeEntity.mapping b/mappings/net/minecraft/entity/passive/BeeEntity.mapping index d24bf851fd..f447786b08 100644 --- a/mappings/net/minecraft/entity/passive/BeeEntity.mapping +++ b/mappings/net/minecraft/entity/passive/BeeEntity.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_4466 net/minecraft/entity/passive/BeeEntity - FIELD field_20353 STATUS_TRACKER Lnet/minecraft/class_2940; + FIELD field_20353 BEE_FLAGS Lnet/minecraft/class_2940; FIELD field_20354 ANGER Lnet/minecraft/class_2940; FIELD field_20356 currentPitch F FIELD field_20357 lastPitch F @@ -24,6 +24,9 @@ CLASS net/minecraft/class_4466 net/minecraft/entity/passive/BeeEntity FIELD field_30278 HAS_NECTAR_KEY Ljava/lang/String; FIELD field_30279 FLOWER_POS_KEY Ljava/lang/String; FIELD field_30280 HIVE_POS_KEY Ljava/lang/String; + FIELD field_30281 NEAR_TARGET_FLAG I + FIELD field_30282 HAS_STUNG_FLAG I + FIELD field_30283 HAS_NECTAR_FLAG I FIELD field_30285 FLOWER_NAVIGATION_START_TICKS I COMMENT A bee will start moving to a flower once this time in ticks has passed from a pollination. FIELD field_30286 POLLINATION_FAIL_TICKS I diff --git a/mappings/net/minecraft/entity/passive/CatEntity.mapping b/mappings/net/minecraft/entity/passive/CatEntity.mapping index d79ab4d8ec..ad3626519c 100644 --- a/mappings/net/minecraft/entity/passive/CatEntity.mapping +++ b/mappings/net/minecraft/entity/passive/CatEntity.mapping @@ -10,6 +10,17 @@ CLASS net/minecraft/class_1451 net/minecraft/entity/passive/CatEntity FIELD field_16290 sleepAnimation F FIELD field_16291 prevSleepAnimation F FIELD field_16292 HEAD_DOWN Lnet/minecraft/class_2940; + FIELD field_30313 TABBY_TYPE I + FIELD field_30314 BLACK_TYPE I + FIELD field_30315 RED_TYPE I + FIELD field_30316 SIAMESE_TYPE I + FIELD field_30317 BRITISH_SHORTHAIR_TYPE I + FIELD field_30318 CALICO_TYPE I + FIELD field_30319 PERSIAN_TYPE I + FIELD field_30320 RAGDOLL_TYPE I + FIELD field_30321 WHITE_TYPE I + FIELD field_30322 JELLIE_TYPE I + FIELD field_30323 ALL_BLACK_TYPE I FIELD field_6808 fleeGoal Lnet/minecraft/class_1451$class_3698; FIELD field_6809 TAMING_INGREDIENT Lnet/minecraft/class_1856; FIELD field_6810 temptGoal Lnet/minecraft/class_1391; diff --git a/mappings/net/minecraft/entity/passive/FoxEntity.mapping b/mappings/net/minecraft/entity/passive/FoxEntity.mapping index 67a223ad19..39d9813bc2 100644 --- a/mappings/net/minecraft/entity/passive/FoxEntity.mapping +++ b/mappings/net/minecraft/entity/passive/FoxEntity.mapping @@ -15,6 +15,13 @@ CLASS net/minecraft/class_4019 net/minecraft/entity/passive/FoxEntity FIELD field_17962 extraRollingHeight F FIELD field_17963 lastExtraRollingHeight F FIELD field_17964 eatingTime I + FIELD field_30328 CROUCHING_FLAG I + FIELD field_30329 ROLLING_HEAD_FLAG I + FIELD field_30330 CHASING_FLAG I + FIELD field_30331 SITTING_FLAG I + FIELD field_30332 SLEEPING_FLAG I + FIELD field_30333 WALKING_FLAG I + FIELD field_30334 AGGRESSIVE_FLAG I METHOD method_18253 (Lnet/minecraft/class_1297;)Z ARG 0 entity METHOD method_18254 (Lnet/minecraft/class_1309;)Z diff --git a/mappings/net/minecraft/entity/passive/HorseBaseEntity.mapping b/mappings/net/minecraft/entity/passive/HorseBaseEntity.mapping index 3cb8cb41a4..07a4c41f35 100644 --- a/mappings/net/minecraft/entity/passive/HorseBaseEntity.mapping +++ b/mappings/net/minecraft/entity/passive/HorseBaseEntity.mapping @@ -1,6 +1,12 @@ CLASS net/minecraft/class_1496 net/minecraft/entity/passive/HorseBaseEntity FIELD field_18118 PARENT_HORSE_PREDICATE Lnet/minecraft/class_4051; FIELD field_25374 BREEDING_INGREDIENT Lnet/minecraft/class_1856; + FIELD field_30419 TAMED_FLAG I + FIELD field_30420 SADDLED_FLAG I + FIELD field_30421 BRED_FLAG I + FIELD field_30422 EATING_GRASS_FLAG I + FIELD field_30423 ANGRY_FLAG I + FIELD field_30424 EATING_FLAG I FIELD field_6955 temper I FIELD field_6956 IS_BRED_HORSE Ljava/util/function/Predicate; FIELD field_6957 tailWagTicks I diff --git a/mappings/net/minecraft/entity/passive/PandaEntity.mapping b/mappings/net/minecraft/entity/passive/PandaEntity.mapping index a63879a12e..9aa735a61e 100644 --- a/mappings/net/minecraft/entity/passive/PandaEntity.mapping +++ b/mappings/net/minecraft/entity/passive/PandaEntity.mapping @@ -2,6 +2,10 @@ CLASS net/minecraft/class_1440 net/minecraft/entity/passive/PandaEntity FIELD field_18277 playingJump Lnet/minecraft/class_243; FIELD field_21803 ASK_FOR_BAMBOO_TARGET Lnet/minecraft/class_4051; FIELD field_21804 lookAtPlayerGoal Lnet/minecraft/class_1440$class_4056; + FIELD field_30344 SNEEZING_FLAG I + FIELD field_30345 PLAYING_FLAG I + FIELD field_30346 SCARED_FLAG I + FIELD field_30347 LYING_ON_BACK_FLAG I FIELD field_6764 ASK_FOR_BAMBOO_TICKS Lnet/minecraft/class_2940; FIELD field_6765 IS_FOOD Ljava/util/function/Predicate; FIELD field_6766 MAIN_GENE Lnet/minecraft/class_2940; diff --git a/mappings/net/minecraft/entity/passive/RabbitEntity.mapping b/mappings/net/minecraft/entity/passive/RabbitEntity.mapping index e65b0897e5..20824c0dd7 100644 --- a/mappings/net/minecraft/entity/passive/RabbitEntity.mapping +++ b/mappings/net/minecraft/entity/passive/RabbitEntity.mapping @@ -1,4 +1,12 @@ CLASS net/minecraft/class_1463 net/minecraft/entity/passive/RabbitEntity + FIELD field_30359 ESCAPE_SPEED D + FIELD field_30361 BROWN_TYPE I + FIELD field_30362 WHITE_TYPE I + FIELD field_30363 BLACK_TYPE I + FIELD field_30364 WHITE_SPOTTED_TYPE I + FIELD field_30365 GOLD_TYPE I + FIELD field_30366 SALT_TYPE I + FIELD field_30367 KILLER_BUNNY_TYPE I FIELD field_6846 KILLER_BUNNY Lnet/minecraft/class_2960; FIELD field_6847 moreCarrotTicks I FIELD field_6848 ticksUntilJump I diff --git a/mappings/net/minecraft/entity/passive/SnowGolemEntity.mapping b/mappings/net/minecraft/entity/passive/SnowGolemEntity.mapping index eaa2a62dd3..9189cd68f8 100644 --- a/mappings/net/minecraft/entity/passive/SnowGolemEntity.mapping +++ b/mappings/net/minecraft/entity/passive/SnowGolemEntity.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_1473 net/minecraft/entity/passive/SnowGolemEntity + FIELD field_30373 HAS_PUMPKIN_FLAG B FIELD field_6873 SNOW_GOLEM_FLAGS Lnet/minecraft/class_2940; METHOD method_20255 (Lnet/minecraft/class_1268;Lnet/minecraft/class_1657;)V ARG 1 player diff --git a/mappings/net/minecraft/entity/passive/StriderEntity.mapping b/mappings/net/minecraft/entity/passive/StriderEntity.mapping index 199b49dec2..6a64362e25 100644 --- a/mappings/net/minecraft/entity/passive/StriderEntity.mapping +++ b/mappings/net/minecraft/entity/passive/StriderEntity.mapping @@ -7,6 +7,9 @@ CLASS net/minecraft/class_4985 net/minecraft/entity/passive/StriderEntity FIELD field_23245 BOOST_TIME Lnet/minecraft/class_2940; FIELD field_23246 COLD Lnet/minecraft/class_2940; FIELD field_23247 SADDLED Lnet/minecraft/class_2940; + FIELD field_30499 COLD_SADDLED_SPEED F + FIELD field_30500 COLD_SPEED F + FIELD field_30501 DEFAULT_SADDLED_SPEED F METHOD method_26344 canSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_1936;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Ljava/util/Random;)Z ARG 0 type ARG 1 world diff --git a/mappings/net/minecraft/entity/passive/TameableShoulderEntity.mapping b/mappings/net/minecraft/entity/passive/TameableShoulderEntity.mapping index a895a70cba..79b3e887f8 100644 --- a/mappings/net/minecraft/entity/passive/TameableShoulderEntity.mapping +++ b/mappings/net/minecraft/entity/passive/TameableShoulderEntity.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_1471 net/minecraft/entity/passive/TameableShoulderEntity + FIELD field_30372 READY_TO_SIT_COOLDOWN I FIELD field_6864 ticks I METHOD method_6626 isReadyToSitOnPlayer ()Z METHOD method_6627 mountOnto (Lnet/minecraft/class_3222;)Z diff --git a/mappings/net/minecraft/entity/projectile/PersistentProjectileEntity.mapping b/mappings/net/minecraft/entity/projectile/PersistentProjectileEntity.mapping index d503bf792d..6a6b8c287a 100644 --- a/mappings/net/minecraft/entity/projectile/PersistentProjectileEntity.mapping +++ b/mappings/net/minecraft/entity/projectile/PersistentProjectileEntity.mapping @@ -1,4 +1,7 @@ CLASS net/minecraft/class_1665 net/minecraft/entity/projectile/PersistentProjectileEntity + FIELD field_30654 CRITICAL_FLAG I + FIELD field_30655 NO_CLIP_FLAG I + FIELD field_30656 SHOT_FROM_CROSSBOW_FLAG I FIELD field_7571 damage D FIELD field_7572 pickupType Lnet/minecraft/class_1665$class_1666; FIELD field_7573 PROJECTILE_FLAGS Lnet/minecraft/class_2940; diff --git a/mappings/net/minecraft/entity/vehicle/HopperMinecartEntity.mapping b/mappings/net/minecraft/entity/vehicle/HopperMinecartEntity.mapping index d5b9539f0a..dc508c29e9 100644 --- a/mappings/net/minecraft/entity/vehicle/HopperMinecartEntity.mapping +++ b/mappings/net/minecraft/entity/vehicle/HopperMinecartEntity.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_1700 net/minecraft/entity/vehicle/HopperMinecartEntity + FIELD field_30702 MAX_TRANSFER_COOLDOWN I FIELD field_7748 transferCooldown I FIELD field_7749 enabled Z FIELD field_7750 currentBlockPos Lnet/minecraft/class_2338; diff --git a/mappings/net/minecraft/entity/vehicle/TntMinecartEntity.mapping b/mappings/net/minecraft/entity/vehicle/TntMinecartEntity.mapping index f6d1f02963..70eb3f46f8 100644 --- a/mappings/net/minecraft/entity/vehicle/TntMinecartEntity.mapping +++ b/mappings/net/minecraft/entity/vehicle/TntMinecartEntity.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_1701 net/minecraft/entity/vehicle/TntMinecartEntity + FIELD field_30703 PRIME_TNT_STATUS B FIELD field_7751 fuseTicks I METHOD (Lnet/minecraft/class_1937;DDD)V ARG 1 world diff --git a/src/constants/java/net/fabricmc/yarn/constants/CatTypes.java b/src/constants/java/net/fabricmc/yarn/constants/CatTypes.java deleted file mode 100644 index 643044b715..0000000000 --- a/src/constants/java/net/fabricmc/yarn/constants/CatTypes.java +++ /dev/null @@ -1,22 +0,0 @@ -/* - * This file is free for everyone to use under the Creative Commons Zero license. - */ - -package net.fabricmc.yarn.constants; - -public final class CatTypes { - public static final int TABBY = 0; - public static final int BLACK = 1; - public static final int RED = 2; - public static final int SIAMESE = 3; - public static final int BRITISH_SHORTHAIR = 4; - public static final int CALICO = 5; - public static final int PERSIAN = 6; - public static final int RAGDOLL = 7; - public static final int WHITE = 8; - public static final int JELLIE = 9; - public static final int ALL_BLACK = 10; - - private CatTypes() { - } -} diff --git a/src/constants/java/net/fabricmc/yarn/constants/RabbitTypes.java b/src/constants/java/net/fabricmc/yarn/constants/RabbitTypes.java deleted file mode 100644 index 88a6710f5c..0000000000 --- a/src/constants/java/net/fabricmc/yarn/constants/RabbitTypes.java +++ /dev/null @@ -1,18 +0,0 @@ -/* - * This file is free for everyone to use under the Creative Commons Zero license. - */ - -package net.fabricmc.yarn.constants; - -public final class RabbitTypes { - public static final int BROWN = 0; - public static final int ALBINO = 1; - public static final int BLACK = 2; - public static final int SPOTTED = 3; - public static final int GOLDEN = 4; - public static final int SALT_AND_PEPPER = 5; - public static final int KILLER_BUNNY = 99; - - private RabbitTypes() { - } -} diff --git a/unpick-definitions/cat_types.unpick b/unpick-definitions/cat_types.unpick index 7e17a1386b..03b47c55e2 100644 --- a/unpick-definitions/cat_types.unpick +++ b/unpick-definitions/cat_types.unpick @@ -1,16 +1,16 @@ v2 -constant cat_types net/fabricmc/yarn/constants/CatTypes TABBY -constant cat_types net/fabricmc/yarn/constants/CatTypes BLACK -constant cat_types net/fabricmc/yarn/constants/CatTypes RED -constant cat_types net/fabricmc/yarn/constants/CatTypes SIAMESE -constant cat_types net/fabricmc/yarn/constants/CatTypes BRITISH_SHORTHAIR -constant cat_types net/fabricmc/yarn/constants/CatTypes CALICO -constant cat_types net/fabricmc/yarn/constants/CatTypes PERSIAN -constant cat_types net/fabricmc/yarn/constants/CatTypes RAGDOLL -constant cat_types net/fabricmc/yarn/constants/CatTypes WHITE -constant cat_types net/fabricmc/yarn/constants/CatTypes JELLIE -constant cat_types net/fabricmc/yarn/constants/CatTypes ALL_BLACK +constant cat_types net/minecraft/entity/passive/CatEntity TABBY_TYPE +constant cat_types net/minecraft/entity/passive/CatEntity BLACK_TYPE +constant cat_types net/minecraft/entity/passive/CatEntity RED_TYPE +constant cat_types net/minecraft/entity/passive/CatEntity SIAMESE_TYPE +constant cat_types net/minecraft/entity/passive/CatEntity BRITISH_SHORTHAIR_TYPE +constant cat_types net/minecraft/entity/passive/CatEntity CALICO_TYPE +constant cat_types net/minecraft/entity/passive/CatEntity PERSIAN_TYPE +constant cat_types net/minecraft/entity/passive/CatEntity RAGDOLL_TYPE +constant cat_types net/minecraft/entity/passive/CatEntity WHITE_TYPE +constant cat_types net/minecraft/entity/passive/CatEntity JELLIE_TYPE +constant cat_types net/minecraft/entity/passive/CatEntity ALL_BLACK_TYPE target_method net/minecraft/entity/passive/CatEntity setCatType (I)V param 0 cat_types diff --git a/unpick-definitions/rabbit_types.unpick b/unpick-definitions/rabbit_types.unpick index e38b1ab997..fa251c0b06 100644 --- a/unpick-definitions/rabbit_types.unpick +++ b/unpick-definitions/rabbit_types.unpick @@ -1,12 +1,12 @@ v2 -constant rabbit_types net/fabricmc/yarn/constants/RabbitTypes BROWN -constant rabbit_types net/fabricmc/yarn/constants/RabbitTypes ALBINO -constant rabbit_types net/fabricmc/yarn/constants/RabbitTypes BLACK -constant rabbit_types net/fabricmc/yarn/constants/RabbitTypes SPOTTED -constant rabbit_types net/fabricmc/yarn/constants/RabbitTypes GOLDEN -constant rabbit_types net/fabricmc/yarn/constants/RabbitTypes SALT_AND_PEPPER -constant rabbit_types net/fabricmc/yarn/constants/RabbitTypes KILLER_BUNNY +constant rabbit_types net/minecraft/entity/passive/RabbitEntity BROWN_TYPE +constant rabbit_types net/minecraft/entity/passive/RabbitEntity WHITE_TYPE +constant rabbit_types net/minecraft/entity/passive/RabbitEntity BLACK_TYPE +constant rabbit_types net/minecraft/entity/passive/RabbitEntity WHITE_SPOTTED_TYPE +constant rabbit_types net/minecraft/entity/passive/RabbitEntity GOLD_TYPE +constant rabbit_types net/minecraft/entity/passive/RabbitEntity SALT_TYPE +constant rabbit_types net/minecraft/entity/passive/RabbitEntity KILLER_BUNNY_TYPE target_method net/minecraft/entity/passive/RabbitEntity setRabbitType (I)V param 0 rabbit_types