Mapped entity rendering methods/classes & options screens (#913)

* Mapped entity rendering methods and classes & options screens

* Fixed Knit's issues and implemented liach's suggestions

* Removed strange leftover obf stubs (I blame Knit)

* Mapped some more stuff from AnimalModel

* Adapt some stuff from Runemoro

* Some more Runemoro

* Another two fixes

* Unmap unobfuscated mapping

Co-Authored-By: liach <7806504+liach@users.noreply.github.com>

* Shorten dragon

by liach

Co-Authored-By: liach <7806504+liach@users.noreply.github.com>

* Shorten biped model

by liach

Co-Authored-By: liach <7806504+liach@users.noreply.github.com>

* Shorten another biped model

Co-Authored-By: liach <7806504+liach@users.noreply.github.com>
This commit is contained in:
Siphalor 2019-10-25 10:02:48 +02:00 committed by Mark J
parent b8403e7661
commit 194e42daff
40 changed files with 125 additions and 17 deletions

View File

@ -1 +0,0 @@
CLASS net/minecraft/class_4592

View File

@ -1 +0,0 @@
CLASS net/minecraft/class_4593

View File

@ -1 +0,0 @@
CLASS net/minecraft/class_4594

View File

@ -1,2 +0,0 @@
CLASS net/minecraft/class_4595
METHOD method_22960 getParts ()Ljava/lang/Iterable;

View File

@ -1 +0,0 @@
CLASS net/minecraft/class_4606

View File

@ -0,0 +1,6 @@
CLASS net/minecraft/class_4603 net/minecraft/client/gui/hud/InGameOverlayRenderer
FIELD field_20986 UNDERWATER_TEX Lnet/minecraft/class_2960;
METHOD method_23067 renderOverlays (Lnet/minecraft/class_310;Lnet/minecraft/class_4587;)V
METHOD method_23068 renderInWallOverlay (Lnet/minecraft/class_310;Lnet/minecraft/class_1058;Lnet/minecraft/class_4587;)V
METHOD method_23069 renderUnderwaterOverlay (Lnet/minecraft/class_310;Lnet/minecraft/class_4587;)V
METHOD method_23070 renderFireOverlay (Lnet/minecraft/class_310;Lnet/minecraft/class_4587;)V

View File

@ -1,4 +1,4 @@
CLASS net/minecraft/class_4189 net/minecraft/client/gui/screen/AccessibilityScreen
CLASS net/minecraft/class_4189 net/minecraft/client/gui/screen/options/AccessibilityScreen
FIELD field_18730 OPTIONS [Lnet/minecraft/class_316;
FIELD field_18734 narratorButton Lnet/minecraft/class_339;
METHOD <init> (Lnet/minecraft/class_437;Lnet/minecraft/class_315;)V

View File

@ -1,4 +1,4 @@
CLASS net/minecraft/class_404 net/minecraft/client/gui/screen/ChatOptionsScreen
CLASS net/minecraft/class_404 net/minecraft/client/gui/screen/options/ChatOptionsScreen
FIELD field_2352 OPTIONS [Lnet/minecraft/class_316;
FIELD field_2355 narratorOptionButton Lnet/minecraft/class_339;
METHOD <init> (Lnet/minecraft/class_437;Lnet/minecraft/class_315;)V

View File

@ -1,4 +1,4 @@
CLASS net/minecraft/class_459 net/minecraft/client/gui/screen/controls/ControlsListWidget
CLASS net/minecraft/class_459 net/minecraft/client/gui/screen/options/ControlsListWidget
CLASS class_460 CategoryEntry
FIELD field_2736 name Ljava/lang/String;
FIELD field_2737 nameWidth I

View File

@ -1,4 +1,4 @@
CLASS net/minecraft/class_458 net/minecraft/client/gui/screen/controls/ControlsOptionsScreen
CLASS net/minecraft/class_458 net/minecraft/client/gui/screen/options/ControlsOptionsScreen
FIELD field_2723 time J
FIELD field_2725 resetButton Lnet/minecraft/class_4185;
FIELD field_2727 focusedBinding Lnet/minecraft/class_304;

View File

@ -0,0 +1 @@
CLASS net/minecraft/class_4667 net/minecraft/client/gui/screen/options/GameOptionsScreen

View File

@ -1,4 +1,4 @@
CLASS net/minecraft/class_426 net/minecraft/client/gui/screen/LanguageOptionsScreen
CLASS net/minecraft/class_426 net/minecraft/client/gui/screen/options/LanguageOptionsScreen
CLASS class_4195 LanguageSelectionListWidget
CLASS class_4194 LanguageEntry
FIELD field_18743 languageDefinition Lnet/minecraft/class_1077;

View File

@ -1,4 +1,4 @@
CLASS net/minecraft/class_4288 net/minecraft/client/gui/screen/MouseOptionsScreen
CLASS net/minecraft/class_4288 net/minecraft/client/gui/screen/options/MouseOptionsScreen
FIELD field_19246 buttonList Lnet/minecraft/class_353;
FIELD field_19247 OPTIONS [Lnet/minecraft/class_316;
METHOD <init> (Lnet/minecraft/class_437;Lnet/minecraft/class_315;)V

View File

@ -1,4 +1,4 @@
CLASS net/minecraft/class_440 net/minecraft/client/gui/screen/SkinOptionsScreen
CLASS net/minecraft/class_440 net/minecraft/client/gui/screen/options/SkinOptionsScreen
METHOD <init> (Lnet/minecraft/class_437;Lnet/minecraft/class_315;)V
ARG 1 parent
METHOD method_2248 getPlayerModelPartDisplayString (Lnet/minecraft/class_1664;)Ljava/lang/String;

View File

@ -1,4 +1,4 @@
CLASS net/minecraft/class_443 net/minecraft/client/gui/screen/SoundOptionsScreen
CLASS net/minecraft/class_443 net/minecraft/client/gui/screen/options/SoundOptionsScreen
METHOD <init> (Lnet/minecraft/class_437;Lnet/minecraft/class_315;)V
ARG 1 parent
ARG 2 options

View File

@ -1,4 +1,7 @@
CLASS net/minecraft/class_3879 net/minecraft/client/model/Model
FIELD field_17138 textureWidth I
FIELD field_17139 textureHeight I
METHOD method_2828 renderItem (Lnet/minecraft/class_4587;Lnet/minecraft/class_4588;IIFFF)V
METHOD method_2828 render (Lnet/minecraft/class_4587;Lnet/minecraft/class_4588;IIFFF)V
ARG 5 r
ARG 6 g
ARG 7 b

View File

@ -1,2 +1,3 @@
CLASS net/minecraft/class_892 net/minecraft/client/render/entity/EnderCrystalEntityRenderer
FIELD field_21005 bottom Lnet/minecraft/class_630;
FIELD field_4663 SKIN Lnet/minecraft/class_2960;

View File

@ -1,5 +1,6 @@
CLASS net/minecraft/class_895 net/minecraft/client/render/entity/EnderDragonEntityRenderer
CLASS class_625 DragonEntityModel
FIELD field_21441 dragon Lnet/minecraft/class_1510;
FIELD field_3625 frontFoot Lnet/minecraft/class_630;
FIELD field_3626 rearLegTip Lnet/minecraft/class_630;
FIELD field_3627 body Lnet/minecraft/class_630;
@ -12,7 +13,8 @@ CLASS net/minecraft/class_895 net/minecraft/client/render/entity/EnderDragonEnti
FIELD field_3634 frontLegTip Lnet/minecraft/class_630;
FIELD field_3635 wingTip Lnet/minecraft/class_630;
FIELD field_3637 neck Lnet/minecraft/class_630;
FIELD field_4668 CRYSTAL_BEAM Lnet/minecraft/class_2960;
FIELD field_21006 EYES_TEX Lnet/minecraft/class_2960;
FIELD field_4668 CRYSTAL_BEAM_TEX Lnet/minecraft/class_2960;
FIELD field_4669 EXPLOSION_TEX Lnet/minecraft/class_2960;
FIELD field_4670 SKIN Lnet/minecraft/class_2960;
METHOD method_3917 renderCrystalBeam (FFFFILnet/minecraft/class_4587;Lnet/minecraft/class_4597;I)V

View File

@ -17,6 +17,8 @@ CLASS net/minecraft/class_898 net/minecraft/client/render/entity/EntityRenderDis
METHOD method_17145 register (Lnet/minecraft/class_1299;Lnet/minecraft/class_897;)V
METHOD method_23165 renderFire (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;Lnet/minecraft/class_1297;)V
ARG 1 matrices
METHOD method_23167 registerRenderers (Lnet/minecraft/class_918;Lnet/minecraft/class_3296;)V
METHOD method_23168 getSquaredDistanceToCamera (Lnet/minecraft/class_1297;)D
METHOD method_3941 configure (Lnet/minecraft/class_1937;Lnet/minecraft/class_4184;Lnet/minecraft/class_1297;)V
ARG 1 world
METHOD method_3944 setWorld (Lnet/minecraft/class_1937;)V
@ -39,7 +41,7 @@ CLASS net/minecraft/class_898 net/minecraft/client/render/entity/EntityRenderDis
ARG 1 value
METHOD method_3956 renderHitbox (Lnet/minecraft/class_4587;Lnet/minecraft/class_4588;Lnet/minecraft/class_1297;F)V
METHOD method_3958 shouldRenderHitboxes ()Z
METHOD method_3959 squaredDistanceToCamera (DDD)D
METHOD method_3959 getSquaredDistanceToCamera (DDD)D
ARG 1 x
ARG 3 y
ARG 5 z

View File

@ -1,6 +1,8 @@
CLASS net/minecraft/class_922 net/minecraft/client/render/entity/LivingEntityRenderer
FIELD field_21011 LOGGER Lorg/apache/logging/log4j/Logger;
FIELD field_4737 model Lnet/minecraft/class_583;
FIELD field_4738 features Ljava/util/List;
METHOD method_18656 getYaw (Lnet/minecraft/class_2350;)F
METHOD method_4039 getLyingAngle (Lnet/minecraft/class_1309;)F
METHOD method_4042 scale (Lnet/minecraft/class_1309;Lnet/minecraft/class_4587;F)V
ARG 1 entity

View File

@ -1,4 +1,5 @@
CLASS net/minecraft/class_1007 net/minecraft/client/render/entity/PlayerEntityRenderer
METHOD method_4210 getArmPose (Lnet/minecraft/class_742;Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;Lnet/minecraft/class_1268;)Lnet/minecraft/class_572$class_573;
METHOD method_4218 setModelPose (Lnet/minecraft/class_742;)V
METHOD method_4220 renderRightArm (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;Lnet/minecraft/class_742;)V
METHOD method_4221 renderLeftArm (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;Lnet/minecraft/class_742;)V

View File

@ -3,3 +3,4 @@ CLASS net/minecraft/class_936 net/minecraft/client/render/entity/PufferfishEntit
FIELD field_4762 SKIN Lnet/minecraft/class_2960;
FIELD field_4763 largeModel Lnet/minecraft/class_592;
FIELD field_4764 mediumModel Lnet/minecraft/class_595;
FIELD field_4765 modelSize I

View File

@ -1 +1,6 @@
CLASS net/minecraft/class_987 net/minecraft/client/render/entity/feature/ArmorBipedFeatureRenderer
METHOD method_4170 (Lnet/minecraft/class_572;Lnet/minecraft/class_1304;)V
ARG 1 bipedModel
ARG 2 equipmentSlot
METHOD method_4190 (Lnet/minecraft/class_572;)V
ARG 1 bipedModel

View File

@ -2,6 +2,19 @@ CLASS net/minecraft/class_970 net/minecraft/client/render/entity/feature/ArmorFe
FIELD field_4829 ARMOR_TEXTURE_CACHE Ljava/util/Map;
FIELD field_4830 modelLeggings Lnet/minecraft/class_572;
FIELD field_4831 modelBody Lnet/minecraft/class_572;
METHOD method_23192 renderArmorParts (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;ILnet/minecraft/class_1738;ZLnet/minecraft/class_572;ZFFFLjava/lang/String;)V
ARG 5 renderGlint
ARG 7 lowerParts
ARG 8 r
ARG 9 g
ARG 10 b
ARG 11 textureSuffix
METHOD method_4169 renderArmor (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;Lnet/minecraft/class_1309;FFFFFFFLnet/minecraft/class_1304;I)V
METHOD method_4170 setVisible (Lnet/minecraft/class_572;Lnet/minecraft/class_1304;)V
ARG 1 bipedModel
METHOD method_4172 getArmor (Lnet/minecraft/class_1304;)Lnet/minecraft/class_572;
METHOD method_4173 isLegs (Lnet/minecraft/class_1304;)Z
METHOD method_4174 getArmorTexture (Lnet/minecraft/class_1738;ZLjava/lang/String;)Lnet/minecraft/class_2960;
ARG 2 lowerParts
ARG 3 suffix
METHOD method_4190 setInvisible (Lnet/minecraft/class_572;)V

View File

@ -0,0 +1,2 @@
CLASS net/minecraft/class_4606 net/minecraft/client/render/entity/feature/EntityEyesFeatureRenderer
METHOD method_23193 getTexture ()Lnet/minecraft/class_2960;

View File

@ -3,4 +3,7 @@ CLASS net/minecraft/class_3887 net/minecraft/client/render/entity/feature/Featur
METHOD <init> (Lnet/minecraft/class_3883;)V
ARG 1 context
METHOD method_17165 getModel ()Lnet/minecraft/class_583;
METHOD method_23194 getTexture (Lnet/minecraft/class_1297;)Lnet/minecraft/class_2960;
METHOD method_23196 render (Lnet/minecraft/class_583;Lnet/minecraft/class_583;Lnet/minecraft/class_2960;Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;ILnet/minecraft/class_1309;FFFFFFFFFF)V
METHOD method_23199 renderModel (Lnet/minecraft/class_583;Lnet/minecraft/class_2960;Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;ILnet/minecraft/class_1309;FFF)V
METHOD method_4199 render (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;ILnet/minecraft/class_1297;FFFFFFF)V

View File

@ -1,3 +1,4 @@
CLASS net/minecraft/class_989 net/minecraft/client/render/entity/feature/HeldItemFeatureRenderer
METHOD <init> (Lnet/minecraft/class_3883;)V
ARG 1 context
METHOD method_4192 renderItem (Lnet/minecraft/class_1309;Lnet/minecraft/class_1799;Lnet/minecraft/class_809$class_811;Lnet/minecraft/class_1306;Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;)V

View File

@ -1 +1,2 @@
CLASS net/minecraft/class_4607 net/minecraft/client/render/entity/feature/SkinOverlayFeatureRenderer
METHOD method_23201 getTexture ()Lnet/minecraft/class_2960;

View File

@ -0,0 +1,27 @@
CLASS net/minecraft/class_4592 net/minecraft/client/render/entity/model/AnimalModel
FIELD field_20915 headScaled Z
FIELD field_20916 childHeadYOffset F
FIELD field_20917 childHeadZOffset F
FIELD field_20918 invertedChildHeadScale F
FIELD field_20919 invertedChildBodyScale F
FIELD field_20920 childBodyYOffset F
METHOD <init> (Ljava/util/function/Function;ZFFFFF)V
ARG 2 headScaled
ARG 3 childHeadYOffset
ARG 4 childHeadZOffset
ARG 5 invertedChildHeadScale
ARG 6 invertedChildBodyScale
ARG 7 childBodyYOffset
METHOD <init> (ZFF)V
ARG 1 headScaled
ARG 2 childHeadYOffset
ARG 3 childHeadZOffset
METHOD <init> (ZFFFFF)V
ARG 1 headScaled
ARG 2 childHeadYOffset
ARG 3 childHeadZOffset
ARG 4 invertedChildHeadScale
ARG 5 invertedChildBodyScale
ARG 6 childBodyYOffset
METHOD method_22946 getHeadParts ()Ljava/lang/Iterable;
METHOD method_22948 getBodyParts ()Ljava/lang/Iterable;

View File

@ -1,5 +1,8 @@
CLASS net/minecraft/class_572 net/minecraft/client/render/entity/model/BipedEntityModel
CLASS class_573 ArmPose
METHOD <init> (Ljava/lang/String;I)V
ARG 1 name
ARG 2 id
FIELD field_3390 leftArm Lnet/minecraft/class_630;
FIELD field_3391 body Lnet/minecraft/class_630;
FIELD field_3392 rightLeg Lnet/minecraft/class_630;
@ -13,6 +16,10 @@ CLASS net/minecraft/class_572 net/minecraft/client/render/entity/model/BipedEnti
FIELD field_3401 rightArm Lnet/minecraft/class_630;
METHOD <init> (F)V
ARG 1 scale
METHOD method_2804 lerpAngle (FFF)F
ARG 1 from
ARG 2 to
ARG 3 position
METHOD method_2805 setVisible (Z)V
ARG 1 visible
METHOD method_2806 getPreferredArm (Lnet/minecraft/class_1309;)Lnet/minecraft/class_1306;

View File

@ -1,3 +1,4 @@
CLASS net/minecraft/class_555 net/minecraft/client/render/entity/model/BlazeEntityModel
FIELD field_20921 parts Lcom/google/common/collect/ImmutableList;
FIELD field_3328 rods [Lnet/minecraft/class_630;
FIELD field_3329 head Lnet/minecraft/class_630;

View File

@ -1,6 +1,8 @@
CLASS net/minecraft/class_554 net/minecraft/client/render/entity/model/BoatEntityModel
FIELD field_20922 parts Lcom/google/common/collect/ImmutableList;
FIELD field_3325 paddles [Lnet/minecraft/class_630;
FIELD field_3326 bottom Lnet/minecraft/class_630;
METHOD method_22954 getBottom ()Lnet/minecraft/class_630;
METHOD method_2796 makePaddle (Z)Lnet/minecraft/class_630;
ARG 1 isLeft
METHOD method_2797 renderPaddle (Lnet/minecraft/class_1690;IFF)V

View File

@ -1,4 +1,5 @@
CLASS net/minecraft/class_557 net/minecraft/client/render/entity/model/BookModel
FIELD field_20786 parts Ljava/util/List;
FIELD field_3333 spine Lnet/minecraft/class_630;
FIELD field_3334 leftPage Lnet/minecraft/class_630;
FIELD field_3335 rightBlock Lnet/minecraft/class_630;

View File

@ -0,0 +1,2 @@
CLASS net/minecraft/class_4595 net/minecraft/client/render/entity/model/CompositeEntityModel
METHOD method_22960 getParts ()Ljava/lang/Iterable;

View File

@ -1,2 +1,3 @@
CLASS net/minecraft/class_584 net/minecraft/client/render/entity/model/ParrotEntityModel
CLASS class_585 Pose
METHOD method_17107 getPose (Lnet/minecraft/class_1453;)Lnet/minecraft/class_584$class_585;

View File

@ -1 +1,7 @@
CLASS net/minecraft/class_602 net/minecraft/client/render/entity/model/ShulkerEntityModel
FIELD field_3553 bottomShell Lnet/minecraft/class_630;
FIELD field_3554 head Lnet/minecraft/class_630;
FIELD field_3555 topShell Lnet/minecraft/class_630;
METHOD method_2829 getTopShell ()Lnet/minecraft/class_630;
METHOD method_2830 getHead ()Lnet/minecraft/class_630;
METHOD method_2831 getBottomShell ()Lnet/minecraft/class_630;

View File

@ -0,0 +1,8 @@
CLASS net/minecraft/class_4593 net/minecraft/client/render/entity/model/TintableAnimalModel
FIELD field_20923 redMultiplier F
FIELD field_20924 greenMultiplier F
FIELD field_20925 blueMultiplier F
METHOD method_22955 setColorMultiplier (FFF)V
ARG 1 red
ARG 2 green
ARG 3 blue

View File

@ -0,0 +1,8 @@
CLASS net/minecraft/class_4594 net/minecraft/client/render/entity/model/TintableCompositeModel
FIELD field_20926 redMultiplier F
FIELD field_20927 greenMultiplier F
FIELD field_20928 blueMultiplier F
METHOD method_22956 setColorMultiplier (FFF)V
ARG 1 red
ARG 2 green
ARG 3 blue

View File

@ -1,2 +1,5 @@
CLASS net/minecraft/class_622 net/minecraft/client/render/entity/model/WitchEntityModel
FIELD field_3614 liftingNose Z
FIELD field_3615 mole Lnet/minecraft/class_630;
METHOD method_2839 getNose ()Lnet/minecraft/class_630;
METHOD method_2840 setLiftingNose (Z)V

View File

@ -6,6 +6,10 @@ CLASS net/minecraft/class_918 net/minecraft/client/render/item/ItemRenderer
FIELD field_4733 colorMap Lnet/minecraft/class_325;
METHOD <init> (Lnet/minecraft/class_1060;Lnet/minecraft/class_1092;Lnet/minecraft/class_325;)V
ARG 3 colorMap
METHOD method_23181 getArmorVertexConsumer (Lnet/minecraft/class_4597;Lnet/minecraft/class_1921;ZZ)Lnet/minecraft/class_4588;
ARG 0 vertexConsumers
ARG 1 layer
ARG 3 glint
METHOD method_4004 renderGuiQuad (Lnet/minecraft/class_287;IIIIIIII)V
ARG 2 x
ARG 3 y