From 8a00a58f58e9aa510716b96a2431d733454b9a68 Mon Sep 17 00:00:00 2001 From: Yanis48 Date: Sun, 26 Apr 2020 23:16:16 +0200 Subject: [PATCH] Attribute command & related stuff (#1295) * Attribute command & related stuff * missed parameters * updated name --- .../net/minecraft/entity/LivingEntity.mapping | 5 +- .../attribute/AttributeContainer.mapping | 8 +++ .../DefaultAttributeContainer.mapping | 3 ++ .../attribute/EntityAttributeInstance.mapping | 2 + .../attribute/EntityAttributeModifier.mapping | 10 ++-- mappings/net/minecraft/item/Items.mapping | 4 +- .../server/command/AttributeCommand.mapping | 50 +++++++++++++++++++ 7 files changed, 74 insertions(+), 8 deletions(-) create mode 100644 mappings/net/minecraft/server/command/AttributeCommand.mapping diff --git a/mappings/net/minecraft/entity/LivingEntity.mapping b/mappings/net/minecraft/entity/LivingEntity.mapping index e63b938982..4e8032d67b 100644 --- a/mappings/net/minecraft/entity/LivingEntity.mapping +++ b/mappings/net/minecraft/entity/LivingEntity.mapping @@ -171,7 +171,10 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity COMMENT

This checks both the entity's main and off hand. METHOD method_24831 getPoses ()Lcom/google/common/collect/ImmutableList; METHOD method_26319 canWalkOnLava ()Z - METHOD method_26825 getAttribute (Lnet/minecraft/class_1320;)D + METHOD method_26825 getAttributeValue (Lnet/minecraft/class_1320;)D + ARG 1 attribute + METHOD method_26826 getAttributeBaseValue (Lnet/minecraft/class_1320;)D + ARG 1 attribute METHOD method_26827 createLivingAttributes ()Lnet/minecraft/class_5132$class_5133; METHOD method_5973 canTarget (Lnet/minecraft/class_1299;)Z ARG 1 type diff --git a/mappings/net/minecraft/entity/attribute/AttributeContainer.mapping b/mappings/net/minecraft/entity/attribute/AttributeContainer.mapping index 9c56e951f3..2cc4089642 100644 --- a/mappings/net/minecraft/entity/attribute/AttributeContainer.mapping +++ b/mappings/net/minecraft/entity/attribute/AttributeContainer.mapping @@ -24,3 +24,11 @@ CLASS net/minecraft/class_5131 net/minecraft/entity/attribute/AttributeContainer METHOD method_26855 toTag ()Lnet/minecraft/class_2499; METHOD method_26856 getBaseValue (Lnet/minecraft/class_1320;)D ARG 1 attribute + METHOD method_27305 hasModifierForAttribute (Lnet/minecraft/class_1320;Ljava/util/UUID;)Z + ARG 1 attribute + ARG 2 uuid + METHOD method_27306 hasAttribute (Lnet/minecraft/class_1320;)Z + ARG 1 attribute + METHOD method_27307 getModifierValue (Lnet/minecraft/class_1320;Ljava/util/UUID;)D + ARG 1 attribute + ARG 2 uuid diff --git a/mappings/net/minecraft/entity/attribute/DefaultAttributeContainer.mapping b/mappings/net/minecraft/entity/attribute/DefaultAttributeContainer.mapping index 53fb872507..3ee80a25a7 100644 --- a/mappings/net/minecraft/entity/attribute/DefaultAttributeContainer.mapping +++ b/mappings/net/minecraft/entity/attribute/DefaultAttributeContainer.mapping @@ -12,6 +12,9 @@ CLASS net/minecraft/class_5132 net/minecraft/entity/attribute/DefaultAttributeCo ARG 1 attribute METHOD method_26865 require (Lnet/minecraft/class_1320;)Lnet/minecraft/class_1324; ARG 1 attribute + METHOD method_27308 getModifierValue (Lnet/minecraft/class_1320;Ljava/util/UUID;)D + ARG 1 attribute + ARG 2 uuid CLASS class_5133 Builder FIELD field_23714 instances Ljava/util/Map; FIELD field_23715 unmodifiable Z diff --git a/mappings/net/minecraft/entity/attribute/EntityAttributeInstance.mapping b/mappings/net/minecraft/entity/attribute/EntityAttributeInstance.mapping index 31377900ca..047aa4a532 100644 --- a/mappings/net/minecraft/entity/attribute/EntityAttributeInstance.mapping +++ b/mappings/net/minecraft/entity/attribute/EntityAttributeInstance.mapping @@ -22,6 +22,8 @@ CLASS net/minecraft/class_1324 net/minecraft/entity/attribute/EntityAttributeIns METHOD method_26838 onUpdate ()V METHOD method_26839 toTag ()Lnet/minecraft/class_2487; METHOD method_26840 computeValue ()D + METHOD method_27304 tryRemoveModifier (Ljava/util/UUID;)Z + ARG 1 uuid METHOD method_6192 setBaseValue (D)V ARG 1 baseValue METHOD method_6193 getModifiers (Lnet/minecraft/class_1322$class_1323;)Ljava/util/Set; diff --git a/mappings/net/minecraft/entity/attribute/EntityAttributeModifier.mapping b/mappings/net/minecraft/entity/attribute/EntityAttributeModifier.mapping index 36fd16b1be..e147f81658 100644 --- a/mappings/net/minecraft/entity/attribute/EntityAttributeModifier.mapping +++ b/mappings/net/minecraft/entity/attribute/EntityAttributeModifier.mapping @@ -1,22 +1,22 @@ CLASS net/minecraft/class_1322 net/minecraft/entity/attribute/EntityAttributeModifier FIELD field_23712 LOGGER Lorg/apache/logging/log4j/Logger; - FIELD field_6323 amount D + FIELD field_6323 value D FIELD field_6324 operation Lnet/minecraft/class_1322$class_1323; FIELD field_6326 nameGetter Ljava/util/function/Supplier; FIELD field_6327 uuid Ljava/util/UUID; METHOD (Ljava/lang/String;DLnet/minecraft/class_1322$class_1323;)V ARG 1 name - ARG 2 amount + ARG 2 value ARG 4 operation METHOD (Ljava/util/UUID;Ljava/lang/String;DLnet/minecraft/class_1322$class_1323;)V ARG 1 uuid ARG 2 name - ARG 3 amount + ARG 3 value ARG 5 operation METHOD (Ljava/util/UUID;Ljava/util/function/Supplier;DLnet/minecraft/class_1322$class_1323;)V ARG 1 uuid ARG 2 nameGetter - ARG 3 amount + ARG 3 value ARG 5 operation METHOD equals (Ljava/lang/Object;)Z ARG 1 o @@ -25,7 +25,7 @@ CLASS net/minecraft/class_1322 net/minecraft/entity/attribute/EntityAttributeMod METHOD method_26860 toTag ()Lnet/minecraft/class_2487; METHOD method_6182 getOperation ()Lnet/minecraft/class_1322$class_1323; METHOD method_6185 getName ()Ljava/lang/String; - METHOD method_6186 getAmount ()D + METHOD method_6186 getValue ()D METHOD method_6189 getId ()Ljava/util/UUID; CLASS class_1323 Operation FIELD field_6329 id I diff --git a/mappings/net/minecraft/item/Items.mapping b/mappings/net/minecraft/item/Items.mapping index 3ee895c141..b6feb1b85b 100644 --- a/mappings/net/minecraft/item/Items.mapping +++ b/mappings/net/minecraft/item/Items.mapping @@ -130,7 +130,7 @@ CLASS net/minecraft/class_1802 net/minecraft/item/Items FIELD field_21998 WARPED_FENCE_GATE Lnet/minecraft/class_1792; FIELD field_21999 SOUL_SOIL Lnet/minecraft/class_1792; FIELD field_22000 BASALT Lnet/minecraft/class_1792; - FIELD field_22001 SOUL_FIRE_TORCH Lnet/minecraft/class_1792; + FIELD field_22001 SOUL_TORCH Lnet/minecraft/class_1792; FIELD field_22002 CRIMSON_TRAPDOOR Lnet/minecraft/class_1792; FIELD field_22003 WARPED_TRAPDOOR Lnet/minecraft/class_1792; FIELD field_22004 CRIMSON_BUTTON Lnet/minecraft/class_1792; @@ -142,7 +142,7 @@ CLASS net/minecraft/class_1802 net/minecraft/item/Items FIELD field_22010 CRIMSON_DOOR Lnet/minecraft/class_1792; FIELD field_22013 CRIMSON_NYLIUM Lnet/minecraft/class_1792; FIELD field_22015 WARPED_NYLIUM Lnet/minecraft/class_1792; - FIELD field_22016 SOUL_FIRE_LANTERN Lnet/minecraft/class_1792; + FIELD field_22016 SOUL_LANTERN Lnet/minecraft/class_1792; FIELD field_22017 SHROOMLIGHT Lnet/minecraft/class_1792; FIELD field_22018 NETHERITE_BLOCK Lnet/minecraft/class_1792; FIELD field_22019 ANCIENT_DEBRIS Lnet/minecraft/class_1792; diff --git a/mappings/net/minecraft/server/command/AttributeCommand.mapping b/mappings/net/minecraft/server/command/AttributeCommand.mapping new file mode 100644 index 0000000000..6c5c7cc56b --- /dev/null +++ b/mappings/net/minecraft/server/command/AttributeCommand.mapping @@ -0,0 +1,50 @@ +CLASS net/minecraft/class_5252 net/minecraft/server/command/AttributeCommand + FIELD field_24375 SUGGESTION_PROVIDER Lcom/mojang/brigadier/suggestion/SuggestionProvider; + FIELD field_24376 ENTITY_FAILED_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; + FIELD field_24377 NO_ATTRIBUTE_EXCEPTION Lcom/mojang/brigadier/exceptions/Dynamic2CommandExceptionType; + FIELD field_24378 NO_MODIFIER_EXCEPTION Lcom/mojang/brigadier/exceptions/Dynamic3CommandExceptionType; + FIELD field_24379 MODIFIER_ALREADY_PRESENT_EXCEPTION Lcom/mojang/brigadier/exceptions/Dynamic3CommandExceptionType; + METHOD method_27733 getLivingEntity (Lnet/minecraft/class_1297;)Lnet/minecraft/class_1309; + ARG 0 entity + METHOD method_27734 getAttributeInstance (Lnet/minecraft/class_1297;Lnet/minecraft/class_1320;)Lnet/minecraft/class_1324; + ARG 0 entity + ARG 1 attribute + METHOD method_27735 register (Lcom/mojang/brigadier/CommandDispatcher;)V + ARG 0 dispatcher + METHOD method_27739 executeValueGet (Lnet/minecraft/class_2168;Lnet/minecraft/class_1297;Lnet/minecraft/class_1320;D)I + ARG 0 source + ARG 1 target + ARG 2 attribute + ARG 3 multiplier + METHOD method_27740 executeModifierRemove (Lnet/minecraft/class_2168;Lnet/minecraft/class_1297;Lnet/minecraft/class_1320;Ljava/util/UUID;)I + ARG 0 source + ARG 1 target + ARG 2 attribute + ARG 3 uuid + METHOD method_27741 executeModifierValueGet (Lnet/minecraft/class_2168;Lnet/minecraft/class_1297;Lnet/minecraft/class_1320;Ljava/util/UUID;D)I + ARG 0 source + ARG 1 target + ARG 2 attribute + ARG 3 uuid + ARG 4 multiplier + METHOD method_27742 executeModifierAdd (Lnet/minecraft/class_2168;Lnet/minecraft/class_1297;Lnet/minecraft/class_1320;Ljava/util/UUID;Ljava/lang/String;DLnet/minecraft/class_1322$class_1323;)I + ARG 0 source + ARG 1 target + ARG 2 attribute + ARG 3 uuid + ARG 4 name + ARG 5 value + ARG 7 operation + METHOD method_27746 getLivingEntityWithAttribute (Lnet/minecraft/class_1297;Lnet/minecraft/class_1320;)Lnet/minecraft/class_1309; + ARG 0 entity + ARG 1 attribute + METHOD method_27748 executeBaseValueGet (Lnet/minecraft/class_2168;Lnet/minecraft/class_1297;Lnet/minecraft/class_1320;D)I + ARG 0 source + ARG 1 target + ARG 2 attribute + ARG 3 multiplier + METHOD method_27751 executeBaseValueSet (Lnet/minecraft/class_2168;Lnet/minecraft/class_1297;Lnet/minecraft/class_1320;D)I + ARG 0 source + ARG 1 target + ARG 2 attribute + ARG 3 value