Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

25w07a: Additional Rendering / Shader / Model maps #4119

Merged
merged 1 commit into from
Feb 16, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions mappings/net/minecraft/TextureType.mapping
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
CLASS net/minecraft/class_10793 net/minecraft/TextureType
METHOD method_67791 glId ()I
METHOD method_67792 formatId ()I
METHOD method_67793 glType ()I
11 changes: 11 additions & 0 deletions mappings/net/minecraft/block/ItemFrameBlockStates.mapping
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
CLASS net/minecraft/class_10811 net/minecraft/block/ItemFrameBlockStates
FIELD field_56981 ITEM_FRAME Lnet/minecraft/class_2689;
FIELD field_56982 GLOW_ITEM_FRAME Lnet/minecraft/class_2689;
FIELD field_56983 glowItemFrameId Lnet/minecraft/class_2960;
FIELD field_56984 itemFrameId Lnet/minecraft/class_2960;
FIELD field_56985 STATIC_CODEC Ljava/util/Map;
METHOD method_68013 register ()Ljava/util/function/Function;
METHOD method_68014 getBlockState (ZZ)Lnet/minecraft/class_2680;
ARG 0 hasGlow
ARG 1 hasMap
METHOD method_68015 build ()Lnet/minecraft/class_2689;
38 changes: 0 additions & 38 deletions mappings/net/minecraft/class_10792.mapping

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CLASS net/minecraft/class_10785
CLASS net/minecraft/class_10785 net/minecraft/client/gl/ShaderProgramLayer
FIELD field_56705 id Lnet/minecraft/class_2960;
FIELD field_56706 verticies Lnet/minecraft/class_2960;
FIELD field_56707 shard Lnet/minecraft/class_2960;
Expand Down Expand Up @@ -45,7 +45,7 @@ CLASS net/minecraft/class_10785
METHOD method_67738 getDefs ()Lnet/minecraft/class_10149;
METHOD method_67739 getSamples ()Ljava/util/List;
METHOD method_67740 getNames ()Ljava/util/List;
CLASS class_10786
CLASS class_10786 Builder
FIELD field_56722 id Ljava/util/Optional;
FIELD field_56723 shard Ljava/util/Optional;
FIELD field_56724 verticies Ljava/util/Optional;
Expand Down Expand Up @@ -110,3 +110,4 @@ CLASS net/minecraft/class_10785
METHOD method_67765 setSamples (Ljava/lang/String;)Lnet/minecraft/class_10785$class_10786;
ARG 1 name
CLASS class_10787 Stage
CLASS class_10788 Uniform
Original file line number Diff line number Diff line change
Expand Up @@ -38,3 +38,6 @@ CLASS net/minecraft/class_10444 net/minecraft/client/render/item/ItemRenderState
METHOD method_65617 setSpecialModel (Lnet/minecraft/class_10515;Ljava/lang/Object;)V
ARG 1 specialModelType
ARG 2 data
METHOD method_67993 transform (Lnet/minecraft/class_804;)V
METHOD method_67994 particleIcon (Lnet/minecraft/class_1058;)V
METHOD method_67996 useBlockLight (Z)V
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@ CLASS net/minecraft/class_796 net/minecraft/client/render/model/BakedQuadFactory
ARG 1 transformation
METHOD method_3458 packVertexData (Lnet/minecraft/class_783$class_10800;Lnet/minecraft/class_10821;Lorg/joml/Matrix4fc;Lnet/minecraft/class_1058;Lnet/minecraft/class_2350;[FLnet/minecraft/class_4590;Lnet/minecraft/class_789;)[I
ARG 0 texture
ARG 1 rotation
ARG 3 sprite
ARG 4 facing
ARG 6 transform
ARG 7 modelRotation
METHOD method_3459 getPositionMatrix (Lorg/joml/Vector3fc;Lorg/joml/Vector3fc;)[F
METHOD method_3460 packVertexData ([IILorg/joml/Vector3f;Lnet/minecraft/class_1058;FF)V
ARG 0 vertices
Expand All @@ -26,9 +31,15 @@ CLASS net/minecraft/class_796 net/minecraft/client/render/model/BakedQuadFactory
METHOD method_3467 decodeDirection ([I)Lnet/minecraft/class_2350;
ARG 0 rotationMatrix
METHOD method_3468 bake (Lorg/joml/Vector3fc;Lorg/joml/Vector3fc;Lnet/minecraft/class_783;Lnet/minecraft/class_1058;Lnet/minecraft/class_2350;Lnet/minecraft/class_3665;Lnet/minecraft/class_789;ZI)Lnet/minecraft/class_777;
ARG 2 element
ARG 3 sprite
ARG 4 direction
ARG 5 settings
ARG 6 rotation
ARG 7 shade
ARG 8 lightEmission
METHOD method_67920 (Lnet/minecraft/class_1058;Lnet/minecraft/class_783$class_10800;)Lnet/minecraft/class_783$class_10800;
ARG 0 sprite
ARG 1 uv
METHOD method_67921 (Lorg/joml/Vector3fc;Lorg/joml/Vector3fc;Lnet/minecraft/class_2350;)Lnet/minecraft/class_783$class_10800;
ARG 2 facing
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CLASS net/minecraft/class_10819
CLASS net/minecraft/class_10819 net/minecraft/client/render/model/BakedSimpleModel
FIELD field_57023 DEFAULT_AMBIENT_OCCULSION Z
FIELD field_57024 DEFAULT_GUI_LIGHT Lnet/minecraft/class_1100$class_4751;
METHOD method_68031 getModel ()Lnet/minecraft/class_1100;
Expand All @@ -18,10 +18,17 @@ CLASS net/minecraft/class_10819
METHOD method_68054 getParticleTexture (Lnet/minecraft/class_10419;Lnet/minecraft/class_7775;Lnet/minecraft/class_10813;)Lnet/minecraft/class_1058;
ARG 0 textures
ARG 1 baker
ARG 2 model
METHOD method_68055 getTextures (Lnet/minecraft/class_10819;)Lnet/minecraft/class_10419;
ARG 0 model
METHOD method_68056 extractTransformation (Lnet/minecraft/class_10819;Lnet/minecraft/class_811;)Lnet/minecraft/class_804;
ARG 0 model
ARG 1 mode
METHOD method_68057 getAmbientOcclusion (Lnet/minecraft/class_10819;)Z
ARG 0 model
METHOD method_68058 getGuiLight (Lnet/minecraft/class_10819;)Lnet/minecraft/class_1100$class_4751;
ARG 0 model
METHOD method_68059 getGeometry (Lnet/minecraft/class_10819;)Lnet/minecraft/class_10820;
ARG 0 model
METHOD method_68060 copyTransformations (Lnet/minecraft/class_10819;)Lnet/minecraft/class_809;
ARG 0 model
1 change: 1 addition & 0 deletions mappings/net/minecraft/client/render/model/Baker.mapping
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
CLASS net/minecraft/class_7775 net/minecraft/client/render/model/Baker
METHOD method_45872 getModel (Lnet/minecraft/class_2960;)Lnet/minecraft/class_10819;
ARG 1 id
METHOD method_65732 getSpriteGetter ()Lnet/minecraft/class_9826;
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
CLASS net/minecraft/class_9826 net/minecraft/client/render/model/ErrorCollectingSpriteGetter
METHOD method_65739 get (Lnet/minecraft/class_4730;Lnet/minecraft/class_10813;)Lnet/minecraft/class_1058;
METHOD method_65740 getMissing (Ljava/lang/String;Lnet/minecraft/class_10813;)Lnet/minecraft/class_1058;
METHOD method_68061 get (Lnet/minecraft/class_10419;Ljava/lang/String;Lnet/minecraft/class_10813;)Lnet/minecraft/class_1058;
70 changes: 70 additions & 0 deletions mappings/net/minecraft/client/render/model/FutureModel.mapping
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
CLASS net/minecraft/class_10769 net/minecraft/client/render/model/FutureModel
FIELD field_56616 MAX_TASKS I
METHOD method_67611 newTask (Ljava/util/Map;Ljava/util/function/BiFunction;ILjava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture;
ARG 0 futures
ARG 1 function
ARG 3 exec
METHOD method_67612 newTask (Ljava/util/Map;Ljava/util/function/BiFunction;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture;
ARG 0 futures
ARG 1 function
ARG 2 exec
CLASS class_10770 Batch
FIELD field_56618 entries Ljava/util/Map;
FIELD field_56619 size I
FIELD field_56620 start I
METHOD method_67617 newTask (Ljava/util/Map;IILnet/minecraft/class_10769$class_10771;)Ljava/lang/Runnable;
ARG 0 futures
ARG 1 size
ARG 2 maxCount
ARG 3 entry
METHOD method_67618 (Ljava/util/Map;Ljava/lang/Object;)Ljava/util/Map;
ARG 1 obj
CLASS class_10771 Future
METHOD <init> (Ljava/util/function/BiFunction;I)V
ARG 1 function
ARG 2 size
METHOD method_67620 keySize ()I
METHOD method_67621 apply (I)V
ARG 1 index
METHOD method_67622 put (ILjava/lang/Object;Ljava/lang/Object;)V
ARG 1 index
ARG 2 key
ARG 3 value
METHOD method_67623 copy (ILjava/util/Map;)V
ARG 1 index
ARG 2 futures
METHOD method_67624 getKey (I)Ljava/lang/Object;
ARG 1 index
METHOD method_67625 getValue (I)Ljava/lang/Object;
ARG 1 index
METHOD method_67626 getUValue (I)Ljava/lang/Object;
ARG 1 index
CLASS class_10772 Single
METHOD <init> (Ljava/util/function/BiFunction;I)V
ARG 1 function
METHOD method_67628 (Lnet/minecraft/class_10769$class_10771;Ljava/lang/Object;)Ljava/util/Map;
ARG 1 obj
CLASS class_10773 Entry
FIELD field_56622 lastBatch I
FIELD field_56624 index I
FIELD field_56625 futures [Ljava/util/concurrent/CompletableFuture;
FIELD field_56626 batch I
FIELD field_56627 entry Lnet/minecraft/class_10769$class_10771;
METHOD <init> (Ljava/util/function/BiFunction;II)V
ARG 1 function
ARG 2 size
ARG 3 startAt
METHOD method_67614 getLastIndex (I)I
METHOD method_67616 newBatch (Lnet/minecraft/class_10769$class_10771;IILjava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture;
ARG 1 futures
ARG 4 exec
METHOD method_67619 addLastTask (Ljava/util/concurrent/CompletableFuture;Lnet/minecraft/class_10769$class_10771;)Ljava/util/concurrent/CompletableFuture;
ARG 1 future
ARG 2 entry
METHOD method_67629 nextSize ()I
METHOD method_67630 newTasks (Ljava/util/Map;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture;
ARG 1 future
ARG 2 exec
METHOD method_67631 (Ljava/util/concurrent/Executor;Ljava/lang/Object;Ljava/lang/Object;)V
ARG 2 key
ARG 3 value
10 changes: 10 additions & 0 deletions mappings/net/minecraft/client/render/model/Geometry.mapping
Original file line number Diff line number Diff line change
@@ -1,2 +1,12 @@
CLASS net/minecraft/class_10820 net/minecraft/client/render/model/Geometry
FIELD field_57025 EMPTY Lnet/minecraft/class_10820;
METHOD bake bake (Lnet/minecraft/class_10419;Lnet/minecraft/class_7775;Lnet/minecraft/class_3665;Lnet/minecraft/class_10813;)Lnet/minecraft/class_10817;
ARG 1 textures
ARG 2 baker
ARG 3 settings
ARG 4 model
METHOD method_68062 (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
Original file line number Diff line number Diff line change
@@ -1,2 +1,7 @@
CLASS net/minecraft/class_3665 net/minecraft/client/render/model/ModelBakeSettings
FIELD field_57009 TRANSFORM_NONE Lorg/joml/Matrix4fc;
METHOD method_3509 getRotation ()Lnet/minecraft/class_4590;
METHOD method_68011 forward (Lnet/minecraft/class_2350;)Lorg/joml/Matrix4fc;
ARG 1 facing
METHOD method_68012 reverse (Lnet/minecraft/class_2350;)Lorg/joml/Matrix4fc;
ARG 1 facing
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
CLASS net/minecraft/class_10809 net/minecraft/client/render/model/ModelSettings
METHOD method_68000 addSettings (Lnet/minecraft/class_10444$class_10446;Lnet/minecraft/class_811;)V
ARG 1 state
ARG 2 mode
METHOD method_68001 resolveSettings (Lnet/minecraft/class_7775;Lnet/minecraft/class_10819;Lnet/minecraft/class_10419;)Lnet/minecraft/class_10809;
ARG 0 baker
ARG 1 model
ARG 2 textures
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,5 @@ CLASS net/minecraft/class_10526 net/minecraft/client/render/model/ResolvableMode
METHOD method_62326 resolve (Lnet/minecraft/class_10526$class_10103;)V
ARG 1 resolver
CLASS class_10103 Resolver
METHOD markDependency (Lnet/minecraft/class_2960;)V
ARG 1 id
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
CLASS net/minecraft/class_10813 net/minecraft/client/render/model/SimpleModel
METHOD debugName name ()Ljava/lang/String;
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
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;
ARG 2 sprite
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ CLASS net/minecraft/class_783 net/minecraft/client/render/model/json/ModelElemen
METHOD comp_2867 cullFace ()Lnet/minecraft/class_2350;
METHOD comp_2868 tintIndex ()I
METHOD comp_2869 textureId ()Ljava/lang/String;
CLASS class_10800 UV
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;
Expand Down
4 changes: 4 additions & 0 deletions mappings/net/minecraft/client/texture/ClampedTexture.mapping
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
CLASS net/minecraft/class_10790 net/minecraft/client/texture/ClampedTexture
FIELD field_56754 identifier I
METHOD <init> (Ljava/lang/String;II)V
ARG 3 id
66 changes: 66 additions & 0 deletions mappings/net/minecraft/client/texture/DrawableTexture.mapping
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
CLASS net/minecraft/class_10792 net/minecraft/client/texture/DrawableTexture
FIELD field_56759 glId I
FIELD field_56760 type Lnet/minecraft/class_10793;
FIELD field_56761 width I
FIELD field_56762 height I
FIELD field_56763 mipLevels I
FIELD field_56764 debugName Ljava/lang/String;
FIELD field_56765 closed Z
FIELD field_56766 clampedU Lnet/minecraft/class_10790;
FIELD field_56767 clampedV Lnet/minecraft/class_10790;
FIELD field_56768 nearFilter Lnet/minecraft/class_10791;
FIELD field_56769 farFilter Lnet/minecraft/class_10791;
FIELD field_56770 hasMipmap Z
FIELD field_56771 dirty Z
METHOD <init> (Ljava/lang/String;Lnet/minecraft/class_10793;III)V
ARG 1 debugName
ARG 2 type
ARG 3 width
ARG 4 height
ARG 5 mipLevels
METHOD <init> (Ljava/util/function/Supplier;Lnet/minecraft/class_10793;III)V
ARG 1 supplier
ARG 2 type
ARG 3 width
ARG 4 height
ARG 5 mipLevels
METHOD method_67777 getMipLevels ()I
METHOD method_67778 getMippedWidth (I)I
ARG 1 mipLevel
METHOD method_67779 replaceImage (Lnet/minecraft/class_1011;)V
ARG 1 newImage
METHOD method_67780 copyTo (Lnet/minecraft/class_1011;IIIIIII)V
ARG 1 image
ARG 2 mipLevel
ARG 3 destX
ARG 4 destY
ARG 5 width
ARG 6 height
ARG 7 srcX
ARG 8 srcY
METHOD method_67781 setClamp (Lnet/minecraft/class_10790;)V
ARG 1 uv
METHOD method_67782 setClamp (Lnet/minecraft/class_10790;Lnet/minecraft/class_10790;)V
ARG 1 u
ARG 2 v
METHOD method_67783 setFilter (Lnet/minecraft/class_10791;Lnet/minecraft/class_10791;Z)V
ARG 1 near
ARG 2 far
ARG 3 hasMipMap
METHOD method_67784 setFilter (Lnet/minecraft/class_10791;Z)V
ARG 1 all
ARG 2 hasMipMap
METHOD method_67785 upload (Ljava/nio/IntBuffer;Lnet/minecraft/class_1011$class_1012;IIIII)V
ARG 1 buffer
ARG 2 format
ARG 3 mipLevel
ARG 4 x
ARG 5 y
ARG 6 width
ARG 7 height
METHOD method_67786 getType ()Lnet/minecraft/class_10793;
METHOD method_67787 getMippedHeight (I)I
ARG 1 mipLevel
METHOD method_67788 bindTexture ()V
METHOD method_67789 getGlId ()I
METHOD method_67790 getDebugName ()Ljava/lang/String;
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
CLASS net/minecraft/class_10791 net/minecraft/client/texture/FilteredTexture
1 change: 1 addition & 0 deletions mappings/net/minecraft/client/texture/NativeImage.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@ CLASS net/minecraft/class_1011 net/minecraft/client/texture/NativeImage
METHOD method_65806 putAndRead (Ljava/nio/ByteBuffer;[B)Lnet/minecraft/class_1011;
ARG 0 buffer
ARG 1 bytes
METHOD method_67769 imageId ()J
CLASS class_1012 Format
FIELD field_4993 glFormat I
FIELD field_4994 channelCount I
Expand Down
24 changes: 24 additions & 0 deletions mappings/net/minecraft/entity/passive/SheepColors.mapping
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
CLASS net/minecraft/class_10777 net/minecraft/entity/passive/SheepColors
FIELD field_56661 TEMPERATE Lnet/minecraft/class_10777$class_10779;
FIELD field_56662 WARM Lnet/minecraft/class_10777$class_10779;
FIELD field_56663 COLD Lnet/minecraft/class_10777$class_10779;
METHOD method_67662 group ()Lnet/minecraft/class_6012$class_6006;
METHOD method_67663 builder (Lnet/minecraft/class_6012;)Lnet/minecraft/class_10777$class_10778;
ARG 0 factory
METHOD method_67664 (Lnet/minecraft/class_6012;Lnet/minecraft/class_5819;)Lnet/minecraft/class_1767;
ARG 1 prov
METHOD method_67665 addDefault (Lnet/minecraft/class_1767;)Lnet/minecraft/class_10777$class_10778;
ARG 0 color
METHOD method_67666 (Lnet/minecraft/class_1767;Lnet/minecraft/class_5819;)Lnet/minecraft/class_1767;
ARG 1 prov
METHOD method_67667 getType (Lnet/minecraft/class_6880;)Lnet/minecraft/class_10777$class_10779;
ARG 0 biome
METHOD method_67668 getRandomColor (Lnet/minecraft/class_6880;Lnet/minecraft/class_5819;)Lnet/minecraft/class_1767;
ARG 0 biome
ARG 1 seed
METHOD method_67669 addColor (Lnet/minecraft/class_1767;)Lnet/minecraft/class_10777$class_10778;
ARG 0 color
CLASS class_10778 Factory
METHOD get init (Lnet/minecraft/class_5819;)Lnet/minecraft/class_1767;
ARG 1 seed
CLASS class_10779 Type
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
CLASS net/minecraft/class_10713 net/minecraft/item/equipment/EquipmentHolder
1 change: 1 addition & 0 deletions mappings/net/minecraft/state/property/Properties.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -277,6 +277,7 @@ CLASS net/minecraft/class_2741 net/minecraft/state/property/Properties
COMMENT A property that specifies the state of a creaking heart.
FIELD field_56023 TEST_BLOCK_MODE Lnet/minecraft/class_2754;
COMMENT A property that specifies the mode of a test block.
FIELD field_56672 MAP Lnet/minecraft/class_2746;
METHOD method_11813 (Lnet/minecraft/class_2768;)Z
ARG 0 shape
METHOD method_11814 (Lnet/minecraft/class_2350;)Z
Expand Down
13 changes: 13 additions & 0 deletions mappings/net/minecraft/util/math/Rotation.mapping
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
CLASS net/minecraft/class_10821 net/minecraft/util/math/Rotation
FIELD field_57033 CODEC Lcom/mojang/serialization/Codec;
FIELD field_57034 rotation I
METHOD <init> (Ljava/lang/String;II)V
ARG 3 rotate
METHOD method_68064 fromJson (I)Lnet/minecraft/class_10821;
ARG 0 value
METHOD method_68065 (Lnet/minecraft/class_10821;)Ljava/lang/Integer;
ARG 0 rot
METHOD method_68066 (Ljava/lang/Integer;)Lcom/mojang/serialization/DataResult;
ARG 0 value
METHOD method_68067 rotate (I)I
ARG 1 index