More client mappings

FabricMC · Nov 10, 2024 · 6e811df · 6e811df
1 parent cb4bbbd
commit 6e811df
Show file tree

Hide file tree

Showing 18 changed files with 70 additions and 5 deletions.
diff --git a/mappings/net/minecraft/client/MinecraftClient.mapping b/mappings/net/minecraft/client/MinecraftClient.mapping
@@ -366,7 +366,7 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient
 	METHOD method_31382 createUserApiService (Lcom/mojang/authlib/yggdrasil/YggdrasilAuthenticationService;Lnet/minecraft/class_542;)Lcom/mojang/authlib/minecraft/UserApiService;
 		ARG 1 authService
 		ARG 2 runArgs
-	METHOD method_31974 getEntityModelLoader ()Lnet/minecraft/class_5599;
+	METHOD method_31974 getLoadedEntityModels ()Lnet/minecraft/class_5599;
 	METHOD method_31975 getBlockEntityRenderDispatcher ()Lnet/minecraft/class_824;
 	METHOD method_33883 shouldFilterText ()Z
 	METHOD method_33884 getChatRestriction ()Lnet/minecraft/class_310$class_5859;

diff --git a/mappings/net/minecraft/client/gui/Element.mapping b/mappings/net/minecraft/client/gui/Element.mapping
@@ -141,3 +141,5 @@ CLASS net/minecraft/class_364 net/minecraft/client/gui/Element
 	METHOD method_48205 getNavigationPath (Lnet/minecraft/class_8023;)Lnet/minecraft/class_8016;
 		ARG 1 navigation
 	METHOD method_48218 getFocusedPath ()Lnet/minecraft/class_8016;
+	METHOD method_65515 getBorder (Lnet/minecraft/class_8028;)Lnet/minecraft/class_8030;
+		ARG 1 direction
diff --git a/mappings/net/minecraft/client/gui/ParentElement.mapping b/mappings/net/minecraft/client/gui/ParentElement.mapping
@@ -34,3 +34,5 @@ CLASS net/minecraft/class_4069 net/minecraft/client/gui/ParentElement
 		ARG 2 direction
 		ARG 3 focused
 		ARG 4 navigation
+	METHOD method_48609 (Lnet/minecraft/class_364;)I
+		ARG 0 child
diff --git a/mappings/net/minecraft/client/gui/Selectable.mapping b/mappings/net/minecraft/client/gui/Selectable.mapping
@@ -1,5 +1,6 @@
 CLASS net/minecraft/class_6379 net/minecraft/client/gui/Selectable
 	METHOD method_37018 getType ()Lnet/minecraft/class_6379$class_6380;
 	METHOD method_37303 isNarratable ()Z
+	METHOD method_65516 getNarratedParts ()Ljava/util/Collection;
 	CLASS class_6380 SelectionType
 		METHOD method_37028 isFocused ()Z
diff --git a/mappings/net/minecraft/client/gui/screen/GameModeSelectionScreen.mapping b/mappings/net/minecraft/client/gui/screen/GameModeSelectionScreen.mapping
@@ -41,6 +41,10 @@ CLASS net/minecraft/class_5289 net/minecraft/client/gui/screen/GameModeSelection
 	CLASS class_5291 ButtonWidget
 		FIELD field_24586 gameMode Lnet/minecraft/class_5289$class_5290;
 		FIELD field_24587 selected Z
+		METHOD <init> (Lnet/minecraft/class_5289$class_5290;II)V
+			ARG 1 gameMode
+			ARG 2 x
+			ARG 3 y
 		METHOD method_28080 drawBackground (Lnet/minecraft/class_332;)V
 			ARG 1 context
 		METHOD method_28082 drawSelectionBox (Lnet/minecraft/class_332;)V

diff --git a/mappings/net/minecraft/client/gui/screen/Screen.mapping b/mappings/net/minecraft/client/gui/screen/Screen.mapping
@@ -193,6 +193,8 @@ CLASS net/minecraft/class_437 net/minecraft/client/gui/screen/Screen
 	METHOD method_64507 shouldHideStatusEffectHud ()Z
 	METHOD method_65027 addCrashReportSection (Lnet/minecraft/class_128;)V
 		ARG 1 report
+	METHOD method_65517 (Lnet/minecraft/class_6379;)Ljava/util/stream/Stream;
+		ARG 0 selectable
 	CLASS class_6390 SelectedElementNarrationData
 		FIELD field_33825 selectable Lnet/minecraft/class_6379;
 		FIELD field_33826 index I

