From 2a404a0023a51bfaa916b62e26633a5508550efb Mon Sep 17 00:00:00 2001 From: Tehc Date: Sun, 2 Aug 2020 04:35:13 -0400 Subject: [PATCH] CanPickup/canPickUp -> Equipable/canEquip (#1640) * LivingEntity.canPickUp -> canEquip * EntityPredicates.CanPickup -> CanEquip * EntityPredicates.CanEquip -> Equipable --- mappings/net/minecraft/entity/LivingEntity.mapping | 2 +- .../net/minecraft/predicate/entity/EntityPredicates.mapping | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mappings/net/minecraft/entity/LivingEntity.mapping b/mappings/net/minecraft/entity/LivingEntity.mapping index eaeeb2de6a..2bf70e4a1e 100644 --- a/mappings/net/minecraft/entity/LivingEntity.mapping +++ b/mappings/net/minecraft/entity/LivingEntity.mapping @@ -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 diff --git a/mappings/net/minecraft/predicate/entity/EntityPredicates.mapping b/mappings/net/minecraft/predicate/entity/EntityPredicates.mapping index 9bcdd122e3..92210df079 100644 --- a/mappings/net/minecraft/predicate/entity/EntityPredicates.mapping +++ b/mappings/net/minecraft/predicate/entity/EntityPredicates.mapping @@ -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 (Lnet/minecraft/class_1799;)V ARG 1 stack