From be62423a9f9fdec6fa90eb4946e6a8ce91299d9a Mon Sep 17 00:00:00 2001 From: DrMeepster <19316085+DrMeepster@users.noreply.github.com> Date: Thu, 12 Sep 2019 14:48:45 -0700 Subject: [PATCH 01/11] named difficultyChecker --- mappings/net/minecraft/entity/mob/ZombieEntity.mapping | 1 + 1 file changed, 1 insertion(+) diff --git a/mappings/net/minecraft/entity/mob/ZombieEntity.mapping b/mappings/net/minecraft/entity/mob/ZombieEntity.mapping index 99d6ccd2a6..a23ee0cd80 100644 --- a/mappings/net/minecraft/entity/mob/ZombieEntity.mapping +++ b/mappings/net/minecraft/entity/mob/ZombieEntity.mapping @@ -3,6 +3,7 @@ CLASS net/minecraft/class_1642 net/minecraft/entity/mob/ZombieEntity METHOD (Lnet/minecraft/class_1642;Lnet/minecraft/class_1314;DI)V ARG 2 mob ARG 3 speed + FIELD field_19015 difficultyChecker Ljava/util/function/Predicate; FIELD field_7424 ticksUntilWaterConversion I FIELD field_7425 CONVERTING_IN_WATER Lnet/minecraft/class_2940; FIELD field_7426 inWaterTime I From 52fc7faeda3dfebf21a19ce913c714ce2e5ec66a Mon Sep 17 00:00:00 2001 From: DrMeepster <19316085+DrMeepster@users.noreply.github.com> Date: Thu, 12 Sep 2019 15:12:19 -0700 Subject: [PATCH 02/11] Update ZombieEntity.mapping --- mappings/net/minecraft/entity/mob/ZombieEntity.mapping | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mappings/net/minecraft/entity/mob/ZombieEntity.mapping b/mappings/net/minecraft/entity/mob/ZombieEntity.mapping index a23ee0cd80..bc6741a922 100644 --- a/mappings/net/minecraft/entity/mob/ZombieEntity.mapping +++ b/mappings/net/minecraft/entity/mob/ZombieEntity.mapping @@ -3,6 +3,7 @@ CLASS net/minecraft/class_1642 net/minecraft/entity/mob/ZombieEntity METHOD (Lnet/minecraft/class_1642;Lnet/minecraft/class_1314;DI)V ARG 2 mob ARG 3 speed + ARG 5 maxYDifference FIELD field_19015 difficultyChecker Ljava/util/function/Predicate; FIELD field_7424 ticksUntilWaterConversion I FIELD field_7425 CONVERTING_IN_WATER Lnet/minecraft/class_2940; @@ -15,6 +16,8 @@ CLASS net/minecraft/class_1642 net/minecraft/entity/mob/ZombieEntity FIELD field_7434 BABY Lnet/minecraft/class_2940; METHOD (Lnet/minecraft/class_1299;Lnet/minecraft/class_1937;)V ARG 1 type + METHOD method_20009 (Lnet/minecraft/class_1267;)Z + ARG 0 difficulty METHOD method_7200 convertTo (Lnet/minecraft/class_1299;)V ARG 1 entityType METHOD method_7201 setCanBreakDoors (Z)V From 8f6f594aa1d7c4372ce4678ddd7d026c5d9787d8 Mon Sep 17 00:00:00 2001 From: DrMeepster <19316085+DrMeepster@users.noreply.github.com> Date: Thu, 12 Sep 2019 15:19:28 -0700 Subject: [PATCH 03/11] Baby data --- mappings/net/minecraft/entity/mob/ZombieEntity.mapping | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/mappings/net/minecraft/entity/mob/ZombieEntity.mapping b/mappings/net/minecraft/entity/mob/ZombieEntity.mapping index bc6741a922..3507cdf3b7 100644 --- a/mappings/net/minecraft/entity/mob/ZombieEntity.mapping +++ b/mappings/net/minecraft/entity/mob/ZombieEntity.mapping @@ -4,6 +4,10 @@ CLASS net/minecraft/class_1642 net/minecraft/entity/mob/ZombieEntity ARG 2 mob ARG 3 speed ARG 5 maxYDifference + CLASS class_1644 BabyData + FIELD field_7439 isBaby Z + METHOD (Lnet/minecraft/class_1642;Z)V + ARG 2 isBaby FIELD field_19015 difficultyChecker Ljava/util/function/Predicate; FIELD field_7424 ticksUntilWaterConversion I FIELD field_7425 CONVERTING_IN_WATER Lnet/minecraft/class_2940; From d21d4b0e4d72fe898ee3254eb5310141228e975d Mon Sep 17 00:00:00 2001 From: DrMeepster <19316085+DrMeepster@users.noreply.github.com> Date: Thu, 12 Sep 2019 15:24:09 -0700 Subject: [PATCH 04/11] revised data name --- mappings/net/minecraft/entity/mob/ZombieEntity.mapping | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mappings/net/minecraft/entity/mob/ZombieEntity.mapping b/mappings/net/minecraft/entity/mob/ZombieEntity.mapping index 3507cdf3b7..29dd7a6f33 100644 --- a/mappings/net/minecraft/entity/mob/ZombieEntity.mapping +++ b/mappings/net/minecraft/entity/mob/ZombieEntity.mapping @@ -4,7 +4,7 @@ CLASS net/minecraft/class_1642 net/minecraft/entity/mob/ZombieEntity ARG 2 mob ARG 3 speed ARG 5 maxYDifference - CLASS class_1644 BabyData + CLASS class_1644 Data FIELD field_7439 isBaby Z METHOD (Lnet/minecraft/class_1642;Z)V ARG 2 isBaby @@ -20,6 +20,8 @@ CLASS net/minecraft/class_1642 net/minecraft/entity/mob/ZombieEntity FIELD field_7434 BABY Lnet/minecraft/class_2940; METHOD (Lnet/minecraft/class_1299;Lnet/minecraft/class_1937;)V ARG 1 type + METHOD (Lnet/minecraft/class_1937;)V + ARG 1 world METHOD method_20009 (Lnet/minecraft/class_1267;)Z ARG 0 difficulty METHOD method_7200 convertTo (Lnet/minecraft/class_1299;)V From 90b4500b6345b87aefeca14253b6714ef5cb9534 Mon Sep 17 00:00:00 2001 From: DrMeepster <19316085+DrMeepster@users.noreply.github.com> Date: Thu, 12 Sep 2019 15:37:51 -0700 Subject: [PATCH 05/11] more naming --- mappings/net/minecraft/entity/mob/MobEntity.mapping | 1 + mappings/net/minecraft/entity/mob/ZombieEntity.mapping | 3 +++ 2 files changed, 4 insertions(+) diff --git a/mappings/net/minecraft/entity/mob/MobEntity.mapping b/mappings/net/minecraft/entity/mob/MobEntity.mapping index 944850263a..f901e73a50 100644 --- a/mappings/net/minecraft/entity/mob/MobEntity.mapping +++ b/mappings/net/minecraft/entity/mob/MobEntity.mapping @@ -66,6 +66,7 @@ CLASS net/minecraft/class_1308 net/minecraft/entity/mob/MobEntity METHOD method_5938 setSidewaysSpeed (F)V ARG 1 sidewaysMovement METHOD method_5939 canPickupItem (Lnet/minecraft/class_1799;)Z + ARG 1 itemStack METHOD method_5940 deserializeLeashTag ()V METHOD method_5941 setPathfindingPenalty (Lnet/minecraft/class_7;F)V ARG 1 nodeType diff --git a/mappings/net/minecraft/entity/mob/ZombieEntity.mapping b/mappings/net/minecraft/entity/mob/ZombieEntity.mapping index 29dd7a6f33..6d1e77845e 100644 --- a/mappings/net/minecraft/entity/mob/ZombieEntity.mapping +++ b/mappings/net/minecraft/entity/mob/ZombieEntity.mapping @@ -28,6 +28,7 @@ CLASS net/minecraft/class_1642 net/minecraft/entity/mob/ZombieEntity ARG 1 entityType METHOD method_7201 setCanBreakDoors (Z)V ARG 1 canBreakDoors + METHOD method_7205 applyAttributeModifiers (F)V METHOD method_7206 isConvertingInWater ()Z METHOD method_7207 getStepSound ()Lnet/minecraft/class_3414; METHOD method_7208 initCustomGoals ()V @@ -35,7 +36,9 @@ CLASS net/minecraft/class_1642 net/minecraft/entity/mob/ZombieEntity METHOD method_7211 canBreakDoors ()Z METHOD method_7212 shouldBreakDoors ()Z METHOD method_7213 setTicksUntilWaterConversion (I)V + ARG 1 ticksUntilWaterConversion METHOD method_7215 getSkull ()Lnet/minecraft/class_1799; METHOD method_7216 burnsInDaylight ()Z METHOD method_7217 setChild (Z)V + ARG 1 child METHOD method_7218 convertInWater ()V From 2f47abedba449a0933ebbc7640529ee541487f4a Mon Sep 17 00:00:00 2001 From: DrMeepster <19316085+DrMeepster@users.noreply.github.com> Date: Thu, 12 Sep 2019 15:54:49 -0700 Subject: [PATCH 06/11] renamed another variable --- mappings/net/minecraft/entity/mob/ZombieEntity.mapping | 1 + 1 file changed, 1 insertion(+) diff --git a/mappings/net/minecraft/entity/mob/ZombieEntity.mapping b/mappings/net/minecraft/entity/mob/ZombieEntity.mapping index 6d1e77845e..216998931e 100644 --- a/mappings/net/minecraft/entity/mob/ZombieEntity.mapping +++ b/mappings/net/minecraft/entity/mob/ZombieEntity.mapping @@ -29,6 +29,7 @@ CLASS net/minecraft/class_1642 net/minecraft/entity/mob/ZombieEntity METHOD method_7201 setCanBreakDoors (Z)V ARG 1 canBreakDoors METHOD method_7205 applyAttributeModifiers (F)V + ARG 1 chanceMultiplier METHOD method_7206 isConvertingInWater ()Z METHOD method_7207 getStepSound ()Lnet/minecraft/class_3414; METHOD method_7208 initCustomGoals ()V From 61268498eff27f197e3ea88e75065f224f94662f Mon Sep 17 00:00:00 2001 From: DrMeepster <19316085+DrMeepster@users.noreply.github.com> Date: Thu, 12 Sep 2019 16:33:52 -0700 Subject: [PATCH 07/11] Update mappings/net/minecraft/entity/mob/ZombieEntity.mapping Co-Authored-By: liach <7806504+liach@users.noreply.github.com> --- mappings/net/minecraft/entity/mob/ZombieEntity.mapping | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mappings/net/minecraft/entity/mob/ZombieEntity.mapping b/mappings/net/minecraft/entity/mob/ZombieEntity.mapping index 216998931e..75e0173fc5 100644 --- a/mappings/net/minecraft/entity/mob/ZombieEntity.mapping +++ b/mappings/net/minecraft/entity/mob/ZombieEntity.mapping @@ -5,7 +5,7 @@ CLASS net/minecraft/class_1642 net/minecraft/entity/mob/ZombieEntity ARG 3 speed ARG 5 maxYDifference CLASS class_1644 Data - FIELD field_7439 isBaby Z + FIELD field_7439 baby Z METHOD (Lnet/minecraft/class_1642;Z)V ARG 2 isBaby FIELD field_19015 difficultyChecker Ljava/util/function/Predicate; From 7b0c29ab7d714abfa86f649ecfbcdb50ad68dc00 Mon Sep 17 00:00:00 2001 From: DrMeepster <19316085+DrMeepster@users.noreply.github.com> Date: Thu, 12 Sep 2019 16:34:17 -0700 Subject: [PATCH 08/11] Update mappings/net/minecraft/entity/mob/ZombieEntity.mapping Co-Authored-By: liach <7806504+liach@users.noreply.github.com> --- mappings/net/minecraft/entity/mob/ZombieEntity.mapping | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mappings/net/minecraft/entity/mob/ZombieEntity.mapping b/mappings/net/minecraft/entity/mob/ZombieEntity.mapping index 75e0173fc5..f2657a18f7 100644 --- a/mappings/net/minecraft/entity/mob/ZombieEntity.mapping +++ b/mappings/net/minecraft/entity/mob/ZombieEntity.mapping @@ -7,7 +7,7 @@ CLASS net/minecraft/class_1642 net/minecraft/entity/mob/ZombieEntity CLASS class_1644 Data FIELD field_7439 baby Z METHOD (Lnet/minecraft/class_1642;Z)V - ARG 2 isBaby + ARG 2 baby FIELD field_19015 difficultyChecker Ljava/util/function/Predicate; FIELD field_7424 ticksUntilWaterConversion I FIELD field_7425 CONVERTING_IN_WATER Lnet/minecraft/class_2940; From 3d5d02f52f449db36f82e4f35a9c5eb5c3689ca5 Mon Sep 17 00:00:00 2001 From: DrMeepster <19316085+DrMeepster@users.noreply.github.com> Date: Thu, 12 Sep 2019 16:54:39 -0700 Subject: [PATCH 09/11] changed name to fit conventions --- mappings/net/minecraft/entity/mob/ZombieEntity.mapping | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mappings/net/minecraft/entity/mob/ZombieEntity.mapping b/mappings/net/minecraft/entity/mob/ZombieEntity.mapping index f2657a18f7..aff2e5622c 100644 --- a/mappings/net/minecraft/entity/mob/ZombieEntity.mapping +++ b/mappings/net/minecraft/entity/mob/ZombieEntity.mapping @@ -8,7 +8,7 @@ CLASS net/minecraft/class_1642 net/minecraft/entity/mob/ZombieEntity FIELD field_7439 baby Z METHOD (Lnet/minecraft/class_1642;Z)V ARG 2 baby - FIELD field_19015 difficultyChecker Ljava/util/function/Predicate; + FIELD field_19015 DOOR_BREAK_DIFFICULTY_CHECKER Ljava/util/function/Predicate; FIELD field_7424 ticksUntilWaterConversion I FIELD field_7425 CONVERTING_IN_WATER Lnet/minecraft/class_2940; FIELD field_7426 inWaterTime I From 13a7075a7d238bc845b639fb7f3473e8d1960441 Mon Sep 17 00:00:00 2001 From: DrMeepster <19316085+DrMeepster@users.noreply.github.com> Date: Thu, 12 Sep 2019 17:21:21 -0700 Subject: [PATCH 10/11] replaced child with baby for consistency --- mappings/net/minecraft/entity/mob/ZombieEntity.mapping | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mappings/net/minecraft/entity/mob/ZombieEntity.mapping b/mappings/net/minecraft/entity/mob/ZombieEntity.mapping index aff2e5622c..f19db870a3 100644 --- a/mappings/net/minecraft/entity/mob/ZombieEntity.mapping +++ b/mappings/net/minecraft/entity/mob/ZombieEntity.mapping @@ -40,6 +40,6 @@ CLASS net/minecraft/class_1642 net/minecraft/entity/mob/ZombieEntity ARG 1 ticksUntilWaterConversion METHOD method_7215 getSkull ()Lnet/minecraft/class_1799; METHOD method_7216 burnsInDaylight ()Z - METHOD method_7217 setChild (Z)V - ARG 1 child + METHOD method_7217 setBaby (Z)V + ARG 1 baby METHOD method_7218 convertInWater ()V From a3d3b650315fb7795049d7d3f0ae30bc86f3f80a Mon Sep 17 00:00:00 2001 From: DrMeepster <19316085+DrMeepster@users.noreply.github.com> Date: Thu, 26 Sep 2019 14:26:51 -0700 Subject: [PATCH 11/11] changed itemStack to stack --- mappings/net/minecraft/entity/mob/MobEntity.mapping | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mappings/net/minecraft/entity/mob/MobEntity.mapping b/mappings/net/minecraft/entity/mob/MobEntity.mapping index f901e73a50..dfb08583dc 100644 --- a/mappings/net/minecraft/entity/mob/MobEntity.mapping +++ b/mappings/net/minecraft/entity/mob/MobEntity.mapping @@ -66,7 +66,7 @@ CLASS net/minecraft/class_1308 net/minecraft/entity/mob/MobEntity METHOD method_5938 setSidewaysSpeed (F)V ARG 1 sidewaysMovement METHOD method_5939 canPickupItem (Lnet/minecraft/class_1799;)Z - ARG 1 itemStack + ARG 1 stack METHOD method_5940 deserializeLeashTag ()V METHOD method_5941 setPathfindingPenalty (Lnet/minecraft/class_7;F)V ARG 1 nodeType