From 2438999c4128dcf027a0786c558eb37a7b3b0b3f Mon Sep 17 00:00:00 2001 From: Sakura Ryoko <116967773+sakura-ryoko@users.noreply.github.com> Date: Mon, 17 Feb 2025 14:43:18 -0500 Subject: [PATCH] More 25w07a stuff, fixing TextureType and GeometryBakedModel pathing (#4124) * More 25w07a stuff, fixing TextureType and GeometryBakedModel pathing * revert a change as requested * Update MultipartUnbakedModel.mapping * Update ModelElementFace.mapping * Update ModelVariants.mapping * Update ModelElementFace.mapping * make into `getters` as per Pepper in Discord. --- mappings/net/minecraft/TextureType.mapping | 4 ---- .../entity/AbstractFurnaceBlockEntity.mapping | 1 + .../block/entity/BeaconBlockEntity.mapping | 1 + .../net/minecraft/client/gl/Framebuffer.mapping | 4 ++++ .../render/ChunkRenderingDataPreparer.mapping | 12 +++++++++--- .../client/render/DiffuseLighting.mapping | 9 +++++++++ .../minecraft/client/render/Tessellator.mapping | 1 + .../client/render/VertexFormatElement.mapping | 6 +++++- .../client/render/WorldBorderRendering.mapping | 4 ++++ .../client/render/chunk/ChunkBuilder.mapping | 1 + .../model/ErrorCollectingSpriteGetter.mapping | 3 +++ .../{ => render}/model/GeometryBakedModel.mapping | 2 +- .../client/render/model/ModelBaker.mapping | 5 ++++- .../client/render/model/ModelRotation.mapping | 10 ++++++++++ .../render/model/MultipartBakedModel.mapping | 2 ++ .../render/model/MultipartUnbakedModel.mapping | 2 ++ .../client/render/model/UnbakedGeometry.mapping | 11 ++++++++++- .../client/render/model/UnbakedModel.mapping | 8 +++++--- .../client/render/model/WeightedBakedModel.mapping | 2 ++ .../render/model/json/GeneratedItemModel.mapping | 14 +++++++++++++- .../render/model/json/ModelElementFace.mapping | 4 ++++ .../model/json/MultipartModelComponent.mapping | 3 +++ .../model/json/MultipartModelSelector.mapping | 4 ++++ .../render/model/json/WeightedUnbakedModel.mapping | 6 ++++++ .../minecraft/client/texture/TextureType.mapping | 11 +++++++++++ .../util/math/AffineTransformations.mapping | 1 + 26 files changed, 116 insertions(+), 15 deletions(-) delete mode 100644 mappings/net/minecraft/TextureType.mapping rename mappings/net/minecraft/client/{ => render}/model/GeometryBakedModel.mapping (76%) create mode 100644 mappings/net/minecraft/client/texture/TextureType.mapping diff --git a/mappings/net/minecraft/TextureType.mapping b/mappings/net/minecraft/TextureType.mapping deleted file mode 100644 index ce65525f79..0000000000 --- a/mappings/net/minecraft/TextureType.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS net/minecraft/class_10793 net/minecraft/TextureType - METHOD method_67791 glId ()I - METHOD method_67792 formatId ()I - METHOD method_67793 glType ()I diff --git a/mappings/net/minecraft/block/entity/AbstractFurnaceBlockEntity.mapping b/mappings/net/minecraft/block/entity/AbstractFurnaceBlockEntity.mapping index 7144f72202..d9f19233aa 100644 --- a/mappings/net/minecraft/block/entity/AbstractFurnaceBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/AbstractFurnaceBlockEntity.mapping @@ -19,6 +19,7 @@ CLASS net/minecraft/class_2609 net/minecraft/block/entity/AbstractFurnaceBlockEn FIELD field_55574 litTimeRemaining I FIELD field_55575 litTotalTime I FIELD field_55576 cookingTimeSpent I + FIELD field_56671 CODEC Lcom/mojang/serialization/Codec; METHOD (Lnet/minecraft/class_2591;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_3956;)V ARG 1 blockEntityType ARG 2 pos diff --git a/mappings/net/minecraft/block/entity/BeaconBlockEntity.mapping b/mappings/net/minecraft/block/entity/BeaconBlockEntity.mapping index cd58d3291b..454a67dc4d 100644 --- a/mappings/net/minecraft/block/entity/BeaconBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/BeaconBlockEntity.mapping @@ -8,6 +8,7 @@ CLASS net/minecraft/class_2580 net/minecraft/block/entity/BeaconBlockEntity FIELD field_17377 lock Lnet/minecraft/class_1273; FIELD field_17378 propertyDelegate Lnet/minecraft/class_3913; FIELD field_19177 beamSegments Ljava/util/List; + FIELD field_19178 beamEmitters Ljava/util/List; FIELD field_19179 minY I FIELD field_31300 LEVEL_PROPERTY_INDEX I FIELD field_31301 PRIMARY_PROPERTY_INDEX I diff --git a/mappings/net/minecraft/client/gl/Framebuffer.mapping b/mappings/net/minecraft/client/gl/Framebuffer.mapping index db904c4bdc..ac258e6198 100644 --- a/mappings/net/minecraft/client/gl/Framebuffer.mapping +++ b/mappings/net/minecraft/client/gl/Framebuffer.mapping @@ -8,6 +8,10 @@ CLASS net/minecraft/class_276 net/minecraft/client/gl/Framebuffer FIELD field_1481 textureHeight I FIELD field_1482 textureWidth I FIELD field_1483 texFilter Lnet/minecraft/class_10791; + FIELD field_31901 red I + FIELD field_31902 green I + FIELD field_31903 blue I + FIELD field_31904 alpha I FIELD field_56737 index I FIELD field_56738 name Ljava/lang/String; FIELD field_56739 textureAttachment Lnet/minecraft/class_10792; diff --git a/mappings/net/minecraft/client/render/ChunkRenderingDataPreparer.mapping b/mappings/net/minecraft/client/render/ChunkRenderingDataPreparer.mapping index a9c09af44a..e511e9e24d 100644 --- a/mappings/net/minecraft/client/render/ChunkRenderingDataPreparer.mapping +++ b/mappings/net/minecraft/client/render/ChunkRenderingDataPreparer.mapping @@ -1,23 +1,27 @@ CLASS net/minecraft/class_8679 net/minecraft/client/render/ChunkRenderingDataPreparer FIELD field_45617 LOGGER Lorg/slf4j/Logger; FIELD field_45618 DIRECTIONS [Lnet/minecraft/class_2350; + FIELD field_45619 DEFAULT_SECTION_DISTANCE I FIELD field_45620 CHUNK_INNER_DIAGONAL_LENGTH D FIELD field_45621 terrainUpdateScheduled Z FIELD field_45622 terrainUpdateFuture Ljava/util/concurrent/Future; FIELD field_45623 builtChunkStorage Lnet/minecraft/class_769; FIELD field_45624 state Ljava/util/concurrent/atomic/AtomicReference; FIELD field_45625 events Ljava/util/concurrent/atomic/AtomicReference; + FIELD field_45626 needsUpdate Ljava/util/concurrent/atomic/AtomicBoolean; + FIELD field_55873 sectionDistance I METHOD method_52817 scheduleTerrainUpdate ()V METHOD method_52819 addNeighbors (Lnet/minecraft/class_1923;)V ARG 1 chunkPos - METHOD method_52821 (Lnet/minecraft/class_4184;Ljava/util/Queue;)V + METHOD method_52821 scheduleLater (Lnet/minecraft/class_4184;Ljava/util/Queue;)V ARG 1 camera METHOD method_52822 addNeighbors (Lnet/minecraft/class_8679$class_8680;Lnet/minecraft/class_1923;)V ARG 1 events ARG 2 chunkPos + METHOD method_52823 scheduleNew (Lnet/minecraft/class_8679$class_8681;)V METHOD method_52824 (Lnet/minecraft/class_8679$class_8681;Lnet/minecraft/class_8679$class_762;)V ARG 1 info - METHOD method_52825 (Lnet/minecraft/class_8679$class_6600;Lnet/minecraft/class_243;Ljava/util/Queue;ZLjava/util/function/Consumer;Lit/unimi/dsi/fastutil/longs/LongOpenHashSet;)V + METHOD method_52825 update (Lnet/minecraft/class_8679$class_6600;Lnet/minecraft/class_243;Ljava/util/Queue;ZLjava/util/function/Consumer;Lit/unimi/dsi/fastutil/longs/LongOpenHashSet;)V ARG 2 pos ARG 4 cullChunks METHOD method_52826 setStorage (Lnet/minecraft/class_769;)V @@ -46,11 +50,12 @@ CLASS net/minecraft/class_8679 net/minecraft/client/render/ChunkRenderingDataPre ARG 3 frustum ARG 4 builtChunk ARG 5 activeSections - METHOD method_52835 (ZLnet/minecraft/class_4604;Ljava/util/List;Lnet/minecraft/class_243;Lit/unimi/dsi/fastutil/longs/LongOpenHashSet;)V + METHOD method_52835 updateNow (ZLnet/minecraft/class_4604;Ljava/util/List;Lnet/minecraft/class_243;Lit/unimi/dsi/fastutil/longs/LongOpenHashSet;)V ARG 2 frustum ARG 3 builtChunks ARG 4 cameraPos ARG 5 activeSections + METHOD method_52836 updateFrustum ()Z METHOD method_52837 getInfo (Lnet/minecraft/class_846$class_851;)Lnet/minecraft/class_8679$class_762; ARG 1 chunk METHOD method_62924 (Ljava/util/List;Ljava/util/List;Lnet/minecraft/class_10143$class_10147;ZIZ)V @@ -70,6 +75,7 @@ CLASS net/minecraft/class_8679 net/minecraft/client/render/ChunkRenderingDataPre ARG 2 info CLASS class_6600 RenderableChunks FIELD field_45627 infoList Lnet/minecraft/class_8679$class_5972; + FIELD field_45628 queue Lit/unimi/dsi/fastutil/longs/Long2ObjectMap; FIELD field_53929 octree Lnet/minecraft/class_10143; METHOD (Lnet/minecraft/class_769;)V ARG 1 storage diff --git a/mappings/net/minecraft/client/render/DiffuseLighting.mapping b/mappings/net/minecraft/client/render/DiffuseLighting.mapping index ade47cc874..55581130d6 100644 --- a/mappings/net/minecraft/client/render/DiffuseLighting.mapping +++ b/mappings/net/minecraft/client/render/DiffuseLighting.mapping @@ -1,5 +1,14 @@ CLASS net/minecraft/class_308 net/minecraft/client/render/DiffuseLighting + FIELD field_24426 DEFAULT_DIFFUSION_LIGHT_0 Lorg/joml/Vector3f; + FIELD field_24427 DEFAULT_DIFFUSION_LIGHT_1 Lorg/joml/Vector3f; + FIELD field_24428 WORLD_DIFFUSION_LIGHT_0 Lorg/joml/Vector3f; + FIELD field_24429 WORLD_DIFFUSION_LIGHT_1 Lorg/joml/Vector3f; + FIELD field_29567 INVENTORY_DIFFUSION_LIGHT_0 Lorg/joml/Vector3f; + FIELD field_29568 INVENTORY_DIFFUSION_LIGHT_1 Lorg/joml/Vector3f; METHOD method_1452 enableForLevel ()V METHOD method_24210 disableGuiDepthLighting ()V METHOD method_24211 enableGuiDepthLighting ()V METHOD method_27869 disableForLevel ()V + METHOD method_34742 enableGuiShaderLighting ()V + METHOD method_56819 rotateGuiShaderLighting (Lorg/joml/Quaternionf;)V + ARG 0 rotation diff --git a/mappings/net/minecraft/client/render/Tessellator.mapping b/mappings/net/minecraft/client/render/Tessellator.mapping index 9c3600e8c3..f4ed3c0ed8 100644 --- a/mappings/net/minecraft/client/render/Tessellator.mapping +++ b/mappings/net/minecraft/client/render/Tessellator.mapping @@ -4,6 +4,7 @@ CLASS net/minecraft/class_289 net/minecraft/client/render/Tessellator COMMENT

This class reuses the buffer builder so a buffer doesn't have to be COMMENT allocated every time. FIELD field_1573 INSTANCE Lnet/minecraft/class_289; + FIELD field_46841 MAX_BUFFER_SIZE I FIELD field_52098 allocator Lnet/minecraft/class_9799; METHOD (I)V ARG 1 bufferCapacity diff --git a/mappings/net/minecraft/client/render/VertexFormatElement.mapping b/mappings/net/minecraft/client/render/VertexFormatElement.mapping index 021248f3ba..217aa9b37f 100644 --- a/mappings/net/minecraft/client/render/VertexFormatElement.mapping +++ b/mappings/net/minecraft/client/render/VertexFormatElement.mapping @@ -15,7 +15,11 @@ CLASS net/minecraft/class_296 net/minecraft/client/render/VertexFormatElement FIELD field_52114 ELEMENTS [Lnet/minecraft/class_296; FIELD field_52115 ELEMENTS_LIST Ljava/util/List; METHOD (IILnet/minecraft/class_296$class_297;Lnet/minecraft/class_296$class_298;I)V - ARG 1 uvIndex + ARG 1 id + ARG 2 uv + ARG 3 type + ARG 4 usage + ARG 5 count METHOD comp_2843 uvIndex ()I METHOD equals (Ljava/lang/Object;)Z ARG 1 o diff --git a/mappings/net/minecraft/client/render/WorldBorderRendering.mapping b/mappings/net/minecraft/client/render/WorldBorderRendering.mapping index 8c494cec83..bd48136f28 100644 --- a/mappings/net/minecraft/client/render/WorldBorderRendering.mapping +++ b/mappings/net/minecraft/client/render/WorldBorderRendering.mapping @@ -4,6 +4,10 @@ CLASS net/minecraft/class_9978 net/minecraft/client/render/WorldBorderRendering FIELD field_56587 lastUploadedBoundWest D FIELD field_56589 lastUploadedBoundNorth D FIELD field_56591 directionBuffers [Lnet/minecraft/class_291; + FIELD field_56923 lastXMin D + FIELD field_56924 lastXMax D + FIELD field_56925 lastZMin D + FIELD field_56926 lastZMax D METHOD method_62322 render (Lnet/minecraft/class_2784;Lnet/minecraft/class_243;DD)V ARG 1 border ARG 2 cameraPos diff --git a/mappings/net/minecraft/client/render/chunk/ChunkBuilder.mapping b/mappings/net/minecraft/client/render/chunk/ChunkBuilder.mapping index 75f09b8f55..7b2156ff80 100644 --- a/mappings/net/minecraft/client/render/chunk/ChunkBuilder.mapping +++ b/mappings/net/minecraft/client/render/chunk/ChunkBuilder.mapping @@ -83,6 +83,7 @@ CLASS net/minecraft/class_846 net/minecraft/client/render/chunk/ChunkBuilder CLASS class_851 BuiltChunk FIELD field_20834 rebuildTask Lnet/minecraft/class_846$class_851$class_4578; FIELD field_29641 index I + FIELD field_32832 CHUNK_SIZE I FIELD field_4457 blockEntities Ljava/util/Set; FIELD field_4458 boundingBox Lnet/minecraft/class_238; FIELD field_4459 data Ljava/util/concurrent/atomic/AtomicReference; diff --git a/mappings/net/minecraft/client/render/model/ErrorCollectingSpriteGetter.mapping b/mappings/net/minecraft/client/render/model/ErrorCollectingSpriteGetter.mapping index 8ccc68f1a8..9ddc5f5b26 100644 --- a/mappings/net/minecraft/client/render/model/ErrorCollectingSpriteGetter.mapping +++ b/mappings/net/minecraft/client/render/model/ErrorCollectingSpriteGetter.mapping @@ -6,3 +6,6 @@ CLASS net/minecraft/class_9826 net/minecraft/client/render/model/ErrorCollecting ARG 1 name ARG 2 model METHOD method_68061 get (Lnet/minecraft/class_10419;Ljava/lang/String;Lnet/minecraft/class_10813;)Lnet/minecraft/class_1058; + ARG 1 texture + ARG 2 name + ARG 3 model diff --git a/mappings/net/minecraft/client/model/GeometryBakedModel.mapping b/mappings/net/minecraft/client/render/model/GeometryBakedModel.mapping similarity index 76% rename from mappings/net/minecraft/client/model/GeometryBakedModel.mapping rename to mappings/net/minecraft/client/render/model/GeometryBakedModel.mapping index 37df98db58..8658aae155 100644 --- a/mappings/net/minecraft/client/model/GeometryBakedModel.mapping +++ b/mappings/net/minecraft/client/render/model/GeometryBakedModel.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_10801 net/minecraft/client/model/GeometryBakedModel +CLASS net/minecraft/class_10801 net/minecraft/client/render/model/GeometryBakedModel FIELD comp_3751 useAmbientOcclusion Z FIELD comp_3752 getParticleSprite Lnet/minecraft/class_1058; METHOD method_67931 create (Lnet/minecraft/class_7775;Lnet/minecraft/class_2960;Lnet/minecraft/class_3665;)Lnet/minecraft/class_10801; diff --git a/mappings/net/minecraft/client/render/model/ModelBaker.mapping b/mappings/net/minecraft/client/render/model/ModelBaker.mapping index 10e61f9b85..15bf95c868 100644 --- a/mappings/net/minecraft/client/render/model/ModelBaker.mapping +++ b/mappings/net/minecraft/client/render/model/ModelBaker.mapping @@ -16,11 +16,12 @@ CLASS net/minecraft/class_1088 net/minecraft/client/render/model/ModelBaker FIELD field_55463 entityModels Lnet/minecraft/class_5599; FIELD field_55464 blockModels Ljava/util/Map; FIELD field_55572 itemAssets Ljava/util/Map; + FIELD field_56986 simpleModels Ljava/util/Map; METHOD (Lnet/minecraft/class_5599;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Lnet/minecraft/class_10819;)V ARG 1 entityModels ARG 2 blockModels ARG 3 itemModels - ARG 4 allModels + ARG 4 simpleModels ARG 5 missingModel METHOD method_22820 (I)Lnet/minecraft/class_2960; ARG 0 stage @@ -32,6 +33,8 @@ CLASS net/minecraft/class_1088 net/minecraft/client/render/model/ModelBaker ARG 0 path CLASS class_10524 BakedModels CLASS class_10812 BlockItemModels + METHOD method_68021 bake (Lnet/minecraft/class_10819;Lnet/minecraft/class_9826;)Lnet/minecraft/class_1088$class_10812; + ARG 0 model CLASS class_7778 BakerImpl FIELD field_56988 spriteGetter Lnet/minecraft/class_9826; METHOD (Lnet/minecraft/class_1088;Lnet/minecraft/class_9826;)V diff --git a/mappings/net/minecraft/client/render/model/ModelRotation.mapping b/mappings/net/minecraft/client/render/model/ModelRotation.mapping index 6a2a1dca18..2ea3e878d9 100644 --- a/mappings/net/minecraft/client/render/model/ModelRotation.mapping +++ b/mappings/net/minecraft/client/render/model/ModelRotation.mapping @@ -1,6 +1,16 @@ CLASS net/minecraft/class_1086 net/minecraft/client/render/model/ModelRotation FIELD field_23373 rotation Lnet/minecraft/class_4590; FIELD field_23374 directionTransformation Lnet/minecraft/class_4990; + FIELD field_56975 ROTATION_MAP [[Lnet/minecraft/class_1086; + FIELD field_56976 xRotation Lnet/minecraft/class_10821; + FIELD field_56977 yRotation Lnet/minecraft/class_10821; + FIELD field_56978 faces Ljava/util/Map; + FIELD field_56979 invertedFaces Ljava/util/Map; + FIELD field_56980 uvModel Lnet/minecraft/class_1086$class_10810; + METHOD (Ljava/lang/String;ILnet/minecraft/class_10821;Lnet/minecraft/class_10821;)V + ARG 3 x + ARG 4 y METHOD method_35808 getDirectionTransformation ()Lnet/minecraft/class_4990; METHOD method_68008 rotate (Lnet/minecraft/class_10821;Lnet/minecraft/class_10821;)Lnet/minecraft/class_1086; METHOD method_68010 getUVLock ()Lnet/minecraft/class_3665; + CLASS class_10810 UVModel diff --git a/mappings/net/minecraft/client/render/model/MultipartBakedModel.mapping b/mappings/net/minecraft/client/render/model/MultipartBakedModel.mapping index 0065058237..f89646c78c 100644 --- a/mappings/net/minecraft/client/render/model/MultipartBakedModel.mapping +++ b/mappings/net/minecraft/client/render/model/MultipartBakedModel.mapping @@ -1,6 +1,8 @@ CLASS net/minecraft/class_1095 net/minecraft/client/render/model/MultipartBakedModel FIELD field_5427 selectors Ljava/util/List; FIELD field_5431 stateCache Ljava/util/Map; + FIELD field_57010 useAmbientOcclusion Z + FIELD field_57011 particleSprite Lnet/minecraft/class_1058; METHOD (Ljava/util/List;)V ARG 1 selectors METHOD method_64095 getFirst (Ljava/util/List;)Lnet/minecraft/class_1087; diff --git a/mappings/net/minecraft/client/render/model/MultipartUnbakedModel.mapping b/mappings/net/minecraft/client/render/model/MultipartUnbakedModel.mapping index 1d0d08bb8e..3f74fcbc9c 100644 --- a/mappings/net/minecraft/client/render/model/MultipartUnbakedModel.mapping +++ b/mappings/net/minecraft/client/render/model/MultipartUnbakedModel.mapping @@ -6,5 +6,7 @@ CLASS net/minecraft/class_816 net/minecraft/client/render/model/MultipartUnbaked ARG 1 selector CLASS class_9981 EqualityGroup CLASS class_9982 Serialized + FIELD field_56951 CODEC Lcom/mojang/serialization/Codec; METHOD method_62339 toModel (Lnet/minecraft/class_2689;)Lnet/minecraft/class_816; + ARG 1 stateMap CLASS class_9983 Selector diff --git a/mappings/net/minecraft/client/render/model/UnbakedGeometry.mapping b/mappings/net/minecraft/client/render/model/UnbakedGeometry.mapping index 234be36fea..eaf7b9be2c 100644 --- a/mappings/net/minecraft/client/render/model/UnbakedGeometry.mapping +++ b/mappings/net/minecraft/client/render/model/UnbakedGeometry.mapping @@ -1,3 +1,12 @@ CLASS net/minecraft/class_10802 net/minecraft/client/render/model/UnbakedGeometry - METHOD method_67932 (Lnet/minecraft/class_785;Lnet/minecraft/class_783;Lnet/minecraft/class_1058;Lnet/minecraft/class_2350;Lnet/minecraft/class_3665;)Lnet/minecraft/class_777; + METHOD method_67932 bakeQuad (Lnet/minecraft/class_785;Lnet/minecraft/class_783;Lnet/minecraft/class_1058;Lnet/minecraft/class_2350;Lnet/minecraft/class_3665;)Lnet/minecraft/class_777; + ARG 0 element + ARG 1 face ARG 2 sprite + ARG 3 facing + ARG 4 settings + METHOD method_67934 bakeGeometry (Ljava/util/List;Lnet/minecraft/class_10419;Lnet/minecraft/class_9826;Lnet/minecraft/class_3665;Lnet/minecraft/class_10813;)Lnet/minecraft/class_10817; + ARG 0 elements + ARG 1 textures + ARG 3 settings + ARG 4 model diff --git a/mappings/net/minecraft/client/render/model/UnbakedModel.mapping b/mappings/net/minecraft/client/render/model/UnbakedModel.mapping index 43aba56410..156558bb8b 100644 --- a/mappings/net/minecraft/client/render/model/UnbakedModel.mapping +++ b/mappings/net/minecraft/client/render/model/UnbakedModel.mapping @@ -1,8 +1,10 @@ CLASS net/minecraft/class_1100 net/minecraft/client/render/model/UnbakedModel - METHOD comp_3740 guiLight ()Lnet/minecraft/class_1100$class_4751; + FIELD field_57026 PARTICLE_TEXTURE Ljava/lang/String; + METHOD comp_3739 getGeometry ()Lnet/minecraft/class_10820; + METHOD comp_3740 getGuiLight ()Lnet/minecraft/class_1100$class_4751; METHOD comp_3741 getAmbientOcclusion ()Ljava/lang/Boolean; - METHOD comp_3742 transformations ()Lnet/minecraft/class_809; - METHOD comp_3743 textures ()Lnet/minecraft/class_10419$class_10420; + METHOD comp_3742 getTransformations ()Lnet/minecraft/class_809; + METHOD comp_3743 getTextures ()Lnet/minecraft/class_10419$class_10420; METHOD comp_3744 getParentId ()Lnet/minecraft/class_2960; CLASS class_4751 GuiLight FIELD field_21858 ITEM Lnet/minecraft/class_1100$class_4751; diff --git a/mappings/net/minecraft/client/render/model/WeightedBakedModel.mapping b/mappings/net/minecraft/client/render/model/WeightedBakedModel.mapping index 1798dd5c3f..acd79b9eaf 100644 --- a/mappings/net/minecraft/client/render/model/WeightedBakedModel.mapping +++ b/mappings/net/minecraft/client/render/model/WeightedBakedModel.mapping @@ -1,2 +1,4 @@ CLASS net/minecraft/class_1097 net/minecraft/client/render/model/WeightedBakedModel FIELD field_5434 models Lnet/minecraft/class_6012; + FIELD field_57027 useAmbientOcclusion Z + FIELD field_57028 particleSprite Lnet/minecraft/class_1058; diff --git a/mappings/net/minecraft/client/render/model/json/GeneratedItemModel.mapping b/mappings/net/minecraft/client/render/model/json/GeneratedItemModel.mapping index c967711039..f2f56e3b52 100644 --- a/mappings/net/minecraft/client/render/model/json/GeneratedItemModel.mapping +++ b/mappings/net/minecraft/client/render/model/json/GeneratedItemModel.mapping @@ -2,13 +2,25 @@ CLASS net/minecraft/class_801 net/minecraft/client/render/model/json/GeneratedIt FIELD field_4270 LAYERS Ljava/util/List; FIELD field_55273 GENERATED Lnet/minecraft/class_2960; FIELD field_55274 TEXTURES Lnet/minecraft/class_10419$class_10420; + FIELD field_56930 FACING_SOUTH_UV Lnet/minecraft/class_783$class_10800; + FIELD field_56931 FACING_NORTH_UV Lnet/minecraft/class_783$class_10800; METHOD method_3476 buildCube (Lnet/minecraft/class_801$class_803;Ljava/util/List;Lnet/minecraft/class_7764;IIIIIZ)V METHOD method_3477 isPixelTransparent (Lnet/minecraft/class_7764;IIIII)Z METHOD method_3478 getFrames (Lnet/minecraft/class_7764;)Ljava/util/List; - METHOD method_3479 create (Lnet/minecraft/class_10419;Lnet/minecraft/class_9826;Lnet/minecraft/class_3665;Lnet/minecraft/class_10813;)Lnet/minecraft/class_10817; + METHOD method_3479 bakeGeometry (Lnet/minecraft/class_10419;Lnet/minecraft/class_9826;Lnet/minecraft/class_3665;Lnet/minecraft/class_10813;)Lnet/minecraft/class_10817; + ARG 0 textures + ARG 2 settings + ARG 3 model METHOD method_3480 addLayerElements (ILjava/lang/String;Lnet/minecraft/class_7764;)Ljava/util/List; + ARG 0 tintIndex + ARG 1 name METHOD method_3481 addSubComponents (Lnet/minecraft/class_7764;Ljava/lang/String;I)Ljava/util/List; METHOD method_3482 buildCube (Ljava/util/List;Lnet/minecraft/class_801$class_803;II)V + METHOD method_67928 bakeGeometry (Lnet/minecraft/class_10419;Lnet/minecraft/class_7775;Lnet/minecraft/class_3665;Lnet/minecraft/class_10813;)Lnet/minecraft/class_10817; + ARG 0 textures + ARG 1 baker + ARG 2 settings + ARG 3 model CLASS class_802 Frame FIELD field_4271 side Lnet/minecraft/class_801$class_803; FIELD field_4272 level I diff --git a/mappings/net/minecraft/client/render/model/json/ModelElementFace.mapping b/mappings/net/minecraft/client/render/model/json/ModelElementFace.mapping index 5cb089947d..8e49283bd1 100644 --- a/mappings/net/minecraft/client/render/model/json/ModelElementFace.mapping +++ b/mappings/net/minecraft/client/render/model/json/ModelElementFace.mapping @@ -13,6 +13,8 @@ CLASS net/minecraft/class_783 net/minecraft/client/render/model/json/ModelElemen METHOD method_67909 getUValue (Lnet/minecraft/class_783$class_10800;Lnet/minecraft/class_10821;I)F METHOD method_67910 getVValue (Lnet/minecraft/class_783$class_10800;Lnet/minecraft/class_10821;I)F CLASS class_10800 UV + METHOD method_67913 getUVertices (I)F + METHOD method_67914 getVVertices (I)F CLASS class_784 Deserializer FIELD field_32790 DEFAULT_TINT_INDEX I METHOD deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object; @@ -22,3 +24,5 @@ CLASS net/minecraft/class_783 net/minecraft/client/render/model/json/ModelElemen METHOD method_3398 deserializeCullFace (Lcom/google/gson/JsonObject;)Lnet/minecraft/class_2350; METHOD method_3399 deserializeTexture (Lcom/google/gson/JsonObject;)Ljava/lang/String; METHOD method_3400 deserializeTintIndex (Lcom/google/gson/JsonObject;)I + METHOD method_67911 getRotation (Lcom/google/gson/JsonObject;)Lnet/minecraft/class_10821; + METHOD method_67912 getUV (Lcom/google/gson/JsonObject;)Lnet/minecraft/class_783$class_10800; diff --git a/mappings/net/minecraft/client/render/model/json/MultipartModelComponent.mapping b/mappings/net/minecraft/client/render/model/json/MultipartModelComponent.mapping index 3dc3ec2cd2..8e2dab9ffb 100644 --- a/mappings/net/minecraft/client/render/model/json/MultipartModelComponent.mapping +++ b/mappings/net/minecraft/client/render/model/json/MultipartModelComponent.mapping @@ -1,7 +1,10 @@ CLASS net/minecraft/class_819 net/minecraft/client/render/model/json/MultipartModelComponent FIELD comp_3764 selector Ljava/util/Optional; FIELD comp_3765 model Lnet/minecraft/class_807; + FIELD field_56952 CODEC Lcom/mojang/serialization/Codec; METHOD (Ljava/util/Optional;Lnet/minecraft/class_807;)V ARG 2 model METHOD comp_3764 selector ()Ljava/util/Optional; METHOD comp_3765 model ()Lnet/minecraft/class_807; + METHOD method_67981 init (Lnet/minecraft/class_2689;)Ljava/util/function/Predicate; + ARG 1 value diff --git a/mappings/net/minecraft/client/render/model/json/MultipartModelSelector.mapping b/mappings/net/minecraft/client/render/model/json/MultipartModelSelector.mapping index 780633314b..febe58f2c8 100644 --- a/mappings/net/minecraft/client/render/model/json/MultipartModelSelector.mapping +++ b/mappings/net/minecraft/client/render/model/json/MultipartModelSelector.mapping @@ -1,2 +1,6 @@ CLASS net/minecraft/class_815 net/minecraft/client/render/model/json/MultipartModelSelector + FIELD field_56942 CODEC Lcom/mojang/serialization/Codec; METHOD instantiate instantiate (Lnet/minecraft/class_2689;)Ljava/util/function/Predicate; + ARG 1 value + METHOD method_67954 (Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/Codec; + ARG 0 group diff --git a/mappings/net/minecraft/client/render/model/json/WeightedUnbakedModel.mapping b/mappings/net/minecraft/client/render/model/json/WeightedUnbakedModel.mapping index aa7a3a2695..fc5d517f8b 100644 --- a/mappings/net/minecraft/client/render/model/json/WeightedUnbakedModel.mapping +++ b/mappings/net/minecraft/client/render/model/json/WeightedUnbakedModel.mapping @@ -1,7 +1,13 @@ CLASS net/minecraft/class_807 net/minecraft/client/render/model/json/WeightedUnbakedModel FIELD comp_3049 variants Ljava/util/List; + FIELD field_56932 CODEC Lcom/mojang/serialization/Codec; METHOD comp_3049 variants ()Ljava/util/List; METHOD equals (Ljava/lang/Object;)Z ARG 1 o METHOD method_62333 (Lnet/minecraft/class_10526$class_10103;Lnet/minecraft/class_813;)V ARG 1 variant + METHOD method_67929 put (Lnet/minecraft/class_10804;)Lnet/minecraft/class_807; + ARG 1 variants + METHOD method_67930 bake (Lnet/minecraft/class_7775;Lnet/minecraft/class_813;)Lnet/minecraft/class_1087; + ARG 0 baker + ARG 1 variant diff --git a/mappings/net/minecraft/client/texture/TextureType.mapping b/mappings/net/minecraft/client/texture/TextureType.mapping new file mode 100644 index 0000000000..89e5377310 --- /dev/null +++ b/mappings/net/minecraft/client/texture/TextureType.mapping @@ -0,0 +1,11 @@ +CLASS net/minecraft/class_10793 net/minecraft/client/texture/TextureType + FIELD field_56776 glId I + FIELD field_56777 formatId I + FIELD field_56778 glType I + METHOD (Ljava/lang/String;IIII)V + ARG 3 glId + ARG 4 formatId + ARG 5 glType + METHOD method_67791 glId ()I + METHOD method_67792 formatId ()I + METHOD method_67793 glType ()I diff --git a/mappings/net/minecraft/util/math/AffineTransformations.mapping b/mappings/net/minecraft/util/math/AffineTransformations.mapping index 65dea16a59..1c53ceb908 100644 --- a/mappings/net/minecraft/util/math/AffineTransformations.mapping +++ b/mappings/net/minecraft/util/math/AffineTransformations.mapping @@ -5,3 +5,4 @@ CLASS net/minecraft/class_4609 net/minecraft/util/math/AffineTransformations ARG 0 transformation METHOD method_35829 (Lnet/minecraft/class_4590;)Lnet/minecraft/class_4590; ARG 0 transformation + METHOD method_68069 getTransformed (Lnet/minecraft/class_4590;Lnet/minecraft/class_2350;)Lnet/minecraft/class_4590;