diff --git a/mappings/net/minecraft/client/render/entity/impl/EntityRendererHorse.mapping b/mappings/net/minecraft/client/render/entity/impl/EntityRendererHorse.mapping index 81df68ec4d..bf7be772bd 100644 --- a/mappings/net/minecraft/client/render/entity/impl/EntityRendererHorse.mapping +++ b/mappings/net/minecraft/client/render/entity/impl/EntityRendererHorse.mapping @@ -1 +1,2 @@ CLASS none/btl net/minecraft/client/render/entity/impl/EntityRendererHorse + FIELD a TEXTURE_CACHE Ljava/util/Map; diff --git a/mappings/net/minecraft/client/render/model/ModelManager.mapping b/mappings/net/minecraft/client/render/model/ModelManager.mapping index d99de23090..fcd808d176 100644 --- a/mappings/net/minecraft/client/render/model/ModelManager.mapping +++ b/mappings/net/minecraft/client/render/model/ModelManager.mapping @@ -1,4 +1,7 @@ CLASS none/bzo net/minecraft/client/render/model/ModelManager + CLASS none/bzo$3 + METHOD a registerSprites (Lnone/bxc;)V + ARG 0 atlas FIELD a MISSING Lnone/bzq; FIELD b DEFAULT_TEXTURES Ljava/util/Set; FIELD c LOGGER Lorg/apache/logging/log4j/Logger; diff --git a/mappings/net/minecraft/client/texture/ISpriteRegistrationListener.mapping b/mappings/net/minecraft/client/texture/ISpriteRegistrationListener.mapping new file mode 100644 index 0000000000..bf82c17413 --- /dev/null +++ b/mappings/net/minecraft/client/texture/ISpriteRegistrationListener.mapping @@ -0,0 +1,3 @@ +CLASS none/bwv net/minecraft/client/texture/ISpriteRegistrationListener + METHOD a registerSprites (Lnone/bxc;)V + ARG 0 atlas diff --git a/mappings/net/minecraft/client/texture/ITexture.mapping b/mappings/net/minecraft/client/texture/ITexture.mapping index 6cb7b19ac8..8bd1e297c6 100644 --- a/mappings/net/minecraft/client/texture/ITexture.mapping +++ b/mappings/net/minecraft/client/texture/ITexture.mapping @@ -1,2 +1,4 @@ CLASS none/bxf net/minecraft/client/texture/ITexture + METHOD a load (Lnone/byc;)V + ARG 0 resourceContainer METHOD b getGlId ()I diff --git a/mappings/net/minecraft/client/texture/PngMetadata.mapping b/mappings/net/minecraft/client/texture/PngMetadata.mapping new file mode 100644 index 0000000000..6fe9e20aa7 --- /dev/null +++ b/mappings/net/minecraft/client/texture/PngMetadata.mapping @@ -0,0 +1,7 @@ +CLASS none/bwy net/minecraft/client/texture/PngMetadata + FIELD a width I + FIELD b height I + METHOD (Ljava/io/InputStream;)V + ARG 0 stream + METHOD a get (Lnone/byb;)Lnone/bwy; + ARG 0 resource diff --git a/mappings/net/minecraft/client/texture/Sprite.mapping b/mappings/net/minecraft/client/texture/Sprite.mapping index cee954f8e2..6a1f10e7cd 100644 --- a/mappings/net/minecraft/client/texture/Sprite.mapping +++ b/mappings/net/minecraft/client/texture/Sprite.mapping @@ -1,5 +1,6 @@ CLASS none/bxd net/minecraft/client/texture/Sprite FIELD a frames Ljava/util/List; + FIELD b interpolatedFrames [[I FIELD c rotated Z FIELD d x I FIELD e y I @@ -8,6 +9,7 @@ CLASS none/bxd net/minecraft/client/texture/Sprite FIELD h framePos I FIELD i ticks I FIELD j name Ljava/lang/String; + FIELD k animationMetadata Lnone/byv; FIELD l uMin F FIELD m uMax F FIELD n vMin F @@ -27,10 +29,21 @@ CLASS none/bxd net/minecraft/client/texture/Sprite ARG 4 rotated METHOD a setFrameList (Ljava/util/List;)V ARG 0 frames + METHOD a initialize (Lnone/bwy;Z)V + ARG 0 metadata + ARG 1 animation METHOD a copy (Lnone/bxd;)V ARG 0 src + METHOD a load (Lnone/byb;I)V + ARG 0 resource + ARG 1 mipLevel METHOD a create (Lnone/kp;)Lnone/bxd; ARG 0 name + METHOD a cutFrame ([[IIII)[[I + ARG 0 origData + ARG 1 texWidth + ARG 2 texHeight + ARG 3 frameIndex METHOD b getY ()I METHOD b getV (D)F ARG 0 y @@ -52,3 +65,6 @@ CLASS none/bxd net/minecraft/client/texture/Sprite METHOD j update ()V METHOD k getFrameCount ()I METHOD l clearFrameList ()V + METHOD m isAnimated ()Z + METHOD n interpolateFrames ()V + METHOD o clear ()V diff --git a/mappings/net/minecraft/client/texture/Texture.mapping b/mappings/net/minecraft/client/texture/Texture.mapping index 6cf3c3b400..8b15863ea1 100644 --- a/mappings/net/minecraft/client/texture/Texture.mapping +++ b/mappings/net/minecraft/client/texture/Texture.mapping @@ -1,3 +1,4 @@ CLASS none/bws net/minecraft/client/texture/Texture FIELD a glId I METHOD b getGlId ()I + METHOD c clearGlId ()V diff --git a/mappings/net/minecraft/client/texture/TextureDynamic.mapping b/mappings/net/minecraft/client/texture/TextureDynamic.mapping index aff14e82d5..8382ce694f 100644 --- a/mappings/net/minecraft/client/texture/TextureDynamic.mapping +++ b/mappings/net/minecraft/client/texture/TextureDynamic.mapping @@ -7,5 +7,7 @@ CLASS none/bwt net/minecraft/client/texture/TextureDynamic ARG 1 height METHOD (Ljava/awt/image/BufferedImage;)V ARG 0 image + METHOD a load (Lnone/byc;)V + ARG 0 resourceContainer METHOD d upload ()V METHOD e getData ()[I diff --git a/mappings/net/minecraft/client/texture/TextureImage.mapping b/mappings/net/minecraft/client/texture/TextureImage.mapping new file mode 100644 index 0000000000..42c9210fae --- /dev/null +++ b/mappings/net/minecraft/client/texture/TextureImage.mapping @@ -0,0 +1,7 @@ +CLASS none/bwz net/minecraft/client/texture/TextureImage + FIELD f location Lnone/kp; + FIELD g LOGGER Lorg/apache/logging/log4j/Logger; + METHOD (Lnone/kp;)V + ARG 0 location + METHOD a load (Lnone/byc;)V + ARG 0 resourceContainer diff --git a/mappings/net/minecraft/client/texture/TextureImageLayered.mapping b/mappings/net/minecraft/client/texture/TextureImageLayered.mapping new file mode 100644 index 0000000000..37b8ef9dd2 --- /dev/null +++ b/mappings/net/minecraft/client/texture/TextureImageLayered.mapping @@ -0,0 +1,7 @@ +CLASS none/bwx net/minecraft/client/texture/TextureImageLayered + FIELD f locations Ljava/util/List; + FIELD g LOGGER Lorg/apache/logging/log4j/Logger; + METHOD ([Ljava/lang/String;)V + ARG 0 locations + METHOD a load (Lnone/byc;)V + ARG 0 resourceContainer diff --git a/mappings/net/minecraft/client/texture/TextureManager.mapping b/mappings/net/minecraft/client/texture/TextureManager.mapping index 3bf6578994..6701256ffe 100644 --- a/mappings/net/minecraft/client/texture/TextureManager.mapping +++ b/mappings/net/minecraft/client/texture/TextureManager.mapping @@ -3,6 +3,9 @@ CLASS none/bxe net/minecraft/client/texture/TextureManager FIELD b textures Ljava/util/Map; FIELD c updateable Ljava/util/List; FIELD d dynamicIdCounters Ljava/util/Map; + FIELD e resourceContainer Lnone/byc; + METHOD (Lnone/byc;)V + ARG 0 resourceContainer METHOD a registerDynamicTexture (Ljava/lang/String;Lnone/bwt;)Lnone/kp; ARG 0 prefix ARG 1 texture diff --git a/mappings/net/minecraft/client/texture/TextureSpriteAtlas.mapping b/mappings/net/minecraft/client/texture/TextureSpriteAtlas.mapping index b620fd1fac..3cdb892f8c 100644 --- a/mappings/net/minecraft/client/texture/TextureSpriteAtlas.mapping +++ b/mappings/net/minecraft/client/texture/TextureSpriteAtlas.mapping @@ -2,22 +2,37 @@ CLASS none/bxc net/minecraft/client/texture/TextureSpriteAtlas FIELD f MISSINGNO_LOC Lnone/kp; FIELD g BLOCK_ATLAS_LOC Lnone/kp; FIELD h LOGGER Lorg/apache/logging/log4j/Logger; - FIELD i sprites Ljava/util/List; + FIELD i animatedSprites Ljava/util/List; + FIELD j registeredSprites Ljava/util/Map; + FIELD k sprites Ljava/util/Map; FIELD l prefix Ljava/lang/String; + FIELD m listener Lnone/bwv; FIELD n mipLevel I FIELD o defaultSprite Lnone/bxd; METHOD (Ljava/lang/String;)V ARG 0 prefix METHOD (Ljava/lang/String;Lnone/bwv;)V ARG 0 prefix + ARG 1 listener METHOD a setMipLevel (I)V ARG 0 value METHOD a getSprite (Ljava/lang/String;)Lnone/bxd; ARG 0 id METHOD a getResourceLocation (Lnone/bxd;)Lnone/kp; ARG 0 sprite + METHOD a load (Lnone/byc;)V + ARG 0 resourceContainer + METHOD a load (Lnone/byc;Lnone/bwv;)V + ARG 0 resourceContainer + ARG 1 listener + METHOD a loadSprite (Lnone/byc;Lnone/bxd;)Z + ARG 0 container + ARG 1 sprite METHOD a register (Lnone/kp;)Lnone/bxd; ARG 0 id + METHOD b generateAtlas (Lnone/byc;)V + ARG 0 container + METHOD d updateAnimatedSprites ()V METHOD e updateTexture ()V METHOD f getDefaultSprite ()Lnone/bxd; METHOD g initDefaultSprite ()V diff --git a/mappings/net/minecraft/client/texture/TextureStitcher.mapping b/mappings/net/minecraft/client/texture/TextureStitcher.mapping new file mode 100644 index 0000000000..90701d3dce --- /dev/null +++ b/mappings/net/minecraft/client/texture/TextureStitcher.mapping @@ -0,0 +1,47 @@ +CLASS none/bxa net/minecraft/client/texture/TextureStitcher + CLASS none/bxa$a Holder + FIELD a sprite Lnone/bxd; + FIELD b width I + FIELD c height I + FIELD d mipLevel I + METHOD (Lnone/bxd;I)V + ARG 0 sprite + ARG 1 mipLevel + METHOD a getSprite ()Lnone/bxd; + CLASS none/bxa$b Slot + FIELD a x I + FIELD b y I + FIELD c width I + FIELD d height I + FIELD f spriteHolder Lnone/bxa$a; + METHOD (IIII)V + ARG 0 x + ARG 1 y + ARG 2 width + ARG 3 height + METHOD a getSpriteHolder ()Lnone/bxa$a; + METHOD a addAllFilledSlots (Ljava/util/List;)V + ARG 0 slots + METHOD a tryFit (Lnone/bxa$a;)Z + ARG 0 holder + METHOD b getX ()I + METHOD c getY ()I + FIELD a mipLevel I + FIELD b holders Ljava/util/Set; + FIELD c slots Ljava/util/List; + FIELD d width I + FIELD e height I + FIELD f maxWidth I + FIELD g maxHeight I + METHOD (IIII)V + ARG 0 maxWidth + ARG 1 maxHeight + ARG 3 mipLevel + METHOD a getWidth ()I + METHOD a tryFit (Lnone/bxa$a;)Z + ARG 0 holder + METHOD a add (Lnone/bxd;)V + ARG 0 sprite + METHOD b getHeight ()I + METHOD c stitch ()V + METHOD d getStitchedSprites ()Ljava/util/List; diff --git a/mappings/net/minecraft/client/texture/TextureStitcherCannotFitException.mapping b/mappings/net/minecraft/client/texture/TextureStitcherCannotFitException.mapping new file mode 100644 index 0000000000..7177bf40a1 --- /dev/null +++ b/mappings/net/minecraft/client/texture/TextureStitcherCannotFitException.mapping @@ -0,0 +1,5 @@ +CLASS none/bxb net/minecraft/client/texture/TextureStitcherCannotFitException + FIELD a holder Lnone/bxa$a; + METHOD (Lnone/bxa$a;Ljava/lang/String;)V + ARG 0 holder + ARG 1 message diff --git a/mappings/net/minecraft/client/util/TextureUtils.mapping b/mappings/net/minecraft/client/util/TextureUtils.mapping index 45fbda1329..e8c3e7b853 100644 --- a/mappings/net/minecraft/client/util/TextureUtils.mapping +++ b/mappings/net/minecraft/client/util/TextureUtils.mapping @@ -3,20 +3,42 @@ CLASS none/bxg net/minecraft/client/util/TextureUtils FIELD b TEXTURE_MISSING_DATA [I FIELD c LOGGER Lorg/apache/logging/log4j/Logger; METHOD a createTextureId ()I - METHOD a (I)V + METHOD a destroyTextureId (I)V + ARG 0 id + METHOD a (II[[I)[[I METHOD a (ILjava/awt/image/BufferedImage;)I ARG 0 textureId ARG 1 image - METHOD a upload (I[III)V + METHOD a (ILjava/awt/image/BufferedImage;IIZZ)I + ARG 0 textureId + ARG 1 image + ARG 2 width + ARG 3 height + ARG 4 blur + ARG 5 clamp + METHOD a (ILjava/awt/image/BufferedImage;ZZ)I + ARG 0 textureId + ARG 1 image + ARG 2 blur + ARG 3 clamp + METHOD a (I[III)V ARG 0 textureId ARG 1 data ARG 2 width ARG 3 height + METHOD a (I[IIIIIZZZ)V + ARG 0 textureId + ARG 1 data + ARG 2 width + ARG 3 height + ARG 4 x + ARG 5 y METHOD a getBufferedImage (Ljava/io/InputStream;)Ljava/awt/image/BufferedImage; ARG 0 stream METHOD a getImagePixels (Lnone/byc;Lnone/kp;)[I ARG 0 resourceContainer ARG 1 location + METHOD a ([[IIIIIZZ)V METHOD b bindTexture (I)V ARG 0 texId METHOD c getAnaglyphColor (I)I diff --git a/mappings/net/minecraft/entity/passive/impl/EntityHorse.mapping b/mappings/net/minecraft/entity/passive/impl/EntityHorse.mapping index 73b6d389cd..926d1b144a 100644 --- a/mappings/net/minecraft/entity/passive/impl/EntityHorse.mapping +++ b/mappings/net/minecraft/entity/passive/impl/EntityHorse.mapping @@ -1,6 +1,12 @@ CLASS none/xe net/minecraft/entity/passive/impl/EntityHorse FIELD bI VARIANT Lnone/kj; FIELD bJ ARMOR_TYPE Lnone/kj; + FIELD bK HORSE_TEX [Ljava/lang/String; + FIELD bL HORSE_TEX_ID [Ljava/lang/String; + FIELD bM HORSE_MARKING_TEX [Ljava/lang/String; + FIELD bN HORSE_MARKING_TEX_ID [Ljava/lang/String; + FIELD bO textureLocation Ljava/lang/String; + FIELD bP textureLayers [Ljava/lang/String; METHOD G getSoundAmbient ()Lnone/nk; METHOD J ()Lnone/kp; METHOD a interactMob (Lnone/aal;Lnone/ra;)Z @@ -18,7 +24,11 @@ CLASS none/xe net/minecraft/entity/passive/impl/EntityHorse METHOD bD initAttributes ()V METHOD bV getSoundHurt ()Lnone/nk; METHOD bW getSoundDeath ()Lnone/nk; + METHOD dD getTextureLocation ()Ljava/lang/String; + METHOD dE getTextureLayers ()[Ljava/lang/String; METHOD dF getArmorType ()Lnone/xf; + METHOD dG clearTextureInfo ()V + METHOD dH initTextureInfo ()V METHOD de getVariant ()I METHOD f setArmorTypeFromStack (Lnone/aer;)V ARG 0 stack diff --git a/mappings/none/bwu.mapping b/mappings/none/bwu.mapping index 69801a7f1d..7a9a0ef14d 100644 --- a/mappings/none/bwu.mapping +++ b/mappings/none/bwu.mapping @@ -1,2 +1,4 @@ CLASS none/bwu + METHOD a load (Lnone/byc;)V + ARG 0 resourceContainer METHOD b getGlId ()I diff --git a/mappings/none/bww.mapping b/mappings/none/bww.mapping new file mode 100644 index 0000000000..d55c0eaf83 --- /dev/null +++ b/mappings/none/bww.mapping @@ -0,0 +1,3 @@ +CLASS none/bww + METHOD a load (Lnone/byc;)V + ARG 0 resourceContainer diff --git a/mappings/none/bwy.mapping b/mappings/none/bwy.mapping deleted file mode 100644 index 45621e6f48..0000000000 --- a/mappings/none/bwy.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS none/bwy - FIELD a width I - FIELD b height I diff --git a/mappings/none/bwz.mapping b/mappings/none/bwz.mapping deleted file mode 100644 index 74c8deab58..0000000000 --- a/mappings/none/bwz.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS none/bwz - FIELD g LOGGER Lorg/apache/logging/log4j/Logger;