some piglin stuff + misc (#1144)

* some piglin stuff + misc

* Update mappings/net/minecraft/entity/mob/ZombifiedPiglinEntity.mapping

Co-Authored-By: Juuxel <6596629+Juuxel@users.noreply.github.com>

* more stuff

Co-authored-by: Juuxel <6596629+Juuxel@users.noreply.github.com>
This commit is contained in:
modmuss50 2020-03-05 21:40:35 +00:00 committed by GitHub
parent 42eff3b6d0
commit f339c99217
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 75 additions and 2 deletions

View File

@ -4,7 +4,11 @@ CLASS net/minecraft/class_4851 net/minecraft/advancement/criterion/TargetHitCrit
ARG 1 player
CLASS class_4852 Conditions
FIELD field_22430 signalStrength Lnet/minecraft/class_2096$class_2100;
FIELD field_22512 projectile Lnet/minecraft/class_2048;
FIELD field_22513 shooter Lnet/minecraft/class_2048;
METHOD <init> (Lnet/minecraft/class_2096$class_2100;Lnet/minecraft/class_2048;Lnet/minecraft/class_2048;)V
ARG 1 signalStrength
ARG 2 projectile
ARG 3 shooter
METHOD method_24865 create (Lnet/minecraft/class_2096$class_2100;)Lnet/minecraft/class_4851$class_4852;
ARG 0 signalStrength

View File

@ -1 +1,5 @@
CLASS net/minecraft/class_2490 net/minecraft/block/SlimeBlock
METHOD <init> (Lnet/minecraft/class_2248$class_2251;)V
ARG 1 settings
METHOD method_21847 bounce (Lnet/minecraft/class_1297;)V
ARG 1 entity

View File

@ -1,3 +1,9 @@
CLASS net/minecraft/class_4842 net/minecraft/client/render/entity/PiglinEntityRenderer
FIELD field_22410 TEXTURE Lnet/minecraft/class_2960;
FIELD field_22410 PIGLIN_TEXTURE Lnet/minecraft/class_2960;
FIELD field_22442 ZOMBIFIED_PIGLIN_TEXTURE Lnet/minecraft/class_2960;
METHOD <init> (Lnet/minecraft/class_898;Z)V
ARG 1 dispatcher
ARG 2 zombified
METHOD method_24813 createEarlessPiglinModel ()Lnet/minecraft/class_4840;
METHOD method_24875 getPiglinModel (Z)Lnet/minecraft/class_4840;
ARG 0 zombified

View File

@ -1,3 +1,4 @@
CLASS net/minecraft/class_1893 net/minecraft/enchantment/Enchantments
FIELD field_9102 ALL_ARMOR [Lnet/minecraft/class_1304;
METHOD method_8235 register (Ljava/lang/String;Lnet/minecraft/class_1887;)Lnet/minecraft/class_1887;
ARG 0 name

View File

@ -1,11 +1,19 @@
CLASS net/minecraft/class_1533 net/minecraft/entity/decoration/ItemFrameEntity
FIELD field_22476 fixed Z
FIELD field_7129 itemDropChance F
FIELD field_7130 ITEM_STACK Lnet/minecraft/class_2940;
FIELD field_7131 ITEM_FRAME_LOGGER Lorg/apache/logging/log4j/Logger;
FIELD field_7132 ROTATION Lnet/minecraft/class_2940;
METHOD <init> (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)V
ARG 1 world
ARG 2 pos
ARG 3 direction
METHOD method_6933 setHeldItemStack (Lnet/minecraft/class_1799;Z)V
ARG 1 value
ARG 2 update
METHOD method_6934 getRotation ()I
METHOD method_6935 setHeldItemStack (Lnet/minecraft/class_1799;)V
ARG 1 stack
METHOD method_6936 dropHeldStack (Lnet/minecraft/class_1297;Z)V
ARG 1 entity
ARG 2 alwaysDrop
@ -13,6 +21,7 @@ CLASS net/minecraft/class_1533 net/minecraft/entity/decoration/ItemFrameEntity
ARG 1 map
METHOD method_6938 getComparatorPower ()I
METHOD method_6939 setRotation (I)V
ARG 1 value
METHOD method_6940 getHeldItemStack ()Lnet/minecraft/class_1799;
METHOD method_6941 setRotation (IZ)V
ARG 1 value

View File

@ -2,6 +2,8 @@ CLASS net/minecraft/class_4835 net/minecraft/entity/mob/HoglinBrain
FIELD field_22369 AVOID_MEMORY_DURATION Lnet/minecraft/class_4801;
METHOD method_24662 makeRandomWalkTask (F)Lnet/minecraft/class_4118;
ARG 0 speed
METHOD method_24663 (Lnet/minecraft/class_1309;Lnet/minecraft/class_4760;)V
ARG 1 hoglin
METHOD method_24664 refreshActivities (Lnet/minecraft/class_4760;)V
ARG 0 hoglin
METHOD method_24665 onAttacking (Lnet/minecraft/class_4760;Lnet/minecraft/class_1309;)V
@ -16,6 +18,8 @@ CLASS net/minecraft/class_4835 net/minecraft/entity/mob/HoglinBrain
METHOD method_24669 isWarpedFungusAround (Lnet/minecraft/class_4760;Lnet/minecraft/class_2338;)Z
ARG 0 hoglin
ARG 1 pos
METHOD method_24670 (Lnet/minecraft/class_1309;Lnet/minecraft/class_4760;)V
ARG 1 hoglin
METHOD method_24671 playSoundAtChance (Lnet/minecraft/class_4760;)V
ARG 0 hoglin
METHOD method_24672 onAttacked (Lnet/minecraft/class_4760;Lnet/minecraft/class_1309;)V

View File

@ -53,6 +53,9 @@ CLASS net/minecraft/class_1308 net/minecraft/entity/mob/MobEntity
METHOD method_23734 isDisallowedInPeaceful ()Z
METHOD method_24523 tryEquip (Lnet/minecraft/class_1799;)Z
ARG 1 equipment
METHOD method_24834 equipLootStack (Lnet/minecraft/class_1304;Lnet/minecraft/class_1799;)V
ARG 1 slot
ARG 2 stack
METHOD method_5929 getDropChance (Lnet/minecraft/class_1304;)F
METHOD method_5930 setForwardSpeed (F)V
ARG 1 forwardSpeed

View File

@ -14,6 +14,8 @@ CLASS net/minecraft/class_4838 net/minecraft/entity/mob/PiglinBrain
ARG 0 speed
METHOD method_24719 wearsGoldArmor (Lnet/minecraft/class_1309;)Z
ARG 0 entity
METHOD method_24721 (Lnet/minecraft/class_1309;Lnet/minecraft/class_4836;)V
ARG 1 piglin
METHOD method_24722 tickActivities (Lnet/minecraft/class_4836;)V
ARG 0 piglin
METHOD method_24723 canRide (Lnet/minecraft/class_4836;Lnet/minecraft/class_1297;)Z
@ -29,29 +31,40 @@ CLASS net/minecraft/class_4838 net/minecraft/entity/mob/PiglinBrain
ARG 0 piglin
ARG 1 drop
METHOD method_24727 dropBarteredItem (Lnet/minecraft/class_4836;Lnet/minecraft/class_1657;Lnet/minecraft/class_1799;)V
ARG 0 piglin
ARG 1 player
ARG 2 stack
METHOD method_24728 playerInteract (Lnet/minecraft/class_4836;Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;)Z
ARG 0 piglin
ARG 1 player
ARG 2 hand
METHOD method_24729 (Lnet/minecraft/class_4836;Lnet/minecraft/class_4168;)V
ARG 1 activity
METHOD method_24730 canGather (Lnet/minecraft/class_4836;Lnet/minecraft/class_1799;)Z
ARG 0 piglin
ARG 1 stack
METHOD method_24731 drop (Lnet/minecraft/class_4836;Lnet/minecraft/class_1799;Lnet/minecraft/class_243;)V
ARG 0 piglin
ARG 1 stack
ARG 2 pos
METHOD method_24732 create (Lnet/minecraft/class_4836;Lcom/mojang/datafixers/Dynamic;)Lnet/minecraft/class_4095;
ARG 0 piglin
ARG 1 data
METHOD method_24733 onGoldBlockBroken (Lnet/minecraft/class_1657;)V
ARG 0 player
METHOD method_24734 (Lnet/minecraft/class_1657;Lnet/minecraft/class_4836;)V
ARG 1 piglin
METHOD method_24735 isGoldenItem (Lnet/minecraft/class_1792;)Z
ARG 0 item
METHOD method_24736 setHuntedRecently (Lnet/minecraft/class_4836;)V
ARG 0 piglin
METHOD method_24737 makeRememberRideableHoglinTask ()Lnet/minecraft/class_4821;
METHOD method_24738 makeGoToSoulFireTask (F)Lnet/minecraft/class_4121;
ARG 0 speed
METHOD method_24739 isGoldHoldingPlayer (Lnet/minecraft/class_1309;)Z
ARG 0 target
METHOD method_24740 (Lnet/minecraft/class_1309;Lnet/minecraft/class_4836;)V
ARG 1 piglin
METHOD method_24741 consumeOffHandItem (Lnet/minecraft/class_4836;Z)V
ARG 0 piglin
METHOD method_24742 angerAtCloserTargets (Lnet/minecraft/class_4836;Lnet/minecraft/class_1309;)V
@ -60,6 +73,8 @@ CLASS net/minecraft/class_4838 net/minecraft/entity/mob/PiglinBrain
METHOD method_24743 addIdleActivities (Lnet/minecraft/class_4836;Lnet/minecraft/class_4095;)V
ARG 0 piglin
ARG 1 brain
METHOD method_24745 (Lnet/minecraft/class_1657;Lnet/minecraft/class_4836;)Z
ARG 1 piglin
METHOD method_24746 acceptsForBarter (Lnet/minecraft/class_1792;)Z
ARG 0 item
METHOD method_24747 makeGoToZombifiedPiglinTask (F)Lnet/minecraft/class_4121;
@ -123,10 +138,13 @@ CLASS net/minecraft/class_4838 net/minecraft/entity/mob/PiglinBrain
ARG 1 target
METHOD method_24772 doBarter (Lnet/minecraft/class_4836;Lnet/minecraft/class_1799;)V
ARG 0 piglin
ARG 1 stack
METHOD method_24773 runAwayFrom (Lnet/minecraft/class_4836;Lnet/minecraft/class_1309;)V
ARG 0 piglin
ARG 1 target
METHOD method_24774 dropBarteredItem (Lnet/minecraft/class_4836;Lnet/minecraft/class_1799;)V
ARG 0 piglin
ARG 1 stack
METHOD method_24776 getBarteredItem (Lnet/minecraft/class_4836;)Lnet/minecraft/class_1799;
ARG 0 piglin
METHOD method_24777 getPreferredTarget (Lnet/minecraft/class_4836;)Ljava/util/Optional;
@ -157,3 +175,12 @@ CLASS net/minecraft/class_4838 net/minecraft/entity/mob/PiglinBrain
ARG 0 entity
METHOD method_24791 hasSoulFireNearby (Lnet/minecraft/class_4836;)Z
ARG 0 piglin
METHOD method_24848 (Lnet/minecraft/class_1542;)Lnet/minecraft/class_1799;
ARG 0 stack
METHOD method_24849 (Lnet/minecraft/class_4836;Lnet/minecraft/class_1799;)V
ARG 0 piglin
ARG 1 stack
METHOD method_24850 doesNotHaveGoldInOffHand (Lnet/minecraft/class_4836;)Z
ARG 0 piglin
METHOD method_24917 hasItemInOffHand (Lnet/minecraft/class_4836;)Z
ARG 0 piglin

View File

@ -8,6 +8,7 @@ CLASS net/minecraft/class_4836 net/minecraft/entity/mob/PiglinEntity
FIELD field_22380 BABY_SPEED_BOOST_MODIFIER Lnet/minecraft/class_1322;
FIELD field_22381 MEMORY_MODULE_TYPES Lcom/google/common/collect/ImmutableList;
FIELD field_22382 LOGGER Lorg/apache/logging/log4j/Logger;
FIELD field_22419 IMMUNE_TO_ZOMBIFICATION Lnet/minecraft/class_2940;
METHOD method_24694 zombify (Lnet/minecraft/class_3218;)V
ARG 1 world
METHOD method_24695 canSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_1936;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Ljava/util/Random;)Z
@ -33,4 +34,13 @@ CLASS net/minecraft/class_4836 net/minecraft/entity/mob/PiglinEntity
METHOD method_24711 addItem (Lnet/minecraft/class_1799;)Lnet/minecraft/class_1799;
ARG 1 stack
METHOD method_24712 isAdult ()Z
METHOD method_24843 isImmuneToZombification ()Z
METHOD method_24844 equipToMainHand (Lnet/minecraft/class_1799;)V
ARG 1 stack
METHOD method_24845 equipToOffHand (Lnet/minecraft/class_1799;)V
ARG 1 stack
METHOD method_24846 (Lnet/minecraft/class_1799;)Z
ARG 1 stack
METHOD method_24847 setImmuneToZombification (Z)V
ARG 1 immuneToZombification
CLASS class_4837 Activity

View File

@ -1,4 +1,4 @@
CLASS net/minecraft/class_1590 net/minecraft/entity/mob/ZombiePigmanEntity
CLASS net/minecraft/class_1590 net/minecraft/entity/mob/ZombifiedPiglinEntity
FIELD field_7307 ATTACKING_SPEED_BOOST Lnet/minecraft/class_1322;
FIELD field_7308 angrySoundDelay I
FIELD field_7309 anger I
@ -10,6 +10,7 @@ CLASS net/minecraft/class_1590 net/minecraft/entity/mob/ZombiePigmanEntity
ARG 2 spawnType
ARG 3 pos
ARG 4 random
METHOD method_20806 getNewAngerDuration ()I
METHOD method_7079 isAngry ()Z
CLASS class_1591 FollowPlayerIfAngryGoal
METHOD <init> (Lnet/minecraft/class_1590;)V

View File

@ -1,6 +1,10 @@
CLASS net/minecraft/class_1794 net/minecraft/item/HoeItem
FIELD field_22486 EFFECTIVE_BLOCKS Ljava/util/Set;
FIELD field_8023 TILLED_BLOCKS Ljava/util/Map;
METHOD <init> (Lnet/minecraft/class_1832;IFLnet/minecraft/class_1792$class_1793;)V
ARG 1 material
ARG 2 attackDamage
ARG 3 attackSpeed
ARG 4 settings
METHOD method_20279 (Lnet/minecraft/class_1838;Lnet/minecraft/class_1657;)V
ARG 1 p