24w45a stuff (#4046)

* 24w45a stuff Very unfinished, but it's 8AM and I haven't slept so this is what I've done for now... * Map more stuff * More stuff * Even more stuff * More client mappings * Rendering stuff, part 1 * Map the rest --------- Co-authored-by: apple502j <33279053+apple502j@users.noreply.github.com>
FabricMC · Nov 13, 2024 · 74d2c70 · 74d2c70
1 parent d12e55b
commit 74d2c70
Show file tree

Hide file tree

Showing 314 changed files with 1,998 additions and 168 deletions.
diff --git a/mappings/net/minecraft/block/AbstractBlock.mapping b/mappings/net/minecraft/block/AbstractBlock.mapping
@@ -721,6 +721,7 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock
 		ARG 1 world
 		ARG 2 pos
 		ARG 3 state
+		ARG 4 includeData
 	METHOD method_9575 getAmbientOcclusionLightLevel (Lnet/minecraft/class_2680;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)F
 		COMMENT @see AbstractBlockState#getAmbientOcclusionLightLevel
 		ARG 1 state
@@ -1348,6 +1349,7 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock
 		METHOD method_65171 getPickStack (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;Z)Lnet/minecraft/class_1799;
 			ARG 1 world
 			ARG 2 pos
+			ARG 3 includeData
 		CLASS class_3752 ShapeCache
 			FIELD field_16559 DIRECTIONS [Lnet/minecraft/class_2350;
 			FIELD field_17651 exceedsCube Z

diff --git a/mappings/net/minecraft/block/CreakingHeartBlock.mapping b/mappings/net/minecraft/block/CreakingHeartBlock.mapping
@@ -17,3 +17,7 @@ CLASS net/minecraft/class_10319 net/minecraft/block/CreakingHeartBlock
 	METHOD method_65147 isNightAndNatural (Lnet/minecraft/class_1937;)Z
 		ARG 0 world
 	METHOD method_65148 dropExperienceOnBreak (Lnet/minecraft/class_1657;Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V
+		ARG 1 player
+		ARG 2 state
+		ARG 3 world
+		ARG 4 pos
diff --git a/mappings/net/minecraft/block/EyeblossomBlock.mapping b/mappings/net/minecraft/block/EyeblossomBlock.mapping
@@ -13,6 +13,8 @@ CLASS net/minecraft/class_10374 net/minecraft/block/EyeblossomBlock
 		ARG 4 otherPos
 	METHOD method_65150 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
 		ARG 0 instance
+	METHOD method_65151 (Lnet/minecraft/class_10374;)Ljava/lang/Boolean;
+		ARG 0 block
 	METHOD method_65153 updateStateAndNotifyOthers (Lnet/minecraft/class_2680;Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;)Z
 		ARG 1 state
 		ARG 2 world
@@ -41,3 +43,6 @@ CLASS net/minecraft/class_10374 net/minecraft/block/EyeblossomBlock
 			ARG 0 open
 		METHOD method_65157 isOpen ()Z
 		METHOD method_65158 getLongSound ()Lnet/minecraft/class_3414;
+		METHOD method_65369 getBlock ()Lnet/minecraft/class_2248;
+		METHOD method_65370 getBlockState ()Lnet/minecraft/class_2680;
+		METHOD method_65371 getOpposite ()Lnet/minecraft/class_10374$class_10375;
diff --git a/mappings/net/minecraft/block/entity/BannerBlockEntity.mapping b/mappings/net/minecraft/block/entity/BannerBlockEntity.mapping
@@ -11,6 +11,7 @@ CLASS net/minecraft/class_2573 net/minecraft/block/entity/BannerBlockEntity
 	METHOD <init> (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_1767;)V
 		ARG 1 pos
 		ARG 2 state
+		ARG 3 baseColor
 	METHOD method_10907 getPickStack ()Lnet/minecraft/class_1799;
 	METHOD method_10908 getColorForState ()Lnet/minecraft/class_1767;
 	METHOD method_57566 (Ljava/lang/String;)V

diff --git a/mappings/net/minecraft/block/spawner/TrialSpawnerConfig.mapping b/mappings/net/minecraft/block/spawner/TrialSpawnerConfig.mapping
@@ -12,6 +12,8 @@ CLASS net/minecraft/class_8965 net/minecraft/block/spawner/TrialSpawnerConfig
 		ARG 1 additionalPlayers
 	METHOD method_58712 getCooldownLength ()J
 	METHOD method_63466 builder ()Lnet/minecraft/class_8965$class_10165;
+	METHOD method_65373 withSpawnPotential (Lnet/minecraft/class_1299;)Lnet/minecraft/class_8965;
+		ARG 1 entityType
 	CLASS class_10165 Builder
 		FIELD field_53981 spawnRange I
 		FIELD field_53982 totalMobs F

diff --git a/mappings/net/minecraft/block/spawner/TrialSpawnerLogic.mapping b/mappings/net/minecraft/block/spawner/TrialSpawnerLogic.mapping
@@ -109,6 +109,9 @@ CLASS net/minecraft/class_8963 net/minecraft/block/spawner/TrialSpawnerLogic
 		ARG 3 data
 		ARG 4 cooldownLength
 		ARG 5 entityDetectionRange
+	METHOD method_65372 setEntityType (Lnet/minecraft/class_1299;Lnet/minecraft/class_1937;)V
+		ARG 1 entityType
+		ARG 2 world
 	CLASS class_8964 TrialSpawner
 		METHOD method_55146 setSpawnerState (Lnet/minecraft/class_1937;Lnet/minecraft/class_8967;)V
 			ARG 1 world

diff --git a/mappings/net/minecraft/class_10415.mapping b/mappings/net/minecraft/class_10415.mapping
diff --git a/mappings/net/minecraft/client/ClientBootstrap.mapping b/mappings/net/minecraft/client/ClientBootstrap.mapping
@@ -0,0 +1,3 @@
+CLASS net/minecraft/class_10395 net/minecraft/client/ClientBootstrap
+	FIELD field_55225 initialized Z
+	METHOD method_65385 initialize ()V
diff --git a/mappings/net/minecraft/client/MinecraftClient.mapping b/mappings/net/minecraft/client/MinecraftClient.mapping
@@ -185,6 +185,7 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient
 	FIELD field_52753 inactivityFpsLimiter Lnet/minecraft/class_9919;
 	FIELD field_53831 shaderLoader Lnet/minecraft/class_10151;
 	FIELD field_54267 tracyFrameCapturer Lnet/minecraft/class_10219;
+	FIELD field_55226 itemModelManager Lnet/minecraft/class_10442;
 	METHOD <init> (Lnet/minecraft/class_542;)V
 		ARG 1 args
 	METHOD method_1478 getResourceManager ()Lnet/minecraft/class_3300;
@@ -365,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;
@@ -528,6 +529,9 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient
 	METHOD method_62887 getShaderLoader ()Lnet/minecraft/class_10151;
 	METHOD method_63507 onShaderResourceReloadFailure (Ljava/lang/Exception;)V
 		ARG 1 exception
+	METHOD method_64035 (Lnet/minecraft/class_6880$class_6883;)V
+		ARG 0 item
+	METHOD method_65386 getItemModelManager ()Lnet/minecraft/class_10442;
 	CLASS 1
 		FIELD field_52756 closed Z
 	CLASS class_5859 ChatRestriction

diff --git a/mappings/net/minecraft/client/color/block/BlockColors.mapping b/mappings/net/minecraft/client/color/block/BlockColors.mapping
@@ -2,6 +2,8 @@ CLASS net/minecraft/class_324 net/minecraft/client/color/block/BlockColors
 	FIELD field_1995 providers Lnet/minecraft/class_2361;
 	FIELD field_20271 properties Ljava/util/Map;
 	FIELD field_32163 NO_COLOR I
+	FIELD field_55227 PLACED_LILY_PAD I
+	FIELD field_55228 LILY_PAD I
 	METHOD method_1684 (Lnet/minecraft/class_2680;Lnet/minecraft/class_1920;Lnet/minecraft/class_2338;I)I
 		ARG 0 state
 		ARG 1 world

diff --git a/...a/client/BlockStateModelGenerator.mapping → ...ent/data/BlockStateModelGenerator.mapping b/...a/client/BlockStateModelGenerator.mapping → ...ent/data/BlockStateModelGenerator.mapping
@@ -1,4 +1,4 @@
-CLASS net/minecraft/class_4910 net/minecraft/data/client/BlockStateModelGenerator
+CLASS net/minecraft/class_4910 net/minecraft/client/data/BlockStateModelGenerator
 	FIELD field_22830 blockStateCollector Ljava/util/function/Consumer;
 	FIELD field_22831 modelCollector Ljava/util/function/BiConsumer;
 	FIELD field_28548 CONNECTION_VARIANT_FUNCTIONS Ljava/util/List;
@@ -10,8 +10,11 @@ CLASS net/minecraft/class_4910 net/minecraft/data/client/BlockStateModelGenerato
 	FIELD field_28552 VARIANT_POOL_FUNCTIONS Ljava/util/Map;
 	FIELD field_29504 stoneStateFactories Ljava/util/Map;
 	FIELD field_41526 CHISELED_BOOKSHELF_MODEL_CACHE Ljava/util/Map;
+	FIELD field_55238 itemModelOutput Lnet/minecraft/class_10405;
 	METHOD <init> (Ljava/util/function/Consumer;Lnet/minecraft/class_10405;Ljava/util/function/BiConsumer;)V
 		ARG 1 blockStateCollector
+		ARG 2 itemModelOutput
+		ARG 3 modelCollector
 	METHOD method_25508 registerChorusPlant ()V
 	METHOD method_25509 registerComposter ()V
 	METHOD method_25510 registerDaylightDetector ()V
@@ -45,6 +48,7 @@ CLASS net/minecraft/class_4910 net/minecraft/data/client/BlockStateModelGenerato
 		ARG 2 prefix
 		ARG 3 textures
 	METHOD method_25537 registerItemModel (Lnet/minecraft/class_1792;)V
+		ARG 1 item
 	METHOD method_25542 registerBuiltinWithParticle (Lnet/minecraft/class_2248;Lnet/minecraft/class_1792;)V
 		ARG 1 block
 		ARG 2 particleSource
@@ -73,6 +77,8 @@ CLASS net/minecraft/class_4910 net/minecraft/data/client/BlockStateModelGenerato
 		ARG 2 ageProperty
 		ARG 3 ageTextureIndices
 	METHOD method_25548 registerTintableCross (Lnet/minecraft/class_2248;Lnet/minecraft/class_4910$class_4913;)V
+		ARG 1 block
+		ARG 2 crossType
 	METHOD method_25549 registerTintableCross (Lnet/minecraft/class_2248;Lnet/minecraft/class_4910$class_4913;Lnet/minecraft/class_4944;)V
 		ARG 1 block
 		ARG 2 tintType
@@ -88,6 +94,8 @@ CLASS net/minecraft/class_4910 net/minecraft/data/client/BlockStateModelGenerato
 		ARG 2 verticalModelFactory
 		ARG 3 horizontalModelFactory
 	METHOD method_25556 registerItemModel (Lnet/minecraft/class_2248;Ljava/lang/String;)V
+		ARG 1 block
+		ARG 2 textureSuffix
 	METHOD method_25557 createSubModel (Lnet/minecraft/class_2248;Ljava/lang/String;Lnet/minecraft/class_4942;Ljava/util/function/Function;)Lnet/minecraft/class_2960;
 		ARG 1 block
 		ARG 2 suffix
@@ -141,6 +149,7 @@ CLASS net/minecraft/class_4910 net/minecraft/data/client/BlockStateModelGenerato
 	METHOD method_25598 registerInfestedStone ()V
 	METHOD method_25599 createNorthDefaultHorizontalRotationStates ()Lnet/minecraft/class_4926;
 	METHOD method_25600 registerItemModel (Lnet/minecraft/class_2248;)V
+		ARG 1 block
 	METHOD method_25601 registerCoralFan (Lnet/minecraft/class_2248;Lnet/minecraft/class_2248;)V
 		ARG 1 coralFanBlock
 		ARG 2 coralWallFanBlock
@@ -225,7 +234,8 @@ CLASS net/minecraft/class_4910 net/minecraft/data/client/BlockStateModelGenerato
 	METHOD method_25649 createAxisRotatedVariantMap ()Lnet/minecraft/class_4926;
 	METHOD method_25650 registerCubeAllModelTexturePool (Lnet/minecraft/class_2248;)Lnet/minecraft/class_4910$class_4912;
 		ARG 1 block
-	METHOD method_25651 registerGlassPane (Lnet/minecraft/class_2248;Lnet/minecraft/class_2248;)V
+	METHOD method_25651 registerGlassAndPane (Lnet/minecraft/class_2248;Lnet/minecraft/class_2248;)V
+		ARG 1 glassBlock
 		ARG 2 glassPane
 	METHOD method_25652 registerCooker (Lnet/minecraft/class_2248;Lnet/minecraft/class_4946$class_4947;)V
 		ARG 1 cooker
@@ -492,6 +502,7 @@ CLASS net/minecraft/class_4910 net/minecraft/data/client/BlockStateModelGenerato
 		ARG 4 southModelId
 		ARG 5 westModelId
 	METHOD method_46190 registerHangingSign (Lnet/minecraft/class_2248;Lnet/minecraft/class_2248;Lnet/minecraft/class_2248;)V
+		ARG 1 base
 		ARG 2 hangingSign
 		ARG 3 wallHangingSign
 	METHOD method_46193 registerChiseledBookshelf ()V
@@ -602,6 +613,78 @@ CLASS net/minecraft/class_4910 net/minecraft/data/client/BlockStateModelGenerato
 	METHOD method_65295 registerMultifaceBlock (Lnet/minecraft/class_2248;Lnet/minecraft/class_1792;)V
 		ARG 1 block
 		ARG 2 item
+	METHOD method_65398 uploadItemModel (Lnet/minecraft/class_1792;)Lnet/minecraft/class_2960;
+		ARG 1 item
+	METHOD method_65399 registerItemModel (Lnet/minecraft/class_1792;Lnet/minecraft/class_2960;)V
+		ARG 1 item
+		ARG 2 modelId
+	METHOD method_65400 uploadBlockItemModel (Lnet/minecraft/class_1792;Lnet/minecraft/class_2248;)Lnet/minecraft/class_2960;
+		ARG 1 item
+		ARG 2 block
+	METHOD method_65401 uploadBlockItemModel (Lnet/minecraft/class_1792;Lnet/minecraft/class_2248;Ljava/lang/String;)Lnet/minecraft/class_2960;
+		ARG 1 item
+		ARG 2 block
+		ARG 3 textureSuffix
+	METHOD method_65402 registerTintedItemModel (Lnet/minecraft/class_2248;Lnet/minecraft/class_2960;Lnet/minecraft/class_10401;)V
+		ARG 1 block
+		ARG 2 modelId
+		ARG 3 tint
+	METHOD method_65403 registerBuiltinWithParticle (Lnet/minecraft/class_2248;Lnet/minecraft/class_2248;)V
+		ARG 1 block
+		ARG 2 particleSource
+	METHOD method_65404 registerChest (Lnet/minecraft/class_2248;Lnet/minecraft/class_2248;Lnet/minecraft/class_2960;Z)V
+		ARG 1 block
+		ARG 2 particleSource
+		ARG 3 texture
+		ARG 4 christmas
+	METHOD method_65405 registerBanner (Lnet/minecraft/class_2248;Lnet/minecraft/class_2248;Lnet/minecraft/class_1767;)V
+		ARG 1 block
+		ARG 2 wallBlock
+		ARG 3 color
+	METHOD method_65406 registerSkull (Lnet/minecraft/class_2248;Lnet/minecraft/class_2248;Lnet/minecraft/class_2484$class_2485;Lnet/minecraft/class_2960;)V
+		ARG 1 block
+		ARG 2 wallBlock
+		ARG 3 type
+		ARG 4 baseModelId
+	METHOD method_65407 registerFlowerPotPlantAndItem (Lnet/minecraft/class_2248;Lnet/minecraft/class_2248;Lnet/minecraft/class_4910$class_4913;)V
+		ARG 1 block
+		ARG 2 flowerPotBlock
+		ARG 3 crossType
+	METHOD method_65408 registerTintedBlockAndItem (Lnet/minecraft/class_2248;Lnet/minecraft/class_4946$class_4947;I)V
+		ARG 1 block
+		ARG 2 texturedModelFactory
+		ARG 3 tintColor
+	METHOD method_65409 registerSpecialItemModel (Lnet/minecraft/class_2248;Lnet/minecraft/class_10515$class_10516;)V
+		ARG 1 block
+		ARG 2 specialModel
+	METHOD method_65410 registerSkulls ()V
+	METHOD method_65411 registerBanners ()V
+	METHOD method_65412 registerChests ()V
+	METHOD method_65413 registerBeds ()V
+	METHOD method_65414 uploadTwoLayerBlockItemModel (Lnet/minecraft/class_1792;Lnet/minecraft/class_2248;Ljava/lang/String;)Lnet/minecraft/class_2960;
+		ARG 1 item
+		ARG 2 block
+		ARG 3 layer1Suffix
+	METHOD method_65415 registerBed (Lnet/minecraft/class_2248;Lnet/minecraft/class_2248;Lnet/minecraft/class_1767;)V
+		ARG 1 block
+		ARG 2 particleSource
+		ARG 3 color
+	METHOD method_65416 registerTwoLayerItemModel (Lnet/minecraft/class_2248;Ljava/lang/String;)V
+		ARG 1 block
+		ARG 2 layer1Suffix
+	METHOD method_65417 registerDoubleBlockAndItem (Lnet/minecraft/class_2248;Lnet/minecraft/class_4910$class_4913;)V
+		ARG 1 block
+		ARG 2 crossType
+	METHOD method_65418 registerVine ()V
+	METHOD method_65419 uploadParticleModel (Lnet/minecraft/class_2248;Lnet/minecraft/class_2248;)Lnet/minecraft/class_2960;
+		ARG 1 block
+		ARG 2 particleSource
+	METHOD method_65420 registerGrassTinted (Lnet/minecraft/class_2248;)V
+		ARG 1 block
+	METHOD method_65421 registerGrassTintedDoubleBlockAndItem (Lnet/minecraft/class_2248;)V
+		ARG 1 block
+	METHOD method_65422 registerBuilltin (Lnet/minecraft/class_2248;)V
+		ARG 1 block
 	CLASS class_4912 BlockTexturePool
 		FIELD field_22837 textures Lnet/minecraft/class_4944;
 		FIELD field_22838 baseModelId Lnet/minecraft/class_2960;

diff --git a/...ft/data/client/BlockStateSupplier.mapping → ...ft/client/data/BlockStateSupplier.mapping b/...ft/data/client/BlockStateSupplier.mapping → ...ft/client/data/BlockStateSupplier.mapping
@@ -1,3 +1,3 @@
-CLASS net/minecraft/class_4917 net/minecraft/data/client/BlockStateSupplier
+CLASS net/minecraft/class_4917 net/minecraft/client/data/BlockStateSupplier
 	COMMENT A supplier of a block state JSON definition.
 	METHOD method_25743 getBlock ()Lnet/minecraft/class_2248;
diff --git a/...aft/data/client/BlockStateVariant.mapping → ...aft/client/data/BlockStateVariant.mapping b/...aft/data/client/BlockStateVariant.mapping → ...aft/client/data/BlockStateVariant.mapping
@@ -1,4 +1,4 @@
-CLASS net/minecraft/class_4935 net/minecraft/data/client/BlockStateVariant
+CLASS net/minecraft/class_4935 net/minecraft/client/data/BlockStateVariant
 	COMMENT The supplier for a {@code ModelVariant}'s JSON representation.
 	FIELD field_22884 properties Ljava/util/Map;
 	METHOD method_25824 create ()Lnet/minecraft/class_4935;

diff --git a/.../data/client/BlockStateVariantMap.mapping → .../client/data/BlockStateVariantMap.mapping b/.../data/client/BlockStateVariantMap.mapping → .../client/data/BlockStateVariantMap.mapping
@@ -1,4 +1,4 @@
-CLASS net/minecraft/class_4926 net/minecraft/data/client/BlockStateVariantMap
+CLASS net/minecraft/class_4926 net/minecraft/client/data/BlockStateVariantMap
 	COMMENT An equivalence to the {@code Map<String, WeightedUnbakedModel>}
 	COMMENT passed to the constructor of {@code ModelVariantMap}.
 	FIELD field_22863 variants Ljava/util/Map;

diff --git a/mappings/net/minecraft/client/data/EquipmentAssetProvider.mapping b/mappings/net/minecraft/client/data/EquipmentAssetProvider.mapping
@@ -0,0 +1,13 @@
+CLASS net/minecraft/class_10206 net/minecraft/client/data/EquipmentAssetProvider
+	FIELD field_54202 pathResolver Lnet/minecraft/class_7784$class_7489;
+	METHOD <init> (Lnet/minecraft/class_7784;)V
+		ARG 1 output
+	METHOD method_64112 (Ljava/util/Map;Lnet/minecraft/class_5321;Lnet/minecraft/class_10186;)V
+		ARG 1 key
+		ARG 2 model
+	METHOD method_65423 createHumanoidOnlyModel (Ljava/lang/String;)Lnet/minecraft/class_10186;
+		ARG 0 id
+	METHOD method_65424 bootstrap (Ljava/util/function/BiConsumer;)V
+		ARG 0 equipmentBiConsumer
+	METHOD method_65425 createHumanoidAndHorseModel (Ljava/lang/String;)Lnet/minecraft/class_10186;
+		ARG 0 id