mirrors/yarn
mirrors
/
yarn
mirror of https://github.com/FabricMC/yarn.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

FirstPersonRenderer -> HeldItemRenderer (#991) 

* Update all the mappings for ItemRenderer and FirstPersonItemRenderer

* FirstPersonRenderer -> HeldItemRenderer

* Apply suggestions from code review

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

* Revert `vertexConsumers` -> `provider

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

* Typo

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

* matrix -> matrices (part 2)

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

* vertices -> vertexConsumers (part 2)

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

* transformation -> transformationType

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

* Item -> item

Co-Authored-By: liach <7806504+liach@users.noreply.github.com>
This commit is contained in:
­Sollace 2019-12-08 20:08:24 +02:00 committed by modmuss50
parent 7321f6c54f
commit 0192eb0e67
8 changed files with 139 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mappings/net/minecraft/client/MinecraftClient.mapping
View File

@ -46,7 +46,7 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient
FIELD field_1733 searchManager Lnet/minecraft/class_1124;
FIELD field_1734 paused Z
FIELD field_1735 fpsCounter I
FIELD field_1737 firstPersonRenderer Lnet/minecraft/class_759;
FIELD field_1737 heldItemRenderer Lnet/minecraft/class_759;
FIELD field_1738 currentFps I
FIELD field_1739 netProxy Ljava/net/Proxy;
FIELD field_17404 renderTaskQueue Ljava/util/Queue;
@ -105,7 +105,7 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient
ARG 1 key
METHOD method_1487 getNetworkProxy ()Ljava/net/Proxy;
METHOD method_1488 getTickDelta ()F
METHOD method_1489 getFirstPersonRenderer ()Lnet/minecraft/class_759;
METHOD method_1489 getHeldItemRenderer ()Lnet/minecraft/class_759;
METHOD method_1490 stop ()V
METHOD method_1492 drawProfilerResults ()V
METHOD method_1493 isPaused ()Z

2
mappings/net/minecraft/client/render/DiffuseLighting.mapping
View File

@ -3,3 +3,5 @@ CLASS net/minecraft/class_308 net/minecraft/client/render/DiffuseLighting
METHOD method_1452 enableForLevel (Lnet/minecraft/class_1159;)V
ARG 0 modelMatrix
METHOD method_22890 enable ()V
METHOD method_24210 disableGuiDepthLighting ()V
METHOD method_24211 enableGuiDepthLighting ()V

3
mappings/net/minecraft/client/render/GameRenderer.mapping
View File

@ -45,6 +45,9 @@ CLASS net/minecraft/class_757 net/minecraft/client/render/GameRenderer
ARG 2 scaledHeight
ARG 3 tickDelta
METHOD method_3172 renderHand (Lnet/minecraft/class_4587;Lnet/minecraft/class_4184;F)V
ARG 1 matrices
ARG 2 camera
ARG 3 tickDelta
METHOD method_3174 getNightVisionStrength (Lnet/minecraft/class_1309;F)F
METHOD method_3176 updateWorldIcon ()V
METHOD method_3182 tick ()V

3
mappings/net/minecraft/client/render/entity/ItemEntityRenderer.mapping
View File

@ -2,6 +2,7 @@ CLASS net/minecraft/class_916 net/minecraft/client/render/entity/ItemEntityRende
FIELD field_4725 random Ljava/util/Random;
FIELD field_4726 itemRenderer Lnet/minecraft/class_918;
METHOD <init> (Lnet/minecraft/class_898;Lnet/minecraft/class_918;)V
ARG 1 renderManager
ARG 1 dispatcher
ARG 2 renderer
METHOD method_3998 getRenderedAmount (Lnet/minecraft/class_1799;)I
ARG 1 stack

15
mappings/net/minecraft/client/render/entity/PlayerEntityRenderer.mapping
View File

@ -1,5 +1,20 @@
CLASS net/minecraft/class_1007 net/minecraft/client/render/entity/PlayerEntityRenderer
METHOD method_23205 renderArm (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;ILnet/minecraft/class_742;Lnet/minecraft/class_630;Lnet/minecraft/class_630;)V
ARG 1 matrices
ARG 2 vertexConsumers
ARG 3 light
ARG 4 player
ARG 5 arm
ARG 6 sleeve
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;ILnet/minecraft/class_742;)V
ARG 1 matrices
ARG 2 vertexConsumers
ARG 3 light
ARG 4 player
METHOD method_4221 renderLeftArm (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;ILnet/minecraft/class_742;)V
ARG 1 matrices
ARG 2 vertexConsumers
ARG 3 light
ARG 4 player

61
mappings/net/minecraft/client/render/FirstPersonRenderer.mapping → mappings/net/minecraft/client/render/item/HeldItemRenderer.mapping
View File

@ -1,4 +1,4 @@
CLASS net/minecraft/class_759 net/minecraft/client/render/FirstPersonRenderer
CLASS net/minecraft/class_759 net/minecraft/client/render/item/HeldItemRenderer
FIELD field_4043 equipProgressMainHand F
FIELD field_4044 itemRenderer Lnet/minecraft/class_918;
FIELD field_4046 renderManager Lnet/minecraft/class_898;
@ -10,21 +10,78 @@ CLASS net/minecraft/class_759 net/minecraft/client/render/FirstPersonRenderer
FIELD field_4053 prevEquipProgressMainHand F
METHOD <init> (Lnet/minecraft/class_310;)V
ARG 1 client
METHOD method_22976 renderItem (FLnet/minecraft/class_4587;Lnet/minecraft/class_4597$class_4598;Lnet/minecraft/class_746;I)V
ARG 1 tickDelta
ARG 2 matrices
ARG 3 vertexConsumers
ARG 4 player
ARG 5 light
METHOD method_3215 resetEquipProgress (Lnet/minecraft/class_1268;)V
ARG 1 hand
METHOD method_3216 renderArm (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;ILnet/minecraft/class_1306;)V
ARG 1 matrices
ARG 2 vertexConsumers
ARG 3 light
ARG 4 arm
METHOD method_3217 applySwingOffset (Lnet/minecraft/class_4587;Lnet/minecraft/class_1306;F)V
ARG 1 matrices
ARG 2 arm
ARG 3 swingProgress
METHOD method_3218 applyEatOrDrinkTransformation (Lnet/minecraft/class_4587;FLnet/minecraft/class_1306;Lnet/minecraft/class_1799;)V
ARG 1 matrices
ARG 2 tickDelta
ARG 3 arm
ARG 4 stack
METHOD method_3219 renderArmHoldingItem (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;IFFLnet/minecraft/class_1306;)V
ARG 1 matrices
ARG 2 vertexConsumers
ARG 3 light
ARG 4 equipProgress
ARG 5 swingProgress
ARG 6 arm
METHOD method_3220 updateHeldItems ()V
METHOD method_3222 renderMapInOneHand (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;IFLnet/minecraft/class_1306;FLnet/minecraft/class_1799;)V
ARG 1 matrices
ARG 2 vertexConsumers
ARG 3 light
ARG 4 equipProgress
ARG 5 arm
ARG 6 swingProgress
ARG 7 stack
METHOD method_3223 renderFirstPersonMap (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;ILnet/minecraft/class_1799;)V
METHOD method_3224 applyHandOffset (Lnet/minecraft/class_4587;Lnet/minecraft/class_1306;F)V
ARG 1 matrices
ARG 2 vertexConsumers
ARG 3 swingProgress
ARG 4 stack
METHOD method_3224 applyEquipOffset (Lnet/minecraft/class_4587;Lnet/minecraft/class_1306;F)V
ARG 1 matrices
ARG 2 arm
ARG 3 equipProgress
METHOD method_3227 getMapAngle (F)F
ARG 1 tickDelta
METHOD method_3228 renderFirstPersonItem (Lnet/minecraft/class_742;FFLnet/minecraft/class_1268;FLnet/minecraft/class_1799;FLnet/minecraft/class_4587;Lnet/minecraft/class_4597;I)V
ARG 1 player
ARG 2 tickDelta
ARG 3 pitch
ARG 4 hand
ARG 5 swingProgress
ARG 6 item
ARG 7 equipProgress
ARG 8 matrices
ARG 9 vertexConsumers
ARG 10 light
METHOD method_3231 renderMapInBothHands (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;IFFF)V
ARG 1 matrices
ARG 2 vertexConsumers
ARG 3 light
ARG 4 pitch
ARG 5 equipProgress
ARG 6 swingProgress
METHOD method_3233 renderItem (Lnet/minecraft/class_1309;Lnet/minecraft/class_1799;Lnet/minecraft/class_809$class_811;ZLnet/minecraft/class_4587;Lnet/minecraft/class_4597;I)V
ARG 1 entity
ARG 2 stack
ARG 3 transformationType
ARG 4 leftHanded
ARG 5 matrices
ARG 6 vertexConsumers
ARG 7 light

52
mappings/net/minecraft/client/render/item/ItemRenderer.mapping
View File

@ -6,12 +6,56 @@ CLASS net/minecraft/class_918 net/minecraft/client/render/item/ItemRenderer
FIELD field_4732 models Lnet/minecraft/class_763;
FIELD field_4733 colorMap Lnet/minecraft/class_325;
METHOD <init> (Lnet/minecraft/class_1060;Lnet/minecraft/class_1092;Lnet/minecraft/class_325;)V
ARG 1 manager
ARG 2 bakery
ARG 3 colorMap
METHOD method_23177 renderItem (Lnet/minecraft/class_1309;Lnet/minecraft/class_1799;Lnet/minecraft/class_809$class_811;ZLnet/minecraft/class_4587;Lnet/minecraft/class_4597;Lnet/minecraft/class_1937;II)V
ARG 1 entity
ARG 2 item
ARG 3 transformationType
ARG 4 leftHanded
ARG 5 matrices
ARG 6 vertexConsumers
ARG 7 world
ARG 8 light
ARG 9 overlay
METHOD method_23178 renderItem (Lnet/minecraft/class_1799;Lnet/minecraft/class_809$class_811;IILnet/minecraft/class_4587;Lnet/minecraft/class_4597;)V
ARG 1 stack
ARG 2 transformationType
ARG 3 light
ARG 4 overlay
ARG 5 matrices
ARG 6 vertexConsumers
METHOD method_23179 renderItem (Lnet/minecraft/class_1799;Lnet/minecraft/class_809$class_811;ZLnet/minecraft/class_4587;Lnet/minecraft/class_4597;IILnet/minecraft/class_1087;)V
ARG 1 stack
ARG 2 transformationType
ARG 3 leftHanded
ARG 4 matrices
ARG 5 vertexConsumers
ARG 6 light
ARG 7 overlay
ARG 8 model
METHOD method_23180 renderBakedItemQuads (Lnet/minecraft/class_4587;Lnet/minecraft/class_4588;Ljava/util/List;Lnet/minecraft/class_1799;II)V
ARG 1 matrices
ARG 2 vertices
ARG 3 quads
ARG 4 stack
ARG 5 light
ARG 6 overlay
METHOD method_23181 getArmorVertexConsumer (Lnet/minecraft/class_4597;Lnet/minecraft/class_1921;ZZ)Lnet/minecraft/class_4588;
ARG 0 vertexConsumers
ARG 1 layer
ARG 2 solid
ARG 3 glint
METHOD method_23182 renderBakedItemModel (Lnet/minecraft/class_1087;Lnet/minecraft/class_1799;IILnet/minecraft/class_4587;Lnet/minecraft/class_4588;)V
ARG 1 model
ARG 2 stack
ARG 3 light
ARG 4 overlay
ARG 5 matrices
ARG 6 vertices
METHOD method_4004 renderGuiQuad (Lnet/minecraft/class_287;IIIIIIII)V
ARG 1 buffer
ARG 2 x
ARG 3 y
ARG 4 width
@ -27,11 +71,18 @@ CLASS net/minecraft/class_918 net/minecraft/client/render/item/ItemRenderer
METHOD method_4012 getModels ()Lnet/minecraft/class_763;
METHOD method_4019 getHeldItemModel (Lnet/minecraft/class_1799;Lnet/minecraft/class_1937;Lnet/minecraft/class_1309;)Lnet/minecraft/class_1087;
ARG 1 stack
ARG 2 world
ARG 3 entity
METHOD method_4020 getOverriddenModel (Lnet/minecraft/class_1087;Lnet/minecraft/class_1799;Lnet/minecraft/class_1937;Lnet/minecraft/class_1309;)Lnet/minecraft/class_1087;
ARG 1 model
ARG 2 stack
ARG 3 world
ARG 4 entity
METHOD method_4021 renderGuiItemModel (Lnet/minecraft/class_1799;IILnet/minecraft/class_1087;)V
ARG 1 stack
ARG 2 x
ARG 3 y
ARG 4 model
METHOD method_4022 renderGuiItemOverlay (Lnet/minecraft/class_327;Lnet/minecraft/class_1799;IILjava/lang/String;)V
ARG 1 fontRenderer
ARG 2 stack
@ -48,6 +99,7 @@ CLASS net/minecraft/class_918 net/minecraft/client/render/item/ItemRenderer
ARG 3 x
ARG 4 y
METHOD method_4026 renderGuiItem (Lnet/minecraft/class_1309;Lnet/minecraft/class_1799;II)V
ARG 1 entity
ARG 2 itemStack
ARG 3 x
ARG 4 y

5
mappings/net/minecraft/client/render/model/json/Transformation.mapping
View File

@ -9,6 +9,9 @@ CLASS net/minecraft/class_804 net/minecraft/client/render/model/json/Transformat
ARG 3 scale
METHOD equals (Ljava/lang/Object;)Z
ARG 1 o
METHOD method_23075 apply (ZLnet/minecraft/class_4587;)V
ARG 1 leftHanded
ARG 2 matrices
CLASS class_805 Deserializer
FIELD field_4288 DEFAULT_ROATATION Lnet/minecraft/class_1160;
FIELD field_4289 DEFAULT_SCALE Lnet/minecraft/class_1160;
@ -20,4 +23,4 @@ CLASS net/minecraft/class_804 net/minecraft/client/render/model/json/Transformat
METHOD method_3493 parseVector3f (Lcom/google/gson/JsonObject;Ljava/lang/String;Lnet/minecraft/class_1160;)Lnet/minecraft/class_1160;
ARG 1 json
ARG 2 key
ARG 3 default_
ARG 3 fallback