diff --git a/mappings/net/minecraft/client/gui/screen/StatsScreen.mapping b/mappings/net/minecraft/client/gui/screen/StatsScreen.mapping
@@ -64,6 +64,11 @@ CLASS net/minecraft/class_447 net/minecraft/client/gui/screen/StatsScreen
 			ARG 1 statType
 		METHOD method_19410 getStatType (I)Lnet/minecraft/class_3448;
 			ARG 1 headerColumn
+		METHOD method_57742 getIconX (I)I
+			ARG 1 index
+		METHOD method_65518 select (II)Z
+			ARG 1 mouseX
+			ARG 2 mouseY
 		CLASS class_4199 Entry
 			FIELD field_33830 item Lnet/minecraft/class_1792;
 			METHOD <init> (Lnet/minecraft/class_447$class_4200;Lnet/minecraft/class_1792;)V

diff --git a/mappings/net/minecraft/client/gui/screen/world/ExperimentsScreen.mapping b/mappings/net/minecraft/client/gui/screen/world/ExperimentsScreen.mapping
@@ -1,12 +1,14 @@
 CLASS net/minecraft/class_8134 net/minecraft/client/gui/screen/world/ExperimentsScreen
-	FIELD field_42503 INFO_WIDTH I
+	FIELD field_42503 EXPERIMENTS_LIST_WIDTH I
 	FIELD field_42504 experimentToggleList Lnet/minecraft/class_8132;
 	FIELD field_42505 parent Lnet/minecraft/class_437;
 	FIELD field_42506 resourcePackManager Lnet/minecraft/class_3283;
 	FIELD field_42507 applier Ljava/util/function/Consumer;
 	FIELD field_42508 experiments Lit/unimi/dsi/fastutil/objects/Object2BooleanMap;
 	FIELD field_49562 TITLE Lnet/minecraft/class_2561;
 	FIELD field_50043 INFO_TEXT Lnet/minecraft/class_2561;
+	FIELD field_55262 EXPERIMENTS_LIST_HEIGHT I
+	FIELD field_55263 experimentsList Lnet/minecraft/class_8134$class_10416;
 	METHOD <init> (Lnet/minecraft/class_437;Lnet/minecraft/class_3283;Ljava/util/function/Consumer;)V
 		ARG 1 parent
 		ARG 2 resourcePackManager
@@ -30,3 +32,12 @@ CLASS net/minecraft/class_8134 net/minecraft/client/gui/screen/world/Experiments
 	METHOD method_49024 applyAndClose ()V
 	METHOD method_52767 (Lnet/minecraft/class_7847;)V
 		ARG 0 positioner
+	CLASS class_10416 ExperimentsListWidget
+		FIELD field_55264 children Ljava/util/List;
+		FIELD field_55265 layout Lnet/minecraft/class_8133;
+		METHOD <init> (Lnet/minecraft/class_8134;Lnet/minecraft/class_8133;II)V
+			ARG 2 layout
+			ARG 3 width
+			ARG 4 height
+		METHOD method_65520 add (Lnet/minecraft/class_339;)V
+			ARG 1 child
diff --git a/mappings/net/minecraft/client/gui/screen/world/WorldScreenOptionGrid.mapping b/mappings/net/minecraft/client/gui/screen/world/WorldScreenOptionGrid.mapping
@@ -1,11 +1,14 @@
 CLASS net/minecraft/class_8096 net/minecraft/client/gui/screen/world/WorldScreenOptionGrid
 	FIELD field_42196 BUTTON_WIDTH I
 	FIELD field_42197 options Ljava/util/List;
+	FIELD field_55266 layout Lnet/minecraft/class_8133;
 	METHOD <init> (Ljava/util/List;Lnet/minecraft/class_8133;)V
 		ARG 1 options
+		ARG 2 layout
 	METHOD method_48683 refresh ()V
 	METHOD method_48684 builder (I)Lnet/minecraft/class_8096$class_8097;
 		ARG 0 width
+	METHOD method_65521 getLayout ()Lnet/minecraft/class_8133;
 	CLASS class_8097 Builder
 		FIELD field_42198 width I
 		FIELD field_42199 options Ljava/util/List;

diff --git a/mappings/net/minecraft/client/gui/widget/EntryListWidget.mapping b/mappings/net/minecraft/client/gui/widget/EntryListWidget.mapping
@@ -15,6 +15,13 @@ CLASS net/minecraft/class_350 net/minecraft/client/gui/widget/EntryListWidget
 		ARG 3 height
 		ARG 4 y
 		ARG 5 itemHeight
