From 86a0f7ffb8c561e98441e65c8fa7cd96dc49a3d2 Mon Sep 17 00:00:00 2001 From: YanisBft Date: Wed, 9 Jun 2021 01:16:31 +0200 Subject: [PATCH] Some client mappings (#2481) * Some client mappings * Update mappings/net/minecraft/client/gui/widget/EntryListWidget.mapping Co-authored-by: ByMartrixX <47987888+ByMartrixx@users.noreply.github.com> * Update mappings/net/minecraft/client/gui/widget/EntryListWidget.mapping Co-authored-by: liach <7806504+liach@users.noreply.github.com> Co-authored-by: ByMartrixX <47987888+ByMartrixx@users.noreply.github.com> Co-authored-by: liach <7806504+liach@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- .../minecraft/client/MinecraftClient.mapping | 2 +- .../gui/screen/ingame/BeaconScreen.mapping | 13 +++++++++++++ .../client/gui/widget/EntryListWidget.mapping | 3 ++- .../client/render/entity/EntityRenderer.mapping | 2 +- .../entity/model/AxolotlEntityModel.mapping | 2 +- .../render/entity/model/BoatEntityModel.mapping | 2 +- .../entity/model/HoglinEntityModel.mapping | 2 ++ .../entity/model/OcelotEntityModel.mapping | 17 +++++++++++++++++ .../entity/model/ShulkerEntityModel.mapping | 2 +- .../entity/model/SnowGolemEntityModel.mapping | 2 +- .../dedicated/ServerPropertiesHandler.mapping | 2 -- 11 files changed, 40 insertions(+), 9 deletions(-) diff --git a/mappings/net/minecraft/client/MinecraftClient.mapping b/mappings/net/minecraft/client/MinecraftClient.mapping index b2c9aa187f..c9854a6607 100644 --- a/mappings/net/minecraft/client/MinecraftClient.mapping +++ b/mappings/net/minecraft/client/MinecraftClient.mapping @@ -93,7 +93,7 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient FIELD field_1735 fpsCounter I FIELD field_1737 heldItemRenderer Lnet/minecraft/class_759; FIELD field_1738 currentFps I - FIELD field_1739 netProxy Ljava/net/Proxy; + FIELD field_1739 networkProxy Ljava/net/Proxy; FIELD field_17404 renderTaskQueue Ljava/util/Queue; FIELD field_17405 worldGenProgressTracker Ljava/util/concurrent/atomic/AtomicReference; FIELD field_1740 DEFAULT_FONT_ID Lnet/minecraft/class_2960; diff --git a/mappings/net/minecraft/client/gui/screen/ingame/BeaconScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/BeaconScreen.mapping index f01843c9a1..e2ab5ecd7c 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/BeaconScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/BeaconScreen.mapping @@ -35,6 +35,10 @@ CLASS net/minecraft/class_466 net/minecraft/client/gui/screen/ingame/BeaconScree METHOD (II)V ARG 1 x ARG 2 y + METHOD (IILnet/minecraft/class_2561;)V + ARG 1 x + ARG 2 y + ARG 3 message METHOD method_18641 renderExtra (Lnet/minecraft/class_4587;)V ARG 1 matrices METHOD method_2401 setDisabled (Z)V @@ -43,8 +47,17 @@ CLASS net/minecraft/class_466 net/minecraft/client/gui/screen/ingame/BeaconScree CLASS class_4072 IconButtonWidget FIELD field_18224 u I FIELD field_18225 v I + METHOD (Lnet/minecraft/class_466;IIIILnet/minecraft/class_2561;)V + ARG 2 x + ARG 3 y + ARG 4 u + ARG 5 v + ARG 6 message CLASS class_6392 METHOD method_25352 renderToolTip (Lnet/minecraft/class_4587;II)V + ARG 1 matrices + ARG 2 mouseX + ARG 3 mouseY CLASS class_6393 LevelTwoEffectButtonWidget METHOD (Lnet/minecraft/class_466;IILnet/minecraft/class_1291;)V ARG 2 x diff --git a/mappings/net/minecraft/client/gui/widget/EntryListWidget.mapping b/mappings/net/minecraft/client/gui/widget/EntryListWidget.mapping index d2db0457ef..73a5bd95fd 100644 --- a/mappings/net/minecraft/client/gui/widget/EntryListWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/EntryListWidget.mapping @@ -89,7 +89,8 @@ CLASS net/minecraft/class_350 net/minecraft/client/gui/widget/EntryListWidget ARG 1 index METHOD method_25333 setLeftPos (I)V ARG 1 left - METHOD method_25334 getSelected ()Lnet/minecraft/class_350$class_351; + METHOD method_25334 getSelectedOrNull ()Lnet/minecraft/class_350$class_351; + COMMENT {@return the selected entry of this entry list, or {@code null} if there is none} METHOD method_25335 moveSelection (Lnet/minecraft/class_350$class_5403;)V ARG 1 direction METHOD method_25337 getRowTop (I)I diff --git a/mappings/net/minecraft/client/render/entity/EntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/EntityRenderer.mapping index a5a8f4f4b0..628b3facfb 100644 --- a/mappings/net/minecraft/client/render/entity/EntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/EntityRenderer.mapping @@ -30,7 +30,7 @@ CLASS net/minecraft/class_897 net/minecraft/client/render/entity/EntityRenderer ARG 5 light METHOD method_3931 getTexture (Lnet/minecraft/class_1297;)Lnet/minecraft/class_2960; ARG 1 entity - METHOD method_3932 getFontRenderer ()Lnet/minecraft/class_327; + METHOD method_3932 getTextRenderer ()Lnet/minecraft/class_327; METHOD method_3933 shouldRender (Lnet/minecraft/class_1297;Lnet/minecraft/class_4604;DDD)Z ARG 1 entity ARG 2 frustum diff --git a/mappings/net/minecraft/client/render/entity/model/AxolotlEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/AxolotlEntityModel.mapping index 9e48077a51..79e250c9f5 100644 --- a/mappings/net/minecraft/client/render/entity/model/AxolotlEntityModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/AxolotlEntityModel.mapping @@ -77,7 +77,7 @@ CLASS net/minecraft/class_5772 net/minecraft/client/render/entity/model/AxolotlE METHOD method_37091 lerpAngleDegrees (FF)F ARG 1 start ARG 2 end - METHOD method_37092 lerpAngleDegress (FFF)F + METHOD method_37092 lerpAngleDegrees (FFF)F ARG 1 delta ARG 2 start ARG 3 end diff --git a/mappings/net/minecraft/client/render/entity/model/BoatEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/BoatEntityModel.mapping index 563f3cdbc7..eff5f363aa 100644 --- a/mappings/net/minecraft/client/render/entity/model/BoatEntityModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/BoatEntityModel.mapping @@ -55,7 +55,7 @@ CLASS net/minecraft/class_554 net/minecraft/client/render/entity/model/BoatEntit FIELD field_3326 waterPatch Lnet/minecraft/class_630; METHOD (Lnet/minecraft/class_630;)V ARG 1 root - METHOD method_22954 getBottom ()Lnet/minecraft/class_630; + METHOD method_22954 getWaterPatch ()Lnet/minecraft/class_630; METHOD method_2797 setPaddleAngle (Lnet/minecraft/class_1690;ILnet/minecraft/class_630;F)V ARG 0 entity ARG 1 sigma diff --git a/mappings/net/minecraft/client/render/entity/model/HoglinEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/HoglinEntityModel.mapping index 0e4e7b2871..47172d96b6 100644 --- a/mappings/net/minecraft/client/render/entity/model/HoglinEntityModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/HoglinEntityModel.mapping @@ -51,6 +51,8 @@ CLASS net/minecraft/class_4791 net/minecraft/client/render/entity/model/HoglinEn FIELD field_27422 leftFrontLeg Lnet/minecraft/class_630; FIELD field_27423 rightHindLeg Lnet/minecraft/class_630; FIELD field_27424 leftHindLeg Lnet/minecraft/class_630; + FIELD field_32484 HEAD_PITCH_START F + FIELD field_32485 HEAD_PITCH_END F METHOD (Lnet/minecraft/class_630;)V ARG 1 root METHOD method_32009 getTexturedModelData ()Lnet/minecraft/class_5607; diff --git a/mappings/net/minecraft/client/render/entity/model/OcelotEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/OcelotEntityModel.mapping index 9263e6c965..f887f1041d 100644 --- a/mappings/net/minecraft/client/render/entity/model/OcelotEntityModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/OcelotEntityModel.mapping @@ -37,10 +37,27 @@ CLASS net/minecraft/class_582 net/minecraft/client/render/entity/model/OcelotEnt FIELD field_27455 rightHindLeg Lnet/minecraft/class_630; FIELD field_27456 leftFrontLeg Lnet/minecraft/class_630; FIELD field_27457 rightFrontLeg Lnet/minecraft/class_630; + FIELD field_32512 BODY_PIVOT_Z F + FIELD field_32513 UPPER_TAIL_PIVOT_Y F + FIELD field_32514 UPPER_TAIL_PIVOT_Z F + FIELD field_32515 LOWER_TAIL_PIVOT_Y F + FIELD field_32516 LOWER_TAIL_PIVOT_Z F + FIELD field_32517 FRONT_LEG_PIVOT_Z F FIELD field_32518 TAIL1 Ljava/lang/String; COMMENT The key of the upper tail model part, whose value is {@value}. FIELD field_32519 TAIL2 Ljava/lang/String; COMMENT The key of the lower tail model part, whose value is {@value}. + FIELD field_32520 SITTING_ANIMATION_STATE I + FIELD field_32521 HIND_LEG_PIVOT_Y F + FIELD field_32522 HIND_LEG_PIVOT_Z F + FIELD field_32523 FRONT_LEG_PIVOT_Y F + FIELD field_32524 SNEAKING_ANIMATION_STATE I + FIELD field_32525 STANDING_ANIMATION_STATE I + FIELD field_32526 SPRINTING_ANIMATION_STATE I + FIELD field_32528 BODY_SIZE_Y F + FIELD field_32530 HEAD_PIVOT_Y F + FIELD field_32531 HEAD_PIVOT_Z F + FIELD field_32532 BODY_PIVOT_Y F FIELD field_3434 animationState I FIELD field_3435 head Lnet/minecraft/class_630; FIELD field_3436 upperTail Lnet/minecraft/class_630; diff --git a/mappings/net/minecraft/client/render/entity/model/ShulkerEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/ShulkerEntityModel.mapping index 0ccaaf6541..4cb207e75e 100644 --- a/mappings/net/minecraft/client/render/entity/model/ShulkerEntityModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/ShulkerEntityModel.mapping @@ -8,6 +8,6 @@ CLASS net/minecraft/class_602 net/minecraft/client/render/entity/model/ShulkerEn FIELD field_3555 lid Lnet/minecraft/class_630; METHOD (Lnet/minecraft/class_630;)V ARG 1 root - METHOD method_2829 getTopShell ()Lnet/minecraft/class_630; + METHOD method_2829 getLid ()Lnet/minecraft/class_630; METHOD method_2830 getHead ()Lnet/minecraft/class_630; METHOD method_32041 getTexturedModelData ()Lnet/minecraft/class_5607; diff --git a/mappings/net/minecraft/client/render/entity/model/SnowGolemEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/SnowGolemEntityModel.mapping index 12a8be2467..aefb882ab2 100644 --- a/mappings/net/minecraft/client/render/entity/model/SnowGolemEntityModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/SnowGolemEntityModel.mapping @@ -8,5 +8,5 @@ CLASS net/minecraft/class_608 net/minecraft/client/render/entity/model/SnowGolem FIELD field_3568 head Lnet/minecraft/class_630; METHOD (Lnet/minecraft/class_630;)V ARG 1 root - METHOD method_2834 getTopSnowball ()Lnet/minecraft/class_630; + METHOD method_2834 getHead ()Lnet/minecraft/class_630; METHOD method_32053 getTexturedModelData ()Lnet/minecraft/class_5607; diff --git a/mappings/net/minecraft/server/dedicated/ServerPropertiesHandler.mapping b/mappings/net/minecraft/server/dedicated/ServerPropertiesHandler.mapping index dafaabed0e..586c99da8f 100644 --- a/mappings/net/minecraft/server/dedicated/ServerPropertiesHandler.mapping +++ b/mappings/net/minecraft/server/dedicated/ServerPropertiesHandler.mapping @@ -49,8 +49,6 @@ CLASS net/minecraft/class_3806 net/minecraft/server/dedicated/ServerPropertiesHa FIELD field_26899 textFilteringConfig Ljava/lang/String; FIELD field_27845 requireResourcePack Z FIELD field_33432 resourcePackPrompt Ljava/lang/String; - METHOD (Ljava/util/Properties;)V - ARG 1 properties METHOD method_16714 load (Ljava/nio/file/Path;)Lnet/minecraft/class_3806; METHOD method_16715 (Ljava/lang/Integer;)Ljava/lang/Integer; ARG 0 maxWorldSize