From e8ab7629e03ede86f7203e0eb9637f1097577f04 Mon Sep 17 00:00:00 2001 From: Shnupbups Date: Fri, 10 Nov 2023 10:16:44 +1100 Subject: [PATCH] more 45a stuff (#3721) further repackaging and mapping of spawner stuff breeze tasks and stuff command actions from last week --- .../spawner/EntityDetector.mapping | 2 +- .../spawner}/MobSpawnerEntry.mapping | 2 +- .../spawner}/MobSpawnerLogic.mapping | 2 +- .../block/spawner/TrialSpawnerConfig.mapping | 7 ++++ .../spawner/TrialSpawnerData.mapping | 11 +++++- .../spawner/TrialSpawnerLogic.mapping | 26 ++++++++++--- mappings/net/minecraft/class_8965.mapping | 5 --- .../command/FallthroughCommandAction.mapping | 3 ++ .../command/IsolatedCommandAction.mapping | 6 +++ .../command/SingleCommandAction.mapping | 4 ++ .../ai/brain/task/BreezeJumpTask.mapping | 38 +++++++++++++++++++ .../ai/brain/task/BreezeShootTask.mapping | 21 ++++++++++ .../task/BreezeSlideTowardsTargetTask.mapping | 4 ++ .../entity/ai/brain/task/LongJumpTask.mapping | 2 + .../minecraft/entity/mob/BreezeBrain.mapping | 2 +- .../minecraft/entity/mob/BreezeEntity.mapping | 6 +++ mappings/net/minecraft/util/Uuids.mapping | 1 + .../minecraft/util/math/LongJumpUtil.mapping | 12 ++++++ .../net/minecraft/util/math/Vec3d.mapping | 4 ++ 19 files changed, 142 insertions(+), 16 deletions(-) rename mappings/net/minecraft/block/{entity => }/spawner/EntityDetector.mapping (88%) rename mappings/net/minecraft/{world => block/spawner}/MobSpawnerEntry.mapping (96%) rename mappings/net/minecraft/{world => block/spawner}/MobSpawnerLogic.mapping (97%) create mode 100644 mappings/net/minecraft/block/spawner/TrialSpawnerConfig.mapping rename mappings/net/minecraft/block/{entity => }/spawner/TrialSpawnerData.mapping (87%) rename mappings/net/minecraft/block/{entity => }/spawner/TrialSpawnerLogic.mapping (64%) delete mode 100644 mappings/net/minecraft/class_8965.mapping create mode 100644 mappings/net/minecraft/command/FallthroughCommandAction.mapping create mode 100644 mappings/net/minecraft/command/IsolatedCommandAction.mapping create mode 100644 mappings/net/minecraft/entity/ai/brain/task/BreezeJumpTask.mapping create mode 100644 mappings/net/minecraft/entity/ai/brain/task/BreezeShootTask.mapping create mode 100644 mappings/net/minecraft/entity/ai/brain/task/BreezeSlideTowardsTargetTask.mapping create mode 100644 mappings/net/minecraft/util/math/LongJumpUtil.mapping diff --git a/mappings/net/minecraft/block/entity/spawner/EntityDetector.mapping b/mappings/net/minecraft/block/spawner/EntityDetector.mapping similarity index 88% rename from mappings/net/minecraft/block/entity/spawner/EntityDetector.mapping rename to mappings/net/minecraft/block/spawner/EntityDetector.mapping index 92eba2c5c7..90a14f20d6 100644 --- a/mappings/net/minecraft/block/entity/spawner/EntityDetector.mapping +++ b/mappings/net/minecraft/block/spawner/EntityDetector.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_8962 net/minecraft/block/entity/spawner/EntityDetector +CLASS net/minecraft/class_8962 net/minecraft/block/spawner/EntityDetector FIELD field_47356 SURVIVAL_PLAYER Lnet/minecraft/class_8962; FIELD field_47357 SHEEP Lnet/minecraft/class_8962; METHOD detect (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;I)Ljava/util/List; diff --git a/mappings/net/minecraft/world/MobSpawnerEntry.mapping b/mappings/net/minecraft/block/spawner/MobSpawnerEntry.mapping similarity index 96% rename from mappings/net/minecraft/world/MobSpawnerEntry.mapping rename to mappings/net/minecraft/block/spawner/MobSpawnerEntry.mapping index f09323a88f..7fabf5dab4 100644 --- a/mappings/net/minecraft/world/MobSpawnerEntry.mapping +++ b/mappings/net/minecraft/block/spawner/MobSpawnerEntry.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_1952 net/minecraft/world/MobSpawnerEntry +CLASS net/minecraft/class_1952 net/minecraft/block/spawner/MobSpawnerEntry FIELD comp_64 entity Lnet/minecraft/class_2487; FIELD comp_65 customSpawnRules Ljava/util/Optional; FIELD field_34460 CODEC Lcom/mojang/serialization/Codec; diff --git a/mappings/net/minecraft/world/MobSpawnerLogic.mapping b/mappings/net/minecraft/block/spawner/MobSpawnerLogic.mapping similarity index 97% rename from mappings/net/minecraft/world/MobSpawnerLogic.mapping rename to mappings/net/minecraft/block/spawner/MobSpawnerLogic.mapping index 9a00023f29..d4085c5b27 100644 --- a/mappings/net/minecraft/world/MobSpawnerLogic.mapping +++ b/mappings/net/minecraft/block/spawner/MobSpawnerLogic.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_1917 net/minecraft/world/MobSpawnerLogic +CLASS net/minecraft/class_1917 net/minecraft/block/spawner/MobSpawnerLogic FIELD field_40877 SPAWN_DATA_KEY Ljava/lang/String; FIELD field_9149 spawnCount I FIELD field_9150 maxSpawnDelay I diff --git a/mappings/net/minecraft/block/spawner/TrialSpawnerConfig.mapping b/mappings/net/minecraft/block/spawner/TrialSpawnerConfig.mapping new file mode 100644 index 0000000000..84b608814b --- /dev/null +++ b/mappings/net/minecraft/block/spawner/TrialSpawnerConfig.mapping @@ -0,0 +1,7 @@ +CLASS net/minecraft/class_8965 net/minecraft/block/spawner/TrialSpawnerConfig + FIELD field_47367 defaultInstance Lnet/minecraft/class_8965; + FIELD field_47368 codec Lcom/mojang/serialization/MapCodec; + METHOD method_55179 getTotalMobs (I)I + ARG 1 additionalPlayers + METHOD method_55181 getSimultaneousMobs (I)I + ARG 1 additionalPlayers diff --git a/mappings/net/minecraft/block/entity/spawner/TrialSpawnerData.mapping b/mappings/net/minecraft/block/spawner/TrialSpawnerData.mapping similarity index 87% rename from mappings/net/minecraft/block/entity/spawner/TrialSpawnerData.mapping rename to mappings/net/minecraft/block/spawner/TrialSpawnerData.mapping index d9d0811197..c7411ee201 100644 --- a/mappings/net/minecraft/block/entity/spawner/TrialSpawnerData.mapping +++ b/mappings/net/minecraft/block/spawner/TrialSpawnerData.mapping @@ -1,5 +1,6 @@ -CLASS net/minecraft/class_8966 net/minecraft/block/entity/spawner/TrialSpawnerData +CLASS net/minecraft/class_8966 net/minecraft/block/spawner/TrialSpawnerData FIELD field_47369 SPAWN_DATA_KEY Ljava/lang/String; + FIELD field_47370 codec Lcom/mojang/serialization/MapCodec; FIELD field_47371 players Ljava/util/Set; FIELD field_47372 spawnedMobsAlive Ljava/util/Set; FIELD field_47373 cooldownEnd J @@ -25,9 +26,11 @@ CLASS net/minecraft/class_8966 net/minecraft/block/entity/spawner/TrialSpawnerDa ARG 1 world METHOD method_55184 isCooldownPast (Lnet/minecraft/class_3218;Lnet/minecraft/class_8965;F)Z ARG 1 world + ARG 2 config ARG 3 position METHOD method_55185 canSpawnMore (Lnet/minecraft/class_3218;Lnet/minecraft/class_8965;I)Z ARG 1 world + ARG 2 config ARG 3 additionalPlayers METHOD method_55186 updatePlayers (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_8962;I)V ARG 1 world @@ -45,7 +48,10 @@ CLASS net/minecraft/class_8966 net/minecraft/block/entity/spawner/TrialSpawnerDa ARG 1 logic ARG 2 world ARG 3 state - METHOD method_55192 hasSpawedAllMobs (Lnet/minecraft/class_8965;I)Z + METHOD method_55191 populateSpawnDataPool (Lnet/minecraft/class_8965;)V + ARG 1 config + METHOD method_55192 hasSpawnedAllMobs (Lnet/minecraft/class_8965;I)Z + ARG 1 config ARG 2 additionalPlayers METHOD method_55194 getSpawnDataNbt (Lnet/minecraft/class_8967;)Lnet/minecraft/class_2487; ARG 1 state @@ -56,6 +62,7 @@ CLASS net/minecraft/class_8966 net/minecraft/block/entity/spawner/TrialSpawnerDa METHOD method_55197 hasSpawnData ()Z METHOD method_55198 isCooldownAtRepeating (Lnet/minecraft/class_3218;Lnet/minecraft/class_8965;F)Z ARG 1 world + ARG 2 config ARG 3 position METHOD method_55200 areMobsDead ()Z METHOD method_55202 getDisplayEntityRotation ()D diff --git a/mappings/net/minecraft/block/entity/spawner/TrialSpawnerLogic.mapping b/mappings/net/minecraft/block/spawner/TrialSpawnerLogic.mapping similarity index 64% rename from mappings/net/minecraft/block/entity/spawner/TrialSpawnerLogic.mapping rename to mappings/net/minecraft/block/spawner/TrialSpawnerLogic.mapping index d3579a83d0..0617f6a322 100644 --- a/mappings/net/minecraft/block/entity/spawner/TrialSpawnerLogic.mapping +++ b/mappings/net/minecraft/block/spawner/TrialSpawnerLogic.mapping @@ -1,17 +1,22 @@ -CLASS net/minecraft/class_8963 net/minecraft/block/entity/spawner/TrialSpawnerLogic +CLASS net/minecraft/class_8963 net/minecraft/block/spawner/TrialSpawnerLogic FIELD field_47359 MAX_ENTITY_DISTANCE I FIELD field_47360 MAX_ENTITY_DISTANCE_SQUARED I + FIELD field_47362 config Lnet/minecraft/class_8965; FIELD field_47363 data Lnet/minecraft/class_8966; FIELD field_47364 trialSpawner Lnet/minecraft/class_8963$class_8964; FIELD field_47365 entityDetector Lnet/minecraft/class_8962; + FIELD field_47366 forceActivate Z METHOD (Lnet/minecraft/class_8963$class_8964;Lnet/minecraft/class_8962;)V ARG 1 trialSpawner ARG 2 entityDetector METHOD (Lnet/minecraft/class_8965;Lnet/minecraft/class_8966;Lnet/minecraft/class_8963$class_8964;Lnet/minecraft/class_8962;)V + ARG 1 config ARG 2 data ARG 3 trialSpawner ARG 4 entityDetector METHOD method_55156 codec ()Lcom/mojang/serialization/Codec; + METHOD method_55157 (DDDLnet/minecraft/class_5819;Lnet/minecraft/class_1297;)Lnet/minecraft/class_1297; + ARG 7 entity METHOD method_55158 trySpawnMob (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)Ljava/util/Optional; ARG 1 world ARG 2 pos @@ -19,6 +24,10 @@ CLASS net/minecraft/class_8963 net/minecraft/block/entity/spawner/TrialSpawnerLo ARG 1 world ARG 2 pos ARG 3 lootTable + METHOD method_55160 shouldRemoveMobFromData (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Ljava/util/UUID;)Z + ARG 0 world + ARG 1 pos + ARG 2 uuid METHOD method_55161 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 1 instance METHOD method_55162 canActivate (Lnet/minecraft/class_1937;)Z @@ -26,25 +35,31 @@ CLASS net/minecraft/class_8963 net/minecraft/block/entity/spawner/TrialSpawnerLo METHOD method_55163 setSpawnerState (Lnet/minecraft/class_1937;Lnet/minecraft/class_8967;)V ARG 1 world ARG 2 spawnerState - METHOD method_55164 (Lnet/minecraft/class_1937;Lnet/minecraft/class_243;Lnet/minecraft/class_243;)Z + METHOD method_55164 hasLineOfSight (Lnet/minecraft/class_1937;Lnet/minecraft/class_243;Lnet/minecraft/class_243;)Z ARG 0 world + ARG 1 spawnerPos + ARG 2 spawnPos METHOD method_55165 tickClient (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V ARG 1 world ARG 2 pos - METHOD method_55166 (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;)V + METHOD method_55166 addMobSpawnParticles (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;)V ARG 0 world ARG 1 pos ARG 2 random - METHOD method_55167 (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;I)V + METHOD method_55167 addDetectionParticles (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;I)V ARG 0 world ARG 1 pos ARG 2 random + ARG 3 playerCount METHOD method_55168 setEntityDetector (Lnet/minecraft/class_8962;)V ARG 1 detector + METHOD method_55170 getConfig ()Lnet/minecraft/class_8965; METHOD method_55171 tickServer (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)V ARG 1 world ARG 2 pos - METHOD method_55173 (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;)V + METHOD method_55172 (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Ljava/util/UUID;)Z + ARG 2 uuid + METHOD method_55173 addEjectItemParticles (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;)V ARG 0 world ARG 1 pos ARG 2 random @@ -52,6 +67,7 @@ CLASS net/minecraft/class_8963 net/minecraft/block/entity/spawner/TrialSpawnerLo METHOD method_55175 getSpawnerState ()Lnet/minecraft/class_8967; METHOD method_55176 updateListeners ()V METHOD method_55177 getEntityDetector ()Lnet/minecraft/class_8962; + METHOD method_55178 forceActivate ()V CLASS class_8964 TrialSpawner METHOD method_55146 setSpawnerState (Lnet/minecraft/class_1937;Lnet/minecraft/class_8967;)V ARG 1 world diff --git a/mappings/net/minecraft/class_8965.mapping b/mappings/net/minecraft/class_8965.mapping deleted file mode 100644 index c7d4c40b29..0000000000 --- a/mappings/net/minecraft/class_8965.mapping +++ /dev/null @@ -1,5 +0,0 @@ -CLASS net/minecraft/class_8965 - METHOD method_55179 getTotalMobs (I)I - ARG 1 additionalPlayers - METHOD method_55181 getSimultaneousMobs (I)I - ARG 1 additionalPlayers diff --git a/mappings/net/minecraft/command/FallthroughCommandAction.mapping b/mappings/net/minecraft/command/FallthroughCommandAction.mapping new file mode 100644 index 0000000000..159f0bad70 --- /dev/null +++ b/mappings/net/minecraft/command/FallthroughCommandAction.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_8939 net/minecraft/command/FallthroughCommandAction + FIELD field_47169 INSTANCE Lnet/minecraft/class_8939; + METHOD method_54899 getInstance ()Lnet/minecraft/class_8853; diff --git a/mappings/net/minecraft/command/IsolatedCommandAction.mapping b/mappings/net/minecraft/command/IsolatedCommandAction.mapping new file mode 100644 index 0000000000..7c00e44561 --- /dev/null +++ b/mappings/net/minecraft/command/IsolatedCommandAction.mapping @@ -0,0 +1,6 @@ +CLASS net/minecraft/class_8940 net/minecraft/command/IsolatedCommandAction + FIELD field_47170 controlConsumer Ljava/util/function/Consumer; + FIELD field_47171 returnValueConsumer Lnet/minecraft/class_8935; + METHOD (Ljava/util/function/Consumer;Lnet/minecraft/class_8935;)V + ARG 1 controlConsumer + ARG 2 returnValueConsumer diff --git a/mappings/net/minecraft/command/SingleCommandAction.mapping b/mappings/net/minecraft/command/SingleCommandAction.mapping index 5487cb146e..e40b3c80bf 100644 --- a/mappings/net/minecraft/command/SingleCommandAction.mapping +++ b/mappings/net/minecraft/command/SingleCommandAction.mapping @@ -19,6 +19,10 @@ CLASS net/minecraft/class_8858 net/minecraft/command/SingleCommandAction ARG 3 context ARG 4 frame ARG 5 flags + METHOD method_54897 (Lcom/mojang/brigadier/context/CommandContext;ZI)V + ARG 0 context + ARG 1 successful + ARG 2 returnValue CLASS class_8859 MultiSource FIELD field_46745 sources Ljava/util/List; FIELD field_47164 flags Lnet/minecraft/class_8936; diff --git a/mappings/net/minecraft/entity/ai/brain/task/BreezeJumpTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/BreezeJumpTask.mapping new file mode 100644 index 0000000000..cb3f6b8d71 --- /dev/null +++ b/mappings/net/minecraft/entity/ai/brain/task/BreezeJumpTask.mapping @@ -0,0 +1,38 @@ +CLASS net/minecraft/class_8952 net/minecraft/entity/ai/brain/task/BreezeJumpTask + FIELD field_47289 REQUIRED_SPACE_ABOVE I + FIELD field_47290 MAX_JUMP_DISTANCE D + FIELD field_47291 JUMP_COOLDOWN_EXPIRY I + FIELD field_47292 JUMP_COOLDOWN_EXPIRY_WHEN_HURT I + FIELD field_47293 JUMP_INHALING_EXPIRY I + FIELD field_47294 MAX_JUMP_VELOCITY F + FIELD field_47295 POSSIBLE_JUMP_ANGLES Lit/unimi/dsi/fastutil/objects/ObjectArrayList; + METHOD method_55022 getRandomPosBehindTarget (Lnet/minecraft/class_1309;Lnet/minecraft/class_5819;)Lnet/minecraft/class_243; + ARG 0 target + ARG 1 random + METHOD method_55023 getPosToJumpTo (Lnet/minecraft/class_1309;Lnet/minecraft/class_243;)Lnet/minecraft/class_2338; + ARG 0 breeze + ARG 1 pos + METHOD method_55024 shouldStopInhalingPose (Lnet/minecraft/class_8949;)Z + ARG 0 breeze + METHOD method_55025 getJumpingVelocity (Lnet/minecraft/class_8949;Lnet/minecraft/class_5819;Lnet/minecraft/class_243;)Ljava/util/Optional; + ARG 0 breeze + ARG 1 random + ARG 2 jumpTarget + METHOD method_55026 isTargetOutOfRange (Lnet/minecraft/class_8949;Lnet/minecraft/class_1309;)Z + ARG 0 breeze + ARG 1 target + METHOD method_55027 canJumpTo (Lnet/minecraft/class_8949;Lnet/minecraft/class_243;)Z + ARG 0 breeze + ARG 1 jumpPos + METHOD method_55028 (Lnet/minecraft/class_8949;Lnet/minecraft/class_2338;)Ljava/util/Optional; + ARG 1 jumpTarget + METHOD method_55029 hasRoomToJump (Lnet/minecraft/class_3218;Lnet/minecraft/class_8949;)Z + ARG 0 world + ARG 1 breeze + METHOD method_55031 shouldStopLongJumpingPose (Lnet/minecraft/class_8949;)Z + ARG 0 breeze + METHOD method_55032 isTargetTooClose (Lnet/minecraft/class_8949;Lnet/minecraft/class_1309;)Z + ARG 0 breeze + ARG 1 target + METHOD method_55033 (Lnet/minecraft/class_8949;Lnet/minecraft/class_2338;)V + ARG 1 jumpTarget diff --git a/mappings/net/minecraft/entity/ai/brain/task/BreezeShootTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/BreezeShootTask.mapping new file mode 100644 index 0000000000..43ca6d6004 --- /dev/null +++ b/mappings/net/minecraft/entity/ai/brain/task/BreezeShootTask.mapping @@ -0,0 +1,21 @@ +CLASS net/minecraft/class_8953 net/minecraft/entity/ai/brain/task/BreezeShootTask + FIELD field_47296 MIN_SQUARED_RANGE I + FIELD field_47297 MAX_SQUARED_RANGE I + FIELD field_47298 BASE_PROJECTILE_DIVERGENCY I + FIELD field_47299 PROJECTILE_DIVERGENCY_DIFFICULTY_MODIFIER I + FIELD field_47300 PROJECTILE_SPEED F + FIELD field_47301 SHOOT_CHARGING_EXPIRY I + FIELD field_47302 RECOVER_EXPIRY I + FIELD field_47303 SHOOT_COOLDOWN_EXPIRY I + METHOD method_55038 isFacingTarget (Lnet/minecraft/class_8949;Lnet/minecraft/class_1309;)Z + ARG 0 breeze + ARG 1 target + METHOD method_55039 (Lnet/minecraft/class_8949;Ljava/lang/Boolean;)Ljava/lang/Boolean; + ARG 1 withinRange + METHOD method_55041 isTargetWithinRange (Lnet/minecraft/class_8949;Lnet/minecraft/class_1309;)Z + ARG 0 breeze + ARG 1 target + METHOD method_55043 (Lnet/minecraft/class_8949;Lnet/minecraft/class_1309;)V + ARG 1 target + METHOD method_55045 (Lnet/minecraft/class_8949;Lnet/minecraft/class_1309;)Ljava/lang/Boolean; + ARG 1 target diff --git a/mappings/net/minecraft/entity/ai/brain/task/BreezeSlideTowardsTargetTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/BreezeSlideTowardsTargetTask.mapping new file mode 100644 index 0000000000..dd99e56454 --- /dev/null +++ b/mappings/net/minecraft/entity/ai/brain/task/BreezeSlideTowardsTargetTask.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_8954 net/minecraft/entity/ai/brain/task/BreezeSlideTowardsTargetTask + METHOD method_55048 getRandomPosInMediumRange (Lnet/minecraft/class_8949;Lnet/minecraft/class_1309;)Lnet/minecraft/class_243; + ARG 0 breeze + ARG 1 target diff --git a/mappings/net/minecraft/entity/ai/brain/task/LongJumpTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/LongJumpTask.mapping index 18656deb6a..66bea66929 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/LongJumpTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/LongJumpTask.mapping @@ -29,6 +29,8 @@ CLASS net/minecraft/class_6030 net/minecraft/entity/ai/brain/task/LongJumpTask ARG 5 entityToSound ARG 6 jumpToPredicate METHOD method_35078 getJumpingVelocity (Lnet/minecraft/class_1308;Lnet/minecraft/class_243;)Lnet/minecraft/class_243; + ARG 1 entity + ARG 2 targetPos METHOD method_41336 getTarget (Lnet/minecraft/class_3218;)Ljava/util/Optional; ARG 1 world METHOD method_41337 canJumpTo (Lnet/minecraft/class_3218;Lnet/minecraft/class_1308;Lnet/minecraft/class_2338;)Z diff --git a/mappings/net/minecraft/entity/mob/BreezeBrain.mapping b/mappings/net/minecraft/entity/mob/BreezeBrain.mapping index d783332170..4741929992 100644 --- a/mappings/net/minecraft/entity/mob/BreezeBrain.mapping +++ b/mappings/net/minecraft/entity/mob/BreezeBrain.mapping @@ -9,4 +9,4 @@ CLASS net/minecraft/class_8950 net/minecraft/entity/mob/BreezeBrain ARG 0 brain METHOD method_55019 addFightTasks (Lnet/minecraft/class_4095;)V ARG 0 brain - CLASS class_8951 SlideTask + CLASS class_8951 SlideAroundTask diff --git a/mappings/net/minecraft/entity/mob/BreezeEntity.mapping b/mappings/net/minecraft/entity/mob/BreezeEntity.mapping index 527a77b7ec..1b17c6ba54 100644 --- a/mappings/net/minecraft/entity/mob/BreezeEntity.mapping +++ b/mappings/net/minecraft/entity/mob/BreezeEntity.mapping @@ -3,4 +3,10 @@ CLASS net/minecraft/class_8949 net/minecraft/entity/mob/BreezeEntity FIELD field_47280 inhalingAnimationState Lnet/minecraft/class_7094; FIELD field_47281 shootingAnimationState Lnet/minecraft/class_7094; METHOD method_55009 getChargeY ()D + METHOD method_55011 isWithinLargeRange (Lnet/minecraft/class_243;)Z + ARG 1 pos + METHOD method_55012 isWithinMediumRange (Lnet/minecraft/class_243;)Z + ARG 1 pos + METHOD method_55013 isWithinShortRange (Lnet/minecraft/class_243;)Z + ARG 1 pos METHOD method_55014 createBreezeAttributes ()Lnet/minecraft/class_5132$class_5133; diff --git a/mappings/net/minecraft/util/Uuids.mapping b/mappings/net/minecraft/util/Uuids.mapping index bed876664e..f4c1a637bc 100644 --- a/mappings/net/minecraft/util/Uuids.mapping +++ b/mappings/net/minecraft/util/Uuids.mapping @@ -5,6 +5,7 @@ CLASS net/minecraft/class_4844 net/minecraft/util/Uuids FIELD field_40825 CODEC Lcom/mojang/serialization/Codec; FIELD field_41525 STRING_CODEC Lcom/mojang/serialization/Codec; FIELD field_46588 STRICT_CODEC Lcom/mojang/serialization/Codec; + FIELD field_47491 INT_STREAM_LIST_CODEC Lcom/mojang/serialization/Codec; METHOD method_26274 toIntArray (JJ)[I ARG 0 uuidMost ARG 2 uuidLeast diff --git a/mappings/net/minecraft/util/math/LongJumpUtil.mapping b/mappings/net/minecraft/util/math/LongJumpUtil.mapping new file mode 100644 index 0000000000..1759547750 --- /dev/null +++ b/mappings/net/minecraft/util/math/LongJumpUtil.mapping @@ -0,0 +1,12 @@ +CLASS net/minecraft/class_8946 net/minecraft/util/math/LongJumpUtil + METHOD method_54989 isPathClear (Lnet/minecraft/class_1308;Lnet/minecraft/class_4048;Lnet/minecraft/class_243;Lnet/minecraft/class_243;)Z + ARG 0 entity + ARG 1 dimensions + ARG 2 prevPos + ARG 3 nextPos + METHOD method_54990 getJumpingVelocity (Lnet/minecraft/class_1308;Lnet/minecraft/class_243;FIZ)Ljava/util/Optional; + ARG 0 entity + ARG 1 jumpTarget + ARG 2 maxVelocity + ARG 3 angle + ARG 4 requireClearPath diff --git a/mappings/net/minecraft/util/math/Vec3d.mapping b/mappings/net/minecraft/util/math/Vec3d.mapping index ab11f2a32b..856b7b0531 100644 --- a/mappings/net/minecraft/util/math/Vec3d.mapping +++ b/mappings/net/minecraft/util/math/Vec3d.mapping @@ -246,3 +246,7 @@ CLASS net/minecraft/class_243 net/minecraft/util/math/Vec3d ARG 1 deltaX ARG 3 deltaY ARG 5 deltaZ + METHOD method_55230 isWithinRangeOf (Lnet/minecraft/class_243;DD)Z + ARG 1 vec + ARG 2 horizontalRange + ARG 4 verticalRange