+	METHOD <init> (Lnet/minecraft/class_310;IIIII)V
+		ARG 1 client
+		ARG 2 width
+		ARG 3 height
+		ARG 4 y
+		ARG 5 itemHeight
+		ARG 6 headerHeight
 	METHOD method_25308 getEntryAtPosition (DD)Lnet/minecraft/class_350$class_351;
 		ARG 1 x
 		ARG 3 y

diff --git a/mappings/net/minecraft/client/gui/widget/ScrollableTextFieldWidget.mapping b/mappings/net/minecraft/client/gui/widget/ScrollableTextFieldWidget.mapping
@@ -11,6 +11,9 @@ CLASS net/minecraft/class_10415 net/minecraft/client/gui/widget/ScrollableTextFi
 		ARG 4 delta
 	METHOD method_44391 getContentsHeight ()I
 	METHOD method_65509 getTextMargin ()I
+	METHOD method_65510 isVisible (II)Z
+		ARG 1 textTop
+		ARG 2 textBottom
 	METHOD method_65511 draw (Lnet/minecraft/class_332;IIII)V
 		ARG 1 context
 		ARG 2 x

diff --git a/mappings/net/minecraft/client/gui/widget/ScrollableWidget.mapping b/mappings/net/minecraft/client/gui/widget/ScrollableWidget.mapping
@@ -20,5 +20,6 @@ CLASS net/minecraft/class_7528 net/minecraft/client/gui/widget/ScrollableWidget
 		ARG 1 mouseX
 		ARG 3 mouseY
 		ARG 5 button
+	METHOD method_65506 refreshScroll ()V
 	METHOD method_65507 getScrollbarX ()I
 	METHOD method_65508 getScrollbarThumbY ()I
diff --git a/mappings/net/minecraft/client/network/ClientPlayerEntity.mapping b/mappings/net/minecraft/client/network/ClientPlayerEntity.mapping
@@ -109,5 +109,6 @@ CLASS net/minecraft/class_746 net/minecraft/client/network/ClientPlayerEntity
 		ARG 1 fromPortalEffect
 	METHOD method_62165 sendSneakingPacket ()V
 	METHOD method_64376 getItemDropCooldown ()Lnet/minecraft/class_10222;
+	METHOD method_65525 isBlind ()Z
 	METHOD method_7290 dropSelectedItem (Z)Z
 		ARG 1 entireStack
diff --git a/mappings/net/minecraft/client/render/block/entity/BlockEntityRenderDispatcher.mapping b/mappings/net/minecraft/client/render/block/entity/BlockEntityRenderDispatcher.mapping
@@ -8,8 +8,14 @@ CLASS net/minecraft/class_824 net/minecraft/client/render/block/entity/BlockEnti
 	FIELD field_4345 renderers Ljava/util/Map;
 	FIELD field_4348 world Lnet/minecraft/class_1937;
 	FIELD field_4350 crosshairTarget Lnet/minecraft/class_239;
+	FIELD field_55283 itemModelManager Lnet/minecraft/class_10442;
 	METHOD <init> (Lnet/minecraft/class_327;Ljava/util/function/Supplier;Lnet/minecraft/class_776;Lnet/minecraft/class_10442;Lnet/minecraft/class_918;Lnet/minecraft/class_898;)V
 		ARG 1 textRenderer
+		ARG 2 entityModelLoader
+		ARG 3 blockRenderManager
+		ARG 4 itemModelManager
+		ARG 5 itemRenderer
+		ARG 6 entityRenderDispatcher
 	METHOD method_23079 render (Lnet/minecraft/class_827;Lnet/minecraft/class_2586;FLnet/minecraft/class_4587;Lnet/minecraft/class_4597;)V
 		ARG 0 renderer
 		ARG 1 blockEntity

diff --git a/mappings/net/minecraft/client/render/entity/EntityRenderDispatcher.mapping b/mappings/net/minecraft/client/render/entity/EntityRenderDispatcher.mapping
@@ -1,7 +1,7 @@
 CLASS net/minecraft/class_898 net/minecraft/client/render/entity/EntityRenderDispatcher
 	FIELD field_21009 SHADOW_LAYER Lnet/minecraft/class_1921;
 	FIELD field_21794 rotation Lorg/joml/Quaternionf;
-	FIELD field_27760 modelLoader Ljava/util/function/Supplier;
+	FIELD field_27760 entityModelLoader Ljava/util/function/Supplier;
 	FIELD field_38886 blockRenderManager Lnet/minecraft/class_776;
 	FIELD field_38887 heldItemRenderer Lnet/minecraft/class_759;
 	FIELD field_4678 targetedEntity Lnet/minecraft/class_1297;
