Skip to content

Commit

Permalink
CanPickup/canPickUp -> Equipable/canEquip (#1640)
Browse files Browse the repository at this point in the history 
* LivingEntity.canPickUp -> canEquip

* EntityPredicates.CanPickup -> CanEquip

* EntityPredicates.CanEquip -> Equipable
  • Loading branch information
Tehc committed Aug 2, 2020
1 parent 48b45b3 commit 2a404a0
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion mappings/net/minecraft/entity/LivingEntity.mapping
View file
Expand Up @@ -106,7 +106,7 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity
METHOD method_18395 canTarget (Lnet/minecraft/class_1309;)Z
ARG 1 target
METHOD method_18396 getArmorVisibility ()F
METHOD method_18397 canPickUp (Lnet/minecraft/class_1799;)Z
METHOD method_18397 canEquip (Lnet/minecraft/class_1799;)Z
ARG 1 stack
METHOD method_18398 getSleepingPosition ()Ljava/util/Optional;
METHOD method_18399 clearSleepingPosition ()V
Expand Down
2 changes: 1 addition & 1 deletion mappings/net/minecraft/predicate/entity/EntityPredicates.mapping
View file
Expand Up @@ -41,7 +41,7 @@ CLASS net/minecraft/class_1301 net/minecraft/predicate/entity/EntityPredicates
ARG 0 entity
METHOD method_5913 rides (Lnet/minecraft/class_1297;)Ljava/util/function/Predicate;
ARG 0 entity
CLASS class_1302 CanPickup
CLASS class_1302 Equipable
FIELD field_6158 stack Lnet/minecraft/class_1799;
METHOD <init> (Lnet/minecraft/class_1799;)V
ARG 1 stack
Expand Down

2 comments on commit 2a404a0

@gbl
Copy link

@gbl gbl commented on 2a404a0 Aug 2, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Something seems to be wrong here.
Building with yarn 1.16.2-pre1+build.13 (which apparently includes this) throws errors when building:

:remapping antighost-1.16.2-pre1-fabric0.16.3-1.1.2-dev.jar
Mapping source name conflicts detected:
  net/minecraft/entity/passive/FoxEntity METHOD canEquip ((Lnet/minecraft/item/ItemStack;)Z) -> [net/minecraft/entity/LivingEntity/method_18397, net/minecraft/entity/passive/FoxEntity/method_6773]
  net/minecraft/entity/player/PlayerEntity METHOD canEquip ((Lnet/minecraft/item/ItemStack;)Z) -> [net/minecraft/entity/player/PlayerEntity/method_6773, net/minecraft/entity/LivingEntity/method_18397]
  net/minecraft/entity/LivingEntity METHOD canEquip ((Lnet/minecraft/item/ItemStack;)Z) -> [net/minecraft/entity/LivingEntity/method_18397, net/minecraft/entity/LivingEntity/method_6773]
  net/minecraft/entity/mob/MobEntity METHOD canEquip ((Lnet/minecraft/item/ItemStack;)Z) -> [net/minecraft/entity/mob/MobEntity/method_6773, net/minecraft/entity/LivingEntity/method_18397]
  net/minecraft/entity/passive/PandaEntity METHOD canEquip ((Lnet/minecraft/item/ItemStack;)Z) -> [net/minecraft/entity/passive/PandaEntity/method_6773, net/minecraft/entity/LivingEntity/method_18397]
  net/minecraft/entity/passive/DolphinEntity METHOD canEquip ((Lnet/minecraft/item/ItemStack;)Z) -> [net/minecraft/entity/LivingEntity/method_18397, net/minecraft/entity/passive/DolphinEntity/method_6773]
  net/minecraft/entity/passive/LlamaEntity METHOD canEquip ((Lnet/minecraft/item/ItemStack;)Z) -> [net/minecraft/entity/LivingEntity/method_18397, net/minecraft/entity/passive/LlamaEntity/method_6773]
  net/minecraft/entity/decoration/ArmorStandEntity METHOD canEquip ((Lnet/minecraft/item/ItemStack;)Z) -> [net/minecraft/entity/LivingEntity/method_18397, net/minecraft/entity/decoration/ArmorStandEntity/method_6773]
  net/minecraft/entity/passive/HorseBaseEntity METHOD canEquip ((Lnet/minecraft/item/ItemStack;)Z) -> [net/minecraft/entity/passive/HorseBaseEntity/method_6773, net/minecraft/entity/LivingEntity/method_18397]
  net/minecraft/entity/passive/HorseEntity METHOD canEquip ((Lnet/minecraft/item/ItemStack;)Z) -> [net/minecraft/entity/LivingEntity/method_18397, net/minecraft/entity/passive/HorseEntity/method_6773]
Daemon vm is shutting down... The daemon has exited normally or was terminated in response to a user interrupt.
----- End of the daemon log -----

while building with yarn 1.16.2-pre1+build.9 which does not include this commit has no issues.

@liach
Copy link
Contributor

@liach liach commented on 2a404a0 Aug 2, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See #1643

Please sign in to comment.