From 84adfb1d6c2d2cefa64420a428c53dfa254a213b Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Thu, 12 Sep 2019 14:36:00 +0100 Subject: [PATCH] Merged #825 Squashed commit of the following: commit ce2f24233b4d6475c4d82f9c0dfc21c517cda6d7 Author: YummyLoop <12478030+YummyLoop@users.noreply.github.com> Date: Wed Aug 28 20:43:17 2019 +0100 Fix typo commit ba7ca63d44482548d4b16680129e93626b1769c9 Author: YummyLoop <12478030+YummyLoop@users.noreply.github.com> Date: Fri Aug 23 00:42:05 2019 +0100 Fix typo + missing rename from previous commit commit c63132b3b88c2d9d95b23fae485b061d82b69c44 Author: YummyLoop <12478030+YummyLoop@users.noreply.github.com> Date: Fri Aug 23 00:37:33 2019 +0100 Rename variable names in 'natural language order' commit b5c1f164f8cc7e57506cbe91693448b84ef2b965 Author: YummyLoop <12478030+YummyLoop@users.noreply.github.com> Date: Mon Aug 19 05:33:09 2019 +0100 class_597 METHOD init ARG 2 -> scale commit 728bec6b41feca387bef27b60a87719897e77abe Author: YummyLoop <12478030+YummyLoop@users.noreply.github.com> Date: Mon Aug 19 05:31:06 2019 +0100 class_597 METHOD init ARG 1 -> ySize commit d3dc2b2ee3eaa448394984d78ccc600876432f43 Author: YummyLoop <12478030+YummyLoop@users.noreply.github.com> Date: Mon Aug 19 05:26:33 2019 +0100 method_2800 -> getHead commit d1aca827767bebb57fb5ed7b4ff656b8ac3eedbf Author: YummyLoop <12478030+YummyLoop@users.noreply.github.com> Date: Mon Aug 19 05:25:30 2019 +0100 field_3356 -> finRight commit ca9476050ebf86c8f5c58fb3137219a35b4f71f5 Author: YummyLoop <12478030+YummyLoop@users.noreply.github.com> Date: Mon Aug 19 05:25:09 2019 +0100 field_3351 -> finLeft commit a88727b5ab139a4b13811d6a4325be525ab44c9c Author: YummyLoop <12478030+YummyLoop@users.noreply.github.com> Date: Mon Aug 19 05:21:28 2019 +0100 field_3355 -> finTop commit 1abd1bd4bc2cb5bcbdd5435ba46a28df052bdf75 Author: YummyLoop <12478030+YummyLoop@users.noreply.github.com> Date: Mon Aug 19 05:19:49 2019 +0100 field_3350 -> finTail commit 8b2faed2cfd5b51eb20bff894ce40e3eed87746c Author: YummyLoop <12478030+YummyLoop@users.noreply.github.com> Date: Mon Aug 19 05:13:05 2019 +0100 field_3352 -> mouth commit 4162946189ea75614403c0fc594ebed4ec93ae6b Author: YummyLoop <12478030+YummyLoop@users.noreply.github.com> Date: Mon Aug 19 05:09:36 2019 +0100 field_3354 -> head commit 62ea7ab62fba7bb35edd560595498aafc1c920d6 Author: YummyLoop <12478030+YummyLoop@users.noreply.github.com> Date: Mon Aug 19 05:08:36 2019 +0100 field_3353 -> body commit 84aeb8284ba3b4a8c55241b657ab9315d52800b0 Author: YummyLoop <12478030+YummyLoop@users.noreply.github.com> Date: Mon Aug 19 05:04:36 2019 +0100 field_3347 -> wingRight commit 394c90e230b2b33d36f3aba39221f909e2578b42 Author: YummyLoop <12478030+YummyLoop@users.noreply.github.com> Date: Mon Aug 19 05:04:03 2019 +0100 field_3341 -> wingLeft commit 9e177b49a6cb8675bb6cf73f66f5d7e73c082847 Author: YummyLoop <12478030+YummyLoop@users.noreply.github.com> Date: Mon Aug 19 05:01:56 2019 +0100 field_3343 -> legRight commit cf37239d250cb9d23f93cc691249ce0146a8b960 Author: YummyLoop <12478030+YummyLoop@users.noreply.github.com> Date: Mon Aug 19 05:01:22 2019 +0100 field_3345 -> legLeft commit 5b1640962329b480f04cddba443fb322d1c86610 Author: YummyLoop <12478030+YummyLoop@users.noreply.github.com> Date: Mon Aug 19 04:58:24 2019 +0100 field_3346 -> body commit 41157a8d86e2cb6883831a15fa3694e79a67b64f Author: YummyLoop <12478030+YummyLoop@users.noreply.github.com> Date: Mon Aug 19 04:55:20 2019 +0100 field_3342 -> wattle commit 036c309d3b0c9d5e2dee9ef2f90bfa6c3997d5e8 Author: YummyLoop <12478030+YummyLoop@users.noreply.github.com> Date: Mon Aug 19 04:52:43 2019 +0100 field_3340 -> beak commit cc948d7ca9dbc49e558e387b12ac64ac80edaca2 Author: YummyLoop <12478030+YummyLoop@users.noreply.github.com> Date: Mon Aug 19 04:48:21 2019 +0100 method_2798 -> getLid commit a4bba1e1f06d912a6418af82eea77c08c63419a6 Author: YummyLoop <12478030+YummyLoop@users.noreply.github.com> Date: Mon Aug 19 04:47:17 2019 +0100 method_2799 -> render commit 21fc1342cf8e9237b92237dca6aad01251a05aaf Author: YummyLoop <12478030+YummyLoop@users.noreply.github.com> Date: Mon Aug 19 04:45:52 2019 +0100 class_582 METHOD init ARG 1 -> scale commit b60f47e4f1ce5451d52b7b6375438246f0a7be1f Author: YummyLoop <12478030+YummyLoop@users.noreply.github.com> Date: Mon Aug 19 04:35:08 2019 +0100 method_17073 ARG 6 -> scale commit f5821fd949d5bb6c237b965e4e1ae61dabe2b7af Author: YummyLoop <12478030+YummyLoop@users.noreply.github.com> Date: Mon Aug 19 04:33:51 2019 +0100 method_17072 ARG 6 -> scale commit 3f59c2482dc9d7dc2cc37be2ae43079a605f3987 Author: YummyLoop <12478030+YummyLoop@users.noreply.github.com> Date: Mon Aug 19 04:27:34 2019 +0100 method_2836 ARG 7 -> scale commit b3308599e81797a0c954f479beb5c5c213e0c4b7 Author: YummyLoop <12478030+YummyLoop@users.noreply.github.com> Date: Mon Aug 19 04:24:01 2019 +0100 field_3326 -> bottom commit 50501302e952cfc14f8e6286ae4eb07d4348c21b Author: YummyLoop <12478030+YummyLoop@users.noreply.github.com> Date: Mon Aug 19 04:03:07 2019 +0100 field_3328 -> rods commit 9b019bd627424b0d898eae0853e8fac0f3976052 Author: YummyLoop <12478030+YummyLoop@users.noreply.github.com> Date: Mon Aug 19 04:00:18 2019 +0100 field_3329 -> head commit 94954e9dc59ddd5c263707318988e30bcaa04aa3 Author: YummyLoop <12478030+YummyLoop@users.noreply.github.com> Date: Mon Aug 19 03:58:14 2019 +0100 field_3318 -> part2 commit e0da88d86a4214bbe6cc0058d6fdbb230e6d5ea2 Author: YummyLoop <12478030+YummyLoop@users.noreply.github.com> Date: Mon Aug 19 03:57:41 2019 +0100 field_3316 -> part1 commit f91e3b2473bed6aae9234031db9339d950e70f17 Author: YummyLoop <12478030+YummyLoop@users.noreply.github.com> Date: Mon Aug 19 03:52:49 2019 +0100 field_3317 -> legs commit a7b2e36c57b1b5ff9c9487e312c9eb12d344735c Author: YummyLoop <12478030+YummyLoop@users.noreply.github.com> Date: Mon Aug 19 03:52:12 2019 +0100 method_2795 ARG 1 -> visible commit 2ee962f9d95615323591eabbad026eafcc5c8c11 Author: YummyLoop <12478030+YummyLoop@users.noreply.github.com> Date: Mon Aug 19 03:48:12 2019 +0100 field_3324 -> wingLeftTip commit 6c89361dea5532b3c9e38c95ab9b6958aceaf12e Author: YummyLoop <12478030+YummyLoop@users.noreply.github.com> Date: Mon Aug 19 03:47:38 2019 +0100 field_3319 -> wingRightTip commit 18289d89b98b505097a514a0158814a47709a13d Author: YummyLoop <12478030+YummyLoop@users.noreply.github.com> Date: Mon Aug 19 03:45:57 2019 +0100 field_3320 -> wingLeft commit b7cfac8702778a572c59db9009d40439a2f062b2 Author: YummyLoop <12478030+YummyLoop@users.noreply.github.com> Date: Mon Aug 19 03:43:41 2019 +0100 field_3322 -> wingRight commit 66203f9137adb86cca257e4dbc7bbaed27051d52 Author: YummyLoop <12478030+YummyLoop@users.noreply.github.com> Date: Mon Aug 19 03:39:49 2019 +0100 field_3323 -> body commit d8344db158d5af5432f7e5511d96cb5bcb9049ab Author: YummyLoop <12478030+YummyLoop@users.noreply.github.com> Date: Mon Aug 19 03:39:19 2019 +0100 field_3321 -> head commit e5c8a2617054c60518f68f6186cff3874013659f Author: YummyLoop <12478030+YummyLoop@users.noreply.github.com> Date: Mon Aug 19 03:17:37 2019 +0100 method_2793 -> render commit 5a86e9f41a45fd04113987259e3cc66307c60e50 Author: YummyLoop <12478030+YummyLoop@users.noreply.github.com> Date: Mon Aug 19 03:15:37 2019 +0100 method_2792 -> getBanner commit f6b577fe9b7606e1e04a7d1b5522d2d0325b3472 Author: YummyLoop <12478030+YummyLoop@users.noreply.github.com> Date: Mon Aug 19 03:14:42 2019 +0100 method_2791 -> getStickVertical commit 2d53a588f399f3c66a476426a50197efc0e06617 Author: YummyLoop <12478030+YummyLoop@users.noreply.github.com> Date: Mon Aug 19 03:13:21 2019 +0100 field_3310 -> stickHorizontal commit 42c6c02edbc7a45398f2aa05400772fa172ac067 Author: YummyLoop <12478030+YummyLoop@users.noreply.github.com> Date: Mon Aug 19 03:11:47 2019 +0100 field_3311 -> stickVertical commit 4117732d3365de0355c74b74f6ba7d497e2755f3 Author: YummyLoop <12478030+YummyLoop@users.noreply.github.com> Date: Mon Aug 19 03:10:13 2019 +0100 field_3309 -> banner commit 9cf06abcbb6cb1398e7836e47698de374754783e Author: YummyLoop <12478030+YummyLoop@users.noreply.github.com> Date: Mon Aug 19 02:59:03 2019 +0100 method_17790 -> isAttacking --- .../client/render/entity/model/AbstractZombieModel.mapping | 1 + .../render/entity/model/BannerBlockEntityModel.mapping | 6 ++++++ .../client/render/entity/model/BatEntityModel.mapping | 6 ++++++ .../client/render/entity/model/BedEntityModel.mapping | 4 ++++ .../client/render/entity/model/BlazeEntityModel.mapping | 2 ++ .../client/render/entity/model/BoatEntityModel.mapping | 2 ++ .../minecraft/client/render/entity/model/BookModel.mapping | 2 ++ .../client/render/entity/model/ChickenEntityModel.mapping | 7 +++++++ .../client/render/entity/model/CodEntityModel.mapping | 7 +++++++ .../client/render/entity/model/CowEntityModel.mapping | 1 + .../client/render/entity/model/OcelotEntityModel.mapping | 2 ++ .../render/entity/model/QuadrupedEntityModel.mapping | 3 +++ 12 files changed, 43 insertions(+) diff --git a/mappings/net/minecraft/client/render/entity/model/AbstractZombieModel.mapping b/mappings/net/minecraft/client/render/entity/model/AbstractZombieModel.mapping index 89f88f1032..b5c23d4019 100644 --- a/mappings/net/minecraft/client/render/entity/model/AbstractZombieModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/AbstractZombieModel.mapping @@ -1 +1,2 @@ CLASS net/minecraft/class_3968 net/minecraft/client/render/entity/model/AbstractZombieModel + METHOD method_17790 isAttacking (Lnet/minecraft/class_1588;)Z diff --git a/mappings/net/minecraft/client/render/entity/model/BannerBlockEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/BannerBlockEntityModel.mapping index a6e37a7eb9..5bad2a5dbf 100644 --- a/mappings/net/minecraft/client/render/entity/model/BannerBlockEntityModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/BannerBlockEntityModel.mapping @@ -1 +1,7 @@ CLASS net/minecraft/class_550 net/minecraft/client/render/entity/model/BannerBlockEntityModel + FIELD field_3309 banner Lnet/minecraft/class_630; + FIELD field_3310 horizontalStick Lnet/minecraft/class_630; + FIELD field_3311 verticalStick Lnet/minecraft/class_630; + METHOD method_2791 getVerticalStick ()Lnet/minecraft/class_630; + METHOD method_2792 getBanner ()Lnet/minecraft/class_630; + METHOD method_2793 render ()V diff --git a/mappings/net/minecraft/client/render/entity/model/BatEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/BatEntityModel.mapping index 4043a1cdef..ba0c0f1ea2 100644 --- a/mappings/net/minecraft/client/render/entity/model/BatEntityModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/BatEntityModel.mapping @@ -1 +1,7 @@ CLASS net/minecraft/class_553 net/minecraft/client/render/entity/model/BatEntityModel + FIELD field_3319 rightWingTip Lnet/minecraft/class_630; + FIELD field_3320 leftWing Lnet/minecraft/class_630; + FIELD field_3321 head Lnet/minecraft/class_630; + FIELD field_3322 rightWing Lnet/minecraft/class_630; + FIELD field_3323 body Lnet/minecraft/class_630; + FIELD field_3324 leftWingTip Lnet/minecraft/class_630; diff --git a/mappings/net/minecraft/client/render/entity/model/BedEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/BedEntityModel.mapping index dbb72e635e..20f3d32150 100644 --- a/mappings/net/minecraft/client/render/entity/model/BedEntityModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/BedEntityModel.mapping @@ -1,3 +1,7 @@ CLASS net/minecraft/class_552 net/minecraft/client/render/entity/model/BedEntityModel + FIELD field_3316 part1 Lnet/minecraft/class_630; + FIELD field_3317 legs [Lnet/minecraft/class_630; + FIELD field_3318 part2 Lnet/minecraft/class_630; METHOD method_2794 render ()V METHOD method_2795 setVisible (Z)V + ARG 1 visible diff --git a/mappings/net/minecraft/client/render/entity/model/BlazeEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/BlazeEntityModel.mapping index b8dcb871ca..3aa04b1e8d 100644 --- a/mappings/net/minecraft/client/render/entity/model/BlazeEntityModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/BlazeEntityModel.mapping @@ -1 +1,3 @@ CLASS net/minecraft/class_555 net/minecraft/client/render/entity/model/BlazeEntityModel + FIELD field_3328 rods [Lnet/minecraft/class_630; + FIELD field_3329 head Lnet/minecraft/class_630; diff --git a/mappings/net/minecraft/client/render/entity/model/BoatEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/BoatEntityModel.mapping index 2b71ef1736..9af29c4588 100644 --- a/mappings/net/minecraft/client/render/entity/model/BoatEntityModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/BoatEntityModel.mapping @@ -1,5 +1,6 @@ CLASS net/minecraft/class_554 net/minecraft/client/render/entity/model/BoatEntityModel FIELD field_3325 paddles [Lnet/minecraft/class_630; + FIELD field_3326 bottom Lnet/minecraft/class_630; FIELD field_3327 body [Lnet/minecraft/class_630; METHOD method_2796 makePaddle (Z)Lnet/minecraft/class_630; ARG 1 isLeft @@ -11,3 +12,4 @@ CLASS net/minecraft/class_554 net/minecraft/client/render/entity/model/BoatEntit METHOD method_2836 renderPass (Lnet/minecraft/class_1297;FFFFFF)V ARG 1 entity ARG 2 tickDelta + ARG 7 scale diff --git a/mappings/net/minecraft/client/render/entity/model/BookModel.mapping b/mappings/net/minecraft/client/render/entity/model/BookModel.mapping index c86a5ef4e2..ac5590f565 100644 --- a/mappings/net/minecraft/client/render/entity/model/BookModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/BookModel.mapping @@ -11,8 +11,10 @@ CLASS net/minecraft/class_557 net/minecraft/client/render/entity/model/BookModel ARG 2 leftPageAngle ARG 3 rightPageAngle ARG 4 pageTurningSpeed + ARG 6 scale METHOD method_17073 setPageAngles (FFFFFF)V ARG 1 ticks ARG 2 leftPageAngle ARG 3 rightPageAngle ARG 4 pageTurningSpeed + ARG 6 scale diff --git a/mappings/net/minecraft/client/render/entity/model/ChickenEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/ChickenEntityModel.mapping index 8ec7308d3e..f08c3cf64e 100644 --- a/mappings/net/minecraft/client/render/entity/model/ChickenEntityModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/ChickenEntityModel.mapping @@ -1,2 +1,9 @@ CLASS net/minecraft/class_558 net/minecraft/client/render/entity/model/ChickenEntityModel + FIELD field_3340 beak Lnet/minecraft/class_630; + FIELD field_3341 leftWing Lnet/minecraft/class_630; + FIELD field_3342 wattle Lnet/minecraft/class_630; + FIELD field_3343 rightLeg Lnet/minecraft/class_630; FIELD field_3344 head Lnet/minecraft/class_630; + FIELD field_3345 leftLeg Lnet/minecraft/class_630; + FIELD field_3346 body Lnet/minecraft/class_630; + FIELD field_3347 rightWing Lnet/minecraft/class_630; diff --git a/mappings/net/minecraft/client/render/entity/model/CodEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/CodEntityModel.mapping index 5dfcb42d08..42bf04387b 100644 --- a/mappings/net/minecraft/client/render/entity/model/CodEntityModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/CodEntityModel.mapping @@ -1 +1,8 @@ CLASS net/minecraft/class_561 net/minecraft/client/render/entity/model/CodEntityModel + FIELD field_3350 tailFin Lnet/minecraft/class_630; + FIELD field_3351 leftFint Lnet/minecraft/class_630; + FIELD field_3352 mouth Lnet/minecraft/class_630; + FIELD field_3353 body Lnet/minecraft/class_630; + FIELD field_3354 head Lnet/minecraft/class_630; + FIELD field_3355 topFin Lnet/minecraft/class_630; + FIELD field_3356 rightFin Lnet/minecraft/class_630; diff --git a/mappings/net/minecraft/client/render/entity/model/CowEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/CowEntityModel.mapping index 268d19e276..6debf10277 100644 --- a/mappings/net/minecraft/client/render/entity/model/CowEntityModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/CowEntityModel.mapping @@ -1 +1,2 @@ CLASS net/minecraft/class_560 net/minecraft/client/render/entity/model/CowEntityModel + METHOD method_2800 getHead ()Lnet/minecraft/class_630; diff --git a/mappings/net/minecraft/client/render/entity/model/OcelotEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/OcelotEntityModel.mapping index 69c0c18455..64f52494b4 100644 --- a/mappings/net/minecraft/client/render/entity/model/OcelotEntityModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/OcelotEntityModel.mapping @@ -8,3 +8,5 @@ CLASS net/minecraft/class_582 net/minecraft/client/render/entity/model/OcelotEnt FIELD field_3440 backLegLeft Lnet/minecraft/class_630; FIELD field_3441 frontLegRight Lnet/minecraft/class_630; FIELD field_3442 tail2 Lnet/minecraft/class_630; + METHOD (F)V + ARG 1 scale diff --git a/mappings/net/minecraft/client/render/entity/model/QuadrupedEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/QuadrupedEntityModel.mapping index e7b3f8df4b..1216e82f3e 100644 --- a/mappings/net/minecraft/client/render/entity/model/QuadrupedEntityModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/QuadrupedEntityModel.mapping @@ -5,3 +5,6 @@ CLASS net/minecraft/class_597 net/minecraft/client/render/entity/model/Quadruped FIELD field_3536 leg1 Lnet/minecraft/class_630; FIELD field_3538 body Lnet/minecraft/class_630; FIELD field_3539 leg4 Lnet/minecraft/class_630; + METHOD (IF)V + ARG 1 ySize + ARG 2 scale