@@ -15,9 +15,19 @@ CLASS net/minecraft/class_898 net/minecraft/client/render/entity/EntityRenderDis
 	FIELD field_4692 gameOptions Lnet/minecraft/class_315;
 	FIELD field_4696 renderers Ljava/util/Map;
 	FIELD field_53188 mapRenderer Lnet/minecraft/class_330;
+	FIELD field_55289 itemModelManager Lnet/minecraft/class_10442;
+	FIELD field_55290 equipmentModelLoader Lnet/minecraft/class_10201;
 	METHOD <init> (Lnet/minecraft/class_310;Lnet/minecraft/class_1060;Lnet/minecraft/class_10442;Lnet/minecraft/class_918;Lnet/minecraft/class_330;Lnet/minecraft/class_776;Lnet/minecraft/class_327;Lnet/minecraft/class_315;Ljava/util/function/Supplier;Lnet/minecraft/class_10201;)V
 		ARG 1 client
 		ARG 2 textureManager
+		ARG 3 itemModelManager
+		ARG 4 itemRenderer
+		ARG 5 mapRenderer
+		ARG 6 blockRenderManager
+		ARG 7 textRenderer
+		ARG 8 gameOptions
+		ARG 9 entityModelLoader
+		ARG 10 equipmentModelLoader
 	METHOD method_23161 drawFireVertex (Lnet/minecraft/class_4587$class_4665;Lnet/minecraft/class_4588;FFFFF)V
 		ARG 0 entry
 		ARG 1 vertices

diff --git a/...er/entity/model/EntityModelLoader.mapping → ...r/entity/model/LoadedEntityModels.mapping b/...er/entity/model/EntityModelLoader.mapping → ...r/entity/model/LoadedEntityModels.mapping
@@ -1,4 +1,8 @@
-CLASS net/minecraft/class_5599 net/minecraft/client/render/entity/model/EntityModelLoader
+CLASS net/minecraft/class_5599 net/minecraft/client/render/entity/model/LoadedEntityModels
 	FIELD field_27542 modelParts Ljava/util/Map;
+	FIELD field_55267 EMPTY Lnet/minecraft/class_5599;
+	METHOD <init> (Ljava/util/Map;)V
+		ARG 1 modelarts
 	METHOD method_32072 getModelPart (Lnet/minecraft/class_5601;)Lnet/minecraft/class_630;
 		ARG 1 layer
+	METHOD method_65522 copy ()Lnet/minecraft/class_5599;
diff --git a/mappings/net/minecraft/client/render/model/BakedModelManager.mapping b/mappings/net/minecraft/client/render/model/BakedModelManager.mapping
@@ -9,7 +9,7 @@ CLASS net/minecraft/class_1092 net/minecraft/client/render/model/BakedModelManag
 	FIELD field_5410 blockModelCache Lnet/minecraft/class_773;
 	FIELD field_55471 bakedBlockModels Ljava/util/Map;
 	FIELD field_55472 bakedItemModels Ljava/util/Map;
-	FIELD field_55473 entityModelLoader Lnet/minecraft/class_5599;
+	FIELD field_55473 loadedEntityModels Lnet/minecraft/class_5599;
 	FIELD field_55475 missingItemModel Lnet/minecraft/class_10439;
 	FIELD field_55476 modelGroups Lit/unimi/dsi/fastutil/objects/Object2IntMap;
 	METHOD <init> (Lnet/minecraft/class_1060;Lnet/minecraft/class_324;I)V
@@ -51,4 +51,5 @@ CLASS net/minecraft/class_1092 net/minecraft/client/render/model/BakedModelManag
 	METHOD method_62657 collect (Lnet/minecraft/class_1100;Ljava/util/Map;Lnet/minecraft/class_9824$class_10095;Lnet/minecraft/class_10521$class_10522;)Lnet/minecraft/class_10097;
 	METHOD method_65746 getItemModel (Lnet/minecraft/class_2960;)Lnet/minecraft/class_10439;
 		ARG 1 id
+	METHOD method_65757 getEntityModelsSupplier ()Ljava/util/function/Supplier;
 	CLASS class_7779 BakingResult
diff --git a/mappings/net/minecraft/client/world/ClientChunkManager.mapping b/mappings/net/minecraft/client/world/ClientChunkManager.mapping
@@ -65,3 +65,5 @@ CLASS net/minecraft/class_631 net/minecraft/client/world/ClientChunkManager
 			ARG 2 chunk
 		METHOD method_62894 loadChunkSections (Lnet/minecraft/class_2818;)V
 			ARG 1 chunk
+		METHOD method_65523 refreshSections (Lnet/minecraft/class_2818;)V
+			ARG 1 chunk