From 19c661296a50d33bef0f6ebebe85705d02073414 Mon Sep 17 00:00:00 2001 From: Shnupbups Date: Sun, 11 Apr 2021 03:09:14 +1000 Subject: [PATCH] more 21w14a stuff (#2300) * stuff mostly client stuff * Apply suggestions from code review Co-authored-by: liach <7806504+liach@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: liach <7806504+liach@users.noreply.github.com> Co-authored-by: liach <7806504+liach@users.noreply.github.com> --- .../client/render/debug/BeeDebugRenderer.mapping | 4 ++++ .../render/debug/GameEventDebugRenderer.mapping | 11 +++++++++++ .../debug/GoalSelectorDebugRenderer.mapping | 3 +++ .../client/render/debug/NameGenerator.mapping | 2 ++ .../render/debug/RaidCenterDebugRenderer.mapping | 5 +++++ .../entity/CaveSpiderEntityRenderer.mapping | 1 + .../entity/EndCrystalEntityRenderer.mapping | 2 ++ .../client/render/entity/EntityRenderers.mapping | 1 + .../entity/ItemFrameEntityRenderer.mapping | 4 ++++ .../render/entity/PiglinEntityRenderer.mapping | 1 + .../client/render/entity/PlayerModelPart.mapping | 1 + .../entity/model/ArmorStandEntityModel.mapping | 4 ++++ .../client/render/item/HeldItemRenderer.mapping | 4 ++++ .../client/render/item/ItemRenderer.mapping | 1 + .../client/render/model/BakedQuad.mapping | 1 + .../client/render/model/ModelLoader.mapping | 6 +++++- .../client/render/model/ModelRotation.mapping | 1 + .../model/json/AndMultipartModelSelector.mapping | 1 + .../render/model/json/JsonUnbakedModel.mapping | 5 +++-- .../render/model/json/ModelVariantMap.mapping | 1 + .../model/json/OrMultipartModelSelector.mapping | 1 + .../client/resource/Format4ResourcePack.mapping | 1 + .../GrassColormapResourceSupplier.mapping | 2 ++ .../client/resource/ResourceIndex.mapping | 3 ++- .../resource/language/LanguageManager.mapping | 1 + .../language/TextReorderingProcessor.mapping | 2 ++ .../metadata/AnimationResourceMetadata.mapping | 1 + .../sound/MinecartInsideSoundInstance.mapping | 2 ++ .../minecraft/client/sound/SoundManager.mapping | 9 +++++++++ .../minecraft/client/sound/SoundSystem.mapping | 16 ++++++++++++++++ .../client/sound/WeightedSoundSet.mapping | 1 + .../minecraft/client/texture/NativeImage.mapping | 14 ++++++++++++++ .../texture/NativeImageBackedTexture.mapping | 1 + .../client/texture/PlayerSkinProvider.mapping | 1 + .../net/minecraft/client/texture/Sprite.mapping | 14 +++++++++++++- .../client/texture/SpriteAtlasTexture.mapping | 1 + .../client/texture/TextureManager.mapping | 3 +++ .../client/util/DefaultSkinHelper.mapping | 2 ++ .../client/util/SelectionManager.mapping | 9 +++++++++ .../net/minecraft/client/util/Session.mapping | 1 + .../client/util/SpriteIdentifier.mapping | 3 +++ .../minecraft/client/util/TextCollector.mapping | 3 +++ .../net/minecraft/client/util/Window.mapping | 4 ++++ .../minecraft/client/util/math/Vector3d.mapping | 10 ++++++++++ mappings/net/minecraft/server/BanEntry.mapping | 2 ++ .../net/minecraft/server/MinecraftServer.mapping | 2 ++ .../server/command/CloneCommand.mapping | 1 + .../util/snooper/SnooperListener.mapping | 2 ++ 48 files changed, 166 insertions(+), 5 deletions(-) diff --git a/mappings/net/minecraft/client/render/debug/BeeDebugRenderer.mapping b/mappings/net/minecraft/client/render/debug/BeeDebugRenderer.mapping index 07f8b18925..69f3b2e224 100644 --- a/mappings/net/minecraft/client/render/debug/BeeDebugRenderer.mapping +++ b/mappings/net/minecraft/client/render/debug/BeeDebugRenderer.mapping @@ -63,6 +63,10 @@ CLASS net/minecraft/class_4703 net/minecraft/client/render/debug/BeeDebugRendere METHOD method_23832 updateTargetedEntity ()V METHOD method_23952 removeInvalidBees ()V METHOD method_24084 getBlacklistingBees ()Ljava/util/Map; + METHOD method_35794 removeBee (I)V + ARG 1 id + METHOD method_35796 getBeeNamesForHive (Lnet/minecraft/class_4703$class_4705;)Ljava/util/Set; + ARG 1 hive CLASS class_4705 Hive FIELD field_21543 pos Lnet/minecraft/class_2338; FIELD field_21544 label Ljava/lang/String; diff --git a/mappings/net/minecraft/client/render/debug/GameEventDebugRenderer.mapping b/mappings/net/minecraft/client/render/debug/GameEventDebugRenderer.mapping index 0d507f19f9..11e0923e72 100644 --- a/mappings/net/minecraft/client/render/debug/GameEventDebugRenderer.mapping +++ b/mappings/net/minecraft/client/render/debug/GameEventDebugRenderer.mapping @@ -6,11 +6,22 @@ CLASS net/minecraft/class_5739 net/minecraft/client/render/debug/GameEventDebugR ARG 1 client METHOD method_33086 (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_5739$class_5741;)Z ARG 2 listener + METHOD method_33087 addEvent (Lnet/minecraft/class_5712;Lnet/minecraft/class_2338;)V + ARG 1 event + ARG 2 pos + METHOD method_33088 addListener (Lnet/minecraft/class_5716;I)V + ARG 1 positionSource + ARG 2 range METHOD method_33091 (Lnet/minecraft/class_5739$class_5741;Lnet/minecraft/class_4587;Lnet/minecraft/class_4588;DDDLnet/minecraft/class_2338;)V ARG 9 pos CLASS class_5740 Entry FIELD field_28258 startingMs J FIELD field_28259 event Lnet/minecraft/class_5712; + FIELD field_28260 pos Lnet/minecraft/class_243; + METHOD (JLnet/minecraft/class_5712;Lnet/minecraft/class_243;)V + ARG 1 startingMs + ARG 3 event + ARG 4 pos METHOD method_33093 hasExpired ()Z CLASS class_5741 Listener FIELD field_28261 positionSource Lnet/minecraft/class_5716; diff --git a/mappings/net/minecraft/client/render/debug/GoalSelectorDebugRenderer.mapping b/mappings/net/minecraft/client/render/debug/GoalSelectorDebugRenderer.mapping index b466a2fc0b..4509184366 100644 --- a/mappings/net/minecraft/client/render/debug/GoalSelectorDebugRenderer.mapping +++ b/mappings/net/minecraft/client/render/debug/GoalSelectorDebugRenderer.mapping @@ -4,6 +4,9 @@ CLASS net/minecraft/class_4205 net/minecraft/client/render/debug/GoalSelectorDeb METHOD (Lnet/minecraft/class_310;)V ARG 1 client METHOD method_19430 setGoalSelectorList (ILjava/util/List;)V + ARG 1 index + METHOD method_35799 removeGoalSelectorList (I)V + ARG 1 index CLASS class_4206 GoalSelector FIELD field_18782 pos Lnet/minecraft/class_2338; FIELD field_18784 name Ljava/lang/String; diff --git a/mappings/net/minecraft/client/render/debug/NameGenerator.mapping b/mappings/net/minecraft/client/render/debug/NameGenerator.mapping index cf341cde23..65564698c9 100644 --- a/mappings/net/minecraft/client/render/debug/NameGenerator.mapping +++ b/mappings/net/minecraft/client/render/debug/NameGenerator.mapping @@ -8,3 +8,5 @@ CLASS net/minecraft/class_4617 net/minecraft/client/render/debug/NameGenerator ARG 0 uuid METHOD method_23268 randomFromUuid (Ljava/util/UUID;)Ljava/util/Random; ARG 0 uuid + METHOD method_36154 name (Lnet/minecraft/class_1297;)Ljava/lang/String; + ARG 0 entity diff --git a/mappings/net/minecraft/client/render/debug/RaidCenterDebugRenderer.mapping b/mappings/net/minecraft/client/render/debug/RaidCenterDebugRenderer.mapping index f75b99c4ec..481c8db2f4 100644 --- a/mappings/net/minecraft/client/render/debug/RaidCenterDebugRenderer.mapping +++ b/mappings/net/minecraft/client/render/debug/RaidCenterDebugRenderer.mapping @@ -5,4 +5,9 @@ CLASS net/minecraft/class_4304 net/minecraft/client/render/debug/RaidCenterDebug ARG 1 client METHOD method_20561 setRaidCenters (Ljava/util/Collection;)V ARG 1 centers + METHOD method_23122 drawRaidCenter (Lnet/minecraft/class_2338;)V + ARG 0 pos + METHOD method_23123 drawString (Ljava/lang/String;Lnet/minecraft/class_2338;I)V + ARG 0 string + ARG 1 pos METHOD method_23125 getCamera ()Lnet/minecraft/class_4184; diff --git a/mappings/net/minecraft/client/render/entity/CaveSpiderEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/CaveSpiderEntityRenderer.mapping index bf33d703ca..f7edb9eb30 100644 --- a/mappings/net/minecraft/client/render/entity/CaveSpiderEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/CaveSpiderEntityRenderer.mapping @@ -1,2 +1,3 @@ CLASS net/minecraft/class_880 net/minecraft/client/render/entity/CaveSpiderEntityRenderer + FIELD field_32918 SCALE F FIELD field_4646 TEXTURE Lnet/minecraft/class_2960; diff --git a/mappings/net/minecraft/client/render/entity/EndCrystalEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/EndCrystalEntityRenderer.mapping index 7055d52cc1..8105668e86 100644 --- a/mappings/net/minecraft/client/render/entity/EndCrystalEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/EndCrystalEntityRenderer.mapping @@ -4,6 +4,8 @@ CLASS net/minecraft/class_892 net/minecraft/client/render/entity/EndCrystalEntit FIELD field_21004 frame Lnet/minecraft/class_630; FIELD field_21005 bottom Lnet/minecraft/class_630; FIELD field_21736 END_CRYSTAL Lnet/minecraft/class_1921; + FIELD field_32919 GLASS Ljava/lang/String; + FIELD field_32920 BASE Ljava/lang/String; FIELD field_4663 TEXTURE Lnet/minecraft/class_2960; METHOD method_23155 getYOffset (Lnet/minecraft/class_1511;F)F ARG 0 crystal diff --git a/mappings/net/minecraft/client/render/entity/EntityRenderers.mapping b/mappings/net/minecraft/client/render/entity/EntityRenderers.mapping index a3222428b0..8944cf912d 100644 --- a/mappings/net/minecraft/client/render/entity/EntityRenderers.mapping +++ b/mappings/net/minecraft/client/render/entity/EntityRenderers.mapping @@ -2,6 +2,7 @@ CLASS net/minecraft/class_5619 net/minecraft/client/render/entity/EntityRenderer FIELD field_27767 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_27768 rendererFactories Ljava/util/Map; FIELD field_27769 playerRendererFactories Ljava/util/Map; + FIELD field_32922 DEFAULT Ljava/lang/String; METHOD method_32172 isMissingRendererFactories ()Z METHOD method_32173 register (Lnet/minecraft/class_1299;Lnet/minecraft/class_5617;)V ARG 0 type diff --git a/mappings/net/minecraft/client/render/entity/ItemFrameEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/ItemFrameEntityRenderer.mapping index 59ed14366e..e0d80f0fc7 100644 --- a/mappings/net/minecraft/client/render/entity/ItemFrameEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/ItemFrameEntityRenderer.mapping @@ -5,6 +5,10 @@ CLASS net/minecraft/class_915 net/minecraft/client/render/entity/ItemFrameEntity FIELD field_4721 NORMAL_FRAME Lnet/minecraft/class_1091; FIELD field_4723 MAP_FRAME Lnet/minecraft/class_1091; FIELD field_4724 client Lnet/minecraft/class_310; + METHOD method_33433 getLight (Lnet/minecraft/class_1533;II)I + ARG 1 itemFrame + ARG 2 glowLight + ARG 3 regularLight METHOD method_33434 getModelId (Lnet/minecraft/class_1533;Lnet/minecraft/class_1799;)Lnet/minecraft/class_1091; ARG 1 entity ARG 2 stack diff --git a/mappings/net/minecraft/client/render/entity/PiglinEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/PiglinEntityRenderer.mapping index 94b791d6e4..51b5fbf4d7 100644 --- a/mappings/net/minecraft/client/render/entity/PiglinEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/PiglinEntityRenderer.mapping @@ -1,5 +1,6 @@ CLASS net/minecraft/class_4842 net/minecraft/client/render/entity/PiglinEntityRenderer FIELD field_25793 TEXTURES Ljava/util/Map; + FIELD field_32942 HORIZONTAL_SCALE F METHOD (Lnet/minecraft/class_5617$class_5618;Lnet/minecraft/class_5601;Lnet/minecraft/class_5601;Lnet/minecraft/class_5601;Z)V ARG 1 ctx ARG 2 mainLayer diff --git a/mappings/net/minecraft/client/render/entity/PlayerModelPart.mapping b/mappings/net/minecraft/client/render/entity/PlayerModelPart.mapping index d11f11f6e5..b874795b2e 100644 --- a/mappings/net/minecraft/client/render/entity/PlayerModelPart.mapping +++ b/mappings/net/minecraft/client/render/entity/PlayerModelPart.mapping @@ -6,6 +6,7 @@ CLASS net/minecraft/class_1664 net/minecraft/client/render/entity/PlayerModelPar METHOD (Ljava/lang/String;IILjava/lang/String;)V ARG 3 id ARG 4 name + METHOD method_35206 getId ()I METHOD method_7428 getOptionName ()Lnet/minecraft/class_2561; METHOD method_7429 getName ()Ljava/lang/String; METHOD method_7430 getBitFlag ()I diff --git a/mappings/net/minecraft/client/render/entity/model/ArmorStandEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/ArmorStandEntityModel.mapping index 9cc0509df0..5adaca80dc 100644 --- a/mappings/net/minecraft/client/render/entity/model/ArmorStandEntityModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/ArmorStandEntityModel.mapping @@ -1,6 +1,10 @@ CLASS net/minecraft/class_551 net/minecraft/client/render/entity/model/ArmorStandEntityModel FIELD field_27391 rightBodyStick Lnet/minecraft/class_630; FIELD field_27392 leftBodyStick Lnet/minecraft/class_630; + FIELD field_32445 RIGHT_BODY_STICK Ljava/lang/String; + FIELD field_32446 LEFT_BODY_STICK Ljava/lang/String; + FIELD field_32447 SHOULDER_STICK Ljava/lang/String; + FIELD field_32448 BASE_PLATE Ljava/lang/String; FIELD field_3312 basePlate Lnet/minecraft/class_630; FIELD field_3313 shoulderStick Lnet/minecraft/class_630; METHOD method_31979 getTexturedModelData ()Lnet/minecraft/class_5607; diff --git a/mappings/net/minecraft/client/render/item/HeldItemRenderer.mapping b/mappings/net/minecraft/client/render/item/HeldItemRenderer.mapping index 981c993bce..0da469d9ee 100644 --- a/mappings/net/minecraft/client/render/item/HeldItemRenderer.mapping +++ b/mappings/net/minecraft/client/render/item/HeldItemRenderer.mapping @@ -89,6 +89,10 @@ CLASS net/minecraft/class_759 net/minecraft/client/render/item/HeldItemRenderer ARG 7 light METHOD method_33302 isChargedCrossbow (Lnet/minecraft/class_1799;)Z ARG 0 stack + METHOD method_33303 getHandRenderType (Lnet/minecraft/class_746;)Lnet/minecraft/class_759$class_5773; + ARG 0 player + METHOD method_33304 getUsingItemHandRenderType (Lnet/minecraft/class_746;)Lnet/minecraft/class_759$class_5773; + ARG 0 player CLASS class_5773 HandRenderType FIELD field_28387 renderMainHand Z FIELD field_28388 renderOffHand Z diff --git a/mappings/net/minecraft/client/render/item/ItemRenderer.mapping b/mappings/net/minecraft/client/render/item/ItemRenderer.mapping index 8f32a0b454..58c670f082 100644 --- a/mappings/net/minecraft/client/render/item/ItemRenderer.mapping +++ b/mappings/net/minecraft/client/render/item/ItemRenderer.mapping @@ -109,6 +109,7 @@ CLASS net/minecraft/class_918 net/minecraft/client/render/item/ItemRenderer ARG 3 y METHOD method_4012 getModels ()Lnet/minecraft/class_763; METHOD method_4019 getHeldItemModel (Lnet/minecraft/class_1799;Lnet/minecraft/class_1937;Lnet/minecraft/class_1309;I)Lnet/minecraft/class_1087; + ARG 1 stack ARG 2 world ARG 3 entity ARG 4 seed diff --git a/mappings/net/minecraft/client/render/model/BakedQuad.mapping b/mappings/net/minecraft/client/render/model/BakedQuad.mapping index e3fa1526dd..b4792ca43a 100644 --- a/mappings/net/minecraft/client/render/model/BakedQuad.mapping +++ b/mappings/net/minecraft/client/render/model/BakedQuad.mapping @@ -15,3 +15,4 @@ CLASS net/minecraft/class_777 net/minecraft/client/render/model/BakedQuad METHOD method_3358 getFace ()Lnet/minecraft/class_2350; METHOD method_3359 getColorIndex ()I METHOD method_3360 hasColor ()Z + METHOD method_35788 getSprite ()Lnet/minecraft/class_1058; diff --git a/mappings/net/minecraft/client/render/model/ModelLoader.mapping b/mappings/net/minecraft/client/render/model/ModelLoader.mapping index 741030d658..acdcea8f15 100644 --- a/mappings/net/minecraft/client/render/model/ModelLoader.mapping +++ b/mappings/net/minecraft/client/render/model/ModelLoader.mapping @@ -10,11 +10,15 @@ CLASS net/minecraft/class_1088 net/minecraft/client/render/model/ModelLoader FIELD field_21558 SHIELD_BASE_NO_PATTERN Lnet/minecraft/class_4730; FIELD field_21772 BLOCK_DESTRUCTION_RENDER_LAYERS Ljava/util/List; FIELD field_21774 spriteAtlasManager Lnet/minecraft/class_4724; + FIELD field_32986 BUILTIN Ljava/lang/String; + FIELD field_32987 BUILTIN_GENERATED Ljava/lang/String; + FIELD field_32988 BUILTIN_ENTITY Ljava/lang/String; + FIELD field_32989 MISSING Ljava/lang/String; FIELD field_5370 FIRE_1 Lnet/minecraft/class_4730; FIELD field_5371 MISSING_DEFINITION Ljava/lang/String; FIELD field_5372 KEY_VALUE_SPLITTER Lcom/google/common/base/Splitter; FIELD field_5373 COMMA_SPLITTER Lcom/google/common/base/Splitter; - FIELD field_5374 MISSING Lnet/minecraft/class_1091; + FIELD field_5374 MISSING_ID Lnet/minecraft/class_1091; FIELD field_5376 unbakedModels Ljava/util/Map; FIELD field_5378 DEFAULT_TEXTURES Ljava/util/Set; FIELD field_5379 resourceManager Lnet/minecraft/class_3300; diff --git a/mappings/net/minecraft/client/render/model/ModelRotation.mapping b/mappings/net/minecraft/client/render/model/ModelRotation.mapping index aa8a8b8b9c..c14e9522e4 100644 --- a/mappings/net/minecraft/client/render/model/ModelRotation.mapping +++ b/mappings/net/minecraft/client/render/model/ModelRotation.mapping @@ -6,6 +6,7 @@ CLASS net/minecraft/class_1086 net/minecraft/client/render/model/ModelRotation METHOD (Ljava/lang/String;III)V ARG 3 x ARG 4 y + METHOD method_35808 getDirectionTransformation ()Lnet/minecraft/class_4990; METHOD method_4699 get (II)Lnet/minecraft/class_1086; ARG 0 x ARG 1 y diff --git a/mappings/net/minecraft/client/render/model/json/AndMultipartModelSelector.mapping b/mappings/net/minecraft/client/render/model/json/AndMultipartModelSelector.mapping index d4b998187d..ab9535ab0b 100644 --- a/mappings/net/minecraft/client/render/model/json/AndMultipartModelSelector.mapping +++ b/mappings/net/minecraft/client/render/model/json/AndMultipartModelSelector.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_812 net/minecraft/client/render/model/json/AndMultipartModelSelector + FIELD field_32814 KEY Ljava/lang/String; FIELD field_4324 selectors Ljava/lang/Iterable; METHOD (Ljava/lang/Iterable;)V ARG 1 selectors diff --git a/mappings/net/minecraft/client/render/model/json/JsonUnbakedModel.mapping b/mappings/net/minecraft/client/render/model/json/JsonUnbakedModel.mapping index 45558a76e3..029b03ff51 100644 --- a/mappings/net/minecraft/client/render/model/json/JsonUnbakedModel.mapping +++ b/mappings/net/minecraft/client/render/model/json/JsonUnbakedModel.mapping @@ -1,5 +1,6 @@ CLASS net/minecraft/class_793 net/minecraft/client/render/model/json/JsonUnbakedModel FIELD field_21857 guiLight Lnet/minecraft/class_793$class_4751; + FIELD field_32792 PARTICLE_KEY Ljava/lang/String; FIELD field_4244 ambientOcclusion Z FIELD field_4245 elements Ljava/util/List; FIELD field_4247 parentId Lnet/minecraft/class_2960; @@ -77,9 +78,9 @@ CLASS net/minecraft/class_793 net/minecraft/client/render/model/json/JsonUnbaked METHOD method_3453 deserializeAmbientOcclusion (Lcom/google/gson/JsonObject;)Z ARG 1 json CLASS class_4751 GuiLight - FIELD field_21858 Lnet/minecraft/class_793$class_4751; + FIELD field_21858 ITEM Lnet/minecraft/class_793$class_4751; COMMENT The model will be shaded from the front, like a basic item - FIELD field_21859 Lnet/minecraft/class_793$class_4751; + FIELD field_21859 BLOCK Lnet/minecraft/class_793$class_4751; COMMENT The model will be shaded from the side, like a block. FIELD field_21860 name Ljava/lang/String; METHOD (Ljava/lang/String;ILjava/lang/String;)V diff --git a/mappings/net/minecraft/client/render/model/json/ModelVariantMap.mapping b/mappings/net/minecraft/client/render/model/json/ModelVariantMap.mapping index f4b33ad4c1..8cf52faedf 100644 --- a/mappings/net/minecraft/client/render/model/json/ModelVariantMap.mapping +++ b/mappings/net/minecraft/client/render/model/json/ModelVariantMap.mapping @@ -14,6 +14,7 @@ CLASS net/minecraft/class_790 net/minecraft/client/render/model/json/ModelVarian METHOD method_3424 deserialize (Lnet/minecraft/class_790$class_791;Ljava/io/Reader;)Lnet/minecraft/class_790; ARG 0 context ARG 1 reader + METHOD method_35791 getAllModels ()Ljava/util/Set; CLASS class_791 DeserializationContext FIELD field_4242 stateFactory Lnet/minecraft/class_2689; FIELD field_4243 gson Lcom/google/gson/Gson; diff --git a/mappings/net/minecraft/client/render/model/json/OrMultipartModelSelector.mapping b/mappings/net/minecraft/client/render/model/json/OrMultipartModelSelector.mapping index 27b0cc4628..a1bbe42b39 100644 --- a/mappings/net/minecraft/client/render/model/json/OrMultipartModelSelector.mapping +++ b/mappings/net/minecraft/client/render/model/json/OrMultipartModelSelector.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_821 net/minecraft/client/render/model/json/OrMultipartModelSelector + FIELD field_32815 KEY Ljava/lang/String; FIELD field_4337 selectors Ljava/lang/Iterable; METHOD (Ljava/lang/Iterable;)V ARG 1 selectors diff --git a/mappings/net/minecraft/client/resource/Format4ResourcePack.mapping b/mappings/net/minecraft/client/resource/Format4ResourcePack.mapping index db83407032..4f9d0e3492 100644 --- a/mappings/net/minecraft/client/resource/Format4ResourcePack.mapping +++ b/mappings/net/minecraft/client/resource/Format4ResourcePack.mapping @@ -7,6 +7,7 @@ CLASS net/minecraft/class_4729 net/minecraft/client/resource/Format4ResourcePack FIELD field_21764 SHIELD_PATTERN_TEXTURES Ljava/util/Set; FIELD field_21765 BANNER_PATTERN_TEXTURES Ljava/util/Set; FIELD field_21766 parent Lnet/minecraft/class_3262; + FIELD field_32969 IRON_GOLEM_TEXTURE_PATH Ljava/lang/String; METHOD (Lnet/minecraft/class_3262;)V ARG 1 parent METHOD method_24132 loadBytes (Lnet/minecraft/class_1011;Lnet/minecraft/class_1011;IIIIIIIZZ)V diff --git a/mappings/net/minecraft/client/resource/GrassColormapResourceSupplier.mapping b/mappings/net/minecraft/client/resource/GrassColormapResourceSupplier.mapping index 856f60a222..5611ed3496 100644 --- a/mappings/net/minecraft/client/resource/GrassColormapResourceSupplier.mapping +++ b/mappings/net/minecraft/client/resource/GrassColormapResourceSupplier.mapping @@ -1,2 +1,4 @@ CLASS net/minecraft/class_1069 net/minecraft/client/resource/GrassColormapResourceSupplier FIELD field_5302 GRASS_COLORMAP_LOC Lnet/minecraft/class_2960; + METHOD method_18662 tryLoad (Lnet/minecraft/class_3300;Lnet/minecraft/class_3695;)[I + ARG 1 resourceManager diff --git a/mappings/net/minecraft/client/resource/ResourceIndex.mapping b/mappings/net/minecraft/client/resource/ResourceIndex.mapping index fb0d2dfc5d..de1589bc15 100644 --- a/mappings/net/minecraft/client/resource/ResourceIndex.mapping +++ b/mappings/net/minecraft/client/resource/ResourceIndex.mapping @@ -1,5 +1,6 @@ CLASS net/minecraft/class_1064 net/minecraft/client/resource/ResourceIndex - FIELD field_5289 index Ljava/util/Map; + FIELD field_21556 namespacedIndex Ljava/util/Map; + FIELD field_5289 rootIndex Ljava/util/Map; FIELD field_5290 LOGGER Lorg/apache/logging/log4j/Logger; METHOD (Ljava/io/File;Ljava/lang/String;)V ARG 1 directory diff --git a/mappings/net/minecraft/client/resource/language/LanguageManager.mapping b/mappings/net/minecraft/client/resource/language/LanguageManager.mapping index cbd0c80f93..58a22e24d9 100644 --- a/mappings/net/minecraft/client/resource/language/LanguageManager.mapping +++ b/mappings/net/minecraft/client/resource/language/LanguageManager.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_1076 net/minecraft/client/resource/language/LanguageManager FIELD field_25291 ENGLISH_US Lnet/minecraft/class_1077; FIELD field_25292 language Lnet/minecraft/class_1077; + FIELD field_32971 DEFAULT_LANGUAGE_CODE Ljava/lang/String; FIELD field_5323 currentLanguageCode Ljava/lang/String; FIELD field_5324 languageDefs Ljava/util/Map; FIELD field_5325 LOGGER Lorg/apache/logging/log4j/Logger; diff --git a/mappings/net/minecraft/client/resource/language/TextReorderingProcessor.mapping b/mappings/net/minecraft/client/resource/language/TextReorderingProcessor.mapping index 94a632034a..cd73e7c50b 100644 --- a/mappings/net/minecraft/client/resource/language/TextReorderingProcessor.mapping +++ b/mappings/net/minecraft/client/resource/language/TextReorderingProcessor.mapping @@ -21,3 +21,5 @@ CLASS net/minecraft/class_5492 net/minecraft/client/resource/language/TextReorde METHOD method_30943 create (Lnet/minecraft/class_5348;Lit/unimi/dsi/fastutil/ints/Int2IntFunction;Ljava/util/function/UnaryOperator;)Lnet/minecraft/class_5492; ARG 0 visitable ARG 1 reverser + METHOD method_36144 create (Lnet/minecraft/class_5348;)Lnet/minecraft/class_5492; + ARG 0 visitable diff --git a/mappings/net/minecraft/client/resource/metadata/AnimationResourceMetadata.mapping b/mappings/net/minecraft/client/resource/metadata/AnimationResourceMetadata.mapping index 1ff9b4f618..03131a9c43 100644 --- a/mappings/net/minecraft/client/resource/metadata/AnimationResourceMetadata.mapping +++ b/mappings/net/minecraft/client/resource/metadata/AnimationResourceMetadata.mapping @@ -1,5 +1,6 @@ CLASS net/minecraft/class_1079 net/minecraft/client/resource/metadata/AnimationResourceMetadata FIELD field_21768 EMPTY Lnet/minecraft/class_1079; + FIELD field_32974 KEY Ljava/lang/String; FIELD field_5334 defaultFrameTime I FIELD field_5335 interpolate Z FIELD field_5336 height I diff --git a/mappings/net/minecraft/client/sound/MinecartInsideSoundInstance.mapping b/mappings/net/minecraft/client/sound/MinecartInsideSoundInstance.mapping index c92e360ef1..899445db31 100644 --- a/mappings/net/minecraft/client/sound/MinecartInsideSoundInstance.mapping +++ b/mappings/net/minecraft/client/sound/MinecartInsideSoundInstance.mapping @@ -1,7 +1,9 @@ CLASS net/minecraft/class_1107 net/minecraft/client/sound/MinecartInsideSoundInstance COMMENT A sound instance played when a player is riding a minecart. + FIELD field_27773 underwater Z FIELD field_5456 minecart Lnet/minecraft/class_1688; FIELD field_5457 player Lnet/minecraft/class_1657; METHOD (Lnet/minecraft/class_1657;Lnet/minecraft/class_1688;Z)V ARG 1 player ARG 2 minecart + ARG 3 underwater diff --git a/mappings/net/minecraft/client/sound/SoundManager.mapping b/mappings/net/minecraft/client/sound/SoundManager.mapping index d5d97196c6..b04316f20e 100644 --- a/mappings/net/minecraft/client/sound/SoundManager.mapping +++ b/mappings/net/minecraft/client/sound/SoundManager.mapping @@ -1,10 +1,14 @@ CLASS net/minecraft/class_1144 net/minecraft/client/sound/SoundManager + FIELD field_33026 SOUNDS_JSON Ljava/lang/String; FIELD field_5588 sounds Ljava/util/Map; FIELD field_5590 soundSystem Lnet/minecraft/class_1140; FIELD field_5591 TYPE Lcom/google/gson/reflect/TypeToken; FIELD field_5592 MISSING_SOUND Lnet/minecraft/class_1111; FIELD field_5593 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_5594 GSON Lcom/google/gson/Gson; + METHOD (Lnet/minecraft/class_3300;Lnet/minecraft/class_315;)V + ARG 1 resourceManager + ARG 2 gameOptions METHOD method_18670 tick (Z)V METHOD method_20305 getDebugString ()Ljava/lang/String; METHOD method_22140 playNextTick (Lnet/minecraft/class_1117;)V @@ -14,12 +18,15 @@ CLASS net/minecraft/class_1144 net/minecraft/client/sound/SoundManager ARG 1 category ARG 2 volume METHOD method_4866 unregisterListener (Lnet/minecraft/class_1145;)V + ARG 1 listener METHOD method_4868 isSoundResourcePresent (Lnet/minecraft/class_1111;Lnet/minecraft/class_2960;Lnet/minecraft/class_3300;)Z ARG 0 sound ARG 1 id + ARG 2 resourceManager METHOD method_4869 get (Lnet/minecraft/class_2960;)Lnet/minecraft/class_1146; ARG 1 id METHOD method_4870 stop (Lnet/minecraft/class_1113;)V + ARG 1 sound METHOD method_4872 play (Lnet/minecraft/class_1113;I)V ARG 1 sound ARG 2 delay @@ -31,7 +38,9 @@ CLASS net/minecraft/class_1144 net/minecraft/client/sound/SoundManager METHOD method_4876 updateListenerPosition (Lnet/minecraft/class_4184;)V ARG 1 camera METHOD method_4877 isPlaying (Lnet/minecraft/class_1113;)Z + ARG 1 sound METHOD method_4878 registerListener (Lnet/minecraft/class_1145;)V + ARG 1 listener METHOD method_4879 pauseAll ()V METHOD method_4880 resumeAll ()V METHOD method_4881 stopAll ()V diff --git a/mappings/net/minecraft/client/sound/SoundSystem.mapping b/mappings/net/minecraft/client/sound/SoundSystem.mapping index 8e6eadc0dc..0f38289e67 100644 --- a/mappings/net/minecraft/client/sound/SoundSystem.mapping +++ b/mappings/net/minecraft/client/sound/SoundSystem.mapping @@ -22,7 +22,9 @@ CLASS net/minecraft/class_1140 net/minecraft/client/sound/SoundSystem METHOD (Lnet/minecraft/class_1144;Lnet/minecraft/class_315;Lnet/minecraft/class_3300;)V ARG 1 loader ARG 2 settings + ARG 3 resourceManager METHOD method_19753 stop (Lnet/minecraft/class_1113;)V + ARG 1 sound METHOD method_19761 pauseAll ()V METHOD method_19762 resumeAll ()V METHOD method_20185 tick (Z)V @@ -30,26 +32,40 @@ CLASS net/minecraft/class_1140 net/minecraft/client/sound/SoundSystem METHOD method_22139 playNextTick (Lnet/minecraft/class_1117;)V ARG 1 sound METHOD method_24878 canRepeatInstantly (Lnet/minecraft/class_1113;)Z + ARG 0 sound METHOD method_24879 isRepeatDelayed (Lnet/minecraft/class_1113;)Z + ARG 0 sound METHOD method_24880 shouldRepeatInstantly (Lnet/minecraft/class_1113;)Z + ARG 0 sound METHOD method_4835 isPlaying (Lnet/minecraft/class_1113;)Z + ARG 1 sound METHOD method_4837 reloadSounds ()V METHOD method_4838 stopSounds (Lnet/minecraft/class_2960;Lnet/minecraft/class_3419;)V + ARG 1 id + ARG 2 category METHOD method_4840 updateListenerPosition (Lnet/minecraft/class_4184;)V + ARG 1 camera METHOD method_4843 stopAll ()V METHOD method_4844 updateSoundVolume (Lnet/minecraft/class_3419;F)V + ARG 1 category ARG 2 volume METHOD method_4846 start ()V METHOD method_4847 unregisterListener (Lnet/minecraft/class_1145;)V + ARG 1 listener METHOD method_4849 getAdjustedPitch (Lnet/minecraft/class_1113;)F + ARG 1 sound METHOD method_4850 getSoundVolume (Lnet/minecraft/class_3419;)F + ARG 1 category METHOD method_4851 addPreloadedSound (Lnet/minecraft/class_1111;)V ARG 1 sound METHOD method_4852 play (Lnet/minecraft/class_1113;I)V ARG 1 sound ARG 2 delay METHOD method_4853 getAdjustedVolume (Lnet/minecraft/class_1113;)F + ARG 1 sound METHOD method_4854 play (Lnet/minecraft/class_1113;)V + ARG 1 sound METHOD method_4855 registerListener (Lnet/minecraft/class_1145;)V + ARG 1 listener METHOD method_4856 stop ()V METHOD method_4857 tick ()V diff --git a/mappings/net/minecraft/client/sound/WeightedSoundSet.mapping b/mappings/net/minecraft/client/sound/WeightedSoundSet.mapping index 5af53da8db..36cb7b97d6 100644 --- a/mappings/net/minecraft/client/sound/WeightedSoundSet.mapping +++ b/mappings/net/minecraft/client/sound/WeightedSoundSet.mapping @@ -6,5 +6,6 @@ CLASS net/minecraft/class_1146 net/minecraft/client/sound/WeightedSoundSet METHOD (Lnet/minecraft/class_2960;Ljava/lang/String;)V ARG 1 id ARG 2 subtitle + METHOD method_35812 getId ()Lnet/minecraft/class_2960; METHOD method_4885 add (Lnet/minecraft/class_1148;)V METHOD method_4886 getSubtitle ()Lnet/minecraft/class_2561; diff --git a/mappings/net/minecraft/client/texture/NativeImage.mapping b/mappings/net/minecraft/client/texture/NativeImage.mapping index 0fbff5e638..a76e0baa74 100644 --- a/mappings/net/minecraft/client/texture/NativeImage.mapping +++ b/mappings/net/minecraft/client/texture/NativeImage.mapping @@ -181,6 +181,20 @@ CLASS net/minecraft/class_1011 net/minecraft/client/texture/NativeImage ARG 13 luminanceOffset ARG 14 alphaOffset ARG 15 writeable + METHOD method_35628 hasRed ()Z + METHOD method_35629 hasGreen ()Z + METHOD method_35630 hasBlue ()Z + METHOD method_35631 hasLuminance ()Z + METHOD method_35632 getRedOffset ()I + METHOD method_35633 getGreenOffset ()I + METHOD method_35634 getBlueOffset ()I + METHOD method_35635 getLuminanceChannelOffset ()I + METHOD method_35636 hasRedChannel ()Z + METHOD method_35637 hasGreenChannel ()Z + METHOD method_35638 hasBlueChannel ()Z + METHOD method_35639 getRedOrLuminanceOffset ()I + METHOD method_35640 getGreenOrLuminanceOffset ()I + METHOD method_35641 getBlueOrLuminanceOffset ()I METHOD method_4329 hasAlphaChannel ()Z METHOD method_4330 getOpacityOffset ()I METHOD method_4332 getAlphaChannelOffset ()I diff --git a/mappings/net/minecraft/client/texture/NativeImageBackedTexture.mapping b/mappings/net/minecraft/client/texture/NativeImageBackedTexture.mapping index 020a37dada..ac483982ad 100644 --- a/mappings/net/minecraft/client/texture/NativeImageBackedTexture.mapping +++ b/mappings/net/minecraft/client/texture/NativeImageBackedTexture.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_1043 net/minecraft/client/texture/NativeImageBackedTexture + FIELD field_25794 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_5200 image Lnet/minecraft/class_1011; METHOD (IIZ)V ARG 1 width diff --git a/mappings/net/minecraft/client/texture/PlayerSkinProvider.mapping b/mappings/net/minecraft/client/texture/PlayerSkinProvider.mapping index e6d6c15c33..ddfb266e94 100644 --- a/mappings/net/minecraft/client/texture/PlayerSkinProvider.mapping +++ b/mappings/net/minecraft/client/texture/PlayerSkinProvider.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_1071 net/minecraft/client/texture/PlayerSkinProvider + FIELD field_32970 TEXTURES Ljava/lang/String; FIELD field_5304 textureManager Lnet/minecraft/class_1060; FIELD field_5305 skinCacheDir Ljava/io/File; FIELD field_5306 skinCache Lcom/google/common/cache/LoadingCache; diff --git a/mappings/net/minecraft/client/texture/Sprite.mapping b/mappings/net/minecraft/client/texture/Sprite.mapping index 46a7d933a9..615b2c7c86 100644 --- a/mappings/net/minecraft/client/texture/Sprite.mapping +++ b/mappings/net/minecraft/client/texture/Sprite.mapping @@ -13,6 +13,7 @@ CLASS net/minecraft/class_1058 net/minecraft/client/texture/Sprite FIELD field_5269 uMax F FIELD field_5270 uMin F METHOD (Lnet/minecraft/class_1059;Lnet/minecraft/class_1058$class_4727;IIIIILnet/minecraft/class_1011;)V + ARG 1 atlas ARG 3 maxLevel ARG 4 atlasWidth ARG 5 atlasHeight @@ -22,13 +23,17 @@ CLASS net/minecraft/class_1058 net/minecraft/client/texture/Sprite METHOD method_23842 getAnimationFrameDelta ()F METHOD method_24108 getTextureSpecificVertexConsumer (Lnet/minecraft/class_4588;)Lnet/minecraft/class_4588; METHOD method_24119 getAtlas ()Lnet/minecraft/class_1059; - METHOD method_33437 (Lnet/minecraft/class_1058$class_4727;III)Lnet/minecraft/class_1058$class_5790; + METHOD method_33437 createAnimation (Lnet/minecraft/class_1058$class_4727;III)Lnet/minecraft/class_1058$class_5790; ARG 2 nativeImageWidth ARG 3 nativeImageHeight ARG 4 maxLevel METHOD method_33440 (Ljava/util/List;II)V ARG 1 index ARG 2 time + METHOD method_33442 getDistinctFrameCount ()Ljava/util/stream/IntStream; + METHOD method_33443 getAnimation ()Lnet/minecraft/class_1061; + METHOD method_35806 getX ()I + METHOD method_35807 getY ()I METHOD method_4570 getFrameV (D)F ARG 1 frame METHOD method_4575 getMaxV ()F @@ -71,6 +76,7 @@ CLASS net/minecraft/class_1058 net/minecraft/client/texture/Sprite COMMENT Linearly interpolate between the current and next frame on all mip levels COMMENT based on the tick position within the current frame, COMMENT and upload the results to the currently bound texture to the frame slot at position (0,0). + ARG 1 animation METHOD method_24129 lerp (DII)I COMMENT Purely mathematical single-value linear interpolation. COMMENT {@code lerp(0, a, b) == b}, {@code lerp(1, a, b) == a}. @@ -79,7 +85,11 @@ CLASS net/minecraft/class_1058 net/minecraft/client/texture/Sprite ARG 4 from METHOD method_24130 getPixelColor (Lnet/minecraft/class_1058$class_5790;IIII)I COMMENT Returns the pixel color at frame {@code frameIndex} within mipmap {@code layer} at sprite relative coordinates. + ARG 1 animation ARG 2 frameIndex + ARG 3 layer + ARG 4 x + ARG 5 y CLASS class_5790 Animation FIELD field_28470 frameIndex I FIELD field_28471 frameTicks I @@ -89,9 +99,11 @@ CLASS net/minecraft/class_1058 net/minecraft/client/texture/Sprite METHOD (Lnet/minecraft/class_1058;Ljava/util/List;ILnet/minecraft/class_1058$class_4728;)V ARG 2 frames ARG 3 frameCount + ARG 4 interpolation METHOD method_33445 upload ()V METHOD method_33446 getFrameX (I)I ARG 1 frame + METHOD method_33450 getDistinctFrameCount ()Ljava/util/stream/IntStream; METHOD method_33451 getFrameY (I)I ARG 1 frame METHOD method_33455 upload (I)V diff --git a/mappings/net/minecraft/client/texture/SpriteAtlasTexture.mapping b/mappings/net/minecraft/client/texture/SpriteAtlasTexture.mapping index 05278169d8..9cd42939e0 100644 --- a/mappings/net/minecraft/client/texture/SpriteAtlasTexture.mapping +++ b/mappings/net/minecraft/client/texture/SpriteAtlasTexture.mapping @@ -2,6 +2,7 @@ CLASS net/minecraft/class_1059 net/minecraft/client/texture/SpriteAtlasTexture FIELD field_17898 PARTICLE_ATLAS_TEXTURE Lnet/minecraft/class_2960; FIELD field_17899 maxTextureSize I FIELD field_21749 id Lnet/minecraft/class_2960; + FIELD field_32957 PNG_EXTENSION Ljava/lang/String; FIELD field_5275 BLOCK_ATLAS_TEXTURE Lnet/minecraft/class_2960; FIELD field_5276 animatedSprites Ljava/util/List; FIELD field_5277 spritesToLoad Ljava/util/Set; diff --git a/mappings/net/minecraft/client/texture/TextureManager.mapping b/mappings/net/minecraft/client/texture/TextureManager.mapping index 2fa47554db..1548127fe2 100644 --- a/mappings/net/minecraft/client/texture/TextureManager.mapping +++ b/mappings/net/minecraft/client/texture/TextureManager.mapping @@ -20,6 +20,9 @@ CLASS net/minecraft/class_1060 net/minecraft/client/texture/TextureManager METHOD method_30299 closeTexture (Lnet/minecraft/class_2960;Lnet/minecraft/class_1044;)V ARG 1 id ARG 2 texture + METHOD method_34590 getOrDefault (Lnet/minecraft/class_2960;Lnet/minecraft/class_1044;)Lnet/minecraft/class_1044; + ARG 1 id + ARG 2 fallback METHOD method_4615 destroyTexture (Lnet/minecraft/class_2960;)V ARG 1 id METHOD method_4616 registerTexture (Lnet/minecraft/class_2960;Lnet/minecraft/class_1044;)V diff --git a/mappings/net/minecraft/client/util/DefaultSkinHelper.mapping b/mappings/net/minecraft/client/util/DefaultSkinHelper.mapping index 3578334daa..56cf6a28af 100644 --- a/mappings/net/minecraft/client/util/DefaultSkinHelper.mapping +++ b/mappings/net/minecraft/client/util/DefaultSkinHelper.mapping @@ -1,4 +1,6 @@ CLASS net/minecraft/class_1068 net/minecraft/client/util/DefaultSkinHelper + FIELD field_32964 DEFAULT Ljava/lang/String; + FIELD field_32965 SLIM Ljava/lang/String; FIELD field_5300 ALEX_SKIN Lnet/minecraft/class_2960; FIELD field_5301 STEVE_SKIN Lnet/minecraft/class_2960; METHOD method_4647 getModel (Ljava/util/UUID;)Ljava/lang/String; diff --git a/mappings/net/minecraft/client/util/SelectionManager.mapping b/mappings/net/minecraft/client/util/SelectionManager.mapping index c2aebccb9c..d49c3c27cd 100644 --- a/mappings/net/minecraft/client/util/SelectionManager.mapping +++ b/mappings/net/minecraft/client/util/SelectionManager.mapping @@ -66,3 +66,12 @@ CLASS net/minecraft/class_3728 net/minecraft/client/util/SelectionManager METHOD method_27567 clampCursorPosition (I)I ARG 1 pos METHOD method_27568 isSelecting ()Z + METHOD method_35727 moveCursor (I)V + ARG 1 offset + METHOD method_35728 moveCursorPastWord (I)V + ARG 1 offset + METHOD method_35729 moveCursorToStart ()V + METHOD method_35730 moveCursorTo (I)V + ARG 1 position + METHOD method_35731 setSelectionEnd (I)V + ARG 1 pos diff --git a/mappings/net/minecraft/client/util/Session.mapping b/mappings/net/minecraft/client/util/Session.mapping index f5ba89d7f5..a3b96100c4 100644 --- a/mappings/net/minecraft/client/util/Session.mapping +++ b/mappings/net/minecraft/client/util/Session.mapping @@ -13,6 +13,7 @@ CLASS net/minecraft/class_320 net/minecraft/client/util/Session METHOD method_1675 getSessionId ()Ljava/lang/String; METHOD method_1676 getUsername ()Ljava/lang/String; METHOD method_1677 getProfile ()Lcom/mojang/authlib/GameProfile; + METHOD method_35718 getAccountType ()Lnet/minecraft/class_320$class_321; CLASS class_321 AccountType FIELD field_1986 name Ljava/lang/String; FIELD field_1989 BY_NAME Ljava/util/Map; diff --git a/mappings/net/minecraft/client/util/SpriteIdentifier.mapping b/mappings/net/minecraft/client/util/SpriteIdentifier.mapping index b191e72ee6..4453726567 100644 --- a/mappings/net/minecraft/client/util/SpriteIdentifier.mapping +++ b/mappings/net/minecraft/client/util/SpriteIdentifier.mapping @@ -13,3 +13,6 @@ CLASS net/minecraft/class_4730 net/minecraft/client/util/SpriteIdentifier ARG 1 layerFactory METHOD method_24147 getTextureId ()Lnet/minecraft/class_2960; METHOD method_24148 getSprite ()Lnet/minecraft/class_1058; + METHOD method_30001 getVertexConsumer (Lnet/minecraft/class_4597;Ljava/util/function/Function;Z)Lnet/minecraft/class_4588; + ARG 1 vertexConsumers + ARG 2 layerFactory diff --git a/mappings/net/minecraft/client/util/TextCollector.mapping b/mappings/net/minecraft/client/util/TextCollector.mapping index ace45b04ae..6ddab79ba3 100644 --- a/mappings/net/minecraft/client/util/TextCollector.mapping +++ b/mappings/net/minecraft/client/util/TextCollector.mapping @@ -1,4 +1,7 @@ CLASS net/minecraft/class_5222 net/minecraft/client/util/TextCollector + FIELD field_25260 texts Ljava/util/List; METHOD method_27461 getRawCombined ()Lnet/minecraft/class_5348; METHOD method_27462 add (Lnet/minecraft/class_5348;)V + ARG 1 text METHOD method_27463 getCombined ()Lnet/minecraft/class_5348; + METHOD method_35690 clear ()V diff --git a/mappings/net/minecraft/client/util/Window.mapping b/mappings/net/minecraft/client/util/Window.mapping index 981f24ac06..75e0722f33 100644 --- a/mappings/net/minecraft/client/util/Window.mapping +++ b/mappings/net/minecraft/client/util/Window.mapping @@ -46,6 +46,10 @@ CLASS net/minecraft/class_1041 net/minecraft/client/util/Window METHOD method_30132 onCursorEnterChanged (JZ)V ARG 1 window ARG 3 entered + METHOD method_35642 setFramebufferWidth (I)V + ARG 1 framebufferWidth + METHOD method_35643 setFramebufferHeight (I)V + ARG 1 framebufferHeight METHOD method_4474 setPhase (Ljava/lang/String;)V ARG 1 phase METHOD method_4475 applyVideoMode ()V diff --git a/mappings/net/minecraft/client/util/math/Vector3d.mapping b/mappings/net/minecraft/client/util/math/Vector3d.mapping index 5fac209724..f22bf673ee 100644 --- a/mappings/net/minecraft/client/util/math/Vector3d.mapping +++ b/mappings/net/minecraft/client/util/math/Vector3d.mapping @@ -6,3 +6,13 @@ CLASS net/minecraft/class_1161 net/minecraft/client/util/math/Vector3d ARG 1 x ARG 3 y ARG 5 z + METHOD method_35873 multiply (D)V + ARG 1 amount + METHOD method_35874 set (DDD)V + ARG 1 x + ARG 3 y + ARG 5 z + METHOD method_35875 copy (Lnet/minecraft/class_1161;)V + ARG 1 vector3d + METHOD method_35876 add (Lnet/minecraft/class_1161;)V + ARG 1 vector3d diff --git a/mappings/net/minecraft/server/BanEntry.mapping b/mappings/net/minecraft/server/BanEntry.mapping index 387c444efa..8c19702a2e 100644 --- a/mappings/net/minecraft/server/BanEntry.mapping +++ b/mappings/net/minecraft/server/BanEntry.mapping @@ -4,6 +4,7 @@ CLASS net/minecraft/class_3309 net/minecraft/server/BanEntry FIELD field_14306 creationDate Ljava/util/Date; FIELD field_14307 reason Ljava/lang/String; FIELD field_14308 DATE_FORMAT Ljava/text/SimpleDateFormat; + FIELD field_29787 FOREVER Ljava/lang/String; METHOD (Ljava/lang/Object;Lcom/google/gson/JsonObject;)V ARG 1 key ARG 2 json @@ -17,3 +18,4 @@ CLASS net/minecraft/class_3309 net/minecraft/server/BanEntry METHOD method_14502 getExpiryDate ()Ljava/util/Date; METHOD method_14503 getReason ()Ljava/lang/String; METHOD method_14504 toText ()Lnet/minecraft/class_2561; + METHOD method_34885 getCreationDate ()Ljava/util/Date; diff --git a/mappings/net/minecraft/server/MinecraftServer.mapping b/mappings/net/minecraft/server/MinecraftServer.mapping index 392f914552..1687421162 100644 --- a/mappings/net/minecraft/server/MinecraftServer.mapping +++ b/mappings/net/minecraft/server/MinecraftServer.mapping @@ -167,6 +167,8 @@ CLASS net/minecraft/server/MinecraftServer METHOD method_32699 getItemModifierManager ()Lnet/minecraft/class_5640; METHOD method_32816 getPlayerInteractionManager (Lnet/minecraft/class_3222;)Lnet/minecraft/class_3225; ARG 1 player + METHOD method_34864 getResourceManager ()Lnet/minecraft/class_3300; + METHOD method_36113 getProxy ()Ljava/net/Proxy; METHOD method_3716 getKeyPair ()Ljava/security/KeyPair; METHOD method_3718 isFlightEnabled ()Z METHOD method_3719 getGameProfileRepo ()Lcom/mojang/authlib/GameProfileRepository; diff --git a/mappings/net/minecraft/server/command/CloneCommand.mapping b/mappings/net/minecraft/server/command/CloneCommand.mapping index 8f4afc7ba6..db8f1c6e0b 100644 --- a/mappings/net/minecraft/server/command/CloneCommand.mapping +++ b/mappings/net/minecraft/server/command/CloneCommand.mapping @@ -3,6 +3,7 @@ CLASS net/minecraft/class_3023 net/minecraft/server/command/CloneCommand FIELD field_13491 TOO_BIG_EXCEPTION Lcom/mojang/brigadier/exceptions/Dynamic2CommandExceptionType; FIELD field_13492 FAILED_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; FIELD field_13493 OVERLAP_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; + FIELD field_33386 MAX_BLOCKS I METHOD method_13086 (Lcom/mojang/brigadier/context/CommandContext;)I ARG 0 context METHOD method_13087 (Lcom/mojang/brigadier/context/CommandContext;)I diff --git a/mappings/net/minecraft/util/snooper/SnooperListener.mapping b/mappings/net/minecraft/util/snooper/SnooperListener.mapping index aef1a3dcdd..dd74938a7a 100644 --- a/mappings/net/minecraft/util/snooper/SnooperListener.mapping +++ b/mappings/net/minecraft/util/snooper/SnooperListener.mapping @@ -1,3 +1,5 @@ CLASS net/minecraft/class_1279 net/minecraft/util/snooper/SnooperListener + METHOD method_35034 addInitialSnooperInfo (Lnet/minecraft/class_1276;)V + ARG 1 snooper METHOD method_5495 addSnooperInfo (Lnet/minecraft/class_1276;)V ARG 1 snooper